diff options
| -rw-r--r-- | docs/circumvention.rst | 4 | ||||
| -rw-r--r-- | gui/qml/BackgroundImage.qml | 2 | ||||
| -rw-r--r-- | gui/qml/main.qml | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/docs/circumvention.rst b/docs/circumvention.rst index 9a0d6da..7e22d03 100644 --- a/docs/circumvention.rst +++ b/docs/circumvention.rst @@ -1,8 +1,8 @@ Censorship Circumvention ================================================================================ -This document contains some advice for using BitmaskVPN for censorship -circumvention. +This document contains some advice for using BitmaskVPN (or any of its +derivatives) for censorship circumvention. Bootstrapping the connection ----------------------------- diff --git a/gui/qml/BackgroundImage.qml b/gui/qml/BackgroundImage.qml index aed907f..3071bf4 100644 --- a/gui/qml/BackgroundImage.qml +++ b/gui/qml/BackgroundImage.qml @@ -11,7 +11,7 @@ Rectangle { Image { source: parent.backgroundSrc; - visible: backgroundVisible; + visible: parent.backgroundVisible; fillMode: Image.PreserveAspectCrop; anchors.fill: parent; opacity: 0.8; diff --git a/gui/qml/main.qml b/gui/qml/main.qml index e166d65..fef68cf 100644 --- a/gui/qml/main.qml +++ b/gui/qml/main.qml @@ -303,7 +303,6 @@ ApplicationWindow { } function setGwSelection() { - if (!isManualLocation()) { manualSelectionItem.checked = false bar.currentIndex = 1 @@ -312,7 +311,6 @@ ApplicationWindow { app.raise() return } - // last used manual selection const location = ctx.currentLocation.toLowerCase() const idx = gwSelector.model.indexOf(location) @@ -320,6 +318,13 @@ ApplicationWindow { backend.useLocation(location) } + function showMainWindow() { + bar.currentIndex = 0 + app.visible = true + app.show() + app.raise() + } + Component.onCompleted: { Logic.debugInit() loginDone = false @@ -406,6 +411,7 @@ ApplicationWindow { MenuItem { text: qsTr("Preferences…") visible: !hasMultipleGateways() + onTriggered: showMainWindow() } MenuSeparator {} |