RinUI 0.0.10__tar.gz → 0.0.11__tar.gz

{rinui-0.0.10/RinUI.egg-info → rinui-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RinUI
-Version: 0.0.10
+Version: 0.0.11
 Summary: A Fluent Design-like UI library for Qt Quick (QML) based on PySide6
 Author-email: RinLit <lintu233_qwq@icloud.com>
 Classifier: Programming Language :: Python :: 3
@@ -35,7 +35,8 @@ With simple configuration, you can quickly develop elegant UI interfaces in the
 * Elegant Fluent Design controls (WIP)
 * Dark and light mode, automatic switching
 * Compatible with original QML control names
-* Multi-language support (WIP)
+* i18n Internationalization
+* Multi-programming language support (WIP)
 * Theme system (WIP)
 * Development documentation, [preview](https://ui.rinlit.cn/) now. (WIP)
 

{rinui-0.0.10 → rinui-0.0.11}/README.md

@@ -20,7 +20,8 @@ With simple configuration, you can quickly develop elegant UI interfaces in the
 * Elegant Fluent Design controls (WIP)
 * Dark and light mode, automatic switching
 * Compatible with original QML control names
-* Multi-language support (WIP)
+* i18n Internationalization
+* Multi-programming language support (WIP)
 * Theme system (WIP)
 * Development documentation, [preview](https://ui.rinlit.cn/) now. (WIP)
 

{rinui-0.0.10 → rinui-0.0.11}/RinUI/__init__.py

@@ -1,4 +1,4 @@
 from .core import *
 
-__version__ = "0.0.10"
+__version__ = "0.0.11"
 __author__ = "RinLit"

{rinui-0.0.10 → rinui-0.0.11}/RinUI/components/ContextMenu.qml

@@ -101,9 +101,9 @@ Popup {
             }
 
             onClicked: {
+                contextMenu.close()
                 listView.currentIndex = index
                 contextMenu.itemSelected(index)
-                contextMenu.close()
             }
         }
     }

rinui-0.0.11/RinUI/components/MenusAndToolbars/TextInputMenu.qml

@@ -0,0 +1,38 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import "../../themes"
+import "../../components"
+
+
+// Menu
+Menu {
+    id: contextMenu
+    position: -1
+    Action {
+        icon.name: "ic_fluent_cut_20_regular"
+        text: qsTr("Cut")
+        enabled: root.selectedText.length > 0 && root.editable  // 选中&可编辑
+        shortcut: "Ctrl+X"
+        onTriggered: root.cut()
+    }
+    Action {
+        icon.name: "ic_fluent_copy_20_regular"
+        text: qsTr("Copy")
+        enabled: root.selectedText.length > 0  // 选中内容
+        shortcut: "Ctrl+C"
+        onTriggered: root.copy()
+    }
+    Action {
+        icon.name: "ic_fluent_clipboard_paste_20_regular"
+        text: qsTr("Paste")
+        enabled: root.editable
+        shortcut: "Ctrl+V"
+        onTriggered: root.paste()
+    }
+    Action {
+        icon.name: " "
+        text: qsTr("Select All")
+        shortcut: "Ctrl+A"
+        onTriggered: root.selectAll()
+    }
+}

{rinui-0.0.10 → rinui-0.0.11}/RinUI/components/StatusAndInfo/InfoBar.qml

@@ -104,6 +104,7 @@ Frame {
         }
 
         Flow {
+            id: flow
             Layout.alignment: Qt.AlignTop
             Layout.fillWidth: true
             Layout.topMargin: 3
@@ -121,7 +122,6 @@ Frame {
                 property bool wrap: (
                     (
                         infoBar.width - iconWidget.width - rights.width - main.spacing * 2 - infoBar.padding * 2
-                        - (titleText.width + custom.width + 24)
                     )
                     < implicitWidth
                 )

{rinui-0.0.10 → rinui-0.0.11}/RinUI/components/Text/TextArea.qml

@@ -15,36 +15,8 @@ TextArea {
     enabled: editable
 
     // Menu
-    Menu {
+    TextInputMenu {
         id: contextMenu
-        position: -1
-        Action {
-            icon.name: "ic_fluent_cut_20_regular"
-            text: qsTr("Cut")
-            enabled: root.selectedText.length > 0 && root.editable  // 选中&可编辑
-            shortcut: "Ctrl+X"
-            onTriggered: root.cut()
-        }
-        Action {
-            icon.name: "ic_fluent_copy_20_regular"
-            text: qsTr("Copy")
-            enabled: root.selectedText.length > 0  // 选中内容
-            shortcut: "Ctrl+C"
-            onTriggered: root.copy()
-        }
-        Action {
-            icon.name: "ic_fluent_clipboard_paste_20_regular"
-            text: qsTr("Paste")
-            enabled: root.editable
-            shortcut: "Ctrl+V"
-            onTriggered: root.paste()
-        }
-        Action {
-            icon.name: " "
-            text: qsTr("Select All")
-            shortcut: "Ctrl+A"
-            onTriggered: root.selectAll()
-        }
     }
 
     MouseArea {

{rinui-0.0.10 → rinui-0.0.11}/RinUI/components/Text/TextField.qml

@@ -15,36 +15,8 @@ TextField {
     enabled: editable
 
     // Menu
-    Menu {
+    TextInputMenu {
         id: contextMenu
-        position: -1
-        Action {
-            icon.name: "ic_fluent_cut_20_regular"
-            text: qsTr("Cut")
-            enabled: root.selectedText.length > 0 && root.editable  // 选中&可编辑
-            shortcut: "Ctrl+X"
-            onTriggered: root.cut()
-        }
-        Action {
-            icon.name: "ic_fluent_copy_20_regular"
-            text: qsTr("Copy")
-            enabled: root.selectedText.length > 0  // 选中内容
-            shortcut: "Ctrl+C"
-            onTriggered: root.copy()
-        }
-        Action {
-            icon.name: "ic_fluent_clipboard_paste_20_regular"
-            text: qsTr("Paste")
-            enabled: root.editable
-            shortcut: "Ctrl+V"
-            onTriggered: root.paste()
-        }
-        Action {
-            icon.name: " "
-            text: qsTr("Select All")
-            shortcut: "Ctrl+A"
-            onTriggered: root.selectAll()
-        }
     }
 
     MouseArea {

{rinui-0.0.10 → rinui-0.0.11}/RinUI/components/Text/TextInput.qml

@@ -13,6 +13,25 @@ TextInput {
     color: Theme.currentTheme.colors.textColor
     selectionColor: Theme.currentTheme.colors.primaryColor
 
+    // Menu
+    TextInputMenu {
+        id: contextMenu
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.RightButton
+        propagateComposedEvents: true
+        onPressed: (mouse) => {
+            if (mouse.button === Qt.RightButton)
+                contextMenu.popup(mouse.scenePosition)
+            mouse.accepted = false
+        }
+
+        // 鼠标
+        cursorShape: Qt.IBeamCursor
+    }
+
     font.pixelSize: {
         switch (typography) {
             case Typography.Display: return Theme.currentTheme.typography.displaySize;

{rinui-0.0.10 → rinui-0.0.11}/RinUI/components/qmldir

@@ -47,6 +47,7 @@ Text 1.0 Text/Text.qml
 
 # Menus & Toolbars
 Menu 1.0 MenusAndToolbars/Menu.qml
+TextInputMenu 1.0 MenusAndToolbars/TextInputMenu.qml
 MenuItem 1.0 MenusAndToolbars/MenuItem.qml
 MenuItemGroup 1.0 MenusAndToolbars/MenuItemGroup.qml
 MenuSeparator 1.0 MenusAndToolbars/MenuSeparator.qml

rinui-0.0.11/RinUI/core/__init__.py

@@ -0,0 +1,4 @@
+from .theme import ThemeManager
+from .launcher import RinUIWindow
+from .config import DEFAULT_CONFIG, RinConfig, PATH, Theme, BackdropEffect, ConfigManager
+from .translator import RinUITranslator

{rinui-0.0.10 → rinui-0.0.11}/RinUI/core/config.py

@@ -2,6 +2,7 @@ import os
 import json
 import platform
 import sys
+from PySide6.QtCore import QLocale
 from enum import Enum
 
 
@@ -36,7 +37,6 @@ BASE_DIR = os.path.abspath(os.getcwd())
 PATH = os.path.join(BASE_DIR, "RinUI/config")
 RINUI_PATH = resource_path(os.path.join(rinui_core_path, "../../"))  # 使用 resource_path 处理路径
 DEFAULT_CONFIG = {
-    "language": "zh_CN",
     "theme": {
         "current_theme": "Auto",
     },
@@ -62,8 +62,13 @@ class BackdropEffect(Enum):
     Tabbed = "tabbed"
 
 
-class ConfigCenter:
+class ConfigManager:
     def __init__(self, path, filename):
+        """
+        Json Config Manager
+        :param path: json config file path
+        :param filename: json config file name (eg: rin_ui.json)
+        """
         self.path = path
         self.filename = filename
         self.config = {}
@@ -118,3 +123,7 @@ class ConfigCenter:
 
     def __repr__(self):
         return json.dumps(self.config, ensure_ascii=False, indent=4)
+
+
+RinConfig = ConfigManager(path=PATH, filename='rin_ui.json')
+RinConfig.load_config(DEFAULT_CONFIG)  # 加载配置

{rinui-0.0.10 → rinui-0.0.11}/RinUI/core/launcher.py

@@ -1,33 +1,20 @@
 import os
 import sys
 
-from PySide6.QtCore import QCoreApplication, QUrl
+from PySide6.QtCore import QCoreApplication, QUrl, QObject
 from PySide6.QtGui import QIcon
-from PySide6.QtWidgets import QApplication, QWidget, QPushButton, QVBoxLayout
+from PySide6.QtWidgets import QApplication
 from PySide6.QtQml import QQmlApplicationEngine
-from .theme import ThemeManager
-from .config import BackdropEffect, is_windows, Theme, RINUI_PATH
-
 
-class TestWindow(QWidget):
-    def __init__(self, theme_manager):
-        super().__init__()
-        layout = QVBoxLayout()
-        self.setLayout(layout)
-        self.setWindowTitle("Test Window")
-        btn = QPushButton(theme_manager.current_theme)
-        btn.clicked.connect(
-            lambda: theme_manager.toggle_theme("Light" if theme_manager.current_theme == "Dark" else "Dark")
-        )
-        self.layout().addWidget(btn)
-        self.resize(400, 300)
+from .theme import ThemeManager
+from .config import BackdropEffect, is_windows, Theme, RINUI_PATH, RinConfig
 
 
 class RinUIWindow:
     def __init__(self, qml_path: str):
         """
-        创建基于 RinUI 的 QML 应用程序。
-        :param qml_path: str, QML 文件路径
+        Create an application window with RinUI.
+        :param qml_path: str, QML file path (eg = "path/to/main.qml")
         """
         super().__init__()
         if hasattr(self, "_initialized") and self._initialized:
@@ -35,29 +22,29 @@ class RinUIWindow:
         self._initialized = True
         print("✨ RinUIWindow Initializing")
 
+        # 退出清理
+        app_instance = QCoreApplication.instance()
+        if not app_instance:
+            raise RuntimeError("QApplication must be created before RinUIWindow.")
+
         self.engine = QQmlApplicationEngine()
         self.theme_manager = ThemeManager()
         self.qml_path = qml_path
         self.autoSetWindowsEffect = True
 
+        app_instance.aboutToQuit.connect(self.theme_manager.clean_up)
         self._setup_application()
         self.print_startup_info()
 
-        # 退出清理
-        app_instance = QCoreApplication.instance()
-        if app_instance:
-            app_instance.aboutToQuit.connect(self.theme_manager.clean_up)
-
-    def _setup_application(self):
+    def _setup_application(self) -> None:
         """Setup"""
         # RInUI 模块
-        rinui_import_path = RINUI_PATH
-        print(f"UI Module Path: {rinui_import_path}")
+        print(f"UI Module Path: {RINUI_PATH}")
 
-        if os.path.exists(rinui_import_path):
-            self.engine.addImportPath(rinui_import_path)
+        if os.path.exists(RINUI_PATH):
+            self.engine.addImportPath(RINUI_PATH)
         else:
-            raise FileNotFoundError(f"Cannot find RinUI module: {rinui_import_path}")
+            raise FileNotFoundError(f"Cannot find RinUI module: {RINUI_PATH}")
 
         # 主题管理器
         self.engine.rootContext().setContextProperty("ThemeManager", self.theme_manager)
@@ -77,8 +64,8 @@ class RinUIWindow:
 
     def setIcon(self, path: str) -> None:
         """
-        设置应用程序图标。
-        :param path: str, 图标路径
+        Sets the icon for the application.
+        :param path: str, icon file path (eg = "path/to/icon.png")
         :return:
         """
         app_instance = QApplication.instance()
@@ -88,7 +75,7 @@ class RinUIWindow:
         else:
             raise RuntimeError("Cannot set icon before QApplication is created.")
 
-    def _apply_windows_effects(self):
+    def _apply_windows_effects(self) -> None:
         """
         Apply Windows effects to the window.
         :return:
@@ -98,7 +85,7 @@ class RinUIWindow:
             self.theme_manager.apply_window_effects()
 
     # func名称遵循 Qt 命名规范
-    def setBackdropEffect(self, effect: BackdropEffect):
+    def setBackdropEffect(self, effect: BackdropEffect) -> None:
         """
         Sets the backdrop effect for the window. (Only available on Windows)
         :param effect: BackdropEffect, type of backdrop effect（Acrylic, Mica, Tabbed, None_）
@@ -108,7 +95,7 @@ class RinUIWindow:
             raise OSError("Only can set backdrop effect on Windows platform.")
         self.theme_manager.apply_backdrop_effect(effect.value)
 
-    def setTheme(self, theme: Theme):
+    def setTheme(self, theme: Theme) -> None:
         """
         Sets the theme for the window.
         :param theme: Theme, type of theme（Auto, Dark, Light）
@@ -116,7 +103,7 @@ class RinUIWindow:
         """
         self.theme_manager.toggle_theme(theme.value)
 
-    def __getattr__(self, name):
+    def __getattr__(self, name) -> QObject:
         """获取 QML 窗口属性"""
         try:
             root = object.__getattribute__(self, "root_window")
@@ -124,7 +111,7 @@ class RinUIWindow:
         except AttributeError:
             raise AttributeError(f"\"RinUIWindow\" object has no attribute '{name}'")
 
-    def print_startup_info(self):
+    def print_startup_info(self) -> None:
         border = "=" * 40
         print(f"\n{border}")
         print("✨ RinUIWindow Loaded Successfully!")

{rinui-0.0.10 → rinui-0.0.11}/RinUI/core/theme.py

@@ -4,7 +4,7 @@ import time
 
 from PySide6.QtCore import QObject, Signal, Slot, QThread
 
-from .config import DEFAULT_CONFIG, ConfigCenter, PATH, is_win10, is_windows, is_win11, BackdropEffect
+from .config import DEFAULT_CONFIG, RinConfig, is_win10, is_windows, is_win11, BackdropEffect
 import sys
 import darkdetect
 
@@ -99,7 +99,7 @@ class ThemeManager(QObject):
         清理资源并停止主题监听。
         """
         if self.listener:
-            self.config.save_config()
+            RinConfig.save_config()
             print("Save config.")
             self.listener.stop()
             self.listener.wait()  # 等待线程结束
@@ -129,11 +129,8 @@ class ThemeManager(QObject):
         self.current_theme = DEFAULT_CONFIG["theme"]["current_theme"]  # 当前主题
         self.is_darkdetect_supported = check_darkdetect_support()
 
-        self.config = ConfigCenter(PATH, "rin_ui.json")  # 配置中心
-        self.config.load_config(DEFAULT_CONFIG)  # 加载配置
-
         try:
-            self.current_theme = self.config["theme"]["current_theme"]
+            self.current_theme = RinConfig["theme"]["current_theme"]
         except Exception as e:
             print(f"Failed to load config because of {e}, using default config")
 
@@ -154,7 +151,7 @@ class ThemeManager(QObject):
         self.windows.append(hwnd)
         print(f"Window handle set: {hwnd}")
 
-    def _handle_system_theme(self, system_theme):
+    def _handle_system_theme(self):
         if self.current_theme == "Auto":
             self._update_window_theme()
             self.themeChanged.emit(self._actual_theme())
@@ -190,7 +187,7 @@ class ThemeManager(QObject):
             elif is_win10() and effect_type == BackdropEffect.Acrylic.value:
                 self._apply_win10_effect(effect_type, hwnd)
 
-        self.config["backdrop_effect"] = effect_type
+        RinConfig["backdrop_effect"] = effect_type
         print(
             f"Applied \"{effect_type.strip().capitalize()}\" effect with "
             f"{platform.system() + '11' if is_win11() else '10'}"
@@ -202,7 +199,7 @@ class ThemeManager(QObject):
         应用 Windows 10 背景效果
         :param effect_type: str, 背景效果类型（acrylic, tabbed(actually blur)
         """
-        backdrop_color = self.config["win10_feat"]["backdrop_dark" if self.is_dark_theme() else "backdrop_light"]
+        backdrop_color = RinConfig["win10_feat"]["backdrop_dark" if self.is_dark_theme() else "backdrop_light"]
 
         accent = ACCENT_POLICY()
         accent.AccentState = ACCENT_STATES[effect_type]
@@ -257,8 +254,8 @@ class ThemeManager(QObject):
                     ctypes.byref(ctypes.c_int(self.theme_dict[actual_theme])),
                     ctypes.sizeof(ctypes.c_int)
                 )
-            elif is_win10() and self.config["backdrop_effect"] == BackdropEffect.Acrylic.value:
-                self._apply_win10_effect(self.config["backdrop_effect"], hwnd)
+            elif is_win10() and RinConfig["backdrop_effect"] == BackdropEffect.Acrylic.value:
+                self._apply_win10_effect(RinConfig["backdrop_effect"], hwnd)
             else:
                 print(f"Cannot apply backdrop on {platform.system()}")
 
@@ -281,7 +278,7 @@ class ThemeManager(QObject):
         if self.current_theme != theme:
             print(f"Switching to '{theme}' theme")
             self.current_theme = theme
-            self.config["theme"]["current_theme"] = theme
+            RinConfig["theme"]["current_theme"] = theme
             self._update_window_theme()
             self.themeChanged.emit(self._actual_theme())
 
@@ -301,18 +298,18 @@ class ThemeManager(QObject):
     @Slot(result=str)
     def get_backdrop_effect(self):
         """获取当前背景效果"""
-        return self.config["backdrop_effect"]
+        return RinConfig["backdrop_effect"]
+
+    @Slot(str)
+    def set_theme_color(self, color):
+        """设置当前主题颜色"""
+        RinConfig["theme_color"] = color
+        RinConfig.save_config()
 
     @Slot(result=str)
     def get_theme_color(self):
         """获取当前主题颜色"""
-        return self.config["theme_color"]
-
-    @Slot(result=str)
-    def set_theme_color(self, color):
-        """设置当前主题颜色"""
-        self.config["theme_color"] = color
-        self.config.save_config()
+        return RinConfig["theme_color"]
 
     @Slot(QObject, result=int)
     def getWindowId(self, window):

rinui-0.0.11/RinUI/core/translator.py

@@ -0,0 +1,25 @@
+from PySide6.QtCore import QTranslator, QLocale
+from .config import RINUI_PATH
+import os
+
+
+class RinUITranslator(QTranslator):
+    """
+    RinUI i18n translator.
+    :param locale: QLocale, optional, default is system locale
+    """
+    def __init__(self, locale: QLocale = QLocale.system().name(), parent=None):  # follow system
+        super().__init__(parent)
+        self.load(locale or QLocale())
+
+    def load(self, locale: QLocale) -> bool:
+        """
+        Load translation file for the given locale.
+        :param locale: QLocale, the locale to load (eg = QLocale(QLocale.Chinese, QLocale.China), QLocale("zh_CN"))
+        :return: bool
+        """
+        print(f"🌏 Current locale: {locale.name()}")
+        path = os.path.join(RINUI_PATH, "RinUI", "languages", f"{locale.name()}.qm")
+        if not os.path.exists(path):
+            raise FileNotFoundError(f"Cannot find translation file: {path}")
+        return super().load(path)

rinui-0.0.11/RinUI/languages/en_US.qm

@@ -0,0 +1 @@
+<�d��!�`���