adding System / User title to theme window

Author: s-n-g

README.html

@@ -233,6 +233,7 @@ <h2 id="pyradio-themes">PyRadio Themes</h2>
 <li><strong>white_on_black</strong> or <strong>wob</strong> (256 color b&amp;w theme). A theme for dark terminal background settings.</li>
 <li><strong>black_on_white</strong> or <strong>bow</strong> (256 color b&amp;w theme). A theme for light terminal background settings.</li>
 </ol>
+<p>and three 256-color system themes (these are actual files saved in the <strong>themes</strong> installation directory): 1. <strong>brown_by_sng</strong>, <strong>pink_by_sng</strong> and <strong>purple_by_sng</strong>.</p>
 <p>The visual result of an applied theme greatly depends on the terminal settings (e.g. foreground and background color settings, palette used, number of colors supported, real or pseudo-transparency support, etc.)</p>
 <p>Pressing “<strong>t</strong>” will bring up the <em>Theme selection window</em>, which can be used to activate a theme and set the default one.</p>
 <p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> Themes that use more colors than those supported by the terminal in use, will not be present in the <em>Theme selection window</em>. Furthermore, if a such at theme is set as default (or requested using the “<strong>-t</strong>” command line option), <strong>PyRadio</strong> will silently fall-back to the “<strong>dark</strong>” theme (or the “<strong>light</strong>” theme, if the terminal supports 8 colors and default theme is set to “<em>light_16_colors</em>”).</p>

README.md

@@ -332,6 +332,8 @@ Example:
 5. **white_on_black** or **wob** (256 color b&w theme). A theme for dark terminal background settings.
 6. **black_on_white** or **bow** (256 color b&w theme). A theme for light terminal background settings.
 
+and three 256-color system themes (these are actual files saved in the **themes** installation directory): 1. **brown_by_sng**, **pink_by_sng** and **purple_by_sng**.
+
 The visual result of an applied theme greatly depends on the terminal settings (e.g. foreground and background color settings, palette used, number of colors supported, real or pseudo-transparency support, etc.)
 
 Pressing "**t**" will bring up the *Theme selection window*, which can be used to activate a theme and set the default one.

pyradio.1

@@ -239,7 +239,7 @@ Since we know \fBall stations\fR must comprise the third (encoding) column, we a
 \fIStation1\fB,\fIStation1_URL\fB,
 
 .PP
-This way we add an empty encoding, forcing 
+This way we add an empty encoding, forcing
 .PP
 Finally, we insert the new station to the playlist:
 
@@ -358,6 +358,9 @@ A theme for dark terminal background settings.
 .IP \fBblack_on_white\fR\ or\ \fBbow\fR\ (256\ color\ b&w\ theme)
 A theme for light terminal background settings.
 
+.PP
+and three 256-color system themes (these are actual files saved in the \fIthemes\fR installation directory): \fBbrown_by_sng\fR, \fBpink_by_sng\fR and \fBpurple_by_sng\fR.
+
 .PP
 The visual result of an applied theme greatly depends on the terminal settings (e.g. foreground and background color settings, palette used, number of colors supported, real or pseudo-transparency support, etc.)
 
@@ -375,7 +378,7 @@ The use of custom themes and theme editing is not implemented yet; theses are fe
 
 \fBpyradio\fR themes are able to be used with a transparent background.
 
-Pressing "\fBT\fR"  will toggle the transparency setting (it is \fIoff\fR by default) and save this state in \fBpyradio\fR's configuration file. 
+Pressing "\fBT\fR"  will toggle the transparency setting (it is \fIoff\fR by default) and save this state in \fBpyradio\fR's configuration file.
 
 Setting transparency on, will actually force \fBpyradio\fR to not use its own background color, effectively making it to display whatever is on the terminal (color/picture/transparency). The visual result depends on terminal settings and whether a compositor is running.
 

pyradio/radio.py

@@ -1169,11 +1169,10 @@ def _print_save_playlist_error_2(self):
 
     def _print_ask_to_create_theme(self):
         txt ='''You have requested to edit a |read-only| theme,
-            which is not possible.
+            which is not possible. Do you want to create a
+            new theme instead?
 
-            Do you want to create a new theme instead?
-
-            Press "|y|" to accept or "|n|" to reject'''
+            Press "|y|" to accept or any other key to cancel.'''
         self._show_help(txt, ASK_TO_CREATE_NEW_THEME_MODE,
                 caption = ' Read-only theme ',
                 prompt = ' ',
@@ -1430,9 +1429,9 @@ def _redisplay_transient_window(self):
                 self._show_theme_selector_from_config()
             else:
                 self._show_theme_selector()
-            self._print_ask_to_create_theme()
             if self.theme_forced_selection:
                 self._theme_selector.set_theme(self.theme_forced_selection)
+            self._print_ask_to_create_theme()
 
     def play_random(self):
         # Pick a random radio station
@@ -1757,14 +1756,13 @@ def keypress(self, char):
                 #else:
                 #    """ error """
                 #    self._print_foreign_playlist_copy_error()
-            elif char in (ord('n'), ):
-                self.operation_mode = THEME_MODE
-                self.refreshBody()
-                if logger.isEnabledFor(logging.DEBUG):
-                    logger.debug('MODE: Cancel ASK_TO_CREATE_NEW_THEME_MODE -> THEME_MODE')
             elif not char in (ord('#'), curses.KEY_RESIZE):
-                # Do this here to properly resize
-                return
+                    self.operation_mode = THEME_MODE
+                    self.refreshBody()
+                    if logger.isEnabledFor(logging.DEBUG):
+                        logger.debug('MODE: Cancel ASK_TO_CREATE_NEW_THEME_MODE -> THEME_MODE')
+                    # Do this here to properly resize
+                    return
 
         elif self.operation_mode == THEME_MODE:
             if char not in (ord('m'), ord('v'), ord('.'),

pyradio/themes.py

@@ -351,6 +351,7 @@ class PyRadioThemeSelector(object):
     selection = _selection = _start_pos = _items = 0
 
     _themes = []
+    _title_ids = []
 
     # display the 2 internal 8 color themes
     _items = 2
@@ -421,6 +422,7 @@ def show(self):
         if themes_to_add:
             self._themes.extend(themes_to_add)
             self._items = len(self._themes)
+            self._get_titles_ids()
 
         for a_theme in self._themes:
             if len(a_theme[0]) > self._max_title_width:
@@ -439,18 +441,34 @@ def _scan_for_theme_files(self, cnf_path, user_themes_first=False):
                 path.join(cnf_path, 'themes') ]
         if user_themes_first:
             theme_dirs.reverse()
-        for theme_dir in theme_dirs:
+        for i, theme_dir in enumerate(theme_dirs):
             logger.error('DE theme_dir = "{}"'.format(theme_dir))
             files = glob.glob(path.join(theme_dir, '*.pyradio-theme'))
             logger.error('DE {}'.format(files))
             if files:
+                tmp_themes = []
                 for a_file in files:
                      theme_name, ret = self._can_use_theme(a_file)
                      if ret:
-                         out_themes.append([ theme_name, a_file ])
+                         tmp_themes.append([ theme_name, a_file ])
+                if tmp_themes:
+                    tmp_themes.sort()
+                    tmp_themes.reverse()
+                    if i == 0:
+                        tmp_themes.append(['System Themes', '-'])
+                    else:
+                        tmp_themes.append(['User Themes', '-'])
+                    tmp_themes.reverse()
+                    out_themes.extend(tmp_themes)
         logger.error('DE {}'.format(out_themes))
         return out_themes
 
+    def _get_titles_ids(self):
+        for i, a_theme in enumerate(self._themes):
+            if a_theme[1] == '-':
+                self._title_ids.append(i)
+        logger.info('DE self._title_ids = {}'.format(self._title_ids))
+
     def _can_use_theme(self, a_theme):
         """ Check if theme name contains number of colors.
             If so, check if the theme can be used on this terminal
@@ -545,7 +563,7 @@ def _get_metrics(self):
 
         self._page_jump = int(self._items / 2)
         self._win = None
-        self._win=curses.newwin(self._height, self._width, self.Y, self.X)
+        self._win = curses.newwin(self._height, self._width, self.Y, self.X)
         self._win.bkgdset(' ', curses.color_pair(self._box_color_pair))
         #self._win.erase()
         self._draw_box()
@@ -608,7 +626,9 @@ def refresh(self):
             self.log('{}\n'.format(self._themes))
         for i in range(self._start_pos, self._start_pos + self._items):
             token = ' '
-            if self._start_pos + i == self.selection:
+            if i in self._title_ids:
+                col = curses.color_pair(self._title_color_pair)
+            elif self._start_pos + i == self.selection:
                 # on selection, display cursor
                 if self._selection == self._applied_theme:
                     col = curses.color_pair(self._applied_cursor_color_pair)
@@ -622,7 +642,27 @@ def refresh(self):
             self._win.hline(i + 1, 1, ' ', self._max_title_width + 2, col)
             if self._start_pos + i == self._config_theme:
                 token = '*'
-            self._win.addstr(i+1, 1, token + self._themes[i][0], col)
+            if i in self._title_ids:
+                self._win.move(i + 1, 0)
+                try:
+                    self._win.addstr('├', curses.color_pair(3))
+                    self._win.move(i + 1, len(self._themes[i][0]) + 3)
+                    self._win.addstr('─' * (self._width - 2 - len(self._themes[i][0]) - 2), curses.color_pair(3))
+                    try:
+                        self._win.addstr('┤', curses.color_pair(3))
+                    except:
+                        pass
+                except:
+                    self._win.addstr('├'.encode('utf-8'), curses.color_pair(3))
+                    self._win.move(i + 1, len(self._themes[i][0]) + 2)
+                    self._win.addstr('─'.encode('utf-8') * (self._width - 2 - len(self._themes[i][0]) - 2), curses.color_pair(3))
+                    try:
+                        self._win.addstr('┤'.encode('utf-8'), curses.color_pair(3))
+                    except:
+                        pass
+                self._win.addstr(i+1, 1, token + self._themes[i][0], col)
+            else:
+                self._win.addstr(i+1, 1, token + self._themes[i][0], col)
 
         try:
             self._win.move(sel, self._width - 2)
@@ -632,7 +672,8 @@ def refresh(self):
         if self._transparent:
             self._win.addstr(self._height-1, self._width -4, '[T]', curses.color_pair(self._box_color_pair))
         else:
-            self._draw_box()
+            pass
+            #self._draw_box()
         self._win.refresh()
         curses.doupdate()
 
@@ -643,6 +684,8 @@ def _draw_box(self):
 
     def _go_up(self):
         self._selection -= 1
+        if self._selection in self._title_ids:
+            self._selection -= 1
         if self._selection < 0:
             self.selection = len(self._themes) - 1
         elif self._selection == self._start_pos -1:
@@ -651,6 +694,8 @@ def _go_up(self):
 
     def _go_down(self):
         self._selection += 1
+        if self._selection in self._title_ids:
+            self._selection += 1
         if self._selection == len(self._themes):
             self.selection = 0
         elif self._selection == self._start_pos + self._items:
@@ -739,12 +784,16 @@ def keypress(self, char):
                 self._go_end()
             else:
                 num = int(self.jumpnr) - 1
+                if num in self._title_ids:
+                    num += 1
                 if num >= 0:
                     self.selection = num
                     self.jumpnr = ''
         elif char in (curses.KEY_NPAGE, ):
             self.jumpnr = ''
             sel = self._selection + self._page_jump
+            if sel in self._title_ids:
+                sel += 1
             if self._selection == len(self._themes) - 1:
                 sel = 0
             elif sel >= len(self._themes):
@@ -753,6 +802,8 @@ def keypress(self, char):
         elif char in (curses.KEY_PPAGE, ):
             self.jumpnr = ''
             sel = self._selection - self._page_jump
+            if sel in self._title_ids:
+                sel -= 1
             if self._selection == 0:
                 sel = len(self._themes) - 1
             elif sel < 0: