tkfluent 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

tkflu/__init__.py

@@ -12,15 +12,23 @@ from .button import FluButton
 from .entry import FluEntry
 from .frame import FluFrame
 from .label import FluLabel
+from .menu import FluMenu
+from .menubar import FluMenuBar
+from .popupmenu import FluPopupMenu
 from .text import FluText
 from .thememanager import FluThemeManager
 from .togglebutton import FluToggleButton
+from .toplevel import FluToplevel
 from .window import FluWindow
+#from .winico import FluWinico
+
 
 FluChip = FluBadge
 FluPushButton = FluButton
 FluTextInput = FluEntry
 FluTextBox = FluText
 FluPanel = FluFrame
+FluMainWindow = FluWindow
+FluSubWindow = FluToplevel
 
 # 

tkflu/__main__.py

@@ -3,13 +3,40 @@ from tkinter import *
 from tkinter.font import *
 
 root = FluWindow()
-root.iconify
-root.wincustom(way=0)
-root.wm_geometry("180x360")
+#root.wincustom(way=0)
+root.wm_geometry("360x500")
+
+popupmenu = FluPopupMenu()
 
 thememanager = FluThemeManager()
 
-frame = FluFrame()
+menubar = FluMenuBar(root)
+menubar.add_command(
+    label="FluMenu1", width=80, command=lambda: print("FluMenu1 -> Clicked")
+)
+
+menu1 = FluMenu()
+menu1.add_command(
+    label="FluMenu2-1", width=80, command=lambda: print("FluMenu2-1 -> Clicked")
+)
+menubar.add_cascade(
+    label="FluMenu2", width=80, menu=menu1
+)
+
+menu2 = FluMenu(height=93)
+menu2.add_command(
+    label="FluMenu3-1", width=80, command=lambda: print("FluMenu3-1 -> Clicked")
+)
+menu2.add_command(
+    label="FluMenu3-2", width=80, command=lambda: print("FluMenu3-2 -> Clicked")
+)
+menubar.add_cascade(
+    label="FluMenu3", width=80, menu=menu2
+)
+
+menubar.pack(fill="x",)
+
+frame = FluFrame(root)
 
 badge1 = FluBadge(frame, text="FluBadge", width=60)
 badge1.pack(padx=5, pady=5)

tkflu/badge.py

@@ -121,11 +121,12 @@ class FluBadge(FluBadgeCanvas, DDrawWidget):
             fill=_text_color, text=self.attributes.text, font=self.attributes.font
         )
 
-    def theme(self, mode, style=None):
-        self.mode = mode
+    def theme(self, mode=None, style=None):
+        if mode:
+            self.mode = mode
         if style:
             self.style = style
-        if mode.lower() == "dark":
+        if self.mode.lower() == "dark":
             if self.style.lower() == "accent":
                 self._dark_accent()
             else:
@@ -138,7 +139,7 @@ class FluBadge(FluBadgeCanvas, DDrawWidget):
 
     def _light(self):
         self.dconfigure(
-            back_color="#f0f0f0",
+            back_color="#f9f9f9",
             border_color="#f0f0f0",
             border_width=1,
             text_color="#191919",

tkflu/button.py

@@ -155,18 +155,23 @@ class FluButton(FluButtonCanvas, DDrawWidget):
             fill=_text_color, text=self.attributes.text, font=self.attributes.font
         )
 
-    def theme(self, mode, style=None):
-        self.mode = mode
+    def theme(self, mode=None, style=None):
+        if mode:
+            self.mode = mode
         if style:
             self.style = style
-        if mode.lower() == "dark":
+        if self.mode.lower() == "dark":
             if self.style.lower() == "accent":
                 self._dark_accent()
+            elif self.style.lower() == "menu":
+                self._dark_menu()
             else:
                 self._dark()
         else:
             if self.style.lower() == "accent":
                 self._light_accent()
+            elif self.style.lower() == "menu":
+                self._light_menu()
             else:
                 self._light()
 
@@ -174,25 +179,53 @@ class FluButton(FluButtonCanvas, DDrawWidget):
         self.dconfigure(
             rest={
                 "back_color": "#ffffff",
-                "border_color": "#f0f0f0",
-                "border_color2": "#d6d6d6",
+                "border_color": "#e5e5e5",
+                "border_color2": "#cccccc",
                 "border_width": 1,
                 "radius": 6,
                 "text_color": "#1b1b1b",
             },
             hover={
                 "back_color": "#fcfcfc",
-                "border_color": "#f0f0f0",
-                "border_color2": "#d6d6d6",
+                "border_color": "#e5e5e5",
+                "border_color2": "#cccccc",
                 "border_width": 1,
                 "radius": 6,
                 "text_color": "#1b1b1b",
             },
             pressed={
                 "back_color": "#fdfdfd",
+                "border_color": "#e5e5e5",
+                "border_color2": "#e5e5e5",
+                "border_width": 1,
+                "radius": 6,
+                "text_color": "#636363",
+            }
+        )
+
+    def _light_menu(self):
+        self.dconfigure(
+            rest={
+                "back_color": "#ffffff",
+                "border_color": "white",
+                "border_color2": "white",
+                "border_width": 0,
+                "radius": 6,
+                "text_color": "#1b1b1b",
+            },
+            hover={
+                "back_color": "#eaeaea",
+                "border_color": "#f0f0f0",
+                "border_color2": "#d6d6d6",
+                "border_width": 0,
+                "radius": 6,
+                "text_color": "#1b1b1b",
+            },
+            pressed={
+                "back_color": "#ededed",
                 "border_color": "#f0f0f0",
                 "border_color2": "#f0f0f0",
-                "border_width": 1,
+                "border_width": 0,
                 "radius": 6,
                 "text_color": "#636363",
             }
@@ -254,6 +287,34 @@ class FluButton(FluButtonCanvas, DDrawWidget):
             }
         )
 
+    def _dark_menu(self):
+        self.dconfigure(
+            rest={
+                "back_color": "#202020",
+                "border_color": "black",
+                "border_color2": "black",
+                "border_width": 0,
+                "radius": 6,
+                "text_color": "#ffffff",
+            },
+            hover={
+                "back_color": "#2d2d2d",
+                "border_color": "#303030",
+                "border_color2": "#262626",
+                "border_width": 0,
+                "radius": 6,
+                "text_color": "#ffffff",
+            },
+            pressed={
+                "back_color": "#292929",
+                "border_color": "#2a2a2a",
+                "border_color2": "#262626",
+                "border_width": 0,
+                "radius": 6,
+                "text_color": "#cfcfcf",
+            }
+        )
+
     def _dark_accent(self):
         self.dconfigure(
             rest={

tkflu/bwm.py

@@ -0,0 +1,174 @@
+class BWm(object):
+    def _draw(self, event=None):
+
+        """
+        重新绘制窗口及自定义的窗口组件
+
+        :param event:
+        """
+
+        self.configure(background=self.attributes.back_color)
+        if self.custom:
+            if hasattr(self, "titlebar"):
+                self.titlebar.configure(background=self.attributes.back_color)
+                self.titlebar.update()
+            if hasattr(self, "titlelabel"):
+                self.titlelabel.dconfigure(text_color=self.attributes.text_color)
+                self.titlelabel._draw()
+            if hasattr(self, "closebutton"):
+                self.closebutton.dconfigure(
+                    rest={
+                        "back_color": self.titlebar.cget("background"),
+                        "border_color": "#f0f0f0",
+                        "border_color2": "#d6d6d6",
+                        "border_width": 0,
+                        "radius": 0,
+                        "text_color": self.attributes.closebutton.text_color,
+                    },
+                    hover={
+                        "back_color": self.attributes.closebutton.back_color,
+                        "border_color": "#f0f0f0",
+                        "border_color2": "#d6d6d6",
+                        "border_width": 0,
+                        "radius": 0,
+                        "text_color": self.attributes.closebutton.text_hover_color,
+                    },
+                    pressed={
+                        "back_color": self.attributes.closebutton.back_color,
+                        "border_color": "#f0f0f0",
+                        "border_color2": "#f0f0f0",
+                        "border_width": 0,
+                        "radius": 0,
+                        "text_color": self.attributes.closebutton.text_hover_color,
+                    }
+                )
+                self.closebutton._draw()
+
+    def _event_configure(self, event=None):
+
+        """
+        触发 `<Configure>` 事件
+
+        :param event:
+        :return:
+        """
+
+        self._draw()
+
+    def _init(self, mode):
+        from easydict import EasyDict
+        self.attributes = EasyDict(
+            {
+                "back_color": None,
+                "text_color": None,
+                "closebutton": {
+                    "back_color": None,
+                    "text_color": None,
+                    "text_hover_color": None
+                }
+            }
+        )
+
+        self.theme(mode)
+
+    def _exit(self):
+        self.quit()
+
+    def theme(self, mode: str):
+
+        """
+        同 `theme_myself`
+
+        :param mode:
+        :return:
+        """
+
+        self.theme_myself(mode=mode)
+
+    def theme_myself(self, mode: str):
+
+        """
+        修改该窗口的Fluent主题
+
+        :param mode:
+        :return:
+        """
+
+        self.mode = mode
+        if mode.lower() == "dark":
+            self._dark()
+        else:
+            self._light()
+
+    def _light(self):
+        self.dconfigure(
+            back_color="#ffffff",
+            text_color="#000000",
+            closebutton={
+                "back_color": "red",
+                "text_color": "#000000",
+                "text_hover_color": "#ffffff"
+            }
+        )
+
+    def _dark(self):
+        self.dconfigure(
+            back_color="#202020",
+            text_color="#ffffff",
+            closebutton={
+                "back_color": "red",
+                "text_color": "#ffffff",
+                "text_hover_color": "#000000"
+            }
+        )
+
+    def wincustom(self, wait=200, way=1):
+
+        """
+        自定义窗口 仅限`Windows系统`
+
+        :param wait: 直接执行自定义窗口容易出错误 需要一点时间等待才能执行 同`after()`中的`ms`
+        :param way: 取0时保留原版边框，但稳定性很差，容易崩溃。取1时不保留原版边框，但稳定性较好。
+        :return:
+        """
+
+        from sys import platform
+        from .button import FluButton
+        from .label import FluLabel
+        from tkinter import Frame
+        self.titlebar = Frame(self, width=180, height=35, background=self.attributes.back_color)
+        self.titlelabel = FluLabel(self.titlebar, text=self.title(), width=50)
+        self.titlelabel.pack(fill="y", side="left")
+        self.closebutton = FluButton(self.titlebar, text="", width=32, height=32, command=lambda: self._exit())
+        self.closebutton.pack(fill="y", side="right")
+        self.titlebar.pack(fill="x", side="top")
+
+        if platform == "win32":
+            if way == 0:
+                from .customwindow import CustomWindow
+                self.customwindow = CustomWindow(self, wait=wait)
+                self.customwindow.bind_drag(self.titlebar)
+                self.customwindow.bind_drag(self.titlelabel)
+            else:
+                self.overrideredirect(True)
+                try:
+                    from win32gui import GetParent, GetWindowLong, SetWindowLong
+                    from win32con import GWL_EXSTYLE, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW
+                    hwnd = GetParent(self.winfo_id())
+                    style = GetWindowLong(hwnd, GWL_EXSTYLE)
+                    style = style & ~WS_EX_TOOLWINDOW
+                    style = style | WS_EX_APPWINDOW
+                    SetWindowLong(hwnd, GWL_EXSTYLE, style)
+                    self.after(30, lambda: self.withdraw())
+                    self.after(60, lambda: self.deiconify())
+                except:
+                    pass
+
+                self.wm_attributes("-topmost", True)
+
+                from .customwindow2 import WindowDragArea
+                self.dragarea = WindowDragArea(self)
+                self.dragarea.bind(self.titlebar)
+                self.dragarea.bind(self.titlelabel)
+
+        self.custom = True

tkflu/entry.py

@@ -71,6 +71,8 @@ class FluEntry(FluEntryCanvas, DDrawWidget):
 
         super().__init__(*args, width=width, height=height, cursor=cursor, **kwargs)
 
+        self.bind("<FocusIn>", self._event_focus_in, add="+")
+
         if font is None:
             from tkdeft.utility.fonts import SegoeFont
             self.attributes.font = SegoeFont()
@@ -148,7 +150,7 @@ class FluEntry(FluEntryCanvas, DDrawWidget):
         self.dconfigure(
             rest={
                 "back_color": "#ffffff",
-                "border_color": "#f0f0f0",
+                "border_color": "#e5e5e5",
                 "border_color2": "#8d8d8d",
                 "border_width": 1,
                 "radius": 6,
@@ -156,7 +158,7 @@ class FluEntry(FluEntryCanvas, DDrawWidget):
             },
             focus={
                 "back_color": "#ffffff",
-                "border_color": "#f0f0f0",
+                "border_color": "#e5e5e5",
                 "border_color2": "#005fb8",
                 "border_width": 2,
                 "radius": 6,

tkflu/frame.py

@@ -74,6 +74,7 @@ class FluFrame(Frame, DObject):
                  width=300,
                  height=150,
                  mode="light",
+                 style="standard",
                  **kwargs,
                  ):
         from tempfile import mkstemp
@@ -84,7 +85,7 @@ class FluFrame(Frame, DObject):
 
         super().__init__(master=self.canvas)
 
-        self._init(mode)
+        self._init(mode, style)
 
         self.enter = False
         self.button1 = False
@@ -93,7 +94,7 @@ class FluFrame(Frame, DObject):
 
         self.canvas.bind("<Configure>", self._event_configure, add="+")
 
-    def _init(self, mode):
+    def _init(self, mode, style):
         from easydict import EasyDict
 
         self.attributes = EasyDict(
@@ -106,33 +107,60 @@ class FluFrame(Frame, DObject):
             }
         )
 
-        self.theme(mode)
-
-    def theme(self, mode="light"):
-        self.mode = mode
-        if mode.lower() == "dark":
-            self._dark()
+        self.theme(mode=mode, style=style)
+
+    def theme(self, mode=None, style=None):
+        if mode:
+            self.mode = mode
+        if style:
+            self.style = style
+        if self.mode.lower() == "dark":
+            if self.style.lower() == "popupmenu":
+                self._dark_popupmenu()
+            else:
+                self._dark()
         else:
-            self._light()
+            if self.style.lower() == "popupmenu":
+                self._light_popupmenu()
+            else:
+                self._light()
 
     def _light(self):
         self.dconfigure(
-            back_color="#ffffff",
+            back_color="#f9f9f9",
             border_color="#ebebeb",
             border_color2="#e4e4e4",
-            border_width=1,
+            border_width=1.5,
             radius=6,
         )
 
+    def _light_popupmenu(self):
+        self.dconfigure(
+            back_color="#f9f9f9",
+            border_color="#4d5056",
+            border_color2="#4d5056",
+            border_width=1.5,
+            radius=8,
+        )
+
     def _dark(self):
         self.dconfigure(
             back_color="#242424",
             border_color="#303030",
             border_color2="#282828",
-            border_width=1,
+            border_width=1.5,
             radius=6,
         )
 
+    def _dark_popupmenu(self):
+        self.dconfigure(
+            back_color="#242424",
+            border_color="#4d5056",
+            border_color2="#4d5056",
+            border_width=1.5,
+            radius=8,
+        )
+
     def pack_info(self):
         return self.canvas.pack_info()
 

tkflu/menu.py

@@ -0,0 +1,65 @@
+from .popupmenu import FluPopupMenu
+from tkdeft.object import DObject
+
+
+class FluMenu(FluPopupMenu):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+    def _init(self, mode, style):
+        from easydict import EasyDict
+
+        self.attributes = EasyDict(
+            {
+                "back_color": None,
+                "border_color": None,
+                "border_color2": None,
+                "border_width": None,
+                "radius": None,
+
+                "actions": {}
+            }
+        )
+
+        self.theme(mode=mode, style=style)
+
+    def add_command(self, custom_widget=None, width=40, **kwargs):
+        if custom_widget:
+            widget = custom_widget(self)
+        else:
+            from .button import FluButton
+            widget = FluButton(self, width=width)
+        if "label" in kwargs:
+            label = kwargs.pop("label")
+        else:
+            label = ""
+        if "style" in kwargs:
+            style = kwargs.pop("style")
+        else:
+            style = "menu"
+        if "command" in kwargs:
+            c = kwargs.pop("command")
+
+            def command():
+                c()
+                self.window.wm_withdraw()
+
+        else:
+            def empty():
+                pass
+
+            command = empty
+        if "id" in kwargs:
+            id = kwargs.pop("id")
+        else:
+            id = widget._w
+        if hasattr(widget, "dconfigure"):
+            widget.dconfigure(text=label, command=command)
+        else:
+            if hasattr(widget, "configure"):
+                widget.configure(text=label, command=command)
+        if hasattr(widget, "theme"):
+            widget.theme(style=style)
+
+        widget.pack(side="top", fill="x", padx=1, pady=(1, 0))
+        self.dcget("actions")[id] = widget

tkflu/menubar.py

@@ -0,0 +1,140 @@
+from tkinter import Frame, Menu
+from tkdeft.object import DObject
+
+
+class FluMenuBar(Frame, DObject):
+    def __init__(self, *args, mode="light", height=40, **kwargs):
+        self._init(mode)
+
+        super().__init__(*args, height=height, **kwargs)
+
+        self._draw(None)
+
+        self.bind("<Configure>", self._event_configure, add="+")
+
+    def _init(self, mode):
+
+        from easydict import EasyDict
+
+        self.attributes = EasyDict(
+            {
+                "back_color": "#f3f3f3",
+
+                "actions": {}
+            }
+        )
+
+        self.theme(mode=mode)
+
+    def add_command(self, custom_widget=None, width=40, **kwargs):
+        if custom_widget:
+            widget = custom_widget(self)
+        else:
+            from .button import FluButton
+            widget = FluButton(self, width=width)
+        if "label" in kwargs:
+            label = kwargs.pop("label")
+        else:
+            label = ""
+        if "style" in kwargs:
+            style = kwargs.pop("style")
+        else:
+            style = "menu"
+        if "command" in kwargs:
+            command = kwargs.pop("command")
+        else:
+            def empty():
+                pass
+
+            command = empty
+        if "id" in kwargs:
+            id = kwargs.pop("id")
+        else:
+            id = widget._w
+        if hasattr(widget, "dconfigure"):
+            widget.dconfigure(text=label, command=command)
+        else:
+            if hasattr(widget, "configure"):
+                widget.configure(text=label, command=command)
+        if hasattr(widget, "theme"):
+            widget.theme(style=style)
+
+        widget.pack(side="left", padx=5, pady=5)
+        self.dcget("actions")[id] = widget
+
+    from .menu import FluMenu
+
+    def add_cascade(self, custom_widget=None, width=40, menu: FluMenu = None, **kwargs):
+        if custom_widget:
+            widget = custom_widget(self)
+        else:
+            from .button import FluButton
+            widget = FluButton(self, width=width)
+        if "label" in kwargs:
+            label = kwargs.pop("label")
+        else:
+            label = ""
+        if "style" in kwargs:
+            style = kwargs.pop("style")
+        else:
+            style = "menu"
+        if "id" in kwargs:
+            id = kwargs.pop("id")
+        else:
+            id = widget._w
+
+        def command():
+            menu.focus_set()
+            menu.popup(widget.winfo_rootx(), widget.winfo_rooty() + widget.winfo_height())
+            menu.window.deiconify()
+            menu.window.attributes("-topmost")
+
+        if hasattr(widget, "dconfigure"):
+            widget.dconfigure(text=label, command=command)
+        else:
+            if hasattr(widget, "configure"):
+                widget.configure(text=label, command=command)
+        if hasattr(widget, "theme"):
+            widget.theme(style=style)
+
+        widget.pack(side="left", padx=5, pady=5)
+        self.dcget("actions")[id] = widget
+
+    def action(self, id):
+        return self.dcget("actions")[id]
+
+    def theme(self, mode="light"):
+        self.theme_myself(mode=mode)
+
+        actions = self.dcget("actions")
+
+        for key in actions:
+            widget = actions[key]
+            if hasattr(widget, "theme"):
+                widget.theme(mode=mode)
+                if hasattr(widget, "_draw"):
+                    widget._draw()
+                widget.update()
+
+    def theme_myself(self, mode="light"):
+        self.mode = mode
+        if mode.lower() == "dark":
+            self._dark()
+        else:
+            self._light()
+
+    def _light(self):
+        self.dconfigure(
+            back_color="#f3f3f3"
+        )
+
+    def _dark(self):
+        self.dconfigure(
+            back_color="#202020"
+        )
+
+    def _draw(self, event=None):
+        self.config(background=self.attributes.back_color)
+
+    def _event_configure(self, event=None):
+        self._draw(event)

tkflu/popupmenu.py

@@ -0,0 +1,81 @@
+from tkinter import Toplevel
+from .frame import FluFrame
+
+
+class FluPopupMenuWindow(Toplevel):
+    def __init__(self, *args, transparent_color="#ffefa2", mode="light", width=100, height=46, **kwargs):
+        super().__init__(*args, background=transparent_color, **kwargs)
+
+        self.theme(mode=mode)
+
+        self.geometry(f"{width}x{height}")
+
+        self.transient_color = transparent_color
+        self.overrideredirect(True)
+        self.attributes("-transparentcolor", transparent_color)
+
+        self.withdraw()
+
+        self.bind("<FocusOut>", self._event_focusout)
+
+    def _event_focusout(self, event=None):
+        self.withdraw()
+
+    def popup(self, x, y):
+        self.geometry(f"+{x}+{y}")
+
+    def theme(self, mode=None):
+        if mode:
+            self.mode = mode
+        for widget in self.winfo_children():
+            if hasattr(widget, "theme"):
+                widget.theme(mode=self.mode.lower())
+
+
+class FluPopupMenu(FluFrame):
+    def __init__(self, *args, width=100, height=46, transparent_color="#ffefa2", style="popupmenu", **kwargs):
+        self.window = FluPopupMenuWindow(transparent_color=transparent_color, width=width, height=height)
+
+        super().__init__(self.window, *args, style=style, **kwargs)
+
+        self.pack(fill="both", expand="yes", padx=5, pady=5)
+
+    def wm_attributes(self, *args, **kwargs):
+        self.window.wm_attributes(*args, **kwargs)
+
+    attributes = wm_attributes
+
+    def wm_protocol(self, *args,  **kwargs):
+        self.window.wm_protocol(*args, **kwargs)
+
+    protocol = wm_protocol
+
+    def wm_deiconify(self, *args,  **kwargs):
+        self.window.wm_deiconify(*args, **kwargs)
+
+    deiconify = wm_deiconify
+
+    def wm_withdraw(self, *args,  **kwargs):
+        self.window.wm_withdraw(*args, **kwargs)
+
+    withdraw = wm_withdraw
+
+    def wm_iconify(self, *args,  **kwargs):
+        self.window.wm_iconify(*args, **kwargs)
+
+    iconify = wm_iconify
+
+    def wm_resizable(self, *args,  **kwargs):
+        self.window.wm_resizable(*args, **kwargs)
+
+    resizable = wm_resizable
+
+    def wm_geometry(self, *args,  **kwargs):
+        self.window.wm_geometry(*args, **kwargs)
+
+    geometry = wm_geometry
+
+    def wm_popup(self, x, y):
+        self.window.popup(x=x, y=y)
+
+    popup = wm_popup

tkflu/text.py

@@ -70,6 +70,8 @@ class FluText(FluTextCanvas, DDrawWidget):
 
         super().__init__(*args, width=width, height=height, cursor=cursor, **kwargs)
 
+        self.bind("<FocusIn>", self._event_focus_in, add="+")
+
         if font is None:
             from tkdeft.utility.fonts import SegoeFont
             self.attributes.font = SegoeFont()
@@ -151,7 +153,7 @@ class FluText(FluTextCanvas, DDrawWidget):
         self.dconfigure(
             rest={
                 "back_color": "#ffffff",
-                "border_color": "#f0f0f0",
+                "border_color": "#e5e5e5",
                 "border_color2": "#8d8d8d",
                 "border_width": 1,
                 "radius": 6,
@@ -159,7 +161,7 @@ class FluText(FluTextCanvas, DDrawWidget):
             },
             focus={
                 "back_color": "#ffffff",
-                "border_color": "#f0f0f0",
+                "border_color": "#e5e5e5",
                 "border_color2": "#005fb8",
                 "border_width": 2,
                 "radius": 6,

tkflu/thememanager.py

@@ -1,8 +1,9 @@
 from .window import FluWindow
+from .toplevel import FluToplevel
 
 
 class FluThemeManager(object):
-    def __init__(self, window: FluWindow = None, mode: str = "light"):
+    def __init__(self, window=None, mode: str = "light"):
         if window:
             self._window = window
         else:

tkflu/toplevel.py

@@ -0,0 +1,30 @@
+from tkinter import Toplevel
+from tkdeft.object import DObject
+from .bwm import BWm
+
+
+class FluToplevel(Toplevel, BWm, DObject):
+
+    """Fluent设计的子窗口"""
+
+    def __init__(self, *args, mode="light", **kwargs):
+
+        """
+        初始化类
+
+        :param args: 参照tkinter.TK.__init__
+        :param className: 参照tkinter.TK.__init__
+        :param mode: Fluent主题模式 分为 “light” “dark”
+        :param kwargs: 参照tkinter.TK.__init__
+        """
+
+        self._init(mode)
+
+        self.custom = False
+
+        Toplevel.__init__(self, *args, **kwargs)
+
+        self.bind("<Configure>", self._event_configure)
+
+    def _exit(self):
+        self.destroy()

tkflu/window.py

@@ -1,8 +1,9 @@
-from tkinter import Tk
+from tkinter import Tk, Toplevel
 from tkdeft.object import DObject
+from .bwm import BWm
 
 
-class FluWindow(Tk, DObject):
+class FluWindow(Tk, BWm, DObject):
 
     """Fluent设计的主窗口"""
 
@@ -25,173 +26,6 @@ class FluWindow(Tk, DObject):
 
         self.bind("<Configure>", self._event_configure)
 
-    def _draw(self, event=None):
 
-        """
-        重新绘制窗口及自定义的窗口组件
-
-        :param event:
-        """
-
-        self.configure(background=self.attributes.back_color)
-        if self.custom:
-            if hasattr(self, "titlebar"):
-                self.titlebar.configure(background=self.attributes.back_color)
-                self.titlebar.update()
-            if hasattr(self, "titlelabel"):
-                self.titlelabel.dconfigure(text_color=self.attributes.text_color)
-                self.titlelabel._draw()
-            if hasattr(self, "closebutton"):
-                self.closebutton.dconfigure(
-                    rest={
-                        "back_color": self.titlebar.cget("background"),
-                        "border_color": "#f0f0f0",
-                        "border_color2": "#d6d6d6",
-                        "border_width": 0,
-                        "radius": 0,
-                        "text_color": self.attributes.closebutton.text_color,
-                    },
-                    hover={
-                        "back_color": self.attributes.closebutton.back_color,
-                        "border_color": "#f0f0f0",
-                        "border_color2": "#d6d6d6",
-                        "border_width": 0,
-                        "radius": 0,
-                        "text_color": self.attributes.closebutton.text_hover_color,
-                    },
-                    pressed={
-                        "back_color": self.attributes.closebutton.back_color,
-                        "border_color": "#f0f0f0",
-                        "border_color2": "#f0f0f0",
-                        "border_width": 0,
-                        "radius": 0,
-                        "text_color": self.attributes.closebutton.text_hover_color,
-                    }
-                )
-                self.closebutton._draw()
-
-    def _event_configure(self, event=None):
-
-        """
-        触发 `<Configure>` 事件
-
-        :param event:
-        :return:
-        """
-
-        self._draw()
-
-    def _init(self, mode):
-        from easydict import EasyDict
-        self.attributes = EasyDict(
-            {
-                "back_color": None,
-                "text_color": None,
-                "closebutton": {
-                    "back_color": None,
-                    "text_color": None,
-                    "text_hover_color": None
-                }
-            }
-        )
-
-        self.theme(mode)
-
-    def theme(self, mode: str):
-
-        """
-        同 `theme_myself`
-
-        :param mode:
-        :return:
-        """
-
-        self.theme_myself(mode=mode)
-
-    def theme_myself(self, mode: str):
-
-        """
-        修改该窗口的Fluent主题
-
-        :param mode:
-        :return:
-        """
-
-        self.mode = mode
-        if mode.lower() == "dark":
-            self._dark()
-        else:
-            self._light()
-
-    def _light(self):
-        self.dconfigure(
-            back_color="#ffffff",
-            text_color="#000000",
-            closebutton={
-                "back_color": "red",
-                "text_color": "#000000",
-                "text_hover_color": "#ffffff"
-            }
-        )
-
-    def _dark(self):
-        self.dconfigure(
-            back_color="#202020",
-            text_color="#ffffff",
-            closebutton={
-                "back_color": "red",
-                "text_color": "#ffffff",
-                "text_hover_color": "#000000"
-            }
-        )
-
-    def wincustom(self, wait=200, way=1):
-
-        """
-        自定义窗口 仅限`Windows系统`
-
-        :param wait: 直接执行自定义窗口容易出错误 需要一点时间等待才能执行 同`after()`中的`ms`
-        :param way: 取0时保留原版边框，但稳定性很差，容易崩溃。取1时不保留原版边框，但稳定性较好。
-        :return:
-        """
-
-        from sys import platform
-        from .button import FluButton
-        from .label import FluLabel
-        from tkinter import Frame
-        self.titlebar = Frame(self, width=180, height=35, background=self.attributes.back_color)
-        self.titlelabel = FluLabel(self.titlebar, text=self.title(), width=50)
-        self.titlelabel.pack(fill="y", side="left")
-        self.closebutton = FluButton(self.titlebar, text="", width=32, height=32, command=lambda: self.quit())
-        self.closebutton.pack(fill="y", side="right")
-        self.titlebar.pack(fill="x", side="top")
-
-        if platform == "win32":
-            if way == 0:
-                from .customwindow import CustomWindow
-                self.customwindow = CustomWindow(self, wait=wait)
-                self.customwindow.bind_drag(self.titlebar)
-                self.customwindow.bind_drag(self.titlelabel)
-            else:
-                self.overrideredirect(True)
-                try:
-                    from win32gui import GetParent, GetWindowLong, SetWindowLong
-                    from win32con import GWL_EXSTYLE, WS_EX_APPWINDOW, WS_EX_TOOLWINDOW
-                    hwnd = GetParent(self.winfo_id())
-                    style = GetWindowLong(hwnd, GWL_EXSTYLE)
-                    style = style & ~WS_EX_TOOLWINDOW
-                    style = style | WS_EX_APPWINDOW
-                    SetWindowLong(hwnd, GWL_EXSTYLE, style)
-                    self.after(30, lambda: self.withdraw())
-                    self.after(60, lambda: self.deiconify())
-                except:
-                    pass
-
-                self.wm_attributes("-topmost", True)
 
-                from .customwindow2 import WindowDragArea
-                self.dragarea = WindowDragArea(self)
-                self.dragarea.bind(self.titlebar)
-                self.dragarea.bind(self.titlelabel)
 
-        self.custom = True

tkflu/winico.py

@@ -0,0 +1,25 @@
+from tkdeft.object import DObject
+
+try:
+    from tkwinico import *
+except:
+    class FluWinico(DObject):
+        pass
+else:
+    class FluWinico(Winico, DObject):
+        def __init__(self, *args, icon_name=None, icon_file=None, **kwargs):
+            super().__init__(*args, **kwargs)
+
+            self.tray_add(self.icon(icon_name=icon_name, icon_file=icon_file), callback=self.callback, callback_args=[MESSAGE, X, Y])
+
+            from .popupmenu import FluPopupMenu
+
+            self.menu = FluPopupMenu()
+            self.menu.window.geometry("100x40")
+
+        def callback(self, message, x, y):
+            if message == "WM_RBUTTONDOWNessage":
+                self.menu.window.attributes("-topmost", True)
+                self.menu.window.deiconify()
+                self.menu.popup(x, y)
+                self.menu.focus_set()

{tkfluent-0.0.2.dist-info → tkfluent-0.0.3.dist-info}/METADATA

@@ -1,22 +1,23 @@
 Metadata-Version: 2.1
 Name: tkfluent
-Version: 0.0.2
+Version: 0.0.3
 Summary: Fluent Design for Tkinter
 Author: XiangQinxi
 Author-email: xiangqinxi@outlook.com
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
+Requires-Python: >=3.7,<4.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Requires-Dist: easydict (>=1.13,<2.0)
+Requires-Dist: pillow (>=10.2.0,<11.0.0)
+Requires-Dist: svgwrite (>=1.4.3,<2.0.0)
 Requires-Dist: tkdeft (>=0.0.7,<0.0.8)
+Requires-Dist: tkextrafont (>=0.6.3,<0.7.0)
+Requires-Dist: tksvg (>=0.7.4,<0.8.0)
 Project-URL: Documentation, https://tkfluent.netlify.app
 Description-Content-Type: text/markdown
 

tkfluent-0.0.3.dist-info/RECORD

@@ -0,0 +1,27 @@
+tkflu/__init__.py,sha256=HXTCYFRrttdDS-SfE-vKHNbb6_sw4WqAUkaiv-F7IkA,751
+tkflu/__main__.py,sha256=sWIY4ltJN76w7LmlGZQmE3N0X0VyYS3_zSL-76VwEeY,2002
+tkflu/badge.py,sha256=SReWYzwuJpKU-OvnpMUrsYoYAJ2pA0bahChxS06lhYk,4914
+tkflu/button.py,sha256=WZgwCxKIg0O_zwgsYY37FNyeZdcjIs7xewEiAUqdaK8,11967
+tkflu/bwm.py,sha256=KdDbHar0wReUwJDmLqKYQkfQ_xcBLNVDkTZayTk30FY,5979
+tkflu/checkbox.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tkflu/customwindow.py,sha256=Fr4CF0vKwj36tYzgX9_5F7OwcD59z9LfOW20Ugm2Hxc,3761
+tkflu/customwindow2.py,sha256=nyNEMoGVnOYXCPbdvxZFUH-VlpAtjjEGI8Ul9VDvgAs,2109
+tkflu/entry.py,sha256=5afwWpMgGo_Lm7-ZDuipplxsI5Z1YNsLumtwmaxJIAE,6481
+tkflu/frame.py,sha256=jQprJ5pXfQ17iywzbAatS12U2g43yg1Mg7O-3dnXPOQ,7934
+tkflu/image.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tkflu/label.py,sha256=m9HEXlM0ribh8y4B6vfp3HEVH8ElyuVPyG-2BwzdGVo,1598
+tkflu/listbox.py,sha256=gD_oNNWVZtm5qXQ8bVBNRqJL6CGiIYtvhxztM9huzew,9991
+tkflu/litenav.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tkflu/menu.py,sha256=XUhbEmo0xgiVAv0o8HDRF4jfZ0PxGKbeyzWp3xkQwKk,1868
+tkflu/menubar.py,sha256=2XdMfWy6djGU3RL1ykbaUR6bj0rwaqdUJmufOzsdOPE,4027
+tkflu/popupmenu.py,sha256=rf_YWX5UzwlAhoRDRZE_tVbx_yfVxkecsdWTWvg80QA,2349
+tkflu/scrollbar.py,sha256=1hbu5n1mx4KyiF_M3sohpJJPux1zu5Jlw9V6LfQQs1Y,7293
+tkflu/text.py,sha256=5JwWXQ4OutnqxUWoZ-m1agULDSEg6HDoNdaU0wQMKd8,6590
+tkflu/thememanager.py,sha256=oG-VWkFogVJJOmsz67hyVfvNdkWMUeP252Qcez8FQmk,963
+tkflu/togglebutton.py,sha256=hcAYh8XYaireQuGLHKWxJDLm2wMYHt3GlJnE8TjjbIY,13436
+tkflu/toplevel.py,sha256=e5ZhQ7W2OheWJTkqev9sp9onmSASGIp_hdBaO8EYDc0,723
+tkflu/window.py,sha256=X3hhhtzwwFpKfuVsdkcUk4qX_5Y0iGEUO_N7mKU9sGw,713
+tkflu/winico.py,sha256=5wB9VL6SyMLD9fH9eglWPuJjQAyd851PoNUO4j5A9gw,859
+tkfluent-0.0.3.dist-info/METADATA,sha256=Kcv5NWDbTxkT7dV8NIJiuv3JEPZvQvH4wc17RwLt7KQ,872
+tkfluent-0.0.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+tkfluent-0.0.3.dist-info/RECORD,,

{tkfluent-0.0.2.dist-info → tkfluent-0.0.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
 Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
-Tag: py2.py3-none-any
+Tag: py3-none-any

tkfluent-0.0.2.dist-info/RECORD

@@ -1,21 +0,0 @@
-tkflu/__init__.py,sha256=ZkeXXJhoEwjNUes12oBZHovvKFCuZiaoZj-NCeFvVYg,530
-tkflu/__main__.py,sha256=7qALQjQaw9-cEB_9UhWUuQYZSfh9eONftFx16PlosCE,1317
-tkflu/badge.py,sha256=3Yw5EwlA2UvRLVMK8jdsAv_R6RtrSbC5dQTk9gr2sv4,4882
-tkflu/button.py,sha256=2_XxwkauewTL_Z6YIafJRXAQg8jyrPGhLdRJMaZ1QFY,9987
-tkflu/checkbox.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tkflu/customwindow.py,sha256=Fr4CF0vKwj36tYzgX9_5F7OwcD59z9LfOW20Ugm2Hxc,3761
-tkflu/customwindow2.py,sha256=nyNEMoGVnOYXCPbdvxZFUH-VlpAtjjEGI8Ul9VDvgAs,2109
-tkflu/entry.py,sha256=5tQqhGzqwSiRIJQdZz52afDtVAWKKfWNeLgGDzeRXNk,6416
-tkflu/frame.py,sha256=noQhnU-4d6UnvjVMeLYTuS5F-pFBx9-iSJCFXH02B2c,7075
-tkflu/image.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tkflu/label.py,sha256=m9HEXlM0ribh8y4B6vfp3HEVH8ElyuVPyG-2BwzdGVo,1598
-tkflu/listbox.py,sha256=gD_oNNWVZtm5qXQ8bVBNRqJL6CGiIYtvhxztM9huzew,9991
-tkflu/litenav.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tkflu/scrollbar.py,sha256=1hbu5n1mx4KyiF_M3sohpJJPux1zu5Jlw9V6LfQQs1Y,7293
-tkflu/text.py,sha256=uwpW2omhd6kKQyEVMH-GSSozeMxP3zBUY_RPW5fvuao,6525
-tkflu/thememanager.py,sha256=10Pp4nRyEjdbX4wmh4HayIZomc_iz_vxxSrhIh2SR6s,941
-tkflu/togglebutton.py,sha256=hcAYh8XYaireQuGLHKWxJDLm2wMYHt3GlJnE8TjjbIY,13436
-tkflu/window.py,sha256=pc5M9jIgUj98cFJNR7Q4i3Sll3HxIsDKA8dHL2DxWXg,6581
-tkfluent-0.0.2.dist-info/METADATA,sha256=5UKzRl5OML8VJkXCB1TNd_TB1h5ofkavnxHsDQEhCVM,890
-tkfluent-0.0.2.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
-tkfluent-0.0.2.dist-info/RECORD,,