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

added icons for buttons in the drop-down window of connections sharing.

Browse source 
- corrections in texts
This commit is contained in:
vladimir.kuznetsov 2023-07-31 12:54:59 +09:00
parent 1092abe776
commit 66f9a82f31
13 changed files with 136 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui/qml/Components/ShareConnectionDrawer.qml
View file

@ -55,6 +55,7 @@ DrawerType {
Layout.topMargin: 16
text: qsTr("Share")
imageSource: "qrc:/images/controls/share-2.svg"
onClicked: {
ExportController.saveFile()
@ -73,6 +74,7 @@ DrawerType {
borderWidth: 1
text: qsTr("Copy")
imageSource: "qrc:/images/controls/copy.svg"
onClicked: {
configText.selectAll()

33
client/ui/qml/Controls2/BasicButtonType.qml
View file

@ -1,5 +1,7 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import "TextTypes"
@ -16,6 +18,8 @@ Button {
property string borderColor: "#D7D8DB"
property int borderWidth: 0
property string imageSource
implicitHeight: 56
hoverEnabled: true
@ -48,11 +52,30 @@ Button {
cursorShape: Qt.PointingHandCursor
}
contentItem: ButtonTextType {
contentItem: Item {
anchors.fill: background
color: textColor
text: root.text
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
RowLayout {
anchors.centerIn: parent
Image {
source: root.imageSource
visible: root.imageSource === "" ? false : true
layer {
enabled: true
effect: ColorOverlay {
color: textColor
}
}
}
ButtonTextType {
color: textColor
text: root.text
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
}
}
}
}

2
client/ui/qml/Pages2/PageHome.qml
View file

@ -155,7 +155,7 @@ PageType {
text: root.defaultContainerName
textColor: "#0E0E11"
headerText: qsTr("Connection protocol")
headerText: qsTr("VPN protocol")
headerBackButtonImage: "qrc:/images/controls/arrow-left.svg"
rootButtonClickedFunction: function() {

4
client/ui/qml/Pages2/PageProtocolCloakSettings.qml
View file

@ -92,7 +92,7 @@ PageType {
Layout.fillWidth: true
Layout.topMargin: 32
headerText: qsTr("Masquerading as traffic from")
headerText: qsTr("Disguised as traffic from")
textFieldText: site
textField.onEditingFinished: {
@ -161,7 +161,7 @@ PageType {
Layout.topMargin: 24
Layout.bottomMargin: 24
text: qsTr("Save and Restart Amnesia")
text: qsTr("Save and Restart Amnezia")
onClicked: {
forceActiveFocus()

2
client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
View file

@ -445,7 +445,7 @@ PageType {
Layout.topMargin: 24
Layout.bottomMargin: 24
text: qsTr("Save and Restart Amnesia")
text: qsTr("Save and Restart Amnezia")
onClicked: {
forceActiveFocus()

2
client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
View file

@ -147,7 +147,7 @@ PageType {
Layout.topMargin: 24
Layout.bottomMargin: 24
text: qsTr("Save and Restart Amnesia")
text: qsTr("Save and Restart Amnezia")
onClicked: {
forceActiveFocus()

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

@ -48,7 +48,7 @@ PageType {
Layout.leftMargin: 16
Layout.rightMargin: 16
text: qsTr("Use AmnesiaDNS if installed on the server")
text: qsTr("Use AmneziaDNS if installed on the server")
descriptionText: qsTr("Internal IP address 172.29.172.254")
checked: SettingsController.isAmneziaDnsEnabled()

2
client/ui/qml/Pages2/PageSettingsServerData.qml
View file

@ -110,7 +110,7 @@ PageType {
visible: content.isServerWithWriteAccess
Layout.fillWidth: true
text: qsTr("Check the server for previously installed Amnesia services")
text: qsTr("Check the server for previously installed Amnezia services")
descriptionText: qsTr("Add them to the application if they were not displayed")
clickedFunction: function() {

5
client/ui/qml/Pages2/PageSetupWizardCredentials.qml
View file

@ -49,7 +49,7 @@ PageType {
Layout.fillWidth: true
headerText: qsTr("Server IP address [:port]")
textFieldPlaceholderText: qsTr("Enter the address in the format 255.255.255.255:88")
textFieldPlaceholderText: qsTr("255.255.255.255:88")
textField.validator: RegularExpressionValidator {
regularExpression: InstallController.ipAddressPortRegExp()
}
@ -60,13 +60,14 @@ PageType {
Layout.fillWidth: true
headerText: qsTr("Login to connect via SSH")
textFieldPlaceholderText: "root"
}
TextFieldWithHeaderType {
id: secretData
Layout.fillWidth: true
headerText: qsTr("Password / Private key")
headerText: qsTr("Password / SSH private key")
textField.echoMode: TextInput.Password
}

2
client/ui/qml/Pages2/PageSetupWizardProtocols.qml
View file

@ -70,7 +70,7 @@ PageType {
width: parent.width
headerText: qsTr("Connection protocol")
headerText: qsTr("VPN protocol")
descriptionText: qsTr("Choose the one with the highest priority for you. Later, you can install other protocols and additional services, such as DNS proxy and SFTP.")
}
}

3
client/ui/qml/Pages2/PageSetupWizardStart.qml
View file

@ -53,7 +53,8 @@ PageType {
Layout.leftMargin: 16
Layout.rightMargin: 16
text: qsTr("A free service to create a personal VPN on your server. We help you access blocked content without exposing your privacy even to VPN providers.")
text: qsTr("Free service for creating a personal VPN on your server.") +
qsTr(" Helps you access blocked content without revealing your privacy, even to VPN providers.")
}
BasicButtonType {

6
client/ui/qml/Pages2/PageShare.qml
View file

@ -65,7 +65,7 @@ PageType {
QtObject {
id: amneziaConnectionFormat
property string name: qsTr("For the AmnesiaVPN app")
property string name: qsTr("For the AmneziaVPN app")
property var type: PageShare.ConfigType.AmneziaConnection
}
QtObject {
@ -135,7 +135,7 @@ PageType {
checked: root.currentIndex === 1
implicitWidth: (root.width - 32) / 2
text: qsTr("Full")
text: qsTr("Full access")
onClicked: {
accessTypeSelector.currentIndex = 1
@ -194,6 +194,8 @@ PageType {
protocolSelector.visible = true
root.shareButtonEnabled = false
} else {
shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text
shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
serverSelector.menuVisible = false
}
}