oxen-io
/
lokinet-control-panel
mirror of https://github.com/oxen-io/lokinet-control-panel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #75 from jagerman/rescale-smaller 

Condense UI elements to shrink the control panel
This commit is contained in:
Jeff 2020-11-11 06:19:09 -05:00 committed by GitHub
parent d33d8f349c fe87abeedc
commit c1245d8d25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/qml/AddressPanel.qml
View File

@ -8,7 +8,7 @@ import "."
Container {
property var address: ""
Layout.preferredHeight: 79
Layout.preferredHeight: 45
Layout.preferredWidth: Style.appWidth
contentItem: Rectangle {
@ -24,7 +24,7 @@ Container {
anchors.right: parent.right
anchors.rightMargin: 20
y: 18
y: 3
text: "Lokinet Address"
font.family: Style.weakTextFont
color: Style.weakTextColor
@ -40,7 +40,7 @@ Container {
anchors.right: parent.right
anchors.rightMargin: 20
y: 40
y: 21
text: address
font.family: Style.weakTextFont
color: Style.strongTextColor

2
res/qml/ConnectionButtonPanel.qml
View File

@ -16,7 +16,7 @@ Container {
onRunningChanged: updateState();
onHoveringChanged: updateState();
Layout.preferredHeight: 198
Layout.preferredHeight: 168
Layout.preferredWidth: Style.appWidth
contentItem: Rectangle {

14
res/qml/ExitPanel.qml
View File

@ -11,7 +11,7 @@ Container {
property var status: ""
property var busy: false
property var hasExit: false
Layout.preferredHeight: 200
Layout.preferredHeight: 167
Layout.preferredWidth: Style.appWidth
contentItem: Rectangle {
@ -27,7 +27,7 @@ Container {
anchors.right: parent.right
anchors.rightMargin: 20
y: 18
y: 3
text: "Exit Node"
font.family: Style.weakTextFont
color: Style.weakTextColor
@ -45,7 +45,7 @@ Container {
anchors.right: parent.right
anchors.rightMargin: 20
y: 40
y: 25
text: address
font.family: Style.weakTextFont
color: Style.strongTextColor
@ -60,7 +60,7 @@ Container {
anchors.right: parent.right
anchors.rightMargin: 20
y: 80
y: 62
text: "Auth Code"
font.family: Style.weakTextFont
color: Style.weakTextColor
@ -79,7 +79,7 @@ Container {
anchors.right: parent.right
anchors.rightMargin: 20
y: 100
y: 82
text: authcode
font.family: Style.weakTextFont
color: Style.strongTextColor
@ -117,7 +117,7 @@ Container {
}
y: 140
y: 112
onClicked: {
if(busy)
{
@ -187,7 +187,7 @@ Container {
anchors.leftMargin: 20
anchors.right: parent.right
anchors.rightMargin: 20
y: 180
y: 150
text: status
font.family: Style.weakTextFont
color: Style.weakTextColor

12
res/qml/RouteStatsPanel.qml
View File

@ -10,21 +10,21 @@ Container {
property var routers: 0
property var buildRatio: ""
Layout.preferredHeight: 69
Layout.preferredHeight: 45
Layout.preferredWidth: Style.appWidth
contentItem: Rectangle {
color: Style.panelBackgroundColor
}
// "Paths built"
// "Active Paths"
Text {
anchors.left: parent.left
anchors.leftMargin: 20
anchors.right: parent.right
anchors.rightMargin: 20
y: 18
y: 3
text: "Active Paths"
font.family: Style.weakTextFont
color: Style.weakTextColor
@ -37,7 +37,7 @@ Container {
anchors.right: parent.right
anchors.rightMargin: 20
y: 40
y: 22
text: ""+ paths + " (" + buildRatio + " success)"
font.family: Style.weakTextFont
color: Style.strongTextColor
@ -51,7 +51,7 @@ Container {
anchors.right: parent.right
anchors.rightMargin: 20
y: 18
y: 3
text: "Lokinet routers"
font.family: Style.weakTextFont
color: Style.weakTextColor
@ -64,7 +64,7 @@ Container {
anchors.right: parent.right
anchors.rightMargin: 20
y: 40
y: 22
text: ""+ routers
font.family: Style.weakTextFont
color: Style.strongTextColor

6
res/qml/Style.qml
View File

@ -4,11 +4,11 @@ import QtQuick 2.0
QtObject {
readonly property color strongTextColor: "#efefef"
readonly property string strongTextFont: "Roboto"
readonly property int strongTextSize: 11
readonly property int strongTextSize: 10
readonly property color weakTextColor: "#6b6b78"
readonly property string weakTextFont: "Roboto"
readonly property int weakTextSize: 11
readonly property int weakTextSize: 10
readonly property color logoTextColor: "#eeefef"
readonly property int logoTextSize: 24
@ -29,5 +29,5 @@ QtObject {
// app dimensions -- TODO: components should be sized dynamically,
// this should either be defined/used in one place or implied by
// the desired size of widgets
readonly property int appWidth: 340
readonly property int appWidth: 300
}

16
res/qml/UsagePanel.qml
View File

@ -30,7 +30,7 @@ Container {
recalculateGraphScale(chartData.getHighestSample());
}
Layout.preferredHeight: 249
Layout.preferredHeight: 177
Layout.preferredWidth: Style.appWidth
contentItem: Rectangle {
@ -75,7 +75,7 @@ Container {
anchors.leftMargin: 20
anchors.right: parent.right
anchors.rightMargin: 20
y: 18
y: 3
text: "Upload"
font.family: Style.weakTextFont
color: Style.weakTextColor
@ -87,11 +87,12 @@ Container {
anchors.leftMargin: 20
anchors.right: parent.right
anchors.rightMargin: 20
y: 40
y: 22
text: ""+ makeRate(up)
font.family: Style.weakTextFont
color: Style.strongTextColor
font.pointSize: Style.weakTextSize
z: 1
}
Text {
@ -100,7 +101,7 @@ Container {
anchors.right: parent.right
anchors.rightMargin: 20
text: "Download"
y: 18
y: 3
font.family: Style.weakTextFont
color: Style.weakTextColor
font.pointSize: Style.weakTextSize
@ -111,11 +112,12 @@ Container {
anchors.leftMargin: 170
anchors.right: parent.right
anchors.rightMargin: 20
y: 40
y: 22
text: ""+ makeRate(down)
font.family: Style.weakTextFont
color: Style.strongTextColor
font.pointSize: Style.weakTextSize
z: 1
}
/*
@ -161,8 +163,8 @@ Container {
// these weird numbers come from an attempt to work around ChartView's
// nasty permanent margins
x: -20
y: 50
width: Style.appWidth + 20
y: 25
width: Style.appWidth + 75
height: 189
ValueAxis {