Skip to content

Commit 18ac782

Browse files
committed
"T" key will not work on Config window (or its children)
1 parent 4b77b8c commit 18ac782

File tree

3 files changed

+18
-22
lines changed

3 files changed

+18
-22
lines changed

Changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
2019-03-30 s-n-g
2-
* Minimum python version supported changed. Now it's 2.7+/3.5+
2+
* Minimum python version supported changed. Now it's 2.7+/3.5+
33

44
2019-02-14 s-n-g
55

pyradio/config_window.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ def keypress(self, char):
321321
self._config_options[sel][1] = not self._config_options[sel][1]
322322
self.refresh_selection()
323323
elif sel == 'use_transparency':
324-
self._toggle_transparency_function()
324+
self._toggle_transparency_function(changed_from_config_window=True)
325325
self.refresh_selection()
326326
return -1, []
327327

pyradio/radio.py

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -857,9 +857,7 @@ def _show_theme_help(self):
857857
Esc|/|q|/|Left|/|h |Close window.
858858
%_Player Keys_
859859
-|/|+| or |,|/|. |Change volume.
860-
m v ||M|ute player / |S|ave volume (not in vlc).
861-
%_Other Keys_
862-
T |Toggle transparency."""
860+
m v ||M|ute player / |S|ave volume (not in vlc)."""
863861
self._show_help(txt, mode_to_set=THEME_HELP_MODE, caption=' Themes Help ')
864862
if logger.isEnabledFor(logging.DEBUG):
865863
logger.debug('MODE = THEME_HELP_MODE')
@@ -906,9 +904,7 @@ def _show_config_playlist_help(self):
906904
Esc|/|q|/|Left|/|h |Canel.
907905
%_Player Keys_
908906
-|/|+| or |,|/|. |Change volume.
909-
m v ||M|ute player / |S|ave volume (not in vlc).
910-
%_Other Keys_
911-
T |Toggle transparency."""
907+
m v ||M|ute player / |S|ave volume (not in vlc)."""
912908
self._show_help(txt, mode_to_set=SELECT_PLAYLIST_HELP_MODE, caption=' Playlist Selection Help ')
913909
if logger.isEnabledFor(logging.DEBUG):
914910
logger.debug('MODE = SELECT_PLAYLIST_HELP_MODE')
@@ -924,9 +920,7 @@ def _show_config_station_help(self):
924920
Esc|/|q|/|Left|/|h |Canel.
925921
%_Player Keys_
926922
-|/|+| or |,|/|. |Change volume.
927-
m v ||M|ute player / |S|ave volume (not in vlc).
928-
%_Other Keys_
929-
T |Toggle transparency."""
923+
m v ||M|ute player / |S|ave volume (not in vlc)."""
930924
self._show_help(txt, mode_to_set=SELECT_STATION_HELP_MODE, caption=' Station Selection Help ')
931925
if logger.isEnabledFor(logging.DEBUG):
932926
logger.debug('MODE = SELECT_STATION_HELP_MODE')
@@ -1308,17 +1302,19 @@ def play_random(self):
13081302
self._put_selection_in_the_middle(force=True)
13091303
self.refreshBody()
13101304

1311-
def _toggle_transparency(self):
1312-
self._theme.toggleTransparency()
1313-
if self.operation_mode == THEME_MODE:
1314-
self._theme_slector.transparent = self._theme.getTransparency()
1315-
self.headWin.refresh()
1316-
self.bodyWin.refresh()
1317-
self.footerWin.refresh()
1318-
self.cnf.use_transparency = self._theme.getTransparency()
1319-
if self._config_win:
1320-
self._config_win._config_options['use_transparency'][1] = self.cnf.use_transparency
1321-
self._config_win._saved_config_options['use_transparency'][1] = self.cnf.use_transparency
1305+
def _toggle_transparency(self, changed_from_config_window=False):
1306+
if self.window_mode == CONFIG_MODE and not changed_from_config_window:
1307+
return
1308+
self._theme.toggleTransparency()
1309+
if self.operation_mode == THEME_MODE:
1310+
self._theme_slector.transparent = self._theme.getTransparency()
1311+
self.headWin.refresh()
1312+
self.bodyWin.refresh()
1313+
self.footerWin.refresh()
1314+
self.cnf.use_transparency = self._theme.getTransparency()
1315+
if self._config_win:
1316+
self._config_win._config_options['use_transparency'][1] = self.cnf.use_transparency
1317+
self._config_win._saved_config_options['use_transparency'][1] = self.cnf.use_transparency
13221318

13231319
def _show_theme_selector_from_config(self):
13241320
self.previous_mode = self.operation_mode

0 commit comments

Comments
 (0)