psiutils 0.2.32__tar.gz → 0.2.34__tar.gz

{psiutils-0.2.32 → psiutils-0.2.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: psiutils
-Version: 0.2.32
+Version: 0.2.34
 Summary: Various TKinter utilities.
 Author: Jeff
 Author-email: Jeff <<jeffwatkins2000@gmail.com>>
@@ -14,7 +14,6 @@ Requires-Dist: psi-toml>=0.0.12
 Requires-Dist: psiconfig>=0.0.14
 Requires-Dist: pycairo>=1.28.0
 Requires-Dist: pygments>=2.19.2
-Requires-Dist: pygobject>=3.54.2
 Requires-Dist: pytest>=9.0.2
 Requires-Dist: structlog>=25.4.0
 Requires-Dist: tkcalendar>=1.6.1

{psiutils-0.2.32 → psiutils-0.2.34}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "psiutils"
-version = "0.2.32"
+version = "0.2.34"
 description = "Various TKinter utilities."
 authors = [{name = "Jeff", "email" = "<jeffwatkins2000@gmail.com>"}]
 requires-python = '>= 3.10, < 3.13'
@@ -19,7 +19,6 @@ dependencies = [
     "psiconfig>=0.0.14",
     "pycairo>=1.28.0",
     "pygments>=2.19.2",
-    "pygobject>=3.54.2",
     "pytest>=9.0.2",
     "structlog>=25.4.0",
     "tkcalendar>=1.6.1",

psiutils-0.2.34/src/psiutils/_version.py

@@ -0,0 +1 @@
+__version__ = '0.2.34'

{psiutils-0.2.32 → psiutils-0.2.34}/src/psiutils/buttons.py

@@ -1,4 +1,5 @@
 """Button class for Tkinter applications."""
+
 import tkinter as tk
 from tkinter import ttk
 from pathlib import Path
@@ -14,16 +15,17 @@ txt = Text()
 
 class IconButton(ttk.Frame):
     def __init__(
-            self,
-            master,
-            button_text,
-            icon,
-            command=None,
-            dimmable: bool = False,
-            sticky: str = '',
-            icon_path: str = '',
-            **kwargs):
-        super().__init__(master, borderwidth=1, relief='raised', **kwargs)
+        self,
+        master,
+        button_text,
+        icon,
+        command=None,
+        dimmable: bool = False,
+        sticky: str = "",
+        icon_path: str = "",
+        **kwargs,
+    ):
+        super().__init__(master, borderwidth=1, relief="raised", **kwargs)
         self.command = command
         self._state = tk.NORMAL
         self.text = button_text
@@ -31,12 +33,13 @@ class IconButton(ttk.Frame):
 
         # Icon and text
         if not icon_path:
-            icon_path = f'{Path(__file__).parent}/icons/'
-        image = Image.open(f'{icon_path}{icon}.png').resize((16, 16))
+            icon_path = f"{Path(__file__).parent}/icons/"
+        image = Image.open(f"{icon_path}{icon}.png").resize((16, 16))
         photo_image = ImageTk.PhotoImage(image)
 
         self.button_label = ttk.Label(
-            self, text=button_text, image=photo_image, compound=tk.LEFT)
+            self, text=button_text, image=photo_image, compound=tk.LEFT
+        )
         self.button_label.image = photo_image  # Prevent garbage collection
         self.button_label.pack(padx=(3, 5), pady=5)
         self.widget = self.button_label
@@ -48,7 +51,7 @@ class IconButton(ttk.Frame):
         self.dimmable = dimmable
 
     def __repr__(self) -> str:
-        return f'IconButton: {self.text} {self.icon}'
+        return f"IconButton: {self.text} {self.icon}"
 
     def state(self, *args, **kwargs) -> dict:
         return self._state
@@ -65,14 +68,14 @@ class IconButton(ttk.Frame):
 
     def bind_widgets(self):
         for widget in (self, self.button_label):
-            widget.bind('<Button-1>', self._on_click)
-            widget.bind('<Enter>', self._enter_button)
-            widget.bind('<Leave>', lambda e: self.config(relief='raised'))
+            widget.bind("<Button-1>", self._on_click)
+            widget.bind("<Enter>", self._enter_button)
+            widget.bind("<Leave>", lambda e: self.config(relief="raised"))
 
     def _enter_button(self, event) -> None:
         if self._state == tk.DISABLED:
             return
-        self.config(relief='sunken')
+        self.config(relief="sunken")
         event.widget.winfo_toplevel().config(cursor=HAND)
 
     def _on_click(self, *args):
@@ -84,12 +87,12 @@ class IconButton(ttk.Frame):
 
 class Button(ttk.Button):
     def __init__(
-            self,
-            *args,
-            sticky: str = '',
-            dimmable: bool = False,
-            **kwargs: dict,
-            ) -> None:
+        self,
+        *args,
+        sticky: str = "",
+        dimmable: bool = False,
+        **kwargs: dict,
+    ) -> None:
         super().__init__(*args, **kwargs)
 
         self.sticky = sticky
@@ -97,26 +100,24 @@ class Button(ttk.Button):
 
     def enable(self, enable: bool = True) -> None:
         state = tk.NORMAL if enable else tk.DISABLED
-        self['state'] = state
+        self["state"] = state
 
     def disable(self, disable: bool = True) -> None:
         state = tk.DISABLED if disable else tk.NORMAL
-        self['state'] = state
+        self["state"] = state
 
 
 class ButtonFrame(ttk.Frame):
     def __init__(
-            self,
-            master: tk.Frame,
-            orientation: str = tk.HORIZONTAL,
-            **kwargs: dict) -> None:
+        self, master: tk.Frame, orientation: str = tk.HORIZONTAL, **kwargs: dict
+    ) -> None:
         super().__init__(master, **kwargs)
         self._buttons = []
         self._enabled = False
         self.orientation = orientation
 
-        if 'enabled' in kwargs:
-            self._enabled = kwargs['enabled']
+        if "enabled" in kwargs:
+            self._enabled = kwargs["enabled"]
 
         self.icon_buttons = {
             name: IconButton(self, button[0], button[1])
@@ -124,10 +125,11 @@ class ButtonFrame(ttk.Frame):
         }
 
     def icon_button(
-            self,
-            id_: str,
-            command: object = None,
-            dimmable: bool = False,) -> IconButton:
+        self,
+        id_: str,
+        command: object = None,
+        dimmable: bool = False,
+    ) -> IconButton:
         button = self.icon_buttons[id_]
         button.dimmable = dimmable
         button.command = command
@@ -154,8 +156,8 @@ class ButtonFrame(ttk.Frame):
     def enabled(self, value: bool) -> None:
         self._enabled = value
         state = tk.NORMAL if value else tk.DISABLED
-        for button in self. buttons:
-            button.widget['state'] = state
+        for button in self.buttons:
+            button.widget["state"] = state
 
     def enable(self, enable: bool = True) -> None:
         self._enabled = enable
@@ -166,7 +168,7 @@ class ButtonFrame(ttk.Frame):
         self._enable_buttons(self.buttons, False)
 
     def _vertical_buttons(self) -> None:
-        self.rowconfigure(len(self.buttons)-1, weight=1)
+        self.rowconfigure(len(self.buttons) - 1, weight=1)
         for row, button in enumerate(self.buttons):
             pady = PAD
             if row == 0:
@@ -180,7 +182,7 @@ class ButtonFrame(ttk.Frame):
             clickable_widget(button)
 
     def _horizontal_buttons(self) -> None:
-        self.columnconfigure(len(self.buttons)-1, weight=1)
+        self.columnconfigure(len(self.buttons) - 1, weight=1)
         for col, button in enumerate(self.buttons):
             padx = PAD
             if col == 0:
@@ -199,8 +201,8 @@ class ButtonFrame(ttk.Frame):
         for button in buttons:
             if button.dimmable:
                 if isinstance(button, Button):
-                    button['state'] = state
-                    button.bind('<Enter>', enter_widget)
+                    button["state"] = state
+                    button.bind("<Enter>", enter_widget)
                 elif isinstance(button, IconButton):
                     if enable:
                         button.enable()
@@ -212,55 +214,57 @@ def enable_buttons(buttons: list[Button], enable: bool = True):
     state = tk.NORMAL if enable else tk.DISABLED
     for button in buttons:
         if button.dimmable:
-            button['state'] = state
-            button.bind('<Enter>', enter_widget)
+            button["state"] = state
+            button.bind("<Enter>", enter_widget)
 
 
 icon_buttons = {
-    'backup': (txt.BACKUP, 'backup'),
-    'build': (txt.BUILD, 'build'),
-    'check': (txt.CHECK, 'check'),
-    'clear': (txt.CLEAR, 'clear'),
-    'close': (txt.CLOSE, 'cancel'),
-    'code': (txt.CODE, 'code'),
-    'compare': (txt.COMPARE, 'compare'),
-    'config': (txt.CONFIG, 'gear'),
-    'convert': (txt.CONVERT, 'convert'),
-    'copy_docs': (txt.COPY, 'copy_docs'),
-    'copy_clipboard': (txt.COPY, 'copy_clipboard'),
-    'delete': (txt.DELETE, 'delete'),
-    'download': (txt.DOWNLOAD, 'download'),
-    'diff': (txt.DIFF, 'diff'),
-    'done': (txt.DONE, 'done'),
-    'edit': (txt.EDIT, 'edit'),
-    'exit': (txt.EXIT, 'cancel'),
-    'new': (txt.NEW, 'new'),
-    'next': (txt.NEXT, 'next'),
-    'open': (txt.OPEN, 'open'),
-    'pause': (txt.PAUSE, 'pause'),
-    'preferences': (txt.PREFERENCES, 'preferences'),
-    'previous': (txt.PREVIOUS, 'previous'),
-    'process': (txt.PROCESS, 'process'),
-    'redo': (txt.REDO, 'redo'),
-    'refresh': (txt.REFRESH, 'refresh'),
-    'rename': (txt.RENAME, 'rename'),
-    'report': (txt.REPORT, 'report'),
-    'reset': (txt.RESET, 'reset'),
-    'restore': (txt.RESTORE, 'restore'),
-    'restore_database': (txt.RESTORE, 'restore_database'),
-    'restore_page': (txt.RESTORE, 'restore_page'),
-    'revert': (txt.REVERT, 'revert'),
-    'run': (txt.RUN, 'start'),
-    'save': (txt.SAVE, 'save'),
-    'script': (txt.SCRIPT, 'script'),
-    'search': (txt.SEARCH, 'search'),
-    'send': (txt.SEND, 'send'),
-    'start': (txt.START, 'start'),
-    'update': (txt.UPDATE, 'update'),
-    'upgrade': (txt.UPGRADE, 'upgrade'),
-    'upload': (txt.UPLOAD, 'upload'),
-    'use': (txt.USE, 'done'),
-    'windows': (txt.WINDOWS, 'windows'),
+    "backup": (txt.BACKUP, "backup"),
+    "build": (txt.BUILD, "build"),
+    "check": (txt.CHECK, "check"),
+    "clear": (txt.CLEAR, "clear"),
+    "close": (txt.CLOSE, "cancel"),
+    "code": (txt.CODE, "code"),
+    "compare": (txt.COMPARE, "compare"),
+    "config": (txt.CONFIG, "gear"),
+    "convert": (txt.CONVERT, "convert"),
+    "copy_docs": (txt.COPY, "copy_docs"),
+    "copy_clipboard": (txt.COPY, "copy_clipboard"),
+    "delete": (txt.DELETE, "delete"),
+    "download": (txt.DOWNLOAD, "download"),
+    "diff": (txt.DIFF, "diff"),
+    "done": (txt.DONE, "done"),
+    "edit": (txt.EDIT, "edit"),
+    "exit": (txt.EXIT, "cancel"),
+    "help": (txt.HELP, "help"),
+    "new": (txt.NEW, "new"),
+    "next": (txt.NEXT, "next"),
+    "open": (txt.OPEN, "open"),
+    "pause": (txt.PAUSE, "pause"),
+    "preferences": (txt.PREFERENCES, "preferences"),
+    "previous": (txt.PREVIOUS, "previous"),
+    "process": (txt.PROCESS, "process"),
+    "redo": (txt.REDO, "redo"),
+    "refresh": (txt.REFRESH, "refresh"),
+    "rename": (txt.RENAME, "rename"),
+    "report": (txt.REPORT, "report"),
+    "reset": (txt.RESET, "reset"),
+    "restore": (txt.RESTORE, "restore"),
+    "restore_database": (txt.RESTORE, "restore_database"),
+    "restore_page": (txt.RESTORE, "restore_page"),
+    "revert": (txt.REVERT, "revert"),
+    "run": (txt.RUN, "start"),
+    "save": (txt.SAVE, "save"),
+    "script": (txt.SCRIPT, "script"),
+    "search": (txt.SEARCH, "search"),
+    "send": (txt.SEND, "send"),
+    "start": (txt.START, "start"),
+    "undo": (txt.UNDO, "revert"),
+    "update": (txt.UPDATE, "update"),
+    "upgrade": (txt.UPGRADE, "upgrade"),
+    "upload": (txt.UPLOAD, "upload"),
+    "use": (txt.USE, "done"),
+    "windows": (txt.WINDOWS, "windows"),
 }
 
 
@@ -268,16 +272,17 @@ def list_icon_buttons() -> None:
     """List of icon_button."""
     name_length, text_length, icon_length = 15, 10, 15
 
-    print(
-        (f'{"name":<{name_length}} '
-         f'{"text":<{text_length}} '
-         f'{"icon":<{icon_length}}'))
+    print((f"{'name':<{name_length}} {'text':<{text_length}} {'icon':<{icon_length}}"))
 
-    print(f'{"-"*name_length:<{name_length}} '
-          f'{"-"*text_length:<{text_length}} '
-          f'{"-"*icon_length:<{icon_length}}')
+    print(
+        f"{'-' * name_length:<{name_length}} "
+        f"{'-' * text_length:<{text_length}} "
+        f"{'-' * icon_length:<{icon_length}}"
+    )
 
     for name, button in icon_buttons.items():
-        print(f'{name:<{name_length}} '
-              f'{button[0]:<{text_length}} '
-              f'{button[1]:<{icon_length}}')
+        print(
+            f"{name:<{name_length}} "
+            f"{button[0]:<{text_length}} "
+            f"{button[1]:<{icon_length}}"
+        )

psiutils-0.2.34/src/psiutils/text.py

@@ -0,0 +1,125 @@
+"""Handle standard text for psiutils."""
+
+from copy import copy
+
+
+psi_strings = {
+    "BACKUP": "Backup",
+    "BUILD": "Build",
+    "CANCEL": "Cancel",
+    "CHECK": "Check",
+    "CLEAR": "Clear",
+    "CLOSE": "Close",
+    "CODE": "Code",
+    "COMPARE": "Compare",
+    "CONFIG": "Config",
+    "CONVERT": "Convert",
+    "COPY": "Copy",
+    "DECREMENT_ARROW": "▼",
+    "DELETE": "Delete",
+    "DELETE_THESE_ITEMS": "Are you sure you want to delete these item(s)?",
+    "DIFF": "Diff",
+    "DONE": "Done",
+    "DOWNLOAD": "Download",
+    "EDIT": "Edit",
+    "ELLIPSIS": " ...",
+    "EVENT": "Event",
+    "EXIT": "Exit",
+    "HELP": "Help",
+    "INCREMENT_ARROW": "▲",
+    "LOGS": "Logs",
+    "NEW": "New",
+    "NEXT": "Next",
+    "NO": "No",
+    "NO_SUCH_FILE": "no such file or directory",
+    "OK": "OK",
+    "OPEN": "Open",
+    "PAUSE": "Pause",
+    "PREFERENCES": "Preferences",
+    "PREVIOUS": "Prev",
+    "PROCESS": "Process",
+    "QUIT": "Quit",
+    "REDO": "Redo",
+    "REFRESH": "Refresh",
+    "REPORT": "Report",
+    "RENAME": "Rename",
+    "RESET": "Reset",
+    "RESTORE": "Restore",
+    "REVERT": "Revert",
+    "RUN": "Run",
+    "SAVE": "Save",
+    "SCRIPT": "Script",
+    "SAVE_PDF": "Save as PDF",
+    "SEARCH": "Search",
+    "SEND": "Send",
+    "START": "Start",
+    "UNDO": "Undo",
+    "UPDATE": "Update",
+    "UPGRADE": "Upgrade",
+    "UPLOAD": "Upload",
+    "USE": "Use",
+    "WINDOWS": "Windows",
+    "YES": "Yes",
+}
+
+strings = copy(psi_strings)
+
+
+class Text:
+    """Combines package level and psiutils strings."""
+
+    def __init__(self) -> None:
+        """
+        Initialise the object with attributes based on the key-value pairs
+        in the `strings` dictionary.
+
+        Args:
+            self: The instance of the class.
+
+        Returns:
+            None
+        """
+        self.strings = strings
+        for key, string in strings.items():
+            setattr(self, key, string)
+
+        # Optionally display contents of `strings`
+
+    def display(self, compare: dict = None) -> None:
+        """Print out contents of `strings` and compare if
+        a dict of strings is provided."""
+        duplicates = 0
+        overrides = 0
+        app_strings = 0
+        if not compare:
+            compare = {}
+
+        for key, item in compare.items():
+            if key not in strings:
+                strings[key] = item
+
+        for item in sorted(list(strings)):
+            output = f"{item:.<20} {strings[item]}"
+            if item in compare:
+                if strings[item] != compare[item]:
+                    output = f"{output}, {compare[item]} <{'-' * 10} //override//"
+                    overrides += 1
+                elif item not in psi_strings:
+                    output = f"{output} <{'=' * 10} //app string//"
+                    app_strings += 1
+                else:
+                    output = f"{output} <{'=' * 10} //duplicate//"
+                    duplicates += 1
+            print(output)
+
+        if duplicates:
+            print()
+            print(f"{duplicates} duplicates found")
+
+        if overrides:
+            print()
+            print(f"{overrides} overrides found")
+
+        if app_strings:
+            print()
+            print(f"{app_strings} application strings found")

{psiutils-0.2.32 → psiutils-0.2.34}/src/psiutils/treeview.py

@@ -55,14 +55,14 @@ class Treeview(ttk.Treeview):
             for column, col_defn in enumerate(self.column_defs)
     }
 
-    def _heading(self, col_id: str, heading: str) -> Treeview.heading:
+    def _heading(self, col_id: str, heading: str) -> ttk.Treeview.heading:
         return self.heading(
             col_id,
             text=heading,
             command=lambda c=col_id: self._sort_columns(c, False)
         )
 
-    def populate(self, values: dict[tuples]) -> None:
+    def populate(self, values: dict[tuple]) -> None:
         self.delete(*self.get_children())
         for item in values:
             item = self.insert('', 'end', values=item)

psiutils-0.2.32/src/psiutils/_version.py

@@ -1 +0,0 @@
-__version__ = '0.2.32'

psiutils-0.2.32/src/psiutils/text.py

@@ -1,123 +0,0 @@
-""" Handle standard text for psiutils."""
-
-from copy import copy
-
-
-psi_strings = {
-    'BACKUP': 'Backup',
-    'BUILD': 'Build',
-    'CANCEL': 'Cancel',
-    'CHECK': 'Check',
-    'CLEAR': 'Clear',
-    'CLOSE': 'Close',
-    'CODE': 'Code',
-    'COMPARE': 'Compare',
-    'CONFIG': 'Config',
-    'CONVERT': 'Convert',
-    'COPY': 'Copy',
-    'DECREMENT_ARROW': '▼',
-    'DELETE': 'Delete',
-    'DELETE_THESE_ITEMS': 'Are you sure you want to delete these item(s)?',
-    'DIFF': 'Diff',
-    'DONE': 'Done',
-    'DOWNLOAD': 'Download',
-    'EDIT': 'Edit',
-    'ELLIPSIS': ' ...',
-    'EVENT': 'Event',
-    'EXIT': 'Exit',
-    'HELP': 'Help',
-    'INCREMENT_ARROW': '▲',
-    'LOGS': 'Logs',
-    'NEW': 'New',
-    'NEXT': 'Next',
-    'NO': 'No',
-    'NO_SUCH_FILE': 'no such file or directory',
-    'OK': 'OK',
-    'OPEN': 'Open',
-    'PAUSE': 'Pause',
-    'PREFERENCES': 'Preferences',
-    'PREVIOUS': 'Prev',
-    'PROCESS': 'Process',
-    'QUIT': 'Quit',
-    'REDO': 'Redo',
-    'REFRESH': 'Refresh',
-    'REPORT': 'Report',
-    'RENAME': 'Rename',
-    'RESET': 'Reset',
-    'RESTORE': 'Restore',
-    'REVERT': 'Revert',
-    'RUN': 'Run',
-    'SAVE': 'Save',
-    'SCRIPT': 'Script',
-    'SAVE_PDF': 'Save as PDF',
-    'SEARCH': 'Search',
-    'SEND': 'Send',
-    'START': 'Start',
-    'UPDATE': 'Update',
-    'UPGRADE': 'Upgrade',
-    'UPLOAD': 'Upload',
-    'USE': 'Use',
-    'WINDOWS': 'Windows',
-    'YES': 'Yes',
-}
-
-strings = copy(psi_strings)
-
-
-class Text():
-    """Combines package level and psiutils strings."""
-    def __init__(self) -> None:
-        """
-        Initialise the object with attributes based on the key-value pairs
-        in the `strings` dictionary.
-
-        Args:
-            self: The instance of the class.
-
-        Returns:
-            None
-        """
-        self.strings = strings
-        for key, string in strings.items():
-            setattr(self, key, string)
-
-        # Optionally display contents of `strings`
-    def display(self, compare: dict = None) -> None:
-        """Print out contents of `strings` and compare if
-        a dict of strings is provided."""
-        duplicates = 0
-        overrides = 0
-        app_strings = 0
-        if not compare:
-            compare = {}
-
-        for key, item in compare.items():
-            if key not in strings:
-                strings[key] = item
-
-        for item in sorted(list(strings)):
-            output = f'{item:.<20} {strings[item]}'
-            if item in compare:
-                if strings[item] != compare[item]:
-                    output = (f'{output}, {compare[item]} '
-                              f'<{"-"*10} //override//')
-                    overrides += 1
-                elif item not in psi_strings:
-                    output = f'{output} <{"="*10} //app string//'
-                    app_strings += 1
-                else:
-                    output = f'{output} <{"="*10} //duplicate//'
-                    duplicates += 1
-            print(output)
-
-        if duplicates:
-            print()
-            print(f'{duplicates} duplicates found')
-
-        if overrides:
-            print()
-            print(f'{overrides} overrides found')
-
-        if app_strings:
-            print()
-            print(f'{app_strings} application strings found')