From 1f43c2f215e224b56911961fd292370f1ac06f11 Mon Sep 17 00:00:00 2001 From: Zzaphkiel Date: Wed, 6 Nov 2024 17:09:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=20=E2=80=9C=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E5=AF=B9=E5=B1=80=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2=E2=80=9D?= =?UTF-8?q?=20=E9=80=89=E9=A1=B9=E6=94=B9=E4=B8=BA=20=E2=80=9C=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=AF=B9=E5=B1=80=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/config.py | 4 +-- app/common/icons.py | 1 + app/resource/i18n/Seraphine.zh_CN.qm | Bin 35802 -> 35818 bytes app/resource/i18n/Seraphine.zh_CN.ts | 36 +++++++++++++++--------- app/resource/icons/AttachText_black.svg | 5 ++++ app/resource/icons/AttachText_white.svg | 5 ++++ app/view/main_window.py | 2 +- app/view/setting_interface.py | 6 ++-- 8 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 app/resource/icons/AttachText_black.svg create mode 100644 app/resource/icons/AttachText_white.svg diff --git a/app/common/config.py b/app/common/config.py index 9f5ffea..7e010b3 100644 --- a/app/common/config.py +++ b/app/common/config.py @@ -155,8 +155,8 @@ class Config(QConfig): opggPosition = ConfigItem("Functions", "OpggPosition", "MID", OptionsValidator([ "TOP", "JUNGLE", "MID", "ADC", "SUPPORT"])) - autoClearGameinfo = ConfigItem( - "Functions", "AutoClearGameinfo", True, BoolValidator()) + enableReserveGameinfo = ConfigItem( + "Functions", "EnableReserveGameinfo", False, BoolValidator()) YEAR = 2023 diff --git a/app/common/icons.py b/app/common/icons.py index 09a9ac2..a4aff39 100644 --- a/app/common/icons.py +++ b/app/common/icons.py @@ -64,6 +64,7 @@ class Icon(FluentIconBase, Enum): LEFTARROW = 'LeftArrow' WINDOW = "Window" ERASER = "Eraser" + ATTACHTEXT = "AttachText" def path(self, theme=Theme.AUTO): return f'./app/resource/icons/{self.value}_{getIconColor(theme)}.svg' diff --git a/app/resource/i18n/Seraphine.zh_CN.qm b/app/resource/i18n/Seraphine.zh_CN.qm index 980c5f64297d361def07708f6adddb81ba0aea1f..ee1ad54d79d2b7cfd9634f66c84e578de09e32ab 100644 GIT binary patch delta 1503 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游戏大厅 - + Selecting Champions 英雄选择 - + Gaming 游戏中 - + Waiting for status 等待游戏结果 - + End of game 游戏结束 - + Lobby 房间组队中 - + Ready check 匹配确认 - + Match making 匹配中 - + Exception occurred 😥 程序出现异常 😥 @@ -1499,17 +1499,17 @@ If champions set by lane are not available, default settings will be used.客户端信息请求失败 - + Blue Team 蓝色方 - + Red Team 红色方 - + Waiting reconnect 等待重新连接 @@ -2818,12 +2818,22 @@ when they are used by Seraphine, which will cost more time Clear Game Information interface - 自动清空对局信息界面 + 自动清空对局信息界面 Clear Game Information interface automatically when back to lobby - 在回到大厅或组队房间时清空对局信息界面 + 在回到大厅或组队房间时清空对局信息界面 + + + + Reserve Game Information interface + 保留对局信息界面内容 + + + + Reserve Game Information interface until the next champion selection starts + 保留上一局的对局信息内容直到下一次对局开始 diff --git a/app/resource/icons/AttachText_black.svg b/app/resource/icons/AttachText_black.svg new file mode 100644 index 0000000..1bca14e --- /dev/null +++ b/app/resource/icons/AttachText_black.svg @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/resource/icons/AttachText_white.svg b/app/resource/icons/AttachText_white.svg new file mode 100644 index 0000000..2f5a484 --- /dev/null +++ b/app/resource/icons/AttachText_white.svg @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/view/main_window.py b/app/view/main_window.py index 37c0305..4377a8f 100644 --- a/app/view/main_window.py +++ b/app/view/main_window.py @@ -945,7 +945,7 @@ async def paintTeamColor(): self.checkAndSwitchTo(self.gameInfoInterface) async def __onGameEnd(self): - if cfg.get(cfg.autoClearGameinfo): + if not cfg.get(cfg.enableReserveGameinfo): self.gameInfoInterface.clear() def __checkWindowSize(self): diff --git a/app/view/setting_interface.py b/app/view/setting_interface.py index 739bfa2..3f8c7c7 100644 --- a/app/view/setting_interface.py +++ b/app/view/setting_interface.py @@ -72,10 +72,10 @@ def __init__(self, parent=None): cfg.autoShowOpgg) self.autoClearGameinfoCard = SwitchSettingCard( - Icon.ERASER, self.tr("Clear Game Information interface"), + Icon.ATTACHTEXT, self.tr("Reserve Game Information interface"), self.tr( - "Clear Game Information interface automatically when back to lobby"), - cfg.autoClearGameinfo + "Reserve Game Information interface until the next champion selection starts"), + cfg.enableReserveGameinfo ) self.generalGroup = SettingCardGroup(self.tr("General"),