-

moesnow · Nov 27, 2024 · b814306 · b814306
1 parent 5e2bcc0
commit b814306
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/app/setting_interface.py b/app/setting_interface.py
@@ -524,12 +524,6 @@ def __initCard(self):
             self.tr("游戏刷新时间"),
             self.tr("用于循环运行及判断任务状态，默认凌晨四点"),
         )
-        self.allScreensCard = SwitchSettingCard1(
-            FIF.ZOOM,
-            self.tr('在多显示器上进行截屏'),
-            "默认开启，如果正在使用多显示器且无法正常截屏请开关闭这个",
-            "all_screens"
-        )
 
         self.NotifyGroup = SettingCardGroup(self.tr("消息推送"), self.scrollWidget)
         self.testNotifyCard = PrimaryPushSettingCard(
@@ -570,17 +564,23 @@ def __initCard(self):
             "通过快捷方式、官方启动器、运行中的游戏进程等方式尝试自动配置游戏路径（未测试国际服）",
             "auto_set_game_path_enable"
         )
-        self.keybindingTechniqueCard = PushSettingCardKey(
-            self.tr('按住以修改'),
-            FIF.LEAF,
-            self.tr("秘技（只对清体力和逐光捡金场景生效）"),
-            "hotkey_technique"
+        self.allScreensCard = SwitchSettingCard1(
+            FIF.ZOOM,
+            self.tr('在多显示器上进行截屏'),
+            "默认开启，如果正在使用多显示器且无法正常截屏请开关闭这个",
+            "all_screens"
         )
         self.StartMarch7thAssistantCard = StartMarch7thAssistantSwitchSettingCard(
             FIF.GAME,
             self.tr('在用户登录时启动'),
             "用于开机后自动执行完整运行模式"
         )
+        self.keybindingTechniqueCard = PushSettingCardKey(
+            self.tr('按住以修改'),
+            FIF.LEAF,
+            self.tr("秘技（只对清体力和逐光捡金场景生效）"),
+            "hotkey_technique"
+        )
 
         self.AboutGroup = SettingCardGroup(self.tr('关于'), self.scrollWidget)
         self.githubCard = PrimaryPushSettingCard(
@@ -707,7 +707,6 @@ def __initLayout(self):
         self.ProgramGroup.addSettingCard(self.playAudioCard)
         self.ProgramGroup.addSettingCard(self.powerLimitCard)
         self.ProgramGroup.addSettingCard(self.refreshHourEnableCard)
-        self.ProgramGroup.addSettingCard(self.allScreensCard)
 
         self.NotifyGroup.addSettingCard(self.testNotifyCard)
         self.NotifyGroup.addSettingCard(self.notifyTemplateCard)
@@ -716,8 +715,9 @@ def __initLayout(self):
         self.MiscGroup.addSettingCard(self.autoBattleDetectEnableCard)
         self.MiscGroup.addSettingCard(self.autoSetResolutionEnableCard)
         self.MiscGroup.addSettingCard(self.autoSetGamePathEnableCard)
-        self.MiscGroup.addSettingCard(self.keybindingTechniqueCard)
+        self.MiscGroup.addSettingCard(self.allScreensCard)
         self.MiscGroup.addSettingCard(self.StartMarch7thAssistantCard)
+        self.MiscGroup.addSettingCard(self.keybindingTechniqueCard)
 
         self.AboutGroup.addSettingCard(self.githubCard)
         self.AboutGroup.addSettingCard(self.qqGroupCard)

diff --git a/assets/docs/Changelog.md b/assets/docs/Changelog.md
@@ -4,8 +4,9 @@
 
 ### 新功能
 - 支持 “灵砂”
-- 支持开机后自动运行（设置——杂项）
+- 支持开机后自动运行（设置—杂项）
 - 循环模式每次启动前会重新加载配置文件
+- 增加 “在多显示器上进行截屏” 选项（设置—杂项）
 
 ### 修复
 - “日常任务” 会在每次启动时被错误清空