psiutils 0.2.13__py3-none-any.whl → 0.2.15__py3-none-any.whl

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/_version.py

@@ -1 +1 @@
-__version__ = '0.2.13'
+__version__ = '0.2.15'

psiutils/buttons.py

@@ -217,6 +217,7 @@ def enable_buttons(buttons: list[Button], enable: bool = True):
 
 
 icon_buttons = {
+    'backup': (txt.BACKUP, 'backup'),
     'build': (txt.BUILD, 'build'),
     'check': (txt.CHECK, 'check'),
     'clear': (txt.CLEAR, 'clear'),
@@ -243,6 +244,9 @@ icon_buttons = {
     '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'),

psiutils/constants.py

@@ -4,6 +4,9 @@ from enum import Enum, auto
 from .utilities import invert
 from .known_paths import get_documents_dir, get_downloads_dir
 
+DEFAULT_GEOMETRY = '500x400'
+
+# TODO is this needed with Status?
 DIALOG_STATUS: dict = {
     'yes': True,
     'no': False,
@@ -17,6 +20,7 @@ DIALOG_STATUS: dict = {
 }
 DIALOG_STATUS = invert(DIALOG_STATUS)
 
+# TODO is this needed with Mode?
 MODES: dict[int, str] | dict[str, int] = {
     0: 'view',
     1: 'new',
@@ -25,6 +29,8 @@ MODES: dict[int, str] | dict[str, int] = {
 }
 MODES = invert(MODES)
 
+DEFAULT_GEOMETRY = '500x400'
+
 # GUI
 PAD = 5
 PADR = (0, PAD)
@@ -82,6 +88,7 @@ class Status(Enum):
     NULL = 0
     EXIT = 1
     OK = 2
-    UPDATED = 3
-    ERROR = 4
-    WARNING = 5
+    SUCCESS = 3
+    UPDATED = 4
+    ERROR = 5
+    WARNING = 6

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/text.py

@@ -38,6 +38,7 @@ psi_strings = {
     'REPORT': 'Report',
     'RENAME': 'Rename',
     'RESET': 'Reset',
+    'RESTORE': 'Restore',
     'REVERT': 'Revert',
     'RUN': 'Run',
     'SAVE': 'Save',

psiutils/utilities.py

@@ -1,4 +1,5 @@
 """Common methods for psiutils."""
+import sys
 from pathlib import Path
 import tkinter as tk
 import ctypes
@@ -6,13 +7,12 @@ 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 psiutils.constants import DEFAULT_GEOMETRY
+from psiutils.text import Text
 
-DEFAULT_GEOMETRY = '500x400'
+txt = Text()
 
 
 def display_icon(root: tk.Tk, icon_file_path: str,
@@ -28,6 +28,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 +85,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/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.13.dist-info → psiutils-0.2.15.dist-info}/METADATA

@@ -1,17 +1,21 @@
 Metadata-Version: 2.3
 Name: psiutils
-Version: 0.2.13
+Version: 0.2.15
 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.13.dist-info → psiutils-0.2.15.dist-info}/RECORD

@@ -1,13 +1,14 @@
 psiutils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-psiutils/_about_frame.py,sha256=xZQivwvZc-k8C-SkwQne-dBr4gavDAL_32fv8E-7Wt0,7644
+psiutils/_about_frame.py,sha256=Ei9RMja36x2Xc9SecCXnqXd9EzDe1LIHq4ZDDbKtc_I,7656
 psiutils/_logger.py,sha256=9nXxKWUyu4xqIILjTSUKRAMOG4cFy_EGJTTo0FtUAGU,2859
 psiutils/_notify.py,sha256=rQfYxPxsSwAEJBNXaAZSNlRmZLWB1sah1E1Oja9y-mw,437
-psiutils/_version.py,sha256=BzaUqLuMDa5m8WXD6rxGwHtx-G5rl0QutUD88ULNrkQ,22
-psiutils/buttons.py,sha256=oqTNg1IckV1sr5d4-jD3QZW4B_Tz5TWTQUoPnvpDTwU,8618
-psiutils/constants.py,sha256=Me3oFf7R3VNsq3rZL9pyjRySLzyPYHOow6mNWivVnwo,1383
+psiutils/_version.py,sha256=n8L-CG7GwxdcaK3gVXpLPrQnpjUiTjhwgxpdZpr4XUY,22
+psiutils/buttons.py,sha256=vj-RCKKl4_kYisrMqPi8w56eXfRkbx1zze8oqgS4GjM,8807
+psiutils/constants.py,sha256=-jgP8_QCw91o0F4hS5CzUpPfupqsYrQ8K-Q_NdORvyg,1527
 psiutils/drag_manager.py,sha256=L04GzKIinWXzGCawvTnn18F1AEt8PUPS1U-HqCVrh48,3470
 psiutils/errors.py,sha256=tAypFkpzpbeOppO9zKQimlnRVyr3sMPoiwh0yK3Yc88,562
 psiutils/icecream_init.py,sha256=ArKnRHGCyMfEwSykiHGdhBmX4JPhrgcpShii_GAPWLI,739
+psiutils/icons/backup.png,sha256=kKL5xewG83RQMTr4piNf8SEPNlhHUUtqqcizBuwWU2U,717
 psiutils/icons/build.png,sha256=MgQS4yPxfa5EBXCF5gXu2S6vqjUsRBhR4S6vCzOtrzQ,1169
 psiutils/icons/cancel.png,sha256=O2YSv7wxSV5rhT1WiZ9McqO3pilCKNfZdJNwQceH87E,2168
 psiutils/icons/check.png,sha256=8KqO0lWJvhcbSx1KI8QKfCkwLsszzotL9iBrXfwyf1Q,748
@@ -33,6 +34,9 @@ psiutils/icons/refresh.png,sha256=r-WkScAbDbB15mXzZqEXgys-V1UkDDxRZHrssgTRh1c,21
 psiutils/icons/rename.png,sha256=nEBej5-3BaFi-y1oIgDXCVHkKXndwxu5RW-eCEgu5UY,549
 psiutils/icons/report.png,sha256=gyMzrZkl4QyVd9XsOpAdFZlw-al9J4PTpIBM3EssAyg,979
 psiutils/icons/reset.png,sha256=UJHvnseHeMJoPNCn-WydTnfX-Lrlp9tgSlcIq6jWUBg,1296
+psiutils/icons/restore-database.png,sha256=ezBRAMVbAo9lbs_yPpWpdLxqUFOudiC7mlwNklOKR3A,625
+psiutils/icons/restore-page.png,sha256=WiYVxAHFq0iV_PsCt_5meInbAGAOGOfoYsHM_bWILlY,621
+psiutils/icons/restore.png,sha256=8XAPT_nD3yi5hUQG3OEW1QRQNKRKOdFV7nNIz4jO0RE,986
 psiutils/icons/revert.png,sha256=vWIyLx7dQfTOkI8igLmVtmV8hnBfIh089QmKRRobVmk,1268
 psiutils/icons/save.png,sha256=RSIfWkVE537tMgchS5VFmHughVQqkKMyjMLY0ccDy98,613
 psiutils/icons/script.png,sha256=CG5MYayO1X5O7q40byfMwya1_52rp8BYq-FWUDBG5fg,803
@@ -47,11 +51,11 @@ psiutils/images/icon-info.png,sha256=JFCbGkYfO1BD7VRYQXmTMjOePPRrwjkl-KSFHtKIBE4
 psiutils/images/icon-query.png,sha256=e18hqkew4eOxABvECKn7BGO2VTHTE-XLMWPSQfSW9dU,2808
 psiutils/known_paths.py,sha256=Ydhk-Ie_q827ti35Hru8YwUx5awdO2FEG845k1N0hPo,9543
 psiutils/menus.py,sha256=4pUHb3fEYzLnsftxdKB_NjlPryj_pu7WN5Iy5Quy9-M,1746
-psiutils/messagebox.py,sha256=14W4KzEg8Fi1OCiOX9zZvomoSqibAYNipQpa95Tco5M,4969
-psiutils/text.py,sha256=2q4whK-DjZZNOlTLt811bbaNGhg0T3MafSSPU2c5PMg,3048
+psiutils/messagebox.py,sha256=ODFodaDahAm31A8M4MVp9FXdhI0zhW8PZdUbBqbVQEY,4973
+psiutils/text.py,sha256=Q8f3k-2Op0erGW0AqXptVErGBUaFl9nFNYwmYnp3a3c,3074
 psiutils/treeview.py,sha256=jtSzLWrnFIBDWV5YhWNRoZwgW-Kj8_7XVqZyusr-riQ,2826
-psiutils/utilities.py,sha256=bAoaYMumo0U8kz4pcPThYOY5Z3tPFe-a76Nhbwsd4lk,3005
-psiutils/widgets.py,sha256=ooGAy0IU3ct9aeqnBqMUr2AVyqg_zKHG8Fm9Gm-Wn5Y,11114
-psiutils-0.2.13.dist-info/WHEEL,sha256=5w2T7AS2mz1-rW9CNagNYWRCaB0iQqBMYLwKdlgiR4Q,78
-psiutils-0.2.13.dist-info/METADATA,sha256=Cm932l43m8MzC-KboOHPzqpxupHS7ZJDrXeU156BN2U,1982
-psiutils-0.2.13.dist-info/RECORD,,
+psiutils/utilities.py,sha256=hBntrigp7WiuzRoGGhS96QVE-7pF2OdYT882jwMTrlQ,3355
+psiutils/widgets.py,sha256=TOJKDEdYJetPZxFZohQGJsVX_k3E26-ChgSXqDeJ0Y4,11363
+psiutils-0.2.15.dist-info/WHEEL,sha256=YUH1mBqsx8Dh2cQG2rlcuRYUhJddG9iClegy4IgnHik,79
+psiutils-0.2.15.dist-info/METADATA,sha256=ja3DXZwdpSkhTKERDJ3vEq_OXKaddvq_-JRdrKNmtYU,2109
+psiutils-0.2.15.dist-info/RECORD,,

{psiutils-0.2.13.dist-info → psiutils-0.2.15.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.7
+Generator: uv 0.9.11
 Root-Is-Purelib: true
 Tag: py3-none-any