Skip to content
Snippets Groups Projects
Unverified Commit 9413b50c authored by Kali Kaneko's avatar Kali Kaneko
Browse files

[ui] nospy and sizes

parent 7cdbe15b
No related branches found
No related tags found
No related merge requests found
......@@ -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()
}
......
......@@ -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
......
......@@ -27,7 +27,7 @@ Page {
VerticalSpacer {
visible: true
height: root.height * 0.10
height: root.height * 0.22
}
ProgressBar {
......
......@@ -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
......
......@@ -61,7 +61,7 @@ StateGroup {
}
PropertyChanges {
target: connectionImage
source: "../resources/spy.gif"
source: "../resources/icon-noshield.svg"
}
PropertyChanges {
target: toggleVPN
......
......@@ -48,6 +48,9 @@ const blueButton = {
"focusBorder": blueFocusBorder,
};
const buttonFontSize = 20;
const buttonColor = "#eeeeee";
const bgColor = "#f3f3f3";
const fgColor = "#ffffff";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment