Furious-GUI 0.2.0__tar.gz → 0.2.2__tar.gz

{Furious-GUI-0.2.0 → Furious-GUI-0.2.2}/Furious/Action/Routing.py

@@ -46,8 +46,8 @@ BUILTIN_ROUTING_TABLE = {
             ],
         },
         Hysteria.name(): {
-            'acl': str(DATA_DIR / 'hysteria' / 'bypass-mainland-China.acl'),
-            'mmdb': str(DATA_DIR / 'hysteria' / 'country.mmdb'),
+            'acl': (DATA_DIR / 'hysteria' / 'bypass-mainland-China.acl').as_posix(),
+            'mmdb': (DATA_DIR / 'hysteria' / 'country.mmdb').as_posix(),
         },
     },
     'Bypass Iran': {
@@ -91,8 +91,8 @@ BUILTIN_ROUTING_TABLE = {
             ],
         },
         Hysteria.name(): {
-            'acl': str(DATA_DIR / 'hysteria' / 'bypass-Iran.acl'),
-            'mmdb': str(DATA_DIR / 'hysteria' / 'country.mmdb'),
+            'acl': (DATA_DIR / 'hysteria' / 'bypass-Iran.acl').as_posix(),
+            'mmdb': (DATA_DIR / 'hysteria' / 'country.mmdb').as_posix(),
         },
     },
     'Global': {
@@ -129,6 +129,10 @@ def routingToIndex():
             if routing == currentRouting:
                 return i
 
+        return -1
+    except Exception:
+        # Any non-exit exceptions
+
         return -1
     else:
         return index + len(BUILTIN_ROUTING)

{Furious-GUI-0.2.0 → Furious-GUI-0.2.2}/Furious/Utility/Constants.py

@@ -37,3 +37,8 @@ PROXY_SERVER_BYPASS = (
     '172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;'
     '172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*'
 )
+
+
+class Color:
+    LIGHT_RED_ = '#FF7276'
+    LIGHT_BLUE = '#43ACED'

{Furious-GUI-0.2.0 → Furious-GUI-0.2.2}/Furious/Utility/Settings.py

@@ -1,4 +1,5 @@
 from Furious.Action.Language import SUPPORTED_LANGUAGE
+from Furious.Action.Routing import BUILTIN_ROUTING
 from Furious.Utility.Constants import SYSTEM_LANGUAGE
 from Furious.Utility.Utility import Switch
 
@@ -22,7 +23,9 @@ class Settings:
 
             value = QtCore.QSettings().value(settings.name)
 
-            if settings.protectedRange is None or value in settings.protectedRange:
+            if value is not None and (
+                settings.protectedRange is None or value in settings.protectedRange
+            ):
                 return value
 
             # Value not in protected range. Set to default
@@ -55,7 +58,7 @@ SUPPORTED_SETTINGS = (
     # Connected last time or not
     Settings('Connect', Switch.RANGE),
     # User Routing option
-    Settings('Routing'),
+    Settings('Routing', default=BUILTIN_ROUTING[0]),
     # User Custom Routing object
     Settings('CustomRouting'),
     # User Configuration
@@ -66,8 +69,6 @@ SUPPORTED_SETTINGS = (
     Settings('MainWidgetWindowSize'),
     # Edit Routing Widget Window Size
     Settings('RoutesWidgetWindowSize'),
-    # Edit Routing Widget Editor Window Size
-    Settings('RoutesEditorWindowSize'),
     # Main Widget Section Size
     Settings('ServerWidgetSectionSizeTable'),
     # Edit Routing Widget Section Size

{Furious-GUI-0.2.0 → Furious-GUI-0.2.2}/Furious/Utility/Translator.py

@@ -702,6 +702,33 @@ TRANSLATION = {
         'ZH': '保存路由配置时出错',
         'TW': '保存路由配置時出錯',
     },
+    f'Edit {XrayCore.name()} Routing Rules': {
+        'ES': f'Editar Reglas de Enrutamiento de {XrayCore.name()}',
+        'ZH': f'编辑{XrayCore.name()}路由规则',
+        'TW': f'編輯{XrayCore.name()}路由規則',
+    },
+    f'Edit {Hysteria.name()} Routing Rules': {
+        'ES': f'Editar Reglas de Enrutamiento de {Hysteria.name()}',
+        'ZH': f'编辑{Hysteria.name()}路由规则',
+        'TW': f'編輯{Hysteria.name()}路由規則',
+    },
+    f'{XrayCore.name()} Routing Rules': {
+        'ES': f'Reglas de Enrutamiento de {XrayCore.name()}',
+        'ZH': f'{XrayCore.name()}路由规则',
+        'TW': f'{XrayCore.name()}路由規則',
+    },
+    f'Note: If acl is empty or does not exist, {APPLICATION_NAME} '
+    f'will fall back to proxy all traffic.': {
+        'ES': f'NOTA: Si la ACL está vacía o no existe, '
+        f'{APPLICATION_NAME} volverá a utilizar proxy para todo el tráfico.',
+        'ZH': f'注意：如果acl为空或不存在，{APPLICATION_NAME}将回落到代理所有流量。',
+        'TW': f'注意：如果acl為空或不存在，{APPLICATION_NAME}將回落到代理所有流量。',
+    },
+    f'Note: "Custom" will use acl and mmdb defined in current user configuration.': {
+        'ES': f'NOTA: "Personalizado" utilizará la acl y mmdb definidas en la configuración de usuario actual',
+        'ZH': f'注意："自定义"将使用当前用户配置中定义的acl和mmdb。',
+        'TW': f'注意："自定義"將使用當前用戶配置中定義的acl和mmdb。',
+    },
     # Asset Viewer
     'Asset File': {
         'ES': 'Activos',

{Furious-GUI-0.2.0 → Furious-GUI-0.2.2}/Furious/Utility/Utility.py

@@ -156,6 +156,25 @@ class SupportConnectedCallback:
             ob.disconnectedCallback()
 
 
+class NeedSyncSettings:
+    Object = list()
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        NeedSyncSettings.Object.append(self)
+
+    def syncSettings(self):
+        raise NotImplementedError
+
+    @staticmethod
+    def syncAll():
+        for ob in NeedSyncSettings.Object:
+            assert isinstance(ob, NeedSyncSettings)
+
+            ob.syncSettings()
+
+
 class SupportThemeChangedCallback:
     Object = list()
 

Furious-GUI-0.2.2/Furious/Version.py

@@ -0,0 +1 @@
+__version__ = '0.2.2'

{Furious-GUI-0.2.0 → Furious-GUI-0.2.2}/Furious/Widget/Application.py

@@ -12,7 +12,7 @@ from Furious.Utility.Constants import (
     SYSTEM_LANGUAGE,
     DATA_DIR,
 )
-from Furious.Utility.Utility import SupportThemeChangedCallback
+from Furious.Utility.Utility import SupportThemeChangedCallback, NeedSyncSettings
 from Furious.Utility.Proxy import Proxy
 from Furious.Utility.Settings import Settings
 from Furious.Utility.Translator import gettext as _
@@ -265,14 +265,7 @@ class Application(SingletonApplication):
         # if self.tray is not None:
         #     self.tray.ConnectAction.stopCore()
 
-        if self.MainWidget is not None:
-            self.MainWidget.syncSettings()
-
-        if self.editRoutingWidget is not None:
-            self.editRoutingWidget.syncSettings()
-
-        if self.logViewerWidget is not None:
-            self.logViewerWidget.syncSettings()
+        NeedSyncSettings.syncAll()
 
     def exit(self, exitcode=0):
         if self.MainWidget is not None:

{Furious-GUI-0.2.0 → Furious-GUI-0.2.2}/Furious/Widget/AssetViewer.py

@@ -1,5 +1,5 @@
 from Furious.Gui.Action import Action, Seperator
-from Furious.Widget.Widget import ListWidget, Menu, MessageBox
+from Furious.Widget.Widget import ListWidget, MainWindow, Menu, MessageBox
 from Furious.Utility.Constants import APPLICATION_NAME, PLATFORM, GOLDEN_RATIO, ROOT_DIR
 from Furious.Utility.Utility import (
     StateContext,
@@ -14,7 +14,7 @@ from Furious.Utility.Translator import Translatable, gettext as _
 
 from PySide6 import QtCore
 from PySide6.QtGui import QFont
-from PySide6.QtWidgets import QFileDialog, QListWidget, QListWidgetItem, QMainWindow
+from PySide6.QtWidgets import QFileDialog, QListWidget, QListWidgetItem
 
 import os
 import shutil
@@ -136,9 +136,7 @@ class ExitAction(Action):
         self.parent().hide()
 
 
-class AssetViewerWidget(
-    Translatable, SupportConnectedCallback, SupportThemeChangedCallback, QMainWindow
-):
+class AssetViewerWidget(SupportThemeChangedCallback, MainWindow):
     AssetDir = ROOT_DIR / APPLICATION_NAME / 'Data' / 'xray'
 
     def __init__(self, *args, **kwargs):
@@ -251,17 +249,6 @@ class AssetViewerWidget(
         else:
             self.flushItemByTheme(darkdetect.theme())
 
-    def closeEvent(self, event):
-        event.ignore()
-
-        self.hide()
-
-    def connectedCallback(self):
-        self.setWindowIcon(bootstrapIcon('rocket-takeoff-connected-dark.svg'))
-
-    def disconnectedCallback(self):
-        self.setWindowIcon(bootstrapIcon('rocket-takeoff-window.svg'))
-
     def themeChangedCallback(self, theme):
         if PLATFORM == 'Linux' and getUbuntuRelease() == '20.04':
             # Ubuntu 20.04 system dark theme does not
@@ -269,7 +256,3 @@ class AssetViewerWidget(
             pass
         else:
             self.flushItemByTheme(theme)
-
-    def retranslate(self):
-        with StateContext(self):
-            self.setWindowTitle(_(self.windowTitle()))

{Furious-GUI-0.2.0 → Furious-GUI-0.2.2}/Furious/Widget/ConnectingProgressBar.py

@@ -1,4 +1,4 @@
-from Furious.Utility.Constants import APPLICATION_NAME, GOLDEN_RATIO
+from Furious.Utility.Constants import APPLICATION_NAME, GOLDEN_RATIO, Color
 from Furious.Utility.Utility import (
     bootstrapIcon,
     StateContext,
@@ -31,18 +31,7 @@ class ConnectingProgressBar(Translatable, SupportConnectedCallback, QWidget):
         # Create a progress bar widget
         self.progressBar = QProgressBar(self)
         self.progressBar.setRange(0, 100)
-        self.progressBar.setStyleSheet(
-            f'QProgressBar {{'
-            f'    border-radius: 2px;'
-            f'    text-align: center;'
-            f'}}'
-            f''
-            f'QProgressBar::chunk {{'
-            f'    background-color: #43ACED;'
-            f'      width: 10px;'
-            f'      margin: 0.5px;'
-            f'}}'
-        )
+        self.progressBar.setStyleSheet(self.getStyleSheet(Color.LIGHT_BLUE))
 
         # create a timer to update the progress bar
         self.timer = QtCore.QTimer(self)
@@ -53,42 +42,33 @@ class ConnectingProgressBar(Translatable, SupportConnectedCallback, QWidget):
 
         self.setLayout(self.layout)
 
-    def closeEvent(self, event):
-        event.ignore()
-
-        self.hide()
-
-    def connectedCallback(self):
-        self.setWindowIcon(bootstrapIcon('rocket-takeoff-connected-dark.svg'))
-
-        self.progressBar.setStyleSheet(
+    @staticmethod
+    def getStyleSheet(color):
+        return (
             f'QProgressBar {{'
             f'    border-radius: 2px;'
             f'    text-align: center;'
             f'}}'
             f''
             f'QProgressBar::chunk {{'
-            f'    background-color: #EB212E;'
-            f'      width: 10px;'
-            f'      margin: 0.5px;'
+            f'    background-color: {color};'
+            f'    width: 10px;'
+            f'    margin: 0.5px;'
             f'}}'
         )
 
+    def closeEvent(self, event):
+        event.ignore()
+
+        self.hide()
+
+    def connectedCallback(self):
+        self.setWindowIcon(bootstrapIcon('rocket-takeoff-connected-dark.svg'))
+        self.progressBar.setStyleSheet(self.getStyleSheet(Color.LIGHT_RED_))
+
     def disconnectedCallback(self):
         self.setWindowIcon(bootstrapIcon('rocket-takeoff-window.svg'))
-
-        self.progressBar.setStyleSheet(
-            f'QProgressBar {{'
-            f'    border-radius: 2px;'
-            f'    text-align: center;'
-            f'}}'
-            f''
-            f'QProgressBar::chunk {{'
-            f'    background-color: #43ACED;'
-            f'      width: 10px;'
-            f'      margin: 0.5px;'
-            f'}}'
-        )
+        self.progressBar.setStyleSheet(self.getStyleSheet(Color.LIGHT_BLUE))
 
     def retranslate(self):
         with StateContext(self):

{Furious-GUI-0.2.0 → Furious-GUI-0.2.2}/Furious/Widget/EditConfiguration.py

@@ -5,6 +5,7 @@ from Furious.Core.Configuration import Configuration
 from Furious.Gui.Action import Action, Seperator
 from Furious.Widget.Widget import (
     HeaderView,
+    MainWindow,
     Menu,
     MessageBox,
     PushButton,
@@ -23,6 +24,7 @@ from Furious.Utility.Constants import (
     APPLICATION_REPO_NAME,
     PLATFORM,
     GOLDEN_RATIO,
+    Color,
 )
 from Furious.Utility.Utility import (
     Base64Encoder,
@@ -47,10 +49,8 @@ from PySide6.QtWidgets import (
     QHBoxLayout,
     QHeaderView,
     QLabel,
-    QLineEdit,
     QListWidget,
     QListWidgetItem,
-    QMainWindow,
     QPlainTextEdit,
     QSplitter,
     QStyledItemDelegate,
@@ -1089,7 +1089,7 @@ class NormalServerWidget(Translatable, SupportConnectedCallback, TableWidget):
         self.setVerticalHeader(NormalServerVerticalHeader(self))
 
         # Selection
-        self.setSelectionColor('#008AE1')
+        self.setSelectionColor(Color.LIGHT_BLUE)
         self.setSelectionBehavior(QTableWidget.SelectionBehavior.SelectRows)
         self.setSelectionMode(QTableWidget.SelectionMode.ExtendedSelection)
 
@@ -1592,12 +1592,12 @@ class NormalServerWidget(Translatable, SupportConnectedCallback, TableWidget):
             super().keyPressEvent(event)
 
     def connectedCallback(self):
-        self.setSelectionColor('#EB212E')
+        self.setSelectionColor(Color.LIGHT_RED_)
         # Reactivate with possible color
         self.activateItemByIndex(self.activatedItemIndex)
 
     def disconnectedCallback(self):
-        self.setSelectionColor('#008AE1')
+        self.setSelectionColor(Color.LIGHT_BLUE)
         # Reactivate with possible color
         self.activateItemByIndex(self.activatedItemIndex)
 
@@ -1607,7 +1607,7 @@ class NormalServerWidget(Translatable, SupportConnectedCallback, TableWidget):
         )
 
 
-class EditConfigurationWidget(Translatable, SupportConnectedCallback, QMainWindow):
+class EditConfigurationWidget(MainWindow):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -1975,12 +1975,6 @@ class EditConfigurationWidget(Translatable, SupportConnectedCallback, QMainWindo
         )
         APP().EditorWidgetPointSize = str(self.plainTextEdit.font().pointSize())
 
-    def connectedCallback(self):
-        self.setWindowIcon(bootstrapIcon('rocket-takeoff-connected-dark.svg'))
-
-    def disconnectedCallback(self):
-        self.setWindowIcon(bootstrapIcon('rocket-takeoff-window.svg'))
-
     def retranslate(self):
         with StateContext(self):
             if self.modified: