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

fixes on page split tunneling according to the design layout

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-10-14 16:52:22 +05:00
parent a4624c7377
commit 8163e51434
5 changed files with 53 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/translations/amneziavpn_ru.ts
View file

@ -130,7 +130,7 @@
<context> <context>
<name>ImportController</name> <name>ImportController</name>
<message> <message>
<location filename="../ui/controllers/importController.cpp" line="429"/> <location filename="../ui/controllers/importController.cpp" line="375"/>
<source>Scanned %1 of %2.</source> <source>Scanned %1 of %2.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -777,7 +777,7 @@ Already installed containers were found on the server. All installed containers
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettings.qml" line="114"/> <location filename="../ui/qml/Pages2/PageSettings.qml" line="115"/>
<source>Close application</source> <source>Close application</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

4
client/translations/amneziavpn_zh_CN.ts
View file

@ -130,7 +130,7 @@
<context> <context>
<name>ImportController</name> <name>ImportController</name>
<message> <message>
<location filename="../ui/controllers/importController.cpp" line="429"/> <location filename="../ui/controllers/importController.cpp" line="375"/>
<source>Scanned %1 of %2.</source> <source>Scanned %1 of %2.</source>
<translation type="unfinished">扫描 %1 of %2.</translation> <translation type="unfinished">扫描 %1 of %2.</translation>
</message> </message>
@ -811,7 +811,7 @@ Already installed containers were found on the server. All installed containers
<translation type="unfinished">关于</translation> <translation type="unfinished">关于</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettings.qml" line="114"/> <location filename="../ui/qml/Pages2/PageSettings.qml" line="115"/>
<source>Close application</source> <source>Close application</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

21
client/ui/qml/Controls2/LabelWithButtonType.qml
View file

@ -20,7 +20,9 @@ Item {
property bool isLeftImageHoverEnabled: true //todo separete this qml file to 3 property bool isLeftImageHoverEnabled: true //todo separete this qml file to 3
property string textColor: "#d7d8db" property string textColor: "#d7d8db"
property string textDisabledColor: "#878B91"
property string descriptionColor: "#878B91" property string descriptionColor: "#878B91"
property string descriptionDisabledColor: "#494B50"
property real textOpacity: 1.0 property real textOpacity: 1.0
property string rightImageColor: "#d7d8db" property string rightImageColor: "#d7d8db"
@ -71,7 +73,14 @@ Item {
ListItemTitleType { ListItemTitleType {
text: root.text text: root.text
color: root.descriptionOnTop ? root.descriptionColor : root.textColor color: {
if (root.enabled) {
return root.descriptionOnTop ? root.descriptionColor : root.textColor
} else {
return root.descriptionOnTop ? root.descriptionDisabledColor : root.textDisabledColor
}
}
maximumLineCount: root.textMaximumLineCount maximumLineCount: root.textMaximumLineCount
elide: root.textElide elide: root.textElide
@ -96,7 +105,13 @@ Item {
id: description id: description
text: root.descriptionText text: root.descriptionText
color: root.descriptionOnTop ? root.textColor : root.descriptionColor color: {
if (root.enabled) {
return root.descriptionOnTop ? root.textColor : root.descriptionColor
} else {
return root.descriptionOnTop ? root.textDisabledColor : root.descriptionDisabledColor
}
}
opacity: root.textOpacity opacity: root.textOpacity
@ -157,7 +172,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
hoverEnabled: true hoverEnabled: root.enabled
onEntered: { onEntered: {
if (rightImageSource) { if (rightImageSource) {

12
client/ui/qml/Pages2/PageSettingsConnection.qml
View file

@ -94,6 +94,8 @@ PageType {
DividerType {} DividerType {}
LabelWithButtonType { LabelWithButtonType {
visible: !GC.isMobile()
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Split site tunneling") text: qsTr("Split site tunneling")
@ -105,9 +107,13 @@ PageType {
} }
} }
DividerType {} DividerType {
visible: !GC.isMobile()
}
LabelWithButtonType { LabelWithButtonType {
visible: !GC.isMobile()
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Separate application tunneling") text: qsTr("Separate application tunneling")
@ -118,7 +124,9 @@ PageType {
} }
} }
DividerType {} DividerType {
visible: !GC.isMobile()
}
} }
} }
} }

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

@ -20,6 +20,10 @@ import "../Components"
PageType { PageType {
id: root id: root
property bool pageEnabled: {
return !ConnectionController.isConnected
}
Connections { Connections {
target: SitesController target: SitesController
@ -78,6 +82,8 @@ PageType {
RowLayout { RowLayout {
HeaderType { HeaderType {
enabled: root.pageEnabled
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: 16 Layout.leftMargin: 16
@ -89,6 +95,8 @@ PageType {
property int lastActiveRouteMode: routeMode.onlyForwardSites property int lastActiveRouteMode: routeMode.onlyForwardSites
enabled: root.pageEnabled
Layout.fillWidth: true Layout.fillWidth: true
Layout.rightMargin: 16 Layout.rightMargin: 16
@ -115,7 +123,7 @@ PageType {
drawerHeight: 0.4375 drawerHeight: 0.4375
enabled: switcher.checked enabled: switcher.checked && root.pageEnabled
headerText: qsTr("Mode") headerText: qsTr("Mode")
@ -155,9 +163,9 @@ PageType {
FlickableType { FlickableType {
anchors.top: header.bottom anchors.top: header.bottom
anchors.topMargin: 16 anchors.topMargin: 16
contentHeight: col.implicitHeight + connectButton.implicitHeight + connectButton.anchors.bottomMargin + connectButton.anchors.topMargin contentHeight: col.implicitHeight + addSiteButton.implicitHeight + addSiteButton.anchors.bottomMargin + addSiteButton.anchors.topMargin
enabled: switcher.checked enabled: switcher.checked && root.pageEnabled
Column { Column {
id: col id: col
@ -221,8 +229,17 @@ PageType {
} }
} }
Rectangle {
anchors.fill: addSiteButton
anchors.bottomMargin: -24
color: "#0E0E11"
opacity: 0.8
}
RowLayout { RowLayout {
id: connectButton id: addSiteButton
enabled: root.pageEnabled
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left