RinUI 0.1.3.1__tar.gz → 0.1.4__tar.gz

{rinui-0.1.3.1/RinUI.egg-info → rinui-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RinUI
-Version: 0.1.3.1
+Version: 0.1.4
 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.1 → rinui-0.1.4}/RinUI/__init__.py

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

rinui-0.1.4/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-0.1.3.1 → rinui-0.1.4}/RinUI/components/StatusAndInfo/InfoBar.qml

@@ -125,7 +125,7 @@ Frame {
                 id: bodyText
                 property bool wrap: (
                     (
-                        infoBar.width - iconWidget.width - titleText.width - rights.width - custom.width
+                        infoBar.width - iconWidget.width - rights.width - custom.width
                         - main.spacing * 5 - infoBar.padding * 2
                     )
                     < implicitWidth

{rinui-0.1.3.1 → rinui-0.1.4}/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-0.1.3.1 → rinui-0.1.4}/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"
 
@@ -31,7 +31,7 @@
             ? Theme.currentTheme.colors.systemCautionColor
             : state === ProgressRing.Error
             ? Theme.currentTheme.colors.systemCriticalColor
-            : Theme.currentTheme.colors.primaryColor
+            : primaryColor
         property real _progress: (to - from) === 0
             ? 0
             : Math.max(0, Math.min(1, (value - from) / (to - from)))

{rinui-0.1.3.1 → rinui-0.1.4}/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-0.1.3.1 → rinui-0.1.4}/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-0.1.3.1 → rinui-0.1.4}/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,15 +77,28 @@ 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:
         """
         Sets the icon for the application.
@@ -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-0.1.3.1 → rinui-0.1.4}/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-0.1.3.1 → rinui-0.1.4}/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-0.1.3.1 → rinui-0.1.4}/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.1 → rinui-0.1.4/RinUI.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: RinUI
-Version: 0.1.3.1
+Version: 0.1.4
 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.1 → rinui-0.1.4}/RinUI.egg-info/SOURCES.txt

@@ -68,6 +68,7 @@ RinUI/components/Navigation/Segmented.qml
 RinUI/components/Navigation/SegmentedItem.qml
 RinUI/components/Navigation/SelectorBar.qml
 RinUI/components/Navigation/SelectorBarItem.qml
+RinUI/components/StatusAndInfo/BusyIndicator.qml
 RinUI/components/StatusAndInfo/InfoBadge.qml
 RinUI/components/StatusAndInfo/InfoBar.qml
 RinUI/components/StatusAndInfo/ProgressBar.qml

{rinui-0.1.3.1 → rinui-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "RinUI"
-version = "0.1.3.1"
+version = "0.1.4"
 authors = [
     { name = "RinLit", email = "lintu233_qwq@icloud.com" }
 ]