RinUI 0.0.9.post1__tar.gz → 0.0.9.1__tar.gz

{rinui-0.0.9.post1/RinUI.egg-info → rinui-0.0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RinUI
-Version: 0.0.9.post1
+Version: 0.0.9.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
@@ -55,7 +55,7 @@ With simple configuration, you can quickly develop elegant UI interfaces in the
 
 You can install RinUI via pip: (coming soon, but now you can install via test-pypi)
 ```bash
-pip install RinUI  # if RinUI in pypi
+pip install RinUI
 ```
 
 Import RinUI in your QML file:

{rinui-0.0.9.post1 → rinui-0.0.9.1}/README.md

@@ -40,7 +40,7 @@ With simple configuration, you can quickly develop elegant UI interfaces in the
 
 You can install RinUI via pip: (coming soon, but now you can install via test-pypi)
 ```bash
-pip install RinUI  # if RinUI in pypi
+pip install RinUI
 ```
 
 Import RinUI in your QML file:

{rinui-0.0.9.post1 → rinui-0.0.9.1}/RinUI/__init__.py

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

rinui-0.0.9.1/RinUI/components/DateAndTime/TimePicker.qml

@@ -0,0 +1,115 @@
+import QtQuick 2.15
+import QtQuick.Controls.Basic 2.15
+import QtQuick.Layouts 2.15
+import "../../themes"
+import "../../components"
+
+Button {
+    id: timePickerButton
+
+    property string amText: qsTr("AM")
+    property string pmText: qsTr("PM")
+    property string hourText: qsTr("hour")
+    property string minuteText: qsTr("minute")
+
+    // 是否使用24小时制
+    property bool use24Hour: false
+
+    property alias hour: pickerView.value1
+    property alias minute: pickerView.value2
+    property alias hourSystem: pickerView.value3
+
+    implicitWidth: 250
+    padding: 0
+
+    // 获取 / 设置时间 // Get / Set time (hh:mm)
+    // 获取 / 设置时间 (hh:mm)
+    property string time: {
+        if (!pickerView.gotData) return ""
+        let h = parseInt(hour)
+        if (!use24Hour) {
+            if (hourSystem === pmText && h < 12) h += 12
+            if (hourSystem === amText && h === 12) h = 0
+        }
+        let hh = h < 10 ? "0" + h : "" + h
+        let mm = parseInt(minute)
+        let mmStr = mm < 10 ? "0" + mm : "" + mm
+        return hh + ":" + mmStr
+    }
+
+    function setTime(hhmm) {
+        if (!hhmm || typeof hhmm !== "string" || !hhmm.match(/^\d{2}:\d{2}$/)) return
+
+        let parts = hhmm.split(":")
+        let h = parseInt(parts[0])
+        let m = parseInt(parts[1])
+
+        if (h >= 0 && h < 24 && m >= 0 && m < 60) {
+            if (use24Hour) {
+                pickerView.value1 = h.toString()
+                pickerView.value2 = m.toString()
+                pickerView.value3 = undefined
+            } else {
+                pickerView.value1 = ((h % 12 === 0) ? 12 : h % 12).toString()
+                pickerView.value2 = m.toString()
+                pickerView.value3 = h >= 12 ? pmText : amText
+            }
+            pickerView.gotData = true
+        }
+    }
+
+    // 重写按钮结果
+    contentItem: RowLayout {
+        anchors.fill: parent
+        spacing: 0
+
+        Text {
+            Layout.fillWidth: true
+            Layout.maximumWidth: use24Hour ? timePickerButton.implicitWidth / 2 : timePickerButton.implicitWidth / 3
+            color: pickerView.gotData ? Theme.currentTheme.colors.textColor
+                : Theme.currentTheme.colors.textSecondaryColor
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+
+            text: pickerView.gotData ? pickerView.value1 : hourText
+        }
+        ToolSeparator {
+            implicitHeight: 32
+        }
+        Text {
+            Layout.fillWidth: true
+            Layout.maximumWidth: use24Hour ? timePickerButton.implicitWidth / 2 : timePickerButton.implicitWidth / 3
+            color: pickerView.gotData ? Theme.currentTheme.colors.textColor
+                : Theme.currentTheme.colors.textSecondaryColor
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+
+            text: pickerView.gotData ? pickerView.value2 : minuteText
+        }
+        ToolSeparator {
+            implicitHeight: 32
+            visible: !use24Hour
+        }
+        Text {
+            Layout.fillWidth: true
+            Layout.maximumWidth: timePickerButton.implicitWidth / 3
+            color: pickerView.gotData ? Theme.currentTheme.colors.textColor
+                : Theme.currentTheme.colors.textSecondaryColor
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+
+            text: pickerView.gotData ? pickerView.value3 : amText
+            visible: !use24Hour
+        }
+    }
+
+    onClicked: pickerView.open()
+
+    PickerView {
+        id: pickerView
+        width: parent.width
+
+        model1: use24Hour ? 24 : 12
+        model3: use24Hour ? undefined : [amText, pmText]
+    }
+}

{rinui-0.0.9.post1 → rinui-0.0.9.1}/RinUI/components/Navigation/NavigationView.qml

@@ -42,7 +42,21 @@ RowLayout {
     Item {
         Layout.fillWidth: true
         Layout.fillHeight: true
-        // clip: true
+
+        // 导航栏展开自动收起
+        MouseArea {
+            id: collapseCatcher
+            anchors.fill: parent
+            z: 1
+            hoverEnabled: true
+            acceptedButtons: Qt.AllButtons
+
+            visible: !navigationBar.collapsed && navigationBar.isNotOverMinimumWidth()
+
+            onClicked: {
+                navigationBar.collapsed = true
+            }
+        }
 
         Rectangle {
             id: appLayer

{rinui-0.0.9.post1 → rinui-0.0.9.1}/RinUI/components/ScrollBar.qml

@@ -25,6 +25,47 @@ ScrollBar {
     horizontalPadding : horizontal ? 15 : 3
     enabled: size < 1.0
 
+    // 控制按钮 / Control Button //
+    ToolButton {
+        background: Item {}  // 无背景
+
+        width: 15
+        height: 15
+        size: 8
+        color: Theme.currentTheme.colors.textSecondaryColor
+        icon.name: vertical ? "ic_fluent_triangle_up_20_filled" : "ic_fluent_triangle_left_20_filled"
+        anchors {
+            top: vertical ? parent.top : undefined
+            left: horizontal ? parent.left : undefined
+            horizontalCenter: vertical ? parent.horizontalCenter : undefined
+            verticalCenter: horizontal ? parent.verticalCenter : undefined
+        }
+        onClicked: scrollBar.decrease()
+
+        visible: scrollBar.size < 1.0
+        opacity: background.opacity
+    }
+
+    ToolButton {
+        background: Item {}  // 无背景
+
+        width: 15
+        height: 15
+        size: 8
+        color: Theme.currentTheme.colors.textSecondaryColor
+        icon.name: vertical ? "ic_fluent_triangle_down_20_filled" : "ic_fluent_triangle_right_20_filled"
+        anchors {
+            bottom: vertical ? parent.bottom : undefined
+            right: horizontal ? parent.right : undefined
+            horizontalCenter: vertical ? parent.horizontalCenter : undefined
+            verticalCenter: horizontal ? parent.verticalCenter : undefined
+        }
+        onClicked: scrollBar.increase()
+
+        visible: scrollBar.size < 1.0
+        opacity: background.opacity
+    }
+
 
     // 内容 / Content //
     contentItem: Item {

{rinui-0.0.9.post1 → rinui-0.0.9.1}/RinUI/core/launcher.py

@@ -73,7 +73,6 @@ class RinUIWindow:
             raise FileNotFoundError(f"Cannot find RinUI module: {rinui_import_path}")
 
         # 主题管理器
-
         self.engine.rootContext().setContextProperty("ThemeManager", self.theme_manager)
         try:
             self.engine.load(self.qml_path)
@@ -84,7 +83,6 @@ class RinUIWindow:
             raise RuntimeError(f"Error loading QML file: {self.qml_path}")
 
         # 窗口设置
-
         self.root_window = self.engine.rootObjects()[0]
 
         self.theme_manager.set_window(self.root_window)

{rinui-0.0.9.post1 → rinui-0.0.9.1}/RinUI/themes/utils.qml

@@ -5,9 +5,10 @@ import "../themes"
 import "../utils"
 
 QtObject {
-    property string fontFamily: "Segoe UI" // 默认字体
+    property string fontFamily: 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")  // 字体图标索引路径
     property var fontIconIndex: Icons.FluentIcons // 字体图标索引
 
     property color primaryColor: "#605ed2" // 默认主题色
@@ -23,6 +24,6 @@ QtObject {
     property int progressBarAnimationSpeed: 1550 // 进度条动画速度 (ms)
 
     function loadFontIconIndex() {
-        Qt.include("assets/fonts/FluentSystemIcons-Index.js");
+        Qt.include(fontIconIndexSource);
     }
 }

{rinui-0.0.9.post1 → rinui-0.0.9.1}/RinUI/windows/FluentWindowBase.qml

@@ -151,7 +151,9 @@ ApplicationWindow {
             if (p.x >= width - b) e |= Qt.RightEdge
             if (p.y < b) e |= Qt.TopEdge
             if (p.y >= height - b) e |= Qt.BottomEdge
-            baseWindow.startSystemResize(e)
+            if (e !== 0) {
+                baseWindow.startSystemResize(e)
+            }
         }
     }
 }

{rinui-0.0.9.post1 → rinui-0.0.9.1/RinUI.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RinUI
-Version: 0.0.9.post1
+Version: 0.0.9.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
@@ -55,7 +55,7 @@ With simple configuration, you can quickly develop elegant UI interfaces in the
 
 You can install RinUI via pip: (coming soon, but now you can install via test-pypi)
 ```bash
-pip install RinUI  # if RinUI in pypi
+pip install RinUI
 ```
 
 Import RinUI in your QML file:

{rinui-0.0.9.post1 → rinui-0.0.9.1}/RinUI.egg-info/SOURCES.txt

@@ -33,6 +33,7 @@ RinUI/components/BasicInput/Slider.qml
 RinUI/components/BasicInput/Switch.qml
 RinUI/components/BasicInput/ToggleButton.qml
 RinUI/components/BasicInput/ToolButton.qml
+RinUI/components/DateAndTime/DatePicker.qml
 RinUI/components/DateAndTime/PickerView.qml
 RinUI/components/DateAndTime/TimePicker.qml
 RinUI/components/DialogsAndFlyouts/Dialog.qml

{rinui-0.0.9.post1 → rinui-0.0.9.1}/pyproject.toml

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