diff options
author | kali kaneko (leap communications) <kali@leap.se> | 2020-06-22 22:00:23 +0200 |
---|---|---|
committer | kali kaneko (leap communications) <kali@leap.se> | 2020-06-26 12:13:44 +0200 |
commit | 06a7453984adca0b34e62421a1baa8fe54b0d7bb (patch) | |
tree | 4eb7d0f31d540c33d2d6f53ed44257c06a4d8220 /gui | |
parent | 20266b063c1be8818d4582bff7b59486551ee447 (diff) |
[refactor] several simplifications after review
- simplify notification routine (we dont need no rejected action). we
just check every hour, as in the original code.
- open links directly from Qt
- rename some global variables to make them less cryptic
- move cleanup function to the same module that created them
Diffstat (limited to 'gui')
-rw-r--r-- | gui/backend.go | 5 | ||||
-rw-r--r-- | gui/handlers.cpp | 10 | ||||
-rw-r--r-- | gui/handlers.h | 2 | ||||
-rw-r--r-- | gui/qml/DonateDialog.qml | 7 | ||||
-rw-r--r-- | gui/qml/main.qml | 2 |
5 files changed, 2 insertions, 24 deletions
diff --git a/gui/backend.go b/gui/backend.go index 92cda6e..f7816ee 100644 --- a/gui/backend.go +++ b/gui/backend.go @@ -37,11 +37,6 @@ func DonateAccepted() { backend.DonateAccepted() } -//export DonateRejected -func DonateRejected() { - backend.DonateRejected() -} - //export SubscribeToEvent func SubscribeToEvent(event string, f unsafe.Pointer) { backend.SubscribeToEvent(event, f) diff --git a/gui/handlers.cpp b/gui/handlers.cpp index 39a5746..9ce268d 100644 --- a/gui/handlers.cpp +++ b/gui/handlers.cpp @@ -30,16 +30,6 @@ void Backend::donateAccepted() DonateAccepted(); } -void Backend::donateRejected() -{ - DonateRejected(); -} - -void Backend::openURL(QString link) -{ - QDesktopServices::openUrl(QUrl(link)); -} - void Backend::quit() { Quit(); diff --git a/gui/handlers.h b/gui/handlers.h index e65fd5e..0dc4c1e 100644 --- a/gui/handlers.h +++ b/gui/handlers.h @@ -34,8 +34,6 @@ public slots: void switchOff(); void unblock(); void donateAccepted(); - void donateRejected(); - void openURL(QString link); void quit(); }; diff --git a/gui/qml/DonateDialog.qml b/gui/qml/DonateDialog.qml index fd27a6b..de7ab5b 100644 --- a/gui/qml/DonateDialog.qml +++ b/gui/qml/DonateDialog.qml @@ -16,13 +16,8 @@ MessageDialog { onAccepted: { if (backend) { - backend.openURL(ctx.donateURL) + Qt.openUrlExternally(ctx.donateURL) backend.donateAccepted() } } - onRejected: { - if (backend) { - backend.donateRejected() - } - } } diff --git a/gui/qml/main.qml b/gui/qml/main.qml index efcfef2..efe0111 100644 --- a/gui/qml/main.qml +++ b/gui/qml/main.qml @@ -178,7 +178,7 @@ ApplicationWindow { MenuItem { text: qsTr("Help...") - onTriggered: backend.openURL(ctx.helpURL) + onTriggered: Qt.openUrlExternally(ctx.helpURL) } MenuItem { |