diff --git a/spyder/app/mainwindow.py b/spyder/app/mainwindow.py index 6af81fcf2f1..57b7374928d 100644 --- a/spyder/app/mainwindow.py +++ b/spyder/app/mainwindow.py @@ -557,11 +557,11 @@ def setup(self): """Setup main window""" self.debug_print("*** Start of MainWindow setup ***") self.debug_print(" ..theme configuration") - color_theme = CONF.get('color_schemes', 'color_theme') + ui_theme = CONF.get('color_schemes', 'ui_theme') color_scheme = CONF.get('color_schemes', 'selected') - if color_theme == 'dark': + if ui_theme == 'dark': self.setStyleSheet(qdarkstyle.load_stylesheet_from_environment()) - elif color_theme == 'automatic': + elif ui_theme == 'automatic': if not is_dark_font_color(color_scheme): self.setStyleSheet( qdarkstyle.load_stylesheet_from_environment()) diff --git a/spyder/config/main.py b/spyder/config/main.py index 138bb1fa120..9730f5005d8 100755 --- a/spyder/config/main.py +++ b/spyder/config/main.py @@ -465,7 +465,7 @@ }), ('color_schemes', { - 'color_theme': 'automatic', + 'ui_theme': 'automatic', 'names': ['emacs', 'idle', 'monokai', 'pydev', 'scintilla', 'spyder', 'spyder/dark', 'zenburn', 'solarized/light', 'solarized/dark'], diff --git a/spyder/preferences/configdialog.py b/spyder/preferences/configdialog.py index fc2fce0da2e..49d1426105d 100644 --- a/spyder/preferences/configdialog.py +++ b/spyder/preferences/configdialog.py @@ -1171,14 +1171,13 @@ def setup_page(self): 'selected') self.schemes_combobox = schemes_combobox_widget.combobox - color_themes = ['Automatic', 'Light', 'Dark'] - color_theme_choices = list(zip(color_themes, - [color_theme.lower() - for color_theme in color_themes])) - color_theme_combo = self.create_combobox(_('User interface theme:'), - color_theme_choices, - 'color_theme', - restart=True) + ui_themes = ['Automatic', 'Light', 'Dark'] + ui_theme_choices = list(zip(ui_themes, [ui_theme.lower() + for ui_theme in ui_themes])) + ui_theme_combo = self.create_combobox(_('Interface theme:'), + ui_theme_choices, + 'ui_theme', + restart=True) # Layouts manage_layout = QVBoxLayout() @@ -1188,12 +1187,12 @@ def setup_page(self): combo_layout.addWidget(schemes_combobox_widget.label) combo_layout.addWidget(schemes_combobox_widget.combobox) - color_theme_combo_layout = QHBoxLayout() - color_theme_combo_layout.addWidget(color_theme_combo.label) - color_theme_combo_layout.addWidget(color_theme_combo.combobox) + ui_theme_combo_layout = QHBoxLayout() + ui_theme_combo_layout.addWidget(ui_theme_combo.label) + ui_theme_combo_layout.addWidget(ui_theme_combo.combobox) buttons_layout = QVBoxLayout() - buttons_layout.addLayout(color_theme_combo_layout) + buttons_layout.addLayout(ui_theme_combo_layout) buttons_layout.addLayout(combo_layout) buttons_layout.addWidget(edit_button) buttons_layout.addWidget(self.reset_button) @@ -1237,16 +1236,16 @@ def setup_page(self): def apply_settings(self, options): self.set_option('selected', self.current_scheme) color_scheme = self.get_option('selected') - color_theme = self.get_option('color_theme') + ui_theme = self.get_option('ui_theme') style_sheet = self.main.styleSheet() - if color_theme == 'automatic': + if ui_theme == 'automatic': if ((not is_dark_font_color(color_scheme) and not style_sheet) or (is_dark_font_color(color_scheme) and style_sheet)): - self.changed_options.add('color_theme') - elif 'color_theme' in self.changed_options: - self.changed_options.remove('color_theme') + self.changed_options.add('ui_theme') + elif 'ui_theme' in self.changed_options: + self.changed_options.remove('ui_theme') - if 'color_theme' not in self.changed_options: + if 'ui_theme' not in self.changed_options: self.main.editor.apply_plugin_settings(['color_scheme_name']) if self.main.ipyconsole is not None: self.main.ipyconsole.apply_plugin_settings( @@ -1259,12 +1258,12 @@ def apply_settings(self, options): self.update_combobox() self.update_preview() else: - if 'color_theme' in self.changed_options: - if (style_sheet and color_theme == 'dark' or - not style_sheet and color_theme == 'light'): - self.changed_options.remove('color_theme') + if 'ui_theme' in self.changed_options: + if (style_sheet and ui_theme == 'dark' or + not style_sheet and ui_theme == 'light'): + self.changed_options.remove('ui_theme') - if 'color_theme' not in self.changed_options: + if 'ui_theme' not in self.changed_options: self.main.editor.apply_plugin_settings(['color_scheme_name']) if self.main.ipyconsole is not None: self.main.ipyconsole.apply_plugin_settings( diff --git a/spyder/utils/icon_manager.py b/spyder/utils/icon_manager.py index b9548077cc1..05188f1ac21 100644 --- a/spyder/utils/icon_manager.py +++ b/spyder/utils/icon_manager.py @@ -18,26 +18,26 @@ import qtawesome as qta -def get_main_color(): +def get_foreground_color(): """ Get main color for the icons based on the color theme and color scheme currently selected. """ - color_theme = CONF.get('color_schemes', 'color_theme') + ui_theme = CONF.get('color_schemes', 'ui_theme') color_scheme = CONF.get('color_schemes', 'selected') - if color_theme == 'dark': - main_color = 'white' - elif color_theme == 'automatic': + if ui_theme == 'dark': + foreground_color = 'white' + elif ui_theme == 'automatic': if not is_dark_font_color(color_scheme): - main_color = 'white' + foreground_color = 'white' else: - main_color = 'black' + foreground_color = 'black' else: - main_color = 'black' - return main_color + foreground_color = 'black' + return foreground_color -MAIN_COLOR = get_main_color() +MAIN_FG_COLOR = get_foreground_color() _resource = { 'directory': osp.join(osp.dirname(osp.realpath(__file__)), '../fonts'), @@ -45,30 +45,30 @@ def get_main_color(): } _qtaargs = { - 'log': [('fa.file-text-o',), {'color': MAIN_COLOR}], - 'configure': [('fa.wrench',), {'color': MAIN_COLOR}], - 'bold': [('fa.bold',), {'color': MAIN_COLOR}], - 'italic': [('fa.italic',), {'color': MAIN_COLOR}], - 'genprefs': [('fa.cogs',), {'color': MAIN_COLOR}], - 'exit': [('fa.power-off',), {'color': MAIN_COLOR}], + 'log': [('fa.file-text-o',), {'color': MAIN_FG_COLOR}], + 'configure': [('fa.wrench',), {'color': MAIN_FG_COLOR}], + 'bold': [('fa.bold',), {'color': MAIN_FG_COLOR}], + 'italic': [('fa.italic',), {'color': MAIN_FG_COLOR}], + 'genprefs': [('fa.cogs',), {'color': MAIN_FG_COLOR}], + 'exit': [('fa.power-off',), {'color': MAIN_FG_COLOR}], 'run_small': [('fa.play',), {'color': 'green'}], 'stop': [('fa.stop',), {'color': 'darkred'}], - 'syspath': [('fa.cogs',), {'color': MAIN_COLOR}], - 'font': [('fa.font',), {'color': MAIN_COLOR}], - 'keyboard': [('fa.keyboard-o',), {'color': MAIN_COLOR}], - 'eyedropper': [('fa.eyedropper',), {'color': MAIN_COLOR}], + 'syspath': [('fa.cogs',), {'color': MAIN_FG_COLOR}], + 'font': [('fa.font',), {'color': MAIN_FG_COLOR}], + 'keyboard': [('fa.keyboard-o',), {'color': MAIN_FG_COLOR}], + 'eyedropper': [('fa.eyedropper',), {'color': MAIN_FG_COLOR}], 'tooloptions': [('fa.cog',), {'color': '#333333'}], - 'edit24': [('fa.edit',), {'color': MAIN_COLOR}], - 'edit': [('fa.edit',), {'color': MAIN_COLOR}], - 'filenew': [('fa.file-o',), {'color': MAIN_COLOR}], - 'fileopen': [('fa.folder-open',), {'color': MAIN_COLOR}], - 'revert': [('fa.undo',), {'color': MAIN_COLOR}], - 'filesave': [('fa.save',), {'color': MAIN_COLOR}], - 'save_all': [('fa.save', 'fa.save'), {'options': [{'offset': (-0.2, -0.2), 'scale_factor': 0.6, 'color': MAIN_COLOR}, {'offset': (0.2, 0.2), 'scale_factor': 0.6, 'color': MAIN_COLOR}]}], - 'filesaveas': [('fa.save', 'fa.pencil'), {'options': [{'offset': (-0.2, -0.2), 'scale_factor': 0.6, 'color': MAIN_COLOR}, {'offset': (0.2, 0.2), 'scale_factor': 0.6, 'color': MAIN_COLOR}]}], - 'print': [('fa.print',), {'color': MAIN_COLOR}], - 'fileclose': [('fa.close',), {'color': MAIN_COLOR}], - 'filecloseall': [('fa.close', 'fa.close', 'fa.close'), {'options': [{'scale_factor': 0.6, 'offset': (0.3, -0.3), 'color': MAIN_COLOR}, {'scale_factor': 0.6, 'offset': (-0.3, -0.3), 'color': MAIN_COLOR}, {'scale_factor': 0.6, 'offset': (0.3, 0.3), 'color': MAIN_COLOR}]}], + 'edit24': [('fa.edit',), {'color': MAIN_FG_COLOR}], + 'edit': [('fa.edit',), {'color': MAIN_FG_COLOR}], + 'filenew': [('fa.file-o',), {'color': MAIN_FG_COLOR}], + 'fileopen': [('fa.folder-open',), {'color': MAIN_FG_COLOR}], + 'revert': [('fa.undo',), {'color': MAIN_FG_COLOR}], + 'filesave': [('fa.save',), {'color': MAIN_FG_COLOR}], + 'save_all': [('fa.save', 'fa.save'), {'options': [{'offset': (-0.2, -0.2), 'scale_factor': 0.6, 'color': MAIN_FG_COLOR}, {'offset': (0.2, 0.2), 'scale_factor': 0.6, 'color': MAIN_FG_COLOR}]}], + 'filesaveas': [('fa.save', 'fa.pencil'), {'options': [{'offset': (-0.2, -0.2), 'scale_factor': 0.6, 'color': MAIN_FG_COLOR}, {'offset': (0.2, 0.2), 'scale_factor': 0.6, 'color': MAIN_FG_COLOR}]}], + 'print': [('fa.print',), {'color': MAIN_FG_COLOR}], + 'fileclose': [('fa.close',), {'color': MAIN_FG_COLOR}], + 'filecloseall': [('fa.close', 'fa.close', 'fa.close'), {'options': [{'scale_factor': 0.6, 'offset': (0.3, -0.3), 'color': MAIN_FG_COLOR}, {'scale_factor': 0.6, 'offset': (-0.3, -0.3), 'color': MAIN_FG_COLOR}, {'scale_factor': 0.6, 'offset': (0.3, 0.3), 'color': MAIN_FG_COLOR}]}], 'breakpoint_big': [('fa.circle',), {'color': 'darkred'} ], 'breakpoint_cond_big': [('fa.question-circle',), {'color': 'darkred'},], 'debug': [('spyder.debug',), {'color': '#3775a9'}], @@ -78,91 +78,91 @@ def get_main_color(): 'arrow-step-out': [('spyder.step-out',), {'color': '#3775a9'}], 'stop_debug': [('fa.stop',), {'color': '#3775a9'}], 'run': [('fa.play',), {'color': 'green'}], - 'run_settings': [('fa.wrench', 'fa.play'), {'options': [{'offset':(0.0, -0.1), 'color': MAIN_COLOR}, {'offset': (0.2, 0.125), 'color': 'green', 'scale_factor': 0.8}]}], - 'run_again': [('fa.repeat', 'fa.play'), {'options': [{'offset':(0.0, -0.1), 'color': MAIN_COLOR}, {'offset': (0.2, 0.125), 'color': 'green', 'scale_factor': 0.8}]}], - 'run_selection': [('spyder.run-selection',), {'color': MAIN_COLOR}], + 'run_settings': [('fa.wrench', 'fa.play'), {'options': [{'offset':(0.0, -0.1), 'color': MAIN_FG_COLOR}, {'offset': (0.2, 0.125), 'color': 'green', 'scale_factor': 0.8}]}], + 'run_again': [('fa.repeat', 'fa.play'), {'options': [{'offset':(0.0, -0.1), 'color': MAIN_FG_COLOR}, {'offset': (0.2, 0.125), 'color': 'green', 'scale_factor': 0.8}]}], + 'run_selection': [('spyder.run-selection',), {'color': MAIN_FG_COLOR}], 'run_cell': [('spyder.cell-code', 'spyder.cell-border', 'spyder.cell-play'), - {'options': [{'color': '#fff683'}, {'color': MAIN_COLOR}, {'color': 'green'}]}], + {'options': [{'color': '#fff683'}, {'color': MAIN_FG_COLOR}, {'color': 'green'}]}], 'run_cell_advance': [('spyder.cell-code', 'spyder.cell-border', 'spyder.cell-play', 'spyder.cell-next'), - {'options': [{'color': '#fff683'}, {'color': MAIN_COLOR,}, {'color': 'green'}, {'color': 'red'}]}], + {'options': [{'color': '#fff683'}, {'color': MAIN_FG_COLOR,}, {'color': 'green'}, {'color': 'red'}]}], 'todo_list': [('fa.th-list', 'fa.check'), {'options': [{'color': '#999999'}, {'offset': (0.0, 0.2), 'color': '#3775a9', 'color_disabled': '#748fa6'}]}], 'wng_list': [('fa.th-list', 'fa.warning'), {'options': [{'color': '#999999'}, {'offset': (0.0, 0.2), 'scale_factor': 0.75, 'color': 'orange', 'color_disabled': '#face7e'}]}], 'prev_wng': [('fa.arrow-left', 'fa.warning'), {'options': [{'color': '#999999'}, {'offset': (0.0, 0.2), 'scale_factor': 0.75, 'color': 'orange', 'color_disabled': '#face7e'}]}], 'next_wng': [('fa.arrow-right', 'fa.warning'), {'options': [{'color': '999999'}, {'offset': (0.0, 0.2), 'scale_factor': 0.75, 'color': 'orange', 'color_disabled': '#face7e'}]}], - 'last_edit_location': [('fa.caret-up',), {'color': MAIN_COLOR}], - 'prev_cursor': [('fa.hand-o-left',), {'color': MAIN_COLOR}], - 'next_cursor': [('fa.hand-o-right',), {'color': MAIN_COLOR}], - 'comment': [('fa.comment',), {'color': MAIN_COLOR}], - 'indent': [('fa.indent',), {'color': MAIN_COLOR}], - 'unindent': [('fa.outdent',), {'color': MAIN_COLOR}], - 'gotoline': [('fa.sort-numeric-asc',), {'color': MAIN_COLOR}], + 'last_edit_location': [('fa.caret-up',), {'color': MAIN_FG_COLOR}], + 'prev_cursor': [('fa.hand-o-left',), {'color': MAIN_FG_COLOR}], + 'next_cursor': [('fa.hand-o-right',), {'color': MAIN_FG_COLOR}], + 'comment': [('fa.comment',), {'color': MAIN_FG_COLOR}], + 'indent': [('fa.indent',), {'color': MAIN_FG_COLOR}], + 'unindent': [('fa.outdent',), {'color': MAIN_FG_COLOR}], + 'gotoline': [('fa.sort-numeric-asc',), {'color': MAIN_FG_COLOR}], 'error': [('fa.times-circle',), {'color': 'darkred'}], 'warning': [('fa.warning',), {'color': 'orange'}], 'todo': [('fa.check',), {'color': '#3775a9'}], - 'ipython_console': [('spyder.ipython-logo-alt',), {'color': MAIN_COLOR}], + 'ipython_console': [('spyder.ipython-logo-alt',), {'color': MAIN_FG_COLOR}], 'ipython_console_t': [('spyder.ipython-logo-alt',), {'color':'gray'}], 'python': [('spyder.python-logo-up', 'spyder.python-logo-down'), {'options': [{'color': '#3775a9'}, {'color': '#ffd444'}]}], 'pythonpath': [('spyder.python-logo-up', 'spyder.python-logo-down'), {'options': [{'color': '#3775a9'}, {'color': '#ffd444'}]}], - 'terminated': [('fa.circle',), {'color': MAIN_COLOR}], - 'cmdprompt': [('fa.terminal',), {'color': MAIN_COLOR}], + 'terminated': [('fa.circle',), {'color': MAIN_FG_COLOR}], + 'cmdprompt': [('fa.terminal',), {'color': MAIN_FG_COLOR}], 'cmdprompt_t': [('fa.terminal',), {'color':'gray'}], 'console': [('spyder.python-logo-up', 'spyder.python-logo-down'), {'options': [{'color': '#3775a9'}, {'color': '#ffd444'}]}], - 'findf': [('fa.file-o', 'fa.search'), {'options': [{'scale_factor': 1.0, 'color': MAIN_COLOR}, {'scale_factor': 0.6, 'color': MAIN_COLOR}]}], - 'history24': [('fa.history',), {'color': MAIN_COLOR}], - 'history': [('fa.history',), {'color': MAIN_COLOR}], - 'help': [('fa.question-circle',), {'color': MAIN_COLOR}], - 'lock': [('fa.lock',), {'color': MAIN_COLOR}], - 'lock_open': [('fa.unlock-alt',), {'color': MAIN_COLOR}], - 'outline_explorer': [('spyder.treeview',), {'color': MAIN_COLOR}], - 'project_expanded': [('fa.plus',), {'color': MAIN_COLOR}], - 'dictedit': [('fa.th-list',), {'color': MAIN_COLOR}], - 'previous': [('fa.arrow-left',), {'color': MAIN_COLOR}], - 'next': [('fa.arrow-right',), {'color': MAIN_COLOR}], - 'set_workdir': [('fa.check',), {'color': MAIN_COLOR}], - 'up': [('fa.arrow-up',), {'color': MAIN_COLOR}], - 'down': [('fa.arrow-down',), {'color': MAIN_COLOR}], - 'filesaveas2': [('fa.save', 'fa.close'), {'options': [{'scale_factor': 0.8, 'offset': (-0.1, -0.1), 'color': MAIN_COLOR}, {'offset': (0.2, 0.2), 'color': MAIN_COLOR}]}], # save_session_action + 'findf': [('fa.file-o', 'fa.search'), {'options': [{'scale_factor': 1.0, 'color': MAIN_FG_COLOR}, {'scale_factor': 0.6, 'color': MAIN_FG_COLOR}]}], + 'history24': [('fa.history',), {'color': MAIN_FG_COLOR}], + 'history': [('fa.history',), {'color': MAIN_FG_COLOR}], + 'help': [('fa.question-circle',), {'color': MAIN_FG_COLOR}], + 'lock': [('fa.lock',), {'color': MAIN_FG_COLOR}], + 'lock_open': [('fa.unlock-alt',), {'color': MAIN_FG_COLOR}], + 'outline_explorer': [('spyder.treeview',), {'color': MAIN_FG_COLOR}], + 'project_expanded': [('fa.plus',), {'color': MAIN_FG_COLOR}], + 'dictedit': [('fa.th-list',), {'color': MAIN_FG_COLOR}], + 'previous': [('fa.arrow-left',), {'color': MAIN_FG_COLOR}], + 'next': [('fa.arrow-right',), {'color': MAIN_FG_COLOR}], + 'set_workdir': [('fa.check',), {'color': MAIN_FG_COLOR}], + 'up': [('fa.arrow-up',), {'color': MAIN_FG_COLOR}], + 'down': [('fa.arrow-down',), {'color': MAIN_FG_COLOR}], + 'filesaveas2': [('fa.save', 'fa.close'), {'options': [{'scale_factor': 0.8, 'offset': (-0.1, -0.1), 'color': MAIN_FG_COLOR}, {'offset': (0.2, 0.2), 'color': MAIN_FG_COLOR}]}], # save_session_action 'spyder': [('spyder.spyder-logo-background', 'spyder.spyder-logo-web', 'spyder.spyder-logo-snake'), {'options': [{'color': '#414141'}, {'color': '#fafafa'}, {'color': '#ee0000'}]}], - 'find': [('fa.search',), {'color': MAIN_COLOR}], - 'findnext': [('fa.search', 'fa.long-arrow-down'), {'options':[{'scale_factor': 0.6, 'offset': (0.3, 0.0), 'color': MAIN_COLOR}, {'offset': (-0.3, 0.0), 'color': MAIN_COLOR}]}], - 'findprevious': [('fa.search', 'fa.long-arrow-up'), {'options':[{'scale_factor': 0.6, 'offset': (0.3, 0.0), 'color': MAIN_COLOR}, {'offset': (-0.3, 0.0), 'color': MAIN_COLOR}]}], - 'replace': [('fa.exchange',), {'color': MAIN_COLOR}], - 'undo': [('fa.undo',), {'color': MAIN_COLOR}], - 'redo': [('fa.repeat',), {'color': MAIN_COLOR}], + 'find': [('fa.search',), {'color': MAIN_FG_COLOR}], + 'findnext': [('fa.search', 'fa.long-arrow-down'), {'options':[{'scale_factor': 0.6, 'offset': (0.3, 0.0), 'color': MAIN_FG_COLOR}, {'offset': (-0.3, 0.0), 'color': MAIN_FG_COLOR}]}], + 'findprevious': [('fa.search', 'fa.long-arrow-up'), {'options':[{'scale_factor': 0.6, 'offset': (0.3, 0.0), 'color': MAIN_FG_COLOR}, {'offset': (-0.3, 0.0), 'color': MAIN_FG_COLOR}]}], + 'replace': [('fa.exchange',), {'color': MAIN_FG_COLOR}], + 'undo': [('fa.undo',), {'color': MAIN_FG_COLOR}], + 'redo': [('fa.repeat',), {'color': MAIN_FG_COLOR}], 'restart': [('fa.repeat',), {'çolor': '#3775a9'}], - 'editcopy': [('fa.copy',), {'color': MAIN_COLOR}], - 'editcut': [('fa.scissors',), {'color': MAIN_COLOR}], - 'editpaste': [('fa.clipboard',), {'color': MAIN_COLOR}], - 'editdelete': [('fa.eraser',), {'color': MAIN_COLOR}], - 'editclear': [('fa.times',), {'color': MAIN_COLOR}], - 'selectall': [('spyder.text-select-all',), {'color': MAIN_COLOR}], + 'editcopy': [('fa.copy',), {'color': MAIN_FG_COLOR}], + 'editcut': [('fa.scissors',), {'color': MAIN_FG_COLOR}], + 'editpaste': [('fa.clipboard',), {'color': MAIN_FG_COLOR}], + 'editdelete': [('fa.eraser',), {'color': MAIN_FG_COLOR}], + 'editclear': [('fa.times',), {'color': MAIN_FG_COLOR}], + 'selectall': [('spyder.text-select-all',), {'color': MAIN_FG_COLOR}], 'pythonpath_mgr': [('spyder.python-logo-up', 'spyder.python-logo-down'), {'options': [{'color': '#3775a9'}, {'color': '#ffd444'}]}], 'exit': [('fa.power-off',), {'color': 'darkred'}], - 'advanced': [('fa.gear',), {'color': MAIN_COLOR}], - 'bug': [('fa.bug',), {'color': MAIN_COLOR}], - 'maximize': [('spyder.maximize-pane',), {'color': MAIN_COLOR}], - 'unmaximize': [('spyder.minimize-pane',), {'color': MAIN_COLOR}], - 'window_nofullscreen': [('spyder.inward',), {'color': MAIN_COLOR}], - 'window_fullscreen': [('fa.arrows-alt',), {'color': MAIN_COLOR}], - 'MessageBoxWarning': [('fa.warning',), {'color': MAIN_COLOR}], - 'arredit': [('fa.table',), {'color': MAIN_COLOR}], - 'zoom_out': [('fa.search-minus',), {'color': MAIN_COLOR}], - 'zoom_in': [('fa.search-plus',), {'color': MAIN_COLOR}], - 'home': [('fa.home',), {'color': MAIN_COLOR}], - 'find': [('fa.search',), {'color': MAIN_COLOR}], - 'plot': [('fa.line-chart',), {'color': MAIN_COLOR}], - 'hist': [('fa.bar-chart',), {'color': MAIN_COLOR}], - 'imshow': [('fa.image',), {'color': MAIN_COLOR}], - 'insert': [('fa.sign-in',), {'color': MAIN_COLOR}], - 'rename': [('fa.pencil',), {'color': MAIN_COLOR}], - 'edit_add': [('fa.plus',), {'color': MAIN_COLOR}], - 'edit_remove': [('fa.minus',), {'color': MAIN_COLOR}], - 'browse_tab': [('fa.folder-o',), {'color': MAIN_COLOR}], - 'filelist': [('fa.list',), {'color': MAIN_COLOR}], - 'newwindow': [('spyder.window',), {'color': MAIN_COLOR}], - 'versplit': [('spyder.rows',), {'color': MAIN_COLOR}], - 'horsplit': [('fa.columns',), {'color': MAIN_COLOR}], - 'close_panel': [('fa.close',), {'color': MAIN_COLOR}], + 'advanced': [('fa.gear',), {'color': MAIN_FG_COLOR}], + 'bug': [('fa.bug',), {'color': MAIN_FG_COLOR}], + 'maximize': [('spyder.maximize-pane',), {'color': MAIN_FG_COLOR}], + 'unmaximize': [('spyder.minimize-pane',), {'color': MAIN_FG_COLOR}], + 'window_nofullscreen': [('spyder.inward',), {'color': MAIN_FG_COLOR}], + 'window_fullscreen': [('fa.arrows-alt',), {'color': MAIN_FG_COLOR}], + 'MessageBoxWarning': [('fa.warning',), {'color': MAIN_FG_COLOR}], + 'arredit': [('fa.table',), {'color': MAIN_FG_COLOR}], + 'zoom_out': [('fa.search-minus',), {'color': MAIN_FG_COLOR}], + 'zoom_in': [('fa.search-plus',), {'color': MAIN_FG_COLOR}], + 'home': [('fa.home',), {'color': MAIN_FG_COLOR}], + 'find': [('fa.search',), {'color': MAIN_FG_COLOR}], + 'plot': [('fa.line-chart',), {'color': MAIN_FG_COLOR}], + 'hist': [('fa.bar-chart',), {'color': MAIN_FG_COLOR}], + 'imshow': [('fa.image',), {'color': MAIN_FG_COLOR}], + 'insert': [('fa.sign-in',), {'color': MAIN_FG_COLOR}], + 'rename': [('fa.pencil',), {'color': MAIN_FG_COLOR}], + 'edit_add': [('fa.plus',), {'color': MAIN_FG_COLOR}], + 'edit_remove': [('fa.minus',), {'color': MAIN_FG_COLOR}], + 'browse_tab': [('fa.folder-o',), {'color': MAIN_FG_COLOR}], + 'filelist': [('fa.list',), {'color': MAIN_FG_COLOR}], + 'newwindow': [('spyder.window',), {'color': MAIN_FG_COLOR}], + 'versplit': [('spyder.rows',), {'color': MAIN_FG_COLOR}], + 'horsplit': [('fa.columns',), {'color': MAIN_FG_COLOR}], + 'close_panel': [('fa.close',), {'color': MAIN_FG_COLOR}], 'class': [('spyder.circle-letter-c',), {'color':'#3775a9'}], 'private2': [('spyder.circle-underscore',), {'color':'#e69c9c'}], 'private1': [('spyder.circle-underscore',), {'color':'#e69c9c'}], @@ -170,57 +170,57 @@ def get_main_color(): 'function': [('spyder.circle-letter-f',), {'color':'orange'}], 'blockcomment': [('spyder.circle-hash',), {'color':'grey'}], 'cell': [('spyder.circle-percent',), {'color':'red'}], - 'fromcursor': [('fa.hand-o-right',), {'color': MAIN_COLOR}], - 'filter': [('fa.filter',), {'color': MAIN_COLOR}], - 'folder_new': [('fa.folder-o', 'fa.plus'), {'options': [{'color': MAIN_COLOR}, {'scale_factor': 0.5, 'offset': (0.0, 0.1), 'color': MAIN_COLOR}]}], - 'package_new': [('fa.folder-o', 'spyder.python-logo'), {'options': [{'offset': (0.0, -0.125), 'color': MAIN_COLOR}, {'offset': (0.0, 0.125), 'color': MAIN_COLOR}]}], + 'fromcursor': [('fa.hand-o-right',), {'color': MAIN_FG_COLOR}], + 'filter': [('fa.filter',), {'color': MAIN_FG_COLOR}], + 'folder_new': [('fa.folder-o', 'fa.plus'), {'options': [{'color': MAIN_FG_COLOR}, {'scale_factor': 0.5, 'offset': (0.0, 0.1), 'color': MAIN_FG_COLOR}]}], + 'package_new': [('fa.folder-o', 'spyder.python-logo'), {'options': [{'offset': (0.0, -0.125), 'color': MAIN_FG_COLOR}, {'offset': (0.0, 0.125), 'color': MAIN_FG_COLOR}]}], 'vcs_commit': [('fa.check',), {'color': 'green'}], 'vcs_browse': [('fa.search',), {'color': 'green'}], - 'kill': [('fa.warning',), {'color': MAIN_COLOR}], - 'reload': [('fa.repeat',), {'color': MAIN_COLOR}], - 'auto_reload': [('fa.repeat', 'fa.clock-o'), {'options': [{'scale_factor': 0.75, 'offset': (-0.1, -0.1), 'color': MAIN_COLOR}, {'scale_factor': 0.5, 'offset': (0.25, 0.25), 'color': MAIN_COLOR}]}], - 'fileimport': [('fa.download',), {'color': MAIN_COLOR}], - 'environ': [('fa.th-list',), {'color': MAIN_COLOR}], - 'options_less': [('fa.minus-square',), {'color': MAIN_COLOR}], - 'options_more': [('fa.plus-square',), {'color': MAIN_COLOR}], - 'ArrowDown': [('fa.arrow-circle-down',), {'color': MAIN_COLOR}], - 'ArrowUp': [('fa.arrow-circle-up',), {'color': MAIN_COLOR}], - 'ArrowBack': [('fa.arrow-circle-left',), {'color': MAIN_COLOR}], - 'ArrowForward': [('fa.arrow-circle-right',), {'color': MAIN_COLOR}], - 'DialogApplyButton': [('fa.check',), {'color': MAIN_COLOR}], - 'DialogCloseButton': [('fa.close',), {'color': MAIN_COLOR}], - 'DirClosedIcon': [('fa.folder-o',), {'color': MAIN_COLOR}], + 'kill': [('fa.warning',), {'color': MAIN_FG_COLOR}], + 'reload': [('fa.repeat',), {'color': MAIN_FG_COLOR}], + 'auto_reload': [('fa.repeat', 'fa.clock-o'), {'options': [{'scale_factor': 0.75, 'offset': (-0.1, -0.1), 'color': MAIN_FG_COLOR}, {'scale_factor': 0.5, 'offset': (0.25, 0.25), 'color': MAIN_FG_COLOR}]}], + 'fileimport': [('fa.download',), {'color': MAIN_FG_COLOR}], + 'environ': [('fa.th-list',), {'color': MAIN_FG_COLOR}], + 'options_less': [('fa.minus-square',), {'color': MAIN_FG_COLOR}], + 'options_more': [('fa.plus-square',), {'color': MAIN_FG_COLOR}], + 'ArrowDown': [('fa.arrow-circle-down',), {'color': MAIN_FG_COLOR}], + 'ArrowUp': [('fa.arrow-circle-up',), {'color': MAIN_FG_COLOR}], + 'ArrowBack': [('fa.arrow-circle-left',), {'color': MAIN_FG_COLOR}], + 'ArrowForward': [('fa.arrow-circle-right',), {'color': MAIN_FG_COLOR}], + 'DialogApplyButton': [('fa.check',), {'color': MAIN_FG_COLOR}], + 'DialogCloseButton': [('fa.close',), {'color': MAIN_FG_COLOR}], + 'DirClosedIcon': [('fa.folder-o',), {'color': MAIN_FG_COLOR}], 'DialogHelpButton': [('fa.life-ring',), {'color': 'darkred'}], 'MessageBoxInformation': [('fa.info',), {'color': '3775a9'}], - 'DirOpenIcon': [('fa.folder-open',), {'color': MAIN_COLOR}], - 'FileIcon': [('fa.file-o',), {'color': MAIN_COLOR}], - 'ExcelFileIcon': [('fa.file-excel-o',), {'color': MAIN_COLOR}], - 'WordFileIcon': [('fa.file-word-o',), {'color': MAIN_COLOR}], - 'PowerpointFileIcon': [('fa.file-powerpoint-o',), {'color': MAIN_COLOR}], - 'PDFIcon': [('fa.file-pdf-o',), {'color': MAIN_COLOR}], - 'AudioFileIcon': [('fa.file-audio-o',), {'color': MAIN_COLOR}], - 'ImageFileIcon': [('fa.file-image-o',), {'color': MAIN_COLOR}], - 'ArchiveFileIcon': [('fa.file-archive-o',), {'color': MAIN_COLOR}], - 'VideoFileIcon': [('fa.file-video-o',), {'color': MAIN_COLOR}], - 'TextFileIcon': [('fa.file-text-o',), {'color': MAIN_COLOR}], - 'project': [('fa.folder-open-o',), {'color': MAIN_COLOR}], - 'DriveHDIcon': [('fa.hdd-o',), {'color': MAIN_COLOR}], - 'arrow': [('fa.arrow-right',), {'color': MAIN_COLOR}], - 'collapse': [('spyder.inward',), {'color': MAIN_COLOR}], - 'expand': [('fa.arrows-alt',), {'color': MAIN_COLOR}], - 'restore': [('fa.level-up',), {'color': MAIN_COLOR}], - 'collapse_selection': [('fa.minus-square-o',), {'color': MAIN_COLOR}], - 'expand_selection': [('fa.plus-square-o',), {'color': MAIN_COLOR}], - 'copywop': [('fa.terminal',), {'color': MAIN_COLOR}], - 'editpaste': [('fa.paste',), {'color': MAIN_COLOR}], - 'editcopy': [('fa.copy',), {'color': MAIN_COLOR}], - 'edit': [('fa.edit',), {'color': MAIN_COLOR}], + 'DirOpenIcon': [('fa.folder-open',), {'color': MAIN_FG_COLOR}], + 'FileIcon': [('fa.file-o',), {'color': MAIN_FG_COLOR}], + 'ExcelFileIcon': [('fa.file-excel-o',), {'color': MAIN_FG_COLOR}], + 'WordFileIcon': [('fa.file-word-o',), {'color': MAIN_FG_COLOR}], + 'PowerpointFileIcon': [('fa.file-powerpoint-o',), {'color': MAIN_FG_COLOR}], + 'PDFIcon': [('fa.file-pdf-o',), {'color': MAIN_FG_COLOR}], + 'AudioFileIcon': [('fa.file-audio-o',), {'color': MAIN_FG_COLOR}], + 'ImageFileIcon': [('fa.file-image-o',), {'color': MAIN_FG_COLOR}], + 'ArchiveFileIcon': [('fa.file-archive-o',), {'color': MAIN_FG_COLOR}], + 'VideoFileIcon': [('fa.file-video-o',), {'color': MAIN_FG_COLOR}], + 'TextFileIcon': [('fa.file-text-o',), {'color': MAIN_FG_COLOR}], + 'project': [('fa.folder-open-o',), {'color': MAIN_FG_COLOR}], + 'DriveHDIcon': [('fa.hdd-o',), {'color': MAIN_FG_COLOR}], + 'arrow': [('fa.arrow-right',), {'color': MAIN_FG_COLOR}], + 'collapse': [('spyder.inward',), {'color': MAIN_FG_COLOR}], + 'expand': [('fa.arrows-alt',), {'color': MAIN_FG_COLOR}], + 'restore': [('fa.level-up',), {'color': MAIN_FG_COLOR}], + 'collapse_selection': [('fa.minus-square-o',), {'color': MAIN_FG_COLOR}], + 'expand_selection': [('fa.plus-square-o',), {'color': MAIN_FG_COLOR}], + 'copywop': [('fa.terminal',), {'color': MAIN_FG_COLOR}], + 'editpaste': [('fa.paste',), {'color': MAIN_FG_COLOR}], + 'editcopy': [('fa.copy',), {'color': MAIN_FG_COLOR}], + 'edit': [('fa.edit',), {'color': MAIN_FG_COLOR}], 'convention': [('spyder.circle-letter-c',), {'color':'#3775a9'}], 'refactor': [('spyder.circle-letter-r',), {'color':'#3775a9'}], - '2uparrow': [('fa.angle-double-up',), {'color': MAIN_COLOR}], - '1uparrow': [('fa.angle-up',), {'color': MAIN_COLOR}], - '2downarrow': [('fa.angle-double-down',), {'color': MAIN_COLOR}], - '1downarrow': [('fa.angle-down',), {'color': MAIN_COLOR}], + '2uparrow': [('fa.angle-double-up',), {'color': MAIN_FG_COLOR}], + '1uparrow': [('fa.angle-up',), {'color': MAIN_FG_COLOR}], + '2downarrow': [('fa.angle-double-down',), {'color': MAIN_FG_COLOR}], + '1downarrow': [('fa.angle-down',), {'color': MAIN_FG_COLOR}], # --- Autocompletion type icons -------------- 'attribute': [('spyder.circle-letter-a',), {'color': 'magenta'}], 'module': [('spyder.circle-letter-m',), {'color': '#daa520'}], @@ -232,28 +232,28 @@ def get_main_color(): 'blockcomment': [('spyder.circle-hash',), {'color':'grey'}], 'cell': [('spyder.circle-percent',), {'color':'red'}], 'no_match': [('fa.circle',), {'color': 'gray'}], - 'github': [('fa.github',), {'color': MAIN_COLOR}], + 'github': [('fa.github',), {'color': MAIN_FG_COLOR}], # --- Spyder Tour -------------------------------------------------------- - 'tour.close': [('fa.close',), {'color': MAIN_COLOR}], - 'tour.home': [('fa.fast-backward',), {'color': MAIN_COLOR}], - 'tour.previous': [('fa.backward',), {'color': MAIN_COLOR}], - 'tour.next': [('fa.forward',), {'color': MAIN_COLOR}], - 'tour.end': [('fa.fast-forward',), {'color': MAIN_COLOR}], + 'tour.close': [('fa.close',), {'color': MAIN_FG_COLOR}], + 'tour.home': [('fa.fast-backward',), {'color': MAIN_FG_COLOR}], + 'tour.previous': [('fa.backward',), {'color': MAIN_FG_COLOR}], + 'tour.next': [('fa.forward',), {'color': MAIN_FG_COLOR}], + 'tour.end': [('fa.fast-forward',), {'color': MAIN_FG_COLOR}], # --- Third party plugins ------------------------------------------------ - 'profiler': [('fa.clock-o',), {'color': MAIN_COLOR}], - 'pylint': [('fa.search', 'fa.check'), {'options': [{'color': MAIN_COLOR}, {'offset': (0.125, 0.125), 'color': 'orange'}]}], - 'condapackages': [('fa.archive',), {'color': MAIN_COLOR}], - 'spyder.example': [('fa.eye',), {'color': MAIN_COLOR}], - 'spyder.autopep8': [('fa.eye',), {'color': MAIN_COLOR}], - 'spyder.memory_profiler': [('fa.eye',), {'color': MAIN_COLOR}], - 'spyder.line_profiler': [('fa.eye',), {'color': MAIN_COLOR}], - 'symbol_find': [('fa.at',), {'color': MAIN_COLOR}], + 'profiler': [('fa.clock-o',), {'color': MAIN_FG_COLOR}], + 'pylint': [('fa.search', 'fa.check'), {'options': [{'color': MAIN_FG_COLOR}, {'offset': (0.125, 0.125), 'color': 'orange'}]}], + 'condapackages': [('fa.archive',), {'color': MAIN_FG_COLOR}], + 'spyder.example': [('fa.eye',), {'color': MAIN_FG_COLOR}], + 'spyder.autopep8': [('fa.eye',), {'color': MAIN_FG_COLOR}], + 'spyder.memory_profiler': [('fa.eye',), {'color': MAIN_FG_COLOR}], + 'spyder.line_profiler': [('fa.eye',), {'color': MAIN_FG_COLOR}], + 'symbol_find': [('fa.at',), {'color': MAIN_FG_COLOR}], 'folding.arrow_right_off': [('fa.caret-right',), {'color': 'gray'}], - 'folding.arrow_right_on': [('fa.caret-right',), {'color': MAIN_COLOR}], + 'folding.arrow_right_on': [('fa.caret-right',), {'color': MAIN_FG_COLOR}], 'folding.arrow_down_off': [('fa.caret-down',), {'color': 'gray'}], - 'folding.arrow_down_on': [('fa.caret-down',), {'color': MAIN_COLOR}], - 'lspserver': [('fa.server',), {'color': MAIN_COLOR}], - 'dependency_ok': [('fa.check',), {'color': MAIN_COLOR}], + 'folding.arrow_down_on': [('fa.caret-down',), {'color': MAIN_FG_COLOR}], + 'lspserver': [('fa.server',), {'color': MAIN_FG_COLOR}], + 'dependency_ok': [('fa.check',), {'color': MAIN_FG_COLOR}], 'dependency_warning': [('fa.warning',), {'color': 'orange'}], 'dependency_error': [('fa.warning',), {'color': 'darkred'}], }