listpick 0.1.14.10__py3-none-any.whl → 0.1.14.12__py3-none-any.whl

listpick/listpick_app.py

@@ -188,7 +188,6 @@ class Picker:
         sheet_index = 0,
         sheet_states = [{}],
 
-        redraw_screen_accessory: Callable = lambda : None,
 
     ):
         self.stdscr = stdscr
@@ -338,7 +337,6 @@ class Picker:
         self.sheet_states = sheet_states
         self.sheets = sheets
 
-        self.redraw_screen_accessory = redraw_screen_accessory
         self.initialise_picker_state(reset_colours=self.reset_colours)
 
         # Note: We have to set the footer after initialising the picker state so that the footer can use the get_function_data method
@@ -453,7 +451,7 @@ class Picker:
             if reset_colours:
                 global COLOURS_SET
                 COLOURS_SET = False
-                colours_end = set_colours(pick=self.colour_theme_number, start=self.colours_start)
+                self.colours_end = set_colours(pick=self.colour_theme_number, start=self.colours_start)
             if curses.COLORS >= 255 and curses.COLOR_PAIRS >= 150:
                 self.colours_start = self.colours_start
                 self.notification_colours_start = self.colours_start+50
@@ -752,7 +750,6 @@ class Picker:
     def draw_screen_(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
         """ Draw Picker screen. """
 
-        self.redraw_screen_accessory()
         self.logger.debug("Draw screen.")
 
         if clear:
@@ -1242,7 +1239,6 @@ class Picker:
             "sheets":                           self.sheets,
             "sheet_name":                       self.sheet_name,
             "sheet_states":                     self.sheet_states,
-            "redraw_screen_accessory":          self.redraw_screen_accessory,
         }
         return function_data
 
@@ -1277,7 +1273,6 @@ class Picker:
             "centre_in_terminal_vertical",
             "centre_in_cols",
             "centre_in_terminal",
-            "redraw_screen_accessory",
         ]
 
         for var in variables:
@@ -3452,7 +3447,7 @@ def set_colours(pick: int = 0, start: int = 0) -> Optional[int]:
         curses.init_pair(start+24, colours['footer_string_fg'], colours['footer_string_bg'])
         curses.init_pair(start+25, colours['selected_cell_fg'], colours['selected_cell_bg'])
         curses.init_pair(start+26, colours['deselecting_cell_fg'], colours['deselecting_cell_bg'])
-    except:
+    except Exception as e:
         pass
     COLOURS_SET = True
     return start+21
@@ -3603,7 +3598,7 @@ def main() -> None:
     except:
         pass
         
-    function_data["colour_theme_number"] = 3
+    # function_data["colour_theme_number"] = 3
     # function_data["modes"]  = [ 
     #     {
     #         'filter': '',

listpick/ui/build_help.py

@@ -7,16 +7,18 @@ Author: GrimAndGreedy
 License: MIT
 """
 
-from listpick.ui.keys import picker_keys
+from listpick.ui.keys import picker_keys, notification_keys
 import curses
 import logging
+from listpick.utils import keycodes
 
 logger = logging.getLogger('picker_log')
 
-def build_help_rows(keys_dict: dict) -> list[list[str]]:
+def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
     """ Build help rows based on the keys_dict. """
 
     logger.info(f"function: build_help_rows() (build_help.py)")
+
     ## Key names
     special_keys = {
 
@@ -35,16 +37,35 @@ def build_help_rows(keys_dict: dict) -> list[list[str]]:
             ord('\n'): "\n",
             curses.KEY_DC: "Delete",
             383: "Shift+Delete",
+            ord("\t"): "Tab",
+            curses.KEY_BACKSPACE: "Backspace",
+            keycodes.META_BS: "Alt+Backspace",
     }
 
     # Ctrl + [a-z]
     for i in range(26):
         special_keys[i+1] = f"Ctrl+{chr(ord('a')+i)}"
+        if i == 8:
+            special_keys[i+1] = f"Tab/Ctrl+{chr(ord('a')+i)}"
+
 
     # F1-F12
     for i in range(12):
         special_keys[curses.KEY_F1+i] = f"F{i+1}"
 
+    # Alt+[a-z]
+    for i in range(26):
+        special_keys[keycodes.META_a +i] = f"Alt+{chr(ord('a')+i)}"
+
+    # Alt+[A-Z]
+    for i in range(26):
+        special_keys[keycodes.META_A +i] = f"Alt+{chr(ord('A')+i)}"
+
+    # Alt+[0-9]
+    for i in range(10):
+        special_keys[keycodes.META_0] = f"Alt+{i}"
+
+
     ## Key descriptions
     help_descriptions = {
         "refresh":                          "Refresh the screen.",
@@ -119,14 +140,16 @@ def build_help_rows(keys_dict: dict) -> list[list[str]]:
         "info":                             "Display info screen.",
         "file_next":                        "Go to the next open file.",
         "file_prev":                        "Go to the previous open file.",
+        "sheet_next":                       "Go to the next sheet.",
+        "sheet_prev":                       "Go to the previous sheet.",
     }
     sections = {
         "Navigation:": [ "cursor_down", "cursor_up", "half_page_up", "half_page_down", "page_up", "page_down", "cursor_bottom", "cursor_top", "five_up", "five_down", "scroll_right", "scroll_left", "scroll_far_right", "scroll_far_left" ],
         "Selection:": [ "toggle_select", "select_all", "select_none", "visual_selection_toggle", "visual_deselection_toggle", "enter" ],
         "UI:": [ "toggle_footer", "redraw_screen", "decrease_lines_per_page", "increase_lines_per_page", "increase_column_width", "decrease_column_width", "notification_toggle" ],
         "Sort:": [ "cycle_sort_method", "cycle_sort_method_reverse", "cycle_sort_order", ] ,
-        "Data manipulation:": [ "delete", "delete_column", "edit", "edit_picker", "edit_ipython", "add_column", "add_row" ],
-        "Filter and sort:": [ "filter_input", "search_input", "continue_search_forward", "continue_search_backward", ] ,
+        "Data manipulation:": [ "delete", "delete_column", "edit", "edit_picker", "edit_ipython", "add_column_before", "add_column_after", "add_row_before", "add_row_after"],
+        "Filter and sort:": [ "filter_input", "x", "search_input", "continue_search_forward", "continue_search_backward", ] ,
         "Settings:": [ "settings_input", "settings_options" ],
         "Cancel:": [ "opts_input", "opts_select", "mode_next", "mode_prev", "pipe_input", "reset_opts", "col_select", "col_select_next", "col_select_prev", "col_hide" ],
         "Save, load, copy and paste:": [ "save", "load", "open", "copy", "paste" ],
@@ -148,36 +171,48 @@ def build_help_rows(keys_dict: dict) -> list[list[str]]:
         section_rows = []
         
         for operation in section_operations:
-            try:
-                keys = [chr(int(key)) if key not in special_keys else special_keys[key] for key in keys_dict[operation]]
+            keys = []
+            if operation in keys_dict:
+                for key in keys_dict[operation]:
+                    if key in special_keys:
+                        keys.append(special_keys[key])
+                    else:
+                        try:
+                            keys.append(chr(int(key)))
+                        except Exception as e:
+                            keys.append(f"keycode={key}")
+                            if debug: print(f"Error chr({key}): {e}")
+            else:
+                if debug: print(f"Note that {operation} is not in the keys_dict")
+                continue
+
+
+
+            if operation in help_descriptions:
                 description = help_descriptions[operation]
-                row = [f"    {str(keys)[1:-1]}", description]
-                section_rows.append(row)
-            except:
-                pass
+            else:
+                if debug: print(f"Operation={operation} has no description.")
+                description = "..."
+
+            row = [f"    {str(keys)[1:-1]}", description]
+            section_rows.append(row)
         if section_rows:
             items.append([section_name, ""])
             items += section_rows
             items.append(["",""])
 
-    # [[key_name, key_function_description], ...]
-    # for val, keys in keys_dict.items():
-    #     try: 
-    #         row = [[chr(int(key)) if key not in special_keys else special_keys[key] for key in keys], help_descriptions[val]]
-    #         items.append(row)
-    #     except:
-    #         pass
-
     return items
 
 if __name__ == "__main__":
-    from listpick.listpick_app import Picker, start_curses, close_curses
-    items = build_help_rows(picker_keys)
-    stdscr = start_curses()
-    x = Picker(
-        stdscr,
-        items=items
-    )
-    x.run()
-
-    close_curses(stdscr)
+    items = build_help_rows(picker_keys, debug=True)
+    items = build_help_rows(notification_keys, debug=True)
+
+    # from listpick.listpick_app import Picker, start_curses, close_curses
+    # stdscr = start_curses()
+    # x = Picker(
+    #     stdscr,
+    #     items=items
+    # )
+    # x.run()
+    #
+    # close_curses(stdscr)

listpick/ui/footer.py

@@ -85,6 +85,9 @@ class StandardFooter(Footer):
             self.sheets_y -= 1
 
             self.files_y = h-1
+        if state["search_query"] and self.height < 3:
+            self.height = 3
+
 
     def draw(self, h, w):
         state = self.get_state()

listpick/ui/picker_colours.py

@@ -67,6 +67,8 @@ def get_colours(pick:int=0) -> Dict[str, int]:
         'footer_string_fg': 253,
         'selected_cell_bg': 237,
         'selected_cell_fg': 253,
+        'deselecting_cell_bg': 162,
+        'deselecting_cell_fg': 253,
     },
         ### (1) Black and white
     {
@@ -286,6 +288,9 @@ def get_colours(pick:int=0) -> Dict[str, int]:
         colour["paused_bg"] = colour["background"]
         colour["paused_bg"] = colour["background"]
         # colour["search_bg"] = colour["background"]
+    # tmp = colours[0]
+    # colours[0] = colours[2]
+    # colours[2] = tmp
     if pick > len(colours) - 1:
         return colours[0]
     return colours[pick]

{listpick-0.1.14.10.dist-info → listpick-0.1.14.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.10
+Version: 0.1.14.12
 Summary: Listpick is a powerful TUI data tool for creating TUI apps or viewing/comparing tabulated data.
 Home-page: https://github.com/grimandgreedy/listpick
 Author: Grim

{listpick-0.1.14.10.dist-info → listpick-0.1.14.12.dist-info}/RECORD

@@ -1,14 +1,14 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=SL9lgTIoTYHi3fcs01HFKBoCnxEUMHPkZHxW_nuCFxI,187280
+listpick/listpick_app.py,sha256=w0G2R8XW3tM9MnTWITd4G_amoAbgRBIge1cjHi82RLc,187024
 listpick/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-listpick/ui/build_help.py,sha256=8QtsRosIE2IMagRc_remzmwSWpCurFgLenLL7w1ly94,8949
-listpick/ui/footer.py,sha256=ZM5OWCxOZqy5RG6tFTe1ipvu9PRu6Gh3JCA8KXBR_Wc,15004
+listpick/ui/build_help.py,sha256=3cgthxOOBl9evsgea5gVtIacuwbL68_FmtyWyJK6Re8,10142
+listpick/ui/footer.py,sha256=9oJm95pOCxMEoS7Y-77G3D3dPGK4NnsqPMEAtaOpJco,15087
 listpick/ui/help_screen.py,sha256=zbfGIgb-IXtATpl4_Sx7nPbsnRXZ7eiMYlCKGS9EFmw,5608
 listpick/ui/input_field.py,sha256=ylf3fiLXdAD4pueHWfzIrlwaRb9f5zm8f1UGkEPBxgM,30539
 listpick/ui/keys.py,sha256=7ZhJfsSatpk-jwfXj_FvzgQsQdUoF7JkD5Mniu9XZ0o,13328
 listpick/ui/pane_stuff.py,sha256=7GXa4UnV_7YmBv-baRi5moN51wYcuS4p0odl5C3m0Tc,169
-listpick/ui/picker_colours.py,sha256=FLOzvkq83orrN2bL0Mw-6RugWOZyuwUjQCrUFMUnKGY,11563
+listpick/ui/picker_colours.py,sha256=KUgcgbfSo3azPMRPtv4mNAdwrP0UFqjNbRYEZXnTF4M,11711
 listpick/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/utils/clipboard_operations.py,sha256=ORdNm2kgGbfs51xJSvgJPERgoSmBgT11axuMkvSoP9A,3133
 listpick/utils/config.py,sha256=MEnAZg2Rhfl38XofEIN0uoVAOY7I0ftc79Evk3fOiVw,1654
@@ -25,9 +25,9 @@ listpick/utils/sorting.py,sha256=WZZiVlVA3Zkcpwji3U5SNFlQ14zVEk3cZJtQirBkecQ,532
 listpick/utils/table_to_list_of_lists.py,sha256=XBj7eGBDF15BRME-swnoXyOfZWxXCxrXp0pzsBfcJ5g,12224
 listpick/utils/user_input.py,sha256=oyJZPAwA7UGAclPhdPL44tKnPIVNHWhX-tZEnCdBKC0,4318
 listpick/utils/utils.py,sha256=McOl9uT3jh7l4TIWeSd8ZGjK_e7r0YZF0Gl20yI6fl0,13873
-listpick-0.1.14.10.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.14.10.dist-info/METADATA,sha256=JBhvFd-3BZN7u_19PRPeNos_bXLzEdpAwp5tbUH0_Q8,8091
-listpick-0.1.14.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.14.10.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.14.10.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.14.10.dist-info/RECORD,,
+listpick-0.1.14.12.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.14.12.dist-info/METADATA,sha256=96KlF5-CLZlyrw1h1eXDvMmLINB5iLB3WcR8X_-p-Ls,8091
+listpick-0.1.14.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.14.12.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.14.12.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.14.12.dist-info/RECORD,,