Adding themes "Edit Cursor" field

Author: s-n-g

pyradio/common.py

@@ -20,4 +20,5 @@ def BACKGROUND(): return 1
         ('Stations', 5, 0 ,0),
         ('Active Station', 4, 0, 3),
         ('Normal Cursor', 6, 0, 0),
-        ('Active Cursor', 9, 0, 0) )
+        ('Active Cursor', 9, 0, 0),
+        ('Edit Cursor', 8, 0, 0 ) )

pyradio/edit.py

@@ -240,7 +240,7 @@ def _add_editors(self):
                     box_color = curses.color_pair(9),
                     caption_color = curses.color_pair(4),
                     edit_color = curses.color_pair(9),
-                    cursor_color = curses.color_pair(6),
+                    cursor_color = curses.color_pair(8),
                     unfocused_color = curses.color_pair(5))
                 self._line_editor[ed].bracket = False
 

pyradio/radio.py

@@ -609,7 +609,7 @@ def _give_me_a_search_class(self, operation_mode):
                 box_color = curses.color_pair(5),
                 caption_color = curses.color_pair(4),
                 edit_color = curses.color_pair(5),
-                cursor_color = curses.color_pair(6))
+                cursor_color = curses.color_pair(8))
         self.search = self._search_classes[self._mode_to_search[operation_mode]]
         if self.ws.previous_operation_mode == self.ws.CONFIG_MODE:
             self.search.box_color = curses.color_pair(3)

pyradio/themes.py

@@ -52,10 +52,11 @@ def _do_init_pairs(self):
         curses.init_pair(6, self._active_colors[THEME_ITEMS[5][0]][FOREGROUND()], self._active_colors[THEME_ITEMS[5][0]][BACKGROUND()])
         # status bar
         curses.init_pair(7, self._active_colors[THEME_ITEMS[2][0]][FOREGROUND()], self._active_colors[THEME_ITEMS[2][0]][BACKGROUND()])
-        # search cursor
-        curses.init_pair(8, self._active_colors[THEME_ITEMS[5][0]][BACKGROUND()], self._active_colors[THEME_ITEMS[3][0]][BACKGROUND()])
+        # edit cursor
+        curses.init_pair(8, self._active_colors[THEME_ITEMS[7][0]][FOREGROUND()], self._active_colors[THEME_ITEMS[7][0]][BACKGROUND()])
         # cursor when playing
         curses.init_pair(9, self._active_colors[THEME_ITEMS[6][0]][FOREGROUND()], self._active_colors[THEME_ITEMS[6][0]][BACKGROUND()])
+        logger.error('DE _do_init_pairs:\n{}'.format(self._active_colors))
 
     def restoreActiveTheme(self):
         self._active_colors = deepcopy(self._read_colors)
@@ -136,6 +137,8 @@ def open_theme(self, a_theme = '', a_path=''):
             # help window
             self._colors[THEME_ITEMS[1][0]] = [ curses.COLOR_YELLOW, self._colors[THEME_ITEMS[3][0]][BACKGROUND()] ]
             # calculated value: self._colors['Messages'] = [ self._colors[THEME_ITEMS[4][0]][FOREGROUND()], self._colors[THEME_ITEMS[2][0]][FOREGROUND()] ]
+            # Edit Cursor
+            self._colors[THEME_ITEMS[7][0]] = [ curses.COLOR_WHITE, curses.COLOR_MAGENTA ]
             # info
             self._colors['Colors'] = 8
             self._colors['Name'] = 'dark'
@@ -155,6 +158,8 @@ def open_theme(self, a_theme = '', a_path=''):
             # help window
             self._colors[THEME_ITEMS[1][0]] = [ 11, self._colors[THEME_ITEMS[3][0]][BACKGROUND()] ]
             # calculated value: self._colors['Messages'] = [ self._colors[THEME_ITEMS[4][0]][FOREGROUND()], self._colors[THEME_ITEMS[2][0]][FOREGROUND()] ]
+            # Edit Cursor
+            self._colors[THEME_ITEMS[7][0]] = [ 15, curses.COLOR_MAGENTA ]
             # info
             self._colors['Colors'] = 16
             self._colors['Name'] = 'dark_16_colors'
@@ -174,6 +179,8 @@ def open_theme(self, a_theme = '', a_path=''):
             # help window
             self._colors[THEME_ITEMS[1][0]] = [ curses.COLOR_MAGENTA, self._colors[THEME_ITEMS[3][0]][BACKGROUND()] ]
             # calculated value: self._colors['Messages'] = [ self._colors[THEME_ITEMS[4][0]][FOREGROUND()], self._colors[THEME_ITEMS[2][0]][FOREGROUND()] ]
+            # Edit Cursor
+            self._colors[THEME_ITEMS[7][0]] = [ curses.COLOR_WHITE, curses.COLOR_MAGENTA ]
             # info
             self._colors['Colors'] = 8
             self._colors['Name'] = 'light'
@@ -193,6 +200,8 @@ def open_theme(self, a_theme = '', a_path=''):
             # help window
             self._colors[THEME_ITEMS[1][0]] = [ 13, self._colors[THEME_ITEMS[3][0]][BACKGROUND()] ]
             # calculated value: self._colors['Messages'] = [ self._colors[THEME_ITEMS[4][0]][FOREGROUND()], self._colors[THEME_ITEMS[2][0]][FOREGROUND()] ]
+            # Edit Cursor
+            self._colors[THEME_ITEMS[7][0]] = [ 15, 13 ]
             # info
             self._colors['Colors'] = 16
             self._colors['Name'] = 'light_16_colors'
@@ -212,6 +221,8 @@ def open_theme(self, a_theme = '', a_path=''):
             # help window
             self._colors[THEME_ITEMS[1][0]] = [ 245, self._colors[THEME_ITEMS[3][0]][BACKGROUND()] ]
             # calculated value: self._colors['Messages'] = [ self._colors[THEME_ITEMS[4][0]][FOREGROUND()], self._colors[THEME_ITEMS[2][0]][FOREGROUND()] ]
+            # Edit Cursor
+            self._colors[THEME_ITEMS[7][0]] = [ 15, 238 ]
             # info
             self._colors['Colors'] = 256
             self._colors['Name'] = 'black_on_white'
@@ -231,6 +242,8 @@ def open_theme(self, a_theme = '', a_path=''):
             # help window
             self._colors[THEME_ITEMS[1][0]] = [ 247, self._colors[THEME_ITEMS[3][0]][BACKGROUND()] ]
             # calculated value: self._colors['Messages'] = [ self._colors[THEME_ITEMS[4][0]][FOREGROUND()], self._colors[THEME_ITEMS[2][0]][FOREGROUND()] ]
+            # Edit Cursor
+            self._colors[THEME_ITEMS[7][0]] = [ 15, 247 ]
             # info
             self._colors['Colors'] = 256
             self._colors['Name'] = 'white_on_black'

pyradio/themes/brown_by_sng.pyradio-theme

@@ -5,3 +5,4 @@ Stations = 120,94
 Active Station = 184,94
 Active Cursor = 94,184
 Normal Cursor = 130,112
+Edit Cursor = 130,112

pyradio/themes/pink_by_sng.pyradio-theme

@@ -5,3 +5,4 @@ Stations = 127,219
 Active Station = 199,219
 Active Cursor = 231,201
 Normal Cursor = 123,213
+Edit Cursor = 123,213

pyradio/themes/purple_by_sng.pyradio-theme

@@ -5,3 +5,4 @@ Stations = 195,134
 Active Station = 56,134
 Active Cursor = 226,129
 Normal Cursor = 123,171
+Edit Cursor = 123,171