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

Merge pull request #359 from amnezia-vpn/bugfix/minor-ui-fixes-4-version

Browse source 
minor ui fixes
This commit is contained in:
Nethius 2023-10-03 21:48:30 +03:00 • committed by GitHub
commit 70e6a3d303
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 94 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/ui/controllers/installController.cpp
View file

@ -113,8 +113,7 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
ContainerProps::containerHumanNames().value(container) + tr(" is already installed on the server. ");
}
if (installedContainers.size() > 1) {
finishMessage += tr("\nAlready installed containers were found on the server. "
"All installed containers have been added to the application");
finishMessage += tr("\nAdded containers that were already installed on the server");
}
if (errorCode == ErrorCode::NoError) {

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

@ -114,7 +114,7 @@ DrawerType {
BasicButtonType {
Layout.fillWidth: true
Layout.topMargin: 8
Layout.topMargin: 24
defaultColor: "transparent"
hoveredColor: Qt.rgba(1, 1, 1, 0.08)
@ -123,7 +123,7 @@ DrawerType {
textColor: "#D7D8DB"
borderWidth: 1
text: qsTr("Show content")
text: qsTr("Show connection settings")
onClicked: {
configContentDrawer.visible = true

3
client/ui/qml/Controls2/BackButtonType.qml
View file

@ -23,6 +23,9 @@ Item {
image: backButtonImage
imageColor: "#D7D8DB"
implicitWidth: 40
implicitHeight: 40
onClicked: {
if (backButtonFunction && typeof backButtonFunction === "function") {
backButtonFunction()

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

@ -90,6 +90,9 @@ Button {
anchors.centerIn: parent
Image {
Layout.preferredHeight: 20
Layout.preferredWidth: 20
source: root.imageSource
visible: root.imageSource === "" ? false : true

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

@ -24,6 +24,8 @@ Item {
property string rootButtonImage: "qrc:/images/controls/chevron-down.svg"
property string rootButtonImageColor: "#D7D8DB"
property string rootButtonBackgroundColor: "#1C1D21"
property string rootButtonBackgroundHoveredColor: "#1C1D21"
property string rootButtonBackgroundPressedColor: "#1C1D21"
property string rootButtonHoveredBorderColor: "#494B50"
property string rootButtonDefaultBorderColor: "#2C2D30"
@ -71,6 +73,10 @@ Item {
Behavior on border.color {
PropertyAnimation { duration: 200 }
}
Behavior on color {
PropertyAnimation { duration: 200 }
}
}
RowLayout {
@ -112,6 +118,9 @@ Item {
ImageButtonType {
Layout.rightMargin: 16
implicitWidth: 40
implicitHeight: 40
hoverEnabled: false
image: rootButtonImage
imageColor: rootButtonImageColor
@ -126,12 +135,20 @@ Item {
onEntered: {
if (menu.visible === false) {
rootButtonBackground.border.color = rootButtonHoveredBorderColor
rootButtonBackground.color = rootButtonBackgroundHoveredColor
}
}
onExited: {
if (menu.visible === false) {
rootButtonBackground.border.color = rootButtonDefaultBorderColor
rootButtonBackground.color = rootButtonBackgroundColor
}
}
onPressed: {
if (menu.visible === false) {
rootButtonBackground.color = pressed ? rootButtonBackgroundPressedColor : entered ? rootButtonHoveredBorderColor : rootButtonDefaultBorderColor
}
}

3
client/ui/qml/Controls2/Header2Type.qml
View file

@ -31,6 +31,9 @@ Item {
ImageButtonType {
id: headerActionButton
implicitWidth: 40
implicitHeight: 40
image: root.actionButtonImage
imageColor: "#D7D8DB"

3
client/ui/qml/Controls2/HeaderType.qml
View file

@ -36,6 +36,9 @@ Item {
ImageButtonType {
id: headerActionButton
implicitWidth: 40
implicitHeight: 40
Layout.alignment: Qt.AlignRight
image: root.actionButtonImage

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

@ -15,11 +15,8 @@ Button {
property string imageColor: "#878B91"
property string disableImageColor: "#2C2D30"
property int backGroudRadius: 12
property int implicitSize: 40
implicitWidth: implicitSize
implicitHeight: implicitSize
property alias backgroundColor: background.color
property alias backgroundRadius: background.radius
hoverEnabled: true
@ -34,16 +31,16 @@ Button {
id: background
anchors.fill: parent
radius: backGroudRadius
color: {
if (root.enabled) {
if(root.pressed) {
if (root.pressed) {
return pressedColor
}
return hovered ? hoveredColor : defaultColor
}
return defaultColor
}
radius: 12
Behavior on color {
PropertyAnimation { duration: 200 }
}

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

@ -119,6 +119,9 @@ Item {
ImageButtonType {
id: rightImage
implicitWidth: 40
implicitHeight: 40
hoverEnabled: false
image: rightImageSource
imageColor: rightImageColor

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

@ -167,7 +167,7 @@ Item {
}
onEntered: {
backgroud.border.color = getBackgroundBorderColor(bgBorderHoveredColor)
backgroud.border.color = getBackgroundBorderColor(bgBorderHoveredColor)
}

2
client/ui/qml/Controls2/TextTypes/ButtonTextType.qml
View file

@ -6,7 +6,7 @@ Text {
color: "#D7D8DB"
font.pixelSize: 16
font.weight: 500
font.weight: 600
font.family: "PT Root UI VF"
wrapMode: Text.WordWrap

3
client/ui/qml/Controls2/TopCloseButtonType.qml
View file

@ -23,6 +23,9 @@ Popup {
image: "qrc:/images/svg/close_black_24dp.svg"
imageColor: "#D7D8DB"
implicitWidth: 40
implicitHeight: 40
onClicked: {
PageController.goToDrawerRootPage()
}

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

@ -81,6 +81,20 @@ PageType {
}
}
onEntered: {
collapsedButtonChevron.backgroundColor = collapsedButtonChevron.hoveredColor
collapsedButtonHeader.opacity = 0.8
}
onExited: {
collapsedButtonChevron.backgroundColor = collapsedButtonChevron.defaultColor
collapsedButtonHeader.opacity = 1
}
onPressedChanged: {
collapsedButtonChevron.backgroundColor = pressed ? collapsedButtonChevron.pressedColor : entered ? collapsedButtonChevron.hoveredColor : collapsedButtonChevron.defaultColor
collapsedButtonHeader.opacity = 0.7
}
onClicked: {
if (buttonContent.state === "collapsed") {
buttonContent.state = "expanded"
@ -202,6 +216,7 @@ PageType {
spacing: 0
Header1TextType {
id: collapsedButtonHeader
Layout.maximumWidth: buttonContent.width - 48 - 18 - 12 // todo
maximumLineCount: 2
@ -209,15 +224,33 @@ PageType {
text: root.defaultServerName
horizontalAlignment: Qt.AlignHCenter
Behavior on opacity {
PropertyAnimation { duration: 200 }
}
}
Image {
Layout.preferredWidth: 18
Layout.preferredHeight: 18
ImageButtonType {
id: collapsedButtonChevron
Layout.leftMargin: 12
Layout.leftMargin: 8
source: "qrc:/images/controls/chevron-down.svg"
hoverEnabled: false
image: "qrc:/images/controls/chevron-down.svg"
imageColor: "#d7d8db"
icon.width: 18
icon.height: 18
backgroundRadius: 16
horizontalPadding: 4
topPadding: 4
bottomPadding: 3
onClicked: {
if (buttonContent.state === "collapsed") {
buttonContent.state = "expanded"
}
}
}
}
@ -279,8 +312,10 @@ PageType {
rootButtonImageColor: "#0E0E11"
rootButtonBackgroundColor: "#D7D8DB"
rootButtonBackgroundHoveredColor: Qt.rgba(215, 216, 219, 0.8)
rootButtonBackgroundPressedColor: Qt.rgba(215, 216, 219, 0.65)
rootButtonHoveredBorderColor: "transparent"
rootButtonPressedBorderColor: "transparent"
rootButtonDefaultBorderColor: "transparent"
rootButtonTextTopMargin: 8
rootButtonTextBottomMargin: 8
@ -463,6 +498,8 @@ PageType {
DividerType {
Layout.fillWidth: true
Layout.leftMargin: 0
Layout.rightMargin: 0
}
}
}

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

@ -62,6 +62,7 @@ PageType {
id: header
implicitWidth: parent.width
headerTextMaximumLineCount: 10
headerText: qsTr("What is the level of internet control in your region?")
}
@ -145,14 +146,13 @@ PageType {
Item {
implicitWidth: 1
implicitHeight: 1
implicitHeight: 54
}
BasicButtonType {
id: continueButton
implicitWidth: parent.width
anchors.topMargin: 24
text: qsTr("Continue")

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

@ -219,13 +219,14 @@ PageType {
if (accessTypeSelector.currentIndex !== 0) {
shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text
shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
shareConnectionDrawer.configContentHeaderText = qsTr("File with accessing settings to ") + serverSelector.text
}
serverSelector.menuVisible = false
}
Component.onCompleted: {
handler()
serverSelector.severSelectorIndexChanged()
}
function handler() {
@ -240,12 +241,14 @@ PageType {
DropDownType {
id: protocolSelector
visible: accessTypeSelector.currentIndex === 0
Layout.fillWidth: true
Layout.topMargin: 16
drawerHeight: 0.5
descriptionText: qsTr("Protocols")
descriptionText: qsTr("Protocol")
headerText: qsTr("Protocol")
listView: ListViewWithRadioButtonType {