RinUI 0.1.3.2__py3-none-any.whl → 0.1.4.1__py3-none-any.whl

RinUI/__init__.py

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

RinUI/components/StatusAndInfo/BusyIndicator.qml

@@ -0,0 +1,11 @@
+import QtQuick 2.15
+import QtQuick.Controls.Basic 2.15
+import QtQuick.Layouts 2.15
+import "../../themes"
+import "../../components"
+
+ProgressRing {
+    property bool running: true  // 兼容BusyIndicator
+    state: ProgressRing.Running
+    indeterminate: running
+}

RinUI/components/StatusAndInfo/ProgressBar.qml

@@ -54,7 +54,7 @@ ProgressBar {
         radius: root.radius
         color: root.state === 1 ? Theme.currentTheme.colors.systemCautionColor :
             root.state === 2 ? Theme.currentTheme.colors.systemCriticalColor :
-            Theme.currentTheme.colors.primaryColor
+            primaryColor
 
         width: indeterminate ? state === 0 ? root.width / 3 : parent.width : root.visualPosition * parent.width
         x: indeterminate ? -indicator.width : 0

RinUI/components/StatusAndInfo/ProgressRing.qml

@@ -1,7 +1,7 @@
     import QtQuick 2.15
     import QtQuick.Controls 2.15
     import QtQuick.Controls.Basic 2.15 as QQC
-    import Qt5Compat.GraphicalEffects 1.0
+    import Qt5Compat.GraphicalEffects
     import "../../themes"
     import "../../components"
 

RinUI/components/qmldir

@@ -41,6 +41,7 @@ Expander 1.0 Layout/Expander.qml
 # Status & Info
 InfoBar 1.0 StatusAndInfo/InfoBar.qml
 ProgressBar 1.0 StatusAndInfo/ProgressBar.qml
+ProgressRing 1.0 StatusAndInfo/ProgressRing.qml
 ToolTip 1.0 StatusAndInfo/ToolTip.qml
 
 # Text

RinUI/core/__init__.py

@@ -1,5 +1,8 @@
 from .theme import ThemeManager
 from .launcher import RinUIWindow
-from .config import DEFAULT_CONFIG, RinConfig, PATH, Theme, BackdropEffect, ConfigManager
+from .config import DEFAULT_CONFIG, RinConfig, PATH, Theme, BackdropEffect, ConfigManager, is_windows
 from .translator import RinUITranslator
-from .window import WinEventFilter, WinEventManager
+
+
+if is_windows():
+    from .window import WinEventFilter, WinEventManager

RinUI/core/config.py

@@ -1,9 +1,9 @@
-import os
 import json
 import platform
 import sys
-from PySide6.QtCore import QLocale
 from enum import Enum
+from pathlib import Path
+import os
 
 
 def is_win11():
@@ -27,15 +27,16 @@ def is_windows():
 def resource_path(relative_path):
     """兼容 PyInstaller 打包和开发环境的路径"""
     if hasattr(sys, '_MEIPASS'):
-        return os.path.join(sys._MEIPASS, relative_path)
-    return os.path.abspath(relative_path)
+        return Path(sys._MEIPASS) / relative_path
+    return Path(relative_path).resolve()
+
 
+rinui_core_path = Path(__file__).resolve().parent  # RinUI/core 目录
 
-rinui_core_path = os.path.abspath(os.path.dirname(__file__))  # RinUI/core 目录
+BASE_DIR = Path.cwd().resolve()
+PATH = BASE_DIR / "RinUI" / "config"
+RINUI_PATH = resource_path(rinui_core_path.parent.parent)  # 使用 resource_path 处理路径，等同 ../../
 
-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 = {
     "theme": {
         "current_theme": "Auto",

RinUI/core/launcher.py

@@ -9,8 +9,7 @@ from PySide6.QtQml import QQmlApplicationEngine
 from pathlib import Path
 
 from .theme import ThemeManager
-from .window import WinEventFilter, WinEventManager
-from .config import BackdropEffect, is_windows, Theme, RINUI_PATH, RinConfig
+from .config import BackdropEffect, is_windows, Theme, RINUI_PATH
 
 
 class RinUIWindow:
@@ -28,7 +27,7 @@ class RinUIWindow:
         self.engine = QQmlApplicationEngine()
         self.theme_manager = ThemeManager()
         self.win_event_filter = None
-        self.win_event_manager = WinEventManager()
+        self.win_event_manager = None
         self.qml_path = qml_path
         self._initialized = True
 
@@ -78,19 +77,32 @@ class RinUIWindow:
         self.theme_manager.set_window(self.root_window)
 
         # 窗口句柄管理
+        self._window_handle_setup()
+
+        self._print_startup_info()
+
+    def _window_handle_setup(self) -> None:
+        """
+        set up the window handle. (Only available on Windows platform)
+        :return:
+        """
+        if not is_windows():
+            return
+
+        from .window import WinEventFilter, WinEventManager
+
         self.win_event_filter = WinEventFilter(self.root_window)
+        self.win_event_manager = WinEventManager()
 
         app_instance = QApplication.instance()
         app_instance.installNativeEventFilter(self.win_event_filter)
         self.engine.rootContext().setContextProperty("WinEventManager", self.win_event_manager)
         self._apply_windows_effects()
 
-        self._print_startup_info()
-
-    def setIcon(self, path: str) -> None:
+    def setIcon(self, path: Union[str, Path] = None) -> None:
         """
         Sets the icon for the application.
-        :param path: str, icon file path (eg = "path/to/icon.png")
+        :param path: str or Path, icon file path (eg = "path/to/icon.png")
         :return:
         """
         app_instance = QApplication.instance()
@@ -105,7 +117,7 @@ class RinUIWindow:
         Apply Windows effects to the window.
         :return:
         """
-        if sys.platform == "win32":
+        if is_windows():
             self.theme_manager.apply_backdrop_effect(self.theme_manager.get_backdrop_effect())
             self.theme_manager.apply_window_effects()
 

RinUI/qmldir

@@ -29,6 +29,7 @@ PickerView 1.0 components/DateAndTime/PickerView.qml
 
 # Dialogs & Flyouts
 Dialog 1.0 components/DialogsAndFlyouts/Dialog.qml
+DialogButtonBox 1.0 components/DialogsAndFlyouts/DialogButtonBox.qml
 Flyout 1.0 components/DialogsAndFlyouts/Flyout.qml
 Popup 1.0 components/DialogsAndFlyouts/Popup.qml
 TeachingTip 1.0 components/DialogsAndFlyouts/TeachingTip.qml
@@ -53,6 +54,7 @@ InfoBar 1.0 components/StatusAndInfo/InfoBar.qml
 ProgressBar 1.0 components/StatusAndInfo/ProgressBar.qml
 ProgressRing 1.0 components/StatusAndInfo/ProgressRing.qml
 ToolTip 1.0 components/StatusAndInfo/ToolTip.qml
+BusyIndicator 1.0 components/StatusAndInfo/BusyIndicator.qml
 
 # ListAndCollections
 Clip 1.0 components/ListAndCollections/Clip.qml

RinUI/windows/TitleBar.qml

@@ -54,8 +54,8 @@ Item {
             onPressed: {
                 clickPos = Qt.point(mouseX, mouseY)
 
-                if (!(Qt.platform.os !== "windows" || Qt.platform.os !== "winrt") && !Theme._isThemeMgrInitialized()) {
-                    return  // 在win环境使用原生方法拖拽
+                if (Qt.platform.os !== "windows" || !WindowManager._isWinMgrInitialized()) {
+                    return
                 }
                 WindowManager.sendDragWindowEvent(window)
             }
@@ -65,7 +65,8 @@ Item {
                     return
                 }
 
-                if ((Qt.platform.os !== "windows" || Qt.platform.os !== "winrt") && Theme._isThemeMgrInitialized()) {
+                if (Qt.platform.os !== "windows" && WindowManager._isWinMgrInitialized()) {
+                    log("Windows only")
                     return  // 在win环境使用原生方法拖拽
                 }
 

RinUI/windows/WindowManager.qml

@@ -8,7 +8,7 @@ Item {
 
     function sendDragWindowEvent(window) {
         if (!_isWinMgrInitialized()) {
-            console.error("ThemeManager is not defined.")
+            console.error("WindowManager is not defined.")
             return -1
         }
         WinEventManager.dragWindowEvent(WinEventManager.getWindowId(window))
@@ -16,14 +16,23 @@ Item {
 
     function maximizeWindow(window) {
         if (!_isWinMgrInitialized()) {
-            console.error("ThemeManager is not defined.")
-            return -1
+            console.warn("WindowManager is not defined.")
         }
-        if ((Qt.platform.os !== "windows" || Qt.platform.os !== "winrt") && _isWinMgrInitialized()) {
+        if (Qt.platform.os === "windows") {
             WinEventManager.maximizeWindow(WinEventManager.getWindowId(window))
             return  // 在win环境使用原生方法拖拽
         }
 
-        window.showMaximized()
+        toggleMaximizeWindow(window)
+    }
+
+    function toggleMaximizeWindow(window) {
+        if (!window) return;
+
+        if (window.visibility === Window.Maximized || window.isMaximized) {
+            window.showNormal();
+        } else {
+            window.showMaximized();
+        }
     }
 }

{rinui-0.1.3.2.dist-info → rinui-0.1.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RinUI
-Version: 0.1.3.2
+Version: 0.1.4.1
 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

{rinui-0.1.3.2.dist-info → rinui-0.1.4.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-RinUI/__init__.py,sha256=XFdGWitmk8854o9fDDbtjxkAyReNgMgl7S3Iue7ssYc,65
-RinUI/qmldir,sha256=fwUoGC3efxNnNJmFU6inBDH6Tx9s3-OI4b3-a-25o0U,3829
+RinUI/__init__.py,sha256=d9IqpbSfnP6x6uXkS5V5liug1uHaNhct-nbJQXNhEAA,67
+RinUI/qmldir,sha256=M0TVfvNm_nrx1s6rxXvUIP-8m3Oc9UhqHDxQfEIdQTA,3959
 RinUI/assets/fonts/FluentSystemIcons-Index.js,sha256=M2fUmCiOI7A1rxLWMFaekrB4KmasTSwbociYOzHJegE,253422
 RinUI/assets/fonts/FluentSystemIcons-Resizable.ttf,sha256=-IfF3NT1eODD0vOLVLC0Z2U5bsR6woSQAziX3qD1TqU,1447252
 RinUI/assets/img/default_app_icon.png,sha256=8O83zl-bghUNsmEx9iCWYiXS8aC_0VGZKqMHdNKjB4A,292885
@@ -11,7 +11,7 @@ RinUI/components/Indicator.qml,sha256=nTF4i3tqLirb-gZlK1BCNzt0pVXgcvDBcJ2O-tOcQ8
 RinUI/components/ScrollBar.qml,sha256=EZt2o_yVi--Q0BPQCqebau9bu7_ogNvqglrRXnB_eW8,6914
 RinUI/components/ScrollView.qml,sha256=nMXwarFEnr8HVxRE1FjwyCuVIm2jvt_ZZBi8LGlkwCI,263
 RinUI/components/Shadow.qml,sha256=8y9iAFr45hqDdXXnsfD49t90HHhiFyMzGUHqJa2tavk,1591
-RinUI/components/qmldir,sha256=KiTLgqw5x2LehrUxVfaFZUkD0Al2n2dPjD30gA_6fWk,2255
+RinUI/components/qmldir,sha256=C97LLzpdSj5ytAp8KBIpYI4nVECTk6yUhC4ayOkX5Ys,2303
 RinUI/components/BasicInput/Button.qml,sha256=78Qi7w7cR7N7nwdc9n1JNQ9F_SBlhF6KdVmdPQyqR2o,5244
 RinUI/components/BasicInput/CheckBox.qml,sha256=SJkmo16EY-5omXBxkS74Pk3UcSE_LODABIjiP086aNM,3085
 RinUI/components/BasicInput/ComboBox.qml,sha256=-ZT3FWGybTX1ltEDhTJuoxiG0gW3OlDcxfPdHnVwqsM,4111
@@ -58,10 +58,11 @@ RinUI/components/Navigation/Segmented.qml,sha256=GnLKbJlNxGsaYnSnNflZ3rB3fe5HsRC
 RinUI/components/Navigation/SegmentedItem.qml,sha256=r2e1PteQJTPiqjpCqtGlSIuzCLG03ov9AcPIfqwRJDg,2894
 RinUI/components/Navigation/SelectorBar.qml,sha256=R0DWhWD75QaRYBYV5TTltJm4Y6KJ1ax29khdtn5GvDI,207
 RinUI/components/Navigation/SelectorBarItem.qml,sha256=ohdqUxczPJw_SNFLYOIu8rIYa3gWDH-PTd5DRQ8jUpU,2104
+RinUI/components/StatusAndInfo/BusyIndicator.qml,sha256=N99PKoAH-mvayLBtKUOjWObOXE7uHrvEY8j0rl1Qx7Q,263
 RinUI/components/StatusAndInfo/InfoBadge.qml,sha256=G_mRlnGVhL-Eyo0LB7PWl-i8C-sUGzzXeKaVkz9Fpa0,2380
 RinUI/components/StatusAndInfo/InfoBar.qml,sha256=M_oG4vNFEdPexCB8lOOwk57HEasyCc07cLNFxJ-HC80,7578
-RinUI/components/StatusAndInfo/ProgressBar.qml,sha256=GgV0rPLB1JCpwuSD2LOj7UX5JKVaCRkEsSC13kYObtY,3389
-RinUI/components/StatusAndInfo/ProgressRing.qml,sha256=-QJYPxCA427kMdHpcno0IUTsjPDKfcwQl7wWQEwoJ98,5092
+RinUI/components/StatusAndInfo/ProgressBar.qml,sha256=4q2LKNHNFYChl81Hwhwm_9GcYcBfefaUXz9rKCSjQ0k,3363
+RinUI/components/StatusAndInfo/ProgressRing.qml,sha256=aeWl1v3hom-iI2MNkO_FfFkJaJy23Lo49oiL6bwclaM,5088
 RinUI/components/StatusAndInfo/Toast.qml,sha256=XWZPgFBJnqoWoS6H9W3ycC9JTU1CTzehqVIm2KXhD6Y,6815
 RinUI/components/StatusAndInfo/ToolTip.qml,sha256=f6S9rG_0GsHQl8BB1m4Niik35s7LngelAasLfFkdR7s,2664
 RinUI/components/Text/SpinBox.qml,sha256=rY17yJ3a0ckkl6pX00qVIQQYLmoO-GLtcSZh-WKtPZs,4616
@@ -69,9 +70,9 @@ RinUI/components/Text/Text.qml,sha256=SWJBJtAWkq9XldrX6_BWfCXGRcLQLBNofkRO5NG8q2
 RinUI/components/Text/TextArea.qml,sha256=guhwcFBSEyZkTRT2V0ER3S03xW9WOkH_4U2Oor2I9PY,3706
 RinUI/components/Text/TextField.qml,sha256=BXuJ16AUQaSh-Og7jaYSNEu9r1PcyG7FQ95DaGciJZs,3556
 RinUI/components/Text/TextInput.qml,sha256=gyTJmrYi5yuc-j5dDRSbu5PCxiuQo2xNBm6jWL9ezYk,1611
-RinUI/core/__init__.py,sha256=bjBBPyYGLXPggeyz-7lN_KgsziFKAlyw0Y_m5S4_lUU,248
-RinUI/core/config.py,sha256=kO0bR1EhZB6Mh0KFa7uyBa0KgYr58DdBsHEP2oSGX7U,3722
-RinUI/core/launcher.py,sha256=kFHlhHPU6hf7F15DDUfZ9_hiacovJLOn-3xKWNj2CfI,5517
+RinUI/core/__init__.py,sha256=xNbsFDXuObMebyn0Xsxieenh0fsAEjULqBd9qd8suTY,283
+RinUI/core/config.py,sha256=h5tbQurVtpnfB10OMTWEZstzsF93zDOPDmbP9NRgvJk,3683
+RinUI/core/launcher.py,sha256=ZWBGQP0DT2oWZXvqRK9cW7eRmImZe8L1B1-0ONgaGnc,5812
 RinUI/core/theme.py,sha256=r47QltFKy_s-B1neVAjYIx_jOxxtsdJEMP-u-YJ8mpA,9832
 RinUI/core/translator.py,sha256=5GK7Iy7-2iMicF8hQr79CwU9UWvCwE-8vGd8QkhJ1h8,1037
 RinUI/core/window.py,sha256=KIu3qpN_RKcMc-8o6qxYAWecDVNBtjxCjqUN04RaI6I,7161
@@ -99,16 +100,16 @@ RinUI/windows/CtrlBtn.qml,sha256=8wQH3PWYmZ_e6A0_CIdmYa7uIrU6O6MZCG_RR4S4fkg,315
 RinUI/windows/FluentPage.qml,sha256=J7mXTOyMahdWA8U13rSjesJVsvxklZFQyqwVMiJarT8,2748
 RinUI/windows/FluentWindow.qml,sha256=CUx9H5crOKtPSCnA6_AUst4PcLEbhSjDRrSuWH8novA,969
 RinUI/windows/FluentWindowBase.qml,sha256=rUUHO1lIjIIvrHjKHwSIEn8WOG2kY45mJQQT_KrGZDM,4335
-RinUI/windows/TitleBar.qml,sha256=zzGfAo2p_SIFXarCuVG_zWhrraRBjIx9MS3cc_wV710,3645
-RinUI/windows/WindowManager.qml,sha256=5XFddF38KP-TWhMVesqzQElr3ySrBWVIVuuiBgqi3A4,857
+RinUI/windows/TitleBar.qml,sha256=QjnSb27Db2e8o2QniuJUMT0QI6awMbavVNex70Wsy2s,3591
+RinUI/windows/WindowManager.qml,sha256=f-Il6FCPf3_o6edj5BbscK2XxQd3mmUVnZPZuOO88kc,1037
 RinUI/windows/qmldir,sha256=oxyWR7Q8dWCrwwCwGNyf3l60qe6s4-beiZWWMAEkKcM,252
 RinUI/windows/window/ApplicationWindow.qml,sha256=qRaM8IY0TJxfq1j1DogTMyrPjyoXkuWVzxtZQLzRtOQ,167
 RinUI/windows/window/Window.qml,sha256=90YjjRoaul9qK4FxNy73zTaPuUmLvk_RjcPlBEa7DNI,3189
-rinui-0.1.3.2.data/data/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
-rinui-0.1.3.2.data/data/README.md,sha256=8ZcR55RYV2slRAQbhoYhqDTPOLXmewkFSvuA_cE6zD0,3044
-rinui-0.1.3.2.dist-info/licenses/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
-rinui-0.1.3.2.dist-info/METADATA,sha256=20k38TI3U59A4FsjqtkJ5IeyX9XQBn3jl33b1UgdPeM,3577
-rinui-0.1.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rinui-0.1.3.2.dist-info/entry_points.txt,sha256=taxuZYCggoQa2LPubwcurQYRjBRC4cNYOjWaqOYZVxw,54
-rinui-0.1.3.2.dist-info/top_level.txt,sha256=vKKjXBXEw5OFRIzTxZWUC5ZOj0CK5e3atbymBB4eJ6w,6
-rinui-0.1.3.2.dist-info/RECORD,,
+rinui-0.1.4.1.data/data/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
+rinui-0.1.4.1.data/data/README.md,sha256=8ZcR55RYV2slRAQbhoYhqDTPOLXmewkFSvuA_cE6zD0,3044
+rinui-0.1.4.1.dist-info/licenses/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
+rinui-0.1.4.1.dist-info/METADATA,sha256=YmwxS5tHeWcDsCsZxZlH2vYgo3vyXCZSw3-9yvbpBx0,3577
+rinui-0.1.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rinui-0.1.4.1.dist-info/entry_points.txt,sha256=taxuZYCggoQa2LPubwcurQYRjBRC4cNYOjWaqOYZVxw,54
+rinui-0.1.4.1.dist-info/top_level.txt,sha256=vKKjXBXEw5OFRIzTxZWUC5ZOj0CK5e3atbymBB4eJ6w,6
+rinui-0.1.4.1.dist-info/RECORD,,