listpick 0.1.16.6__tar.gz → 0.1.16.8__tar.gz

{listpick-0.1.16.6/src/listpick.egg-info → listpick-0.1.16.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.16.6
+Version: 0.1.16.8
 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.16.6 → listpick-0.1.16.8}/setup.py

@@ -16,7 +16,7 @@ with open("README.md", "r", encoding = "utf-8") as fh:
 
 setuptools.setup(
     name = "listpick",
-    version = "0.1.16.6",
+    version = "0.1.16.8",
     author = "Grim",
     author_email = "grimandgreedy@protonmail.com",
     description = "Listpick is a powerful TUI data tool for creating TUI apps or viewing/comparing tabulated data.",

{listpick-0.1.16.6 → listpick-0.1.16.8}/src/listpick/listpick_app.py

@@ -56,7 +56,7 @@ class Picker:
         stdscr: curses.window, 
         items: list[list[str]] = [],
         cursor_pos: int = 0,
-        colours: dict = get_colours(0),
+        colours: dict = {},
         colour_theme_number: int = 3,
         max_selected: int = -1,
         top_gap: int =0,
@@ -195,7 +195,7 @@ class Picker:
         self.stdscr = stdscr
         self.items = items
         self.cursor_pos = cursor_pos
-        self.colours = colours
+        self.colours = get_colours(colour_theme_number)
         self.colour_theme_number = colour_theme_number
         self.max_selected = max_selected
         self.top_gap = top_gap
@@ -352,6 +352,7 @@ class Picker:
         # Note: We have to set the footer after initialising the picker state so that the footer can use the get_function_data method
         self.footer_options = [StandardFooter(self.stdscr, colours_start, self.get_function_data), CompactFooter(self.stdscr, colours_start, self.get_function_data), NoFooter(self.stdscr, colours_start, self.get_function_data)]
         self.footer = self.footer_options[self.footer_style]
+        self.footer.adjust_sizes(self.term_h, self.term_w)
 
 
 
@@ -385,6 +386,7 @@ class Picker:
                 global COLOURS_SET 
                 COLOURS_SET = False
                 self.colours_end = set_colours(pick=config["general"]["colour_theme_number"], start=1)
+                self.colours = get_colours(config["general"]["colour_theme_number"])
 
         self.logger.info(f"function: set_config()")
         if "general" in config:
@@ -502,11 +504,14 @@ class Picker:
                 self.notification_colours_start = 0
                 self.help_colours_start = 0
 
+        self.colours = get_colours(self.colour_theme_number)
+
 
         debug_levels = [logging.DEBUG, logging.INFO, logging.WARNING, logging.ERROR, logging.CRITICAL]
         dbglvl =  debug_levels[self.debug_level]
         self.logger = setup_logger(name="picker_log", log_file="picker.log", log_enabled=self.debug, level =dbglvl)
         self.logger.info(f"Initialiasing Picker.")
+        self.update_term_size()
         # self.notification(self.stdscr, message=repr(self.logger))
 
 
@@ -1580,7 +1585,7 @@ class Picker:
 
         self.logger.info(f"function: notification()")
         """ Notification box. """
-        notification_width, notification_height = 50, 7
+        notification_width, notification_height = min(self.term_w-4, 50), 7
         message_width = notification_width-5
 
         if not message: message = "!!"
@@ -1595,7 +1600,7 @@ class Picker:
         while True:
             self.update_term_size()
 
-            submenu_win = curses.newwin(notification_height, notification_width, 3, self.term_w - (notification_width+4))
+            submenu_win = curses.newwin(notification_height, notification_width, 3, self.term_w - (notification_width+2))
             notification_data = {
                 "items": submenu_items,
                 "title": title,
@@ -1808,6 +1813,7 @@ class Picker:
                         set_colours(self.colour_theme_number)
                         self.draw_screen()
                         self.notification(self.stdscr, message=f"Theme {self.colour_theme_number} applied.")
+                    self.colours = get_colours(self.colour_theme_number)
 
                 else:
                     self.user_settings = ""
@@ -2394,6 +2400,9 @@ class Picker:
         self.logger.info(f"function: run()")
 
         if self.get_footer_string_startup and self.footer_string_refresh_function != None:
+            self.footer_string = " "
+            self.footer.adjust_sizes(self.term_h, self.term_w)
+            self.draw_screen()
             self.footer_string = self.footer_string_refresh_function()
 
         self.initialise_variables(get_data=self.get_data_startup)

{listpick-0.1.16.6 → listpick-0.1.16.8}/src/listpick/ui/build_help.py

@@ -68,7 +68,7 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
 
     ## Key descriptions
     help_descriptions = {
-        "refresh":                          "Refresh the screen.",
+        "refresh":                          "Refresh data.",
         "help":                             "Open help.",
         "exit":                             "Exit picker instance.",
         "full_exit":                        "Immediate exit to terminal.",
@@ -119,7 +119,7 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
         "col_hide":                         "Hide column.",
         "edit":                             "Edit cell.",
         "edit_picker":                      "Edit cell from options dialogue.",
-        "edit_ipython":                     "Edit current data with ipython.",
+        "edit_ipython":                     "Drop to ipython shell with environment as `self`",
         "copy":                             "Copy selections.",
         "paste":                            "Paste into picker.",
         "save":                             "Save selections.",
@@ -153,9 +153,9 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
         "UI:": [ "toggle_footer", "redraw_screen", "decrease_lines_per_page", "increase_lines_per_page", "increase_column_width", "decrease_column_width", "notification_toggle", "toggle_right_pane", "cycle_right_pane"],
         "Sort:": [ "cycle_sort_method", "cycle_sort_method_reverse", "cycle_sort_order", ] ,
         "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", "search_input", "continue_search_forward", "continue_search_backward", ] ,
+        "Filter and search:": [ "filter_input", "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" ],
+        "Options and modes:": [ "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" ],
         "Misc:": [ "redo", "undo", "refresh", "help", "exit", "full_exit", "move_column_left", "move_column_right" ],
     }

{listpick-0.1.16.6 → listpick-0.1.16.8}/src/listpick/ui/keys.py

@@ -104,8 +104,8 @@ help_keys = {
     "page_down":                        [curses.KEY_NPAGE, 6],
     "cursor_bottom":                    [ord('G'), curses.KEY_END],
     "cursor_top":                       [ord('g'), curses.KEY_HOME],
-    "five_up":                          [ord('K')],
-    "five_down":                        [ord('J')],
+    "five_up":                          [ord('K'), keycodes.META_k],
+    "five_down":                        [ord('J'), keycodes.META_j],
     "redraw_screen":                    [12], # Ctrl+l
     "cycle_sort_method":                [ord('s')],
     "cycle_sort_method_reverse":        [ord('S')],

{listpick-0.1.16.6 → listpick-0.1.16.8/src/listpick.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.16.6
+Version: 0.1.16.8
 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