summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2021-09-17 19:49:15 +0200
committerkali kaneko (leap communications) <kali@leap.se>2021-11-23 21:51:05 +0100
commit9413b50cba3d8b4c9a8b6474729483b775aa5619 (patch)
tree6dfff47d63647f965727eb8a72198286b220df9c
parent7cdbe15b46a2c2ac94b10f27092b190147f2124f (diff)
[ui] nospy and sizes
-rw-r--r--gui/components/Footer.qml10
-rw-r--r--gui/components/MaterialButton.qml6
-rw-r--r--gui/components/Splash.qml2
-rw-r--r--gui/components/StatusBox.qml9
-rw-r--r--gui/components/VPNState.qml2
-rw-r--r--gui/themes/themes.js3
6 files changed, 22 insertions, 10 deletions
diff --git a/gui/components/Footer.qml b/gui/components/Footer.qml
index 7658fa1..893f4cf 100644
--- a/gui/components/Footer.qml
+++ b/gui/components/Footer.qml
@@ -23,10 +23,16 @@ ToolBar {
visible: hasMultipleGateways()
anchors {
verticalCenter: parent.verticalCenter
- leftMargin: 10
+ leftMargin: 20
left: parent.left
verticalCenterOffset: 5
}
+ /*
+ background.implicitHeight: 32
+ background.implicitWidth: 32
+ */
+ icon.width: 20
+ icon.height: 20
icon.source: stackView.depth > 1 ? "" : "../resources/globe.svg"
onClicked: stackView.push("Locations.qml")
}
@@ -35,7 +41,7 @@ ToolBar {
id: locationLabel
anchors.left: gwButton.right
anchors.verticalCenter: parent.verticalCenter
- anchors.verticalCenterOffset: 5
+ anchors.verticalCenterOffset: 7
text: locationStr()
color: getLocationColor()
}
diff --git a/gui/components/MaterialButton.qml b/gui/components/MaterialButton.qml
index 25911f3..7fe04d9 100644
--- a/gui/components/MaterialButton.qml
+++ b/gui/components/MaterialButton.qml
@@ -5,6 +5,8 @@ import QtQuick.Controls.impl 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Controls.Material.impl 2.12
+import "../themes/themes.js" as Theme
+
T.Button {
id: control
@@ -42,13 +44,13 @@ T.Button {
}
background: Rectangle {
- implicitWidth: 64
+ implicitWidth: 68
implicitHeight: control.Material.buttonHeight
radius: 4
border.color: "black"
border.width: 1
- color: !control.enabled ? control.Material.buttonDisabledColor : control.highlighted ? control.Material.highlightedButtonColor : control.Material.buttonColor
+ color: !control.enabled ? control.Material.buttonDisabledColor : control.highlighted ? control.Material.highlightedButtonColor : Theme.buttonColor
PaddedRectangle {
y: parent.height - 4
diff --git a/gui/components/Splash.qml b/gui/components/Splash.qml
index 0529d76..8cc9bd9 100644
--- a/gui/components/Splash.qml
+++ b/gui/components/Splash.qml
@@ -27,7 +27,7 @@ Page {
VerticalSpacer {
visible: true
- height: root.height * 0.10
+ height: root.height * 0.22
}
ProgressBar {
diff --git a/gui/components/StatusBox.qml b/gui/components/StatusBox.qml
index a3a5c18..2f56faf 100644
--- a/gui/components/StatusBox.qml
+++ b/gui/components/StatusBox.qml
@@ -43,14 +43,14 @@ Item {
ToolButton {
id: settingsButton
objectName: "settingsButton"
- font.pixelSize: Qt.application.font.pixelSize * 1.2
+ font.pixelSize: Qt.application.font.pixelSize * 1.6
opacity: 1
anchors {
top: parent.top
left: parent.left
- topMargin: Theme.windowMargin + 10
- leftMargin: Theme.windowMargin + 10
+ topMargin: Theme.windowMargin + 5
+ leftMargin: Theme.windowMargin + 5
}
onClicked: {
@@ -102,7 +102,7 @@ Item {
Image {
id: connectionImage
height: 160
- source: "../resources/spy.gif"
+ source: "../resources/icon-noshield.svg"
anchors.horizontalCenter: parent.horizontalCenter
fillMode: Image.PreserveAspectFit
}
@@ -121,6 +121,7 @@ Item {
Layout.alignment: Qt.AlignBottom
font {
+ pixelSize: Theme.buttonFontSize
capitalization: Font.Capitalize
family: lightFont.name
bold: false
diff --git a/gui/components/VPNState.qml b/gui/components/VPNState.qml
index 5e659a9..d92065a 100644
--- a/gui/components/VPNState.qml
+++ b/gui/components/VPNState.qml
@@ -61,7 +61,7 @@ StateGroup {
}
PropertyChanges {
target: connectionImage
- source: "../resources/spy.gif"
+ source: "../resources/icon-noshield.svg"
}
PropertyChanges {
target: toggleVPN
diff --git a/gui/themes/themes.js b/gui/themes/themes.js
index c04ef24..0e9293a 100644
--- a/gui/themes/themes.js
+++ b/gui/themes/themes.js
@@ -48,6 +48,9 @@ const blueButton = {
"focusBorder": blueFocusBorder,
};
+const buttonFontSize = 20;
+const buttonColor = "#eeeeee";
+
const bgColor = "#f3f3f3";
const fgColor = "#ffffff";