RinUI 0.0.9.2__tar.gz → 0.0.10.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RinUI
-Version: 0.0.9.2
+Version: 0.0.10.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

{rinui-0.0.9.2 → rinui-0.0.10.1}/RinUI/__init__.py

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

rinui-0.0.10.1/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.1/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.9.2 → rinui-0.0.10.1}/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.2 → rinui-0.0.10.1}/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.2 → rinui-0.0.10.1}/RinUI/components/StatusAndInfo/InfoBar.qml

@@ -104,6 +104,7 @@ Frame {
         }
 
         Flow {
+            id: flow
             Layout.alignment: Qt.AlignTop
             Layout.fillWidth: true
             Layout.topMargin: 3
@@ -118,7 +119,12 @@ Frame {
             }
             Text {
                 id: bodyText
-                property bool wrap: (infoBar.width - titleText.width - custom.width - 24) < implicitWidth
+                property bool wrap: (
+                    (
+                        infoBar.width - iconWidget.width - rights.width - main.spacing * 2 - infoBar.padding * 2
+                    )
+                    < implicitWidth
+                )
                 width: wrap ?
                     parent.width : implicitWidth
                 typography: Typography.Body

rinui-0.0.10.1/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.2 → rinui-0.0.10.1}/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.2 → rinui-0.0.10.1}/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.2 → rinui-0.0.10.1}/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.2 → rinui-0.0.10.1}/RinUI/core/launcher.py

@@ -1,18 +1,12 @@
 import os
 import sys
 
-from PySide6.QtCore import QCoreApplication, QObject
+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):
@@ -29,14 +23,7 @@ class TestWindow(QWidget):
         self.resize(400, 300)
 
 
-class RinUIWindow(QObject):
-    # _instance = None
-    #
-    # def __new__(cls, *args, **kwargs):  # 单例模式管理
-    #     if cls._instance is None:
-    #         cls._instance = super().__new__(cls)
-    #     return cls._instance
-
+class RinUIWindow:
     def __init__(self, qml_path: str):
         """
         创建基于 RinUI 的 QML 应用程序。
@@ -64,8 +51,7 @@ class RinUIWindow(QObject):
     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):
@@ -89,6 +75,19 @@ class RinUIWindow(QObject):
         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.

{rinui-0.0.9.2 → rinui-0.0.10.1}/RinUI/qmldir

@@ -8,6 +8,8 @@ FocusIndicator 1.0 components/FocusIndicator.qml
 
 # Basic Input
 Button 1.0 components/BasicInput/Button.qml
+RoundButton 1.0 components/BasicInput/RoundButton.qml
+PillButton 1.0 components/BasicInput/PillButton.qml
 DropDownButton 1.0 components/BasicInput/DropDownButton.qml
 ToggleButton 1.0 components/BasicInput/ToggleButton.qml
 ToolButton 1.0 components/BasicInput/ToolButton.qml
@@ -26,6 +28,7 @@ PickerView 1.0 components/DateAndTime/PickerView.qml
 # Dialogs & Flyouts
 Dialog 1.0 components/DialogsAndFlyouts/Dialog.qml
 Flyout 1.0 components/DialogsAndFlyouts/Flyout.qml
+TeachingTip 1.0 components/DialogsAndFlyouts/TeachingTip.qml
 
 # Layout
 Expander 1.0 components/Layout/Expander.qml
@@ -36,6 +39,7 @@ SettingItem 1.0 components/Layout/SettingItem.qml
 # Text
 Text 1.0 components/Text/Text.qml
 TextField 1.0 components/Text/TextField.qml
+TextArea 1.0 components/Text/TextArea.qml
 SpinBox 1.0 components/Text/SpinBox.qml
 TextInput 1.0 components/Text/TextInput.qml
 

{rinui-0.0.9.2 → rinui-0.0.10.1}/RinUI/windows/TitleBar.qml

@@ -57,6 +57,10 @@ Item {
 
             onPressed: {
                 clickPos = Qt.point(mouseX, mouseY)
+
+                if (!(Qt.platform.os !== "windows" || Qt.platform.os !== "winrt") && !Theme.isThemeMgrInitialized()) {
+                    return  // 在win环境使用原生方法拖拽
+                }
                 Theme.sendDragWindowEvent(window)
             }
             onDoubleClicked: toggleMaximized()

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

@@ -3,6 +3,7 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 2.15
 import "../../windows"
 import "../../themes"
+import "../../utils"
 
 Window {
     id: baseWindow
@@ -11,7 +12,6 @@ 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
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RinUI
-Version: 0.0.9.2
+Version: 0.0.10.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

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

@@ -28,7 +28,9 @@ RinUI/components/BasicInput/CheckBox.qml
 RinUI/components/BasicInput/ComboBox.qml
 RinUI/components/BasicInput/DropDownButton.qml
 RinUI/components/BasicInput/Hyperlink.qml
+RinUI/components/BasicInput/PillButton.qml
 RinUI/components/BasicInput/RadioButton.qml
+RinUI/components/BasicInput/RoundButton.qml
 RinUI/components/BasicInput/Slider.qml
 RinUI/components/BasicInput/Switch.qml
 RinUI/components/BasicInput/ToggleButton.qml
@@ -69,6 +71,7 @@ RinUI/components/StatusAndInfo/Toast.qml
 RinUI/components/StatusAndInfo/ToolTip.qml
 RinUI/components/Text/SpinBox.qml
 RinUI/components/Text/Text.qml
+RinUI/components/Text/TextArea.qml
 RinUI/components/Text/TextField.qml
 RinUI/components/Text/TextInput.qml
 RinUI/config/rin_ui.json

{rinui-0.0.9.2 → rinui-0.0.10.1}/pyproject.toml

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