RinUI 0.0.9.1.post1__tar.gz → 0.0.9.2__tar.gz

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

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

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

@@ -38,7 +38,7 @@ With simple configuration, you can quickly develop elegant UI interfaces in the
 
 ## 🪄 Usage
 
-You can install RinUI via pip: (coming soon, but now you can install via test-pypi)
+You can install RinUI via pip:
 ```bash
 pip install RinUI
 ```

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

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

rinui-0.0.9.2/RinUI/components/DateAndTime/DatePicker.qml

@@ -0,0 +1,140 @@
+import QtQuick 2.15
+import QtQuick.Controls.Basic 2.15
+import QtQuick.Layouts 2.15
+import "../../themes"
+import "../../components"
+
+Button {
+    id: datePickerButton
+
+    property bool yearVisible: true
+
+    property alias year: pickerView.value3
+    property alias month: pickerView.value1
+    property alias monthIndex: pickerView.index1
+    property alias day: pickerView.value2
+
+    property int startYear: 1925
+    property int endYear: 2125
+
+    readonly property var monthModel: (new Array(12)).fill(0).map((_, i) => i + 1).map(getMonthName)
+    readonly property int maxDays: new Date(pickerView.value3 || new Date().getFullYear(), pickerView.index1 + 1, 0).getDate()
+
+    implicitWidth: 250
+    padding: 0
+
+    property string date: {
+        if (!pickerView.gotData) return ""
+        let y = typeof year === "number"? parseInt(year) : new Date().getFullYear()
+        let m = parseInt(monthModel.indexOf(month) + 1)
+        let d = parseInt(day)
+        return y + "-" + m + "-" + d
+    }
+
+    function setDate(yyyymmdd) {
+        // format
+        if (!yyyymmdd || typeof yyyymmdd !== "string"
+            || !yyyymmdd.match(/^\d{4}[-\/]\d{1,2}[-\/]\d{1,2}$/))
+            return false
+        let parts = yyyymmdd.split(/[-\/]/)  // 使用正则分割符号 '-' 或 '/'
+        let y = parseInt(parts[0])
+        let m = parseInt(parts[1])
+        let d = parseInt(parts[2])
+
+        if (m >= 1 && m <= 12 && d >= 1 && d <= 31) {
+            pickerView.value3 = y.toString()
+            pickerView.value1 = getMonthName(m)
+            pickerView.value2 = d.toString()
+            pickerView.gotData = true
+            return true
+        }
+        return -1
+    }
+
+    // 根据 locale 决定顺序
+    property var dateOrder: {
+        let fmt = Qt.locale().dateFormat(Locale.ShortFormat)
+        let order = []
+        if (fmt.indexOf("y") < fmt.indexOf("M") && fmt.indexOf("M") < fmt.indexOf("d"))
+            order = ["year", "month", "day"]
+        else if (fmt.indexOf("M") < fmt.indexOf("d") && fmt.indexOf("d") < fmt.indexOf("y"))
+            order = ["month", "day", "year"]
+        else if (fmt.indexOf("d") < fmt.indexOf("M") && fmt.indexOf("M") < fmt.indexOf("y"))
+            order = ["day", "month", "year"]
+
+        if (!yearVisible) {
+            order = order.filter(item => item !== "year")
+        }
+        return order
+    }
+
+    // locale获取月份名称
+    function getMonthName(num) {
+        return datePicker.locale.monthName(num - 1)
+    }
+
+    onClicked: pickerView.open()
+
+    contentItem: RowLayout {
+        anchors.fill: parent
+        spacing: 0
+
+        Repeater {
+            model: dateOrder
+
+            delegate: Item {
+                Layout.fillWidth: true
+                Layout.maximumWidth: datePickerButton.implicitWidth / model.length
+                implicitHeight: 32
+
+                Text {
+                    anchors.centerIn: parent
+                    color: pickerView.gotData ? Theme.currentTheme.colors.textColor
+                        : Theme.currentTheme.colors.textSecondaryColor
+
+                    text: {
+                        const type = modelData
+                        if (!pickerView.gotData) {
+                            if (type === "year") return qsTr("year")
+                            if (type === "month") return qsTr("month")
+                            if (type === "day") return qsTr("day")
+                        }
+                        if (type === "year") return year
+                        if (type === "month") return month
+                        if (type === "day") return day
+                        return ""
+                    }
+                }
+                ToolSeparator {
+                    anchors.right: parent.right
+                    anchors.verticalCenter: parent.verticalCenter
+                    implicitHeight: parent.implicitHeight
+                    visible: index !== dateOrder.length - 1
+                }
+            }
+        }
+    }
+
+    PickerView {
+        id: pickerView
+        width: parent.width
+
+        model3: yearVisible
+            ? (
+                startYear <= endYear
+                ? Array.apply(null, {length: endYear - startYear + 1}).map((_, i) => startYear + i)
+                : []
+            )
+            : undefined
+        model1: monthModel
+        model2: Array.from({ length: maxDays }, (_, i) => i + 1) // 天
+
+        // 初始值
+        value3: yearVisible ? (new Date().getFullYear()) : undefined
+        value1: getMonthName(new Date().getMonth() + 1)
+        value2: new Date().getDate()
+        gotData: false
+
+        onValueChanged: gotData = true
+    }
+}

{rinui-0.0.9.1.post1 → rinui-0.0.9.2}/RinUI/components/DateAndTime/PickerView.qml

@@ -17,15 +17,21 @@ Popup {
     property var value2: undefined
     property var value3: undefined
 
+    property alias index1: hours.currentIndex
+    property alias index2: minutes.currentIndex
+    property alias index3: added.currentIndex
+
     property var model1: 12
     property var model2: 60
     property var model3: [qsTr("AM"), qsTr("PM")]
 
-    readonly property bool gotData: typeof value1!== "undefined" && typeof value2!== "undefined"
+    property bool gotData: typeof value1!== "undefined" && typeof value2!== "undefined"
+
+    signal valueChanged(var value1, var value2, var value3)
 
     function formatText(count, modelData) {
-        let data = count === 60 ? modelData : modelData;
-        return data.toString().length < 2 && count !== 12  ? "0" + data
+        let data = modelData;
+        return data.toString().length < 2 && count === 60  ? "0" + data
             : data === 0 && count === 12 ? 12 : data
     }
 
@@ -136,6 +142,7 @@ Popup {
                     value1 = hours.currentItem.text
                     value2 = minutes.currentItem.text
                     typeof model3 !== "undefined" ? value3 = added.currentItem.text : undefined
+                    valueChanged(value1, value2, value3)
                     root.close()
                 }
             }
@@ -184,7 +191,7 @@ Popup {
                     )
                     added.positionViewAtIndex(
                         typeof value3 === "undefined" ? 0
-                        : typeof model3 === "number" ? value3 : model3.indexOf(value3), Tumbler.Center
+                        : typeof model3 === "number" ? value3 : model3.indexOf(parseInt(value3)), Tumbler.Center
                     )
                 }
             }

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

@@ -18,6 +18,8 @@ RowLayout {
     property int pushEnterFromY: height
     property var window: parent  // 窗口对象
 
+    signal pageChanged()  // 页面切换信号
+
     id: navigationView
     anchors.fill: parent
 
@@ -195,6 +197,7 @@ RowLayout {
         navigationBar.lastPages.push(navigationBar.currentPage)  // 记录当前页面
         navigationBar.lastPages = navigationBar.lastPages  // refresh
         navigationBar.currentPage = page.toString()
+        pageChanged()
 
         if (page instanceof Component) {
             // let obj = page.createObject(stackView)

{rinui-0.0.9.1.post1 → rinui-0.0.9.2}/RinUI/components/StatusAndInfo/InfoBar.qml

@@ -118,7 +118,7 @@ Frame {
             }
             Text {
                 id: bodyText
-                property bool wrap: (parent.width - titleText.width - custom.width - 24) < implicitWidth
+                property bool wrap: (infoBar.width - titleText.width - custom.width - 24) < implicitWidth
                 width: wrap ?
                     parent.width : implicitWidth
                 typography: Typography.Body

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

@@ -1,7 +1,7 @@
 import os
 import sys
 
-from PySide6.QtCore import QCoreApplication
+from PySide6.QtCore import QCoreApplication, QObject
 from PySide6.QtWidgets import QApplication, QWidget, QPushButton, QVBoxLayout
 from PySide6.QtQml import QQmlApplicationEngine
 from .theme import ThemeManager
@@ -29,7 +29,7 @@ class TestWindow(QWidget):
         self.resize(400, 300)
 
 
-class RinUIWindow:
+class RinUIWindow(QObject):
     # _instance = None
     #
     # def __new__(cls, *args, **kwargs):  # 单例模式管理
@@ -42,6 +42,7 @@ class RinUIWindow:
         创建基于 RinUI 的 QML 应用程序。
         :param qml_path: str, QML 文件路径
         """
+        super().__init__()
         if hasattr(self, "_initialized") and self._initialized:
             return
         self._initialized = True

{rinui-0.0.9.1.post1 → rinui-0.0.9.2}/RinUI/qmldir

@@ -20,6 +20,7 @@ Slider 1.0 components/BasicInput/Slider.qml
 
 # Date & Time
 TimePicker 1.0 components/DateAndTime/TimePicker.qml
+DatePicker 1.0 components/DateAndTime/DatePicker.qml
 PickerView 1.0 components/DateAndTime/PickerView.qml
 
 # Dialogs & Flyouts

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

@@ -5,7 +5,7 @@ import "../themes"
 import "../utils"
 
 QtObject {
-    property string fontFamily: Qt.application.font.family // 默认字体
+    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")  // 字体图标索引路径
@@ -26,4 +26,8 @@ QtObject {
     function loadFontIconIndex() {
         Qt.include(fontIconIndexSource);
     }
+
+    Component.onCompleted: {
+        console.log("Font Family: " + fontFamily)
+    }
 }

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

@@ -42,12 +42,6 @@ ApplicationWindow {
         }
     }
 
-    FloatLayer {
-        id: floatLayer
-        anchors.topMargin: titleBarHeight
-        z: 998
-    }
-
     // 布局
     ColumnLayout {
         anchors.fill: parent
@@ -117,6 +111,12 @@ ApplicationWindow {
         }
     }
 
+    FloatLayer {
+        id: floatLayer
+        anchors.topMargin: titleBarHeight
+        z: 998
+    }
+
 
     //改变鼠标形状
     MouseArea {

{rinui-0.0.9.1.post1 → rinui-0.0.9.2}/RinUI/windows/window/ApplicationWindow.qml

@@ -5,5 +5,5 @@ import "../../windows"
 FluentWindowBase {
     id: baseWindow
     frameless: false
-    default property alias content: baseWindow.data
+    default property alias content: baseWindow.content
 }

{rinui-0.0.9.1.post1 → rinui-0.0.9.2}/RinUI/windows/window/Window.qml

@@ -11,6 +11,7 @@ Window {
 
     color: frameless ? "transparent" : Theme.currentTheme.colors.backgroundColor
     property bool frameless: false
+    property alias floatLayer: baseWindow.floatLayer
     default property alias content: baseWindow.data
     property int titleBarHeight: Theme.currentTheme.appearance.dialogTitleBarHeight
 
@@ -37,6 +38,12 @@ Window {
         }
     }
 
+    FloatLayer {
+        id: floatLayer
+        anchors.topMargin: titleBarHeight
+        z: 998
+    }
+
     // 标题栏
     TitleBar {
         id: titleBar

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

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

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

@@ -71,7 +71,6 @@ RinUI/components/Text/SpinBox.qml
 RinUI/components/Text/Text.qml
 RinUI/components/Text/TextField.qml
 RinUI/components/Text/TextInput.qml
-RinUI/components/Utils/Blur.qml
 RinUI/config/rin_ui.json
 RinUI/core/__init__.py
 RinUI/core/config.py

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

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

rinui-0.0.9.1.post1/RinUI/components/DateAndTime/DatePicker.qml

@@ -1,115 +0,0 @@
-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.1.post1/RinUI/components/Utils/Blur.qml

@@ -1,42 +0,0 @@
-import QtQuick
-import Qt5Compat.GraphicalEffects
-import FluentUI
-
-Item {
-    id: control
-    property color tintColor: Qt.rgba(1, 1, 1, 1)
-    property real tintOpacity: 0.65
-    property real luminosity: 0.01
-    property real noiseOpacity: 0.02
-    property var target
-    property int blurRadius: 32
-    property rect targetRect: Qt.rect(control.x, control.y, control.width,control.height)
-
-    ShaderEffectSource {
-        id: effect_source
-        anchors.fill: parent
-        visible: false
-        sourceRect: control.targetRect
-        sourceItem: control.target
-    }
-    FastBlur {
-        id: fast_blur
-        anchors.fill: parent
-        source: effect_source
-        radius: control.blurRadius
-    }
-    Rectangle {
-        anchors.fill: parent
-        color: Qt.rgba(1, 1, 1, luminosity)
-    }
-    Rectangle {
-        anchors.fill: parent
-        color: Qt.rgba(tintColor.r, tintColor.g, tintColor.b, tintOpacity)
-    }
-    Image {
-        anchors.fill: parent
-        source: "qrc:/qt/qml/FluentUI/Image/noise.png"
-        fillMode: Image.Tile
-        opacity: control.noiseOpacity
-    }
-}