tksheet 7.1.0__py3-none-any.whl → 7.1.1__py3-none-any.whl

tksheet/__init__.py

@@ -1,96 +1,96 @@
-# ruff: noqa: F401
-
-"""
-tksheet - A Python tkinter table widget
-"""
-
-__version__ = "7.1.0"
-
-from .colors import (
-    color_map,
-)
-from .column_headers import ColumnHeaders
-from .formatters import (
-    Formatter,
-    bool_formatter,
-    data_to_str,
-    float_formatter,
-    float_to_str,
-    format_data,
-    formatter,
-    get_clipboard_data,
-    get_data_with_valid_check,
-    int_formatter,
-    is_bool_like,
-    is_none_like,
-    percentage_formatter,
-    percentage_to_str,
-    to_bool,
-    to_float,
-    to_int,
-    to_str,
-    try_to_bool,
-)
-from .functions import (
-    alpha2idx,
-    alpha2num,
-    consecutive_chunks,
-    data_to_displayed_idxs,
-    displayed_to_data_idxs,
-    dropdown_search_function,
-    event_dict,
-    get_checkbox_dict,
-    get_checkbox_kwargs,
-    get_checkbox_points,
-    get_dropdown_dict,
-    get_dropdown_kwargs,
-    get_index_of_gap_in_sorted_integer_seq_forward,
-    get_index_of_gap_in_sorted_integer_seq_reverse,
-    get_n2a,
-    get_new_indexes,
-    get_seq_without_gaps_at_index,
-    is_iterable,
-    move_elements_by_mapping,
-    move_elements_to,
-    num2alpha,
-    span_dict,
-    tksheet_type_error,
-)
-from .main_table import MainTable
-from .other_classes import (
-    DotDict,
-    DraggedRowColumn,
-    DrawnItem,
-    EventDataDict,
-    GeneratedMouseEvent,
-    Selected,
-    Span,
-    SpanRange,
-    TextCfg,
-)
-from .row_index import RowIndex
-from .sheet import Dropdown, Sheet
-from .sheet_options import new_sheet_options
-from .text_editor import (
-    TextEditor,
-    TextEditorTkText,
-)
-from .themes import (
-    theme_black,
-    theme_dark,
-    theme_dark_blue,
-    theme_dark_green,
-    theme_light_blue,
-    theme_light_green,
-)
-from .top_left_rectangle import TopLeftRectangle
-from .vars import (
-    USER_OS,
-    ctrl_key,
-    emitted_events,
-    falsy,
-    nonelike,
-    rc_binding,
-    symbols_set,
-    truthy,
-)
+# ruff: noqa: F401
+
+"""
+tksheet - A Python tkinter table widget
+"""
+
+__version__ = "7.1.1"
+
+from .colors import (
+    color_map,
+)
+from .column_headers import ColumnHeaders
+from .formatters import (
+    Formatter,
+    bool_formatter,
+    data_to_str,
+    float_formatter,
+    float_to_str,
+    format_data,
+    formatter,
+    get_clipboard_data,
+    get_data_with_valid_check,
+    int_formatter,
+    is_bool_like,
+    is_none_like,
+    percentage_formatter,
+    percentage_to_str,
+    to_bool,
+    to_float,
+    to_int,
+    to_str,
+    try_to_bool,
+)
+from .functions import (
+    alpha2idx,
+    alpha2num,
+    consecutive_chunks,
+    data_to_displayed_idxs,
+    displayed_to_data_idxs,
+    dropdown_search_function,
+    event_dict,
+    get_checkbox_dict,
+    get_checkbox_kwargs,
+    get_checkbox_points,
+    get_dropdown_dict,
+    get_dropdown_kwargs,
+    get_index_of_gap_in_sorted_integer_seq_forward,
+    get_index_of_gap_in_sorted_integer_seq_reverse,
+    get_n2a,
+    get_new_indexes,
+    get_seq_without_gaps_at_index,
+    is_iterable,
+    move_elements_by_mapping,
+    move_elements_to,
+    num2alpha,
+    span_dict,
+    tksheet_type_error,
+)
+from .main_table import MainTable
+from .other_classes import (
+    DotDict,
+    DraggedRowColumn,
+    DrawnItem,
+    EventDataDict,
+    GeneratedMouseEvent,
+    Selected,
+    Span,
+    SpanRange,
+    TextCfg,
+)
+from .row_index import RowIndex
+from .sheet import Dropdown, Sheet
+from .sheet_options import new_sheet_options
+from .text_editor import (
+    TextEditor,
+    TextEditorTkText,
+)
+from .themes import (
+    theme_black,
+    theme_dark,
+    theme_dark_blue,
+    theme_dark_green,
+    theme_light_blue,
+    theme_light_green,
+)
+from .top_left_rectangle import TopLeftRectangle
+from .vars import (
+    USER_OS,
+    ctrl_key,
+    emitted_events,
+    falsy,
+    nonelike,
+    rc_binding,
+    symbols_set,
+    truthy,
+)

tksheet/functions.py

@@ -1254,6 +1254,11 @@ def mod_span(
     return to_set_to
 
 
+def mod_span_widget(span: Span, widget: object) -> Span:
+    span.widget = widget
+    return span
+
+
 def mod_event_val(
     event_data: EventDataDict,
     val: object,

tksheet/main_table.py

@@ -69,6 +69,7 @@ from .functions import (
     move_elements_by_mapping,
     pickle_obj,
     span_idxs_post_move,
+    mod_span_widget,
     try_binding,
     unpickle_obj,
 )
@@ -1434,7 +1435,15 @@ class MainTable(tk.Canvas):
             self.CH.cell_options = modification["options"]["CH_cell_options"]
         if "RI_cell_options" in modification["options"]:
             self.RI.cell_options = modification["options"]["RI_cell_options"]
-        self.named_spans = {k: unpickle_obj(v) for k, v in modification["named_spans"].items()}
+        if "tagged_cells" in modification["options"]:
+            self.tagged_cells = modification["options"]["tagged_cells"]
+        if "tagged_rows" in modification["options"]:
+            self.tagged_rows = modification["options"]["tagged_rows"]
+        if "tagged_columns" in modification["options"]:
+            self.tagged_columns = modification["options"]["tagged_columns"]
+        self.named_spans = {
+            k: mod_span_widget(unpickle_obj(v), self.PAR) for k, v in modification["named_spans"].items()
+        }
 
     def undo_modification_invert_event(self, modification: EventDataDict, name: str = "undo") -> bytes | EventDataDict:
         self.deselect("all", redraw=False)
@@ -1709,7 +1718,7 @@ class MainTable(tk.Canvas):
         return False
 
     def select_all(self, redraw: bool = True, run_binding_func: bool = True) -> None:
-        iid, r, c = self.selected.iid, self.selected.row, self.selected.column
+        selected = self.selected
         self.deselect("all", redraw=False)
         if len(self.row_positions) > 1 and len(self.col_positions) > 1:
             item = self.create_selection_box(
@@ -1719,8 +1728,8 @@ class MainTable(tk.Canvas):
                 len(self.col_positions) - 1,
                 set_current=False,
             )
-            if iid:
-                self.set_currently_selected(r, c, item=item)
+            if selected:
+                self.set_currently_selected(selected.row, selected.column, item=item)
             else:
                 self.set_currently_selected(0, 0, item=item)
             if redraw:
@@ -4531,6 +4540,9 @@ class MainTable(tk.Canvas):
                 "row_options": self.row_options,
                 "CH_cell_options": self.CH.cell_options,
                 "RI_cell_options": self.RI.cell_options,
+                "tagged_cells": self.tagged_cells,
+                "tagged_rows": self.tagged_rows,
+                "tagged_columns": self.tagged_columns,
             }
         )
 
@@ -6252,10 +6264,10 @@ class MainTable(tk.Canvas):
         return [(box.coords, box.type) for item, box in self.get_selection_items()]
 
     def all_selected(self) -> bool:
-        for r1, c1, r2, c2 in self.get_all_selection_boxes():
-            if not r1 and not c1 and r2 == len(self.row_positions) - 1 and c2 == len(self.col_positions) - 1:
-                return True
-        return False
+        return any(
+            not r1 and not c1 and r2 == len(self.row_positions) - 1 and c2 == len(self.col_positions) - 1
+            for r1, c1, r2, c2 in self.get_all_selection_boxes()
+        )
 
     def cell_selected(
         self,
@@ -6264,31 +6276,35 @@ class MainTable(tk.Canvas):
         inc_cols: bool = False,
         inc_rows: bool = False,
     ) -> bool:
-        if not isinstance(r, int) or not isinstance(c, int):
-            return False
-        for item, box in self.get_selection_items(rows=inc_rows, columns=inc_cols):
-            r1, c1, r2, c2 = box.coords
-            if r1 <= r and c1 <= c and r2 > r and c2 > c:
-                return True
-        return False
+        return (
+            isinstance(r, int)
+            and isinstance(c, int)
+            and any(
+                box.coords.from_r <= r and box.coords.upto_r > r and box.coords.from_c <= c and box.coords.upto_c > c
+                for item, box in self.get_selection_items(
+                    rows=inc_rows,
+                    columns=inc_cols,
+                )
+            )
+        )
 
     def col_selected(self, c: int) -> bool:
-        if not isinstance(c, int):
-            return False
-        for item, box in self.get_selection_items(cells=False, rows=False):
-            r1, c1, r2, c2 = box.coords
-            if c1 <= c and c2 > c:
-                return True
-        return False
+        return isinstance(c, int) and any(
+            box.coords.from_c <= c and box.coords.upto_c > c
+            for item, box in self.get_selection_items(
+                cells=False,
+                columns=False,
+            )
+        )
 
     def row_selected(self, r: int) -> bool:
-        if not isinstance(r, int):
-            return False
-        for item, box in self.get_selection_items(cells=False, columns=False):
-            r1, c1, r2, c2 = box.coords
-            if r1 <= r and r2 > r:
-                return True
-        return False
+        return isinstance(r, int) and any(
+            box.coords.from_r <= r and box.coords.upto_r > r
+            for item, box in self.get_selection_items(
+                cells=False,
+                columns=False,
+            )
+        )
 
     def anything_selected(
         self,

{tksheet-7.1.0.dist-info → tksheet-7.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.1.0
+Version: 7.1.1
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors

{tksheet-7.1.0.dist-info → tksheet-7.1.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
-tksheet/__init__.py,sha256=BtFx0z_hW793tGDNe8VmnGEjZKAdSXxq6gHyklEky7s,1970
+tksheet/__init__.py,sha256=-P8w8KS0O82elJMwvIYsdoTCWYEV3mRGX_60GToTxWI,1874
 tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
 tksheet/column_headers.py,sha256=1I49CQS4unBcJ-y044R-DtYhJ4zUplrOfImOk8qHIj8,99396
 tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
-tksheet/functions.py,sha256=cMnWgE-rZVrCH8wXKKtg8uXn60pd5MuOE3Bm9T94ePM,38546
-tksheet/main_table.py,sha256=QM4peTylZP7omXriKQO9kP-ZwHGDSILIXECjy-SEFSw,318674
+tksheet/functions.py,sha256=NnBFBvTqT6VhCK8pFlXqTwKekKpcsCYeuxaALcJeVzw,38651
+tksheet/main_table.py,sha256=SwJVPoivJuu8D37lvoo1Hn52P75TvjFwg-E2QHILhuw,319302
 tksheet/other_classes.py,sha256=s559IxoFEeAgxTKrrHZnAeXUXWIEmiP4tBncIdQIXSQ,13544
 tksheet/row_index.py,sha256=4Q_J83AKKZhajeK23_deby9CXfL4wl1MOWnSu8LW2PU,104428
 tksheet/sheet.py,sha256=66AKMY-wNiLi2briyUlbUHtsVNwEWKnljx58q1c1tKU,254086
@@ -13,8 +13,8 @@ tksheet/themes.py,sha256=OwUe31NRbosjw3ZoZsMyB8lNVyYin9YcKLhCturi5q8,13398
 tksheet/top_left_rectangle.py,sha256=-2u9GfOvcqhkKwHEtbqdFvXCY3RbvL5k2Sh9l3r_k04,8275
 tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
 tksheet/vars.py,sha256=Iukk7-MMT9X7vv0m3nQPKzbp2Iw2Pg1wJEW7js919Mo,2092
-tksheet-7.1.0.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.1.0.dist-info/METADATA,sha256=ue-jn_hvJCVDRsFhOc3z5ikKDT5joY5s2JggO-4-Ksk,6013
-tksheet-7.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tksheet-7.1.0.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.1.0.dist-info/RECORD,,
+tksheet-7.1.1.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.1.1.dist-info/METADATA,sha256=2PCCoZogg-1iMfDoYbKCV6a_2N8Tf0kYgIX4o908q98,6013
+tksheet-7.1.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tksheet-7.1.1.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.1.1.dist-info/RECORD,,