Merge branch 'dev' into feature/app-update

This commit is contained in:
aiamnezia 2024-12-19 18:15:22 +04:00
commit caa5132355
4 changed files with 109 additions and 2 deletions

View file

@ -2679,7 +2679,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="154"/>
<source>Where to get connection data, step-by-step instructions for buying a VPS</source>
<translation>Где взять данные для подключения, пошаговые инстуркции по покупке VPS</translation>
<translation>Где взять данные для подключения, пошаговые инструкции по покупке VPS</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="170"/>

View file

@ -24,7 +24,7 @@ Button {
property string leftImageSource
property string rightImageSource
property string leftImageColor
property string leftImageColor: textColor
property bool changeLeftImageSize: true
property bool squareLeftSide: false

View file

@ -110,6 +110,7 @@ PageType {
text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled")
leftImageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
leftImageColor: ""
rightImageSource: "qrc:/images/controls/chevron-down.svg"
Keys.onEnterPressed: splitTunnelingButton.clicked()