psiutils 0.2.12__tar.gz → 0.2.14__tar.gz

{psiutils-0.2.12 → psiutils-0.2.14}/PKG-INFO

@@ -1,17 +1,21 @@
 Metadata-Version: 2.3
 Name: psiutils
-Version: 0.2.12
+Version: 0.2.14
 Summary: Various TKinter utilities.
 Author: Jeff
 Author-email: Jeff <<jeffwatkins2000@gmail.com>>
+Requires-Dist: appdirs>=1.4.4
 Requires-Dist: iniconfig>=2.1.0
 Requires-Dist: markdown>=3.8.2
 Requires-Dist: packaging>=25.0
 Requires-Dist: pillow>=11.3.0
 Requires-Dist: pluggy>=1.6.0
-Requires-Dist: psi-toml>=0.0.21
-Requires-Dist: psiconfig>=0.0.15
+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: structlog>=25.4.0
 Requires-Dist: tkinterweb>=4.4.4
 Requires-Dist: tkinterweb-tkhtml>=1.1.1
 Requires-Dist: tomli>=2.2.1

{psiutils-0.2.12 → psiutils-0.2.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "psiutils"
-version = "0.2.12"
+version = "0.2.14"
 description = "Various TKinter utilities."
 authors = [{name = "Jeff", "email" = "<jeffwatkins2000@gmail.com>"}]
 requires-python = '>= 3.10, < 3.13'
@@ -9,14 +9,18 @@ readme = "README.md"
 include = ["HISTORY.md", "src/psiutils/icons/*.png"]
 
 dependencies = [
+    "appdirs>=1.4.4",
     "iniconfig>=2.1.0",
     "markdown>=3.8.2",
     "packaging>=25.0",
     "pillow>=11.3.0",
     "pluggy>=1.6.0",
-    "psi-toml>=0.0.21",
-    "psiconfig>=0.0.15",
+    "psi-toml>=0.0.12",
+    "psiconfig>=0.0.14",
+    "pycairo>=1.28.0",
     "pygments>=2.19.2",
+    "pygobject>=3.54.2",
+    "structlog>=25.4.0",
     "tkinterweb>=4.4.4",
     "tkinterweb-tkhtml>=1.1.1",
     "tomli>=2.2.1",

{psiutils-0.2.12 → psiutils-0.2.14}/src/psiutils/_about_frame.py

@@ -8,7 +8,9 @@ import markdown
 from psiutils.constants import PAD, Pad
 from psiutils.utilities import window_resize
 
-from psiutils import text as txt
+from psiutils.text import Text
+
+txt = Text()
 
 DEFAULT_GEOMETRY = '400x200'
 HISTORY_GEOMETRY = '800x750'

psiutils-0.2.14/src/psiutils/_version.py

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

{psiutils-0.2.12 → psiutils-0.2.14}/src/psiutils/buttons.py

@@ -4,10 +4,12 @@ from tkinter import ttk
 from pathlib import Path
 from PIL import Image, ImageTk
 
-import psiutils.text as txt
+from psiutils.text import Text
 
-from .constants import PAD, Pad
-from .widgets import enter_widget, clickable_widget, HAND
+from psiutils.constants import PAD, Pad
+from psiutils.widgets import enter_widget, clickable_widget, HAND
+
+txt = Text()
 
 
 class IconButton(ttk.Frame):

{psiutils-0.2.12 → psiutils-0.2.14}/src/psiutils/constants.py

@@ -74,6 +74,7 @@ class Mode(Enum):
     EDIT = auto()
     DELETE = auto()
 
+
 class Status(Enum):
     YES = True
     NO = False
@@ -81,5 +82,7 @@ class Status(Enum):
     NULL = 0
     EXIT = 1
     OK = 2
-    UPDATED = 3
-    ERROR = 4
+    SUCCESS = 3
+    UPDATED = 4
+    ERROR = 5
+    WARNING = 6

{psiutils-0.2.12 → psiutils-0.2.14}/src/psiutils/messagebox.py

@@ -5,9 +5,11 @@ from tkinter import font
 from pathlib import Path
 from PIL import ImageTk, Image
 
-from psiutils.constants import PAD
+from psiutils.constants import PAD, Status
 
-import psiutils.text as text
+from psiutils.text import Text
+
+txt = Text()
 
 icons = {
     'info': 'icon-info.png',
@@ -113,29 +115,29 @@ class MessageBox():
     def _get_buttons(self, frame: ttk.Frame) -> dict[str, ttk.Button]:
         return {
             'ok': ttk.Button(
-                frame, text=text.OK, command=self._ok, underline=0),
+                frame, text=txt.OK, command=self._ok, underline=0),
             'yes': ttk.Button(
-                frame, text=text.YES, command=self._yes, underline=0),
+                frame, text=txt.YES, command=self._yes, underline=0),
             'no': ttk.Button(
-                frame, text=text.NO, command=self._no, underline=0),
+                frame, text=txt.NO, command=self._no, underline=0),
             'cancel': ttk.Button(
-                frame, text=text.CANCEL, command=self._cancel, underline=0),
+                frame, text=txt.CANCEL, command=self._cancel, underline=0),
         }
 
     def _ok(self, *args) -> None:
-        self.status = STATUS['cancel']
+        self.status = Status.OK
         self._dismiss()
 
     def _yes(self, *args) -> None:
-        self.status = STATUS['yes']
+        self.status = Status.YES
         self._dismiss()
 
     def _no(self, *args) -> None:
-        self.status = STATUS['no']
+        self.status = Status.NO
         self._dismiss()
 
     def _cancel(self, *args) -> None:
-        self.status = STATUS['cancel']
+        self.status = Status.CANCEL
         self._dismiss()
 
     def _dismiss(self, *args) -> None:

{psiutils-0.2.12 → psiutils-0.2.14}/src/psiutils/text.py

@@ -1,52 +1,9 @@
-BUILD = 'Build'
-CANCEL = 'Cancel'
-CHECK = 'Check'
-CLEAR = 'Clear'
-CLOSE = 'Close'
-CODE = 'Code'
-COMPARE = 'Compare'
-CONFIG = 'Config'
-COPY = 'Copy'
-DELETE = 'Delete'
-DELETE_THESE_ITEMS = 'Are you sure you want to delete these item(s)?'
-DIFF = 'Diff'
-DONE = 'Done'
-EDIT = 'Edit'
-EVENT = 'Event'
-EXIT = 'Exit'
-HELP = 'Help'
-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'
-REVERT = 'Revert'
-RUN = 'Run'
-SAVE = 'Save'
-SCRIPT = 'Script'
-SAVE_PDF = 'Save as PDF'
-SEARCH = 'Search'
-SEND = 'Send'
-START = 'Start'
-UPDATE = 'Update'
-UPGRADE = 'Upgrade'
-USE = 'Use'
-WINDOWS = 'Windows'
-YES = 'Yes'
+""" Handle standard text for psiutils."""
 
+from copy import copy
 
-strings = {
+
+psi_strings = {
     'BUILD': 'Build',
     'CANCEL': 'Cancel',
     'CHECK': 'Check',
@@ -96,6 +53,8 @@ strings = {
     'YES': 'Yes',
 }
 
+strings = copy(psi_strings)
+
 
 class Text():
     """Combines package level and psiutils strings."""
@@ -119,9 +78,15 @@ class Text():
         """Print out contents of `strings` and compare if
         a dict of strings is provided."""
         duplicates = 0
-        overrides =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:
@@ -129,6 +94,9 @@ class Text():
                     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
@@ -141,3 +109,7 @@ class Text():
         if overrides:
             print()
             print(f'{overrides} overrides found')
+
+        if app_strings:
+            print()
+            print(f'{app_strings} application strings found')

{psiutils-0.2.12 → psiutils-0.2.14}/src/psiutils/utilities.py

@@ -1,4 +1,5 @@
 """Common methods for psiutils."""
+import sys
 from pathlib import Path
 import tkinter as tk
 import ctypes
@@ -6,11 +7,11 @@ from typing import Any
 import platform
 
 from psiconfig import TomlConfig
-import psiutils.text as txt
-
-# Exposes psi_logger to other applications
 from psiutils._logger import psi_logger
 from psiutils._notify import _notify as notify
+from psiconfig import TomlConfig
+from psiutils.text import Text
+txt = Text()
 
 DEFAULT_GEOMETRY = '500x400'
 
@@ -28,6 +29,16 @@ def display_icon(root: tk.Tk, icon_file_path: str,
         print(f'Cannot find icon file: {icon_file_path}')
 
 
+def resource_path(base: Path, relative_path: Path):
+    """ Get absolute path to resource, works for dev and for PyInstaller."""
+    try:
+        # PyInstaller creates a temp folder and stores path in _MEIPASS
+        base_path = sys._MEIPASS
+    except Exception:
+        base_path = Path(base).parent
+    return Path(base_path, relative_path)
+
+
 class Enum():
     def __init__(self, values: dict) -> None:
         self.values = invert(values)
@@ -75,6 +86,7 @@ def enable_frame(parent: tk.Frame, enable: bool = True) -> None:
         else:
             child.configure(state=state)
 
+
 def geometry(config: TomlConfig, file: Path, default: str = '') -> str:
     if not default:
         default = DEFAULT_GEOMETRY

{psiutils-0.2.12 → psiutils-0.2.14}/src/psiutils/widgets.py

@@ -62,6 +62,7 @@ def get_styles() -> ttk.Style:
 
     style.configure('red-bg.TEntry', fieldbackground='red')
     style.configure('green-bg.TEntry', fieldbackground='green')
+    style.configure('blue-bg.TEntry', fieldbackground='blue')
     style.configure('orange-bg.TEntry', fieldbackground='orange')
     style.configure(
         'pale-umber-bg.TEntry', fieldbackground=COLOURS['pale-umber'])
@@ -71,6 +72,7 @@ def get_styles() -> ttk.Style:
     # Entries - foreground
     style.configure('red-fg.TEntry', foreground='red')
     style.configure('green-fg.TEntry', foreground='green')
+    style.configure('blue-fg.TEntry', foreground='blue')
     style.configure('orange-fg.TEntry', foreground='orange')
 
     # Frames
@@ -83,6 +85,8 @@ def get_styles() -> ttk.Style:
     # radiobuttons
     style.configure('red-fg.TRadiobutton', foreground='red')
     style.configure('green-fg.TRadiobutton', foreground='green')
+    style.configure('blue-fg.TRadiobutton', foreground='blue')
+    style.configure('orange-fg.TRadiobutton', foreground='orange')
 
     # Tree view
     style.map('Treeview',

psiutils-0.2.12/src/psiutils/_version.py

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