diff options
-rw-r--r-- | conf/glances.conf | 2 | ||||
-rw-r--r-- | docker-compose/glances.conf | 2 | ||||
-rw-r--r-- | docs/config.rst | 2 | ||||
-rw-r--r-- | docs/man/glances.1 | 10 | ||||
-rw-r--r-- | glances/main.py | 4 | ||||
-rw-r--r-- | glances/outputs/glances_curses.py | 23 | ||||
-rw-r--r-- | glances/plugins/help/__init__.py | 2 |
7 files changed, 3 insertions, 42 deletions
diff --git a/conf/glances.conf b/conf/glances.conf index e8911d25..1a3be000 100644 --- a/conf/glances.conf +++ b/conf/glances.conf @@ -23,8 +23,6 @@ history_size=1200 ############################################################################## [outputs] -# Theme name (for the moment only for the Curses interface: black or white) -curse_theme=black # Separator in the Curses and WebUI interface (between top and others plugins) separator=True # Set the the Curses and WebUI interface left menu plugin list (comma-separated) diff --git a/docker-compose/glances.conf b/docker-compose/glances.conf index 24de7619..b33738a6 100644 --- a/docker-compose/glances.conf +++ b/docker-compose/glances.conf @@ -23,8 +23,6 @@ history_size=1200 ############################################################################## [outputs] -# Theme name (for the moment only for the Curses interface: black or white) -curse_theme=black # Separator in the Curses and WebUI interface (between top and others plugins) separator=True # Set the the Curses and WebUI interface left menu plugin list (comma-separated) diff --git a/docs/config.rst b/docs/config.rst index f99dcc77..53d6d84f 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -59,8 +59,6 @@ than a second one concerning the user interface: .. code-block:: ini [outputs] - # Theme name (for the moment only for the Curses interface: black or white) - curse_theme=black # Separator in the Curses and WebUI interface (between top and others plugins) separator=True # Set the the Curses and WebUI interface left menu plugin list (comma-separated) diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 0615ce92..b3b5b8c6 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -313,11 +313,6 @@ display FS free space instead of used .UNINDENT .INDENT 0.0 .TP -.B \-\-theme\-white -optimize display colors for a white background -.UNINDENT -.INDENT 0.0 -.TP .B \-\-disable\-check\-update disable online Glances version check .UNINDENT @@ -503,9 +498,6 @@ Enable/disable the top menu (QuickLook, CPU, MEM, SWAP, and LOAD) .B \fB6\fP Enable/disable mean GPU mode .TP -.B \fB9\fP -Switch UI theme between black and white -.TP .B \fB/\fP Switch between process command line or command name .TP @@ -632,8 +624,6 @@ than a second one concerning the user interface: .nf .ft C [outputs] -# Theme name (for the moment only for the Curses interface: black or white) -curse_theme=black # Separator in the Curses and WebUI interface (between top and others plugins) separator=True # Set the the Curses and WebUI interface left menu plugin list (comma\-separated) diff --git a/glances/main.py b/glances/main.py index a2bf4933..2b71f8dd 100644 --- a/glances/main.py +++ b/glances/main.py @@ -525,10 +525,8 @@ Examples of use: ) parser.add_argument( '--theme-white', - action='store_true', default=False, - dest='theme_white', - help='optimize display colors for a white background', + help='(deprecated, no effect)', ) # Globals options parser.add_argument( diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py index 60c5aa22..e91cc0d6 100644 --- a/glances/outputs/glances_curses.py +++ b/glances/outputs/glances_curses.py @@ -47,8 +47,6 @@ class _GlancesCurses(object): '4': {'handler': '_handle_quicklook'}, '5': {'handler': '_handle_top_menu'}, '6': {'switch': 'meangpu'}, - '9': {'switch': 'theme_white', - 'handler': '_handle_theme'}, '/': {'switch': 'process_short_name'}, 'a': {'sort_key': 'auto'}, 'A': {'switch': 'disable_amps'}, @@ -158,9 +156,6 @@ class _GlancesCurses(object): logger.critical("Cannot init the curses library ({})".format(e)) sys.exit(1) - # Load the 'outputs' section of the configuration file - # - Init the theme (default is black) - self.theme = {'name': 'black'} # Load configuration file self.load_config(config) @@ -202,8 +197,6 @@ class _GlancesCurses(object): """Load the outputs section of the configuration file.""" if config is not None and config.has_section('outputs'): logger.debug('Read the outputs section in the configuration file') - # Load the theme - self.theme['name'] = config.get_value('outputs', 'curse_theme', default='black') # Separator ? self.args.enable_separator = config.get_bool_value('outputs', 'separator', default=True) # Set the left sidebar list @@ -211,9 +204,6 @@ class _GlancesCurses(object): 'left_menu', default=self._left_sidebar) - def is_theme(self, name): - """Return True if the theme *name* should be used.""" - return getattr(self.args, 'theme_' + name) or self.theme['name'] == name def _init_history(self): """Init the history option.""" @@ -258,11 +248,7 @@ class _GlancesCurses(object): # ex: export TERM=xterm-256color # export TERM=xterm-color - if self.is_theme('white'): - # White theme: black ==> white - curses.init_pair(1, -1, -1) - else: - curses.init_pair(1, -1, -1) + curses.init_pair(1, -1, -1) if self.args.disable_bg: curses.init_pair(2, curses.COLOR_RED, -1) curses.init_pair(3, curses.COLOR_GREEN, -1) @@ -300,10 +286,7 @@ class _GlancesCurses(object): try: curses.init_pair(i + 9, colors_list[i], -1) except Exception: - if self.is_theme('white'): - curses.init_pair(i + 9, -1, -1) - else: - curses.init_pair(i + 9, -1, -1) + curses.init_pair(i + 9, -1, -1) self.filter_color = curses.color_pair(9) | A_BOLD self.selected_color = curses.color_pair(10) | A_BOLD # Define separator line style @@ -455,8 +438,6 @@ class _GlancesCurses(object): else: self.enable_top() - def _handle_theme(self): - self._init_colors() def _handle_process_extended(self): self.args.enable_process_extended = not self.args.enable_process_extended diff --git a/glances/plugins/help/__init__.py b/glances/plugins/help/__init__.py index 831f7109..607d682f 100644 --- a/glances/plugins/help/__init__.py +++ b/glances/plugins/help/__init__.py @@ -128,8 +128,6 @@ class PluginModel(GlancesPluginModel): ('misc_reset_history', msg_col.format('r', 'Reset history')), ('misc_delete_warning_alerts', msg_col.format('w', 'Delete warning alerts')), ('misc_delete_warning_and_critical_alerts', msg_col.format('x', 'Delete warning & critical alerts')), - ('misc_theme_white', - '' if self.args.webserver else msg_col.format('9', 'Optimize colors for white background')), ('misc_edit_process_filter_pattern', '' if self.args.webserver else ' ENTER: Edit process filter pattern'), ] |