listpick 0.1.13.25__py3-none-any.whl → 0.1.13.27__py3-none-any.whl

listpick/listpick_app.py

@@ -318,12 +318,14 @@ 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.get_function_data()
         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 = CompactFooter(self.stdscr, colours_start, self.get_function_data)
 
 
+
     def calculate_section_sizes(self):
         """
         Calculte the following for the Picker:
@@ -598,6 +600,8 @@ class Picker:
             else:
                 self.cursor_pos = 0
         
+        if self.display_infobox:
+            self.infobox_picker = self.infobox(self.stdscr, self.infobox_items, self.infobox_title)
 
 
     def move_column(self, direction: int) -> None:
@@ -988,15 +992,23 @@ class Picker:
         ## Display infobox
         if self.display_infobox:
             # self.stdscr.refresh()
-            self.infobox(self.stdscr, message=self.infobox_items, title=self.infobox_title)
+            # self.infobox(self.stdscr, message=self.infobox_items, title=self.infobox_title)
+            
+            infobox_width, infobox_height = w//2, 3*h//5
+            infobox_x, infobox_y = w - (infobox_width + 4), 3
+            self.infobox_picker.stdscr.mvwin(infobox_y, infobox_x)
+            self.infobox_picker.stdscr.resize(infobox_height, infobox_width)
+            self.infobox_picker.run()
+            self.infobox_picker.stdscr.noutrefresh()
+        else:
+            self.stdscr.noutrefresh()
 
-        # if not self.display_only:
-        #     self.stdscr.refresh()
-            # self.stdscr.timeout(2000)  # timeout is set to 50 in order to get the infobox to be displayed so here we reset it to 2000
 
+        if not self.display_only:
+            curses.doupdate()
 
 
-    def infobox(self, stdscr: curses.window, message: str ="", title: str ="Infobox",  colours_end: int = 0, duration: int = 4) -> curses.window:
+    def infobox(self, stdscr: curses.window, message: list =[], title: str ="Infobox",  colours_end: int = 0, duration: int = 4):
         """ Display non-interactive infobox window. """
 
         self.logger.info(f"function: infobox()")
@@ -1004,6 +1016,7 @@ class Picker:
         notification_width, notification_height = w//2, 3*h//5
         message_width = notification_width-5
 
+        notification_x, notification_y = w-(notification_width+4), 3
         if not message: message = "!!"
         if isinstance(message, str):
             submenu_items = ["  "+message[i*message_width:(i+1)*message_width] for i in range(len(message)//message_width+1)]
@@ -1019,10 +1032,7 @@ class Picker:
         # while True:
         h, w = stdscr.getmaxyx()
 
-        # submenu_win = curses.newwin(notification_height, notification_width, 3, w - (notification_width+4))
-        submenu_win = self.stdscr.subpad(notification_height, notification_width, 3, w - (notification_width+4))
-        submenu_win.erase()
-        # submenu_win.untouchwin()
+        submenu_win = self.stdscr.derwin(notification_height, notification_width, 3, w - (notification_width+4))
         infobox_data = {
             "items": submenu_items,
             "colours": notification_colours,
@@ -1036,12 +1046,9 @@ class Picker:
             "title": title,
             "reset_colours": False,
         }
-
-        # for i in range(3, 3+notification_height):
-        #     self.stdscr.addstr(i, w - (notification_width+4), ' '*notification_width, curses.color_pair(4))
+        submenu_win.noutrefresh()
         OptionPicker = Picker(submenu_win, **infobox_data)
-        s, o, f = OptionPicker.run()
-        submenu_win.refresh()
+        return OptionPicker
 
 
     def get_function_data(self) -> dict:
@@ -1182,7 +1189,6 @@ class Picker:
         self.selections = {i:False for i in range(len(self.indexed_items))}
         self.cursor_pos = min(self.cursor_pos, len(self.indexed_items)-1)
         self.initialise_variables()
-        self.draw_screen(self.indexed_items, self.highlights)
 
 
     def choose_option(
@@ -1480,7 +1486,6 @@ class Picker:
         """ Toggle selection of item at index. """
         self.logger.info(f"function: toggle_item()")
         self.selections[index] = not self.selections[index]
-        self.draw_screen(self.indexed_items, self.highlights)
 
     def select_all(self) -> None:
         """ Select all in indexed_items. """
@@ -1492,10 +1497,6 @@ class Picker:
         for row in range(len(self.indexed_items)):
             self.selected_cells_by_row[row] = list(range(len(self.indexed_items[row][1])))
 
-
-
-        self.draw_screen(self.indexed_items, self.highlights)
-
     def deselect_all(self) -> None:
         """ Deselect all items in indexed_items. """
         self.logger.info(f"function: deselect_all()")
@@ -1504,7 +1505,6 @@ class Picker:
         for i in self.cell_selections.keys():
             self.cell_selections[i] = False
         self.selected_cells_by_row = {}
-        self.draw_screen(self.indexed_items, self.highlights)
 
     def handle_visual_selection(self, selecting:bool = True) -> None:
         """ Toggle visual selection or deselection. """
@@ -1548,8 +1548,6 @@ class Picker:
             self.end_selection = -1
             self.is_selecting = False
 
-            self.draw_screen(self.indexed_items, self.highlights)
-
         elif self.is_deselecting:
             self.end_selection = self.indexed_items[self.cursor_pos][0]
             self.end_selection = self.cursor_pos
@@ -1581,7 +1579,6 @@ class Picker:
             self.start_selection = -1
             self.end_selection = -1
             self.is_deselecting = False
-            self.draw_screen(self.indexed_items, self.highlights)
 
     def cursor_down(self, count=1) -> bool:
         """ Move cursor down. """
@@ -1936,7 +1933,7 @@ class Picker:
         # curses.curs_set(0)
         # stdscr.nodelay(1)  # Non-blocking input
         # stdscr.timeout(2000)  # Set a timeout for getch() to ensure it does not block indefinitely
-        self.stdscr.timeout(max(min(2000, int(self.timer*1000)//2, int(self.footer_timer*1000))//2, 20))  # Set a timeout for getch() to ensure it does not block indefinitely
+        # self.stdscr.timeout(max(min(2000, int(self.timer*1000)//2, int(self.footer_timer*1000))//2, 20))  # Set a timeout for getch() to ensure it does not block indefinitely
         
         if self.clear_on_start:
             self.stdscr.clear()
@@ -1953,8 +1950,6 @@ class Picker:
         self.draw_screen(self.indexed_items, self.highlights)
 
         if self.display_only:
-            # self.stdscr.refresh()
-            # function_data = self.get_function_data()
             return [], "", {}
 
         # Main loop
@@ -1975,15 +1970,18 @@ class Picker:
 
                         initial_time = time.time()
 
-                        self.draw_screen(self.indexed_items, self.highlights, clear=False)
+                        try:
+                            self.draw_screen(self.indexed_items, self.highlights, clear=False)
+                        except:
+                            pass
 
                         self.refreshing_data = False
                         self.data_ready = False
 
             elif self.check_key("refresh", key, self.keys_dict) or self.remapped_key(key, curses.KEY_F5, self.key_remappings) or (self.auto_refresh and (time.time() - initial_time) >= self.timer):
                 self.logger.debug(f"Get new data (refresh).")
-                self.stdscr.addstr(0,w-3,"  ", curses.color_pair(self.colours_start+21) | curses.A_BOLD)
-                self.stdscr.refresh()
+                # self.stdscr.addstr(0,w-3,"  ", curses.color_pair(self.colours_start+21) | curses.A_BOLD)
+                # self.stdscr.refresh()
                 if self.get_new_data and self.refresh_function:
                     self.refreshing_data = True
 
@@ -2889,7 +2887,7 @@ class Picker:
                 self.stdscr.clear()
                 self.stdscr.refresh()
                 self.initialise_variables()
-                self.draw_screen(self.indexed_items, self.highlights)
+                # self.draw_screen(self.indexed_items, self.highlights)
 
 
 
@@ -3158,9 +3156,10 @@ def main() -> None:
     function_data["centre_in_terminal_vertical"] = True
     function_data["highlight_full_row"] = True
     function_data["pin_cursor"] = True
-    # function_data["display_infobox"] = True
-    # function_data["infobox_items"] = [["1"], ["2"], ["3"]]
-    # function_data["infobox_title"] = "Title"
+    function_data["display_infobox"] = True
+    function_data["infobox_items"] = [["1"], ["2"], ["3"]]
+    function_data["infobox_title"] = "Title"
+    function_data["footer_string"] = "Title"
 
 
     # function_data["debug"] = True

listpick/ui/footer.py

@@ -50,6 +50,9 @@ class StandardFooter(Footer):
     def draw(self, h, w):
         state = self.get_state()
         # Fill background
+        if "footer_string" in state and state["footer_string"]: self.height = 3
+        else: self.height = 2
+
         for i in range(self.height):
             self.stdscr.addstr(h-self.height+i, 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
 
@@ -63,19 +66,14 @@ class StandardFooter(Footer):
         
             picker_info_y = h-3
             sort_info_y = h-2
-            self.height = 3
-
         else:
             picker_info_y = h-2
             sort_info_y = h-1
-            ""
             select_mode = "C"
             if state["is_selecting"]: select_mode = "VS"
             elif state["is_deselecting"]: select_mode = "VDS"
             if state["pin_cursor"]: select_mode = f"{select_mode} "
             self.stdscr.addstr(h - 1, w-35, f"{select_mode:>33} ", curses.color_pair(self.colours_start+20))
-            self.height = 2
-
 
         if state["filter_query"]:
             self.stdscr.addstr(h - 2, 2, f" Filter: {state['filter_query']} "[:w-40], curses.color_pair(self.colours_start+20) | curses.A_BOLD)

{listpick-0.1.13.25.dist-info → listpick-0.1.13.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.13.25
+Version: 0.1.13.27
 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.13.25.dist-info → listpick-0.1.13.27.dist-info}/RECORD

@@ -1,9 +1,9 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=WooRDRtXporfAaKzR_2M0xxLbbiodBCw0ToO8Jm_mRs,164195
+listpick/listpick_app.py,sha256=oSbKJFzg8gea8EMXmJa7_7UAoAXBZ7--Kt-yBui_RLk,164021
 listpick/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/ui/build_help.py,sha256=_rVKKrX3HfFJtw-pyeNb2lQWbml4-AAw8sZIUYGn97Y,8731
-listpick/ui/footer.py,sha256=s1L68MNmhWwbWRy0mn0ChmnE_dMQBAzNlTv917pyHE0,10673
+listpick/ui/footer.py,sha256=4PO7gS-NSk6zfc2DAwSFPU6Ch_HYfu0L_57u93zfyjk,10711
 listpick/ui/help_screen.py,sha256=zbfGIgb-IXtATpl4_Sx7nPbsnRXZ7eiMYlCKGS9EFmw,5608
 listpick/ui/input_field.py,sha256=eyoWHoApdZybjfXcp7Eth7xwb-C-856ZVnq5j_Q3Ojs,30412
 listpick/ui/keys.py,sha256=TzaadgBP_rC7jbp--RFJZDOkHd0EB4K1wToDTiVs6CI,13029
@@ -23,9 +23,9 @@ listpick/utils/searching.py,sha256=Xk5UIqamNHL2L90z3ACB_Giqdpi9iRKoAJ6pKaqaD7Q,3
 listpick/utils/sorting.py,sha256=WZZiVlVA3Zkcpwji3U5SNFlQ14zVEk3cZJtQirBkecQ,5329
 listpick/utils/table_to_list_of_lists.py,sha256=T-i-nV1p6g8UagdgUPKrhIGpKY_YXZDxf4xZzcPepNA,7635
 listpick/utils/utils.py,sha256=8nsjjTDQH13tHTU93YcKklLQ_uuMAz-rbDTmao83T4Q,12783
-listpick-0.1.13.25.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.13.25.dist-info/METADATA,sha256=nVxF7NSl9aZm9jyIpR9KcPlA_kvqFfEDoFMoZgm4fc8,7988
-listpick-0.1.13.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.13.25.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.13.25.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.13.25.dist-info/RECORD,,
+listpick-0.1.13.27.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.13.27.dist-info/METADATA,sha256=n4VSEQvyg6jXBLT3Yp2ifBrUsEnMhKh_iW-WisQBuPg,7988
+listpick-0.1.13.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.13.27.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.13.27.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.13.27.dist-info/RECORD,,