RinUI 0.0.9.1.post1__tar.gz → 0.0.10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RinUI
-Version: 0.0.9.1.post1
+Version: 0.0.10
 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.10}/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.10}/RinUI/__init__.py

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

rinui-0.0.10/RinUI/components/BasicInput/PillButton.qml

@@ -0,0 +1,11 @@
+import QtQuick 2.15
+import QtQuick.Controls.Basic 2.15
+import QtQuick.Layouts 2.15
+import "../../themes"
+import "../../components"
+
+RoundButton {
+    id: root
+    highlighted: checked
+    checkable: true
+}

rinui-0.0.10/RinUI/components/BasicInput/RoundButton.qml

@@ -0,0 +1,27 @@
+import QtQuick 2.15
+import QtQuick.Controls.Basic 2.15
+import QtQuick.Layouts 2.15
+import Qt5Compat.GraphicalEffects
+import "../../themes"
+import "../../components"
+
+Button {
+    id: root
+    property alias radius: background.radius
+    backgroundColor: highlighted ? primaryColor : Theme.currentTheme.colors.controlQuaternaryColor
+
+    background: Rectangle {
+        id: background
+        anchors.fill: parent
+        color: hovered ? hoverColor : backgroundColor
+        radius: height / 2
+
+        border.width: Theme.currentTheme.appearance.borderWidth  // 边框宽度 / Border Width
+        border.color: flat ? "transparent" :
+            enabled ? highlighted ? primaryColor : Theme.currentTheme.colors.controlBorderColor :
+            highlighted ? Theme.currentTheme.colors.disabledColor : Theme.currentTheme.colors.controlBorderColor
+
+        Behavior on color { ColorAnimation { duration: Utils.appearanceSpeed; easing.type: Easing.OutQuart } }
+        opacity: flat && !hovered || !hoverable ? 0 : 1
+    }
+}

rinui-0.0.10/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.10}/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.10}/RinUI/components/MenusAndToolbars/Menu.qml

@@ -19,7 +19,8 @@ Menu {
             case Position.Right:
                 return parent.width + 5
             default:
-                return (parent.width - root.width) / 2
+                // return (parent.width - root.width) / 2
+                return root.x
         }
     }
 
@@ -33,7 +34,8 @@ Menu {
             case Position.Right:
                 return (parent.height - root.height) / 2
             default:
-                return -root.height + 5  // 默认顶部
+                // return -root.height + 5  // 默认顶部
+                return root.y
         }
     }
 
@@ -49,7 +51,7 @@ Menu {
                 property: "opacity"
                 from: 0
                 to: 1
-                duration: 70
+                duration: Utils.animationSpeed
                 easing.type: Easing.InOutQuart
             }
             NumberAnimation {

{rinui-0.0.9.1.post1 → rinui-0.0.10}/RinUI/components/MenusAndToolbars/MenuItem.qml

@@ -116,4 +116,17 @@ MenuItem {
 
         Behavior on color { ColorAnimation { duration: Utils.animationSpeed; easing.type: Easing.OutQuart } }
     }
+
+    // States //
+    // 状态变化
+    states: [
+        State {
+        name: "disabled"
+            when: !enabled
+            PropertyChanges {
+                target: root
+                opacity: 0.3628
+            }
+        }
+    ]
 }

{rinui-0.0.9.1.post1 → rinui-0.0.10}/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.10}/RinUI/components/StatusAndInfo/InfoBar.qml

@@ -118,7 +118,13 @@ Frame {
             }
             Text {
                 id: bodyText
-                property bool wrap: (parent.width - titleText.width - custom.width - 24) < implicitWidth
+                property bool wrap: (
+                    (
+                        infoBar.width - iconWidget.width - rights.width - main.spacing * 2 - infoBar.padding * 2
+                        - (titleText.width + custom.width + 24)
+                    )
+                    < implicitWidth
+                )
                 width: wrap ?
                     parent.width : implicitWidth
                 typography: Typography.Body

rinui-0.0.10/RinUI/components/Text/TextArea.qml

@@ -0,0 +1,146 @@
+import QtQuick 2.15
+import Qt5Compat.GraphicalEffects
+import QtQuick.Controls.Basic 2.15
+import "../../themes"
+import "../../components"
+
+TextArea {
+    id: root
+
+    property bool frameless: false
+    property bool editable: true
+    property color primaryColor: Theme.currentTheme.colors.primaryColor
+
+    selectByMouse: true
+    enabled: editable
+
+    // Menu
+    Menu {
+        id: contextMenu
+        position: -1
+        Action {
+            icon.name: "ic_fluent_cut_20_regular"
+            text: qsTr("Cut")
+            enabled: root.selectedText.length > 0 && root.editable  // 选中&可编辑
+            shortcut: "Ctrl+X"
+            onTriggered: root.cut()
+        }
+        Action {
+            icon.name: "ic_fluent_copy_20_regular"
+            text: qsTr("Copy")
+            enabled: root.selectedText.length > 0  // 选中内容
+            shortcut: "Ctrl+C"
+            onTriggered: root.copy()
+        }
+        Action {
+            icon.name: "ic_fluent_clipboard_paste_20_regular"
+            text: qsTr("Paste")
+            enabled: root.editable
+            shortcut: "Ctrl+V"
+            onTriggered: root.paste()
+        }
+        Action {
+            icon.name: " "
+            text: qsTr("Select All")
+            shortcut: "Ctrl+A"
+            onTriggered: root.selectAll()
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.RightButton
+        propagateComposedEvents: true
+        onPressed: (mouse) => {
+            if (mouse.button === Qt.RightButton)
+                contextMenu.popup(mouse.scenePosition)
+            mouse.accepted = false
+        }
+
+        // 鼠标
+        cursorShape: Qt.IBeamCursor
+    }
+
+    // 背景 / Background //
+    background: Rectangle {
+        id: background
+        anchors.fill: parent
+        radius: Theme.currentTheme.appearance.buttonRadius
+        color: frameless ? "transparent" : Theme.currentTheme.colors.controlColor
+        clip: true
+        border.width: Theme.currentTheme.appearance.borderWidth
+        border.color: frameless ? root.activeFocus ? Theme.currentTheme.colors.controlBorderColor : "transparent" :
+            Theme.currentTheme.colors.controlBorderColor
+
+        layer.enabled: true
+        layer.smooth: true
+        layer.effect: OpacityMask {
+            maskSource: Rectangle {
+                width: background.width
+                height: background.height
+                radius: background.radius
+            }
+        }
+
+        // 底部指示器 / indicator //
+        Rectangle {
+            id: indicator
+            width: parent.width
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.bottom: parent.bottom
+            radius: 999
+            height: root.activeFocus ? Theme.currentTheme.appearance.borderWidth * 2 : Theme.currentTheme.appearance.borderWidth
+            color: root.activeFocus ? primaryColor : frameless ? "transparent" : Theme.currentTheme.colors.textControlBorderColor
+
+            Behavior on color { ColorAnimation { duration: Utils.animationSpeed; easing.type: Easing.OutQuint } }
+            Behavior on height { NumberAnimation { duration: Utils.animationSpeed; easing.type: Easing.OutQuint } }
+        }
+    }
+
+    Behavior on opacity { NumberAnimation { duration: Utils.animationSpeed; easing.type: Easing.OutQuint } }
+
+
+    // 字体 / Font //
+    font.pixelSize: Theme.currentTheme.typography.bodySize
+
+    wrapMode: Text.WordWrap  // 自动换行
+    selectionColor: Theme.currentTheme.colors.primaryColor
+    color: Theme.currentTheme.colors.textColor
+    placeholderTextColor: Theme.currentTheme.colors.textSecondaryColor
+
+    leftPadding: 12
+    rightPadding: 12
+    topPadding: 5
+    bottomPadding: 7
+
+    // 动画 / Animation //
+    Behavior on implicitHeight { NumberAnimation { duration: Utils.animationSpeed; easing.type: Easing.OutQuint } }
+
+    // 状态
+    states: [
+        State {
+        name: "disabled"
+            when: !enabled
+            PropertyChanges {  // 禁用时禁止改变属性
+                target: root;
+                opacity: !editable ? 1 : 0.4
+            }
+        },
+        State {
+            name: "pressed&focused"
+            when: activeFocus
+            PropertyChanges {
+                target: background;
+                color: Theme.currentTheme.colors.controlInputActiveColor
+            }
+        },
+        State {
+            name: "hovered"
+            when: hovered
+            PropertyChanges {
+                target: background;
+                color: Theme.currentTheme.colors.controlSecondaryColor
+            }
+        }
+    ]
+}

{rinui-0.0.9.1.post1 → rinui-0.0.10}/RinUI/components/Text/TextField.qml

@@ -2,6 +2,7 @@ import QtQuick 2.15
 import Qt5Compat.GraphicalEffects
 import QtQuick.Controls.Basic 2.15
 import "../../themes"
+import "../../components"
 
 TextField {
     id: root
@@ -13,6 +14,53 @@ TextField {
     selectByMouse: true
     enabled: editable
 
+    // Menu
+    Menu {
+        id: contextMenu
+        position: -1
+        Action {
+            icon.name: "ic_fluent_cut_20_regular"
+            text: qsTr("Cut")
+            enabled: root.selectedText.length > 0 && root.editable  // 选中&可编辑
+            shortcut: "Ctrl+X"
+            onTriggered: root.cut()
+        }
+        Action {
+            icon.name: "ic_fluent_copy_20_regular"
+            text: qsTr("Copy")
+            enabled: root.selectedText.length > 0  // 选中内容
+            shortcut: "Ctrl+C"
+            onTriggered: root.copy()
+        }
+        Action {
+            icon.name: "ic_fluent_clipboard_paste_20_regular"
+            text: qsTr("Paste")
+            enabled: root.editable
+            shortcut: "Ctrl+V"
+            onTriggered: root.paste()
+        }
+        Action {
+            icon.name: " "
+            text: qsTr("Select All")
+            shortcut: "Ctrl+A"
+            onTriggered: root.selectAll()
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.RightButton
+        propagateComposedEvents: true
+        onPressed: (mouse) => {
+            if (mouse.button === Qt.RightButton)
+                contextMenu.popup(mouse.scenePosition)
+            mouse.accepted = false
+        }
+
+        // 鼠标
+        cursorShape: Qt.IBeamCursor
+    }
+
     // 背景 / Background //
     background: Rectangle {
         id: background

{rinui-0.0.9.1.post1 → rinui-0.0.10}/RinUI/components/qmldir

@@ -14,6 +14,7 @@ ScrollView 1.0 ScrollView.qml
 
 # Basic Input
 Button 1.0 BasicInput/Button.qml
+RoundButton 1.0 BasicInput/RoundButton.qml
 HyperlinkButton 1.0 BasicInput/HyperlinkButton.qml
 Slider 1.0 BasicInput/Slider.qml
 Hyperlink 1.0 BasicInput/Hyperlink.qml

{rinui-0.0.9.1.post1 → rinui-0.0.10}/RinUI/core/config.py

@@ -1,6 +1,7 @@
 import os
 import json
 import platform
+import sys
 from enum import Enum
 
 
@@ -22,8 +23,18 @@ def is_windows():
     return platform.system() == 'Windows'
 
 
+def resource_path(relative_path):
+    """兼容 PyInstaller 打包和开发环境的路径"""
+    if hasattr(sys, '_MEIPASS'):
+        return os.path.join(sys._MEIPASS, relative_path)
+    return os.path.abspath(relative_path)
+
+
+rinui_core_path = os.path.abspath(os.path.dirname(__file__))  # RinUI/core 目录
+
 BASE_DIR = os.path.abspath(os.getcwd())
 PATH = os.path.join(BASE_DIR, "RinUI/config")
+RINUI_PATH = resource_path(os.path.join(rinui_core_path, "../../"))  # 使用 resource_path 处理路径
 DEFAULT_CONFIG = {
     "language": "zh_CN",
     "theme": {

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

@@ -1,18 +1,12 @@
 import os
 import sys
 
-from PySide6.QtCore import QCoreApplication
+from PySide6.QtCore import QCoreApplication, QUrl
+from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QApplication, QWidget, QPushButton, QVBoxLayout
 from PySide6.QtQml import QQmlApplicationEngine
 from .theme import ThemeManager
-from .config import BackdropEffect, is_windows, Theme
-
-
-def resource_path(relative_path):
-    """兼容 PyInstaller 打包和开发环境的路径"""
-    if hasattr(sys, '_MEIPASS'):
-        return os.path.join(sys._MEIPASS, relative_path)
-    return os.path.abspath(relative_path)
+from .config import BackdropEffect, is_windows, Theme, RINUI_PATH
 
 
 class TestWindow(QWidget):
@@ -30,18 +24,12 @@ class TestWindow(QWidget):
 
 
 class RinUIWindow:
-    # _instance = None
-    #
-    # def __new__(cls, *args, **kwargs):  # 单例模式管理
-    #     if cls._instance is None:
-    #         cls._instance = super().__new__(cls)
-    #     return cls._instance
-
     def __init__(self, qml_path: str):
         """
         创建基于 RinUI 的 QML 应用程序。
         :param qml_path: str, QML 文件路径
         """
+        super().__init__()
         if hasattr(self, "_initialized") and self._initialized:
             return
         self._initialized = True
@@ -63,8 +51,7 @@ class RinUIWindow:
     def _setup_application(self):
         """Setup"""
         # RInUI 模块
-        rinui_path = os.path.abspath(os.path.dirname(__file__))  # RinUI/core 目录
-        rinui_import_path = resource_path(os.path.join(rinui_path, "../../"))  # 使用 resource_path 处理路径
+        rinui_import_path = RINUI_PATH
         print(f"UI Module Path: {rinui_import_path}")
 
         if os.path.exists(rinui_import_path):
@@ -88,6 +75,19 @@ class RinUIWindow:
         self.theme_manager.set_window(self.root_window)
         self._apply_windows_effects() if self.autoSetWindowsEffect else None
 
+    def setIcon(self, path: str) -> None:
+        """
+        设置应用程序图标。
+        :param path: str, 图标路径
+        :return:
+        """
+        app_instance = QApplication.instance()
+        if app_instance:
+            app_instance.setWindowIcon(QIcon(path))  # 设置应用程序图标
+            self.root_window.setProperty('icon', QUrl.fromLocalFile(path))
+        else:
+            raise RuntimeError("Cannot set icon before QApplication is created.")
+
     def _apply_windows_effects(self):
         """
         Apply Windows effects to the window.