psiutils 0.2.19__py3-none-any.whl → 0.2.22__py3-none-any.whl

psiutils/_date_picker.py

@@ -1,8 +1,9 @@
+
+from functools import partial
 import tkinter as tk
 from tkinter import ttk
 import tkinter.font as tkFont
 from tkcalendar import DateEntry
-from functools import partial
 from datetime import datetime, timedelta
 from dateutil.parser import parse
 
@@ -15,7 +16,7 @@ TIME_WIDTH = 3
 INCREMENT_BUTTON_SIZE = 2
 INCREMENT_BUTTON_FONT_SIZE = 8
 DATE_FORMAT = '%d/%m/%Y'
-PICKER_DATE_PATTERN = 'dd/mm/yyyy',
+PICKER_DATE_PATTERN = 'dd/mm/yyyy'
 MAX_HOURS = 23
 MAX_MINS = 59
 TALL_COMBO_PADDING = 6

psiutils/_version.py

@@ -1 +1 @@
-__version__ = '0.2.19'
+__version__ = '0.2.22'

psiutils/buttons.py

@@ -257,6 +257,7 @@ icon_buttons = {
     'start': (txt.START, 'start'),
     'update': (txt.UPDATE, 'update'),
     'upgrade': (txt.UPGRADE, 'upgrade'),
+    'upload': (txt.UPLOAD, 'upload'),
     'use': (txt.USE, 'done'),
     'windows': (txt.WINDOWS, 'windows'),
 }

psiutils/text.py

@@ -54,6 +54,7 @@ psi_strings = {
     'START': 'Start',
     'UPDATE': 'Update',
     'UPGRADE': 'Upgrade',
+    'UPLOAD': 'Upload',
     'USE': 'Use',
     'WINDOWS': 'Windows',
     'YES': 'Yes',

psiutils/treeview.py

@@ -1,10 +1,12 @@
 
+from pathlib import Path
+import tkinter as tk
 from tkinter import ttk
 import dateutil  # type: ignore
 from dateutil.parser import parse  # type: ignore
+from PIL import Image, ImageTk
 
-UNCHECKED = '\u2610'
-CHECKED = '\u2612'
+CHECK_BOX_SIZE = (20, 20)
 
 
 def sort_treeview(tree: ttk.Treeview, col: int, reverse: bool) -> None:
@@ -39,47 +41,109 @@ def sort_treeview(tree: ttk.Treeview, col: int, reverse: bool) -> None:
 
 
 class CheckTreeView(ttk.Treeview):
-    def __init__(self, master=None, width=200, clicked=None,
-                 unchecked=UNCHECKED, checked=CHECKED, **kwargs):
+    def __init__(
+            self,
+            master,
+            column_defs,
+            **kwargs):
         """
-        :param width: the width of the check list
-        :param clicked: the optional function if a checkbox is clicked. Takes a
-                        `iid` parameter.
-        :param unchecked: the character for an unchecked box (default is
-                          "\u2610")
-        :param unchecked: the character for a checked box (default is "\u2612")
 
+        :param column_defs: a tuple defining column (key, text, width)
         Other parameters are passed to the `TreeView`.
         """
+        super().__init__(master, **kwargs)
+        self.column_defs = column_defs
+        self["show"] = "tree headings"
+        self._configure_columns()
+
+        (
+            self.unchecked_image,
+            self.checked_image
+        ) = self._get_checkbox_images()
+
         if "selectmode" not in kwargs:
             kwargs["selectmode"] = "none"
         if "show" not in kwargs:
             kwargs["show"] = "tree"
-        ttk.Treeview.__init__(self, master, **kwargs)
-        self.number_selected = 0
 
-    def item_click(self, pos_x: int, pos_y: int) -> int:
-        element = self.identify("element", pos_x, pos_y)
-        if element == "text":
-            iid = self.identify_row(pos_y)
-            self._toggle(iid)
-        return self.number_selected
+    def _get_checkbox_images(
+            self) -> tuple[ImageTk.PhotoImage, ImageTk.PhotoImage]:
+
+        icon_path = f'{Path(__file__).parent}/icons/'
+        unchecked_img = Image.open(f"{icon_path}checkbox_unchecked.png")
+        unchecked_img = unchecked_img.resize(CHECK_BOX_SIZE, Image.LANCZOS)
+        unchecked = ImageTk.PhotoImage(unchecked_img)
+
+        checked_img = tk.PhotoImage(file=f"{icon_path}checkbox_checked.png")
+        checked_img = Image.open(f"{icon_path}checkbox_checked.png")
+        checked_img = checked_img.resize(CHECK_BOX_SIZE, Image.LANCZOS)
+        checked = ImageTk.PhotoImage(checked_img)
+        return (unchecked, checked)
+
+    def _configure_columns(self) -> None:
+        column_ids = [col[0] for col in self.column_defs]
+        self["columns"] = column_ids[1:]
+
+        # Configure each column
+        for index, (col_id, heading, width) in enumerate(self.column_defs):
+            if index == 0:
+                self.column(
+                    "#0",
+                    width=width,
+                    minwidth=width,
+                    stretch=False,
+                    anchor="center")
+                self.heading("#0", text=heading)
+            else:
+                self.column(col_id, width=width, anchor="w", stretch=True)
+                self.heading(col_id, text=heading)
+
+    def populate(self, items: list[tuple], checked: bool = False) -> None:
+        self.delete(*self.get_children())
+        item_checked = (self.checked_image
+                        if checked else self.unchecked_image)
+        for item in items:
+            iid = self.insert(
+                parent='',
+                index='end',
+                image=item_checked,
+                values=item
+            )
+            if checked:
+                self.item(iid, tags=("checked",))
+            else:
+                self.item(iid, tags=("unchecked"))
 
-    def _toggle(self, iid):
+    def item_click(self, event) -> int:
+        iid = self.identify_row(event.y)
+        if not iid:
+            return
+
+        current_img = self.item(iid, "image")[0]
+        if current_img == str(self.unchecked_image):
+            self.item(iid, image=self.checked_image, tags=("checked",))
+        else:
+            self.item(iid, image=self.unchecked_image, tags=("unchecked"))
+
+        return "break"
+
+    def checked_items(self) -> list[tuple]:
         """
-        Toggle the checkbox `iid`
+        Returns a list of the values (text columns) for all currently
+        checked rows.
+
+        Each returned tuple contains the values from the data columns only
+        (excludes the checkbox image in the tree column).
+
+        Example return value:
+            [("docs", "report.pdf", "Read this file"),
+            ("code", "main.py", "Fix bug")]
         """
-        values = list(self.item(iid).values())[2]
-        new_value = UNCHECKED
-        number = -1
-        if values[0] == UNCHECKED:
-            new_value = CHECKED
-            number = 1
-        values = [new_value] + list(values[1:])
-        self.item(iid, values=values)
-        self.number_selected = self.number_selected + number
-
-    def populate(self, items: list[tuple]) -> None:
-        for item in items:
-            values = [UNCHECKED] + list(item)
-            self.insert('', 'end', values=values)
+        checked_items = []
+
+        for iid in self.get_children(''):
+            tags = self.item(iid, "tags")
+            if "checked" in tags:
+                values = self.item(iid, "values")
+                checked_items.append(values)
+        return checked_items

{psiutils-0.2.19.dist-info → psiutils-0.2.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: psiutils
-Version: 0.2.19
+Version: 0.2.22
 Summary: Various TKinter utilities.
 Author: Jeff
 Author-email: Jeff <<jeffwatkins2000@gmail.com>>

{psiutils-0.2.19.dist-info → psiutils-0.2.22.dist-info}/RECORD

@@ -1,10 +1,10 @@
 psiutils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 psiutils/_about_frame.py,sha256=Ei9RMja36x2Xc9SecCXnqXd9EzDe1LIHq4ZDDbKtc_I,7656
-psiutils/_date_picker.py,sha256=Db6r-NCbNHQCXiXlu4RFB-C4T_1Cn597FQvKWHjGFjU,6228
+psiutils/_date_picker.py,sha256=7frDxqBu0_JAiieCgISh5e0htQQwA9wdraOH3WwkqWo,6228
 psiutils/_logger.py,sha256=9nXxKWUyu4xqIILjTSUKRAMOG4cFy_EGJTTo0FtUAGU,2859
 psiutils/_notify.py,sha256=rQfYxPxsSwAEJBNXaAZSNlRmZLWB1sah1E1Oja9y-mw,437
-psiutils/_version.py,sha256=03OfPLthYtC55XCorTutkAl4vnGLWEzy16PIUJHl7C8,22
-psiutils/buttons.py,sha256=KOHBSH5_PgArG5T0hMU8weM30C97Hp3Wqco7emiBn0Y,8851
+psiutils/_version.py,sha256=De4-ZBTkg15yQWcmhABmI639YXbl5ed1kdRnlGDHXuc,22
+psiutils/buttons.py,sha256=OMUy7gCrT_bWl_UbPuW28PhAm9Akh5_aQqsNk2kshkU,8889
 psiutils/constants.py,sha256=AJOw73GL9Rx9BEmfduTy32S3dM3Rp6iIOYALY0J7JSw,1541
 psiutils/drag_manager.py,sha256=L04GzKIinWXzGCawvTnn18F1AEt8PUPS1U-HqCVrh48,3470
 psiutils/errors.py,sha256=tAypFkpzpbeOppO9zKQimlnRVyr3sMPoiwh0yK3Yc88,562
@@ -13,6 +13,8 @@ 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
+psiutils/icons/checkbox_checked.png,sha256=TOcYTFLrXEerPSeMA0aCUulvHIVuqfe_uQra7AWEN5o,525
+psiutils/icons/checkbox_unchecked.png,sha256=vmaVN0ir9vWVxLQ4nuqIqqvn3zNIch4Gk7NnNcWYrvI,317
 psiutils/icons/clear.png,sha256=UwO_Sf8ZCJro1ymtVA4T3XwWIbkQd-hr_dv0J8EaBxA,859
 psiutils/icons/code.png,sha256=en7AOAITRFfsULX6WVU-nxY9LDEORVGsFVqXDXRqIG0,953
 psiutils/icons/compare.png,sha256=7wEoI2Os7gGU8t1mwlJ5lKDZXkgkLyJRcs0dMyHyo1Q,565
@@ -47,6 +49,7 @@ psiutils/icons/send.png,sha256=4PSUVt8NAKLIxYEYpdMQHNigmfjyUSL8VAsMBmBxxmM,968
 psiutils/icons/start.png,sha256=lzi6occJJXKXlRoFjx76h1YhQy2lLk9IqCf-xDKadDc,1936
 psiutils/icons/update.png,sha256=buOCd1Mq5M8Jbcd2HX6eZjLAQPxM5psFTGNqkkI7c7c,2212
 psiutils/icons/upgrade.png,sha256=kvoT7pwvQGoQIL0AjvbTIx6TTfvw2JjdHv23QxY1I1Y,1201
+psiutils/icons/upload.png,sha256=Vd5Wvk4anJsbPdnkVKgmbWB5FT-xpARsD5zAZtj15S8,587
 psiutils/icons/windows.png,sha256=orrq_I9aYHMcUJHdtfLWbAEJZwzPjja9VMwZPm9jsjg,2264
 psiutils/images/icon-error.png,sha256=Fk1IMjyqXACUbfcCGTHM-Q1Gb_53hzzyRGO1JbxgNB8,5957
 psiutils/images/icon-info.png,sha256=JFCbGkYfO1BD7VRYQXmTMjOePPRrwjkl-KSFHtKIBE4,5979
@@ -54,10 +57,10 @@ psiutils/images/icon-query.png,sha256=e18hqkew4eOxABvECKn7BGO2VTHTE-XLMWPSQfSW9d
 psiutils/known_paths.py,sha256=Ydhk-Ie_q827ti35Hru8YwUx5awdO2FEG845k1N0hPo,9543
 psiutils/menus.py,sha256=4pUHb3fEYzLnsftxdKB_NjlPryj_pu7WN5Iy5Quy9-M,1746
 psiutils/messagebox.py,sha256=ODFodaDahAm31A8M4MVp9FXdhI0zhW8PZdUbBqbVQEY,4973
-psiutils/text.py,sha256=zp46Pfyhyqwwo8MeZMMBeLGCT3meRjmdcbTZqF0IxqE,3206
-psiutils/treeview.py,sha256=jtSzLWrnFIBDWV5YhWNRoZwgW-Kj8_7XVqZyusr-riQ,2826
+psiutils/text.py,sha256=wo8iZLd979SQHy3wq5jjIt0URel5G1ze53HQ5XLfuBE,3230
+psiutils/treeview.py,sha256=zQfSvjQaBhNnyAoNIivAteYFVs8NPgU-i9PN4SvwvQo,4899
 psiutils/utilities.py,sha256=hBntrigp7WiuzRoGGhS96QVE-7pF2OdYT882jwMTrlQ,3355
 psiutils/widgets.py,sha256=haHVcsm4Y9gYQinr0VlrfHg2H83Pnlj_jxjb4aXd37A,11420
-psiutils-0.2.19.dist-info/WHEEL,sha256=e_m4S054HL0hyR3CpOk-b7Q7fDX6BuFkgL5OjAExXas,80
-psiutils-0.2.19.dist-info/METADATA,sha256=YRPX8Vcs3MqE2STtI_q3ARFuFcgraRMzvN1PwdGLDm4,2109
-psiutils-0.2.19.dist-info/RECORD,,
+psiutils-0.2.22.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+psiutils-0.2.22.dist-info/METADATA,sha256=ZbIuXlnyzTifyPV3tijJRnfIdEdW2jbdfeZbO1shPSI,2109
+psiutils-0.2.22.dist-info/RECORD,,

{psiutils-0.2.19.dist-info → psiutils-0.2.22.dist-info}/WHEEL

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