tkfluent 0.0.2__tar.gz → 0.0.3__tar.gz

{tkfluent-0.0.2 → tkfluent-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 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

{tkfluent-0.0.2 → tkfluent-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tkfluent"
-version = "0.0.2"
+version = "0.0.3"
 description = "Fluent Design for Tkinter"
 authors = ["XiangQinxi <xiangqinxi@outlook.com>"]
 readme = "README.md"

{tkfluent-0.0.2 → tkfluent-0.0.3}/tkflu/__init__.py

@@ -12,6 +12,7 @@ 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
@@ -19,6 +20,8 @@ from .thememanager import FluThemeManager
 from .togglebutton import FluToggleButton
 from .toplevel import FluToplevel
 from .window import FluWindow
+#from .winico import FluWinico
+
 
 FluChip = FluBadge
 FluPushButton = FluButton

{tkfluent-0.0.2 → tkfluent-0.0.3}/tkflu/__main__.py

@@ -4,7 +4,7 @@ from tkinter.font import *
 
 root = FluWindow()
 #root.wincustom(way=0)
-root.wm_geometry("220x400")
+root.wm_geometry("360x500")
 
 popupmenu = FluPopupMenu()
 
@@ -12,8 +12,28 @@ thememanager = FluThemeManager()
 
 menubar = FluMenuBar(root)
 menubar.add_command(
-    label="FluMenu1", width=80, command=lambda: print("FluMenu -> Clicked")
+    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)

{tkfluent-0.0.2 → tkfluent-0.0.3}/tkflu/button.py

@@ -179,24 +179,24 @@ 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": "#f0f0f0",
-                "border_color2": "#f0f0f0",
+                "border_color": "#e5e5e5",
+                "border_color2": "#e5e5e5",
                 "border_width": 1,
                 "radius": 6,
                 "text_color": "#636363",

{tkfluent-0.0.2 → tkfluent-0.0.3}/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,

tkfluent-0.0.3/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

{tkfluent-0.0.2 → tkfluent-0.0.3}/tkflu/menubar.py

@@ -62,7 +62,9 @@ class FluMenuBar(Frame, DObject):
         widget.pack(side="left", padx=5, pady=5)
         self.dcget("actions")[id] = widget
 
-    def add_cascade(self, custom_widget=None, width=40, menu=None, **kwargs):
+    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:
@@ -76,17 +78,17 @@ class FluMenuBar(Frame, DObject):
             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
+
+        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:
@@ -98,6 +100,9 @@ class FluMenuBar(Frame, DObject):
         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)
 

tkfluent-0.0.3/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

{tkfluent-0.0.2 → tkfluent-0.0.3}/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,

tkfluent-0.0.3/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/tkflu/menu.py

@@ -1,7 +0,0 @@
-from .popupmenu import FluPopupMenu
-from tkdeft.object import DObject
-
-
-class FluMenu(FluPopupMenu):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)

tkfluent-0.0.2/tkflu/popupmenu.py

@@ -1,37 +0,0 @@
-from tkinter import Toplevel
-from .frame import FluFrame
-
-
-class FluPopupMenuWindow(Toplevel):
-    def __init__(self, *args, transparent_color="#ffefa2", mode="light", width=200, height=400, **kwargs):
-        super().__init__(*args, background=transparent_color, width=width, height=height, **kwargs)
-
-        self.theme(mode=mode)
-
-        self.transient_color = transparent_color
-        self.overrideredirect(True)
-        self.attributes("-transparentcolor", transparent_color)
-
-        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, transparent_color="#ffefa2", style="popupmenu", **kwargs):
-        self.window = FluPopupMenuWindow(transparent_color=transparent_color)
-
-        super().__init__(self.window, *args, style=style, **kwargs)
-
-        self.pack(fill="both", expand="yes", padx=5, pady=5)
-
-    def popup(self, x, y):
-        self.window.popup(x=x, y=y)