From 4811ef79a9db4f4cb3ce59da4921dcbb7ee0ece8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=81?= Date: Tue, 4 Jun 2024 13:58:38 +0900 Subject: [PATCH 1/9] =?UTF-8?q?fix=20=E6=98=8E=E6=9C=9D=E4=BD=93=E3=81=8C?= =?UTF-8?q?=E5=8B=9D=E6=89=8B=E3=81=AB=E3=83=AD=E3=83=BC=E3=83=89=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=82=8B=20#133?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ふぁ --- DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py | 6 ++++++ DMMGamePlayerFastLauncher/models/setting_data.py | 1 + DMMGamePlayerFastLauncher/tab/setting.py | 1 + assets/i18n/app.en_US.yml | 1 + assets/i18n/app.ja_JP.yml | 1 + assets/i18n/app.zh_CN.yml | 1 + assets/i18n/app.zh_TW.yml | 1 + 7 files changed, 12 insertions(+) diff --git a/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py b/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py index e5a68b6..102a37a 100644 --- a/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py +++ b/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py @@ -3,12 +3,14 @@ import os import sys import time +from tkinter import font import customtkinter as ctk import i18n from app import App from coloredlogs import ColoredFormatter from component.logger import LoggingHandlerMask, StyleScheme, TkinkerLogger +from customtkinter import ThemeManager from launch import GameLauncher, GameLauncherUac, LanchLauncher from lib.DGPSessionV2 import DgpSessionV2 from models.setting_data import AppConfig @@ -72,6 +74,10 @@ def loder(master: LanchLauncher): DgpSessionV2.PROXY["https"] = AppConfig.DATA.dmm_proxy_all.get() ctk.set_default_color_theme(str(AssetsPathConfig.THEMES.joinpath(AppConfig.DATA.theme.get()).with_suffix(".json"))) + if AppConfig.DATA.force_use_os_font.get(): + os_default_font = font.nametofont("TkDefaultFont").actual() + ThemeManager.theme["CTkFont"]["family"] = os_default_font["family"] + ctk.set_appearance_mode(AppConfig.DATA.appearance_mode.get()) try: diff --git a/DMMGamePlayerFastLauncher/models/setting_data.py b/DMMGamePlayerFastLauncher/models/setting_data.py index b3cec67..9e9fca2 100644 --- a/DMMGamePlayerFastLauncher/models/setting_data.py +++ b/DMMGamePlayerFastLauncher/models/setting_data.py @@ -17,6 +17,7 @@ class SettingData(VariableBase): dmm_proxy_all: StringVar = field(default_factory=StringVar) lang: StringVar = field(default_factory=lambda: StringVar(value=get_default_locale()[0])) theme: StringVar = field(default_factory=lambda: StringVar(value="blue")) + force_use_os_font: BooleanVar = field(default_factory=lambda: BooleanVar(value=True)) appearance_mode: StringVar = field(default_factory=lambda: StringVar(value="dark")) window_scaling: DoubleVar = field(default_factory=lambda: DoubleVar(value=1.0)) debug_window: BooleanVar = field(default_factory=lambda: BooleanVar(value=False)) diff --git a/DMMGamePlayerFastLauncher/tab/setting.py b/DMMGamePlayerFastLauncher/tab/setting.py index 4fce435..26fe91a 100644 --- a/DMMGamePlayerFastLauncher/tab/setting.py +++ b/DMMGamePlayerFastLauncher/tab/setting.py @@ -57,6 +57,7 @@ def create(self): OptionMenuTupleComponent(self, text=i18n.t("app.setting.lang"), values=self.lang, variable=self.data.lang).create() OptionMenuComponent(self, text=i18n.t("app.setting.theme"), values=self.theme, variable=self.data.theme).create() OptionMenuComponent(self, text=i18n.t("app.setting.appearance"), values=["light", "dark", "system"], variable=self.data.appearance_mode).create() + CheckBoxComponent(self, text=i18n.t("app.setting.force_use_os_font"), variable=self.data.force_use_os_font).create() text = i18n.t("app.setting.proxy_all") EntryComponent(self, text=text, tooltip=i18n.t("app.setting.proxy_all_tooltip"), variable=self.data.proxy_all).create() diff --git a/assets/i18n/app.en_US.yml b/assets/i18n/app.en_US.yml index edd50cd..e7463af 100644 --- a/assets/i18n/app.en_US.yml +++ b/assets/i18n/app.en_US.yml @@ -143,6 +143,7 @@ en_US: lang: Language theme: Theme appearance: Appearance + force_use_os_font: Force use of OS fonts proxy_all: Proxy proxy_all_tooltip: |- diff --git a/assets/i18n/app.ja_JP.yml b/assets/i18n/app.ja_JP.yml index 4071f80..a212cc5 100644 --- a/assets/i18n/app.ja_JP.yml +++ b/assets/i18n/app.ja_JP.yml @@ -140,6 +140,7 @@ ja_JP: lang: 言語 theme: テーマ appearance: 外観 + force_use_os_font: OS フォントの利用を強制する proxy_all: プロキシ proxy_all_tooltip: |- diff --git a/assets/i18n/app.zh_CN.yml b/assets/i18n/app.zh_CN.yml index 58f40a6..02631ff 100644 --- a/assets/i18n/app.zh_CN.yml +++ b/assets/i18n/app.zh_CN.yml @@ -142,6 +142,7 @@ zh_CN: lang: 语言 theme: 主题 appearance: 外观 + force_use_os_font: 强制使用 OS 字体 proxy_all: 代理 proxy_all_tooltip: |- diff --git a/assets/i18n/app.zh_TW.yml b/assets/i18n/app.zh_TW.yml index f409c3e..c5cb1e6 100644 --- a/assets/i18n/app.zh_TW.yml +++ b/assets/i18n/app.zh_TW.yml @@ -141,6 +141,7 @@ zh_TW: lang: 語言 theme: 主題 appearance: 外貌 + force_use_os_font: 強制使用 OS 字體 proxy_all: 代理 proxy_all_tooltip: |- From 01d0f4eaeef6b5ab61c03742cead7c1e0290f54d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=81?= Date: Tue, 4 Jun 2024 13:59:05 +0900 Subject: [PATCH 2/9] fix migrate config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ふぁ --- DMMGamePlayerFastLauncher/component/variable_base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DMMGamePlayerFastLauncher/component/variable_base.py b/DMMGamePlayerFastLauncher/component/variable_base.py index 06a68da..d1e6ca2 100644 --- a/DMMGamePlayerFastLauncher/component/variable_base.py +++ b/DMMGamePlayerFastLauncher/component/variable_base.py @@ -10,5 +10,6 @@ def to_dict(self) -> dict[str, str]: @classmethod def from_dict(cls, obj: dict[str, str]): - item = [(k, v(value=obj.get(k))) for k, v in cls.__annotations__.items()] + default = cls().__dict__ + item = [(k, v(value=obj.get(k, default[k].get()))) for k, v in cls.__annotations__.items()] return cls(**dict(item)) From 3ce821b7f86b9bc3263cca2418cb968644f526c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=81?= Date: Tue, 4 Jun 2024 14:57:16 +0900 Subject: [PATCH 3/9] =?UTF-8?q?fix=20=E6=98=8E=E6=9C=9D=E4=BD=93=E3=81=8C?= =?UTF-8?q?=E5=8B=9D=E6=89=8B=E3=81=AB=E3=83=AD=E3=83=BC=E3=83=89=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=82=8B=20#133?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ふぁ --- .../DMMGamePlayerFastLauncher.py | 15 ++++++++++++--- DMMGamePlayerFastLauncher/models/setting_data.py | 2 +- DMMGamePlayerFastLauncher/tab/setting.py | 4 +++- assets/i18n/app.en_US.yml | 11 ++++++++++- assets/i18n/app.ja_JP.yml | 11 ++++++++++- assets/i18n/app.zh_CN.yml | 11 ++++++++++- assets/i18n/app.zh_TW.yml | 11 ++++++++++- 7 files changed, 56 insertions(+), 9 deletions(-) diff --git a/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py b/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py index 102a37a..ac46eb2 100644 --- a/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py +++ b/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py @@ -74,9 +74,18 @@ def loder(master: LanchLauncher): DgpSessionV2.PROXY["https"] = AppConfig.DATA.dmm_proxy_all.get() ctk.set_default_color_theme(str(AssetsPathConfig.THEMES.joinpath(AppConfig.DATA.theme.get()).with_suffix(".json"))) - if AppConfig.DATA.force_use_os_font.get(): - os_default_font = font.nametofont("TkDefaultFont").actual() - ThemeManager.theme["CTkFont"]["family"] = os_default_font["family"] + + if AppConfig.DATA.theme_font.get() == "i18n": + i18n_font = i18n.t("app.font.home") + if i18n_font not in font.families(): + logging.warning(f"Font {i18n_font} not found") + ThemeManager.theme["CTkFont"]["family"] = i18n_font + elif AppConfig.DATA.theme_font.get() == "os": + os_default_font = font.nametofont("TkDefaultFont").config() + if os_default_font is None: + logging.warning(f"Font {os_default_font} not found") + else: + ThemeManager.theme["CTkFont"]["family"] = os_default_font["family"] ctk.set_appearance_mode(AppConfig.DATA.appearance_mode.get()) diff --git a/DMMGamePlayerFastLauncher/models/setting_data.py b/DMMGamePlayerFastLauncher/models/setting_data.py index 9e9fca2..732836a 100644 --- a/DMMGamePlayerFastLauncher/models/setting_data.py +++ b/DMMGamePlayerFastLauncher/models/setting_data.py @@ -17,7 +17,7 @@ class SettingData(VariableBase): dmm_proxy_all: StringVar = field(default_factory=StringVar) lang: StringVar = field(default_factory=lambda: StringVar(value=get_default_locale()[0])) theme: StringVar = field(default_factory=lambda: StringVar(value="blue")) - force_use_os_font: BooleanVar = field(default_factory=lambda: BooleanVar(value=True)) + theme_font: StringVar = field(default_factory=lambda: StringVar(value="i18n")) appearance_mode: StringVar = field(default_factory=lambda: StringVar(value="dark")) window_scaling: DoubleVar = field(default_factory=lambda: DoubleVar(value=1.0)) debug_window: BooleanVar = field(default_factory=lambda: BooleanVar(value=False)) diff --git a/DMMGamePlayerFastLauncher/tab/setting.py b/DMMGamePlayerFastLauncher/tab/setting.py index 26fe91a..c7a781a 100644 --- a/DMMGamePlayerFastLauncher/tab/setting.py +++ b/DMMGamePlayerFastLauncher/tab/setting.py @@ -57,7 +57,9 @@ def create(self): OptionMenuTupleComponent(self, text=i18n.t("app.setting.lang"), values=self.lang, variable=self.data.lang).create() OptionMenuComponent(self, text=i18n.t("app.setting.theme"), values=self.theme, variable=self.data.theme).create() OptionMenuComponent(self, text=i18n.t("app.setting.appearance"), values=["light", "dark", "system"], variable=self.data.appearance_mode).create() - CheckBoxComponent(self, text=i18n.t("app.setting.force_use_os_font"), variable=self.data.force_use_os_font).create() + + text = i18n.t("app.setting.font_preset") + OptionMenuComponent(self, text=text, tooltip=i18n.t("app.setting.font_preset_tooltip"), values=["i18n", "os", "theme"], variable=self.data.theme_font).create() text = i18n.t("app.setting.proxy_all") EntryComponent(self, text=text, tooltip=i18n.t("app.setting.proxy_all_tooltip"), variable=self.data.proxy_all).create() diff --git a/assets/i18n/app.en_US.yml b/assets/i18n/app.en_US.yml index e7463af..9eab63a 100644 --- a/assets/i18n/app.en_US.yml +++ b/assets/i18n/app.en_US.yml @@ -2,6 +2,9 @@ en_US: title: DMMGamePlayer Fast Launcher language: English + font: + home: "Segoe UI" + tab: home: Home shortcut: Shortcut @@ -143,7 +146,13 @@ en_US: lang: Language theme: Theme appearance: Appearance - force_use_os_font: Force use of OS fonts + + font_preset: Font Preset + font_preset_tooltip: |- + Select a font preset. + i18n: Optimized fonts for each language will be selected. + os: The default font of the operating system will be selected. + theme: Fonts matching the theme will be selected. proxy_all: Proxy proxy_all_tooltip: |- diff --git a/assets/i18n/app.ja_JP.yml b/assets/i18n/app.ja_JP.yml index a212cc5..1c15a8a 100644 --- a/assets/i18n/app.ja_JP.yml +++ b/assets/i18n/app.ja_JP.yml @@ -2,6 +2,9 @@ ja_JP: title: DMMGamePlayer Fast Launcher language: 日本語 + font: + home: "Yu Gothic UI" + tab: home: ホーム shortcut: ショートカット @@ -140,7 +143,13 @@ ja_JP: lang: 言語 theme: テーマ appearance: 外観 - force_use_os_font: OS フォントの利用を強制する + + font_preset: フォントプリセット + font_preset_tooltip: |- + フォントプリセットを選択します。 + i18n: 言語ごとに最適化されたフォントが選択されます。 + os: OSのデフォルトフォントが選択されます。 + theme: テーマに合わせたフォントが選択されます。 proxy_all: プロキシ proxy_all_tooltip: |- diff --git a/assets/i18n/app.zh_CN.yml b/assets/i18n/app.zh_CN.yml index 02631ff..c6f3719 100644 --- a/assets/i18n/app.zh_CN.yml +++ b/assets/i18n/app.zh_CN.yml @@ -2,6 +2,9 @@ zh_CN: title: DMMGamePlayer Fast Launcher language: 简体中文 + font: + home: "Microsoft YaHei UI" + tab: home: 主页 shortcut: 快捷方式 @@ -142,7 +145,13 @@ zh_CN: lang: 语言 theme: 主题 appearance: 外观 - force_use_os_font: 强制使用 OS 字体 + + font_preset: 字体预设 + font_preset_tooltip: |- + 选择字体预设。 + i18n: 将选择针对每种语言优化的字体。 + os: 将选择操作系统的默认字体。 + theme: 将选择与主题匹配的字体。 proxy_all: 代理 proxy_all_tooltip: |- diff --git a/assets/i18n/app.zh_TW.yml b/assets/i18n/app.zh_TW.yml index c5cb1e6..ae61039 100644 --- a/assets/i18n/app.zh_TW.yml +++ b/assets/i18n/app.zh_TW.yml @@ -2,6 +2,9 @@ zh_TW: title: DMMGamePlayer Fast Launcher language: 繁體中文 + font: + home: "Microsoft JhengHei UI" + tab: home: 首頁 shortcut: 快捷方式 @@ -141,7 +144,13 @@ zh_TW: lang: 語言 theme: 主題 appearance: 外貌 - force_use_os_font: 強制使用 OS 字體 + + font_preset: 字型預設 + font_preset_tooltip: |- + 選擇字型預設。 + i18n: 將選擇針對每種語言優化的字型。 + os: 將選擇操作系統的預設字型。 + theme: 將選擇與主題匹配的字型。 proxy_all: 代理 proxy_all_tooltip: |- From 000526fd00a7b0ade6cc727ea3bfbd9684dbcb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=81?= Date: Tue, 4 Jun 2024 18:55:10 +0900 Subject: [PATCH 4/9] rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ふぁ --- DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py | 2 +- assets/i18n/app.en_US.yml | 2 +- assets/i18n/app.ja_JP.yml | 2 +- assets/i18n/app.zh_CN.yml | 2 +- assets/i18n/app.zh_TW.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py b/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py index ac46eb2..ce204ce 100644 --- a/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py +++ b/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py @@ -76,7 +76,7 @@ def loder(master: LanchLauncher): ctk.set_default_color_theme(str(AssetsPathConfig.THEMES.joinpath(AppConfig.DATA.theme.get()).with_suffix(".json"))) if AppConfig.DATA.theme_font.get() == "i18n": - i18n_font = i18n.t("app.font.home") + i18n_font = i18n.t("app.font.main") if i18n_font not in font.families(): logging.warning(f"Font {i18n_font} not found") ThemeManager.theme["CTkFont"]["family"] = i18n_font diff --git a/assets/i18n/app.en_US.yml b/assets/i18n/app.en_US.yml index 9eab63a..9521efb 100644 --- a/assets/i18n/app.en_US.yml +++ b/assets/i18n/app.en_US.yml @@ -3,7 +3,7 @@ en_US: language: English font: - home: "Segoe UI" + main: "Segoe UI" tab: home: Home diff --git a/assets/i18n/app.ja_JP.yml b/assets/i18n/app.ja_JP.yml index 1c15a8a..62fa786 100644 --- a/assets/i18n/app.ja_JP.yml +++ b/assets/i18n/app.ja_JP.yml @@ -3,7 +3,7 @@ ja_JP: language: 日本語 font: - home: "Yu Gothic UI" + main: "Yu Gothic UI" tab: home: ホーム diff --git a/assets/i18n/app.zh_CN.yml b/assets/i18n/app.zh_CN.yml index c6f3719..9d0dc2e 100644 --- a/assets/i18n/app.zh_CN.yml +++ b/assets/i18n/app.zh_CN.yml @@ -3,7 +3,7 @@ zh_CN: language: 简体中文 font: - home: "Microsoft YaHei UI" + main: "Microsoft YaHei UI" tab: home: 主页 diff --git a/assets/i18n/app.zh_TW.yml b/assets/i18n/app.zh_TW.yml index ae61039..51c0300 100644 --- a/assets/i18n/app.zh_TW.yml +++ b/assets/i18n/app.zh_TW.yml @@ -3,7 +3,7 @@ zh_TW: language: 繁體中文 font: - home: "Microsoft JhengHei UI" + main: "Microsoft JhengHei UI" tab: home: 首頁 From d5f69d5c091071d45cc97a1b104ecf416cf7ff70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=81?= Date: Tue, 4 Jun 2024 20:15:45 +0900 Subject: [PATCH 5/9] fix get sid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ふぁ --- DMMGamePlayerFastLauncher/lib/process_manager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DMMGamePlayerFastLauncher/lib/process_manager.py b/DMMGamePlayerFastLauncher/lib/process_manager.py index e10f18b..e72dfd6 100644 --- a/DMMGamePlayerFastLauncher/lib/process_manager.py +++ b/DMMGamePlayerFastLauncher/lib/process_manager.py @@ -83,8 +83,8 @@ def search(self, name: str) -> int: def get_sid() -> str: - desc = win32security.GetFileSecurity(".", win32security.OWNER_SECURITY_INFORMATION) - sid = desc.GetSecurityDescriptorOwner() + username = os.getlogin() + sid, domain, type = win32security.LookupAccountName("", username) sidstr = win32security.ConvertSidToStringSid(sid) return sidstr From f15a0bd12ba98459addbdf1a00eda7c087be37df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=81?= Date: Tue, 4 Jun 2024 20:16:40 +0900 Subject: [PATCH 6/9] remove or MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ふぁ --- DMMGamePlayerFastLauncher/static/loder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DMMGamePlayerFastLauncher/static/loder.py b/DMMGamePlayerFastLauncher/static/loder.py index 298a04f..43a7622 100644 --- a/DMMGamePlayerFastLauncher/static/loder.py +++ b/DMMGamePlayerFastLauncher/static/loder.py @@ -37,7 +37,7 @@ def config_loder(): def config_migrate(): if AppConfig.DATA.last_version.get() != Env.VERSION: - version = Version(AppConfig.DATA.last_version.get() or "v0.0.0") + version = Version(AppConfig.DATA.last_version.get()) logging.info(f"Migration from {version} to {Env.VERSION}") if version < Version("v5.5.2"): From b059e01a941146d77474b25c1bd7f7c998f13589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=81?= Date: Tue, 4 Jun 2024 20:32:22 +0900 Subject: [PATCH 7/9] add tutorial video MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ふぁ --- README-en.md | 2 ++ README.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README-en.md b/README-en.md index 920b02c..b5c5555 100644 --- a/README-en.md +++ b/README-en.md @@ -8,6 +8,8 @@ DMM Game Player Fast Launcher for secure and fast start-up [Detailed instructions(Japanese)](/docs/README-advance.md) +[Tutorial Video](https://github.com/fa0311/DMMGamePlayerFastLauncher/issues/135) + ## Features - **One click to launch the game** diff --git a/README.md b/README.md index cf8cf30..90c4b31 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ DMM Game Player のゲームを高速かつセキュアに起動できるラン [詳しい使い方](/docs/README-advance.md) +[チュートリアル動画](https://github.com/fa0311/DMMGamePlayerFastLauncher/issues/135) + ## 特徴 - **ワンクリックでゲームを起動** From 8ea1f0f050d2c8b70b8d918cf80306d675ebb7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=81?= Date: Thu, 6 Jun 2024 13:54:42 +0900 Subject: [PATCH 8/9] update 5.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ふぁ --- DMMGamePlayerFastLauncher/static/env.py | 2 +- setup.iss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DMMGamePlayerFastLauncher/static/env.py b/DMMGamePlayerFastLauncher/static/env.py index b709dfc..478904d 100644 --- a/DMMGamePlayerFastLauncher/static/env.py +++ b/DMMGamePlayerFastLauncher/static/env.py @@ -8,7 +8,7 @@ class Env(Dump): - VERSION = "v5.6.1" + VERSION = "v5.7.0" RELEASE_VERSION = requests.get(UrlConfig.RELEASE_API).json().get("tag_name", VERSION) DEVELOP: bool = os.environ.get("ENV") == "DEVELOP" diff --git a/setup.iss b/setup.iss index ff8dc1d..d30c754 100644 --- a/setup.iss +++ b/setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "DMMGamePlayerFastLauncher" -#define MyAppVersion "5.6.1" +#define MyAppVersion "5.7.0" #define MyAppPublisher "yuki" #define MyAppURL "https://github.com/fa0311/DMMGamePlayerFastLauncher" #define MyAppExeName "DMMGamePlayerFastLauncher.exe" From 029e13f5dbbdb893fd8c7fef2ea355c1b897c12c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=B5=E3=81=81?= Date: Thu, 6 Jun 2024 14:08:30 +0900 Subject: [PATCH 9/9] add new theme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ふぁ --- .../DMMGamePlayerFastLauncher.py | 8 + README-en.md | 5 +- README.md | 5 +- assets/themes/blue.json | 354 +++++++++++++---- assets/themes/dark-blue.json | 354 +++++++++++++---- assets/themes/green.json | 354 +++++++++++++---- assets/themes/magenta.json | 359 ++++++++++++++++++ assets/themes/purple.json | 359 ++++++++++++++++++ assets/themes/red.json | 359 ++++++++++++++++++ assets/themes/torquoise.json | 359 ++++++++++++++++++ 10 files changed, 2269 insertions(+), 247 deletions(-) create mode 100644 assets/themes/magenta.json create mode 100644 assets/themes/purple.json create mode 100644 assets/themes/red.json create mode 100644 assets/themes/torquoise.json diff --git a/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py b/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py index ce204ce..16badc9 100644 --- a/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py +++ b/DMMGamePlayerFastLauncher/DMMGamePlayerFastLauncher.py @@ -75,6 +75,14 @@ def loder(master: LanchLauncher): ctk.set_default_color_theme(str(AssetsPathConfig.THEMES.joinpath(AppConfig.DATA.theme.get()).with_suffix(".json"))) + additional_theme = { + "MenuComponent": {"text_color": ["#000000", "#ffffff"]}, + "LabelComponent": {"fg_color": ["#F9F9FA", "#343638"], "required_color": ["red", "red"]}, + "CheckBoxComponent": {"checkbox_width": 16, "checkbox_height": 16, "border_width": 2}, + } + for key, value in additional_theme.items(): + ThemeManager.theme[key] = value + if AppConfig.DATA.theme_font.get() == "i18n": i18n_font = i18n.t("app.font.main") if i18n_font not in font.families(): diff --git a/README-en.md b/README-en.md index b5c5555..c4d55a8 100644 --- a/README-en.md +++ b/README-en.md @@ -48,8 +48,9 @@ If you find a bug, please report it in [Issues](https://github.com/fa0311/DMMGam ## Source -[Lutwidse/priconner_launch.py](https://gist.github.com/Lutwidse/82d8e7a20c96296bc0318f1cb6bf26ee) -[kira-96/Inno-Setup-Chinese-Simplified-Translation](https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation) +- [Lutwidse/priconner_launch.py](https://gist.github.com/Lutwidse/82d8e7a20c96296bc0318f1cb6bf26ee) +- [kira-96/Inno-Setup-Chinese-Simplified-Translation](https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation) +- [@takafi CustomTkinter 簡易カスタムテーマ作成ツール](https://qiita.com/takafi/items/90c17b7888263100cbbc) ## License diff --git a/README.md b/README.md index 90c4b31..a6a8b41 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,9 @@ DMM Game Player のゲームを高速かつセキュアに起動できるラン ## 典拠 -[Lutwidse/priconner_launch.py](https://gist.github.com/Lutwidse/82d8e7a20c96296bc0318f1cb6bf26ee) -[kira-96/Inno-Setup-Chinese-Simplified-Translation](https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation) +- [Lutwidse/priconner_launch.py](https://gist.github.com/Lutwidse/82d8e7a20c96296bc0318f1cb6bf26ee) +- [kira-96/Inno-Setup-Chinese-Simplified-Translation](https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation) +- [@takafi CustomTkinter 簡易カスタムテーマ作成ツール](https://qiita.com/takafi/items/90c17b7888263100cbbc) ## ライセンス diff --git a/assets/themes/blue.json b/assets/themes/blue.json index 04facb9..c040cdb 100644 --- a/assets/themes/blue.json +++ b/assets/themes/blue.json @@ -1,139 +1,343 @@ { "CTk": { - "fg_color": ["gray92", "gray14"] + "fg_color": [ + "gray92", + "gray14" + ] }, "CTkToplevel": { - "fg_color": ["gray92", "gray14"] + "fg_color": [ + "gray92", + "gray14" + ] }, "CTkFrame": { "corner_radius": 6, "border_width": 0, - "fg_color": ["gray86", "gray17"], - "top_fg_color": ["gray81", "gray20"], - "border_color": ["gray65", "gray28"] + "fg_color": [ + "gray86", + "gray17" + ], + "top_fg_color": [ + "gray81", + "gray20" + ], + "border_color": [ + "gray65", + "gray28" + ] }, "CTkButton": { "corner_radius": 6, "border_width": 0, - "fg_color": ["#3B8ED0", "#1F6AA5"], - "hover_color": ["#36719F", "#144870"], - "border_color": ["#3E454A", "#949A9F"], - "text_color": ["#DCE4EE", "#DCE4EE"], - "text_color_disabled": ["gray74", "gray60"] + "fg_color": [ + "#3B8ED0", + "#1F6AA5" + ], + "hover_color": [ + "#36719F", + "#144870" + ], + "border_color": [ + "#3E454A", + "#949A9F" + ], + "text_color": [ + "#DCE4EE", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] }, "CTkLabel": { "corner_radius": 0, "fg_color": "transparent", - "text_color": ["gray10", "#DCE4EE"] + "text_color": [ + "gray10", + "#DCE4EE" + ] }, "CTkEntry": { "corner_radius": 6, "border_width": 2, - "fg_color": ["#F9F9FA", "#343638"], - "border_color": ["#979DA2", "#565B5E"], - "text_color": ["gray10", "#DCE4EE"], - "placeholder_text_color": ["gray52", "gray62"] + "fg_color": [ + "#F9F9FA", + "#343638" + ], + "border_color": [ + "#979DA2", + "#565B5E" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "placeholder_text_color": [ + "gray52", + "gray62" + ] }, "CTkCheckBox": { "corner_radius": 6, "border_width": 3, - "fg_color": ["#3B8ED0", "#1F6AA5"], - "border_color": ["#3E454A", "#949A9F"], - "hover_color": ["#3B8ED0", "#1F6AA5"], - "checkmark_color": ["#DCE4EE", "gray90"], - "text_color": ["gray10", "#DCE4EE"], - "text_color_disabled": ["gray60", "gray45"] + "fg_color": [ + "#3B8ED0", + "#1F6AA5" + ], + "border_color": [ + "#3E454A", + "#949A9F" + ], + "hover_color": [ + "#3B8ED0", + "#1F6AA5" + ], + "checkmark_color": [ + "#DCE4EE", + "gray90" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] }, "CTkSwitch": { "corner_radius": 1000, "border_width": 3, "button_length": 0, - "fg_color": ["#939BA2", "#4A4D50"], - "progress_color": ["#3B8ED0", "#1F6AA5"], - "button_color": ["gray36", "#D5D9DE"], - "button_hover_color": ["gray20", "gray100"], - "text_color": ["gray10", "#DCE4EE"], - "text_color_disabled": ["gray60", "gray45"] + "fg_color": [ + "#939BA2", + "#4A4D50" + ], + "progress_color": [ + "#3B8ED0", + "#1F6AA5" + ], + "button_color": [ + "gray36", + "#D5D9DE" + ], + "button_hover_color": [ + "gray20", + "gray100" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] }, "CTkRadioButton": { "corner_radius": 1000, "border_width_checked": 6, "border_width_unchecked": 3, - "fg_color": ["#3B8ED0", "#1F6AA5"], - "border_color": ["#3E454A", "#949A9F"], - "hover_color": ["#36719F", "#144870"], - "text_color": ["gray10", "#DCE4EE"], - "text_color_disabled": ["gray60", "gray45"] + "fg_color": [ + "#3B8ED0", + "#1F6AA5" + ], + "border_color": [ + "#3E454A", + "#949A9F" + ], + "hover_color": [ + "#36719F", + "#144870" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] }, "CTkProgressBar": { "corner_radius": 1000, "border_width": 0, - "fg_color": ["#939BA2", "#4A4D50"], - "progress_color": ["#3B8ED0", "#1F6AA5"], - "border_color": ["gray", "gray"] + "fg_color": [ + "#939BA2", + "#4A4D50" + ], + "progress_color": [ + "#3B8ED0", + "#1F6AA5" + ], + "border_color": [ + "gray", + "gray" + ] }, "CTkSlider": { "corner_radius": 1000, "button_corner_radius": 1000, "border_width": 6, "button_length": 0, - "fg_color": ["#939BA2", "#4A4D50"], - "progress_color": ["gray40", "#AAB0B5"], - "button_color": ["#3B8ED0", "#1F6AA5"], - "button_hover_color": ["#36719F", "#144870"] + "fg_color": [ + "#939BA2", + "#4A4D50" + ], + "progress_color": [ + "gray40", + "#AAB0B5" + ], + "button_color": [ + "#3B8ED0", + "#1F6AA5" + ], + "button_hover_color": [ + "#36719F", + "#144870" + ] }, "CTkOptionMenu": { "corner_radius": 6, - "fg_color": ["#3B8ED0", "#1F6AA5"], - "button_color": ["#36719F", "#144870"], - "button_hover_color": ["#27577D", "#203A4F"], - "text_color": ["#DCE4EE", "#DCE4EE"], - "text_color_disabled": ["gray74", "gray60"] + "fg_color": [ + "#3B8ED0", + "#1F6AA5" + ], + "button_color": [ + "#36719F", + "#144870" + ], + "button_hover_color": [ + "#27577D", + "#203A4F" + ], + "text_color": [ + "#DCE4EE", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] }, "CTkComboBox": { "corner_radius": 6, "border_width": 2, - "fg_color": ["#F9F9FA", "#343638"], - "border_color": ["#979DA2", "#565B5E"], - "button_color": ["#979DA2", "#565B5E"], - "button_hover_color": ["#6E7174", "#7A848D"], - "text_color": ["gray10", "#DCE4EE"], - "text_color_disabled": ["gray50", "gray45"] + "fg_color": [ + "#F9F9FA", + "#343638" + ], + "border_color": [ + "#979DA2", + "#565B5E" + ], + "button_color": [ + "#979DA2", + "#565B5E" + ], + "button_hover_color": [ + "#6E7174", + "#7A848D" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray50", + "gray45" + ] }, "CTkScrollbar": { "corner_radius": 1000, "border_spacing": 4, "fg_color": "transparent", - "button_color": ["gray55", "gray41"], - "button_hover_color": ["gray40", "gray53"] + "button_color": [ + "gray55", + "gray41" + ], + "button_hover_color": [ + "gray40", + "gray53" + ] }, "CTkSegmentedButton": { "corner_radius": 6, "border_width": 2, - "fg_color": ["#979DA2", "gray29"], - "selected_color": ["#3B8ED0", "#1F6AA5"], - "selected_hover_color": ["#36719F", "#144870"], - "unselected_color": ["#979DA2", "gray29"], - "unselected_hover_color": ["gray70", "gray41"], - "text_color": ["#DCE4EE", "#DCE4EE"], - "text_color_disabled": ["gray74", "gray60"] + "fg_color": [ + "#979DA2", + "gray29" + ], + "selected_color": [ + "#3B8ED0", + "#1F6AA5" + ], + "selected_hover_color": [ + "#36719F", + "#144870" + ], + "unselected_color": [ + "#979DA2", + "gray29" + ], + "unselected_hover_color": [ + "gray70", + "gray41" + ], + "text_color": [ + "#DCE4EE", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] }, "CTkTextbox": { "corner_radius": 6, "border_width": 0, - "fg_color": ["#F9F9FA", "#1D1E1E"], - "border_color": ["#979DA2", "#565B5E"], - "text_color": ["gray10", "#DCE4EE"], - "scrollbar_button_color": ["gray55", "gray41"], - "scrollbar_button_hover_color": ["gray40", "gray53"] + "fg_color": [ + "#F9F9FA", + "#1D1E1E" + ], + "border_color": [ + "#979DA2", + "#565B5E" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "scrollbar_button_color": [ + "gray55", + "gray41" + ], + "scrollbar_button_hover_color": [ + "gray40", + "gray53" + ] }, "CTkScrollableFrame": { - "label_fg_color": ["gray78", "gray23"] + "label_fg_color": [ + "gray78", + "gray23" + ] }, "DropdownMenu": { - "fg_color": ["gray90", "gray20"], - "hover_color": ["gray75", "gray28"], - "text_color": ["gray10", "gray90"] + "fg_color": [ + "gray90", + "gray20" + ], + "hover_color": [ + "gray75", + "gray28" + ], + "text_color": [ + "gray10", + "gray90" + ] }, "CTkFont": { "macOS": { @@ -151,17 +355,5 @@ "size": 13, "weight": "normal" } - }, - "MenuComponent": { - "text_color": ["#000000", "#ffffff"] - }, - "LabelComponent": { - "fg_color": ["#F9F9FA", "#343638"], - "required_color": ["red", "red"] - }, - "CheckBoxComponent": { - "checkbox_width": 16, - "checkbox_height": 16, - "border_width": 2 } -} +} \ No newline at end of file diff --git a/assets/themes/dark-blue.json b/assets/themes/dark-blue.json index 55bd262..1bd4084 100644 --- a/assets/themes/dark-blue.json +++ b/assets/themes/dark-blue.json @@ -1,139 +1,343 @@ { "CTk": { - "fg_color": ["gray95", "gray10"] + "fg_color": [ + "gray95", + "gray10" + ] }, "CTkToplevel": { - "fg_color": ["gray95", "gray10"] + "fg_color": [ + "gray95", + "gray10" + ] }, "CTkFrame": { "corner_radius": 6, "border_width": 0, - "fg_color": ["gray90", "gray13"], - "top_fg_color": ["gray85", "gray16"], - "border_color": ["gray65", "gray28"] + "fg_color": [ + "gray90", + "gray13" + ], + "top_fg_color": [ + "gray85", + "gray16" + ], + "border_color": [ + "gray65", + "gray28" + ] }, "CTkButton": { "corner_radius": 6, "border_width": 0, - "fg_color": ["#3a7ebf", "#1f538d"], - "hover_color": ["#325882", "#14375e"], - "border_color": ["#3E454A", "#949A9F"], - "text_color": ["#DCE4EE", "#DCE4EE"], - "text_color_disabled": ["gray74", "gray60"] + "fg_color": [ + "#3a7ebf", + "#1f538d" + ], + "hover_color": [ + "#325882", + "#14375e" + ], + "border_color": [ + "#3E454A", + "#949A9F" + ], + "text_color": [ + "#DCE4EE", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] }, "CTkLabel": { "corner_radius": 0, "fg_color": "transparent", - "text_color": ["gray14", "gray84"] + "text_color": [ + "gray14", + "gray84" + ] }, "CTkEntry": { "corner_radius": 6, "border_width": 2, - "fg_color": ["#F9F9FA", "#343638"], - "border_color": ["#979DA2", "#565B5E"], - "text_color": ["gray14", "gray84"], - "placeholder_text_color": ["gray52", "gray62"] + "fg_color": [ + "#F9F9FA", + "#343638" + ], + "border_color": [ + "#979DA2", + "#565B5E" + ], + "text_color": [ + "gray14", + "gray84" + ], + "placeholder_text_color": [ + "gray52", + "gray62" + ] }, "CTkCheckBox": { "corner_radius": 6, "border_width": 3, - "fg_color": ["#3a7ebf", "#1f538d"], - "border_color": ["#3E454A", "#949A9F"], - "hover_color": ["#325882", "#14375e"], - "checkmark_color": ["#DCE4EE", "gray90"], - "text_color": ["gray14", "gray84"], - "text_color_disabled": ["gray60", "gray45"] + "fg_color": [ + "#3a7ebf", + "#1f538d" + ], + "border_color": [ + "#3E454A", + "#949A9F" + ], + "hover_color": [ + "#325882", + "#14375e" + ], + "checkmark_color": [ + "#DCE4EE", + "gray90" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] }, "CTkSwitch": { "corner_radius": 1000, "border_width": 3, "button_length": 0, - "fg_color": ["#939BA2", "#4A4D50"], - "progress_color": ["#3a7ebf", "#1f538d"], - "button_color": ["gray36", "#D5D9DE"], - "button_hover_color": ["gray20", "gray100"], - "text_color": ["gray14", "gray84"], - "text_color_disabled": ["gray60", "gray45"] + "fg_color": [ + "#939BA2", + "#4A4D50" + ], + "progress_color": [ + "#3a7ebf", + "#1f538d" + ], + "button_color": [ + "gray36", + "#D5D9DE" + ], + "button_hover_color": [ + "gray20", + "gray100" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] }, "CTkRadioButton": { "corner_radius": 1000, "border_width_checked": 6, "border_width_unchecked": 3, - "fg_color": ["#3a7ebf", "#1f538d"], - "border_color": ["#3E454A", "#949A9F"], - "hover_color": ["#325882", "#14375e"], - "text_color": ["gray14", "gray84"], - "text_color_disabled": ["gray60", "gray45"] + "fg_color": [ + "#3a7ebf", + "#1f538d" + ], + "border_color": [ + "#3E454A", + "#949A9F" + ], + "hover_color": [ + "#325882", + "#14375e" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] }, "CTkProgressBar": { "corner_radius": 1000, "border_width": 0, - "fg_color": ["#939BA2", "#4A4D50"], - "progress_color": ["#3a7ebf", "#1f538d"], - "border_color": ["gray", "gray"] + "fg_color": [ + "#939BA2", + "#4A4D50" + ], + "progress_color": [ + "#3a7ebf", + "#1f538d" + ], + "border_color": [ + "gray", + "gray" + ] }, "CTkSlider": { "corner_radius": 1000, "button_corner_radius": 1000, "border_width": 6, "button_length": 0, - "fg_color": ["#939BA2", "#4A4D50"], - "progress_color": ["gray40", "#AAB0B5"], - "button_color": ["#3a7ebf", "#1f538d"], - "button_hover_color": ["#325882", "#14375e"] + "fg_color": [ + "#939BA2", + "#4A4D50" + ], + "progress_color": [ + "gray40", + "#AAB0B5" + ], + "button_color": [ + "#3a7ebf", + "#1f538d" + ], + "button_hover_color": [ + "#325882", + "#14375e" + ] }, "CTkOptionMenu": { "corner_radius": 6, - "fg_color": ["#3a7ebf", "#1f538d"], - "button_color": ["#325882", "#14375e"], - "button_hover_color": ["#234567", "#1e2c40"], - "text_color": ["#DCE4EE", "#DCE4EE"], - "text_color_disabled": ["gray74", "gray60"] + "fg_color": [ + "#3a7ebf", + "#1f538d" + ], + "button_color": [ + "#325882", + "#14375e" + ], + "button_hover_color": [ + "#234567", + "#1e2c40" + ], + "text_color": [ + "#DCE4EE", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] }, "CTkComboBox": { "corner_radius": 6, "border_width": 2, - "fg_color": ["#F9F9FA", "#343638"], - "border_color": ["#979DA2", "#565B5E"], - "button_color": ["#979DA2", "#565B5E"], - "button_hover_color": ["#6E7174", "#7A848D"], - "text_color": ["gray14", "gray84"], - "text_color_disabled": ["gray50", "gray45"] + "fg_color": [ + "#F9F9FA", + "#343638" + ], + "border_color": [ + "#979DA2", + "#565B5E" + ], + "button_color": [ + "#979DA2", + "#565B5E" + ], + "button_hover_color": [ + "#6E7174", + "#7A848D" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray50", + "gray45" + ] }, "CTkScrollbar": { "corner_radius": 1000, "border_spacing": 4, "fg_color": "transparent", - "button_color": ["gray55", "gray41"], - "button_hover_color": ["gray40", "gray53"] + "button_color": [ + "gray55", + "gray41" + ], + "button_hover_color": [ + "gray40", + "gray53" + ] }, "CTkSegmentedButton": { "corner_radius": 6, "border_width": 2, - "fg_color": ["#979DA2", "gray29"], - "selected_color": ["#3a7ebf", "#1f538d"], - "selected_hover_color": ["#325882", "#14375e"], - "unselected_color": ["#979DA2", "gray29"], - "unselected_hover_color": ["gray70", "gray41"], - "text_color": ["#DCE4EE", "#DCE4EE"], - "text_color_disabled": ["gray74", "gray60"] + "fg_color": [ + "#979DA2", + "gray29" + ], + "selected_color": [ + "#3a7ebf", + "#1f538d" + ], + "selected_hover_color": [ + "#325882", + "#14375e" + ], + "unselected_color": [ + "#979DA2", + "gray29" + ], + "unselected_hover_color": [ + "gray70", + "gray41" + ], + "text_color": [ + "#DCE4EE", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] }, "CTkTextbox": { "corner_radius": 6, "border_width": 0, - "fg_color": ["gray100", "gray20"], - "border_color": ["#979DA2", "#565B5E"], - "text_color": ["gray14", "gray84"], - "scrollbar_button_color": ["gray55", "gray41"], - "scrollbar_button_hover_color": ["gray40", "gray53"] + "fg_color": [ + "gray100", + "gray20" + ], + "border_color": [ + "#979DA2", + "#565B5E" + ], + "text_color": [ + "gray14", + "gray84" + ], + "scrollbar_button_color": [ + "gray55", + "gray41" + ], + "scrollbar_button_hover_color": [ + "gray40", + "gray53" + ] }, "CTkScrollableFrame": { - "label_fg_color": ["gray80", "gray21"] + "label_fg_color": [ + "gray80", + "gray21" + ] }, "DropdownMenu": { - "fg_color": ["gray90", "gray20"], - "hover_color": ["gray75", "gray28"], - "text_color": ["gray14", "gray84"] + "fg_color": [ + "gray90", + "gray20" + ], + "hover_color": [ + "gray75", + "gray28" + ], + "text_color": [ + "gray14", + "gray84" + ] }, "CTkFont": { "macOS": { @@ -151,17 +355,5 @@ "size": 13, "weight": "normal" } - }, - "MenuComponent": { - "text_color": ["#000000", "#ffffff"] - }, - "LabelComponent": { - "fg_color": ["#F9F9FA", "#343638"], - "required_color": ["red", "red"] - }, - "CheckBoxComponent": { - "checkbox_width": 16, - "checkbox_height": 16, - "border_width": 2 } -} +} \ No newline at end of file diff --git a/assets/themes/green.json b/assets/themes/green.json index b6be74c..7c9a4fe 100644 --- a/assets/themes/green.json +++ b/assets/themes/green.json @@ -1,139 +1,343 @@ { "CTk": { - "fg_color": ["gray92", "gray14"] + "fg_color": [ + "gray92", + "gray14" + ] }, "CTkToplevel": { - "fg_color": ["gray92", "gray14"] + "fg_color": [ + "gray92", + "gray14" + ] }, "CTkFrame": { "corner_radius": 6, "border_width": 0, - "fg_color": ["gray86", "gray17"], - "top_fg_color": ["gray81", "gray20"], - "border_color": ["gray65", "gray28"] + "fg_color": [ + "gray86", + "gray17" + ], + "top_fg_color": [ + "gray81", + "gray20" + ], + "border_color": [ + "gray65", + "gray28" + ] }, "CTkButton": { "corner_radius": 6, "border_width": 0, - "fg_color": ["#2CC985", "#2FA572"], - "hover_color": ["#0C955A", "#106A43"], - "border_color": ["#3E454A", "#949A9F"], - "text_color": ["gray98", "#DCE4EE"], - "text_color_disabled": ["gray78", "gray68"] + "fg_color": [ + "#2CC985", + "#2FA572" + ], + "hover_color": [ + "#0C955A", + "#106A43" + ], + "border_color": [ + "#3E454A", + "#949A9F" + ], + "text_color": [ + "gray98", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray78", + "gray68" + ] }, "CTkLabel": { "corner_radius": 0, "fg_color": "transparent", - "text_color": ["gray10", "#DCE4EE"] + "text_color": [ + "gray10", + "#DCE4EE" + ] }, "CTkEntry": { "corner_radius": 6, "border_width": 2, - "fg_color": ["#F9F9FA", "#343638"], - "border_color": ["#979DA2", "#565B5E"], - "text_color": ["gray10", "#DCE4EE"], - "placeholder_text_color": ["gray52", "gray62"] + "fg_color": [ + "#F9F9FA", + "#343638" + ], + "border_color": [ + "#979DA2", + "#565B5E" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "placeholder_text_color": [ + "gray52", + "gray62" + ] }, "CTkCheckBox": { "corner_radius": 6, "border_width": 3, - "fg_color": ["#2CC985", "#2FA572"], - "border_color": ["#3E454A", "#949A9F"], - "hover_color": ["#0C955A", "#106A43"], - "checkmark_color": ["#DCE4EE", "gray90"], - "text_color": ["gray10", "#DCE4EE"], - "text_color_disabled": ["gray60", "gray45"] + "fg_color": [ + "#2CC985", + "#2FA572" + ], + "border_color": [ + "#3E454A", + "#949A9F" + ], + "hover_color": [ + "#0C955A", + "#106A43" + ], + "checkmark_color": [ + "#DCE4EE", + "gray90" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] }, "CTkSwitch": { "corner_radius": 1000, "border_width": 3, "button_length": 0, - "fg_color": ["#939BA2", "#4A4D50"], - "progress_color": ["#2CC985", "#2FA572"], - "button_color": ["gray36", "#D5D9DE"], - "button_hover_color": ["gray20", "gray100"], - "text_color": ["gray10", "#DCE4EE"], - "text_color_disabled": ["gray60", "gray45"] + "fg_color": [ + "#939BA2", + "#4A4D50" + ], + "progress_color": [ + "#2CC985", + "#2FA572" + ], + "button_color": [ + "gray36", + "#D5D9DE" + ], + "button_hover_color": [ + "gray20", + "gray100" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] }, "CTkRadioButton": { "corner_radius": 1000, "border_width_checked": 6, "border_width_unchecked": 3, - "fg_color": ["#2CC985", "#2FA572"], - "border_color": ["#3E454A", "#949A9F"], - "hover_color": ["#0C955A", "#106A43"], - "text_color": ["gray10", "#DCE4EE"], - "text_color_disabled": ["gray60", "gray45"] + "fg_color": [ + "#2CC985", + "#2FA572" + ], + "border_color": [ + "#3E454A", + "#949A9F" + ], + "hover_color": [ + "#0C955A", + "#106A43" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] }, "CTkProgressBar": { "corner_radius": 1000, "border_width": 0, - "fg_color": ["#939BA2", "#4A4D50"], - "progress_color": ["#2CC985", "#2FA572"], - "border_color": ["gray", "gray"] + "fg_color": [ + "#939BA2", + "#4A4D50" + ], + "progress_color": [ + "#2CC985", + "#2FA572" + ], + "border_color": [ + "gray", + "gray" + ] }, "CTkSlider": { "corner_radius": 1000, "button_corner_radius": 1000, "border_width": 6, "button_length": 0, - "fg_color": ["#939BA2", "#4A4D50"], - "progress_color": ["gray40", "#AAB0B5"], - "button_color": ["#2CC985", "#2FA572"], - "button_hover_color": ["#0C955A", "#106A43"] + "fg_color": [ + "#939BA2", + "#4A4D50" + ], + "progress_color": [ + "gray40", + "#AAB0B5" + ], + "button_color": [ + "#2CC985", + "#2FA572" + ], + "button_hover_color": [ + "#0C955A", + "#106A43" + ] }, "CTkOptionMenu": { "corner_radius": 6, - "fg_color": ["#2cbe79", "#2FA572"], - "button_color": ["#0C955A", "#106A43"], - "button_hover_color": ["#0b6e3d", "#17472e"], - "text_color": ["gray98", "#DCE4EE"], - "text_color_disabled": ["gray78", "gray68"] + "fg_color": [ + "#2cbe79", + "#2FA572" + ], + "button_color": [ + "#0C955A", + "#106A43" + ], + "button_hover_color": [ + "#0b6e3d", + "#17472e" + ], + "text_color": [ + "gray98", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray78", + "gray68" + ] }, "CTkComboBox": { "corner_radius": 6, "border_width": 2, - "fg_color": ["#F9F9FA", "#343638"], - "border_color": ["#979DA2", "#565B5E"], - "button_color": ["#979DA2", "#565B5E"], - "button_hover_color": ["#6E7174", "#7A848D"], - "text_color": ["gray10", "#DCE4EE"], - "text_color_disabled": ["gray50", "gray45"] + "fg_color": [ + "#F9F9FA", + "#343638" + ], + "border_color": [ + "#979DA2", + "#565B5E" + ], + "button_color": [ + "#979DA2", + "#565B5E" + ], + "button_hover_color": [ + "#6E7174", + "#7A848D" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray50", + "gray45" + ] }, "CTkScrollbar": { "corner_radius": 1000, "border_spacing": 4, "fg_color": "transparent", - "button_color": ["gray55", "gray41"], - "button_hover_color": ["gray40", "gray53"] + "button_color": [ + "gray55", + "gray41" + ], + "button_hover_color": [ + "gray40", + "gray53" + ] }, "CTkSegmentedButton": { "corner_radius": 6, "border_width": 2, - "fg_color": ["#979DA2", "gray29"], - "selected_color": ["#2CC985", "#2FA572"], - "selected_hover_color": ["#0C955A", "#106A43"], - "unselected_color": ["#979DA2", "gray29"], - "unselected_hover_color": ["gray70", "gray41"], - "text_color": ["gray98", "#DCE4EE"], - "text_color_disabled": ["gray78", "gray68"] + "fg_color": [ + "#979DA2", + "gray29" + ], + "selected_color": [ + "#2CC985", + "#2FA572" + ], + "selected_hover_color": [ + "#0C955A", + "#106A43" + ], + "unselected_color": [ + "#979DA2", + "gray29" + ], + "unselected_hover_color": [ + "gray70", + "gray41" + ], + "text_color": [ + "gray98", + "#DCE4EE" + ], + "text_color_disabled": [ + "gray78", + "gray68" + ] }, "CTkTextbox": { "corner_radius": 6, "border_width": 0, - "fg_color": ["#F9F9FA", "gray23"], - "border_color": ["#979DA2", "#565B5E"], - "text_color": ["gray10", "#DCE4EE"], - "scrollbar_button_color": ["gray55", "gray41"], - "scrollbar_button_hover_color": ["gray40", "gray53"] + "fg_color": [ + "#F9F9FA", + "gray23" + ], + "border_color": [ + "#979DA2", + "#565B5E" + ], + "text_color": [ + "gray10", + "#DCE4EE" + ], + "scrollbar_button_color": [ + "gray55", + "gray41" + ], + "scrollbar_button_hover_color": [ + "gray40", + "gray53" + ] }, "CTkScrollableFrame": { - "label_fg_color": ["gray78", "gray23"] + "label_fg_color": [ + "gray78", + "gray23" + ] }, "DropdownMenu": { - "fg_color": ["gray90", "gray20"], - "hover_color": ["gray75", "gray28"], - "text_color": ["gray10", "gray90"] + "fg_color": [ + "gray90", + "gray20" + ], + "hover_color": [ + "gray75", + "gray28" + ], + "text_color": [ + "gray10", + "gray90" + ] }, "CTkFont": { "macOS": { @@ -151,17 +355,5 @@ "size": 13, "weight": "normal" } - }, - "MenuComponent": { - "text_color": ["#000000", "#ffffff"] - }, - "LabelComponent": { - "fg_color": ["#F9F9FA", "#343638"], - "required_color": ["red", "red"] - }, - "CheckBoxComponent": { - "checkbox_width": 16, - "checkbox_height": 16, - "border_width": 2 } -} +} \ No newline at end of file diff --git a/assets/themes/magenta.json b/assets/themes/magenta.json new file mode 100644 index 0000000..38e1bbf --- /dev/null +++ b/assets/themes/magenta.json @@ -0,0 +1,359 @@ +{ + "CTk": { + "fg_color": [ + "gray95", + "gray10" + ] + }, + "CTkToplevel": { + "fg_color": [ + "gray95", + "gray10" + ] + }, + "CTkFrame": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "gray90", + "gray13" + ], + "top_fg_color": [ + "gray85", + "gray16" + ], + "border_color": [ + "gray65", + "gray28" + ] + }, + "CTkButton": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "#c01d6f", + "#8b0648" + ], + "hover_color": [ + "#8d1c55", + "#620533" + ], + "border_color": [ + "grey27", + "grey60" + ], + "text_color": [ + "grey89", + "grey89" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkLabel": { + "corner_radius": 0, + "fg_color": "transparent", + "text_color": [ + "gray14", + "gray84" + ] + }, + "CTkEntry": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray98", + "gray21" + ], + "border_color": [ + "gray61", + "grey35" + ], + "text_color": [ + "gray14", + "gray84" + ], + "placeholder_text_color": [ + "gray52", + "gray62" + ] + }, + "CTkCheckbox": { + "corner_radius": 6, + "border_width": 3, + "fg_color": [ + "#c01d6f", + "#8b0648" + ], + "border_color": [ + "grey27", + "grey60" + ], + "hover_color": [ + "#8d1c55", + "#620533" + ], + "checkmark_color": [ + "grey89", + "gray90" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkSwitch": { + "corner_radius": 1000, + "border_width": 3, + "button_length": 0, + "fg_Color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "#c01d6f", + "#8b0648" + ], + "button_color": [ + "gray36", + "gray85" + ], + "button_hover_color": [ + "gray20", + "gray100" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkRadiobutton": { + "corner_radius": 1000, + "border_width_checked": 6, + "border_width_unchecked": 3, + "fg_color": [ + "#c01d6f", + "#8b0648" + ], + "border_color": [ + "grey27", + "grey60" + ], + "hover_color": [ + "#8d1c55", + "#620533" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkProgressBar": { + "corner_radius": 1000, + "border_width": 0, + "fg_color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "#c01d6f", + "#8b0648" + ], + "border_color": [ + "gray", + "gray" + ] + }, + "CTkSlider": { + "corner_radius": 1000, + "button_corner_radius": 1000, + "border_width": 6, + "button_length": 0, + "fg_color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "gray40", + "gray69" + ], + "button_color": [ + "#c01d6f", + "#8b0648" + ], + "button_hover_color": [ + "#8d1c55", + "#620533" + ] + }, + "CTkOptionMenu": { + "corner_radius": 6, + "fg_color": [ + "#c01d6f", + "#8b0648" + ], + "button_color": [ + "#8d1c55", + "#620533" + ], + "button_hover_color": [ + "#741444", + "#4e1331" + ], + "text_color": [ + "grey89", + "grey89" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkComboBox": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray98", + "gray21" + ], + "border_color": [ + "gray61", + "grey35" + ], + "button_color": [ + "gray61", + "grey35" + ], + "button_hover_color": [ + "grey44", + "grey52" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray50", + "gray45" + ] + }, + "CTkScrollbar": { + "corner_radius": 1000, + "border_spacing": 4, + "fg_color": "transparent", + "button_color": [ + "gray55", + "gray41" + ], + "button_hover_color": [ + "gray40", + "gray53" + ] + }, + "CTkSegmentedButton": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray61", + "gray29" + ], + "selected_color": [ + "#c01d6f", + "#8b0648" + ], + "selected_hover_color": [ + "#8d1c55", + "#620533" + ], + "unselected_color": [ + "gray61", + "gray29" + ], + "unselected_hover_color": [ + "gray70", + "gray41" + ], + "text_color": [ + "grey89", + "grey89" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkTextbox": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "gray100", + "gray20" + ], + "border_color": [ + "gray61", + "grey35" + ], + "text_color": [ + "gray14", + "gray84" + ], + "scrollbar_button_color": [ + "gray55", + "gray41" + ], + "scrollbar_button_hover_color": [ + "gray40", + "gray53" + ] + }, + "CTkScrollableFrame": { + "label_fg_color": [ + "gray80", + "gray21" + ] + }, + "DropdownMenu": { + "fg_color": [ + "gray90", + "gray20" + ], + "hover_color": [ + "gray75", + "gray28" + ], + "text_color": [ + "gray14", + "gray84" + ] + }, + "CTkFont": { + "macOS": { + "family": "SF Display", + "size": 13, + "weight": "normal" + }, + "Windows": { + "family": "Roboto", + "size": 13, + "weight": "normal" + }, + "Linux": { + "family": "Roboto", + "size": 13, + "weight": "normal" + } + } +} \ No newline at end of file diff --git a/assets/themes/purple.json b/assets/themes/purple.json new file mode 100644 index 0000000..32f9896 --- /dev/null +++ b/assets/themes/purple.json @@ -0,0 +1,359 @@ +{ + "CTk": { + "fg_color": [ + "gray95", + "gray10" + ] + }, + "CTkToplevel": { + "fg_color": [ + "gray95", + "gray10" + ] + }, + "CTkFrame": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "gray90", + "gray13" + ], + "top_fg_color": [ + "gray85", + "gray16" + ], + "border_color": [ + "gray65", + "gray28" + ] + }, + "CTkButton": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "#cb45e5", + "#9821b0" + ], + "hover_color": [ + "#9f3eb2", + "#631773" + ], + "border_color": [ + "grey27", + "grey60" + ], + "text_color": [ + "#eadded", + "#eadded" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkLabel": { + "corner_radius": 0, + "fg_color": "transparent", + "text_color": [ + "gray14", + "gray84" + ] + }, + "CTkEntry": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray98", + "gray21" + ], + "border_color": [ + "gray61", + "grey35" + ], + "text_color": [ + "gray14", + "gray84" + ], + "placeholder_text_color": [ + "gray52", + "gray62" + ] + }, + "CTkCheckbox": { + "corner_radius": 6, + "border_width": 3, + "fg_color": [ + "#cb45e5", + "#9821b0" + ], + "border_color": [ + "grey27", + "grey60" + ], + "hover_color": [ + "#9f3eb2", + "#631773" + ], + "checkmark_color": [ + "#eadded", + "gray90" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkSwitch": { + "corner_radius": 1000, + "border_width": 3, + "button_length": 0, + "fg_Color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "#cb45e5", + "#9821b0" + ], + "button_color": [ + "gray36", + "gray85" + ], + "button_hover_color": [ + "gray20", + "gray100" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkRadiobutton": { + "corner_radius": 1000, + "border_width_checked": 6, + "border_width_unchecked": 3, + "fg_color": [ + "#cb45e5", + "#9821b0" + ], + "border_color": [ + "grey27", + "grey60" + ], + "hover_color": [ + "#9f3eb2", + "#631773" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkProgressBar": { + "corner_radius": 1000, + "border_width": 0, + "fg_color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "#cb45e5", + "#9821b0" + ], + "border_color": [ + "gray", + "gray" + ] + }, + "CTkSlider": { + "corner_radius": 1000, + "button_corner_radius": 1000, + "border_width": 6, + "button_length": 0, + "fg_color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "gray40", + "gray69" + ], + "button_color": [ + "#cb45e5", + "#9821b0" + ], + "button_hover_color": [ + "#9f3eb2", + "#631773" + ] + }, + "CTkOptionMenu": { + "corner_radius": 6, + "fg_color": [ + "#cb45e5", + "#9821b0" + ], + "button_color": [ + "#9f3eb2", + "#631773" + ], + "button_hover_color": [ + "#883199", + "#683473" + ], + "text_color": [ + "#eadded", + "#eadded" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkComboBox": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray98", + "gray21" + ], + "border_color": [ + "gray61", + "grey35" + ], + "button_color": [ + "gray61", + "grey35" + ], + "button_hover_color": [ + "grey44", + "grey52" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray50", + "gray45" + ] + }, + "CTkScrollbar": { + "corner_radius": 1000, + "border_spacing": 4, + "fg_color": "transparent", + "button_color": [ + "gray55", + "gray41" + ], + "button_hover_color": [ + "gray40", + "gray53" + ] + }, + "CTkSegmentedButton": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray61", + "gray29" + ], + "selected_color": [ + "#cb45e5", + "#9821b0" + ], + "selected_hover_color": [ + "#9f3eb2", + "#631773" + ], + "unselected_color": [ + "gray61", + "gray29" + ], + "unselected_hover_color": [ + "gray70", + "gray41" + ], + "text_color": [ + "#eadded", + "#eadded" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkTextbox": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "gray100", + "gray20" + ], + "border_color": [ + "gray61", + "grey35" + ], + "text_color": [ + "gray14", + "gray84" + ], + "scrollbar_button_color": [ + "gray55", + "gray41" + ], + "scrollbar_button_hover_color": [ + "gray40", + "gray53" + ] + }, + "CTkScrollableFrame": { + "label_fg_color": [ + "gray80", + "gray21" + ] + }, + "DropdownMenu": { + "fg_color": [ + "gray90", + "gray20" + ], + "hover_color": [ + "gray75", + "gray28" + ], + "text_color": [ + "gray14", + "gray84" + ] + }, + "CTkFont": { + "macOS": { + "family": "SF Display", + "size": 13, + "weight": "normal" + }, + "Windows": { + "family": "Roboto", + "size": 13, + "weight": "normal" + }, + "Linux": { + "family": "Roboto", + "size": 13, + "weight": "normal" + } + } +} \ No newline at end of file diff --git a/assets/themes/red.json b/assets/themes/red.json new file mode 100644 index 0000000..06a1e4c --- /dev/null +++ b/assets/themes/red.json @@ -0,0 +1,359 @@ +{ + "CTk": { + "fg_color": [ + "gray95", + "gray10" + ] + }, + "CTkToplevel": { + "fg_color": [ + "gray95", + "gray10" + ] + }, + "CTkFrame": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "gray90", + "gray13" + ], + "top_fg_color": [ + "gray85", + "gray16" + ], + "border_color": [ + "gray65", + "gray28" + ] + }, + "CTkButton": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "#ca2f2f", + "#941212" + ], + "hover_color": [ + "#972a2a", + "#6b0e0e" + ], + "border_color": [ + "grey27", + "grey60" + ], + "text_color": [ + "grey89", + "grey89" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkLabel": { + "corner_radius": 0, + "fg_color": "transparent", + "text_color": [ + "gray14", + "gray84" + ] + }, + "CTkEntry": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray98", + "gray21" + ], + "border_color": [ + "gray61", + "grey35" + ], + "text_color": [ + "gray14", + "gray84" + ], + "placeholder_text_color": [ + "gray52", + "gray62" + ] + }, + "CTkCheckbox": { + "corner_radius": 6, + "border_width": 3, + "fg_color": [ + "#ca2f2f", + "#941212" + ], + "border_color": [ + "grey27", + "grey60" + ], + "hover_color": [ + "#972a2a", + "#6b0e0e" + ], + "checkmark_color": [ + "grey89", + "gray90" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkSwitch": { + "corner_radius": 1000, + "border_width": 3, + "button_length": 0, + "fg_Color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "#ca2f2f", + "#941212" + ], + "button_color": [ + "gray36", + "gray85" + ], + "button_hover_color": [ + "gray20", + "gray100" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkRadiobutton": { + "corner_radius": 1000, + "border_width_checked": 6, + "border_width_unchecked": 3, + "fg_color": [ + "#ca2f2f", + "#941212" + ], + "border_color": [ + "grey27", + "grey60" + ], + "hover_color": [ + "#972a2a", + "#6b0e0e" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkProgressBar": { + "corner_radius": 1000, + "border_width": 0, + "fg_color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "#ca2f2f", + "#941212" + ], + "border_color": [ + "gray", + "gray" + ] + }, + "CTkSlider": { + "corner_radius": 1000, + "button_corner_radius": 1000, + "border_width": 6, + "button_length": 0, + "fg_color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "gray40", + "gray69" + ], + "button_color": [ + "#ca2f2f", + "#941212" + ], + "button_hover_color": [ + "#972a2a", + "#6b0e0e" + ] + }, + "CTkOptionMenu": { + "corner_radius": 6, + "fg_color": [ + "#ca2f2f", + "#941212" + ], + "button_color": [ + "#972a2a", + "#6b0e0e" + ], + "button_hover_color": [ + "#7d2020", + "#571d1d" + ], + "text_color": [ + "grey89", + "grey89" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkComboBox": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray98", + "gray21" + ], + "border_color": [ + "gray61", + "grey35" + ], + "button_color": [ + "gray61", + "grey35" + ], + "button_hover_color": [ + "grey44", + "grey52" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray50", + "gray45" + ] + }, + "CTkScrollbar": { + "corner_radius": 1000, + "border_spacing": 4, + "fg_color": "transparent", + "button_color": [ + "gray55", + "gray41" + ], + "button_hover_color": [ + "gray40", + "gray53" + ] + }, + "CTkSegmentedButton": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray61", + "gray29" + ], + "selected_color": [ + "#ca2f2f", + "#941212" + ], + "selected_hover_color": [ + "#972a2a", + "#6b0e0e" + ], + "unselected_color": [ + "gray61", + "gray29" + ], + "unselected_hover_color": [ + "gray70", + "gray41" + ], + "text_color": [ + "grey89", + "grey89" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkTextbox": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "gray100", + "gray20" + ], + "border_color": [ + "gray61", + "grey35" + ], + "text_color": [ + "gray14", + "gray84" + ], + "scrollbar_button_color": [ + "gray55", + "gray41" + ], + "scrollbar_button_hover_color": [ + "gray40", + "gray53" + ] + }, + "CTkScrollableFrame": { + "label_fg_color": [ + "gray80", + "gray21" + ] + }, + "DropdownMenu": { + "fg_color": [ + "gray90", + "gray20" + ], + "hover_color": [ + "gray75", + "gray28" + ], + "text_color": [ + "gray14", + "gray84" + ] + }, + "CTkFont": { + "macOS": { + "family": "SF Display", + "size": 13, + "weight": "normal" + }, + "Windows": { + "family": "Roboto", + "size": 13, + "weight": "normal" + }, + "Linux": { + "family": "Roboto", + "size": 13, + "weight": "normal" + } + } +} \ No newline at end of file diff --git a/assets/themes/torquoise.json b/assets/themes/torquoise.json new file mode 100644 index 0000000..e870677 --- /dev/null +++ b/assets/themes/torquoise.json @@ -0,0 +1,359 @@ +{ + "CTk": { + "fg_color": [ + "gray95", + "gray10" + ] + }, + "CTkToplevel": { + "fg_color": [ + "gray95", + "gray10" + ] + }, + "CTkFrame": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "gray90", + "gray13" + ], + "top_fg_color": [ + "gray85", + "gray16" + ], + "border_color": [ + "gray65", + "gray28" + ] + }, + "CTkButton": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "#2fcaca", + "#129494" + ], + "hover_color": [ + "#2a9797", + "#0e6b6b" + ], + "border_color": [ + "grey27", + "grey60" + ], + "text_color": [ + "grey89", + "grey89" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkLabel": { + "corner_radius": 0, + "fg_color": "transparent", + "text_color": [ + "gray14", + "gray84" + ] + }, + "CTkEntry": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray98", + "gray21" + ], + "border_color": [ + "gray61", + "grey35" + ], + "text_color": [ + "gray14", + "gray84" + ], + "placeholder_text_color": [ + "gray52", + "gray62" + ] + }, + "CTkCheckbox": { + "corner_radius": 6, + "border_width": 3, + "fg_color": [ + "#2fcaca", + "#129494" + ], + "border_color": [ + "grey27", + "grey60" + ], + "hover_color": [ + "#2a9797", + "#0e6b6b" + ], + "checkmark_color": [ + "grey89", + "gray90" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkSwitch": { + "corner_radius": 1000, + "border_width": 3, + "button_length": 0, + "fg_Color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "#2fcaca", + "#129494" + ], + "button_color": [ + "gray36", + "gray85" + ], + "button_hover_color": [ + "gray20", + "gray100" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkRadiobutton": { + "corner_radius": 1000, + "border_width_checked": 6, + "border_width_unchecked": 3, + "fg_color": [ + "#2fcaca", + "#129494" + ], + "border_color": [ + "grey27", + "grey60" + ], + "hover_color": [ + "#2a9797", + "#0e6b6b" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray60", + "gray45" + ] + }, + "CTkProgressBar": { + "corner_radius": 1000, + "border_width": 0, + "fg_color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "#2fcaca", + "#129494" + ], + "border_color": [ + "gray", + "gray" + ] + }, + "CTkSlider": { + "corner_radius": 1000, + "button_corner_radius": 1000, + "border_width": 6, + "button_length": 0, + "fg_color": [ + "gray60", + "grey30" + ], + "progress_color": [ + "gray40", + "gray69" + ], + "button_color": [ + "#2fcaca", + "#129494" + ], + "button_hover_color": [ + "#2a9797", + "#0e6b6b" + ] + }, + "CTkOptionMenu": { + "corner_radius": 6, + "fg_color": [ + "#2fcaca", + "#129494" + ], + "button_color": [ + "#2a9797", + "#0e6b6b" + ], + "button_hover_color": [ + "#207d7d", + "#1d5757" + ], + "text_color": [ + "grey89", + "grey89" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkComboBox": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray98", + "gray21" + ], + "border_color": [ + "gray61", + "grey35" + ], + "button_color": [ + "gray61", + "grey35" + ], + "button_hover_color": [ + "grey44", + "grey52" + ], + "text_color": [ + "gray14", + "gray84" + ], + "text_color_disabled": [ + "gray50", + "gray45" + ] + }, + "CTkScrollbar": { + "corner_radius": 1000, + "border_spacing": 4, + "fg_color": "transparent", + "button_color": [ + "gray55", + "gray41" + ], + "button_hover_color": [ + "gray40", + "gray53" + ] + }, + "CTkSegmentedButton": { + "corner_radius": 6, + "border_width": 2, + "fg_color": [ + "gray61", + "gray29" + ], + "selected_color": [ + "#2fcaca", + "#129494" + ], + "selected_hover_color": [ + "#2a9797", + "#0e6b6b" + ], + "unselected_color": [ + "gray61", + "gray29" + ], + "unselected_hover_color": [ + "gray70", + "gray41" + ], + "text_color": [ + "grey89", + "grey89" + ], + "text_color_disabled": [ + "gray74", + "gray60" + ] + }, + "CTkTextbox": { + "corner_radius": 6, + "border_width": 0, + "fg_color": [ + "gray100", + "gray20" + ], + "border_color": [ + "gray61", + "grey35" + ], + "text_color": [ + "gray14", + "gray84" + ], + "scrollbar_button_color": [ + "gray55", + "gray41" + ], + "scrollbar_button_hover_color": [ + "gray40", + "gray53" + ] + }, + "CTkScrollableFrame": { + "label_fg_color": [ + "gray80", + "gray21" + ] + }, + "DropdownMenu": { + "fg_color": [ + "gray90", + "gray20" + ], + "hover_color": [ + "gray75", + "gray28" + ], + "text_color": [ + "gray14", + "gray84" + ] + }, + "CTkFont": { + "macOS": { + "family": "SF Display", + "size": 13, + "weight": "normal" + }, + "Windows": { + "family": "Roboto", + "size": 13, + "weight": "normal" + }, + "Linux": { + "family": "Roboto", + "size": 13, + "weight": "normal" + } + } +} \ No newline at end of file