tksheet 5.6.4__tar.gz → 5.6.6__tar.gz

{tksheet-5.6.4 → tksheet-5.6.6}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 5.6.4
+Version: 5.6.6
 Summary: Tkinter table / sheet widget
 Home-page: https://github.com/ragardner/tksheet
-Download-URL: https://github.com/ragardner/tksheet/archive/5.6.4.tar.gz
+Download-URL: https://github.com/ragardner/tksheet/archive/5.6.6.tar.gz
 Author: ragardner
 Author-email: github@ragardner.simplelogin.com
 License: MIT
@@ -16,7 +16,7 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 
-# tksheet [![PyPI version shields.io](https://img.shields.io/pypi/v/tksheet.svg)](https://pypi.python.org/pypi/tksheet/) ![python](https://img.shields.io/badge/python-3.6+-blue) [![License: MIT](https://img.shields.io/badge/License-MIT%20-blue.svg)](https://github.com/ragardner/tksheet/blob/master/LICENSE.txt) [![GitHub Release Date](https://img.shields.io/github/release-date-pre/ragardner/tksheet.svg)](https://github.com/ragardner/tksheet/releases)
+# tksheet [![PyPI version shields.io](https://img.shields.io/pypi/v/tksheet.svg)](https://pypi.python.org/pypi/tksheet/) ![python](https://img.shields.io/badge/python-3.6+-blue) [![License: MIT](https://img.shields.io/badge/License-MIT%20-blue.svg)](https://github.com/ragardner/tksheet/blob/master/LICENSE.txt) [![GitHub Release Date](https://img.shields.io/github/release-date-pre/ragardner/tksheet.svg)](https://github.com/ragardner/tksheet/releases) [![Downloads](https://img.shields.io/pypi/dm/tksheet.svg)](https://pypi.org/project/tksheet/)
 
 
 Python tkinter table widget
@@ -48,8 +48,8 @@ pip install tksheet --upgrade
 
 ### Light Blue Theme
 
-![alt text](https://i.imgur.com/VaARHUp.png)
+![alt text](https://i.imgur.com/ojU3IQi.jpeg)
 
 ### Dark Theme
 
-![alt text](https://i.imgur.com/ldzbkN9.png)
+![alt text](https://i.imgur.com/JeF9vJe.jpeg)

{tksheet-5.6.4 → tksheet-5.6.6}/README.md

@@ -1,4 +1,4 @@
-# tksheet [![PyPI version shields.io](https://img.shields.io/pypi/v/tksheet.svg)](https://pypi.python.org/pypi/tksheet/) ![python](https://img.shields.io/badge/python-3.6+-blue) [![License: MIT](https://img.shields.io/badge/License-MIT%20-blue.svg)](https://github.com/ragardner/tksheet/blob/master/LICENSE.txt) [![GitHub Release Date](https://img.shields.io/github/release-date-pre/ragardner/tksheet.svg)](https://github.com/ragardner/tksheet/releases)
+# tksheet [![PyPI version shields.io](https://img.shields.io/pypi/v/tksheet.svg)](https://pypi.python.org/pypi/tksheet/) ![python](https://img.shields.io/badge/python-3.6+-blue) [![License: MIT](https://img.shields.io/badge/License-MIT%20-blue.svg)](https://github.com/ragardner/tksheet/blob/master/LICENSE.txt) [![GitHub Release Date](https://img.shields.io/github/release-date-pre/ragardner/tksheet.svg)](https://github.com/ragardner/tksheet/releases) [![Downloads](https://img.shields.io/pypi/dm/tksheet.svg)](https://pypi.org/project/tksheet/)
 
 
 Python tkinter table widget
@@ -30,8 +30,8 @@ pip install tksheet --upgrade
 
 ### Light Blue Theme
 
-![alt text](https://i.imgur.com/VaARHUp.png)
+![alt text](https://i.imgur.com/ojU3IQi.jpeg)
 
 ### Dark Theme
 
-![alt text](https://i.imgur.com/ldzbkN9.png)
+![alt text](https://i.imgur.com/JeF9vJe.jpeg)

{tksheet-5.6.4 → tksheet-5.6.6}/setup.py

@@ -8,7 +8,7 @@ with open(path.join(this_directory, 'README.md'), encoding = 'utf-8') as f:
 setup(
   name = 'tksheet',
   packages = ['tksheet'],
-  version = '5.6.4',
+  version = '5.6.6',
   python_requires = '>=3.6',
   license = 'MIT',
   description = 'Tkinter table / sheet widget',
@@ -17,7 +17,7 @@ setup(
   author = 'ragardner',
   author_email = 'github@ragardner.simplelogin.com',
   url = 'https://github.com/ragardner/tksheet',
-  download_url = 'https://github.com/ragardner/tksheet/archive/5.6.4.tar.gz',
+  download_url = 'https://github.com/ragardner/tksheet/archive/5.6.6.tar.gz',
   keywords = ['tkinter', 'table', 'widget', 'sheet', 'grid', 'tk'],
   install_requires = [],
   classifiers = [

{tksheet-5.6.4 → tksheet-5.6.6}/tksheet/_tksheet.py

@@ -457,6 +457,8 @@ class Sheet(tk.Frame):
             self.MT.extra_end_edit_cell_func = func
             self.CH.extra_begin_edit_cell_func = func
             self.CH.extra_end_edit_cell_func = func
+            self.RI.extra_begin_edit_cell_func = func
+            self.RI.extra_end_edit_cell_func = func
             
             self.RI.ri_extra_end_drag_drop_func = func
             self.CH.ch_extra_end_drag_drop_func = func
@@ -918,13 +920,14 @@ class Sheet(tk.Frame):
         else:
             _rows = set(rows)
         self.MT.data[:] = [row for r, row in enumerate(self.MT.data) if r not in _rows]
+        rhs = tuple(int(b - a) for a, b in zip(self.MT.row_positions, islice(self.MT.row_positions, 1, len(self.MT.row_positions))))
         if self.MT.all_rows_displayed:
-            self.set_row_heights(row_heights = (h for r, h in enumerate(tuple(int(b - a) for a, b in zip(self.MT.row_positions, islice(self.MT.row_positions, 1, len(self.MT.row_positions))))) if r not in _rows))
+            self.set_row_heights(row_heights = tuple(h for r, h in enumerate(rhs) if r not in _rows))
         else:
             dispset = set(self.MT.displayed_rows)
             heights_to_del = {i for i, r in enumerate(to_bis) if r in dispset}
             if heights_to_del:
-                self.set_row_heights(row_heights = (h for r, h in enumerate(tuple(int(b - a) for a, b in zip(self.MT.row_positions, islice(self.MT.row_positions, 1, len(self.MT.row_positions))))) if r not in heights_to_del))
+                self.set_row_heights(row_heights = tuple(h for r, h in enumerate(rhs) if r not in heights_to_del))
             self.MT.displayed_rows = [r for r in self.MT.displayed_rows if r not in _rows]
         to_bis = sorted(_rows)
         self.MT.cell_options = {(r if not bisect.bisect_left(to_bis, r) else r - bisect.bisect_left(to_bis, r), c): v for (r, c), v in self.MT.cell_options.items() if r not in _rows}
@@ -1023,13 +1026,14 @@ class Sheet(tk.Frame):
             to_del = set(columns)
         self.MT.data[:] = [[e for c, e in enumerate(r) if c not in to_del] for r in self.MT.data]
         to_bis = sorted(to_del)
+        cws = tuple(int(b - a) for a, b in zip(self.MT.col_positions, islice(self.MT.col_positions, 1, len(self.MT.col_positions))))
         if self.MT.all_columns_displayed:
-            self.set_column_widths(column_widths = (w for c, w in enumerate(tuple(int(b - a) for a, b in zip(self.MT.col_positions, islice(self.MT.col_positions, 1, len(self.MT.col_positions))))) if c not in to_del))
+            self.set_column_widths(column_widths = tuple(w for c, w in enumerate(cws) if c not in to_del))
         else:
             dispset = set(self.MT.displayed_columns)
             widths_to_del = {i for i, c in enumerate(to_bis) if c in dispset}
             if widths_to_del:
-                self.set_column_widths(column_widths = (w for c, w in enumerate(tuple(int(b - a) for a, b in zip(self.MT.col_positions, islice(self.MT.col_positions, 1, len(self.MT.col_positions))))) if c not in widths_to_del))
+                self.set_column_widths(column_widths = tuple(w for c, w in enumerate(cws) if c not in widths_to_del))
             self.MT.displayed_columns = [c if not bisect.bisect_left(to_bis, c) else c - bisect.bisect_left(to_bis, c) for c in self.MT.displayed_columns if c not in to_del]
         self.MT.cell_options = {(r, c if not bisect.bisect_left(to_bis, c) else c - bisect.bisect_left(to_bis, c)): v for (r, c), v in self.MT.cell_options.items() if c not in to_del}
         self.MT.col_options = {c if not bisect.bisect_left(to_bis, c) else c - bisect.bisect_left(to_bis, c): v for c, v in self.MT.col_options.items() if c not in to_del}
@@ -1288,6 +1292,12 @@ class Sheet(tk.Frame):
 
     def recreate_all_selection_boxes(self):
         self.MT.recreate_all_selection_boxes()
+        
+    def cell_visible(self, r, c):
+        return self.MT.cell_visible(r, c)
+        
+    def cell_completely_visible(self, r, c, seperate_axes = False):
+        return self.MT.cell_completely_visible(r, c, seperate_axes)
 
     def cell_selected(self, r, c):
         return self.MT.cell_selected(r, c)
@@ -1841,33 +1851,27 @@ class Sheet(tk.Frame):
             self.refresh()
 
     def change_theme(self, theme = "light blue", redraw = True):
-        if theme == "light blue":
-            self.MT.display_selected_fg_over_highlights = False
+        if theme.lower() in ("light blue", "light_blue"):
             self.set_options(**theme_light_blue,
                              redraw = redraw)
             self.config(bg = theme_light_blue['table_bg'])
-        elif theme == "dark":
-            self.MT.display_selected_fg_over_highlights = False
+        elif theme.lower() == "dark":
             self.set_options(**theme_dark,
                              redraw = redraw)
             self.config(bg = theme_dark['table_bg'])
-        elif theme == "light green":
-            self.MT.display_selected_fg_over_highlights = True
+        elif theme.lower() in ("light green", "light_green"):
             self.set_options(**theme_light_green,
                              redraw = redraw)
             self.config(bg = theme_light_green['table_bg'])
-        elif theme == "dark blue":
-            self.MT.display_selected_fg_over_highlights = True
+        elif theme.lower() in ("dark blue", "dark_blue"):
             self.set_options(**theme_dark_blue,
                              redraw = redraw)
             self.config(bg = theme_dark_blue['table_bg'])
-        elif theme == "dark green":
-            self.MT.display_selected_fg_over_highlights = True
+        elif theme.lower() in ("dark green", "dark_green"):
             self.set_options(**theme_dark_green,
                              redraw = redraw)
             self.config(bg = theme_dark_green['table_bg'])
-        elif theme == "black":
-            self.MT.display_selected_fg_over_highlights = False
+        elif theme.lower() == "black":
             self.set_options(**theme_black,
                              redraw = redraw)
             self.config(bg = theme_black['table_bg'])
@@ -2755,8 +2759,10 @@ class Sheet_Dropdown(Sheet):
                  width = None,
                  height = None,
                  font = None,
-                 bg = theme_light_blue['table_bg'],
-                 fg = theme_light_blue['table_fg'],
+                 colors = {'bg': theme_light_blue['popup_menu_bg'],
+                           'fg': theme_light_blue['popup_menu_fg'],
+                           'highlight_bg': theme_light_blue['popup_menu_highlight_bg'],
+                           'highlight_fg': theme_light_blue['popup_menu_highlight_fg']},
                  outline_color = theme_light_blue['table_fg'],
                  outline_thickness = 2,
                  values = [],
@@ -2770,7 +2776,7 @@ class Sheet_Dropdown(Sheet):
                        parent = parent,
                        outline_thickness = outline_thickness,
                        outline_color = outline_color,
-                       table_grid_fg = outline_color,
+                       table_grid_fg = colors['fg'],
                        show_horizontal_grid = True,
                        show_vertical_grid = False,
                        show_header = False,
@@ -2782,16 +2788,16 @@ class Sheet_Dropdown(Sheet):
                        selected_rows_to_end_of_window = True,
                        horizontal_grid_to_end_of_window = True,
                        show_selected_cells_border = False,
-                       table_selected_cells_border_fg = fg,
-                       table_selected_cells_bg = fg,
-                       table_selected_rows_border_fg = fg,
-                       table_selected_rows_bg = fg,
-                       table_selected_rows_fg = bg,
+                       table_selected_cells_border_fg = colors['fg'],
+                       table_selected_cells_bg = colors['highlight_bg'],
+                       table_selected_rows_border_fg = colors['fg'],
+                       table_selected_rows_bg = colors['highlight_bg'],
+                       table_selected_rows_fg = colors['highlight_fg'],
                        width = width,
                        height = height,
                        font = font if font else get_font(),
-                       table_fg = fg,
-                       table_bg = bg)
+                       table_fg = colors['fg'],
+                       table_bg = colors['bg'])
         self.parent = parent
         self.hide_dropdown_window = hide_dropdown_window
         self.arrowkey_RIGHT = arrowkey_RIGHT
@@ -2800,8 +2806,6 @@ class Sheet_Dropdown(Sheet):
         self.w_ = width
         self.r = r
         self.c = c
-        self.bg = bg
-        self.fg = fg
         self.row = -1
         self.single_index = single_index
         self.bind("<Motion>", self.mouse_motion)