diff options
| author | kali <kali@win> | 2020-09-25 16:49:46 +0200 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2020-09-25 20:42:50 +0200 |
| commit | 5518645dfdfd1250dcabd98bda5d71d18eb4edcc (patch) | |
| tree | d0ca2b3090aec17d43edb63a4383c63388ee2c27 /gui | |
| parent | 2ecd10efa37c6ccd04c43e663f88c4a6910b2a4b (diff) | |
[pkg] windows helper and qtinstaller
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/backend.go | 4 | ||||
| -rw-r--r-- | gui/handlers.cpp | 2 | ||||
| -rw-r--r-- | gui/qml/main.qml | 12 |
3 files changed, 14 insertions, 4 deletions
diff --git a/gui/backend.go b/gui/backend.go index e353a22..abacd85 100644 --- a/gui/backend.go +++ b/gui/backend.go @@ -10,8 +10,8 @@ import ( "0xacab.org/leap/bitmask-vpn/pkg/backend" ) -//export GetVersion -func GetVersion() *C.char { +//export GetBitmaskVersion +func GetBitmaskVersion() *C.char { return (*C.char)(backend.GetVersion()) } diff --git a/gui/handlers.cpp b/gui/handlers.cpp index f4fe10b..6cafab5 100644 --- a/gui/handlers.cpp +++ b/gui/handlers.cpp @@ -19,7 +19,7 @@ Backend::Backend(QObject *parent) : QObject(parent) QString Backend::getVersion() { - return QString(GetVersion()); + return QString(GetBitmaskVersion()); } void Backend::switchOn() diff --git a/gui/qml/main.qml b/gui/qml/main.qml index 4bd87ba..adf11bd 100644 --- a/gui/qml/main.qml +++ b/gui/qml/main.qml @@ -141,10 +141,20 @@ ApplicationWindow { // left and right click seem to be working fine, so let's ignore this for now. switch (reason) { case SystemTrayIcon.Unknown: - break + console.debug("reason: unknown") + menu.open() + break case SystemTrayIcon.Context: + console.debug("activated: context") + if (Qt.platform.os !== "linux") { + menu.open() + } break case SystemTrayIcon.DoubleClick: + console.debug("activated: double click") + if (Qt.platform.os !== "linux") { + menu.open() + } break case SystemTrayIcon.Trigger: break |