psiutils 0.2.18__py3-none-any.whl → 0.2.20__py3-none-any.whl

psiutils/_date_picker.py

@@ -0,0 +1,210 @@
+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
+
+from text import Text
+
+txt = Text()
+
+PAD = 2
+TIME_WIDTH = 3
+INCREMENT_BUTTON_SIZE = 2
+INCREMENT_BUTTON_FONT_SIZE = 8
+DATE_FORMAT = '%d/%m/%Y'
+PICKER_DATE_PATTERN = 'dd/mm/yyyy',
+MAX_HOURS = 23
+MAX_MINS = 59
+TALL_COMBO_PADDING = 6
+
+
+class DatePicker(tk.Frame):
+    def __init__(
+            self, master: tk.Frame,
+            initial_date: datetime = None,
+            date_format: str = ''):
+        super().__init__(master)
+        if not initial_date:
+            initial_date = datetime.now()
+        if not date_format:
+            date_format = DATE_FORMAT
+
+        self._date_input = tk.StringVar(
+            value=initial_date.strftime(DATE_FORMAT))
+
+        style = ttk.Style()
+        style.configure(
+            'Increment.TButton',
+            font=('Helvetica', INCREMENT_BUTTON_FONT_SIZE),
+            padding=0,)
+        style.configure('Tall.TCombobox', padding=TALL_COMBO_PADDING)
+
+        main_frame = self._picker()
+        main_frame.pack()
+
+    def _picker(self) -> tk.Frame:
+        frame = ttk.Frame(self)
+
+        column = 0
+        date_picker = self._date_picker(frame, self._date_input)
+        date_picker.grid(row=0, column=column, rowspan=2, sticky=tk.NS)
+
+        column += 1
+        button = ttk.Button(
+            frame,
+            text=txt.INCREMENT_ARROW,
+            command=partial(self._date_increment, self._date_input),
+            width=INCREMENT_BUTTON_SIZE,
+            style='Increment.TButton',
+            )
+        button.grid(row=0, column=column, padx=PAD)
+
+        button = ttk.Button(
+            frame,
+            text=txt.DECREMENT_ARROW,
+            command=partial(self._date_increment, self._date_input, -1),
+            width=INCREMENT_BUTTON_SIZE,
+            style='Increment.TButton',
+            )
+        button.grid(row=1, column=column, padx=PAD)
+
+        column += 1
+
+        return frame
+
+    def _date_picker(
+            self, master: tk.Frame, textvariable: tk.StringVar) -> DateEntry:
+        event_date = datetime.now()
+        return DateEntry(
+            master,
+            date_pattern=PICKER_DATE_PATTERN,
+            year=event_date.year,
+            month=event_date.month,
+            day=event_date.day,
+            textvariable=textvariable,
+            )
+
+    @property
+    def date(self) -> datetime:
+        return parse(self._date_input.get())
+
+    def _date_increment(
+            self,
+            textvariable: tk.StringVar,
+            increment: int = 1, *args) -> None:
+        date = parse(textvariable.get(), dayfirst=True).date()
+        new_date = date + timedelta(days=increment)
+        textvariable.set(new_date.strftime(DATE_FORMAT))
+
+
+class TimePicker(tk.Frame):
+    def __init__(
+            self, master: tk.Frame,
+            use_seconds: bool = False,
+            use_labels: bool = False):
+        super().__init__(master)
+        self.use_seconds = use_seconds
+        self.use_labels = use_labels
+
+        self._hour_input = tk.StringVar(value='00')
+        self._minute_input = tk.StringVar(value='00')
+        self._second_input = tk.StringVar(value='00')
+
+        style = ttk.Style()
+        style.configure('Increment.TButton', font=('Helvetica', 8))
+
+        main_frame = self._picker()
+        main_frame.grid(row=0, column=0)
+
+    def _picker(self) -> tk.Frame:
+        frame = ttk.Frame(self)
+
+        column = 0
+        row = 0
+        if self.use_labels:
+            label = ttk.Label(frame, text='Hour')
+            label.grid(row=row, column=column, sticky=tk.W)
+
+            label = ttk.Label(frame, text='Mins')
+            label.grid(row=row, column=column+1, sticky=tk.W)
+
+            if self.use_seconds:
+                label = ttk.Label(frame, text='Secs')
+                label.grid(row=row, column=column+5, sticky=tk.E)
+
+        row += 1
+        hour_timer = self._timer_element(frame, self._hour_input, MAX_HOURS)
+        hour_timer.grid(row=row, column=column)
+
+        column += 1
+        minute_timer = self._timer_element(frame, self._minute_input)
+        minute_timer.grid(row=row, column=column)
+
+        if self.use_seconds:
+            column += 1
+            second_timer = self._timer_element(frame, self._second_input)
+            second_timer.grid(row=row, column=column)
+
+        return frame
+
+    def _timer_element(
+            self,
+            master: tk.Frame,
+            textvariable: tk.StringVar,
+            max_value: int = MAX_MINS,
+            ) -> tk.Frame:
+        frame = ttk.Frame(master)
+        column = 0
+
+        combobox = ttk.Combobox(
+            frame,
+            textvariable=textvariable,
+            values=[f'{x:02d}' for x in range(max_value+1)],
+            width=TIME_WIDTH,
+            style='Tall.TCombobox',
+            )
+        combobox.grid(row=0, column=column, rowspan=2, sticky=tk.W)
+
+        column += 1
+
+        button = ttk.Button(
+            frame,
+            text=txt.INCREMENT_ARROW,
+            command=partial(self._time_increment, textvariable, 1, max_value),
+            width=INCREMENT_BUTTON_SIZE,
+            style='Increment.TButton',
+            )
+        button.grid(row=0, column=column, padx=PAD)
+
+        button = ttk.Button(
+            frame,
+            text=txt.DECREMENT_ARROW,
+            command=partial(self._time_increment, textvariable, -1, max_value),
+            width=INCREMENT_BUTTON_SIZE,
+            style='Increment.TButton',
+            )
+        button.grid(row=1, column=column, padx=PAD)
+        return frame
+
+    def _time_increment(
+            self,
+            textvariable: tk.StringVar,
+            increment,
+            max_value) -> None:
+        value = int(textvariable.get()) + increment
+        if value < 0:
+            value = max_value
+        if value > max_value:
+            value = 0
+        textvariable.set(f'{value:02d}')
+
+    @property
+    def time(self) -> datetime:
+        return datetime(
+            hours=int(self._hour_input.get()),
+            minutes=int(self._minute_input.get()),
+            seconds=int(self._second_input.get()),
+            )

psiutils/_version.py

@@ -1 +1 @@
-__version__ = '0.2.18'
+__version__ = '0.2.20'

psiutils/buttons.py

@@ -228,6 +228,7 @@ icon_buttons = {
     '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'),
@@ -256,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

@@ -14,15 +14,19 @@ psi_strings = {
     'COMPARE': 'Compare',
     'CONFIG': 'Config',
     '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',
@@ -50,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/widgets.py

@@ -6,6 +6,7 @@ import contextlib
 
 from .constants import PAD, COLOURS
 from ._about_frame import AboutFrame
+from psiutils._date_picker import DatePicker, TimePicker
 
 HAND = 'hand2'
 DIM_TEXT = '#555'
@@ -23,16 +24,16 @@ class PsiText(tk.Text):
         tk.Text.__init__(self, *args, **kwargs)
 
         # create a proxy for the underlying widget
-        self._orig = f"{self._w}_orig"
-        self.tk.call("rename", self._w, self._orig)
+        self._orig = f'{self._w}_orig'
+        self.tk.call('rename', self._w, self._orig)
         self.tk.createcommand(self._w, self._proxy)
 
     def _proxy(self, command, *args):
         cmd = (self._orig, command) + args
         result = self.tk.call(cmd)
 
-        if command in ("insert", "delete", "replace"):
-            self.event_generate("<<TextModified>>")
+        if command in ('insert', 'delete', 'replace'):
+            self.event_generate('<<TextModified>>')
 
         return result
 
@@ -349,7 +350,7 @@ class Tooltip:
 
         x, y = tip_pos_calculator(widget, label)
 
-        self.tw.wm_geometry("+%d+%d" % (x, y+self.vertical_offset))
+        self.tw.wm_geometry('+%d+%d' % (x, y+self.vertical_offset))
         # self.tw.wm_geometry(f'{x}x{y}')
 
     def hide(self):

{psiutils-0.2.18.dist-info → psiutils-0.2.20.dist-info}/METADATA

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

{psiutils-0.2.18.dist-info → psiutils-0.2.20.dist-info}/RECORD

@@ -1,9 +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/_logger.py,sha256=9nXxKWUyu4xqIILjTSUKRAMOG4cFy_EGJTTo0FtUAGU,2859
 psiutils/_notify.py,sha256=rQfYxPxsSwAEJBNXaAZSNlRmZLWB1sah1E1Oja9y-mw,437
-psiutils/_version.py,sha256=Y5H04AnBcQJBdVrEZQ-udq9B-QAZZpa6im3A5-sArdI,22
-psiutils/buttons.py,sha256=vj-RCKKl4_kYisrMqPi8w56eXfRkbx1zze8oqgS4GjM,8807
+psiutils/_version.py,sha256=CpGp5mmg0bcg15FyRv0AjXPRmFCjxb6Ad7Ia60rfSqI,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
@@ -12,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
@@ -20,6 +23,7 @@ psiutils/icons/copy_docs.png,sha256=_VQxZ66Ozh-3NmZh8LzS5r91WqjaTHW3VrbHnYcWg4o,
 psiutils/icons/delete.png,sha256=0vtqjA-UeMT9t7zaEiw2XIKVI9ojmDsIrDJKUsMy48w,1292
 psiutils/icons/diff.png,sha256=YIwBq-BlBSFvrbcM_E_F02qkszINNwmvxNrPgCNNNsI,408
 psiutils/icons/done.png,sha256=WYdJW9-DDCDPiRFMnzCRKU5nDJQdlqP5cpLkko-jYf0,847
+psiutils/icons/download.png,sha256=yiR711xKD8fiKxcj2uyeidFLuLvgzRULhHUpvlmgv5I,492
 psiutils/icons/edit.png,sha256=0G4AW240sMUcnzxxeC9r89605Z3TKtUTIrD-Z7dmjCI,749
 psiutils/icons/gear.png,sha256=iAN9l2WmectSjSJXQHR-j9VaJI9-LXDqVSjNYiBLuSw,1489
 psiutils/icons/new.png,sha256=mn-MoVzEijJnPVqkFlNHu1mnxejvhFPf2iCI2QpsVpQ,544
@@ -45,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
@@ -52,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=Jf8GsGKbJf0IyK1kpSGdOK5jjRBM-m-AQOWY3vvzILs,3098
-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=TOJKDEdYJetPZxFZohQGJsVX_k3E26-ChgSXqDeJ0Y4,11363
-psiutils-0.2.18.dist-info/WHEEL,sha256=YUH1mBqsx8Dh2cQG2rlcuRYUhJddG9iClegy4IgnHik,79
-psiutils-0.2.18.dist-info/METADATA,sha256=FJ9niUh37BU4WSlJUW_uyhbVqV6Vkv0x9TRhGRMl1PM,2109
-psiutils-0.2.18.dist-info/RECORD,,
+psiutils/widgets.py,sha256=haHVcsm4Y9gYQinr0VlrfHg2H83Pnlj_jxjb4aXd37A,11420
+psiutils-0.2.20.dist-info/WHEEL,sha256=fAguSjoiATBe7TNBkJwOjyL1Tt4wwiaQGtNtjRPNMQA,80
+psiutils-0.2.20.dist-info/METADATA,sha256=5Ue1jdbnQ24VP_c2Oa-odI_C9GVG-ifdokE-K0cPlbk,2109
+psiutils-0.2.20.dist-info/RECORD,,

{psiutils-0.2.18.dist-info → psiutils-0.2.20.dist-info}/WHEEL

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