RinUI 0.1.1.post1__tar.gz → 0.1.2__tar.gz

{rinui-0.1.1.post1/RinUI.egg-info → rinui-0.1.2}/PKG-INFO

@@ -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 → rinui-0.1.2}/RinUI/__init__.py

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

{rinui-0.1.1.post1 → rinui-0.1.2}/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-0.1.1.post1 → rinui-0.1.2}/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-0.1.1.post1 → rinui-0.1.2}/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-0.1.1.post1 → rinui-0.1.2}/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-0.1.1.post1 → rinui-0.1.2}/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-0.1.1.post1 → rinui-0.1.2}/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-0.1.1.post1 → rinui-0.1.2}/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-0.1.1.post1 → rinui-0.1.2}/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 → rinui-0.1.2/RinUI.egg-info}/PKG-INFO

@@ -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 → rinui-0.1.2}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "RinUI"
-version = "0.1.1.post1"
+version = "0.1.2"
 authors = [
     { name = "RinLit", email = "lintu233_qwq@icloud.com" }
 ]
 description = "A Fluent Design-like UI library for Qt Quick (QML) based on PySide6"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.12"
 dependencies = [
     "PySide6>=6.6.3.1",
     "darkdetect~=0.8.0",
@@ -41,4 +41,4 @@ RinUI = [
 "" = ["README.md", "LICENSE"]
 
 [project.entry-points."pyinstaller40"]
-hook-dirs = "RinUI.hooks:get_hook_dirs"
+hook-dirs = "RinUI.hooks:get_hook_dirs"