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

minor ui fixes

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-08-26 10:08:50 +03:00
parent a74736b100
commit 29bef052c7
16 changed files with 57 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -6,7 +6,7 @@ project(${PROJECT} VERSION 4.0.2.1
DESCRIPTION "AmneziaVPN" DESCRIPTION "AmneziaVPN"
HOMEPAGE_URL "https://amnezia.org/" HOMEPAGE_URL "https://amnezia.org/"
) )
set(RELEASE_DATE "2023-08-16") set(RELEASE_DATE "2023-08-25")
set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}) set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

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

@ -163,7 +163,7 @@ DrawerType {
height: 24 height: 24
color: "#D7D8DB" color: "#D7D8DB"
selectionColor: "#412102" selectionColor: "#633303"
selectedTextColor: "#D7D8DB" selectedTextColor: "#D7D8DB"
font.pixelSize: 16 font.pixelSize: 16

2
client/ui/qml/Controls2/CheckBoxType.qml
View file

@ -21,7 +21,7 @@ CheckBox {
property string defaultBorderColor: "#D7D8DB" property string defaultBorderColor: "#D7D8DB"
property string checkedBorderColor: "#FBB26A" property string checkedBorderColor: "#FBB26A"
property string checkedBorderDisabledColor: "#5A330C" property string checkedBorderDisabledColor: "#402102"
property string checkedImageColor: "#FBB26A" property string checkedImageColor: "#FBB26A"
property string pressedImageColor: "#A85809" property string pressedImageColor: "#A85809"

12
client/ui/qml/Controls2/DropDownType.qml
View file

@ -27,7 +27,9 @@ Item {
property string rootButtonDefaultBorderColor: "#2C2D30" property string rootButtonDefaultBorderColor: "#2C2D30"
property string rootButtonPressedBorderColor: "#D7D8DB" property string rootButtonPressedBorderColor: "#D7D8DB"
property int rootButtonTextMargins: 16 property int rootButtonTextLeftMargins: 16
property int rootButtonTextTopMargin: 16
property int rootButtonTextBottomMargin: 16
property real drawerHeight: 0.9 property real drawerHeight: 0.9
property Component listView property Component listView
@ -76,9 +78,9 @@ Item {
spacing: 0 spacing: 0
ColumnLayout { ColumnLayout {
Layout.leftMargin: rootButtonTextMargins Layout.leftMargin: rootButtonTextLeftMargins
Layout.topMargin: rootButtonTextMargins Layout.topMargin: rootButtonTextTopMargin
Layout.bottomMargin: rootButtonTextMargins Layout.bottomMargin: rootButtonTextBottomMargin
LabelTextType { LabelTextType {
Layout.fillWidth: true Layout.fillWidth: true
@ -104,6 +106,8 @@ Item {
} }
ImageButtonType { ImageButtonType {
Layout.rightMargin: 16
hoverEnabled: false hoverEnabled: false
image: rootButtonImage image: rootButtonImage
imageColor: rootButtonImageColor imageColor: rootButtonImageColor

11
client/ui/qml/Controls2/HorizontalRadioButton.qml
View file

@ -75,19 +75,20 @@ RadioButton {
ColumnLayout { ColumnLayout {
id: content id: content
anchors.fill: parent anchors.fill: parent
spacing: 16 spacing: 0
ButtonTextType { ButtonTextType {
text: root.text text: root.text
color: root.enabled ? root.textColor : root.textDisabledColor color: root.enabled ? root.textColor : root.textDisabledColor
Layout.fillWidth: true Layout.fillWidth: true
Layout.rightMargin: 16 Layout.rightMargin: 24
Layout.leftMargin: 16 Layout.leftMargin: 24
Layout.topMargin: 16 Layout.topMargin: 12
Layout.bottomMargin: 16 Layout.bottomMargin: 12
horizontalAlignment: Qt.AlignHCenter horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
} }
} }

2
client/ui/qml/Controls2/ProgressBarType.qml
View file

@ -8,7 +8,7 @@ ProgressBar {
implicitHeight: 4 implicitHeight: 4
background: Rectangle { background: Rectangle {
color: "#412102" color: "#633303"
} }
contentItem: Item { contentItem: Item {

9
client/ui/qml/Controls2/SwitcherType.qml
View file

@ -14,13 +14,13 @@ Switch {
property string textColor: "#D7D8DB" property string textColor: "#D7D8DB"
property string textDisabledColor: "#878B91" property string textDisabledColor: "#878B91"
property string checkedIndicatorColor: "#412102" property string checkedIndicatorColor: "#633303"
property string defaultIndicatorColor: "transparent" property string defaultIndicatorColor: "transparent"
property string checkedDisabledIndicatorColor: "#5A330C" property string checkedDisabledIndicatorColor: "#402102"
property string checkedIndicatorBorderColor: "#412102" property string checkedIndicatorBorderColor: "#633303"
property string defaultIndicatorBorderColor: "#494B50" property string defaultIndicatorBorderColor: "#494B50"
property string checkedDisabledIndicatorBorderColor: "#5A330C" property string checkedDisabledIndicatorBorderColor: "#402102"
property string checkedInnerCircleColor: "#FBB26A" property string checkedInnerCircleColor: "#FBB26A"
property string defaultInnerCircleColor: "#D7D8DB" property string defaultInnerCircleColor: "#D7D8DB"
@ -40,6 +40,7 @@ Switch {
anchors.left: content.right anchors.left: content.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 4
implicitWidth: 52 implicitWidth: 52
implicitHeight: 32 implicitHeight: 32

8
client/ui/qml/Controls2/TabButtonType.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Controls
TabButton { TabButton {
id: root id: root
property string hoveredColor: "#412102" property string hoveredColor: "#633303"
property string defaultColor: "#2C2D30" property string defaultColor: "#2C2D30"
property string selectedColor: "#FBB26A" property string selectedColor: "#FBB26A"
@ -39,6 +39,12 @@ TabButton {
} }
} }
MouseArea {
anchors.fill: background
cursorShape: Qt.PointingHandCursor
enabled: false
}
contentItem: Text { contentItem: Text {
anchors.fill: background anchors.fill: background
height: 24 height: 24

9
client/ui/qml/Controls2/TabImageButtonType.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Controls
TabButton { TabButton {
id: root id: root
property string hoveredColor: "#412102" property string hoveredColor: "#633303"
property string defaultColor: "#D7D8DB" property string defaultColor: "#D7D8DB"
property string selectedColor: "#FBB26A" property string selectedColor: "#FBB26A"
@ -18,7 +18,14 @@ TabButton {
icon.color: isSelected ? selectedColor : defaultColor icon.color: isSelected ? selectedColor : defaultColor
background: Rectangle { background: Rectangle {
id: background
anchors.fill: parent anchors.fill: parent
color: "transparent" color: "transparent"
} }
MouseArea {
anchors.fill: background
cursorShape: Qt.PointingHandCursor
enabled: false
}
} }

2
client/ui/qml/Controls2/TextAreaType.qml
View file

@ -29,7 +29,7 @@ Rectangle {
anchors.bottomMargin: 16 anchors.bottomMargin: 16
color: "#D7D8DB" color: "#D7D8DB"
selectionColor: "#412102" selectionColor: "#633303"
selectedTextColor: "#D7D8DB" selectedTextColor: "#D7D8DB"
placeholderTextColor: "#878B91" placeholderTextColor: "#878B91"

2
client/ui/qml/Controls2/TextFieldWithHeaderType.qml
View file

@ -74,7 +74,7 @@ Item {
placeholderText: root.textFieldPlaceholderText placeholderText: root.textFieldPlaceholderText
placeholderTextColor: "#494B50" placeholderTextColor: "#494B50"
selectionColor: "#412102" selectionColor: "#633303"
selectedTextColor: "#D7D8DB" selectedTextColor: "#D7D8DB"
font.pixelSize: 16 font.pixelSize: 16

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

@ -70,6 +70,8 @@ PageType {
Layout.topMargin: 24 Layout.topMargin: 24
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
spacing: 0
Header1TextType { Header1TextType {
text: root.defaultServerName text: root.defaultServerName
} }
@ -78,6 +80,8 @@ PageType {
Layout.preferredWidth: 18 Layout.preferredWidth: 18
Layout.preferredHeight: 18 Layout.preferredHeight: 18
Layout.leftMargin: 12
source: "qrc:/images/controls/chevron-down.svg" source: "qrc:/images/controls/chevron-down.svg"
} }
} }
@ -152,7 +156,8 @@ PageType {
rootButtonBackgroundColor: "#D7D8DB" rootButtonBackgroundColor: "#D7D8DB"
rootButtonHoveredBorderColor: "transparent" rootButtonHoveredBorderColor: "transparent"
rootButtonPressedBorderColor: "transparent" rootButtonPressedBorderColor: "transparent"
rootButtonTextMargins: 8 rootButtonTextTopMargin: 8
rootButtonTextBottomMargin: 8
text: root.defaultContainerName text: root.defaultContainerName
textColor: "#0E0E11" textColor: "#0E0E11"
@ -303,6 +308,7 @@ PageType {
ImageButtonType { ImageButtonType {
image: "qrc:/images/controls/settings.svg" image: "qrc:/images/controls/settings.svg"
imageColor: "#D7D8DB"
implicitWidth: 56 implicitWidth: 56
implicitHeight: 56 implicitHeight: 56

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

@ -142,7 +142,7 @@ PageType {
height: 24 height: 24
color: "#D7D8DB" color: "#D7D8DB"
selectionColor: "#412102" selectionColor: "#633303"
selectedTextColor: "#D7D8DB" selectedTextColor: "#D7D8DB"
font.pixelSize: 16 font.pixelSize: 16

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

@ -26,9 +26,11 @@ PageType {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
spacing: 0
HeaderType { HeaderType {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 24
Layout.rightMargin: 16 Layout.rightMargin: 16
Layout.leftMargin: 16 Layout.leftMargin: 16

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

@ -106,9 +106,11 @@ PageType {
anchors.rightMargin: 16 anchors.rightMargin: 16
anchors.leftMargin: 16 anchors.leftMargin: 16
spacing: 0
HeaderType { HeaderType {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 24
headerText: qsTr("VPN Access") headerText: qsTr("VPN Access")
} }
@ -161,6 +163,7 @@ PageType {
ParagraphTextType { ParagraphTextType {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 24 Layout.topMargin: 24
Layout.bottomMargin: 24
text: accessTypeSelector.currentIndex === 0 ? qsTr("VPN access without the ability to manage the server") : text: accessTypeSelector.currentIndex === 0 ? qsTr("VPN access without the ability to manage the server") :
qsTr("Full access to server") qsTr("Full access to server")
@ -171,7 +174,7 @@ PageType {
id: serverSelector id: serverSelector
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 24 Layout.topMargin: 16
drawerHeight: 0.4375 drawerHeight: 0.4375
@ -385,7 +388,7 @@ PageType {
BasicButtonType { BasicButtonType {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 32 Layout.topMargin: 40
enabled: shareButtonEnabled enabled: shareButtonEnabled

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

@ -163,14 +163,6 @@ PageType {
} }
} }
MouseArea {
anchors.fill: tabBar
anchors.leftMargin: shareTabButton.visible ? 96 : 128
anchors.rightMargin: shareTabButton.visible ? 96 : 128
cursorShape: Qt.PointingHandCursor
enabled: false
}
BusyIndicatorType { BusyIndicatorType {
id: busyIndicator id: busyIndicator
anchors.centerIn: parent anchors.centerIn: parent