tksheet 7.1.11__py3-none-any.whl → 7.1.12__py3-none-any.whl

tksheet/__init__.py

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

tksheet/column_headers.py

@@ -1953,6 +1953,7 @@ class ColumnHeaders(tk.Canvas):
             self.dropdown.window.reset(**reset_kwargs)
             self.itemconfig(self.dropdown.canvas_id, state="normal")
             self.coords(self.dropdown.canvas_id, self.MT.col_positions[c], ypos)
+            self.dropdown.window.tkraise()
         else:
             self.dropdown.window = self.PAR.dropdown_class(
                 self.winfo_toplevel(),

tksheet/functions.py

@@ -204,8 +204,6 @@ def get_dropdown_kwargs(
 def get_dropdown_dict(**kwargs) -> dict:
     return {
         "values": kwargs["values"],
-        "window": "no dropdown open",
-        "canvas_id": "no dropdown open",
         "select_function": kwargs["selection_function"],
         "modified_function": kwargs["modified_function"],
         "search_function": kwargs["search_function"],

tksheet/main_table.py

@@ -91,6 +91,10 @@ from .text_editor import (
 )
 from .vars import (
     USER_OS,
+    bind_add_columns,
+    bind_add_rows,
+    bind_del_columns,
+    bind_del_rows,
     ctrl_key,
     rc_binding,
     symbols_set,
@@ -2544,19 +2548,19 @@ class MainTable(tk.Canvas):
             self.undo_enabled = True
             self._tksheet_bind("undo_bindings", self.undo)
             self._tksheet_bind("redo_bindings", self.redo)
-        if binding in ("all", "rc_delete_column"):
+        if binding in bind_del_columns:
             self.rc_delete_column_enabled = True
             self.rc_popup_menus_enabled = True
             self.rc_select_enabled = True
-        if binding in ("all", "rc_delete_row"):
+        if binding in bind_del_rows:
             self.rc_delete_row_enabled = True
             self.rc_popup_menus_enabled = True
             self.rc_select_enabled = True
-        if binding in ("all", "rc_insert_column"):
+        if binding in bind_add_columns:
             self.rc_insert_column_enabled = True
             self.rc_popup_menus_enabled = True
             self.rc_select_enabled = True
-        if binding in ("all", "rc_insert_row"):
+        if binding in bind_add_rows:
             self.rc_insert_row_enabled = True
             self.rc_popup_menus_enabled = True
             self.rc_select_enabled = True
@@ -2615,25 +2619,16 @@ class MainTable(tk.Canvas):
             self.RI.row_selection_enabled = False
         if binding in ("all", "row_drag_and_drop", "move_rows"):
             self.RI.drag_and_drop_enabled = False
-        if binding in ("all", "rc_delete_column"):
+        if binding in bind_del_columns:
             self.rc_delete_column_enabled = False
-            self.rc_popup_menus_enabled = False
-            self.rc_select_enabled = False
-        if binding in ("all", "rc_delete_row"):
+        if binding in bind_del_rows:
             self.rc_delete_row_enabled = False
-            self.rc_popup_menus_enabled = False
-            self.rc_select_enabled = False
-        if binding in ("all", "rc_insert_column"):
+        if binding in bind_add_columns:
             self.rc_insert_column_enabled = False
-            self.rc_popup_menus_enabled = False
-            self.rc_select_enabled = False
-        if binding in ("all", "rc_insert_row"):
+        if binding in bind_add_rows:
             self.rc_insert_row_enabled = False
-            self.rc_popup_menus_enabled = False
-            self.rc_select_enabled = False
         if binding in ("all", "right_click_popup_menu", "rc_popup_menu"):
             self.rc_popup_menus_enabled = False
-            self.rc_select_enabled = False
         if binding in ("all", "right_click_select", "rc_select"):
             self.rc_select_enabled = False
         if binding in ("all", "edit_cell", "edit_bindings", "edit"):
@@ -4188,6 +4183,7 @@ class MainTable(tk.Canvas):
         create_ops: bool = True,
         create_selections: bool = True,
         add_row_positions: bool = True,
+        push_ops: bool = True,
     ) -> EventDataDict:
         self.saved_column_widths = {}
         saved_displayed_columns = list(self.displayed_columns)
@@ -4235,10 +4231,11 @@ class MainTable(tk.Canvas):
             )
         if isinstance(self._headers, list):
             self._headers = insert_items(self._headers, header, self.CH.fix_header)
-        self.adjust_options_post_add_columns(
-            cols=tuple(reversed(columns)),
-            create_ops=create_ops,
-        )
+        if push_ops:
+            self.adjust_options_post_add_columns(
+                cols=tuple(reversed(columns)),
+                create_ops=create_ops,
+            )
         if create_selections:
             self.deselect("all")
             for boxst, boxend in consecutive_ranges(tuple(reversed(column_widths))):
@@ -4319,6 +4316,7 @@ class MainTable(tk.Canvas):
         create_ops: bool = True,
         create_selections: bool = True,
         add_col_positions: bool = True,
+        push_ops: bool = True,
     ) -> EventDataDict:
         self.saved_row_heights = {}
         saved_displayed_rows = list(self.displayed_rows)
@@ -4364,10 +4362,11 @@ class MainTable(tk.Canvas):
                     (self.PAR.ops.default_column_width for i in range(len(self.col_positions) - 1, maxcn + 1)),
                 )
             )
-        self.adjust_options_post_add_rows(
-            rows=tuple(reversed(rows)),
-            create_ops=create_ops,
-        )
+        if push_ops:
+            self.adjust_options_post_add_rows(
+                rows=tuple(reversed(rows)),
+                create_ops=create_ops,
+            )
         if create_selections:
             self.deselect("all")
             for boxst, boxend in consecutive_ranges(tuple(reversed(row_heights))):
@@ -6752,6 +6751,7 @@ class MainTable(tk.Canvas):
         win_w = self.col_positions[c + 1] - self.col_positions[c] + 1
         if anchor == "nw":
             if kwargs["state"] == "normal":
+                self.text_editor.window.update_idletasks()
                 ypos = self.row_positions[r] + self.text_editor.window.winfo_height() - 1
             else:
                 ypos = self.row_positions[r + 1]
@@ -6770,8 +6770,9 @@ class MainTable(tk.Canvas):
         }
         if self.dropdown.window:
             self.dropdown.window.reset(**reset_kwargs)
-            self.itemconfig(self.dropdown.canvas_id, state="normal", anchor=anchor)
             self.coords(self.dropdown.canvas_id, self.col_positions[c], ypos)
+            self.itemconfig(self.dropdown.canvas_id, state="normal", anchor=anchor)
+            self.dropdown.window.tkraise()
         else:
             self.dropdown.window = self.PAR.dropdown_class(
                 self.winfo_toplevel(),

tksheet/row_index.py

@@ -2029,6 +2029,7 @@ class RowIndex(tk.Canvas):
         win_w = self.current_width + 1
         if anchor == "nw":
             if kwargs["state"] == "normal":
+                self.text_editor.window.update_idletasks()
                 ypos = self.MT.row_positions[r] + self.text_editor.window.winfo_height() - 1
             else:
                 ypos = self.MT.row_positions[r + 1]
@@ -2049,6 +2050,7 @@ class RowIndex(tk.Canvas):
             self.dropdown.window.reset(**reset_kwargs)
             self.itemconfig(self.dropdown.canvas_id, state="normal", anchor=anchor)
             self.coords(self.dropdown.canvas_id, 0, ypos)
+            self.dropdown.window.tkraise()
         else:
             self.dropdown.window = self.PAR.dropdown_class(
                 self.winfo_toplevel(),

tksheet/sheet.py

@@ -1939,6 +1939,7 @@ class Sheet(tk.Frame):
         emit_event: bool = False,
         create_selections: bool = True,
         add_column_widths: bool = True,
+        push_ops: bool = True,
         redraw: bool = True,
     ) -> EventDataDict:
         total_cols = None
@@ -2005,6 +2006,7 @@ class Sheet(tk.Frame):
                 selected=self.MT.selected,
             ),
             create_selections=create_selections,
+            push_ops=push_ops,
         )
         if undo:
             self.MT.undo_stack.append(ev_stack_dict(event_data))
@@ -2024,6 +2026,7 @@ class Sheet(tk.Frame):
         emit_event: bool = False,
         create_selections: bool = True,
         add_row_heights: bool = True,
+        push_ops: bool = True,
         redraw: bool = True,
     ) -> EventDataDict:
         old_total = self.MT.equalize_data_row_lengths()
@@ -2098,6 +2101,7 @@ class Sheet(tk.Frame):
                 selected=self.MT.selected,
             ),
             create_selections=create_selections,
+            push_ops=push_ops,
         )
         if undo:
             self.MT.undo_stack.append(ev_stack_dict(event_data))
@@ -2571,7 +2575,7 @@ class Sheet(tk.Frame):
         self.MT.open_dropdown_window(r, c)
         return self
 
-    def close_dropdown(self, r: int, c: int) -> Sheet:
+    def close_dropdown(self, r: int | None = None, c: int | None = None) -> Sheet:
         self.MT.close_dropdown_window(r, c)
         return self
 
@@ -2579,7 +2583,7 @@ class Sheet(tk.Frame):
         self.CH.open_dropdown_window(c)
         return self
 
-    def close_header_dropdown(self, c: int) -> Sheet:
+    def close_header_dropdown(self, c: int | None = None) -> Sheet:
         self.CH.close_dropdown_window(c)
         return self
 
@@ -2587,7 +2591,7 @@ class Sheet(tk.Frame):
         self.RI.open_dropdown_window(r)
         return self
 
-    def close_index_dropdown(self, r: int) -> Sheet:
+    def close_index_dropdown(self, r: int | None = None) -> Sheet:
         self.RI.close_dropdown_window(r)
         return self
 
@@ -4470,6 +4474,7 @@ class Sheet(tk.Frame):
         iid_column: int,
         parent_column: int,
         text_column: None | int = None,
+        push_ops: bool = False,
     ) -> Sheet:
         if text_column is None:
             text_column = iid_column
@@ -4518,6 +4523,7 @@ class Sheet(tk.Frame):
             row_index=True,
             create_selections=False,
             fill=False,
+            push_ops=push_ops,
         )
         self.RI.tree_rns = {n.iid: i for i, n in enumerate(self.MT._row_index)}
         self.hide_rows(
@@ -6231,8 +6237,8 @@ class Sheet(tk.Frame):
         kwargs = self.RI.get_cell_kwargs(r_, key="dropdown")
         if kwargs:
             kwargs["values"] = values
-            if self.RI.current_dropdown_window is not None:
-                self.RI.current_dropdown_window.values(values)
+            if self.RI.dropdown.open:
+                self.RI.dropdown.window.values(values)
             if set_value is not None:
                 self.MT.row_index(newindex=set_value, index=r_)
                 # here
@@ -6454,7 +6460,7 @@ class Dropdown(Sheet):
         width: int | None = None,
         height: int | None = None,
         font: None | tuple[str, int, str] = None,
-        outline_thickness: int = 1,
+        outline_thickness: int = 2,
         values: list[object] = [],
         close_dropdown_window: Callable | None = None,
         search_function: Callable = dropdown_search_function,
@@ -6512,6 +6518,7 @@ class Dropdown(Sheet):
         align: str,
         values: list[object] | None = None,
     ) -> None:
+        self.deselect(redraw=False)
         self.r = r
         self.c = c
         self.row = -1

tksheet/themes.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
-theme_light_blue: dict[str, str] = {
+from .other_classes import DotDict
+
+theme_light_blue: dict[str, str] = DotDict({
     "popup_menu_fg": "#000000",
     "popup_menu_bg": "#FFFFFF",
     "popup_menu_highlight_bg": "#DCDEE0",
@@ -70,9 +72,9 @@ theme_light_blue: dict[str, str] = {
     "horizontal_scroll_not_active_fg": "#DADCE0",
     "vertical_scroll_pressed_fg": "#bdc1c6",
     "horizontal_scroll_pressed_fg": "#bdc1c6",
-}
+})
 
-theme_light_green: dict[str, str] = {
+theme_light_green: dict[str, str] = DotDict({
     "popup_menu_fg": "#000000",
     "popup_menu_bg": "#FFFFFF",
     "popup_menu_highlight_bg": "#DCDEE0",
@@ -142,9 +144,9 @@ theme_light_green: dict[str, str] = {
     "horizontal_scroll_not_active_fg": "#c1c1c1",
     "vertical_scroll_pressed_fg": "#707070",
     "horizontal_scroll_pressed_fg": "#707070",
-}
+})
 
-theme_dark: dict[str, str] = {
+theme_dark: dict[str, str] = DotDict({
     "popup_menu_fg": "white",
     "popup_menu_bg": "gray15",
     "popup_menu_highlight_bg": "gray40",
@@ -214,9 +216,9 @@ theme_dark: dict[str, str] = {
     "horizontal_scroll_not_active_fg": "#3b3b3d",
     "vertical_scroll_pressed_fg": "#a0a0a0",
     "horizontal_scroll_pressed_fg": "#a0a0a0",
-}
+})
 
-theme_black: dict[str, str] = {
+theme_black: dict[str, str] = DotDict({
     "popup_menu_fg": "white",
     "popup_menu_bg": "gray15",
     "popup_menu_highlight_bg": "gray40",
@@ -286,9 +288,9 @@ theme_black: dict[str, str] = {
     "horizontal_scroll_not_active_fg": "#3b3a39",
     "vertical_scroll_pressed_fg": "#a0a0a0",
     "horizontal_scroll_pressed_fg": "#a0a0a0",
-}
+})
 
-theme_dark_blue: dict[str, str] = theme_black.copy()
+theme_dark_blue: dict[str, str] = DotDict(theme_black.copy())
 theme_dark_blue["header_fg"] = "#6ACAD8"
 theme_dark_blue["header_selected_cells_fg"] = "#6ACAD8"
 theme_dark_blue["index_fg"] = "#6ACAD8"
@@ -303,7 +305,7 @@ theme_dark_blue["index_selected_rows_bg"] = "#6ACAD8"
 theme_dark_blue["table_selected_rows_border_fg"] = "#6ACAD8"
 theme_dark_blue["table_selected_columns_border_fg"] = "#6ACAD8"
 
-theme_dark_green: dict[str, str] = theme_black.copy()
+theme_dark_green: dict[str, str] = DotDict(theme_black.copy())
 theme_dark_green["header_fg"] = "#66FFBF"
 theme_dark_green["header_selected_cells_fg"] = "#66FFBF"
 theme_dark_green["index_fg"] = "#66FFBF"

tksheet/vars.py

@@ -9,23 +9,28 @@ symbols_set: set[str] = set("""!#$%&'()*+,-./:;"@[]^_`{|}~>?= \\""")
 nonelike: set[object] = {None, "none", ""}
 truthy: set[object] = {True, "true", "t", "yes", "y", "on", "1", 1, 1.0}
 falsy: set[object] = {False, "false", "f", "no", "n", "off", "0", 0, 0.0}
+
 val_modifying_options: set[str, str, str] = {"checkbox", "format", "dropdown"}
-named_span_types = (
+
+named_span_types: set[str] = {
     "format",
     "highlight",
     "dropdown",
     "checkbox",
     "readonly",
     "align",
-)
+}
+
 emitted_events: set[str] = {
     "<<SheetModified>>",
     "<<SheetRedrawn>>",
     "<<SheetSelect>>",
 }
+
 backwards_compatibility_keys: dict[str, str] = {
     "font": "table_font",
 }
+
 text_editor_to_unbind: tuple[str] = (
     "<Alt-Return>",
     "<Alt-KP_Enter>",
@@ -36,6 +41,7 @@ text_editor_to_unbind: tuple[str] = (
     "<FocusOut>",
     "<Escape>",
 )
+
 scrollbar_options_keys: set[str] = {
     "vertical_scroll_background",
     "horizontal_scroll_background",
@@ -70,3 +76,47 @@ scrollbar_options_keys: set[str] = {
     "vertical_scroll_pressed_fg",
     "horizontal_scroll_pressed_fg",
 }
+
+bind_add_columns: set[str] = {
+    "all",
+    "rc_insert_column",
+    "insert_column",
+    "add_column",
+    "insert_columns",
+    "add_columns",
+    "insert column",
+    "add column",
+}
+
+bind_del_columns: set[str] = {
+    "all",
+    "rc_delete_column",
+    "delete_column",
+    "del_column",
+    "delete_columns",
+    "del_columns",
+    "delete columns",
+    "del columns",
+}
+
+bind_add_rows: set[str] = {
+    "all",
+    "rc_insert_row",
+    "insert_row",
+    "add_row",
+    "insert_rows",
+    "add_rows",
+    "insert row",
+    "add row",
+}
+
+bind_del_rows: set[str] = {
+    "all",
+    "rc_delete_row",
+    "delete_row",
+    "del_row",
+    "delete_rows",
+    "del_rows",
+    "delete rows",
+    "del rows",
+}

{tksheet-7.1.11.dist-info → tksheet-7.1.12.dist-info}/METADATA

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

tksheet-7.1.12.dist-info/RECORD

@@ -0,0 +1,20 @@
+tksheet/__init__.py,sha256=NUxHKOZFQzf4A8eiKohXLDQe-9iyK2d4ZDzkDr4_GQk,2014
+tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
+tksheet/column_headers.py,sha256=eZKZGZEstg5HeCtvdVYmu5nqoY0bdxrwYScQvZz5xEQ,100496
+tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
+tksheet/functions.py,sha256=1aI9sN-O0DOFITj0bOORzI9XQteThciCXhTr8GPHgkw,39616
+tksheet/main_table.py,sha256=z9Q8BjFqoGW88Cm1av7nR8fkYw-HxnOMVlBqgY3R1gU,318838
+tksheet/other_classes.py,sha256=P3FYUYreLhstATvHCNow8sDQoCsD_02KB6oXcca3ahE,13628
+tksheet/row_index.py,sha256=ytD1A6dmzzrM9EYm-IIJ0_xo-2XVfecKgYBG_Hxm_m8,105999
+tksheet/sheet.py,sha256=rc4BuXw9JxV3_Ja-fdBDEkE_1P6jNl8jhPs8MoGuw6E,259740
+tksheet/sheet_options.py,sha256=mh0rTvWrFvIKaiv88jtMZy0TSA8zTS1GXSe88u8_rzk,11978
+tksheet/text_editor.py,sha256=81_IZKrTVa2KIx2cJ4n3cFvFMAwvbHIQYgqtyat-97I,6681
+tksheet/themes.py,sha256=0XY97zB9e26edyxMWutofNarNon8Pp5lpprHYeL_4b0,13490
+tksheet/top_left_rectangle.py,sha256=-2u9GfOvcqhkKwHEtbqdFvXCY3RbvL5k2Sh9l3r_k04,8275
+tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
+tksheet/vars.py,sha256=Nb0mhxJt-SXipi3cE9J9Ea1H1iPqC8PRvUR9CqqMlVA,3062
+tksheet-7.1.12.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.1.12.dist-info/METADATA,sha256=fWMZLYa3BI5udpVfd5vuyt-S7i17enOimu6FNwkKOlc,6014
+tksheet-7.1.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tksheet-7.1.12.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.1.12.dist-info/RECORD,,

tksheet-7.1.11.dist-info/RECORD

@@ -1,20 +0,0 @@
-tksheet/__init__.py,sha256=w1YOGIZHF7gjLLEWIH-XLK-ftzuYgSiLTvMUg6ORTYM,2014
-tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
-tksheet/column_headers.py,sha256=6yYncfnKKKlSGTln35eP74e2Oom9A2XX85SrIsDeq9g,100452
-tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
-tksheet/functions.py,sha256=ytmHQtSa8cN6dKYLFra5G0393-4sU7bivvT_U4wxksI,39697
-tksheet/main_table.py,sha256=1K-JpLixwx_cnqp5IXeghRWyzaMdQiP6BPm6QVOtfzs,319012
-tksheet/other_classes.py,sha256=P3FYUYreLhstATvHCNow8sDQoCsD_02KB6oXcca3ahE,13628
-tksheet/row_index.py,sha256=BnQF-lxH50MfPWlXW94oYSEJXoPewoX29VS7j0X1Jwc,105895
-tksheet/sheet.py,sha256=dvYtZpNJsu6WfjdUKt6RKcwKeDY5c7wZ-tQfL1rjglQ,259484
-tksheet/sheet_options.py,sha256=mh0rTvWrFvIKaiv88jtMZy0TSA8zTS1GXSe88u8_rzk,11978
-tksheet/text_editor.py,sha256=81_IZKrTVa2KIx2cJ4n3cFvFMAwvbHIQYgqtyat-97I,6681
-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=8Qxas-m5nU-yMaeAweO4Z30FM9cOQoRTiOsH4kgZp5s,2288
-tksheet-7.1.11.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.1.11.dist-info/METADATA,sha256=SRDk-Is6G0UmdJ6PAMgPzkwumb4PLOFETNplec7bkbE,6014
-tksheet-7.1.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tksheet-7.1.11.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.1.11.dist-info/RECORD,,