tksheet 7.2.15__tar.gz → 7.2.16__tar.gz

{tksheet-7.2.15/tksheet.egg-info → tksheet-7.2.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.15
+Version: 7.2.16
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -83,6 +83,7 @@ This library is maintained with the help of **[others](https://github.com/ragard
 - Change fonts and font size (not for individual cells)
 - Change any colors in the sheet
 - Dropdowns, check boxes, progress bars
+- Treeview mode
 - [Hide rows and/or columns](https://github.com/ragardner/tksheet/wiki/Version-7#example-header-dropdown-boxes-and-row-filtering)
 - Left `"w"`, Center `"center"` or Right `"e"` text alignment for any cell/row/column
 
@@ -110,3 +111,7 @@ sheet.delete_columns(columns=[0, 3], undo=True)
 ### **dark theme**
 
 ![tksheet dark theme](https://github.com/user-attachments/assets/288453d6-5ac1-4d45-827f-45b24a3d05ed)
+
+### **treeview mode**
+
+![tksheet treeview](https://github.com/user-attachments/assets/201f2d9d-7ffb-43e2-81ba-91da806aaab0)

{tksheet-7.2.15 → tksheet-7.2.16}/README.md

@@ -41,6 +41,7 @@ This library is maintained with the help of **[others](https://github.com/ragard
 - Change fonts and font size (not for individual cells)
 - Change any colors in the sheet
 - Dropdowns, check boxes, progress bars
+- Treeview mode
 - [Hide rows and/or columns](https://github.com/ragardner/tksheet/wiki/Version-7#example-header-dropdown-boxes-and-row-filtering)
 - Left `"w"`, Center `"center"` or Right `"e"` text alignment for any cell/row/column
 
@@ -68,3 +69,7 @@ sheet.delete_columns(columns=[0, 3], undo=True)
 ### **dark theme**
 
 ![tksheet dark theme](https://github.com/user-attachments/assets/288453d6-5ac1-4d45-827f-45b24a3d05ed)
+
+### **treeview mode**
+
+![tksheet treeview](https://github.com/user-attachments/assets/201f2d9d-7ffb-43e2-81ba-91da806aaab0)

{tksheet-7.2.15 → tksheet-7.2.16}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "tksheet"
 description = "Tkinter table / sheet widget"
 readme = "README.md"
-version = "7.2.15"
+version = "7.2.16"
 authors = [{ name = "ragardner", email = "github@ragardner.simplelogin.com" }]
 requires-python = ">=3.8"
 license = {file = "LICENSE.txt"}

{tksheet-7.2.15 → tksheet-7.2.16}/tksheet/__init__.py

@@ -4,7 +4,7 @@
 tksheet - A Python tkinter table widget
 """
 
-__version__ = "7.2.15"
+__version__ = "7.2.16"
 
 from .colors import (
     color_map,

{tksheet-7.2.15 → tksheet-7.2.16}/tksheet/row_index.py

@@ -921,11 +921,12 @@ class RowIndex(tk.Canvas):
         eventx: int,
     ) -> bool:
         if self.PAR.ops.treeview and (
-            canvasy < self.MT.row_positions[r] + self.MT.index_txt_height + 3
+            canvasy < self.MT.row_positions[r] + self.MT.index_txt_height + 5
             and isinstance(self.MT._row_index, list)
             and (datarn := self.MT.datarn(r)) < len(self.MT._row_index)
             and eventx
-            < self.get_treeview_indent((iid := self.MT._row_index[datarn].iid)) + self.MT.index_txt_height + 1
+            < (indent := self.get_treeview_indent((iid := self.MT._row_index[datarn].iid))) + self.MT.index_txt_height + 4
+            and eventx >= indent + 1
         ):
             return iid
         return None

{tksheet-7.2.15 → tksheet-7.2.16}/tksheet/sheet.py

@@ -10,6 +10,7 @@ from collections.abc import (
     Iterator,
     Sequence,
 )
+from functools import partial
 from itertools import (
     accumulate,
     chain,
@@ -4714,6 +4715,8 @@ class Sheet(tk.Frame):
         open_ids: Iterator[str] | None = None,
         safety: bool = True,
         ncols: int | None = None,
+        include_iid_column: bool = True,
+        include_parent_column: bool = True,
     ) -> Sheet:
         self.reset(cell_options=False, column_widths=False, header=False, redraw=False)
         if text_column is None:
@@ -4759,8 +4762,9 @@ class Sheet(tk.Frame):
                 newrow[iid_column] = n.iid
                 self.RI.tree_rns[n.iid] = len(data)
                 data.append(newrow)
-        self.insert_rows(
-            rows=[[self.RI.tree[iid]] + data[self.RI.tree_rns[iid]] for iid in self.get_children()],
+
+        insert_rows = partial(
+            self.insert_rows,
             idx=0,
             heights={} if row_heights is False else row_heights,
             row_index=True,
@@ -4769,6 +4773,37 @@ class Sheet(tk.Frame):
             push_ops=push_ops,
             redraw=False,
         )
+
+        if include_iid_column and include_parent_column:
+            insert_rows(rows=[[self.RI.tree[iid]] + data[self.RI.tree_rns[iid]] for iid in self.get_children()])
+
+        elif include_iid_column and not include_parent_column:
+            exclude = {parent_column}
+            insert_rows(
+                rows=[
+                    [self.RI.tree[iid]] + [e for i, e in enumerate(data[self.RI.tree_rns[iid]]) if i not in exclude]
+                    for iid in self.get_children()
+                ]
+            )
+
+        elif include_parent_column and not include_iid_column:
+            exclude = {iid_column}
+            insert_rows(
+                rows=[
+                    [self.RI.tree[iid]] + [e for i, e in enumerate(data[self.RI.tree_rns[iid]]) if i not in exclude]
+                    for iid in self.get_children()
+                ]
+            )
+
+        elif not include_iid_column and not include_parent_column:
+            exclude = {iid_column, parent_column}
+            insert_rows(
+                rows=[
+                    [self.RI.tree[iid]] + [e for i, e in enumerate(data[self.RI.tree_rns[iid]]) if i not in exclude]
+                    for iid in self.get_children()
+                ]
+            )
+
         self.MT.all_rows_displayed = False
         self.MT.displayed_rows = list(range(len(self.MT._row_index)))
         self.RI.tree_rns = {n.iid: i for i, n in enumerate(self.MT._row_index)}
@@ -4886,12 +4921,12 @@ class Sheet(tk.Frame):
         index: None | int | Literal["end"] = None,
         iid: None | str = None,
         text: None | str = None,
-        values: None | list = None,
+        values: None | list[object] = None,
         create_selections: bool = False,
     ) -> str:
         if iid is None:
             i = 0
-            while (iid := f"{i}") in self.RI.tree:
+            while (iid := f"{num2alpha(i)}") in self.RI.tree:
                 i += 1
         iid, pid = iid.lower(), parent.lower()
         if not iid:
@@ -5214,7 +5249,7 @@ class Sheet(tk.Frame):
             raise ValueError(f"Item '{item}' does not exist.")
         return self.RI.tree_rns[item] in self.MT.displayed_rows
 
-    def display_item(self, item: str, redraw=False) -> Sheet:
+    def display_item(self, item: str, redraw: bool = False) -> Sheet:
         """
         Ensure that item is displayed in the tree
         - Opens all of an item's ancestors
@@ -5231,7 +5266,7 @@ class Sheet(tk.Frame):
             )
         return self.set_refresh_timer(redraw)
 
-    def scroll_to_item(self, item: str, redraw=False) -> Sheet:
+    def scroll_to_item(self, item: str, redraw: bool = False) -> Sheet:
         """
         Scrolls to an item and ensures that it is displayed
         """

{tksheet-7.2.15 → tksheet-7.2.16}/tksheet/sheet_options.py

@@ -242,7 +242,7 @@ def new_sheet_options() -> DotDict:
             "edit_cell_return": "down",
             "editor_del_key": "forward",
             "treeview": False,
-            "treeview_indent": "6",
+            "treeview_indent": "5",
             "rounded_boxes": True,
             "alternate_color": "",
         }

{tksheet-7.2.15 → tksheet-7.2.16/tksheet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.15
+Version: 7.2.16
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -83,6 +83,7 @@ This library is maintained with the help of **[others](https://github.com/ragard
 - Change fonts and font size (not for individual cells)
 - Change any colors in the sheet
 - Dropdowns, check boxes, progress bars
+- Treeview mode
 - [Hide rows and/or columns](https://github.com/ragardner/tksheet/wiki/Version-7#example-header-dropdown-boxes-and-row-filtering)
 - Left `"w"`, Center `"center"` or Right `"e"` text alignment for any cell/row/column
 
@@ -110,3 +111,7 @@ sheet.delete_columns(columns=[0, 3], undo=True)
 ### **dark theme**
 
 ![tksheet dark theme](https://github.com/user-attachments/assets/288453d6-5ac1-4d45-827f-45b24a3d05ed)
+
+### **treeview mode**
+
+![tksheet treeview](https://github.com/user-attachments/assets/201f2d9d-7ffb-43e2-81ba-91da806aaab0)