- Localized window: fixing letters and buttons placement

- Fixing a bug which would fail to read profiles when saving the volume

Author: s-n-g

pyradio/common.py

@@ -976,10 +976,11 @@ def save_volume(self, player_name, profile_name, volume):
             return self.append_to_config(player_name, profile_name, 'volume=' + str(volume))
 
         else:
-            config_string = self._read_a_config_file(config_file)
+            config_list = self._read_a_config_file(config_file)
+            config_string = ''.join(config_list)
             # logger.error(f'{config_file = }')
-            # logger.error(f'before remove {config_string = }')
-            if '[' + profile_name + ']' in config_string:
+            # logger.error(f'before remove {config_list = }')
+            if any(line.strip() == '[' + profile_name + ']' for line in config_list):
                 if logger.isEnabledFor(logging.DEBUG):
                     logger.debug('[{}] profile found!\n\n'.format(profile_name))
                 config_list = remove_consecutive_empty_lines(config_string.split('\n'))

pyradio/config_window.py

@@ -4674,7 +4674,8 @@ def show(self, parent=None, reset=False):
                 color_focused=curses.color_pair(9),
                 color=curses.color_pair(4),
                 bracket_color=curses.color_pair(5),
-                parent=self._win
+                parent=self._win,
+                pad=2
             )
             self._h_buttons.calculate_buttons_position()
             self._widgets[2], self._widgets[3] = self._h_buttons.buttons
@@ -4684,8 +4685,8 @@ def show(self, parent=None, reset=False):
             self._b_ok.focused = self._b_cancel.focused = False
         else:
             self._h_buttons.calculate_buttons_position(parent=self._win)
-
         self._win.refresh()
+
         for i in range(len(self._widgets)):
             try:
                 self._widgets[i].show(parent=self._parent)
@@ -4697,6 +4698,20 @@ def show(self, parent=None, reset=False):
                         pass
             except AttributeError:
                 pass
+        # if parent_Y - (self._widgets[-1].Y + 1) > 5:
+        #     logger.error('I can print help')
+        #     Y = self._widgets[-1].Y + 2
+        #     X = self._widgets[1].left_pad + 2
+        #     self._win.addstr(Y, X, self._widgets[1].active_width * '─', curses.color_pair(12))
+        #     self._win.addstr(Y, self._widgets[1].left_pad + int((self._widgets[1].active_width - len(' Help '))/2), ' Help ', curses.color_pair(4))
+        #     Y += 1
+        #     self._win.addstr(Y, X, 'asdasd ads asd as', curses.color_pair(5))
+        #     self._win.refresh()
+        #     for i in range(len(self._widgets)):
+        #         try:
+        #             self._widgets[i].show()
+        #         except:
+        #             pass
 
     def _update_focus(self):
         for i in range(len(self._widgets)):
@@ -4852,8 +4867,6 @@ def keypress(self, char):
             if self.editing:
                 letter = get_kb_letter()
                 if letter:
-                    if logger.isEnabledFor(logging.DEBUG):
-                        logger.debug('setting letter "{}": "{}"'.format(self._widgets[1].selected_letter, letter))
                     self._widgets[1].set_letter(letter)
                     # self._files[self._widgets[0].selection][-1] = self._widgets[1].letters_dict
                     self._set_ok_enabled()

pyradio/keyboard.py

@@ -993,6 +993,14 @@ def selection(self):
     def selection(self, value):
         self._selection = value
 
+    @property
+    def left_pad(self):
+        return self._left_pad
+
+    @property
+    def active_width(self):
+        return self._num_letters_per_line * self._letter_width
+
     def _show_editing(self):
         if self.editing:
             self._win.addstr(

pyradio/radio.py

@@ -2305,8 +2305,8 @@ def run(self):
                     if letter:
                         # set_kb_letter(letter)  # Save the decoded letter
                         # Call keypress for single-byte shortcuts
-                        if logger.isEnabledFor(logging.DEBUG):
-                            logger.debug('I have a letter!')
+                        # if logger.isEnabledFor(logging.DEBUG):
+                        #     logger.debug('I have a letter!')
                         if len(input_queue) == 0:  # Single-byte input
                             ret = self.keypress(c)  # Handle shortcut
                             if ret == -1:
@@ -2315,8 +2315,8 @@ def run(self):
                             # Set remaining_keys based on input_queue length for multi-byte input
                             remaining_keys = len(input_queue)
                     else:
-                        if logger.isEnabledFor(logging.DEBUG):
-                            logger.debug('I do NOT have a letter!')
+                        # if logger.isEnabledFor(logging.DEBUG):
+                        #     logger.debug('I do NOT have a letter!')
                         # Single-byte character or invalid input
                         ret = self.keypress(c)  # Handle shortcut
                         if ret == -1:

pyradio/simple_curses_widgets.py

@@ -3468,7 +3468,8 @@ def __init__(self, Y, captions,
                  bracket_color, constant_width=0,
                  parent = None,
                  focused=0,
-                 left_or_right_margin = 2):
+                 left_or_right_margin = 2,
+                 pad = 0):
         '''Initialize the wizard.
 
         Parameters
@@ -3499,6 +3500,7 @@ def __init__(self, Y, captions,
         '''
 
         self._buttons = []
+        self._pad = pad
         for n in captions:
             self._buttons.append(SimpleCursesPushButton(
                 Y=Y, X=0,
@@ -3556,7 +3558,7 @@ def show(self, parent=None, orientation='center', show=True):
             X = self._X
             Y = self._Y + offY
             for n in self._buttons:
-                n.mvwin(Y, X, show)
+                n.mvwin(Y, X + self._pad, show)
                 X += n.width + 2
 
     def calculate_buttons_position(self, parent=None, orientation='center'):