tksheet 7.2.13__py3-none-any.whl → 7.2.15__py3-none-any.whl

tksheet/__init__.py

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

tksheet/column_headers.py

@@ -1437,7 +1437,6 @@ class ColumnHeaders(tk.Canvas):
             x_stop,
             self.current_height,
         )
-        draw_x = self.MT.col_positions[grid_start_col]
         yend = self.current_height - 5
         if (self.PAR.ops.show_vertical_grid or self.width_resizing_enabled) and col_pos_exists:
             points = [

tksheet/functions.py

@@ -439,6 +439,58 @@ def is_contiguous(iterable: Iterator[int]) -> bool:
     return all(i == (prev := prev + 1) for i in itr)
 
 
+def down_cell_within_box(
+    r: int,
+    c: int,
+    r1: int,
+    c1: int,
+    r2: int,
+    c2: int,
+    numrows: int,
+    numcols: int,
+) -> tuple[int, int]:
+    moved = False
+    new_r = r
+    new_c = c
+    if r + 1 == r2:
+        new_r = r1
+    elif numrows > 1:
+        new_r = r + 1
+        moved = True
+    if not moved:
+        if c + 1 == c2:
+            new_c = c1
+        elif numcols > 1:
+            new_c = c + 1
+    return new_r, new_c
+
+
+def cell_right_within_box(
+    r: int,
+    c: int,
+    r1: int,
+    c1: int,
+    r2: int,
+    c2: int,
+    numrows: int,
+    numcols: int,
+) -> tuple[int, int]:
+    moved = False
+    new_r = r
+    new_c = c
+    if c + 1 == c2:
+        new_c = c1
+    elif numcols > 1:
+        new_c = c + 1
+        moved = True
+    if not moved:
+        if r + 1 == r2:
+            new_r = r1
+        elif numrows > 1:
+            new_r = r + 1
+    return new_r, new_c
+
+
 def get_last(
     it: Iterator,
 ) -> object:

tksheet/main_table.py

@@ -54,6 +54,7 @@ from .functions import (
     decompress_load,
     diff_gen,
     diff_list,
+    down_cell_within_box,
     event_dict,
     gen_formatted,
     get_data_from_clipboard,
@@ -72,6 +73,7 @@ from .functions import (
     new_tk_event,
     pickle_obj,
     pickled_event_dict,
+    cell_right_within_box,
     rounded_box_coords,
     span_idxs_post_move,
     try_binding,
@@ -6782,63 +6784,63 @@ class MainTable(tk.Canvas):
             numrows = r2 - r1
             if numcols == 1 and numrows == 1:
                 if event.keysym == "Return":
-                    self.select_cell(r + 1 if r < len(self.row_positions) - 2 else r, c)
-                    self.see(
-                        r + 1 if r < len(self.row_positions) - 2 else r,
-                        c,
-                        keep_xscroll=True,
-                        bottom_right_corner=True,
-                        check_cell_visibility=True,
-                    )
+                    if self.PAR.ops.edit_cell_return == "right":
+                        self.select_right(r, c)
+                    if self.PAR.ops.edit_cell_return == "down":
+                        self.select_down(r, c)
+                elif event.keysym == "Tab":
+                    if self.PAR.ops.edit_cell_tab == "right":
+                        self.select_right(r, c)
+                    if self.PAR.ops.edit_cell_tab == "down":
+                        self.select_down(r, c)
+            else:
+                if event.keysym == "Return":
+                    if self.PAR.ops.edit_cell_return == "right":
+                        new_r, new_c = cell_right_within_box(r, c, r1, c1, r2, c2, numrows, numcols)
+                    elif self.PAR.ops.edit_cell_return == "down":
+                        new_r, new_c = down_cell_within_box(r, c, r1, c1, r2, c2, numrows, numcols)
+                    else:
+                        new_r, new_c = None, None
                 elif event.keysym == "Tab":
-                    self.select_cell(r, c + 1 if c < len(self.col_positions) - 2 else c)
+                    if self.PAR.ops.edit_cell_tab == "right":
+                        new_r, new_c = cell_right_within_box(r, c, r1, c1, r2, c2, numrows, numcols)
+                    elif self.PAR.ops.edit_cell_tab == "down":
+                        new_r, new_c = down_cell_within_box(r, c, r1, c1, r2, c2, numrows, numcols)
+                    else:
+                        new_r, new_c = None, None
+                if isinstance(new_r, int):
+                    self.set_currently_selected(new_r, new_c, item=self.selected.fill_iid)
                     self.see(
-                        r,
-                        c + 1 if c < len(self.col_positions) - 2 else c,
-                        keep_xscroll=True,
+                        new_r,
+                        new_c,
+                        keep_xscroll=False,
                         bottom_right_corner=True,
                         check_cell_visibility=True,
                     )
-            else:
-                moved = False
-                new_r = r
-                new_c = c
-                if event.keysym == "Return":
-                    if r + 1 == r2:
-                        new_r = r1
-                    elif numrows > 1:
-                        new_r = r + 1
-                        moved = True
-                    if not moved:
-                        if c + 1 == c2:
-                            new_c = c1
-                        elif numcols > 1:
-                            new_c = c + 1
-                elif event.keysym == "Tab":
-                    if c + 1 == c2:
-                        new_c = c1
-                    elif numcols > 1:
-                        new_c = c + 1
-                        moved = True
-                    if not moved:
-                        if r + 1 == r2:
-                            new_r = r1
-                        elif numrows > 1:
-                            new_r = r + 1
-                self.set_currently_selected(new_r, new_c, item=self.selected.fill_iid)
-                self.see(
-                    new_r,
-                    new_c,
-                    keep_xscroll=False,
-                    bottom_right_corner=True,
-                    check_cell_visibility=True,
-                )
         self.recreate_all_selection_boxes()
         self.hide_text_editor_and_dropdown()
         if event.keysym != "FocusOut":
             self.focus_set()
         return "break"
 
+    def select_right(self, r: int, c: int) -> None:
+        self.select_cell(r, c + 1 if c < len(self.col_positions) - 2 else c)
+        self.see(
+            r,
+            c + 1 if c < len(self.col_positions) - 2 else c,
+            bottom_right_corner=True,
+            check_cell_visibility=True,
+        )
+
+    def select_down(self, r: int, c: int) -> None:
+        self.select_cell(r + 1 if r < len(self.row_positions) - 2 else r, c)
+        self.see(
+            r + 1 if r < len(self.row_positions) - 2 else r,
+            c,
+            bottom_right_corner=True,
+            check_cell_visibility=True,
+        )
+
     def tab_key(self, event: object = None) -> str:
         if not self.selected:
             return
@@ -6851,19 +6853,7 @@ class MainTable(tk.Canvas):
             new_c = c + 1 if c < len(self.col_positions) - 2 else c
             self.select_cell(new_r, new_c)
         else:
-            moved = False
-            new_r = r
-            new_c = c
-            if c + 1 == c2:
-                new_c = c1
-            elif numcols > 1:
-                new_c = c + 1
-                moved = True
-            if not moved:
-                if r + 1 == r2:
-                    new_r = r1
-                elif numrows > 1:
-                    new_r = r + 1
+            new_r, new_c = cell_right_within_box(r, c, r1, c1, r2, c2, numrows, numcols)
             self.set_currently_selected(new_r, new_c, item=self.selected.fill_iid)
         self.see(
             new_r,

tksheet/row_index.py

@@ -1535,7 +1535,6 @@ class RowIndex(tk.Canvas):
         self.hidd_tree_arrow.update(self.disp_tree_arrow)
         self.disp_tree_arrow = {}
         self.visible_row_dividers = {}
-        draw_y = self.MT.row_positions[grid_start_row]
         xend = self.current_width - 6
         self.row_width_resize_bbox = (
             self.current_width - 2,

tksheet/sheet.py

@@ -188,6 +188,9 @@ class Sheet(tk.Frame):
         show_horizontal_grid: bool = True,
         display_selected_fg_over_highlights: bool = False,
         show_selected_cells_border: bool = True,
+        edit_cell_tab: Literal["right", "down", ""] = "right",
+        edit_cell_return: Literal["right", "down", ""] = "down",
+        editor_del_key: Literal["forward", "backward", ""] = "forward",
         treeview: bool = False,
         treeview_indent: str | int = "6",
         rounded_boxes: bool = True,

tksheet/sheet_options.py

@@ -98,7 +98,6 @@ def new_sheet_options() -> DotDict:
             ],
             "delete_bindings": [
                 "<Delete>",
-                "<Delete>",
             ],
             "select_all_bindings": [
                 f"<{ctrl_key}-a>",
@@ -239,6 +238,9 @@ def new_sheet_options() -> DotDict:
             "show_horizontal_grid": True,
             "display_selected_fg_over_highlights": False,
             "show_selected_cells_border": True,
+            "edit_cell_tab": "right",
+            "edit_cell_return": "down",
+            "editor_del_key": "forward",
             "treeview": False,
             "treeview_indent": "6",
             "rounded_boxes": True,

tksheet/text_editor.py

@@ -40,6 +40,7 @@ class TextEditorTkText(tk.Text):
         self.bind(rc_binding, self.rc)
         self.bind(f"<{ctrl_key}-a>", self.select_all)
         self.bind(f"<{ctrl_key}-A>", self.select_all)
+        self.bind("<Delete>", self.delete_key)
         self._orig = self._w + "_orig"
         self.tk.call("rename", self._w, self._orig)
         self.tk.createcommand(self._w, self._proxy)
@@ -62,6 +63,7 @@ class TextEditorTkText(tk.Text):
             insertbackground=fg,
             state=state,
         )
+        self.editor_del_key = sheet_ops.editor_del_key
         self.align = align
         self.rc_popup_menu.delete(0, "end")
         self.rc_popup_menu.add_command(
@@ -126,6 +128,19 @@ class TextEditorTkText(tk.Text):
         self.focus_set()
         self.rc_popup_menu.tk_popup(event.x_root, event.y_root)
 
+    def delete_key(self, event: object = None) -> None:
+        if self.editor_del_key == "forward":
+            return
+        elif not self.editor_del_key:
+            return "break"
+        elif self.editor_del_key == "backward":
+            if self.tag_ranges("sel"):
+                return
+            if self.index("insert") == "1.0":
+                return "break"
+            self.delete("insert-1c")
+            return "break"
+
     def select_all(self, event: object = None) -> Literal["break"]:
         self.tag_add(tk.SEL, "1.0", tk.END)
         self.mark_set(tk.INSERT, tk.END)

{tksheet-7.2.13.dist-info → tksheet-7.2.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.2.13
+Version: 7.2.15
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -103,10 +103,10 @@ sheet.insert_columns(columns=2, idx=4, undo=True)
 sheet.delete_columns(columns=[0, 3], undo=True)
 ```
 
-### **light green theme**
+### **light blue theme**
 
-![tksheet light green theme](https://github.com/ragardner/tksheet/assets/26602401/790ee9bd-b4de-48df-8c44-33f303061d84)
+![tksheet light blue theme](https://github.com/user-attachments/assets/f40317d7-8b7f-43c5-9217-a77168b068ed)
 
 ### **dark theme**
 
-![tksheet dark theme](https://github.com/ragardner/tksheet/assets/26602401/fc8a0407-1486-46cf-b852-9bcff23160e5)
+![tksheet dark theme](https://github.com/user-attachments/assets/288453d6-5ac1-4d45-827f-45b24a3d05ed)

tksheet-7.2.15.dist-info/RECORD

@@ -0,0 +1,20 @@
+tksheet/__init__.py,sha256=7DsA4dnRJU4f9UyzWDd0-lHkvu9HCT28y5A2n7g4z3g,2165
+tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
+tksheet/column_headers.py,sha256=bHv67vRhRYxw_qyrw5akJo-b77vtN4y-mEO617FEqxE,102222
+tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
+tksheet/functions.py,sha256=wTWsTFZkTMJH-2qz--9qNaprWqhA7sYVzCEhuw_PRhs,42369
+tksheet/main_table.py,sha256=WeSemTwFb8zEu0v2QabPNGZqM06kkCs-IvP1HLSR1oM,328843
+tksheet/other_classes.py,sha256=HIKIDNXJRv0H5qbftcCtLVWW8NKSBAwyNXQOlmPWTDQ,15633
+tksheet/row_index.py,sha256=docjegBsQIO0qfPE7_zgTPkdTOHBMRJBpA9t6wqslj0,109630
+tksheet/sheet.py,sha256=ffaVQmjBEFtDiDDif7L1ze7XIT2jMmFHhPerC4AqubU,275549
+tksheet/sheet_options.py,sha256=d6o2TxGrHEJbdeFYfD67QPXM9irKSnLyNIiJI46gaw0,12442
+tksheet/text_editor.py,sha256=lmmHOPb11S8tlNtC10vijF1QqVB5Ts2hUKnGJd_JkWA,7103
+tksheet/themes.py,sha256=ZO4RqnAhEpApsoA5ZGUkYvb7huaNHSmrV_ug2TWWzOE,14474
+tksheet/top_left_rectangle.py,sha256=ri7hb9CC5l37ynmxceprq11UuWWRpWEI_0AI42wzv0A,8444
+tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
+tksheet/vars.py,sha256=86ubZZElsnQuC6Lv6bW2lt2NhD9wAp6PxtkK7ufKqq0,3452
+tksheet-7.2.15.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.2.15.dist-info/METADATA,sha256=LvqFaxqVU3rN2hYis6Ur4XO_AehkY4bBjuhbkb5rvt8,6263
+tksheet-7.2.15.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+tksheet-7.2.15.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.2.15.dist-info/RECORD,,

{tksheet-7.2.13.dist-info → tksheet-7.2.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tksheet-7.2.13.dist-info/RECORD

@@ -1,20 +0,0 @@
-tksheet/__init__.py,sha256=hncZ8UDCiHAX84BygwoCRGInI--ZROe-b2PfOOUMRSo,2165
-tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
-tksheet/column_headers.py,sha256=6PuhA2jHt3IT71syjEx986LsVJIQ65V3Qx0RLDjH1wI,102278
-tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
-tksheet/functions.py,sha256=lAl7KnYn5d8hTT_RgU7TDX8FwFaZOUsbn-i9K3O6hqk,41410
-tksheet/main_table.py,sha256=PBf-rjjgz1CvFZM5KVDTvbzneEtCgMty3R5e30IQYjQ,328748
-tksheet/other_classes.py,sha256=HIKIDNXJRv0H5qbftcCtLVWW8NKSBAwyNXQOlmPWTDQ,15633
-tksheet/row_index.py,sha256=4QyaQHr3ux8apWUfotZD2Vr8yidKdiD4DjRp8syHTTY,109686
-tksheet/sheet.py,sha256=oRKPn92IclzngpvH9w1UhkPT2ZMNWXQziZAQRZduIu0,275346
-tksheet/sheet_options.py,sha256=AJB7twce1DBteP7jk3GOpY1SetW-djgj2WP517FHZ9o,12349
-tksheet/text_editor.py,sha256=-QOO3belB0nGH3_XkO3aJ-SR-RRPZDMApyKUa7DWwAw,6549
-tksheet/themes.py,sha256=ZO4RqnAhEpApsoA5ZGUkYvb7huaNHSmrV_ug2TWWzOE,14474
-tksheet/top_left_rectangle.py,sha256=ri7hb9CC5l37ynmxceprq11UuWWRpWEI_0AI42wzv0A,8444
-tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
-tksheet/vars.py,sha256=86ubZZElsnQuC6Lv6bW2lt2NhD9wAp6PxtkK7ufKqq0,3452
-tksheet-7.2.13.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.2.13.dist-info/METADATA,sha256=0vIzO__DtHFM6Jg93nr-CS0VgTuhNHopzpCvSwab3Jk,6285
-tksheet-7.2.13.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-tksheet-7.2.13.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.2.13.dist-info/RECORD,,