From 780bd32cf49a95c6ba44d59cc542b664dfea1596 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Thu, 19 Oct 2023 17:33:31 +0900 Subject: [PATCH] =?UTF-8?q?[bugfix]=20=E8=89=B2=E3=81=AE=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E6=BC=8F=E3=82=8C=E4=BF=AE=E6=AD=A3=E3=80=82OS=E3=81=AE?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=A7=E3=83=A9=E3=82=A4=E3=83=88=E3=83=86?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=81=AB=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AB=E3=80=81=E8=89=B2=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E9=83=A8=E5=88=86?= =?UTF-8?q?=E3=81=8C=E8=87=AA=E5=8B=95=E7=9A=84=E3=81=AB=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=83=88=E3=83=86=E3=83=BC=E3=83=9E=E7=94=A8(Tkinter=E5=81=B4?= =?UTF-8?q?=E3=81=A7)=E3=81=AB=E6=8C=87=E5=AE=9A=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E3=81=AE=E3=81=A7=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E6=BC=8F=E3=82=8C=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E9=83=A8=E5=88=86=E3=82=92=E6=8C=87=E5=AE=9A=E3=80=82=E3=81=9D?= =?UTF-8?q?=E3=81=AE=E9=9A=9B=E3=81=ABVRCT=E4=B8=8A=E3=81=AE=E3=83=80?= =?UTF-8?q?=E3=83=BC=E3=82=AF=E3=83=86=E3=83=BC=E3=83=9E=E3=81=A7=E3=81=AE?= =?UTF-8?q?=E8=89=B2=E3=81=8C=E4=B8=80=E9=83=A8=E5=BE=AE=E5=A6=99=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E3=82=8F=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_createSettingBoxCompactModeButton.py | 4 +- .../_SettingBoxGenerator.py | 12 + .../_create_sidebar/createSidebarFeatures.py | 2 + vrct_gui/ui_managers/ColorThemeManager.py | 236 ++++++++++-------- 4 files changed, 145 insertions(+), 109 deletions(-) diff --git a/vrct_gui/config_window/widgets/createSettingBoxTopBar/_createSettingBoxCompactModeButton.py b/vrct_gui/config_window/widgets/createSettingBoxTopBar/_createSettingBoxCompactModeButton.py index 7f56af52..80a5d152 100644 --- a/vrct_gui/config_window/widgets/createSettingBoxTopBar/_createSettingBoxCompactModeButton.py +++ b/vrct_gui/config_window/widgets/createSettingBoxTopBar/_createSettingBoxCompactModeButton.py @@ -56,9 +56,11 @@ def _createSettingBoxCompactModeButton(parent_widget, config_window, settings, v onvalue=True, offvalue=False, command=switchConfigWindowCompactMode, - # fg_color="", + fg_color=settings.ctm.COMPACT_MODE_SWITCH_BOX_BG_COLOR, # bg_color="red", progress_color=settings.ctm.COMPACT_MODE_SWITCH_BOX_ACTIVE_BG_COLOR, + button_color=settings.ctm.COMPACT_MODE_SWITCH_BOX_BUTTON_COLOR, + button_hover_color=settings.ctm.COMPACT_MODE_SWITCH_BOX_BUTTON_HOVERED_COLOR, ) config_window.setting_box_compact_mode_switch_box.grid(row=0, column=0) \ No newline at end of file diff --git a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py index ed7d28a8..f11c56b5 100644 --- a/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py +++ b/vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py @@ -177,6 +177,8 @@ class _SettingBoxGenerator(): fg_color=self.settings.ctm.SB__SWITCH_BOX_BG_COLOR, # bg_color="red", progress_color=self.settings.ctm.SB__SWITCH_BOX_ACTIVE_BG_COLOR, + button_color=self.settings.ctm.SB__SWITCH_BOX_BUTTON_COLOR, + button_hover_color=self.settings.ctm.SB__SWITCH_BOX_BUTTON_HOVERED_COLOR, ) setattr(self.config_window, switch_attr_name, switch_widget) @@ -249,6 +251,8 @@ class _SettingBoxGenerator(): from_=slider_range[0], to=slider_range[1], number_of_steps=slider_number_of_steps, + fg_color=self.settings.ctm.SB__SLIDER_BG_COLOR, + progress_color=self.settings.ctm.SB__SLIDER_PROGRESS_BG_COLOR, button_color=self.settings.ctm.SB__SLIDER_BUTTON_COLOR, button_hover_color=self.settings.ctm.SB__SLIDER_BUTTON_HOVERED_COLOR, command=command, @@ -302,6 +306,9 @@ class _SettingBoxGenerator(): setting_box_item_frame.grid_columnconfigure(1, weight=1) entry_widget = CTkEntry( setting_box_item_frame, + text_color=self.settings.ctm.SB__ENTRY_TEXT_COLOR, + fg_color=self.settings.ctm.SB__ENTRY_BG_COLOR, + border_color=self.settings.ctm.SB__ENTRY_BORDER_COLOR, width=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__ENTRY_WIDTH, height=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__ENTRY_HEIGHT, textvariable=entry_variable, @@ -348,6 +355,8 @@ class _SettingBoxGenerator(): setting_box_item_frame, height=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__PROGRESSBAR_HEIGHT, corner_radius=0, + fg_color=self.settings.ctm.SB__PROGRESSBAR_X_SLIDER__PROGRESSBAR_BG_COLOR, + progress_color=self.settings.ctm.SB__PROGRESSBAR_X_SLIDER__PROGRESSBAR_PROGRESS_BG_COLOR, ) setattr(self.config_window, progressbar_attr_name, progressbar_widget) progressbar_widget.grid(row=1, column=1, padx=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__BAR_PADX, sticky="ew") @@ -400,6 +409,9 @@ class _SettingBoxGenerator(): entry_widget = CTkEntry( setting_box_item_frame, + text_color=self.settings.ctm.SB__ENTRY_TEXT_COLOR, + fg_color=self.settings.ctm.SB__ENTRY_BG_COLOR, + border_color=self.settings.ctm.SB__ENTRY_BORDER_COLOR, width=entry_width, height=self.settings.uism.SB__PROGRESSBAR_X_SLIDER__ENTRY_HEIGHT, textvariable=entry_textvariable, diff --git a/vrct_gui/main_window/widgets/_create_sidebar/createSidebarFeatures.py b/vrct_gui/main_window/widgets/_create_sidebar/createSidebarFeatures.py index ad5e09a5..9aaf7cef 100644 --- a/vrct_gui/main_window/widgets/_create_sidebar/createSidebarFeatures.py +++ b/vrct_gui/main_window/widgets/_create_sidebar/createSidebarFeatures.py @@ -213,6 +213,8 @@ def createSidebarFeatures(settings, main_window, view_variable): fg_color=settings.ctm.SF__SWITCH_BOX_BG_COLOR, bg_color=settings.ctm.SF__BG_COLOR, progress_color=settings.ctm.SF__SWITCH_BOX_ACTIVE_BG_COLOR, + button_color=settings.ctm.SF__SWITCH_BOX_BUTTON_COLOR, + # button_hover_color=settings.ctm.SF__SWITCH_BOX_BUTTON_HOVERED_COLOR, ) setattr(main_window, switch_box_attr_name, switch_box_widget) diff --git a/vrct_gui/ui_managers/ColorThemeManager.py b/vrct_gui/ui_managers/ColorThemeManager.py index 6c3ffdb9..f0a97a9e 100644 --- a/vrct_gui/ui_managers/ColorThemeManager.py +++ b/vrct_gui/ui_managers/ColorThemeManager.py @@ -40,6 +40,7 @@ class ColorThemeManager(): self.DARK_100_COLOR = "#f5f7fb" self.DARK_200_COLOR = "#f1f2f6" self.DARK_300_COLOR = "#e9eaee" + self.DARK_350_COLOR = "#d8d9dd" self.DARK_400_COLOR = "#c7c8cc" self.DARK_450_COLOR = "#b8b9bd" self.DARK_500_COLOR = "#a9aaae" @@ -52,6 +53,7 @@ class ColorThemeManager(): self.DARK_800_COLOR = "#4b4c4f" self.DARK_825_COLOR = "#434447" self.DARK_850_COLOR = "#3a3b3e" + self.DARK_863_COLOR = "#36373a" self.DARK_875_COLOR = "#323336" self.DARK_888_COLOR = "#2e2f32" self.DARK_900_COLOR = "#292a2d" @@ -140,6 +142,10 @@ class ColorThemeManager(): self.main.SF__SWITCH_BOX_ACTIVE_CLICKED_BG_COLOR = self.PRIMARY_700_COLOR self.main.SF__SWITCH_BOX_DISABLE_BG_COLOR = self.PRIMARY_800_COLOR + self.main.SF__SWITCH_BOX_BUTTON_COLOR = self.DARK_400_COLOR + # It's not working because It overrode internally. + self.main.SF__SWITCH_BOX_BUTTON_HOVERED_COLOR = self.DARK_350_COLOR + self.main.SF__SELECTED_MARK_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR self.main.SF__SELECTED_MARK_ACTIVE_HOVERED_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_HOVERED_BG_COLOR self.main.SF__SELECTED_MARK_ACTIVE_CLICKED_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_CLICKED_BG_COLOR @@ -249,8 +255,10 @@ class ColorThemeManager(): # Compact Mode - self.config_window.COMPACT_MODE_SWITCH_BOX_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR - + self.config_window.COMPACT_MODE_SWITCH_BOX_BG_COLOR = self.DARK_775_COLOR + self.config_window.COMPACT_MODE_SWITCH_BOX_ACTIVE_BG_COLOR = self.PRIMARY_500_COLOR + self.config_window.COMPACT_MODE_SWITCH_BOX_BUTTON_COLOR = self.DARK_350_COLOR + self.config_window.COMPACT_MODE_SWITCH_BOX_BUTTON_HOVERED_COLOR = self.DARK_300_COLOR # Main self.config_window.MAIN_BG_COLOR = self.DARK_950_COLOR @@ -270,17 +278,29 @@ class ColorThemeManager(): self.config_window.SB__DROPDOWN_MENU_HOVERED_BG_COLOR = self.DARK_800_COLOR self.config_window.SB__DROPDOWN_MENU_CLICKED_BG_COLOR = self.DARK_900_COLOR + self.config_window.SB__SLIDER_BG_COLOR = self.DARK_700_COLOR + self.config_window.SB__SLIDER_PROGRESS_BG_COLOR = self.DARK_500_COLOR self.config_window.SB__SLIDER_BUTTON_COLOR = self.DARK_700_COLOR self.config_window.SB__SLIDER_BUTTON_HOVERED_COLOR = self.DARK_600_COLOR - self.config_window.SB__SWITCH_BOX_BG_COLOR = self.main.SF__SWITCH_BOX_BG_COLOR - self.config_window.SB__SWITCH_BOX_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR + self.config_window.SB__SWITCH_BOX_BG_COLOR = self.DARK_800_COLOR + self.config_window.SB__SWITCH_BOX_ACTIVE_BG_COLOR = self.PRIMARY_500_COLOR + self.config_window.SB__SWITCH_BOX_BUTTON_COLOR = self.DARK_400_COLOR + self.config_window.SB__SWITCH_BOX_BUTTON_HOVERED_COLOR = self.DARK_350_COLOR - self.config_window.SB__CHECKBOX_BORDER_COLOR = self.DARK_500_COLOR + self.config_window.SB__CHECKBOX_BORDER_COLOR = self.DARK_600_COLOR self.config_window.SB__CHECKBOX_HOVER_COLOR = self.DARK_800_COLOR self.config_window.SB__CHECKBOX_CHECKED_COLOR = self.PRIMARY_700_COLOR self.config_window.SB__CHECKBOX_CHECKMARK_COLOR = self.config_window.BASIC_TEXT_COLOR + self.config_window.SB__ENTRY_TEXT_COLOR = self.DARK_300_COLOR + self.config_window.SB__ENTRY_BG_COLOR = self.DARK_863_COLOR + self.config_window.SB__ENTRY_BORDER_COLOR = self.DARK_775_COLOR + + + self.config_window.SB__PROGRESSBAR_X_SLIDER__PROGRESSBAR_BG_COLOR = self.DARK_800_COLOR + self.config_window.SB__PROGRESSBAR_X_SLIDER__PROGRESSBAR_PROGRESS_BG_COLOR = self.PRIMARY_400_COLOR + self.config_window.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_COLOR = self.PRIMARY_600_COLOR self.config_window.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_HOVERED_COLOR = self.PRIMARY_400_COLOR self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_COLOR = self.DARK_800_COLOR @@ -322,144 +342,144 @@ class ColorThemeManager(): - def _createLightModeColor(self): - # Common - self.main.BASIC_TEXT_COLOR = self.DARK_1000_COLOR - self.main.LABELS_TEXT_COLOR = self.main.BASIC_TEXT_COLOR + # def _createLightModeColor(self): + # # Common + # self.main.BASIC_TEXT_COLOR = self.DARK_1000_COLOR + # self.main.LABELS_TEXT_COLOR = self.main.BASIC_TEXT_COLOR - # Main - self.main.MAIN_BG_COLOR = self.LIGHT_300_COLOR + # # Main + # self.main.MAIN_BG_COLOR = self.LIGHT_300_COLOR - self.main.TEXTBOX_BG_COLOR = self.LIGHT_200_COLOR - self.main.TEXTBOX_TEXT_COLOR = self.main.BASIC_TEXT_COLOR - self.main.TEXTBOX_TAB_BG_PASSIVE_COLOR = self.LIGHT_350_COLOR - self.main.TEXTBOX_TAB_BG_ACTIVE_COLOR = self.main.TEXTBOX_BG_COLOR - self.main.TEXTBOX_TAB_BG_HOVERED_COLOR = self.LIGHT_300_COLOR - self.main.TEXTBOX_TAB_BG_CLICKED_COLOR = self.LIGHT_350_COLOR - self.main.TEXTBOX_TAB_TEXT_ACTIVE_COLOR = self.main.BASIC_TEXT_COLOR - self.main.TEXTBOX_TAB_TEXT_PASSIVE_COLOR = self.LIGHT_600_COLOR + # self.main.TEXTBOX_BG_COLOR = self.LIGHT_200_COLOR + # self.main.TEXTBOX_TEXT_COLOR = self.main.BASIC_TEXT_COLOR + # self.main.TEXTBOX_TAB_BG_PASSIVE_COLOR = self.LIGHT_350_COLOR + # self.main.TEXTBOX_TAB_BG_ACTIVE_COLOR = self.main.TEXTBOX_BG_COLOR + # self.main.TEXTBOX_TAB_BG_HOVERED_COLOR = self.LIGHT_300_COLOR + # self.main.TEXTBOX_TAB_BG_CLICKED_COLOR = self.LIGHT_350_COLOR + # self.main.TEXTBOX_TAB_TEXT_ACTIVE_COLOR = self.main.BASIC_TEXT_COLOR + # self.main.TEXTBOX_TAB_TEXT_PASSIVE_COLOR = self.LIGHT_600_COLOR - self.main.TEXTBOX_ENTRY_TEXT_COLOR = self.LIGHT_800_COLOR - self.main.TEXTBOX_ENTRY_TEXT_DISABLED_COLOR = self.LIGHT_500_COLOR - self.main.TEXTBOX_ENTRY_BG_COLOR = self.LIGHT_325_COLOR - self.main.TEXTBOX_ENTRY_BORDER_COLOR = self.LIGHT_400_COLOR - self.main.TEXTBOX_ENTRY_PLACEHOLDER_COLOR = self.LIGHT_600_COLOR - self.main.TEXTBOX_ENTRY_PLACEHOLDER_DISABLED_COLOR = self.LIGHT_700_COLOR + # self.main.TEXTBOX_ENTRY_TEXT_COLOR = self.LIGHT_800_COLOR + # self.main.TEXTBOX_ENTRY_TEXT_DISABLED_COLOR = self.LIGHT_500_COLOR + # self.main.TEXTBOX_ENTRY_BG_COLOR = self.LIGHT_325_COLOR + # self.main.TEXTBOX_ENTRY_BORDER_COLOR = self.LIGHT_400_COLOR + # self.main.TEXTBOX_ENTRY_PLACEHOLDER_COLOR = self.LIGHT_600_COLOR + # self.main.TEXTBOX_ENTRY_PLACEHOLDER_DISABLED_COLOR = self.LIGHT_700_COLOR - # Sidebar - self.main.SIDEBAR_BG_COLOR = self.LIGHT_350_COLOR + # # Sidebar + # self.main.SIDEBAR_BG_COLOR = self.LIGHT_350_COLOR - # Sidebar Features - self.main.SF__BG_COLOR = self.LIGHT_375_COLOR - self.main.SF__HOVERED_BG_COLOR = self.LIGHT_300_COLOR - self.main.SF__CLICKED_BG_COLOR = self.LIGHT_200_COLOR - self.main.SF__TEXT_DISABLED_COLOR = self.LIGHT_500_COLOR + # # Sidebar Features + # self.main.SF__BG_COLOR = self.LIGHT_375_COLOR + # self.main.SF__HOVERED_BG_COLOR = self.LIGHT_300_COLOR + # self.main.SF__CLICKED_BG_COLOR = self.LIGHT_200_COLOR + # self.main.SF__TEXT_DISABLED_COLOR = self.LIGHT_500_COLOR - self.main.SF__SWITCH_BOX_BG_COLOR = self.LIGHT_300_COLOR - self.main.SF__SWITCH_BOX_HOVERED_BG_COLOR = self.LIGHT_450_COLOR - self.main.SF__SWITCH_BOX_CLICKED_BG_COLOR = self.LIGHT_350_COLOR - self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR = self.PRIMARY_650_COLOR - self.main.SF__SWITCH_BOX_ACTIVE_HOVERED_BG_COLOR = self.PRIMARY_500_COLOR - self.main.SF__SWITCH_BOX_ACTIVE_CLICKED_BG_COLOR = self.PRIMARY_700_COLOR - self.main.SF__SWITCH_BOX_DISABLE_BG_COLOR = self.PRIMARY_900_COLOR + # self.main.SF__SWITCH_BOX_BG_COLOR = self.LIGHT_300_COLOR + # self.main.SF__SWITCH_BOX_HOVERED_BG_COLOR = self.LIGHT_450_COLOR + # self.main.SF__SWITCH_BOX_CLICKED_BG_COLOR = self.LIGHT_350_COLOR + # self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR = self.PRIMARY_650_COLOR + # self.main.SF__SWITCH_BOX_ACTIVE_HOVERED_BG_COLOR = self.PRIMARY_500_COLOR + # self.main.SF__SWITCH_BOX_ACTIVE_CLICKED_BG_COLOR = self.PRIMARY_700_COLOR + # self.main.SF__SWITCH_BOX_DISABLE_BG_COLOR = self.PRIMARY_900_COLOR - self.main.SF__SELECTED_MARK_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR - self.main.SF__SELECTED_MARK_ACTIVE_HOVERED_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_HOVERED_BG_COLOR - self.main.SF__SELECTED_MARK_ACTIVE_CLICKED_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_CLICKED_BG_COLOR - self.main.SF__SELECTED_MARK_DISABLE_BG_COLOR = self.main.SF__SWITCH_BOX_DISABLE_BG_COLOR + # self.main.SF__SELECTED_MARK_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR + # self.main.SF__SELECTED_MARK_ACTIVE_HOVERED_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_HOVERED_BG_COLOR + # self.main.SF__SELECTED_MARK_ACTIVE_CLICKED_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_CLICKED_BG_COLOR + # self.main.SF__SELECTED_MARK_DISABLE_BG_COLOR = self.main.SF__SWITCH_BOX_DISABLE_BG_COLOR - # Sidebar quick settings - self.main.SLS__TITLE_TEXT_COLOR = self.LIGHT_800_COLOR + # # Sidebar quick settings + # self.main.SLS__TITLE_TEXT_COLOR = self.LIGHT_800_COLOR - self.main.SLS__BG_COLOR = self.LIGHT_300_COLOR + # self.main.SLS__BG_COLOR = self.LIGHT_300_COLOR - self.main.SLS__PRESETS_TAB_BG_HOVERED_COLOR = self.LIGHT_350_COLOR - self.main.SLS__PRESETS_TAB_BG_CLICKED_COLOR = self.LIGHT_800_COLOR - self.main.SLS__PRESETS_TAB_BG_PASSIVE_COLOR = self.main.SIDEBAR_BG_COLOR - self.main.SLS__PRESETS_TAB_BG_ACTIVE_COLOR = self.main.SLS__BG_COLOR - self.main.SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR_PASSIVE = self.LIGHT_600_COLOR - self.main.SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR = self.main.BASIC_TEXT_COLOR + # self.main.SLS__PRESETS_TAB_BG_HOVERED_COLOR = self.LIGHT_350_COLOR + # self.main.SLS__PRESETS_TAB_BG_CLICKED_COLOR = self.LIGHT_800_COLOR + # self.main.SLS__PRESETS_TAB_BG_PASSIVE_COLOR = self.main.SIDEBAR_BG_COLOR + # self.main.SLS__PRESETS_TAB_BG_ACTIVE_COLOR = self.main.SLS__BG_COLOR + # self.main.SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR_PASSIVE = self.LIGHT_600_COLOR + # self.main.SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR = self.main.BASIC_TEXT_COLOR - self.main.SLS__BOX_BG_COLOR = self.LIGHT_350_COLOR - self.main.SLS__BOX_SECTION_TITLE_TEXT_COLOR = self.LIGHT_800_COLOR - self.main.SLS__BOX_ARROWS_TEXT_COLOR = self.LIGHT_700_COLOR + # self.main.SLS__BOX_BG_COLOR = self.LIGHT_350_COLOR + # self.main.SLS__BOX_SECTION_TITLE_TEXT_COLOR = self.LIGHT_800_COLOR + # self.main.SLS__BOX_ARROWS_TEXT_COLOR = self.LIGHT_700_COLOR - self.main.SLS__OPTIONMENU_BG_COLOR = self.LIGHT_500_COLOR + # self.main.SLS__OPTIONMENU_BG_COLOR = self.LIGHT_500_COLOR - self.main.CONFIG_BUTTON_BG_COLOR = self.main.SIDEBAR_BG_COLOR - self.main.CONFIG_BUTTON_HOVERED_BG_COLOR = self.LIGHT_800_COLOR - self.main.CONFIG_BUTTON_CLICKED_BG_COLOR = self.LIGHT_900_COLOR - # self.main.CONFIG_BUTTON_DISABLE_COLOR = self.LIGHT_900_COLOR + # self.main.CONFIG_BUTTON_BG_COLOR = self.main.SIDEBAR_BG_COLOR + # self.main.CONFIG_BUTTON_HOVERED_BG_COLOR = self.LIGHT_800_COLOR + # self.main.CONFIG_BUTTON_CLICKED_BG_COLOR = self.LIGHT_900_COLOR + # # self.main.CONFIG_BUTTON_DISABLE_COLOR = self.LIGHT_900_COLOR - self.main.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR = self.main.SIDEBAR_BG_COLOR - self.main.MINIMIZE_SIDEBAR_BUTTON_HOVERED_BG_COLOR = self.LIGHT_800_COLOR - self.main.MINIMIZE_SIDEBAR_BUTTON_CLICKED_BG_COLOR = self.LIGHT_900_COLOR - # self.main.MINIMIZE_SIDEBAR_BUTTON_DISABLE_COLOR = self.LIGHT_900_COLOR + # self.main.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR = self.main.SIDEBAR_BG_COLOR + # self.main.MINIMIZE_SIDEBAR_BUTTON_HOVERED_BG_COLOR = self.LIGHT_800_COLOR + # self.main.MINIMIZE_SIDEBAR_BUTTON_CLICKED_BG_COLOR = self.LIGHT_900_COLOR + # # self.main.MINIMIZE_SIDEBAR_BUTTON_DISABLE_COLOR = self.LIGHT_900_COLOR - self.main.HELP_AND_INFO_BUTTON_BG_COLOR = self.main.MAIN_BG_COLOR - self.main.HELP_AND_INFO_BUTTON_HOVERED_BG_COLOR = self.LIGHT_350_COLOR - self.main.HELP_AND_INFO_BUTTON_CLICKED_BG_COLOR = self.LIGHT_450_COLOR - # self.main.HELP_AND_INFO_BUTTON_DISABLE_COLOR = self.LIGHT_900_COLOR + # self.main.HELP_AND_INFO_BUTTON_BG_COLOR = self.main.MAIN_BG_COLOR + # self.main.HELP_AND_INFO_BUTTON_HOVERED_BG_COLOR = self.LIGHT_350_COLOR + # self.main.HELP_AND_INFO_BUTTON_CLICKED_BG_COLOR = self.LIGHT_450_COLOR + # # self.main.HELP_AND_INFO_BUTTON_DISABLE_COLOR = self.LIGHT_900_COLOR - # Common - self.config_window.BASIC_TEXT_COLOR = self.main.BASIC_TEXT_COLOR - self.config_window.LABELS_TEXT_COLOR = self.config_window.BASIC_TEXT_COLOR - self.config_window.LABELS_DESC_TEXT_COLOR = self.DARK_500_COLOR + # # Common + # self.config_window.BASIC_TEXT_COLOR = self.main.BASIC_TEXT_COLOR + # self.config_window.LABELS_TEXT_COLOR = self.config_window.BASIC_TEXT_COLOR + # self.config_window.LABELS_DESC_TEXT_COLOR = self.DARK_500_COLOR - # Top bar - self.config_window.TOP_BAR_BG_COLOR = self.DARK_850_COLOR + # # Top bar + # self.config_window.TOP_BAR_BG_COLOR = self.DARK_850_COLOR - # Main - self.config_window.MAIN_BG_COLOR = self.DARK_950_COLOR + # # Main + # self.config_window.MAIN_BG_COLOR = self.DARK_950_COLOR - # This is for fake border color - self.config_window.SB__WRAPPER_BG_COLOR = self.DARK_750_COLOR + # # This is for fake border color + # self.config_window.SB__WRAPPER_BG_COLOR = self.DARK_750_COLOR - self.config_window.SB__BG_COLOR = self.DARK_888_COLOR + # self.config_window.SB__BG_COLOR = self.DARK_888_COLOR - self.config_window.SB__OPTIONMENU_BG_COLOR = self.DARK_925_COLOR - self.config_window.SB__OPTIONMENU_HOVERED_BG_COLOR = self.DARK_875_COLOR + # self.config_window.SB__OPTIONMENU_BG_COLOR = self.DARK_925_COLOR + # self.config_window.SB__OPTIONMENU_HOVERED_BG_COLOR = self.DARK_875_COLOR - self.config_window.SB__SLIDER_BUTTON_COLOR = self.DARK_700_COLOR - self.config_window.SB__SLIDER_BUTTON_HOVERED_COLOR = self.DARK_600_COLOR + # self.config_window.SB__SLIDER_BUTTON_COLOR = self.DARK_700_COLOR + # self.config_window.SB__SLIDER_BUTTON_HOVERED_COLOR = self.DARK_600_COLOR - self.config_window.SB__SWITCH_BOX_BG_COLOR = self.main.SF__SWITCH_BOX_BG_COLOR - self.config_window.SB__SWITCH_BOX_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR + # self.config_window.SB__SWITCH_BOX_BG_COLOR = self.main.SF__SWITCH_BOX_BG_COLOR + # self.config_window.SB__SWITCH_BOX_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR - self.config_window.SB__CHECKBOX_BORDER_COLOR = self.DARK_500_COLOR - self.config_window.SB__CHECKBOX_HOVER_COLOR = self.DARK_800_COLOR - self.config_window.SB__CHECKBOX_CHECKED_COLOR = self.PRIMARY_700_COLOR - self.config_window.SB__CHECKBOX_CHECKMARK_COLOR = self.config_window.BASIC_TEXT_COLOR + # self.config_window.SB__CHECKBOX_BORDER_COLOR = self.DARK_500_COLOR + # self.config_window.SB__CHECKBOX_HOVER_COLOR = self.DARK_800_COLOR + # self.config_window.SB__CHECKBOX_CHECKED_COLOR = self.PRIMARY_700_COLOR + # self.config_window.SB__CHECKBOX_CHECKMARK_COLOR = self.config_window.BASIC_TEXT_COLOR - self.config_window.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_COLOR = self.PRIMARY_700_COLOR - self.config_window.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_HOVERED_COLOR = self.PRIMARY_500_COLOR - self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_COLOR = self.DARK_800_COLOR + # self.config_window.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_COLOR = self.PRIMARY_700_COLOR + # self.config_window.SB__PROGRESSBAR_X_SLIDER__SLIDER_BUTTON_HOVERED_COLOR = self.PRIMARY_500_COLOR + # self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_COLOR = self.DARK_800_COLOR - self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_COLOR = self.DARK_800_COLOR - self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_HOVERED_COLOR = self.DARK_700_COLOR - self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_CLICKED_COLOR = self.DARK_900_COLOR - self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_DISABLED_COLOR = self.DARK_850_COLOR + # self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_COLOR = self.DARK_800_COLOR + # self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_HOVERED_COLOR = self.DARK_700_COLOR + # self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_CLICKED_COLOR = self.DARK_900_COLOR + # self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_DISABLED_COLOR = self.DARK_850_COLOR - self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_COLOR = self.PRIMARY_700_COLOR - self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_HOVERED_COLOR = self.PRIMARY_600_COLOR - self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_CLICKED_COLOR = self.PRIMARY_900_COLOR - # self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_DISABLED_COLOR = self.PRIMARY_900_COLOR + # self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_COLOR = self.PRIMARY_700_COLOR + # self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_HOVERED_COLOR = self.PRIMARY_600_COLOR + # self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_CLICKED_COLOR = self.PRIMARY_900_COLOR + # # self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_DISABLED_COLOR = self.PRIMARY_900_COLOR - # Side menu - self.config_window.SIDE_MENU_BG_COLOR = self.config_window.MAIN_BG_COLOR + # # Side menu + # self.config_window.SIDE_MENU_BG_COLOR = self.config_window.MAIN_BG_COLOR - self.config_window.SIDE_MENU_LABELS_BG_COLOR = self.config_window.SIDE_MENU_BG_COLOR - self.config_window.SIDE_MENU_LABELS_BG_FOR_FAKE_BORDER_COLOR = self.config_window.SIDE_MENU_BG_COLOR - self.config_window.SIDE_MENU_LABELS_HOVERED_BG_COLOR = self.DARK_850_COLOR - self.config_window.SIDE_MENU_LABELS_CLICKED_BG_COLOR = self.PRIMARY_900_COLOR - self.config_window.SIDE_MENU_LABELS_SELECTED_TEXT_COLOR = self.PRIMARY_300_COLOR + # self.config_window.SIDE_MENU_LABELS_BG_COLOR = self.config_window.SIDE_MENU_BG_COLOR + # self.config_window.SIDE_MENU_LABELS_BG_FOR_FAKE_BORDER_COLOR = self.config_window.SIDE_MENU_BG_COLOR + # self.config_window.SIDE_MENU_LABELS_HOVERED_BG_COLOR = self.DARK_850_COLOR + # self.config_window.SIDE_MENU_LABELS_CLICKED_BG_COLOR = self.PRIMARY_900_COLOR + # self.config_window.SIDE_MENU_LABELS_SELECTED_TEXT_COLOR = self.PRIMARY_300_COLOR - self.config_window.SIDE_MENU_SELECTED_MARK_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR + # self.config_window.SIDE_MENU_SELECTED_MARK_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR