Merge branch 'view' into UI_2.0

This commit is contained in:
Sakamoto Shiina
2023-09-11 04:58:46 +09:00
2 changed files with 53 additions and 36 deletions

View File

@@ -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
)

View File

@@ -7,16 +7,31 @@ class ColorThemeManager():
self.config_window = SimpleNamespace()
self.selectable_language_window = SimpleNamespace()
self.PRIMARY_100_COLOR = "#c4eac1"
self.PRIMARY_200_COLOR = "#9cdd98"
self.PRIMARY_300_COLOR = "#70d16c"
self.PRIMARY_400_COLOR = "#49c649"
self.PRIMARY_500_COLOR = "#0abb1d"
self.PRIMARY_600_COLOR = "#00ac11"
self.PRIMARY_650_COLOR = "#00A309"
self.PRIMARY_700_COLOR = "#009900"
self.PRIMARY_800_COLOR = "#008800"
self.PRIMARY_900_COLOR = "#006900"
# old one. But leave it here for now.
# self.PRIMARY_100_COLOR = "#c4eac1"
# self.PRIMARY_200_COLOR = "#9cdd98"
# self.PRIMARY_300_COLOR = "#70d16c"
# self.PRIMARY_400_COLOR = "#49c649"
# self.PRIMARY_500_COLOR = "#0abb1d"
# self.PRIMARY_600_COLOR = "#00ac11"
# self.PRIMARY_650_COLOR = "#00A309"
# self.PRIMARY_700_COLOR = "#009900"
# self.PRIMARY_800_COLOR = "#008800"
# self.PRIMARY_900_COLOR = "#006900"
# new one.
self.PRIMARY_100_COLOR = "#b7ded8"
self.PRIMARY_200_COLOR = "#8acac0"
self.PRIMARY_300_COLOR = "#61b4a7"
self.PRIMARY_400_COLOR = "#48a495"
self.PRIMARY_500_COLOR = "#3b9483"
self.PRIMARY_600_COLOR = "#368777"
self.PRIMARY_650_COLOR = "#347f6f"
self.PRIMARY_700_COLOR = "#317767"
self.PRIMARY_750_COLOR = "#2F6F60"
self.PRIMARY_800_COLOR = "#2c6759"
self.PRIMARY_900_COLOR = "#214b3f"
self.DARK_100_COLOR = "#f5f7fb"
@@ -26,7 +41,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 +91,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,21 +112,21 @@ 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_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_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_500_COLOR
self.main.SF__SWITCH_BOX_ACTIVE_HOVERED_BG_COLOR = self.PRIMARY_400_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_DISABLE_BG_COLOR = self.PRIMARY_800_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
@@ -120,25 +137,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
@@ -199,8 +216,8 @@ class ColorThemeManager():
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__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
self.config_window.SB__PROGRESSBAR_X_SLIDER__PASSIVE_BUTTON_COLOR = self.DARK_800_COLOR
@@ -208,9 +225,9 @@ class ColorThemeManager():
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_COLOR = self.PRIMARY_600_COLOR
self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_HOVERED_COLOR = self.PRIMARY_500_COLOR
self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_CLICKED_COLOR = self.PRIMARY_800_COLOR
# self.config_window.SB__PROGRESSBAR_X_SLIDER__ACTIVE_BUTTON_DISABLED_COLOR = self.PRIMARY_900_COLOR
@@ -220,8 +237,8 @@ class ColorThemeManager():
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_CLICKED_BG_COLOR = self.PRIMARY_750_COLOR
self.config_window.SIDE_MENU_LABELS_SELECTED_TEXT_COLOR = self.PRIMARY_200_COLOR
self.config_window.SIDE_MENU_SELECTED_MARK_ACTIVE_BG_COLOR = self.main.SF__SWITCH_BOX_ACTIVE_BG_COLOR