diff --git a/app/resource/i18n/Seraphine.zh_CN.qm b/app/resource/i18n/Seraphine.zh_CN.qm index 31ad3531..e14f81f4 100644 Binary files a/app/resource/i18n/Seraphine.zh_CN.qm and b/app/resource/i18n/Seraphine.zh_CN.qm differ diff --git a/app/resource/i18n/Seraphine.zh_CN.ts b/app/resource/i18n/Seraphine.zh_CN.ts index 166411b4..95b0d06f 100644 --- a/app/resource/i18n/Seraphine.zh_CN.ts +++ b/app/resource/i18n/Seraphine.zh_CN.ts @@ -4,7 +4,7 @@ AutoAcceptMatchingCard - + Delay seconds after match made: 在对局找到后接受对局前延迟的秒数： @@ -34,17 +34,17 @@ 已启用，延迟： - + seconds 秒 - + Disabled 未启用 - + Enabled, delay: 已启用，延迟： @@ -62,7 +62,7 @@ 关 - + Champion name 请输入英雄名 @@ -72,17 +72,17 @@ 将要自动选择的英雄 - + Enabled, champion: 已启用，自动选择： - + Disabled 未启用 - + Champion will be seleted automatically: 将要自动选择的英雄： @@ -394,7 +394,7 @@ 房间名 - + Create 创建 @@ -404,7 +404,7 @@ 房间密码 - + Lobby's name: (cannot be empty) 房间名：（不可为空） @@ -414,17 +414,17 @@ 房间密码：（可为空） - + Please input lobby's name 请输入房间名 - + Please input password 请输入房间密码 - + Password: (password will NOT be set if it's empty) 房间密码：（若留空则不设密码） @@ -432,7 +432,7 @@ DodgeCard - + Dodge 秒退 @@ -440,37 +440,37 @@ GameDetailView - + Win 胜利 - + Lose 失败 - + Remake 重开 - + 1st 第一名 - + 2nd 第二名 - + 3rd 第三名 - + 4th 第四名 @@ -496,12 +496,12 @@ GameTitleBar - + Copy game ID 复制游戏 ID - + Game ID: 游戏 ID： @@ -519,7 +519,7 @@ 下一页 - + Empty 无结果 @@ -731,27 +731,27 @@ OnlineAvailabilityCard - + Apply 应用 - + chat 在线 - + away 离开 - + offline 离线 - + Availability 在线状态 @@ -820,100 +820,130 @@ ProfileTierCard - + Apply 应用 - + Teamfight Tactics 云顶之弈 - + Ranked solo 单 / 双排 - + Ranked flex 灵活排位 - + Na 未定级 - + Iron 坚韧黑铁 - + Bronze 英勇黄铜 - + Silver 不屈白银 - + Gold 荣耀黄金 - + Platinum 华贵铂金 - + Emerald 流光翡翠 - + Diamond 璀璨钻石 - + Master 超凡大师 - + Grandmaster 傲世宗师 - + Challenger 最强王者 - + Game mode 游戏模式 - + Tier 段位 - + Division 等级 + + + Game mode: + 游戏模式： + + + + Tier: + 段位： + + + + Division: + 等级： + + + + Please select game mode + 请选择游戏模式 + + + + Please select Tier + 请选择段位 + + + + Please select Division + 请选择等级 + RemoveTokensCard - + Remove 卸下 @@ -959,27 +989,27 @@ Search 🔍 - + Search 🔍 搜索召唤师 🔍 - + Career 生涯 - + Summoner not found 召唤师未找到 - + Please check the summoner name and retry 请检查召唤师名后重试 - + Please input summoner name 请输入召唤师名 @@ -989,27 +1019,27 @@ 模式筛选 - + All 全部 - + Normal 匹配模式 - + A.R.A.M. 极地大乱斗 - + Ranked Solo 单 / 双排 - + Ranked Flex 灵活排位 @@ -1277,42 +1307,42 @@ when they are used by Seraphine, which will cost more time 召唤师名 - + Spectate 观战 - + Summoner not found 召唤师未找到 - + Please check the summoner's name and retry 请检查召唤师名后重试 - + Summoner isn't in game 召唤师不在游戏中 - + Spectate successfully 观战拉起成功 - + Please wait 请等待游戏观战启动 - + Summoners's name you want to spectate: 你想观战的召唤师名： - + Please input summoner's name 请输入召唤师名 @@ -1373,7 +1403,7 @@ when they are used by Seraphine, which will cost more time SummonerInfoBar - + Unranked 未定级 @@ -1427,37 +1457,37 @@ when they are used by Seraphine, which will cost more time TeamView - + Winner 胜方 - + Loser 败方 - + Tower destroyed 摧毁防御塔 - + Inhibitor destroyed 摧毁召唤水晶 - + Baron Nashor killed 击杀男爵 - + Dragon killed 击杀巨龙 - + Rift Herald killed 击杀峡谷先锋 @@ -1467,17 +1497,17 @@ when they are used by Seraphine, which will cost more time 英雄伤害 - + Minions killed 小兵及野怪击杀 - + Gold earned 获取金钱 - + Damage dealed to champions 对英雄造成伤害 diff --git a/app/view/auxiliary_interface.py b/app/view/auxiliary_interface.py index 93cefc1d..f1043ccd 100644 --- a/app/view/auxiliary_interface.py +++ b/app/view/auxiliary_interface.py @@ -330,15 +330,59 @@ def __onComboBoxTextChanged(self): self.pushButton.setEnabled(enable) -class ProfileTierCard(SettingCard): +class ProfileTierCard(ExpandGroupSettingCard): def __init__(self, title, content, parent): super().__init__(Icon.CERTIFICATE, title, content, parent) + self.inputWidget = QWidget(self.view) + self.inputLayout = QGridLayout(self.inputWidget) + + self.rankModeLabel = QLabel(self.tr("Game mode:")) self.rankModeBox = ComboBox() + self.tierLabel = QLabel(self.tr("Tier:")) self.tierBox = ComboBox() + self.divisionLabel = QLabel(self.tr("Division:")) self.divisionBox = ComboBox() + + self.buttonWidget = QWidget(self.view) + self.buttonLayout = QHBoxLayout(self.buttonWidget) self.pushButton = PushButton(self.tr("Apply")) + self.__initLayout() + self.__initWidget() + + def __initLayout(self): + self.inputLayout.setVerticalSpacing(19) + self.inputLayout.setAlignment(Qt.AlignTop) + self.inputLayout.setContentsMargins(48, 18, 44, 18) + + self.inputLayout.addWidget( + self.rankModeLabel, 0, 0, alignment=Qt.AlignLeft) + self.inputLayout.addWidget( + self.rankModeBox, 0, 1, alignment=Qt.AlignRight) + + self.inputLayout.addWidget( + self.tierLabel, 1, 0, alignment=Qt.AlignLeft) + self.inputLayout.addWidget( + self.tierBox, 1, 1, alignment=Qt.AlignRight) + + self.inputLayout.addWidget( + self.divisionLabel, 2, 0, alignment=Qt.AlignLeft) + self.inputLayout.addWidget( + self.divisionBox, 2, 1, alignment=Qt.AlignRight) + + self.inputLayout.setSizeConstraint(QHBoxLayout.SetMinimumSize) + + self.buttonLayout.setContentsMargins(48, 18, 44, 18) + self.buttonLayout.addWidget(self.pushButton, 0, Qt.AlignRight) + self.buttonLayout.setSizeConstraint(QHBoxLayout.SetMinimumSize) + + self.viewLayout.setSpacing(0) + self.viewLayout.setContentsMargins(0, 0, 0, 0) + self.addGroupWidget(self.inputWidget) + self.addGroupWidget(self.buttonWidget) + + def __initWidget(self): self.rankModeBox.addItems([ self.tr("Teamfight Tactics"), self.tr("Ranked solo"), @@ -359,26 +403,17 @@ def __init__(self, title, content, parent): ]) self.divisionBox.addItems(['I', 'II', 'III', 'IV']) - self.rankModeBox.setPlaceholderText(self.tr("Game mode")) - self.tierBox.setPlaceholderText(self.tr("Tier")) - self.divisionBox.setPlaceholderText(self.tr("Division")) + self.rankModeBox.setPlaceholderText(self.tr("Please select game mode")) + self.tierBox.setPlaceholderText(self.tr("Please select Tier")) + self.divisionBox.setPlaceholderText(self.tr("Please select Division")) self.pushButton.setEnabled(False) - self.rankModeBox.setMinimumWidth(130) - self.tierBox.setMinimumWidth(130) - self.divisionBox.setMinimumWidth(130) + self.rankModeBox.setMinimumWidth(250) + self.tierBox.setMinimumWidth(250) + self.divisionBox.setMinimumWidth(250) self.pushButton.setMinimumWidth(100) - self.hBoxLayout.addWidget(self.rankModeBox) - self.hBoxLayout.addSpacing(16) - self.hBoxLayout.addWidget(self.tierBox) - self.hBoxLayout.addSpacing(16) - self.hBoxLayout.addWidget(self.divisionBox) - self.hBoxLayout.addSpacing(16) - self.hBoxLayout.addWidget(self.pushButton) - self.hBoxLayout.addSpacing(16) - self.rankModeBox.currentTextChanged.connect( self.__onRankModeTextChanged) self.tierBox.currentTextChanged.connect(self.__onTierTextChanged)