RinUI 0.1.1.post1__py3-none-any.whl → 0.1.2__py3-none-any.whl

RinUI/__init__.py

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

RinUI/components/BasicInput/ComboBox.qml

@@ -85,17 +85,6 @@ ComboBox {
         onClicked: menu.open()
     }
 
-    // Text //
-    // contentItem: Text {
-    //     id: text
-    //     typography: Typography.Body
-    //     anchors.left: parent.left
-    //     anchors.leftMargin: 11  // 左边距为 11
-    //     verticalAlignment: Text.AlignVCenter
-    //     height: parent.height
-    //     text: root.displayText ? root.displayText : root.placeholderText
-    //     color: root.displayText ? Theme.currentTheme.colors.textColor : Theme.currentTheme.colors.textSecondaryColor
-    // }
 
     contentItem: TextField {
         id: text

RinUI/components/MenusAndToolbars/Menu.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
+import QtQuick.Layouts 2.15
 import "../../themes"
 import "../../components"
 
@@ -34,15 +35,11 @@ Menu {
             case Position.Right:
                 return (parent.height - root.height) / 2
             default:
-                // return -root.height + 5  // 默认顶部
                 return root.y
         }
     }
 
-    implicitWidth: Math.max(contentItem.implicitWidth, 80)
-    implicitHeight: contentItem.implicitHeight
-    // x: (parent.width - root.width) / 2
-    // y: parent.height + 5
+    width: Math.max(contentItem.implicitWidth, 80)
 
     enter: Transition {
         ParallelAnimation {
@@ -101,13 +98,11 @@ Menu {
         }
     }
 
-    spacing: 5
     topPadding: 5
     bottomPadding: 5
 
     background: Rectangle {
-        implicitWidth: 80
-        implicitHeight: 36
+        anchors.fill: parent
         radius: Theme.currentTheme.appearance.windowRadius
         color: Theme.currentTheme.colors.backgroundAcrylicColor
         border.color: Theme.currentTheme.colors.flyoutBorderColor
@@ -125,20 +120,16 @@ Menu {
     contentItem: Flickable {
         id: flickable
         clip: true
-        anchors.fill: parent
-        // contentWidth: width
-        // contentHeight: column.implicitHeight
+        anchors.centerIn: parent
         implicitWidth: column.implicitWidth
         implicitHeight: column.implicitHeight
-        // interactive: column.implicitHeight > height
 
-        Column {
+        ColumnLayout {
             id: column
-            topPadding: 5
-            bottomPadding: 5
+            x: -5
+            spacing: 0
             Repeater {
-                model: root.contentModel  // 默认的 Menu 内容
-                delegate: root.delegate
+                model: root.contentModel
             }
         }
 

RinUI/components/MenusAndToolbars/MenuItem.qml

@@ -7,6 +7,9 @@ import "../../components"
 
 MenuItem {
     id: root
+
+    Layout.fillWidth: true
+
     implicitWidth: {
         const leftMargin = 16;
         const arrowWidth = arrow.visible ? arrow.width + 16 : root.checked ? indicator.width + 16 : 0;
@@ -94,7 +97,7 @@ MenuItem {
         }
         Text {
             id: shortcutText
-            Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
             typography: Typography.Caption
             text: root.action ? root.action.shortcut : ""
             color: Theme.currentTheme.colors.textSecondaryColor

RinUI/components/MenusAndToolbars/MenuSeparator.qml

@@ -1,11 +1,13 @@
 import QtQuick 2.15
 import QtQuick.Controls.Basic 2.15
+import QtQuick.Layouts 2.15
 import "../../themes"
 import "../../components"
 
 
 MenuSeparator {
     id: root
+    Layout.fillWidth: true
 
     contentItem: Rectangle {
         implicitHeight: 1

RinUI/components/Text/TextField.qml

@@ -74,6 +74,7 @@ TextField {
 
     // 字体 / Font //
     font.pixelSize: Theme.currentTheme.typography.bodySize
+    font.family: Utils.fontFamily
 
     selectionColor: Theme.currentTheme.colors.primaryColor
     color: Theme.currentTheme.colors.textColor

RinUI/core/launcher.py

@@ -1,20 +1,23 @@
 import os
 import sys
+from typing import Union
 
 from PySide6.QtCore import QCoreApplication, QUrl, QObject
 from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QApplication
 from PySide6.QtQml import QQmlApplicationEngine
+from pathlib import Path
 
 from .theme import ThemeManager
 from .config import BackdropEffect, is_windows, Theme, RINUI_PATH, RinConfig
 
 
 class RinUIWindow:
-    def __init__(self, qml_path: str):
+    def __init__(self, qml_path: Union[str, Path] = None):
         """
         Create an application window with RinUI.
-        :param qml_path: str, QML file path (eg = "path/to/main.qml")
+        If qml_path is provided, it will automatically load the specified QML file.
+        :param qml_path: str or Path, QML file path (eg = "path/to/main.qml")
         """
         super().__init__()
         if hasattr(self, "_initialized") and self._initialized:
@@ -33,14 +36,22 @@ class RinUIWindow:
         self.autoSetWindowsEffect = True
 
         app_instance.aboutToQuit.connect(self.theme_manager.clean_up)
-        self._setup_application()
-        self.print_startup_info()
 
-    def _setup_application(self) -> None:
-        """Setup"""
+        if qml_path is not None:
+            self.load(qml_path)
+
+    def load(self, qml_path: Union[str, Path] = None) -> None:
+        """
+        Load the QML file and set up the application window.
+        :param qml_path:
+        :return:
+        """
         # RInUI 模块
         print(f"UI Module Path: {RINUI_PATH}")
 
+        if qml_path is not None:
+            self.qml_path = qml_path
+
         if os.path.exists(RINUI_PATH):
             self.engine.addImportPath(RINUI_PATH)
         else:
@@ -62,6 +73,8 @@ class RinUIWindow:
         self.theme_manager.set_window(self.root_window)
         self._apply_windows_effects() if self.autoSetWindowsEffect else None
 
+        self._print_startup_info()
+
     def setIcon(self, path: str) -> None:
         """
         Sets the icon for the application.
@@ -109,9 +122,9 @@ class RinUIWindow:
             root = object.__getattribute__(self, "root_window")
             return getattr(root, name)
         except AttributeError:
-            raise AttributeError(f"\"RinUIWindow\" object has no attribute '{name}'")
+            raise AttributeError(f"\"RinUIWindow\" object has no attribute '{name}', you need to load() qml at first.")
 
-    def print_startup_info(self) -> None:
+    def _print_startup_info(self) -> None:
         border = "=" * 40
         print(f"\n{border}")
         print("✨ RinUIWindow Loaded Successfully!")

RinUI/core/theme.py

@@ -3,6 +3,7 @@ import platform
 import time
 
 from PySide6.QtCore import QObject, Signal, Slot, QThread
+from PySide6.QtGui import QFontDatabase, QFont
 
 from .config import DEFAULT_CONFIG, RinConfig, is_win10, is_windows, is_win11, BackdropEffect
 import sys

RinUI/themes/utils.qml

@@ -5,7 +5,8 @@ import "../themes"
 import "../utils"
 
 QtObject {
-    property string fontFamily: Qt.application.font.family  // 默认字体
+    property string fontFamily: Qt.platform.os === "windows"
+        ? "Microsoft YaHei" : Qt.application.font.family   // 默认字体
     property string iconFontFamily: FontIconLoader.name
     property string fontIconSource: Qt.resolvedUrl("../assets/fonts/FluentSystemIcons-Resizable.ttf")  // 字体图标路径
     property string fontIconIndexSource: Qt.resolvedUrl("../assets/fonts/FluentSystemIcons-Index.js")  // 字体图标索引路径

{rinui-0.1.1.post1.dist-info → rinui-0.1.2.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: RinUI
-Version: 0.1.1.post1
+Version: 0.1.2
 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
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PySide6>=6.6.3.1

{rinui-0.1.1.post1.dist-info → rinui-0.1.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-RinUI/__init__.py,sha256=_5VlpDxB19jOY72Tlru6omOpL80g5CkXSKytxs0BngM,65
+RinUI/__init__.py,sha256=fNeQkYoiWjQ-_ixBLh28FY6AJ00dKNUUs3rX2ixJLQk,65
 RinUI/qmldir,sha256=fwUoGC3efxNnNJmFU6inBDH6Tx9s3-OI4b3-a-25o0U,3829
 RinUI/assets/fonts/FluentSystemIcons-Index.js,sha256=M2fUmCiOI7A1rxLWMFaekrB4KmasTSwbociYOzHJegE,253422
 RinUI/assets/fonts/FluentSystemIcons-Resizable.ttf,sha256=-IfF3NT1eODD0vOLVLC0Z2U5bsR6woSQAziX3qD1TqU,1447252
@@ -14,7 +14,7 @@ RinUI/components/Shadow.qml,sha256=8y9iAFr45hqDdXXnsfD49t90HHhiFyMzGUHqJa2tavk,1
 RinUI/components/qmldir,sha256=KiTLgqw5x2LehrUxVfaFZUkD0Al2n2dPjD30gA_6fWk,2255
 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=tylWrL2FZT2n4lc1VxTBx1H2jyi0RQauUL58TWf0Fxc,4589
+RinUI/components/BasicInput/ComboBox.qml,sha256=-ZT3FWGybTX1ltEDhTJuoxiG0gW3OlDcxfPdHnVwqsM,4111
 RinUI/components/BasicInput/DropDownButton.qml,sha256=TEgRZgjCCOZMPuT8xXrsqCIEuZ7wObRX88PF1unWuaE,390
 RinUI/components/BasicInput/Hyperlink.qml,sha256=8K1JoyX6AKw25QJW-aiVFah5yKmvS1WpxEcXMduM94M,329
 RinUI/components/BasicInput/PillButton.qml,sha256=2eFgpKupz7xlGIWcJOHya4nK616ffByYD_oPRKQiSTg,205
@@ -42,11 +42,11 @@ RinUI/components/ListAndCollections/SettingCard.qml,sha256=hrNlpWmxvzUiGzBvBXkdk
 RinUI/components/ListAndCollections/TableView.qml,sha256=71zKoiHLmfmmxD72WJvmmGGLyvfNeGKzllD7EgB9Ok0,2151
 RinUI/components/ListAndCollections/TableViewDelegate.qml,sha256=IW8JVDiRSO9X7Z-lForRh6q4qFWuuhjtWKZXBjaZXOg,2283
 RinUI/components/Media/Avatar.qml,sha256=8I7MlIalrs4S0WTKTuMU9qxbUkYDrJ-bhKPHjv12-SM,2088
-RinUI/components/MenusAndToolbars/Menu.qml,sha256=LOjoQa0rYNWj0cjc4WctesJdrcaWkRTZXHeEYc3la8o,4503
+RinUI/components/MenusAndToolbars/Menu.qml,sha256=iTk9J1KlZv7BdzQNGbPVPYVGC8dqC94lPX3ggtsZv9E,4103
 RinUI/components/MenusAndToolbars/MenuBar.qml,sha256=YqNcY9Tn2t3NmaDqYCHJIUd_j9EXtn0dtOHYCd7sRXQ,1055
-RinUI/components/MenusAndToolbars/MenuItem.qml,sha256=jZRm-ULnrJSbo7rjzLD15ENn2gxAscJLkwiRo67Rfr4,3784
+RinUI/components/MenusAndToolbars/MenuItem.qml,sha256=L2ZThrVEzw6_klVWKm60LOZXuLYPaab_kYQQI_8Pel0,3813
 RinUI/components/MenusAndToolbars/MenuItemGroup.qml,sha256=FqnDxo7C6DQ-1xvurHtjxuiRZOD69MxdsKT-h236cIk,1014
-RinUI/components/MenusAndToolbars/MenuSeparator.qml,sha256=J9oFbxpUeu43EExlxOX3maGGDwPzDIzeZIuJzIJfckI,257
+RinUI/components/MenusAndToolbars/MenuSeparator.qml,sha256=BQGQ_EjzwtnlJ14fDXT96LEBOoaQwmoNidON0LzAJX8,312
 RinUI/components/MenusAndToolbars/TextInputMenu.qml,sha256=Rm0CT6sKdK5IOQAjtYEaJxqK3RdEZqXe9PjIoWBp1yM,939
 RinUI/components/MenusAndToolbars/ToolSeparator.qml,sha256=X2cKZnTYhYUO0jOVRCwx81QSz4YNwVWRXoSD7kT86V4,414
 RinUI/components/Navigation/ErrorPage.qml,sha256=XplTs6CKs1Y1441uvp9nSD4AeD08OIqoXlmz5RlpCPo,1039
@@ -67,12 +67,12 @@ RinUI/components/StatusAndInfo/ToolTip.qml,sha256=f6S9rG_0GsHQl8BB1m4Niik35s7Lng
 RinUI/components/Text/SpinBox.qml,sha256=rY17yJ3a0ckkl6pX00qVIQQYLmoO-GLtcSZh-WKtPZs,4616
 RinUI/components/Text/Text.qml,sha256=SWJBJtAWkq9XldrX6_BWfCXGRcLQLBNofkRO5NG8q2Q,1714
 RinUI/components/Text/TextArea.qml,sha256=guhwcFBSEyZkTRT2V0ER3S03xW9WOkH_4U2Oor2I9PY,3706
-RinUI/components/Text/TextField.qml,sha256=1DBiO9UCfDTpwma4bWVWXWfolhQu_i4qnhGWascX7dU,3522
+RinUI/components/Text/TextField.qml,sha256=BXuJ16AUQaSh-Og7jaYSNEu9r1PcyG7FQ95DaGciJZs,3556
 RinUI/components/Text/TextInput.qml,sha256=gyTJmrYi5yuc-j5dDRSbu5PCxiuQo2xNBm6jWL9ezYk,1611
 RinUI/core/__init__.py,sha256=LF4-YjoBLaix1UEWYzc5rhXiYGdZXC_J-NyCoYkCpUE,196
 RinUI/core/config.py,sha256=kO0bR1EhZB6Mh0KFa7uyBa0KgYr58DdBsHEP2oSGX7U,3722
-RinUI/core/launcher.py,sha256=sSPWi8iERTuVmtcIYe0PYcAkKKizrN_bNLhnChggv8k,4616
-RinUI/core/theme.py,sha256=BK9EovR2sHvcNarzptgsoMOll78R1B_ftKwEUqzqQhA,10672
+RinUI/core/launcher.py,sha256=Bep-74tsgFvzMw1GHklwgOgQBRjtr4ptPV8FlYDJ5AQ,5046
+RinUI/core/theme.py,sha256=IKyyBXzlakvSsP6Oxf6gGfb0wQWFkxvnVMyfw4RdSo4,10719
 RinUI/core/translator.py,sha256=5GK7Iy7-2iMicF8hQr79CwU9UWvCwE-8vGd8QkhJ1h8,1037
 RinUI/hooks/__init__.py,sha256=7sQJlly1ZbiZTzZUkCV2hI_gY-DAxWP_0kLyhZQ2Tm8,74
 RinUI/hooks/hook-RinUI.py,sha256=VvQui-b3YNuxvhqjRJqLPKdtnWQ6Ev8G9DEgzGNUUUI,116
@@ -86,7 +86,7 @@ RinUI/themes/dark.qml,sha256=qAn7MDh18K-44f4gPIRiA1l_T_PWoBxhhzh0Z6igC0w,5793
 RinUI/themes/light.qml,sha256=L1Qy1yotvF3GemfhQxxTt1keyMdsjOoK9COP6NyVQHE,5741
 RinUI/themes/qmldir,sha256=7SbN6C8cqEW6VvPb-eYg9AlppfkehmekbciYNHRoNSA,184
 RinUI/themes/theme.qml,sha256=srSHRVV9KmQBc9uYitHDjMvXFzvLPolaLu82Tf0uc_Q,4265
-RinUI/themes/utils.qml,sha256=Oz8ezVhCgugCerZUAO9_FBXIRzJSX5GZA4L-94onxMw,1675
+RinUI/themes/utils.qml,sha256=wJfvrsBTYZWi3uJmS-LFIJmsGWzxuT1lTvA7ufiG6Qg,1735
 RinUI/utils/Animation.qml,sha256=hRzsJU_5G78JArYLvVtxTmRxX2VAuMgeWdAHzqyuYWQ,134
 RinUI/utils/FloatLayer.qml,sha256=D0rkYxK6_09OjrNuLHDXhdsb4xbUq5l2IiuLHCsLGhE,3471
 RinUI/utils/FontIconLoader.qml,sha256=Zm-talvAPxCBSt4nd8gpJ6jY91R1uRoJvaXKU3AaWEU,294
@@ -102,11 +102,11 @@ RinUI/windows/TitleBar.qml,sha256=zzOGP6fLm692BMY2UF_eDwjsgtVIZ0Fx90VDPGweHLA,37
 RinUI/windows/qmldir,sha256=LMeM0QzRNU0CIHemtD1j19hGRCuV987DRDuB5W6UJ-k,205
 RinUI/windows/window/ApplicationWindow.qml,sha256=4_COTBi9SoHeHdS0lIOPvqncevUB4P18svZfH3V5GaM,188
 RinUI/windows/window/Window.qml,sha256=pye3j-RI7Tzm8WW7oIctaeFxQ-FJsqXpW2U4Xp3m418,3485
-rinui-0.1.1.post1.data/data/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
-rinui-0.1.1.post1.data/data/README.md,sha256=8ZcR55RYV2slRAQbhoYhqDTPOLXmewkFSvuA_cE6zD0,3044
-rinui-0.1.1.post1.dist-info/licenses/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
-rinui-0.1.1.post1.dist-info/METADATA,sha256=6kUNG4vqLk9kyI4iflqtlJfu9r4Sikrj6UqHgrQQv1Y,3595
-rinui-0.1.1.post1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rinui-0.1.1.post1.dist-info/entry_points.txt,sha256=taxuZYCggoQa2LPubwcurQYRjBRC4cNYOjWaqOYZVxw,54
-rinui-0.1.1.post1.dist-info/top_level.txt,sha256=vKKjXBXEw5OFRIzTxZWUC5ZOj0CK5e3atbymBB4eJ6w,6
-rinui-0.1.1.post1.dist-info/RECORD,,
+rinui-0.1.2.data/data/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
+rinui-0.1.2.data/data/README.md,sha256=8ZcR55RYV2slRAQbhoYhqDTPOLXmewkFSvuA_cE6zD0,3044
+rinui-0.1.2.dist-info/licenses/LICENSE,sha256=vgoqqpny5vKYu34VDBUWYQKzT7Nn-Xy9y8USmcOCyZQ,1063
+rinui-0.1.2.dist-info/METADATA,sha256=TqEp5U_YJcreGSLKjUF8I-j0TlN3F7eySHM2_7Ui9-s,3590
+rinui-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rinui-0.1.2.dist-info/entry_points.txt,sha256=taxuZYCggoQa2LPubwcurQYRjBRC4cNYOjWaqOYZVxw,54
+rinui-0.1.2.dist-info/top_level.txt,sha256=vKKjXBXEw5OFRIzTxZWUC5ZOj0CK5e3atbymBB4eJ6w,6
+rinui-0.1.2.dist-info/RECORD,,