AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

temporarily disabled the drawer close button

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-10-14 20:59:03 +05:00
parent ffc9e5823a
commit 512ac74ee6
4 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/protocols/protocols_defs.cpp
View file

@ -66,7 +66,7 @@ QMap<amnezia::Proto, QString> ProtocolProps::protocolHumanNames()
{ Proto::ShadowSocks, "ShadowSocks" }, { Proto::ShadowSocks, "ShadowSocks" },
{ Proto::Cloak, "Cloak" }, { Proto::Cloak, "Cloak" },
{ Proto::WireGuard, "WireGuard" }, { Proto::WireGuard, "WireGuard" },
{ Proto::WireGuard, "AmneziaWG" }, { Proto::Awg, "AmneziaWG" },
{ Proto::Ikev2, "IKEv2" }, { Proto::Ikev2, "IKEv2" },
{ Proto::L2tp, "L2TP" }, { Proto::L2tp, "L2TP" },

8
client/translations/amneziavpn_ru.ts
View file

@ -1704,22 +1704,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="192"/> <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="166"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="207"/> <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="181"/>
<source>Network protocol</source> <source>Network protocol</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="223"/> <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="197"/>
<source>Port</source> <source>Port</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="239"/> <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="213"/>
<source>Install</source> <source>Install</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

8
client/translations/amneziavpn_zh_CN.ts
View file

@ -1807,22 +1807,22 @@ It&apos;s okay as long as it&apos;s from someone you trust.</source>
<translation>更多细节</translation> <translation>更多细节</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="192"/> <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="166"/>
<source>Close</source> <source>Close</source>
<translation>关闭</translation> <translation>关闭</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="207"/> <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="181"/>
<source>Network protocol</source> <source>Network protocol</source>
<translation>网络协议</translation> <translation>网络协议</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="223"/> <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="197"/>
<source>Port</source> <source>Port</source>
<translation>端口</translation> <translation>端口</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="239"/> <location filename="../ui/qml/Pages2/PageSetupWizardProtocolSettings.qml" line="213"/>
<source>Install</source> <source>Install</source>
<translation>安装</translation> <translation>安装</translation>
</message> </message>

25
client/ui/qml/Pages2/PageStart.qml
View file

@ -44,9 +44,9 @@ PageType {
tabBar.enabled = !visible tabBar.enabled = !visible
} }
function onShowTopCloseButton(visible) { // function onShowTopCloseButton(visible) {
topCloseButton.visible = visible // topCloseButton.visible = visible
} // }
function onEnableTabBar(enabled) { function onEnableTabBar(enabled) {
tabBar.enabled = enabled tabBar.enabled = enabled
@ -137,10 +137,10 @@ PageType {
tabBarStackView.push(pagePath, { "objectName" : pagePath }) tabBarStackView.push(pagePath, { "objectName" : pagePath })
} }
onWidthChanged: { // onWidthChanged: {
topCloseButton.x = tabBarStackView.x + tabBarStackView.width - // topCloseButton.x = tabBarStackView.x + tabBarStackView.width -
topCloseButton.buttonWidth - topCloseButton.rightPadding // topCloseButton.buttonWidth - topCloseButton.rightPadding
} // }
} }
TabBar { TabBar {
@ -234,11 +234,12 @@ PageType {
z: 1 z: 1
} }
TopCloseButtonType { // TopCloseButtonType {
id: topCloseButton // id: topCloseButton
x: tabBarStackView.width - topCloseButton.buttonWidth - topCloseButton.rightPadding
z: 1 // x: tabBarStackView.width - topCloseButton.buttonWidth - topCloseButton.rightPadding
} // z: 1
// }
ConnectionTypeSelectionDrawer { ConnectionTypeSelectionDrawer {
id: connectionTypeSelection id: connectionTypeSelection