gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

Browse Source
This commit is contained in:
SengokuCola
2025-05-06 14:14:56 +08:00
parent 15ec8394d7 717a106e32
commit e27e82616b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
launcher.py
View File

@@ -184,13 +184,13 @@ def main(page: ft.Page):
loaded_config = load_config() loaded_config = load_config()
app_state.gui_config = loaded_config app_state.gui_config = loaded_config
app_state.adapter_paths = loaded_config.get("adapters", []).copy() app_state.adapter_paths = loaded_config.get("adapters", []).copy()
app_state.bot_script_path = loaded_config.get("bot_script_path", "bot.py") # Load bot script path app_state.bot_script_path = loaded_config.get("bot_script_path", "bot.py") # Load bot script path
# 加载用户自定义的 Python 路径 # 加载用户自定义的 Python 路径
if "python_path" in loaded_config and os.path.exists(loaded_config["python_path"]): if "python_path" in loaded_config and os.path.exists(loaded_config["python_path"]):
app_state.python_path = loaded_config["python_path"] app_state.python_path = loaded_config["python_path"]
print(f"[Main] 从配置加载 Python 路径: {app_state.python_path}") print(f"[Main] 从配置加载 Python 路径: {app_state.python_path}")
print(f"[Main] Initial adapters loaded: {app_state.adapter_paths}") print(f"[Main] Initial adapters loaded: {app_state.adapter_paths}")
# Set script_dir in AppState early # Set script_dir in AppState early
@@ -219,7 +219,7 @@ def main(page: ft.Page):
except KeyError: except KeyError:
print(f"[Main] Warning: Invalid theme '{saved_theme}' in config. Falling back to System.") print(f"[Main] Warning: Invalid theme '{saved_theme}' in config. Falling back to System.")
page.theme_mode = ft.ThemeMode.SYSTEM page.theme_mode = ft.ThemeMode.SYSTEM
# --- 自定义主题颜色 --- # # --- 自定义主题颜色 --- #
# 创建深色主题，使橙色变得更暗 # 创建深色主题，使橙色变得更暗
dark_theme = ft.Theme( dark_theme = ft.Theme(
@@ -228,14 +228,14 @@ def main(page: ft.Page):
color_scheme=ft.ColorScheme( color_scheme=ft.ColorScheme(
primary=ft.colors.ORANGE_700, primary=ft.colors.ORANGE_700,
primary_container=ft.colors.ORANGE_800, primary_container=ft.colors.ORANGE_800,
) ),
) )
# 创建亮色主题 # 创建亮色主题
light_theme = ft.Theme( light_theme = ft.Theme(
color_scheme_seed=ft.colors.ORANGE, color_scheme_seed=ft.colors.ORANGE,
) )
# 设置自定义主题 # 设置自定义主题
page.theme = light_theme page.theme = light_theme
page.dark_theme = dark_theme page.dark_theme = dark_theme