RinUI 0.0.11__py3-none-any.whl → 0.1.1__py3-none-any.whl

RinUI/themes/light.qml

@@ -1,137 +1,146 @@
-
-import QtQuick 2.15
-import "../themes"
-
-QtObject {
-    property string name: "Light"
-    property bool isDark: false
-
-    // Colors //
-    property QtObject colors: QtObject {
-        // Controls
-        property color controlColor: Qt.alpha("#ffffff", 0.7)
-        property color controlSecondaryColor: Qt.alpha("#F9F9F9", 0.5)
-        property color controlTertiaryColor: Qt.alpha("#F9F9F9", 0.3)
-        property color controlQuaternaryColor: Qt.alpha("#F3F3F3", 0.76)
-        property color controlStrongColor: Qt.alpha("#000000", 0.4458)
-        property color controlInputActiveColor: "#ffffff"
-
-        property color controlBorderColor: Qt.alpha("#000000", 0.06)
-        property color controlBottomBorderColor: Qt.alpha("#000000", 0.16)
-        property color controlAccentBottomBorderColor: Qt.alpha("#000000", 0.4)
-        property color controlBorderStrongColor: Qt.alpha("#000000", 0.6063)
-        property color controlBorderAccentColor: Qt.alpha("#000000", 0.3)
-        property color textControlBorderColor: Qt.alpha("#000000", 0.45)
-        property color textControlBorderFocusedColor: Utils.primaryColor
-        property color flyoutBorderColor: Qt.alpha("#000000", 0.0578)
-
-        property color controlSolidColor: "#ffffff"
-        property color dividerBorderColor: Qt.alpha("#000000", 0.0803)
-        // Accessibility
-        property color focusBorderOuter: Qt.alpha("#000000", 0.8956)
-        property color focusBorderInner: "#ffffff"
-
-        // Card
-        property color cardColor: Qt.alpha("#ffffff", 0.7)
-        property color cardSecondaryColor: Qt.alpha("#F6F6F6", 0.5)
-        property color cardTertiaryColor: Qt.alpha("#ffffff", 1)
-        property color cardBorderColor: Qt.alpha("#000000", 0.0578)
-
-        // Background
-        property color backgroundColor: "#F3F3F3"
-        property color windowBorderColor: Qt.alpha("#757575", 0.0924)
-        property color backgroundAcrylicColor: "#F9F9F9"
-        property color backgroundSmokeColor: Qt.alpha("#000000", 0.3)
-
-        property color subtleColor: "transparent"
-        property color subtleSecondaryColor: Qt.alpha("#000000", 0.0373)
-        property color subtleTertiaryColor: Qt.alpha("#000000", 0.0241)
-        property color captionCloseColor: "#c42b1c"
-        property color captionCloseTextColor: "#ffffff"
-
-        // Layer
-        property color layerColor: Qt.alpha("#ffffff", 0.5)
-
-        // Text
-        property color textColor: "#1b1b1b"
-        property color textSecondaryColor: Qt.alpha("#000000", 0.6063)
-        property color textAccentColor: primaryColor
-        property color textOnAccentColor: "#ffffff"
-        property color textSelectedColor: "#ffffff"
-
-        property color primaryColor: Utils.primaryColor
-        property color disabledColor: "#000000"
-
-        // System Colors
-        property color systemAttentionColor: primaryColor
-        property color systemSuccessColor: "#0f7b0f"
-        property color systemCautionColor: "#9d5d00"
-        property color systemCriticalColor: "#c42b1c"
-        property color systemNeutralColor: "#8d8d8d"
-
-        property color systemAttentionBackgroundColor: "#fbfbfb"
-        property color systemSuccessBackgroundColor: "#dff6dd"
-        property color systemCautionBackgroundColor: "#fff4ce"
-        property color systemCriticalBackgroundColor: "#fde7e9"
-        property color systemNeutralBackgroundColor: "#f9f9f9"
-    }
-
-    // Appearance //
-    property QtObject appearance: QtObject {
-        property int buttonRadius: 5
-        property int borderWidth: 1
-        property real borderFactor: 0.9
-        property real borderOnAccentFactor: 1.08
-        property int smallRadius: 3
-
-        property int dialogTitleBarHeight: 32
-        property int windowTitleBarHeight: 48
-        property int windowRadius: 7
-        property int windowButtonWidth: 46
-
-        property int scrollBarMinWidth: 2
-        property int scrollBarWidth: 6
-        property int scrollBarPadding: 3
-
-        property int sliderHandleSize: 20
-    }
-
-    // Shadows //
-    property var shadows: {
-        "dialog": {
-            "color": Qt.alpha("#000000", 0.19),  // 模糊颜色
-            "blur": 64,  // 模糊度
-            "offsetY": 32
-        },
-        "tooltip": {
-            "color": Qt.alpha("#000000", 0.14),
-            "blur": 8,
-            "offsetY": 4
-        },
-        "cardRest": {
-            "color": Qt.alpha("#000000", 0.04),
-            "blur": 4,
-            "offsetY": 2
-        },
-        "flyout": {
-            "color": Qt.alpha("#000000", 0.14),
-            "blur": 24,
-            "offsetY": 8
-        },
-    }
-
-    // Typography //
-    property QtObject typography: QtObject {
-        // property string fontFamily: "Segoe UI"
-        // property string fontIcon: "FluentSystemIcons-Resizeable.ttf"  // 字体图标路径 / font icon (put it in the "assets/fonts" folder)
-        // Font Sizes
-        property int displaySize: 68
-        property int titleLargeSize: 40
-        property int titleSize: 28
-        property int subtitleSize: 20
-        property int bodyLargeSize: 18
-        property int bodySize: 14
-        property int bodyStrongSize: 14
-        property int captionSize: 12
-    }
+
+import QtQuick 2.15
+import "../themes"
+
+QtObject {
+    property string name: "Light"
+    property bool isDark: false
+
+    // Colors //
+    property QtObject colors: QtObject {
+        // Controls
+        property color controlColor: Qt.alpha("#ffffff", 0.7)
+        property color controlSecondaryColor: Qt.alpha("#F9F9F9", 0.5)
+        property color controlTertiaryColor: Qt.alpha("#F9F9F9", 0.3)
+        property color controlQuaternaryColor: Qt.alpha("#F3F3F3", 0.76)
+        property color controlStrongColor: Qt.alpha("#000000", 0.4458)
+        property color controlInputActiveColor: "#ffffff"
+
+        property color controlAltSecondaryColor: Qt.alpha("#000000", 0.0241)
+        property color controlAltTertiaryColor: Qt.alpha("#000000", 0.0578)
+        property color controlAltQuaternaryColor: Qt.alpha("#000000", 0.0924)
+
+        property color controlFillColor: Qt.alpha("#ffffff", 0.7)
+        property color controlFillSecondaryColor: Qt.alpha("#F9F9F9", 0.5)
+        property color controlFillTertiaryColor: Qt.alpha("#F9F9F9", 0.3)
+        property color controlFillQuaternaryColor: Qt.alpha("#F3F3F3", 0.76)
+
+        property color controlBorderColor: Qt.alpha("#000000", 0.06)
+        property color controlBottomBorderColor: Qt.alpha("#000000", 0.16)
+        property color controlAccentBottomBorderColor: Qt.alpha("#000000", 0.4)
+        property color controlBorderStrongColor: Qt.alpha("#000000", 0.6063)
+        property color controlBorderAccentColor: Qt.alpha("#000000", 0.3)
+        property color textControlBorderColor: Qt.alpha("#000000", 0.45)
+        property color textControlBorderFocusedColor: Utils.primaryColor
+        property color flyoutBorderColor: Qt.alpha("#000000", 0.0578)
+
+        property color controlSolidColor: "#ffffff"
+        property color dividerBorderColor: Qt.alpha("#000000", 0.0803)
+        // Accessibility
+        property color focusBorderOuter: Qt.alpha("#000000", 0.8956)
+        property color focusBorderInner: "#ffffff"
+
+        // Card
+        property color cardColor: Qt.alpha("#ffffff", 0.7)
+        property color cardSecondaryColor: Qt.alpha("#F6F6F6", 0.5)
+        property color cardTertiaryColor: Qt.alpha("#ffffff", 1)
+        property color cardBorderColor: Qt.alpha("#000000", 0.0578)
+
+        // Background
+        property color backgroundColor: "#F3F3F3"
+        property color windowBorderColor: Qt.alpha("#757575", 0.0924)
+        property color backgroundAcrylicColor: "#F9F9F9"
+        property color backgroundSmokeColor: Qt.alpha("#000000", 0.3)
+
+        property color subtleColor: Qt.alpha("#ffffff", 0)
+        property color subtleSecondaryColor: Qt.alpha("#000000", 0.0373)
+        property color subtleTertiaryColor: Qt.alpha("#000000", 0.0241)
+        property color captionCloseColor: "#c42b1c"
+        property color captionCloseTextColor: "#ffffff"
+
+        // Layer
+        property color layerColor: Qt.alpha("#ffffff", 0.5)
+
+        // Text
+        property color textColor: "#1b1b1b"
+        property color textSecondaryColor: Qt.alpha("#000000", 0.6063)
+        property color textAccentColor: primaryColor
+        property color textOnAccentColor: "#ffffff"
+        property color textSelectedColor: "#ffffff"
+
+        property color primaryColor: Utils.primaryColor
+        property color disabledColor: "#000000"
+
+        // System Colors
+        property color systemAttentionColor: primaryColor
+        property color systemSuccessColor: "#0f7b0f"
+        property color systemCautionColor: "#9d5d00"
+        property color systemCriticalColor: "#c42b1c"
+        property color systemNeutralColor: "#8d8d8d"
+
+        property color systemAttentionBackgroundColor: "#fbfbfb"
+        property color systemSuccessBackgroundColor: "#dff6dd"
+        property color systemCautionBackgroundColor: "#fff4ce"
+        property color systemCriticalBackgroundColor: "#fde7e9"
+        property color systemNeutralBackgroundColor: "#f9f9f9"
+    }
+
+    // Appearance //
+    property QtObject appearance: QtObject {
+        property int buttonRadius: 5
+        property int borderWidth: 1
+        property real borderFactor: 0.9
+        property real borderOnAccentFactor: 1.08
+        property int smallRadius: 3
+
+        property int dialogTitleBarHeight: 32
+        property int windowTitleBarHeight: 48
+        property int windowRadius: 7
+        property int windowButtonWidth: 46
+
+        property int scrollBarMinWidth: 2
+        property int scrollBarWidth: 6
+        property int scrollBarPadding: 3
+
+        property int sliderHandleSize: 20
+    }
+
+    // Shadows //
+    property var shadows: {
+        "dialog": {
+            "color": Qt.alpha("#000000", 0.19),  // 模糊颜色
+            "blur": 64,  // 模糊度
+            "offsetY": 32
+        },
+        "tooltip": {
+            "color": Qt.alpha("#000000", 0.14),
+            "blur": 8,
+            "offsetY": 4
+        },
+        "cardRest": {
+            "color": Qt.alpha("#000000", 0.04),
+            "blur": 4,
+            "offsetY": 2
+        },
+        "flyout": {
+            "color": Qt.alpha("#000000", 0.14),
+            "blur": 24,
+            "offsetY": 8
+        },
+    }
+
+    // Typography //
+    property QtObject typography: QtObject {
+        // property string fontFamily: "Segoe UI"
+        // property string fontIcon: "FluentSystemIcons-Resizeable.ttf"  // 字体图标路径 / font icon (put it in the "assets/fonts" folder)
+        // Font Sizes
+        property int displaySize: 68
+        property int titleLargeSize: 40
+        property int titleSize: 28
+        property int subtitleSize: 20
+        property int bodyLargeSize: 18
+        property int bodySize: 14
+        property int bodyStrongSize: 14
+        property int captionSize: 12
+    }
 }

RinUI/themes/qmldir

@@ -1,7 +1,10 @@
-module RinUI.themes
-
-singleton Theme 1.0 theme.qml
-singleton Utils 1.0 utils.qml
-
-Light 1.0 light.qml
+module RinUI.themes
+
+singleton Theme 1.0 theme.qml
+singleton Utils 1.0 utils.qml
+singleton Colors Colors.qml
+singleton Appearance Appearance.qml
+
+
+Light 1.0 light.qml
 Dark 1.0 dark.qml

RinUI/themes/theme.qml

@@ -1,150 +1,152 @@
-pragma Singleton
-import QtQuick 2.15
-// import "../themes"
-
-Item {
-    id: themeManager
-
-    property var currentTheme: null
-    readonly property var mode: ({
-        Light: "Light",
-        Dark: "Dark",
-        Auto: "Auto"
-    })
-    readonly property var effect: ({
-        Mica: "mica",
-        Acrylic: "acrylic",
-        Tabbed: "tabbed",
-        None: "none"
-    })
-
-    // 初始化时设置默认主题
-    Component.onCompleted: {
-        if (typeof ThemeManager === "undefined") {
-            currentTheme = Qt.createQmlObject("import '../themes'; Light {}", themeManager)
-        } else {
-            Utils.primaryColor = getThemeColor()
-            setTheme(ThemeManager.get_theme_name())
-        }
-    }
-
-    function _isThemeMgrInitialized() {
-        return typeof ThemeManager!== "undefined"
-    }
-
-    function setBackdropEffect(effect) {
-        if (!_isThemeMgrInitialized()) {
-            console.error("ThemeManager is not defined.")
-            return -1
-        }
-        ThemeManager.apply_backdrop_effect(effect)
-    }
-
-    function sendDragWindowEvent(window) {
-        if (!_isThemeMgrInitialized()) {
-            console.error("ThemeManager is not defined.")
-            return -1
-        }
-        ThemeManager.dragWindowEvent(ThemeManager.getWindowId(window))
-    }
-
-    function getBackdropEffect() {
-        if (!_isThemeMgrInitialized()) {
-            console.error("ThemeManager is not defined.")
-            return -1
-        }
-        return ThemeManager.get_backdrop_effect()
-    }
-
-    function setThemeColor(color) {
-        if (!_isThemeMgrInitialized()) {
-            console.error("ThemeManager is not defined.")
-            return -1
-        }
-        if (typeof color !== "string") {
-            console.error("Invalid color format. Expected a string.")
-            return -1
-        }
-        Utils.primaryColor = color
-        ThemeManager.set_theme_color(color)
-    }
-
-    function getThemeColor() {
-        if (!_isThemeMgrInitialized()) {
-            console.error("ThemeManager is not defined.")
-            return -1
-        }
-        return ThemeManager.get_theme_color()
-    }
-
-    function getTheme() {
-        if (!_isThemeMgrInitialized()) {
-            console.error("ThemeManager is not defined.")
-            return -1
-        }
-        return ThemeManager.get_theme_name()
-    }
-
-    // 本来打算写多主题支持的（）
-
-    function toggleMode() {
-        if (!_isThemeMgrInitialized()) {
-            console.error("ThemeManager is not defined.")
-            return -1
-        }
-        let theme_mode;
-        if (!currentTheme.isDark) {
-            theme_mode = mode.Dark
-        } else {
-            theme_mode = mode.Light
-        }
-        setTheme(theme_mode)
-    }
-
-    // 切换主题
-    function setTheme(theme_mode: mode) {
-        if (!_isThemeMgrInitialized()) {
-            console.error("ThemeManager is not defined.")
-            currentTheme = Qt.createQmlObject("import '../themes'; Light {}", themeManager)
-            return
-        }
-
-        // Call Python backend to toggle theme
-        ThemeManager.toggle_theme(theme_mode)
-
-        // Get the actual theme name
-        var themeName = ThemeManager.get_theme_name()
-        if (themeName === mode.Auto) {
-            // Get the actual theme applied (Light or Dark)
-            themeName = ThemeManager.get_theme()
-        }
-        load_qml(themeName)
-        return 0;
-    }
-
-    function load_qml(themeName) {
-        if (themeName) {
-            let themeObject = Qt.createQmlObject("import '../themes'; " + themeName + " {}", themeManager)
-            let mode = ThemeManager.get_theme()
-            if (themeObject) {
-                currentTheme = themeObject
-                console.log("Switched to", mode, "mode")
-            } else {
-                console.error("Failed to create theme object for mode:", mode)
-            }
-        } else {
-            console.error("Invalid theme mode:", mode)
-        }
-    }
-
-    // 监听系统主题变化
-    Connections {
-        target: ThemeManager
-        function onThemeChanged(theme) {
-            load_qml(theme)
-        }
-        function onBackdropChanged(effect) {
-            Utils.backdropEnabled = effect !== "none";
-        }
-    }
+pragma Singleton
+import QtQuick 2.15
+// import "../themes"
+
+Item {
+    id: themeManager
+
+    property var currentTheme: null
+    readonly property var mode: ({
+        Light: "Light",
+        Dark: "Dark",
+        Auto: "Auto"
+    })
+    readonly property var effect: ({
+        Mica: "mica",
+        Acrylic: "acrylic",
+        Tabbed: "tabbed",
+        None: "none"
+    })
+
+    // 初始化时设置默认主题
+    Component.onCompleted: {
+        if (typeof ThemeManager === "undefined") {
+            currentTheme = Qt.createQmlObject("import '../themes'; Light {}", themeManager)
+        } else {
+            Utils.primaryColor = getThemeColor()
+            setTheme(ThemeManager.get_theme_name())
+        }
+    }
+
+    function _isThemeMgrInitialized() {
+        return typeof ThemeManager!== "undefined"
+    }
+
+    function isDark() {
+        return currentTheme.isDark
+    }
+
+    function setBackdropEffect(effect) {
+        if (!_isThemeMgrInitialized()) {
+            console.error("ThemeManager is not defined.")
+            return -1
+        }
+        ThemeManager.apply_backdrop_effect(effect)
+    }
+
+    function sendDragWindowEvent(window) {
+        if (!_isThemeMgrInitialized()) {
+            console.error("ThemeManager is not defined.")
+            return -1
+        }
+        ThemeManager.dragWindowEvent(ThemeManager.getWindowId(window))
+    }
+
+    function getBackdropEffect() {
+        if (!_isThemeMgrInitialized()) {
+            console.error("ThemeManager is not defined.")
+            return -1
+        }
+        return ThemeManager.get_backdrop_effect()
+    }
+
+    function setThemeColor(color) {
+        if (!_isThemeMgrInitialized()) {
+            console.error("ThemeManager is not defined.")
+            return -1
+        }
+        if (typeof color !== "string") {
+            console.error("Invalid color format. Expected a string.")
+            return -1
+        }
+        Utils.primaryColor = color
+        ThemeManager.set_theme_color(color)
+    }
+
+    function getThemeColor() {
+        if (!_isThemeMgrInitialized()) {
+            console.error("ThemeManager is not defined.")
+            return -1
+        }
+        return ThemeManager.get_theme_color()
+    }
+
+    function getTheme() {
+        if (!_isThemeMgrInitialized()) {
+            console.error("ThemeManager is not defined.")
+            return -1
+        }
+        return ThemeManager.get_theme_name()
+    }
+
+    function toggleMode() {
+        if (!_isThemeMgrInitialized()) {
+            console.error("ThemeManager is not defined.")
+            return -1
+        }
+        let theme_mode;
+        if (!currentTheme.isDark) {
+            theme_mode = mode.Dark
+        } else {
+            theme_mode = mode.Light
+        }
+        setTheme(theme_mode)
+    }
+
+    // 切换主题
+    function setTheme(theme_mode: mode) {
+        if (!_isThemeMgrInitialized()) {
+            console.error("ThemeManager is not defined.")
+            currentTheme = Qt.createQmlObject("import '../themes'; Light {}", themeManager)
+            return
+        }
+
+        // Call Python backend to toggle theme
+        ThemeManager.toggle_theme(theme_mode)
+
+        // Get the actual theme name
+        var themeName = ThemeManager.get_theme_name()
+        if (themeName === mode.Auto) {
+            // Get the actual theme applied (Light or Dark)
+            themeName = ThemeManager.get_theme()
+        }
+        load_qml(themeName)
+        return 0;
+    }
+
+    function load_qml(themeName) {
+        if (themeName) {
+            let themeObject = Qt.createQmlObject("import '../themes'; " + themeName + " {}", themeManager)
+            let mode = ThemeManager.get_theme()
+            if (themeObject) {
+                currentTheme = themeObject
+                console.log("Switched to", mode, "mode")
+            } else {
+                console.error("Failed to create theme object for mode:", mode)
+            }
+        } else {
+            console.error("Invalid theme mode:", mode)
+        }
+    }
+
+    // 监听系统主题变化
+    Connections {
+        target: ThemeManager
+        function onThemeChanged(theme) {
+            load_qml(theme)
+        }
+        function onBackdropChanged(effect) {
+            Utils.backdropEnabled = effect !== "none";
+        }
+    }
 }