every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Chore] ColorThemeManager: 変数名変更やコメント追加など。ダークテーマの基本テキストカラーを、元々Lightテーマから持ってきていたのをDarkテーマ固有のものに(中身は今のところ同じでf2f2f2だけど)。

Browse Source 
SENTやRECEIVEDも変数化。参考にしたサイトのコメント記述など。
This commit is contained in:
Sakamoto Shiina
2023-10-29 00:10:04 +09:00
parent 1efd7d0330
commit 6e54b541dd
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vrct_gui/ui_managers/ColorThemeManager.py
View File

@@ -4,12 +4,15 @@ from .Themes import _darkTheme, _lightTheme
class ColorThemeManager(): class ColorThemeManager():
def __init__(self, theme): def __init__(self, theme):
# base_color 100, 200, 300...900 is generated by https://m2.material.io/design/color/the-color-system.html#tools-for-picking-colors . I put the comment "Source". I used it as a source color and generated.
# and like 750, 888... is made by https://meyerweb.com/eric/tools/color-blend/#:::hex
self.base_color = SimpleNamespace( self.base_color = SimpleNamespace(
PRIMARY_100_COLOR = "#b7ded8", PRIMARY_100_COLOR = "#b7ded8",
PRIMARY_200_COLOR = "#8acac0", PRIMARY_200_COLOR = "#8acac0",
PRIMARY_300_COLOR = "#61b4a7", PRIMARY_300_COLOR = "#61b4a7",
PRIMARY_400_COLOR = "#48a495", PRIMARY_400_COLOR = "#48a495", # Source
PRIMARY_450_COLOR = "#429c8c", PRIMARY_450_COLOR = "#429c8c",
PRIMARY_500_COLOR = "#3b9483", PRIMARY_500_COLOR = "#3b9483",
PRIMARY_600_COLOR = "#368777", PRIMARY_600_COLOR = "#368777",
@@ -19,8 +22,11 @@ class ColorThemeManager():
PRIMARY_800_COLOR = "#2c6759", PRIMARY_800_COLOR = "#2c6759",
PRIMARY_900_COLOR = "#214b3f", PRIMARY_900_COLOR = "#214b3f",
SENT_400_COLOR = "#6197b4", # Source PRIMARY_300_COLOR #61b4a7. ANALOGOUS' Second one.
RECEIVED_300_COLOR = "#a861b4", # Source PRIMARY_300_COLOR #61b4a7. TRIADIC' Second one.
DARK_100_COLOR = "#f5f7fb", DARK_BASIC_TEXT_COLOR = "#f2f2f2",
DARK_100_COLOR = "#f5f7fb", # THE LIGHTEST BG COLOR
DARK_200_COLOR = "#f1f2f6", DARK_200_COLOR = "#f1f2f6",
DARK_300_COLOR = "#e9eaee", DARK_300_COLOR = "#e9eaee",
DARK_350_COLOR = "#d8d9dd", DARK_350_COLOR = "#d8d9dd",
@@ -39,14 +45,14 @@ class ColorThemeManager():
DARK_863_COLOR = "#36373a", DARK_863_COLOR = "#36373a",
DARK_875_COLOR = "#323336", DARK_875_COLOR = "#323336",
DARK_888_COLOR = "#2e2f32", DARK_888_COLOR = "#2e2f32",
DARK_900_COLOR = "#292a2d", DARK_900_COLOR = "#292a2d", # Source
DARK_925_COLOR = "#242528", DARK_925_COLOR = "#242528",
DARK_950_COLOR = "#1f2022", DARK_950_COLOR = "#1f2022",
DARK_975_COLOR = "#1a1b1d", DARK_975_COLOR = "#1a1b1d",
DARK_1000_COLOR = "#151517", # THE DARKEST COLOR DARK_1000_COLOR = "#151517", # THE DARKEST BG COLOR
LIGHT_100_COLOR = "#f2f2f2", # THE LIGHTEST COLOR, LIGHT_100_COLOR = "#f2f2f2", # THE LIGHTEST BG COLOR
LIGHT_200_COLOR = "#e9e9e9", LIGHT_200_COLOR = "#e9e9e9",
LIGHT_250_COLOR = "#e1e1e1", LIGHT_250_COLOR = "#e1e1e1",
LIGHT_300_COLOR = "#d9d9d9", LIGHT_300_COLOR = "#d9d9d9",
@@ -66,7 +72,7 @@ class ColorThemeManager():
# LIGHT_925_COLOR = "#121212", # LIGHT_925_COLOR = "#121212",
# LIGHT_950_COLOR = "#0c0c0c", # LIGHT_950_COLOR = "#0c0c0c",
# LIGHT_975_COLOR = "#070707", # LIGHT_975_COLOR = "#070707",
LIGHT_1000_COLOR = "#010101", LIGHT_1000_COLOR = "#010101", # THE DARKEST BG COLOR
) )

30
vrct_gui/ui_managers/Themes/_darkTheme.py
View File

@@ -5,27 +5,27 @@ def _darkTheme(base_color):
theme_settings = SimpleNamespace( theme_settings = SimpleNamespace(
main = SimpleNamespace( main = SimpleNamespace(
# Common # Common
BASIC_TEXT_COLOR = base_color.LIGHT_100_COLOR, BASIC_TEXT_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
LABELS_TEXT_COLOR = base_color.LIGHT_100_COLOR, LABELS_TEXT_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
# Main # Main
MAIN_BG_COLOR = base_color.DARK_888_COLOR, MAIN_BG_COLOR = base_color.DARK_888_COLOR,
TEXTBOX_BG_COLOR = base_color.DARK_900_COLOR, TEXTBOX_BG_COLOR = base_color.DARK_900_COLOR,
TEXTBOX_TEXT_COLOR = base_color.LIGHT_100_COLOR, TEXTBOX_TEXT_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
TEXTBOX_TEXT_SUB_COLOR = base_color.DARK_450_COLOR, TEXTBOX_TEXT_SUB_COLOR = base_color.DARK_450_COLOR,
TEXTBOX_SYSTEM_TAG_TEXT_COLOR = base_color.PRIMARY_300_COLOR, TEXTBOX_SYSTEM_TAG_TEXT_COLOR = base_color.PRIMARY_300_COLOR,
TEXTBOX_SENT_TAG_TEXT_COLOR = "#6197b4", TEXTBOX_SENT_TAG_TEXT_COLOR = base_color.SENT_400_COLOR,
TEXTBOX_RECEIVED_TAG_TEXT_COLOR = "#a861b4", TEXTBOX_RECEIVED_TAG_TEXT_COLOR = base_color.RECEIVED_300_COLOR,
TEXTBOX_ERROR_TAG_TEXT_COLOR = "#c27583", # TEXTBOX_ERROR_TAG_TEXT_COLOR = "#c27583",
TEXTBOX_TIMESTAMP_TEXT_COLOR = base_color.DARK_600_COLOR, TEXTBOX_TIMESTAMP_TEXT_COLOR = base_color.DARK_600_COLOR,
TEXTBOX_TAB_BG_PASSIVE_COLOR = base_color.DARK_850_COLOR, TEXTBOX_TAB_BG_PASSIVE_COLOR = base_color.DARK_850_COLOR,
TEXTBOX_TAB_BG_ACTIVE_COLOR = base_color.DARK_900_COLOR, TEXTBOX_TAB_BG_ACTIVE_COLOR = base_color.DARK_900_COLOR,
TEXTBOX_TAB_BG_HOVERED_COLOR = base_color.DARK_800_COLOR, TEXTBOX_TAB_BG_HOVERED_COLOR = base_color.DARK_800_COLOR,
TEXTBOX_TAB_BG_CLICKED_COLOR = base_color.DARK_925_COLOR, TEXTBOX_TAB_BG_CLICKED_COLOR = base_color.DARK_925_COLOR,
TEXTBOX_TAB_TEXT_ACTIVE_COLOR = base_color.LIGHT_100_COLOR, TEXTBOX_TAB_TEXT_ACTIVE_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
TEXTBOX_TAB_TEXT_PASSIVE_COLOR = base_color.DARK_500_COLOR, TEXTBOX_TAB_TEXT_PASSIVE_COLOR = base_color.DARK_500_COLOR,
TEXTBOX_ENTRY_TEXT_COLOR = base_color.DARK_300_COLOR, TEXTBOX_ENTRY_TEXT_COLOR = base_color.DARK_300_COLOR,
@@ -73,7 +73,7 @@ def _darkTheme(base_color):
SLS__PRESETS_TAB_BG_PASSIVE_COLOR = base_color.DARK_850_COLOR, SLS__PRESETS_TAB_BG_PASSIVE_COLOR = base_color.DARK_850_COLOR,
SLS__PRESETS_TAB_BG_ACTIVE_COLOR = base_color.DARK_800_COLOR, SLS__PRESETS_TAB_BG_ACTIVE_COLOR = base_color.DARK_800_COLOR,
SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR_PASSIVE = base_color.DARK_600_COLOR, SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR_PASSIVE = base_color.DARK_600_COLOR,
SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR = base_color.LIGHT_100_COLOR, SLS__PRESETS_TAB_ACTIVE_TEXT_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
SLS__BOX_BG_COLOR = base_color.DARK_825_COLOR, SLS__BOX_BG_COLOR = base_color.DARK_825_COLOR,
SLS__BOX_SECTION_TITLE_TEXT_COLOR = base_color.DARK_400_COLOR, SLS__BOX_SECTION_TITLE_TEXT_COLOR = base_color.DARK_400_COLOR,
@@ -111,7 +111,7 @@ def _darkTheme(base_color):
selectable_language_window = SimpleNamespace( selectable_language_window = SimpleNamespace(
# Selectable Language Window # Selectable Language Window
BASIC_TEXT_COLOR = base_color.LIGHT_100_COLOR, BASIC_TEXT_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
MAIN_BG_COLOR = base_color.DARK_875_COLOR, MAIN_BG_COLOR = base_color.DARK_875_COLOR,
@@ -130,15 +130,15 @@ def _darkTheme(base_color):
# Modal Window (Main Window) # Modal Window (Main Window)
main_window_cover = SimpleNamespace( main_window_cover = SimpleNamespace(
TEXT_COLOR = base_color.LIGHT_100_COLOR, TEXT_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
), ),
confirmation_modal = SimpleNamespace( confirmation_modal = SimpleNamespace(
MESSAGE_TEXT_COLOR = base_color.LIGHT_100_COLOR, MESSAGE_TEXT_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
FAKE_BORDER_COLOR = base_color.DARK_600_COLOR, FAKE_BORDER_COLOR = base_color.DARK_600_COLOR,
BG_COLOR = base_color.DARK_800_COLOR, BG_COLOR = base_color.DARK_800_COLOR,
CONFIRMATION_BUTTONS_TEXT_COLOR = base_color.LIGHT_100_COLOR, CONFIRMATION_BUTTONS_TEXT_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
ACCEPT_BUTTON_BG_COLOR = base_color.PRIMARY_600_COLOR, ACCEPT_BUTTON_BG_COLOR = base_color.PRIMARY_600_COLOR,
ACCEPT_BUTTON_HOVERED_BG_COLOR = base_color.PRIMARY_450_COLOR, ACCEPT_BUTTON_HOVERED_BG_COLOR = base_color.PRIMARY_450_COLOR,
@@ -151,8 +151,8 @@ def _darkTheme(base_color):
config_window = SimpleNamespace( config_window = SimpleNamespace(
# Common # Common
BASIC_TEXT_COLOR = base_color.LIGHT_100_COLOR, BASIC_TEXT_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
LABELS_TEXT_COLOR = base_color.LIGHT_100_COLOR, LABELS_TEXT_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
LABELS_DESC_TEXT_COLOR = base_color.DARK_500_COLOR, LABELS_DESC_TEXT_COLOR = base_color.DARK_500_COLOR,
LABELS_TEXT_DISABLED_COLOR = base_color.DARK_600_COLOR, LABELS_TEXT_DISABLED_COLOR = base_color.DARK_600_COLOR,
@@ -205,7 +205,7 @@ def _darkTheme(base_color):
SB__CHECKBOX_BORDER_COLOR = base_color.DARK_600_COLOR, SB__CHECKBOX_BORDER_COLOR = base_color.DARK_600_COLOR,
SB__CHECKBOX_HOVER_COLOR = base_color.DARK_800_COLOR, SB__CHECKBOX_HOVER_COLOR = base_color.DARK_800_COLOR,
SB__CHECKBOX_CHECKED_COLOR = base_color.PRIMARY_700_COLOR, SB__CHECKBOX_CHECKED_COLOR = base_color.PRIMARY_700_COLOR,
SB__CHECKBOX_CHECKMARK_COLOR = base_color.LIGHT_100_COLOR, SB__CHECKBOX_CHECKMARK_COLOR = base_color.DARK_BASIC_TEXT_COLOR,
SB__ENTRY_TEXT_COLOR = base_color.DARK_300_COLOR, SB__ENTRY_TEXT_COLOR = base_color.DARK_300_COLOR,
SB__ENTRY_BG_COLOR = base_color.DARK_863_COLOR, SB__ENTRY_BG_COLOR = base_color.DARK_863_COLOR,

6
vrct_gui/ui_managers/Themes/_lightTheme.py
View File

@@ -4,8 +4,12 @@ from ...ui_utils import getImageFileFromUiUtils
def _lightTheme(base_color): def _lightTheme(base_color):
theme_settings = SimpleNamespace( theme_settings = SimpleNamespace(
main = SimpleNamespace( main = SimpleNamespace(
# Common
BASIC_TEXT_COLOR = base_color.LIGHT_100_COLOR,
LABELS_TEXT_COLOR = base_color.LIGHT_100_COLOR,
# Main # Main
MAIN_BG_COLOR = base_color.DARK_200_COLOR, MAIN_BG_COLOR = base_color.DARK_888_COLOR,
), ),
config_window = SimpleNamespace( config_window = SimpleNamespace(