monkeyqt 0.2.1__tar.gz → 0.2.2__tar.gz

{monkeyqt-0.2.1 → monkeyqt-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monkeyqt
-Version: 0.2.1
+Version: 0.2.2
 Summary: An Enterprise-grade PySide6 UI Component Library
 Project-URL: Homepage, https://github.com/luohuabuxiema/MonkeyQt
 Requires-Python: >=3.8

{monkeyqt-0.2.1 → monkeyqt-0.2.2}/monkeyqt/__init__.py

@@ -1,11 +1,19 @@
 # -*- coding: utf-8 -*-
 from .components.basic.button import MkButton
 from .components.basic.checkbox import MkCheckBox
+from .components.basic.select_card import MkSelectItem, MkSelectCard, MkItemActionButton, MkSelectGroupHeader
 # Navigation
 from .components.navigation.sidebar import MkMenu
 from .components.navigation.topbar import MkTopbar
 from .components.navigation.breadcrumb import MkBreadcrumb
 from .components.navigation.tabs import MkTabs
+from .components.navigation.segmented import (
+    MkSegmented,
+    MkSegmentedTabs,
+    MkSegmentedControl,
+    MkCapsuleTabs,
+    SegmentedTabBar,
+)
 from .components.navigation.pagination import MkPagination
 from .components.navigation.dropdown import MkDropdown
 from .components.navigation.history import MkAnimatedStackedWidget, MkHistoryNavigation
@@ -25,8 +33,7 @@ from .components.form.multicombobox import MkMultiComboBox
 
 # Data
 from .components.data.avatar import MkAvatar
-from .components.data.table import MkTable
-from .components.data.data_table import MkDataTable
+from .components.data.pro_table import MkProTable
 from .components.data.image_compare import MkImageCompare
 from .components.data.image_split import MkImageSplit
 from .components.data.console import MkConsole
@@ -36,11 +43,25 @@ from .components.feedback.alert import MkAlert
 from .components.feedback.progress_bar import MkProgressBar
 from .components.feedback.progress_ring import MkProgressRing
 from .components.feedback.card import MkCard
+from .components.feedback.tooltip import (
+    MkTooltipPopover,
+    MkInfoIcon,
+    MkInfoIconButton,
+    MkTooltip,
+    create_field_header,
+    create_input_field,
+    create_switch_field,
+)
 
 # Layout
 from .components.layout.window import MkTitleBar, MkWindow
 from .components.layout.window_shell import MkWindowShell
 from .components.layout.box import MkQVBoxLayout, MkQHBoxLayout, MkVBox, MkHBox
+from .components.layout.widget import MkQWidget, MkWidget
+from .components.layout.scroll_area import MkScrollArea, MkStackedWidget
+from .components.layout.page import MkPage
+
+
 
 
 # Themes (68 UI Styles)
@@ -55,17 +76,26 @@ from .themes import (
     exclude_from_theme,
     include_in_theme,
     MkThemeSelector,
+    modern_scrollbar_qss,
 )
 
-__version__ = "0.2.1"
+__version__ = "0.2.2"
 
 __all__ = [
     "MkButton",
     "MkCheckBox",
+    "MkSelectItem",
+    "MkSelectCard",
+    "MkItemActionButton",
     "MkMenu",
     "MkTopbar",
     "MkBreadcrumb",
     "MkTabs",
+    "MkSegmented",
+    "MkSegmentedTabs",
+    "MkSegmentedControl",
+    "MkCapsuleTabs",
+    "SegmentedTabBar",
     "MkPagination",
     "MkDropdown",
     "MkAnimatedStackedWidget",
@@ -83,8 +113,7 @@ __all__ = [
     "MkMessage",
     "MkUpload",
     "MkAvatar",
-    "MkTable",
-    "MkDataTable",
+    "MkProTable",
     "MkImageCompare",
     "MkImageSplit",
     "MkConsole",
@@ -92,6 +121,13 @@ __all__ = [
     "MkProgressBar",
     "MkProgressRing",
     "MkCard",
+    "MkTooltipPopover",
+    "MkInfoIcon",
+    "MkInfoIconButton",
+    "MkTooltip",
+    "create_field_header",
+    "create_input_field",
+    "create_switch_field",
     "MkTitleBar",
     "MkWindow",
     "MkWindowShell",
@@ -99,6 +135,11 @@ __all__ = [
     "MkQHBoxLayout",
     "MkVBox",
     "MkHBox",
+    "MkQWidget",
+    "MkWidget",
+    "MkScrollArea",
+    "MkStackedWidget",
+    "MkPage",
     # Theme engine and helpers
     "ThemeEngine",
     "apply_monkeyqt_theme",
@@ -110,4 +151,5 @@ __all__ = [
     "exclude_from_theme",
     "include_in_theme",
     "MkThemeSelector",
+    "modern_scrollbar_qss",
 ]

monkeyqt-0.2.2/monkeyqt/components/basic/__init__.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+from .button import MkButton
+from .checkbox import MkCheckBox
+from .select_card import MkSelectItem, MkSelectCard, MkItemActionButton, MkSelectGroupHeader, MkItemIndicator
+
+__all__ = [
+    "MkButton",
+    "MkCheckBox",
+    "MkSelectItem",
+    "MkSelectCard",
+    "MkItemActionButton",
+    "MkSelectGroupHeader",
+    "MkItemIndicator",
+]

{monkeyqt-0.2.1 → monkeyqt-0.2.2}/monkeyqt/components/basic/button.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
+from monkeyqt.themes.engine import ThemeEngine as _MkThemeEngine
 from PySide6.QtWidgets import QPushButton, QWidget, QGraphicsDropShadowEffect
 from PySide6.QtCore import Qt, QPropertyAnimation, QEasingCurve, Property, QRect
-from PySide6.QtGui import QPainter, QColor, QPen, QBrush, QPainterPath, QFont, QLinearGradient
+from PySide6.QtGui import QPainter, QColor, QPen, QBrush, QPainterPath, QFont, QLinearGradient, QIcon
 from monkeyqt.themes.engine import ThemeEngine
 from monkeyqt.themes.style_utils import (
     darken,
@@ -91,119 +92,9 @@ class MkButton(QPushButton):
             if hasattr(self, "_liquid_timer") and self._liquid_timer.isActive():
                 self._liquid_timer.stop()
 
-        primary = t.get("--primary", "#409EFF")
-        bg = t.get("--bg", "#FFFFFF")
-        fg = t.get("--fg", "#1E293B")
-        border = t.get("--border", "#E2E8F0")
-        radius = t.get("--radius", "6px")
-        border_w = t.get("--border-width", "1px")
-
-        if t.is_neumorphic() or t.is_glass() or t.is_brutal() or t.is_glow() or t.is_pixel():
-            text = t.get("--glass-text", fg) if t.is_glass() else fg
-            self.setStyleSheet(f"""
-                QPushButton {{
-                    background: transparent;
-                    border: none;
-                    color: {text};
-                    padding: 8px 20px;
-                    font-weight: 700;
-                }}
-                QPushButton:disabled {{
-                    color: #94A3B8;
-                }}
-            """)
-            self.setGraphicsEffect(None)
-            self._apply_size_qss()
-            self.update()
-            return
-
-        hover_primary = t._lighten_hex(primary, 0.15) if primary.startswith("#") else primary
-        press_primary = t._darken_hex(primary, 0.1) if primary.startswith("#") else primary
-
-        if self._btn_type == "primary":
-            btn_bg = primary
-            btn_fg = "#FFFFFF"
-            btn_border = primary
-            btn_hover_bg = hover_primary
-            btn_press_bg = press_primary
-        elif self._btn_type == "danger":
-            btn_bg = "#EF4444"
-            btn_fg = "#FFFFFF"
-            btn_border = "#EF4444"
-            btn_hover_bg = "#F87171"
-            btn_press_bg = "#DC2626"
-        elif self._btn_type == "success":
-            btn_bg = "#22C55E"
-            btn_fg = "#FFFFFF"
-            btn_border = "#22C55E"
-            btn_hover_bg = "#4ADE80"
-            btn_press_bg = "#16A34A"
-        elif self._btn_type == "warning":
-            btn_bg = "#F59E0B"
-            btn_fg = "#FFFFFF"
-            btn_border = "#F59E0B"
-            btn_hover_bg = "#FBBF24"
-            btn_press_bg = "#D97706"
-        elif self._btn_type == "secondary":
-            btn_bg = "transparent"
-            btn_fg = primary
-            btn_border = primary
-            btn_hover_bg = t._lighten_hex(primary, 0.9) if primary.startswith("#") else "#F0F4FF"
-            btn_press_bg = t._lighten_hex(primary, 0.8) if primary.startswith("#") else "#E0E7FF"
-        else:
-            neutral = self._neutral_palette()
-            btn_bg = neutral["background"]
-            btn_fg = neutral["foreground"]
-            btn_border = neutral["border"]
-            btn_hover_bg = neutral["hover_background"]
-            btn_press_bg = neutral["pressed_background"]
-
-        if self._btn_type in ("default", "info"):
-            neutral = self._neutral_palette()
-            btn_hover_fg = neutral["hover_foreground"]
-            btn_press_fg = neutral["pressed_foreground"]
-            btn_hover_border = neutral["hover_border"]
-            btn_press_border = neutral["pressed_border"]
-            disabled_bg = neutral["disabled_background"]
-            disabled_fg = neutral["disabled_foreground"]
-            disabled_border = neutral["disabled_border"]
-        else:
-            btn_hover_fg = btn_fg
-            btn_press_fg = btn_fg
-            btn_hover_border = btn_border
-            btn_press_border = btn_border
-            disabled_bg = "#E2E8F0"
-            disabled_fg = "#94A3B8"
-            disabled_border = "#E2E8F0"
-
-        self.setStyleSheet(f"""
-            QPushButton {{
-                background-color: {btn_bg};
-                color: {btn_fg};
-                border: {border_w} solid {btn_border};
-                border-radius: {radius};
-                padding: 8px 20px;
-                font-weight: 600;
-            }}
-            QPushButton:hover {{
-                background-color: {btn_hover_bg};
-                color: {btn_hover_fg};
-                border-color: {btn_hover_border};
-            }}
-            QPushButton:pressed {{
-                background-color: {btn_press_bg};
-                color: {btn_press_fg};
-                border-color: {btn_press_border};
-            }}
-            QPushButton:disabled {{
-                opacity: 0.5;
-                background-color: {disabled_bg};
-                color: {disabled_fg};
-                border-color: {disabled_border};
-            }}
-        """)
         self.setGraphicsEffect(None)
         self._apply_size_qss()
+        self.update()
 
     def _neutral_palette(self):
         """Build theme-aware states for the neutral default and info variants."""
@@ -218,40 +109,98 @@ class MkButton(QPushButton):
         dark_theme = t.is_dark()
         is_info = self._btn_type == "info"
 
-        background = surface_muted if is_info else surface
+        if dark_theme:
+            # 严格参考暗黑现代化按钮规范：
+            # (正常态): 深炭灰底色 #212121，纯白文字 #FAFAFA，暗细边框 #303030
+            # (悬停态): 现代反转高亮浅白灰底色 #E5E5E5，深黑清晰文字 #171717
+            # (禁用态): 纯中灰底色 #7E7E7E，暗灰弱化文字 #212121
+            if is_info:
+                background = surface_muted if surface_muted != bg else "#262626"
+                foreground = "#F5F5F5"
+                btn_border = border if border != "#E2E8F0" else "#383838"
+                hover_background = "#3A3A3A"
+                hover_foreground = "#FFFFFF"
+                hover_border = "#505050"
+                pressed_background = "#1C1C1C"
+                pressed_foreground = "#E5E5E5"
+                pressed_border = "#2A2A2A"
+                disabled_background = "#7E7E7E"
+                disabled_foreground = "#212121"
+                disabled_border = "#7E7E7E"
+            else:
+                background = "#212121"
+                foreground = "#FAFAFA"
+                btn_border = "#303030"
+                hover_background = "#282828"
+                hover_foreground = "#FAFAFA"
+                hover_border = "#383838"
+                pressed_background = "#1C1C1C"
+                pressed_foreground = "#FAFAFA"
+                pressed_border = "#2A2A2A"
+                disabled_background = "#7E7E7E"
+                disabled_foreground = "#212121"
+                disabled_border = "#7E7E7E"
+
+            return {
+                "background": background,
+                "foreground": foreground,
+                "border": btn_border,
+                "hover_background": hover_background,
+                "hover_foreground": hover_foreground,
+                "hover_border": hover_border,
+                "pressed_background": pressed_background,
+                "pressed_foreground": pressed_foreground,
+                "pressed_border": pressed_border,
+                "disabled_background": disabled_background,
+                "disabled_foreground": disabled_foreground,
+                "disabled_border": disabled_border,
+            }
+
+        # 雅致亮色 (Light Mode) 现代化中性与行动按钮规范 (严格参考用户图一至图五):
+        # 图一 (默认态 Default - Connect GitHub): 纯白底色 #FFFFFF，深黑文字 #0F172A，浅灰细边框 #E2E8F0
+        # 图二 (中灰填色 Info/Add): 中灰底色 #8B8B8B，纯白文字 #FFFFFF，边框 #8B8B8B
+        # 图三 (悬停态 Hover - Connect GitHub): 浅白灰底色 #F5F5F5，深黑文字 #0F172A，浅灰边框 #CBD5E1
+        # 按压态 (Pressed): 浅白灰底色 #E5E5E5，深黑文字 #0F172A，浅灰边框 #94A3B8
         if is_info:
-            hover_background = (
-                lighten(background, 0.10)
-                if dark_theme
-                else darken(background, 0.055)
-            )
-            pressed_background = darken(background, 0.10)
+            background = "#8B8B8B"
+            foreground = "#FFFFFF"
+            btn_border = "#8B8B8B"
+            hover_background = "#71717A"
+            hover_foreground = "#FFFFFF"
+            hover_border = "#71717A"
+            pressed_background = "#52525B"
+            pressed_foreground = "#FFFFFF"
+            pressed_border = "#52525B"
+            disabled_background = "#E2E8F0"
+            disabled_foreground = "#94A3B8"
+            disabled_border = "#E2E8F0"
         else:
-            hover_background = surface_muted
-            if qcolor(hover_background).rgba() == qcolor(background).rgba():
-                hover_background = (
-                    lighten(background, 0.08)
-                    if dark_theme
-                    else darken(background, 0.045)
-                )
-            pressed_background = darken(background, 0.08)
-
-        disabled_background = darken(surface_muted, 0.14 if dark_theme else 0.03)
-        hover_border = border if is_info else primary
+            background = "#FFFFFF"
+            foreground = _button_text_color(fg, "#FFFFFF")
+            btn_border = qss_color(border, "#E2E8F0")
+            hover_background = "#F5F5F5"
+            hover_foreground = _button_text_color(fg, hover_background)
+            hover_border = "#CBD5E1"
+            pressed_background = "#E5E5E5"
+            pressed_foreground = _button_text_color(fg, pressed_background)
+            pressed_border = "#94A3B8"
+            disabled_background = "#F8FAFC"
+            disabled_foreground = qss_color(text_muted, "#94A3B8")
+            disabled_border = qss_color(border, "#E2E8F0")
 
         return {
-            "background": qss_color(background, bg),
-            "foreground": _button_text_color(fg, background),
-            "border": qss_color(border, "#E2E8F0"),
-            "hover_background": qss_color(hover_background, surface_muted),
-            "hover_foreground": _button_text_color(fg, hover_background),
-            "hover_border": qss_color(hover_border, border),
-            "pressed_background": qss_color(pressed_background, surface),
-            "pressed_foreground": _button_text_color(fg, pressed_background),
-            "pressed_border": qss_color(border, "#E2E8F0"),
-            "disabled_background": qss_color(disabled_background, surface_muted),
-            "disabled_foreground": qss_color(text_muted, fg),
-            "disabled_border": qss_color(border, "#E2E8F0"),
+            "background": background,
+            "foreground": foreground,
+            "border": btn_border,
+            "hover_background": hover_background,
+            "hover_foreground": hover_foreground,
+            "hover_border": hover_border,
+            "pressed_background": pressed_background,
+            "pressed_foreground": pressed_foreground,
+            "pressed_border": pressed_border,
+            "disabled_background": disabled_background,
+            "disabled_foreground": disabled_foreground,
+            "disabled_border": disabled_border,
         }
 
     def _apply_size_qss(self):
@@ -260,16 +209,13 @@ class MkButton(QPushButton):
             size_qss = "padding: 12px 19px; font-size: 14px;"
         elif getattr(self, "_mk_size", "default") == "small":
             size_qss = "padding: 5px 11px; font-size: 12px; border-radius: 3px;"
+        qss = "QPushButton { background: transparent; border: none; outline: none; }"
         if size_qss:
-            self.setStyleSheet(self.styleSheet() + f"\nQPushButton {{ {size_qss} }}")
+            qss += f"\nQPushButton {{ {size_qss} }}"
+        _MkThemeEngine.apply_style_sheet(self, qss)
 
     def paintEvent(self, event):
         t = ThemeEngine
-
-        if not (t.is_neumorphic() or t.is_glass() or t.is_glow() or t.is_brutal() or t.is_pixel()):
-            super().paintEvent(event)
-            return
-
         painter = QPainter(self)
         painter.setRenderHint(QPainter.RenderHint.Antialiasing)
         rect = self.rect()
@@ -307,12 +253,23 @@ class MkButton(QPushButton):
                 text_color = qcolor(neutral["foreground"])
         else:
             if not self.isEnabled():
-                btn_color = qcolor("#CBD5E1")
-                text_color = qcolor("#64748B")
-            if self._hovered:
-                btn_color = btn_color.lighter(115)
-            if self._pressed:
-                btn_color = btn_color.darker(110)
+                if t.is_dark():
+                    btn_color = qcolor("#7E7E7E")
+                    text_color = qcolor("#212121")
+                else:
+                    btn_color = qcolor("#CBD5E1")
+                    text_color = qcolor("#64748B")
+            elif self._hovered:
+                # 若主色为深黑/炭黑（如雅致亮色 #171717，参考图四与图五），悬停转换为炭灰 #454545，避免 lighter 无效
+                if self._btn_type == "primary" and btn_color.lightness() < 60:
+                    btn_color = qcolor("#454545")
+                else:
+                    btn_color = btn_color.lighter(115)
+            elif self._pressed:
+                if self._btn_type == "primary" and btn_color.lightness() < 60:
+                    btn_color = qcolor("#0A0A0A")
+                else:
+                    btn_color = btn_color.darker(110)
 
         if t.is_neumorphic():
             inset = rect.adjusted(4, 4, -4, -4)
@@ -392,6 +349,47 @@ class MkButton(QPushButton):
             painter.drawRect(inset)
             painter.setPen(QPen(QColor("#000000"), 2))
             painter.drawRect(inset)
+        else:
+            inset = rect.adjusted(1, 1, -1, -1)
+            border_w = t.get("--border-width", "1px")
+            bw = parse_px(border_w, 1, 0, 8)
+
+            if self._btn_type == "secondary":
+                if t.is_dark():
+                    border_color = qcolor(primary)
+                    if self._hovered: btn_color = qcolor("rgba(255, 255, 255, 0.12)")
+                    elif self._pressed: btn_color = qcolor("rgba(255, 255, 255, 0.20)")
+                    else: btn_color = QColor(0, 0, 0, 0)
+                else:
+                    if self._hovered:
+                        btn_color = qcolor("#F5F5F5")
+                        border_color = qcolor("#CBD5E1")
+                    elif self._pressed:
+                        btn_color = qcolor("#E5E5E5")
+                        border_color = qcolor("#94A3B8")
+                    else:
+                        btn_color = QColor(0, 0, 0, 0)
+                        border_color = qcolor("#E2E8F0")
+            elif self._btn_type in ("default", "info"):
+                neutral = self._neutral_palette()
+                border_color = qcolor(neutral["border"])
+                if not self.isEnabled():
+                    border_color = qcolor(neutral["disabled_border"])
+                elif self._hovered:
+                    border_color = qcolor(neutral["hover_border"])
+                elif self._pressed:
+                    border_color = qcolor(neutral["pressed_border"])
+            else:
+                border_color = btn_color
+                if not self.isEnabled():
+                    border_color = qcolor("#7E7E7E" if t.is_dark() else "#CBD5E1")
+
+            painter.setBrush(QBrush(btn_color))
+            if border_color and bw > 0:
+                painter.setPen(QPen(border_color, bw))
+            else:
+                painter.setPen(Qt.PenStyle.NoPen)
+            painter.drawRoundedRect(inset, radius, radius)
 
         if self._btn_type in ("default", "info") and not self.isEnabled():
             text_color = qcolor(self._neutral_palette()["disabled_foreground"])
@@ -470,8 +468,8 @@ class MkButton(QPushButton):
             return readable_text(qcolor(primary))
         elif self._btn_type in ("danger", "success", "warning"):
             return "#FFFFFF"
-        elif self._btn_type in ("text", "outline"):
-            return primary
+        elif self._btn_type in ("text", "outline", "secondary"):
+            return fg if not t.is_dark() else "#FAFAFA"
 
         if t.is_glow():
             return primary
@@ -482,7 +480,15 @@ class MkButton(QPushButton):
         return fg
 
     def setIcon(self, icon):
-        if hasattr(icon, "_ph_spec"):
+        if isinstance(icon, str):
+            try:
+                from monkeyqt.icons import Ph
+                pm = Ph.pixmap(icon, size=16, color=self._get_button_text_color())
+                if pm and not pm.isNull():
+                    icon = QIcon(pm)
+            except Exception:
+                pass
+        elif hasattr(icon, "_ph_spec"):
             self._ph_icon_spec = getattr(icon, "_ph_spec", None)
             try:
                 spec = dict(self._ph_icon_spec)
@@ -495,18 +501,28 @@ class MkButton(QPushButton):
         super().setIcon(icon)
 
     def set_theme_style(self, style_name: str = None):
+        self._update_style()
         if getattr(self, "_ph_icon_spec", None):
             try:
-
                 spec = dict(self._ph_icon_spec)
                 orig_color = spec.get("color")
                 if orig_color in (None, "auto", "default", "fg", "foreground", "currentcolor"):
                     spec["color"] = self._get_button_text_color()
                 new_icon = Ph.icon(**spec)
                 super().setIcon(new_icon)
-            except Exception as e:
+            except Exception:
                 pass
-        self._update_style()
+        t = ThemeEngine
+        if t.is_liquid_glass():
+            if not hasattr(self, "_liquid_timer"):
+                from PySide6.QtCore import QTimer
+                self._liquid_timer = QTimer(self)
+                self._liquid_timer.timeout.connect(self._on_liquid_timeout)
+            if not self._liquid_timer.isActive():
+                self._liquid_timer.start(33)
+        else:
+            if hasattr(self, "_liquid_timer") and self._liquid_timer.isActive():
+                self._liquid_timer.stop()
         self.update()
 
     @Property(str)
@@ -543,5 +559,4 @@ class MkButton(QPushButton):
         self._mk_size = value
         self.setProperty("mk_size", value)
         self._update_style()
-        self.style().unpolish(self)
-        self.style().polish(self)
+        self.update()