fix(gui): 修复窗口记忆功能失效问题
This commit is contained in:
@@ -127,6 +127,8 @@ class AppConfig:
|
|||||||
self.queue_config = QueueConfig()
|
self.queue_config = QueueConfig()
|
||||||
self.maa_config = MaaConfig()
|
self.maa_config = MaaConfig()
|
||||||
|
|
||||||
|
qconfig.load(self.config_path, self.global_config)
|
||||||
|
|
||||||
config_list = self.search_config()
|
config_list = self.search_config()
|
||||||
for config in config_list:
|
for config in config_list:
|
||||||
if config[0] == "Maa":
|
if config[0] == "Maa":
|
||||||
|
|||||||
@@ -67,8 +67,6 @@ class Task(QThread):
|
|||||||
|
|
||||||
self.logs = []
|
self.logs = []
|
||||||
|
|
||||||
self.question_response.connect(lambda: print("response"))
|
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
|
|
||||||
if "设置MAA" in self.mode:
|
if "设置MAA" in self.mode:
|
||||||
|
|||||||
@@ -223,7 +223,7 @@ class AUTO_MAA(MSFluentWindow):
|
|||||||
else:
|
else:
|
||||||
|
|
||||||
self.titleBar.minBtn.clicked.disconnect()
|
self.titleBar.minBtn.clicked.disconnect()
|
||||||
self.titleBar.minBtn.clicked.connect(self.showMinimized)
|
self.titleBar.minBtn.clicked.connect(self.window().showMinimized)
|
||||||
|
|
||||||
def on_tray_activated(self, reason):
|
def on_tray_activated(self, reason):
|
||||||
"""双击返回主界面"""
|
"""双击返回主界面"""
|
||||||
@@ -285,11 +285,11 @@ class AUTO_MAA(MSFluentWindow):
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.setGeometry(location[0], location[1], size[0], size[1])
|
self.window().setGeometry(location[0], location[1], size[0], size[1])
|
||||||
self.show()
|
self.window().show()
|
||||||
if not if_quick:
|
if not if_quick:
|
||||||
if Config.global_config.get(Config.global_config.ui_maximized):
|
if Config.global_config.get(Config.global_config.ui_maximized):
|
||||||
self.showMaximized()
|
self.window().showMaximized()
|
||||||
self.set_min_method()
|
self.set_min_method()
|
||||||
self.show_ui("配置托盘")
|
self.show_ui("配置托盘")
|
||||||
|
|
||||||
@@ -303,7 +303,7 @@ class AUTO_MAA(MSFluentWindow):
|
|||||||
elif mode == "隐藏到托盘":
|
elif mode == "隐藏到托盘":
|
||||||
|
|
||||||
# 保存窗口相关属性
|
# 保存窗口相关属性
|
||||||
if not self.isMaximized():
|
if not self.window().isMaximized():
|
||||||
|
|
||||||
Config.global_config.set(
|
Config.global_config.set(
|
||||||
Config.global_config.ui_size,
|
Config.global_config.ui_size,
|
||||||
@@ -314,14 +314,14 @@ class AUTO_MAA(MSFluentWindow):
|
|||||||
f"{self.geometry().x()}x{self.geometry().y()}",
|
f"{self.geometry().x()}x{self.geometry().y()}",
|
||||||
)
|
)
|
||||||
Config.global_config.set(
|
Config.global_config.set(
|
||||||
Config.global_config.ui_maximized, self.isMaximized()
|
Config.global_config.ui_maximized, self.window().isMaximized()
|
||||||
)
|
)
|
||||||
Config.global_config.save()
|
Config.global_config.save()
|
||||||
|
|
||||||
# 隐藏主窗口
|
# 隐藏主窗口
|
||||||
if not if_quick:
|
if not if_quick:
|
||||||
|
|
||||||
self.hide()
|
self.window().hide()
|
||||||
self.tray.show()
|
self.tray.show()
|
||||||
|
|
||||||
def closeEvent(self, event: QCloseEvent):
|
def closeEvent(self, event: QCloseEvent):
|
||||||
@@ -338,6 +338,6 @@ class AUTO_MAA(MSFluentWindow):
|
|||||||
Config.close_database()
|
Config.close_database()
|
||||||
|
|
||||||
logger.info("AUTO_MAA主程序关闭")
|
logger.info("AUTO_MAA主程序关闭")
|
||||||
logger.info("===================================")
|
logger.info("----------------END----------------")
|
||||||
|
|
||||||
event.accept()
|
event.accept()
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"main_version": "4.2.2.4",
|
"main_version": "4.2.2.4",
|
||||||
"updater_version": "1.1.1.3",
|
"updater_version": "1.1.1.3",
|
||||||
"announcement": "\n## 新增功能\n- 添加用户每日代理次数上限功能 #15\n- 新增代理成功消息推送渠道Server酱与企业微信群机器人推送\n- 添加更新类别可选项\n- 添加调度队列完成任务后行为选项\n## 修复BUG\n- 修复自定义基建无法正常使用的问题\n- 修正人工排查文案\n- 修复高级MAA配置序号错位\n- 修复高级用户列表无法配置问题\n- 修复主调度台选项乱动问题\n- 修复更新器文件夹定位问题\n## 程序优化\n- 优化弹窗逻辑\n- 优化静默判定逻辑\n- 调整MAA设置目录时打开当前已配置的目录位置",
|
"announcement": "\n## 新增功能\n- 添加用户每日代理次数上限功能 #15\n- 新增代理成功消息推送渠道Server酱与企业微信群机器人推送\n- 添加更新类别可选项\n- 添加调度队列完成任务后行为选项\n## 修复BUG\n- 修复自定义基建无法正常使用的问题\n- 修正人工排查文案\n- 修复高级MAA配置序号错位\n- 修复高级用户列表无法配置问题\n- 修复主调度台选项乱动问题\n- 修复更新器文件夹定位问题\n- 修复窗口记忆功能失效问题\n## 程序优化\n- 优化弹窗逻辑\n- 优化静默判定逻辑\n- 调整MAA设置目录时打开当前已配置的目录位置",
|
||||||
"proxy_list": [
|
"proxy_list": [
|
||||||
"",
|
"",
|
||||||
"https://gitproxy.click/",
|
"https://gitproxy.click/",
|
||||||
|
|||||||
Reference in New Issue
Block a user