tksheet 7.5.1__tar.gz → 7.5.3__tar.gz

{tksheet-7.5.1/tksheet.egg-info → tksheet-7.5.3}/PKG-INFO

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

{tksheet-7.5.1 → tksheet-7.5.3}/pyproject.toml

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

{tksheet-7.5.1 → tksheet-7.5.3}/tksheet/__init__.py

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

{tksheet-7.5.1 → tksheet-7.5.3}/tksheet/column_headers.py

@@ -24,6 +24,7 @@ from .functions import (
     event_dict,
     event_has_char_key,
     event_opens_dropdown_or_checkbox,
+    get_menu_kwargs,
     get_n2a,
     int_x_tuple,
     is_contiguous,
@@ -35,7 +36,7 @@ from .functions import (
     try_binding,
     wrap_text,
 )
-from .other_classes import DotDict, DraggedRowColumn, DropdownStorage, EventDataDict, TextEditorStorage
+from .other_classes import DraggedRowColumn, DropdownStorage, EventDataDict, TextEditorStorage
 from .row_index import RowIndex
 from .sorting import sort_column, sort_rows_by_column, sort_tree_rows_by_column
 from .text_editor import TextEditor
@@ -1804,16 +1805,9 @@ class ColumnHeaders(tk.Canvas):
         w = self.MT.col_positions[c + 1] - x
         h = self.current_height + 1
         kwargs = {
-            "menu_kwargs": DotDict(
-                {
-                    "font": self.ops.table_font,
-                    "foreground": self.ops.popup_menu_fg,
-                    "background": self.ops.popup_menu_bg,
-                    "activebackground": self.ops.popup_menu_highlight_bg,
-                    "activeforeground": self.ops.popup_menu_highlight_fg,
-                }
-            ),
+            "menu_kwargs": get_menu_kwargs(self.ops),
             "sheet_ops": self.ops,
+            "font": self.ops.header_font,
             "border_color": self.ops.header_selected_columns_bg,
             "text": text,
             "state": state,
@@ -2245,17 +2239,18 @@ class ColumnHeaders(tk.Canvas):
                 self.MT._headers[datacn] = value
 
     def input_valid_for_cell(self, datacn: int, value: Any, check_readonly: bool = True) -> bool:
-        kwargs = self.get_cell_kwargs(datacn, key=None)
-        if check_readonly and "readonly" in kwargs:
+        if check_readonly and self.get_cell_kwargs(datacn, key="readonly"):
             return False
-        elif "checkbox" in kwargs:
+        elif self.get_cell_kwargs(datacn, key="checkbox"):
             return is_bool_like(value)
         else:
             return not (
                 self.cell_equal_to(datacn, value)
-                or (kwargs := kwargs.get("dropdown", {}))
-                and kwargs["validate_input"]
-                and value not in kwargs["values"]
+                or (
+                    (kwargs := self.get_cell_kwargs(datacn, key="dropdown"))
+                    and kwargs["validate_input"]
+                    and value not in kwargs["values"]
+                )
             )
 
     def cell_equal_to(self, datacn: int, value: Any) -> bool:
@@ -2311,11 +2306,14 @@ class ColumnHeaders(tk.Canvas):
         return value
 
     def get_value_for_empty_cell(self, datacn: int, c_ops: bool = True) -> Any:
-        kwargs = self.get_cell_kwargs(datacn, key=None, cell=c_ops)
-        if "checkbox" in kwargs:
+        if self.get_cell_kwargs(datacn, key="checkbox", cell=c_ops):
             return False
-        elif "dropdown" in kwargs and kwargs["dropdown"]["validate_input"] and kwargs["dropdown"]["values"]:
-            return kwargs["dropdown"]["values"][0]
+        elif (
+            (kwargs := self.get_cell_kwargs(datacn, key="dropdown", cell=c_ops))
+            and kwargs["validate_input"]
+            and kwargs["values"]
+        ):
+            return kwargs["values"][0]
         else:
             return ""
 

{tksheet-7.5.1 → tksheet-7.5.3}/tksheet/find_window.py

@@ -434,7 +434,7 @@ class FindWindow(tk.Frame):
         self.tktext.reset(
             menu_kwargs=menu_kwargs,
             sheet_ops=sheet_ops,
-            font=menu_kwargs.font,
+            font=sheet_ops.table_font,
             bg=bg,
             fg=fg,
             select_bg=select_bg,
@@ -443,7 +443,7 @@ class FindWindow(tk.Frame):
         self.replace_tktext.reset(
             menu_kwargs=menu_kwargs,
             sheet_ops=sheet_ops,
-            font=menu_kwargs.font,
+            font=sheet_ops.table_font,
             bg=bg,
             fg=fg,
             select_bg=select_bg,
@@ -459,7 +459,7 @@ class FindWindow(tk.Frame):
             self.replace_all,
         ):
             widget.config(
-                font=menu_kwargs.font,
+                font=sheet_ops.table_font,
                 bg=bg,
                 fg=fg,
                 highlightbackground=bg,

{tksheet-7.5.1 → tksheet-7.5.3}/tksheet/main_table.py

@@ -189,7 +189,7 @@ class MainTable(tk.Canvas):
         self.min_row_height = 0
         self.min_header_height = 0
         self.being_drawn_item = None
-        self.extra_motion_func = None
+        self.extra_enter_func = None
         self.extra_b1_press_func = None
         self.extra_b1_motion_func = None
         self.extra_b1_release_func = None
@@ -389,7 +389,7 @@ class MainTable(tk.Canvas):
 
     def basic_bindings(self, enable: bool = True) -> None:
         bindings = (
-            ("<Enter>", self, self.mouse_motion),
+            ("<Enter>", self, self.enter),
             ("<Configure>", self, self.window_configured),
             ("<ButtonPress-1>", self, self.b1_press),
             ("<B1-Motion>", self, self.b1_motion),
@@ -1222,7 +1222,7 @@ class MainTable(tk.Canvas):
             lastbox_numcols = lastbox_c2 - lastbox_c1
             if lastbox_numrows > new_data_numrows and not lastbox_numrows % new_data_numrows:
                 repeat_num = int(lastbox_numrows / new_data_numrows)
-                data.extend(chain.from_iterable([r.copy() for r in data] for _ in range(repeat_num - 1)))
+                data.extend(list(chain.from_iterable([r.copy() for r in data] for _ in range(repeat_num - 1))))
                 new_data_numrows *= repeat_num
 
             if lastbox_numcols > new_data_numcols and not lastbox_numcols % new_data_numcols:
@@ -3662,11 +3662,11 @@ class MainTable(tk.Canvas):
         self.CH.rsz_w = None
         self.CH.rsz_h = None
 
-    def mouse_motion(self, event: Any) -> None:
+    def enter(self, event: Any) -> None:
         self.config(cursor="")
         self.current_cursor = ""
         self.reset_resize_vars()
-        try_binding(self.extra_motion_func, event)
+        try_binding(self.extra_enter_func, event)
 
     def not_currently_resizing(self) -> bool:
         return all(v is None for v in (self.RI.rsz_h, self.RI.rsz_w, self.CH.rsz_h, self.CH.rsz_w))
@@ -7587,6 +7587,7 @@ class MainTable(tk.Canvas):
         kwargs = {
             "menu_kwargs": get_menu_kwargs(self.PAR.ops),
             "sheet_ops": self.PAR.ops,
+            "font": self.PAR.ops.table_font,
             "border_color": self.PAR.ops.table_selected_box_cells_fg,
             "text": text,
             "state": state,
@@ -8218,18 +8219,30 @@ class MainTable(tk.Canvas):
             return value
 
     def get_value_for_empty_cell(self, datarn: int, datacn: int, r_ops: bool = True, c_ops: bool = True) -> Any:
-        kwargs = self.get_cell_kwargs(
+        if self.get_cell_kwargs(
             datarn,
             datacn,
-            key=None,
+            key="checkbox",
             cell=r_ops and c_ops,
             row=r_ops,
             column=c_ops,
-        )
-        if "checkbox" in kwargs:
+        ):
             return False
-        elif "dropdown" in kwargs and kwargs["dropdown"]["validate_input"] and kwargs["dropdown"]["values"]:
-            return kwargs["dropdown"]["values"][0]
+        elif (
+            (
+                kwargs := self.get_cell_kwargs(
+                    datarn,
+                    datacn,
+                    key="dropdown",
+                    cell=r_ops and c_ops,
+                    row=r_ops,
+                    column=c_ops,
+                )
+            )
+            and kwargs["validate_input"]
+            and kwargs["values"]
+        ):
+            return kwargs["values"][0]
         else:
             return self.format_value(datarn, datacn, "")
 
@@ -8415,16 +8428,17 @@ class MainTable(tk.Canvas):
         check_readonly: bool = True,
         ignore_empty: bool = False,
     ) -> bool:
-        kwargs = self.get_cell_kwargs(datarn, datacn, key=None)
-        if check_readonly and "readonly" in kwargs:
+        if check_readonly and self.get_cell_kwargs(datarn, datacn, key="readonly"):
             return False
-        elif "format" in kwargs:
+        elif self.get_cell_kwargs(datarn, datacn, key="format"):
             return True
         elif self.cell_equal_to(datarn, datacn, value, ignore_empty=ignore_empty, check_fmt=False) or (
-            "dropdown" in kwargs and kwargs["dropdown"]["validate_input"] and value not in kwargs["dropdown"]["values"]
+            (kwargs := self.get_cell_kwargs(datarn, datacn, key="dropdown"))
+            and kwargs["validate_input"]
+            and value not in kwargs["values"]
         ):
             return False
-        elif "checkbox" in kwargs:
+        elif self.get_cell_kwargs(datarn, datacn, key="checkbox"):
             return is_bool_like(value)
         else:
             return True

{tksheet-7.5.1 → tksheet-7.5.3}/tksheet/row_index.py

@@ -26,6 +26,7 @@ from .functions import (
     event_dict,
     event_has_char_key,
     event_opens_dropdown_or_checkbox,
+    get_menu_kwargs,
     get_n2a,
     get_new_indexes,
     int_x_tuple,
@@ -39,7 +40,7 @@ from .functions import (
     try_binding,
     wrap_text,
 )
-from .other_classes import DotDict, DraggedRowColumn, DropdownStorage, EventDataDict, Node, TextEditorStorage
+from .other_classes import DraggedRowColumn, DropdownStorage, EventDataDict, Node, TextEditorStorage
 from .sorting import sort_columns_by_row, sort_row
 from .text_editor import TextEditor
 
@@ -1976,16 +1977,9 @@ class RowIndex(tk.Canvas):
         w = self.current_width + 1
         h = self.MT.row_positions[r + 1] - y + 1
         kwargs = {
-            "menu_kwargs": DotDict(
-                {
-                    "font": self.ops.index_font,
-                    "foreground": self.ops.popup_menu_fg,
-                    "background": self.ops.popup_menu_bg,
-                    "activebackground": self.ops.popup_menu_highlight_bg,
-                    "activeforeground": self.ops.popup_menu_highlight_fg,
-                }
-            ),
+            "menu_kwargs": get_menu_kwargs(self.ops),
             "sheet_ops": self.ops,
+            "font": self.ops.index_font,
             "border_color": self.ops.index_selected_rows_bg,
             "text": text,
             "state": state,
@@ -2414,17 +2408,18 @@ class RowIndex(tk.Canvas):
                 self.MT._row_index[datarn] = value
 
     def input_valid_for_cell(self, datarn: int, value: Any, check_readonly: bool = True) -> bool:
-        kwargs = self.get_cell_kwargs(datarn, key=None)
-        if check_readonly and "readonly" in kwargs:
+        if check_readonly and self.get_cell_kwargs(datarn, key="readonly"):
             return False
-        elif "checkbox" in kwargs:
+        elif self.get_cell_kwargs(datarn, key="checkbox"):
             return is_bool_like(value)
         else:
             return not (
                 self.cell_equal_to(datarn, value)
-                or (kwargs := kwargs.get("dropdown", {}))
-                and kwargs["validate_input"]
-                and value not in kwargs["values"]
+                or (
+                    (kwargs := self.get_cell_kwargs(datarn, key="dropdown"))
+                    and kwargs["validate_input"]
+                    and value not in kwargs["values"]
+                )
             )
 
     def cell_equal_to(self, datarn: int, value: Any) -> bool:
@@ -2487,11 +2482,14 @@ class RowIndex(tk.Canvas):
         if self.ops.treeview:
             iid = self.new_iid()
             return Node(text=iid, iid=iid, parent=self.get_row_parent(datarn))
-        kwargs = self.get_cell_kwargs(datarn, key=None, cell=r_ops)
-        if "checkbox" in kwargs:
+        if self.get_cell_kwargs(datarn, key="checkbox", cell=r_ops):
             return False
-        elif "dropdown" in kwargs and kwargs["dropdown"]["validate_input"] and kwargs["dropdown"]["values"]:
-            return kwargs["dropdown"]["values"][0]
+        elif (
+            (kwargs := self.get_cell_kwargs(datarn, key="dropdown", cell=r_ops))
+            and kwargs["validate_input"]
+            and kwargs["values"]
+        ):
+            return kwargs["values"][0]
         else:
             return ""
 

{tksheet-7.5.1 → tksheet-7.5.3}/tksheet/sheet.py

@@ -703,7 +703,7 @@ class Sheet(tk.Frame):
             self.RI.extra_double_b1_func = func
             self.TL.extra_double_b1_func = func
         elif binding == "<Motion>":
-            self.MT.extra_motion_func = func
+            self.MT.bind("<Motion>", func, add=add)
             self.CH.extra_motion_func = func
             self.RI.extra_motion_func = func
             self.TL.extra_motion_func = func
@@ -718,7 +718,10 @@ class Sheet(tk.Frame):
             else:
                 self.bound_events[binding] = [func]
         else:
-            self.MT.bind(binding, func, add=add)
+            if binding == "<Enter>":
+                self.MT.extra_enter_func = func
+            else:
+                self.MT.bind(binding, func, add=add)
             self.CH.bind(binding, func, add=add)
             self.RI.bind(binding, func, add=add)
             self.TL.bind(binding, func, add=add)
@@ -5497,17 +5500,8 @@ class Sheet(tk.Frame):
         readonly: bool = True,
         redraw: bool = False,
     ) -> Sheet:
-        if isinstance(rows, int):
-            rows = [rows]
-        if not readonly:
-            for r in rows:
-                if r in self.MT.row_options and "readonly" in self.MT.row_options[r]:
-                    del self.MT.row_options[r]["readonly"]
-        else:
-            for r in rows:
-                if r not in self.MT.row_options:
-                    self.MT.row_options[r] = {}
-                self.MT.row_options[r]["readonly"] = True
+        for r in (rows,) if isinstance(rows, int) else rows:
+            set_readonly(self.MT.row_options, r, readonly)
         return self.set_refresh_timer(redraw)
 
     def readonly_columns(
@@ -5516,17 +5510,8 @@ class Sheet(tk.Frame):
         readonly: bool = True,
         redraw: bool = False,
     ) -> Sheet:
-        if isinstance(columns, int):
-            columns = [columns]
-        if not readonly:
-            for c in columns:
-                if c in self.MT.col_options and "readonly" in self.MT.col_options[c]:
-                    del self.MT.col_options[c]["readonly"]
-        else:
-            for c in columns:
-                if c not in self.MT.col_options:
-                    self.MT.col_options[c] = {}
-                self.MT.col_options[c]["readonly"] = True
+        for c in (columns,) if isinstance(columns, int) else columns:
+            set_readonly(self.MT.col_options, c, readonly)
         return self.set_refresh_timer(redraw)
 
     def readonly_cells(
@@ -5537,45 +5522,31 @@ class Sheet(tk.Frame):
         readonly: bool = True,
         redraw: bool = False,
     ) -> Sheet:
-        if not readonly:
-            if cells:
-                for r, c in cells:
-                    if (r, c) in self.MT.cell_options and "readonly" in self.MT.cell_options[(r, c)]:
-                        del self.MT.cell_options[(r, c)]["readonly"]
-            else:
-                if (
-                    row,
-                    column,
-                ) in self.MT.cell_options and "readonly" in self.MT.cell_options[(row, column)]:
-                    del self.MT.cell_options[(row, column)]["readonly"]
+        if cells:
+            for r, c in cells:
+                set_readonly(self.MT.cell_options, (r, c), readonly=readonly)
         else:
-            if cells:
-                for r, c in cells:
-                    if (r, c) not in self.MT.cell_options:
-                        self.MT.cell_options[(r, c)] = {}
-                    self.MT.cell_options[(r, c)]["readonly"] = True
-            else:
-                if (row, column) not in self.MT.cell_options:
-                    self.MT.cell_options[(row, column)] = {}
-                self.MT.cell_options[(row, column)]["readonly"] = True
+            set_readonly(self.MT.cell_options, (row, column), readonly=readonly)
         return self.set_refresh_timer(redraw)
 
     def readonly_header(
         self,
-        columns: list[int],
+        columns: list[int] | int,
         readonly: bool = True,
         redraw: bool = False,
     ) -> Sheet:
-        self.CH.readonly_header(columns=columns, readonly=readonly)
+        for c in (columns, int) if isinstance(columns, int) else columns:
+            set_readonly(self.CH.cell_options, c, readonly)
         return self.set_refresh_timer(redraw)
 
     def readonly_index(
         self,
-        rows: list[int],
+        rows: list[int] | int,
         readonly: bool = True,
         redraw: bool = False,
     ) -> Sheet:
-        self.RI.readonly_index(rows=rows, readonly=readonly)
+        for r in (rows,) if isinstance(rows, int) else rows:
+            set_readonly(self.RI.cell_options, r, readonly)
         return self.set_refresh_timer(redraw)
 
     def dehighlight_rows(

{tksheet-7.5.1 → tksheet-7.5.3}/tksheet/text_editor.py

@@ -6,7 +6,7 @@ from typing import Any, Literal
 
 from .constants import align_helper, ctrl_key, rc_binding
 from .functions import convert_align
-from .other_classes import DotDict
+from .other_classes import DotDict, FontTuple
 
 
 class TextEditorTkText(tk.Text):
@@ -231,6 +231,7 @@ class TextEditor(tk.Frame):
         show_border: bool,
         menu_kwargs: DotDict,
         sheet_ops: DotDict,
+        font: FontTuple,
         bg: str,
         fg: str,
         select_bg: str,
@@ -247,7 +248,7 @@ class TextEditor(tk.Frame):
             menu_kwargs=menu_kwargs,
             sheet_ops=sheet_ops,
             align=align,
-            font=menu_kwargs.font,
+            font=font,
             bg=bg,
             fg=fg,
             select_bg=select_bg,

{tksheet-7.5.1 → tksheet-7.5.3/tksheet.egg-info}/PKG-INFO

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