summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/qml/VpnState.qml2
-rw-r--r--gui/qml/main.qml13
2 files changed, 8 insertions, 7 deletions
diff --git a/gui/qml/VpnState.qml b/gui/qml/VpnState.qml
index 4906fce..9ee4ed8 100644
--- a/gui/qml/VpnState.qml
+++ b/gui/qml/VpnState.qml
@@ -54,7 +54,7 @@ StateGroup {
}
PropertyChanges {
target: mainCurrentGateway
- text: qsTr("Connected to ") + ctx.currentGateway
+ text: qsTr("Connected to ") + ctx.currentLocation
}
PropertyChanges {
target: mainOnBtn
diff --git a/gui/qml/main.qml b/gui/qml/main.qml
index 9a0e111..bcd1031 100644
--- a/gui/qml/main.qml
+++ b/gui/qml/main.qml
@@ -23,9 +23,6 @@ Window {
property var loginDone
property var allowEmptyPass
- onWidthChanged: displayGatewayMarker()
- onHeightChanged: displayGatewayMarker()
-
GridLayout {
visible: true
@@ -37,6 +34,7 @@ Window {
Layout.leftMargin: app.width * 0.10
ColumnLayout {
+
Layout.alignment: Qt.AlignHCenter
Text {
@@ -88,7 +86,8 @@ Window {
target: jsonModel
onDataChanged: {
ctx = JSON.parse(jsonModel.getJson())
- console.debug(jsonModel.getJson())
+ // TODO pass QML_DEBUG variable to be hyper-verbose
+ //console.debug(jsonModel.getJson())
gwSelector.model = Object.keys(ctx.gateways)
if (ctx.donateDialog == 'true') {
@@ -194,6 +193,8 @@ Window {
}
}
+ /* TODO change this!!! automatic: Paris (FR) */
+
function toHumanWithLocation(st) {
switch (st) {
case "off":
@@ -202,12 +203,12 @@ Window {
case "on":
//: %1 -> application name
//: %2 -> current gateway
- return qsTr("%1 on - %2").arg(ctx.appName).arg(ctx.currentGateway)
+ return qsTr("%1 on - %2").arg(ctx.appName).arg(ctx.currentLocation)
case "connecting":
//: %1 -> application name
//: %2 -> current gateway
return qsTr("Connecting to %1 - %2").arg(ctx.appName).arg(
- ctx.currentGateway)
+ ctx.currentLocation)
case "stopping":
//: %1 -> application name
return qsTr("Stopping %1").arg(ctx.appName)