Merge pull request #153 from amnezia-vpn/bugfix/some-ui-small-fixes

bugfix/some-ui-small-fixes

client/ui/qml/Pages/PageServerContainers.qml

@@ -190,12 +190,12 @@ PageBase {
                 left: parent.left;
                 right: parent.right;
             }
-            topPadding: 20
             spacing: 10
 
             Caption {
                 id: cap1
                 text: qsTr("Installed Protocols and Services")
+                leftPadding: -20
                 font.pixelSize: 20
 
             }

client/ui/qml/Pages/PageServerSettings.qml

@@ -87,19 +87,19 @@ PageBase {
             BlueButtonType {
                 Layout.fillWidth: true
                 Layout.topMargin: 60
-                text: ServerSettingsLogic.pushButtonClearText
-                visible: ServerSettingsLogic.pushButtonClearVisible
+                text: ServerSettingsLogic.pushButtonClearClientCacheText
+                visible: ServerSettingsLogic.pushButtonClearClientCacheVisible
                 onClicked: {
-                    ServerSettingsLogic.onPushButtonClearServer()
+                    ServerSettingsLogic.onPushButtonClearClientCacheClicked()
                 }
             }
             BlueButtonType {
                 Layout.fillWidth: true
                 Layout.topMargin: 10
-                text: ServerSettingsLogic.pushButtonClearClientCacheText
-                visible: ServerSettingsLogic.pushButtonClearClientCacheVisible
+                text: ServerSettingsLogic.pushButtonClearText
+                visible: ServerSettingsLogic.pushButtonClearVisible
                 onClicked: {
-                    ServerSettingsLogic.onPushButtonClearClientCacheClicked()
+                    ServerSettingsLogic.onPushButtonClearServer()
                 }
             }
             BlueButtonType {

client/ui/qml/TitleBar.qml

@@ -1,38 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import "./"
-import "Config"
-
-Rectangle {
-    id: root
-    color: "#F5F5F5"
-    width: GC.screenWidth
-    height: 30
-    signal closeButtonClicked()
-
-    Button {
-        id: closeButton
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.right: parent.right
-        anchors.rightMargin: 5
-        icon.source: "qrc:/images/close.png"
-        icon.width: 16
-        icon.height: 16
-        width: height
-        height: 20
-        background: Item {}
-        contentItem: Image {
-            source: closeButton.icon.source
-            anchors.fill: closeButton
-            anchors.margins: ms.containsMouse ? 3 : 4
-        }
-        MouseArea {
-            id: ms
-            hoverEnabled: true
-            anchors.fill: closeButton
-        }
-        onClicked: {
-            root.closeButtonClicked()
-        }
-    }
-}

client/ui/qml/main.qml

@@ -85,14 +85,14 @@ Window  {
     }
 
     Rectangle {
-        y: GC.isDesktop() ? titleBar.height : 0
+        y: 0
         anchors.fill: parent
         color: "white"
     }
 
     StackView {
         id: pageLoader
-        y: GC.isDesktop() ? titleBar.height : 0
+        y: 0
         anchors.fill: parent
         focus: true