From 7baed529995fde899c1b0b025bbe2233ca8a7b98 Mon Sep 17 00:00:00 2001 From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com> Date: Mon, 11 Sep 2023 04:22:37 +0900 Subject: [PATCH] =?UTF-8?q?[Update]=20Main=20Window:=20=E5=85=A8=E4=BD=93?= =?UTF-8?q?=E7=9A=84=E3=81=AB=E8=89=B2=E3=82=92=E6=98=8E=E3=82=8B=E3=81=8F?= =?UTF-8?q?=E3=80=82Textbox=E3=81=A7=E3=81=9F=E3=81=8F=E3=81=95=E3=82=93?= =?UTF-8?q?=E3=81=AE=E6=96=87=E5=AD=97=E3=82=92=E5=B8=B8=E3=81=AB=E8=A6=8B?= =?UTF-8?q?=E3=82=8B=E4=BA=8B=E3=82=92=E8=80=83=E3=81=88=E3=82=8B=E3=81=A8?= =?UTF-8?q?=E3=83=8F=E3=83=AC=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92?= =?UTF-8?q?=E8=B5=B7=E3=81=93=E3=81=97=E3=81=9D=E3=81=86=E3=81=AA=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E3=80=81=E3=82=B3=E3=83=B3=E3=83=88=E3=83=A9=E3=82=B9?= =?UTF-8?q?=E3=83=88=E6=AF=94=E3=82=92=E4=B8=8B=E3=81=92=E3=81=9F=E3=80=82?= =?UTF-8?q?=E3=81=9D=E3=82=8C=E3=81=AB=E4=BC=B4=E3=81=84=E3=82=B5=E3=82=A4?= =?UTF-8?q?=E3=83=89=E3=83=90=E3=83=BC=E3=81=AE=E8=89=B2=E3=81=AA=E3=81=A9?= =?UTF-8?q?=E3=82=82=E5=A4=89=E3=81=88=E3=81=AA=E3=81=84=E3=81=A8=E3=81=8A?= =?UTF-8?q?=E3=81=8B=E3=81=97=E3=81=84=E3=81=AE=E3=81=A7=E5=85=A8=E4=BD=93?= =?UTF-8?q?=E7=9A=84=E3=81=AB=E8=89=B2=E3=81=8C=E6=98=8E=E3=82=8B=E3=81=8F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../createSidebarLanguagesSettings.py | 2 +- vrct_gui/ui_managers/ColorThemeManager.py | 34 ++++++++++--------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py b/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py index c7099530..493092b6 100644 --- a/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py +++ b/vrct_gui/main_window/widgets/_create_sidebar/createSidebarLanguagesSettings.py @@ -20,7 +20,7 @@ def createSidebarLanguagesSettings(settings, main_window, view_variable): tab_buttons=quick_setting_tabs, active_bg_color=settings.ctm.SLS__PRESETS_TAB_BG_ACTIVE_COLOR, active_text_color=settings.ctm.SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR, - passive_bg_color=settings.ctm.SIDEBAR_BG_COLOR, + passive_bg_color=settings.ctm.SLS__PRESETS_TAB_BG_PASSIVE_COLOR, passive_text_color=settings.ctm.SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR_PASSIVE ) diff --git a/vrct_gui/ui_managers/ColorThemeManager.py b/vrct_gui/ui_managers/ColorThemeManager.py index f68e04c0..75a6b0bc 100644 --- a/vrct_gui/ui_managers/ColorThemeManager.py +++ b/vrct_gui/ui_managers/ColorThemeManager.py @@ -26,7 +26,9 @@ class ColorThemeManager(): self.DARK_500_COLOR = "#a9aaae" self.DARK_600_COLOR = "#7f8084" self.DARK_700_COLOR = "#6a6c6f" + self.DARK_725_COLOR = "#636467" self.DARK_750_COLOR = "#5b5c5f" + self.DARK_775_COLOR = "#535457" self.DARK_800_COLOR = "#4b4c4f" self.DARK_825_COLOR = "#434447" self.DARK_850_COLOR = "#3a3b3e" @@ -74,14 +76,14 @@ class ColorThemeManager(): self.main.LABELS_TEXT_COLOR = self.main.BASIC_TEXT_COLOR # Main - self.main.MAIN_BG_COLOR = self.DARK_900_COLOR + self.main.MAIN_BG_COLOR = self.DARK_888_COLOR - self.main.TEXTBOX_BG_COLOR = self.DARK_950_COLOR + self.main.TEXTBOX_BG_COLOR = self.DARK_900_COLOR self.main.TEXTBOX_TEXT_COLOR = self.main.BASIC_TEXT_COLOR self.main.TEXTBOX_TAB_BG_PASSIVE_COLOR = self.DARK_850_COLOR self.main.TEXTBOX_TAB_BG_ACTIVE_COLOR = self.main.TEXTBOX_BG_COLOR self.main.TEXTBOX_TAB_BG_HOVERED_COLOR = self.DARK_800_COLOR - self.main.TEXTBOX_TAB_BG_CLICKED_COLOR = self.DARK_850_COLOR + self.main.TEXTBOX_TAB_BG_CLICKED_COLOR = self.DARK_925_COLOR self.main.TEXTBOX_TAB_TEXT_ACTIVE_COLOR = self.main.BASIC_TEXT_COLOR self.main.TEXTBOX_TAB_TEXT_PASSIVE_COLOR = self.DARK_500_COLOR @@ -95,20 +97,20 @@ class ColorThemeManager(): # Sidebar - self.main.SIDEBAR_BG_COLOR = self.DARK_875_COLOR + self.main.SIDEBAR_BG_COLOR = self.DARK_850_COLOR # Sidebar Features - self.main.SF__BG_COLOR = self.DARK_850_COLOR + self.main.SF__BG_COLOR = self.DARK_825_COLOR self.main.SF__HOVERED_BG_COLOR = self.DARK_800_COLOR - self.main.SF__CLICKED_BG_COLOR = self.DARK_900_COLOR + self.main.SF__CLICKED_BG_COLOR = self.DARK_875_COLOR self.main.SF__TEXT_DISABLED_COLOR = self.DARK_500_COLOR - self.main.SF__SWITCH_BOX_BG_COLOR = self.DARK_800_COLOR - self.main.SF__SWITCH_BOX_HOVERED_BG_COLOR = self.DARK_750_COLOR - self.main.SF__SWITCH_BOX_CLICKED_BG_COLOR = self.DARK_850_COLOR + self.main.SF__SWITCH_BOX_BG_COLOR = self.DARK_775_COLOR + self.main.SF__SWITCH_BOX_HOVERED_BG_COLOR = self.DARK_725_COLOR + self.main.SF__SWITCH_BOX_CLICKED_BG_COLOR = self.DARK_825_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_ACTIVE_CLICKED_BG_COLOR = self.PRIMARY_800_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 @@ -120,25 +122,25 @@ class ColorThemeManager(): # Sidebar Languages Settings self.main.SLS__TITLE_TEXT_COLOR = self.DARK_400_COLOR - self.main.SLS__BG_COLOR = self.DARK_825_COLOR + self.main.SLS__BG_COLOR = self.DARK_800_COLOR - self.main.SLS__PRESETS_TAB_BG_HOVERED_COLOR = self.DARK_850_COLOR - self.main.SLS__PRESETS_TAB_BG_CLICKED_COLOR = self.DARK_888_COLOR + self.main.SLS__PRESETS_TAB_BG_HOVERED_COLOR = self.DARK_825_COLOR + self.main.SLS__PRESETS_TAB_BG_CLICKED_COLOR = self.DARK_875_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.DARK_600_COLOR self.main.SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR = self.main.BASIC_TEXT_COLOR - self.main.SLS__BOX_BG_COLOR = self.DARK_850_COLOR + self.main.SLS__BOX_BG_COLOR = self.DARK_825_COLOR self.main.SLS__BOX_SECTION_TITLE_TEXT_COLOR = self.DARK_400_COLOR self.main.SLS__BOX_ARROWS_TEXT_COLOR = self.DARK_500_COLOR - self.main.SLS__DROPDOWN_MENU_BG_COLOR = self.DARK_900_COLOR + self.main.SLS__DROPDOWN_MENU_BG_COLOR = self.DARK_888_COLOR self.main.CONFIG_BUTTON_BG_COLOR = self.main.SIDEBAR_BG_COLOR self.main.CONFIG_BUTTON_HOVERED_BG_COLOR = self.DARK_800_COLOR - self.main.CONFIG_BUTTON_CLICKED_BG_COLOR = self.DARK_900_COLOR + self.main.CONFIG_BUTTON_CLICKED_BG_COLOR = self.DARK_875_COLOR # self.main.CONFIG_BUTTON_DISABLE_COLOR = self.DARK_900_COLOR self.main.MINIMIZE_SIDEBAR_BUTTON_BG_COLOR = self.main.SIDEBAR_BG_COLOR