summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2020-06-16 21:36:12 +0200
committerkali kaneko (leap communications) <kali@leap.se>2020-06-26 12:13:37 +0200
commitf174e76156759cf28cbe067d1270395cee425758 (patch)
tree1f005779998ebe386c0af4cbe55b6f019a8ad836
parentc17b5f6f7b6b28c890764688ff5e966ecebece63 (diff)
[feat] open help url
-rw-r--r--gui/qml/main.qml8
-rw-r--r--pkg/backend/bitmask.go2
-rw-r--r--pkg/backend/status.go2
3 files changed, 7 insertions, 5 deletions
diff --git a/gui/qml/main.qml b/gui/qml/main.qml
index 65c09cb..b9b844a 100644
--- a/gui/qml/main.qml
+++ b/gui/qml/main.qml
@@ -164,20 +164,18 @@ ApplicationWindow {
MenuItem {
text: qsTr("Help...")
- //onTriggered: ctxSystray.help()
+ onTriggered: backend.openURL(ctx.helpURL)
}
MenuItem {
text: qsTr("Donate...")
visible: true
- onTriggered: {
- donate.visible = true
- }
+ onTriggered: { donate.visible = true }
}
MenuItem {
text: qsTr("About...")
- //onTriggered: about.open()
+ //onTriggered: { about.visible = true }
}
MenuSeparator {}
diff --git a/pkg/backend/bitmask.go b/pkg/backend/bitmask.go
index 8fd2367..feff115 100644
--- a/pkg/backend/bitmask.go
+++ b/pkg/backend/bitmask.go
@@ -53,6 +53,8 @@ func initializeContext(provider, appName string) {
ctx = &connectionCtx{
AppName: appName,
Provider: provider,
+ TosURL: config.TosURL,
+ HelpURL: config.HelpURL,
DonateURL: config.DonateURL,
AskForDonations: wantDonations(),
DonateDialog: false,
diff --git a/pkg/backend/status.go b/pkg/backend/status.go
index 7e9f211..6b13dd3 100644
--- a/pkg/backend/status.go
+++ b/pkg/backend/status.go
@@ -29,6 +29,8 @@ var ctx *connectionCtx
type connectionCtx struct {
AppName string `json:"appName"`
Provider string `json:"provider"`
+ TosURL string `json:"tosURL"`
+ HelpURL string `json:"helpURL"`
AskForDonations bool `json:"askForDonations"`
DonateDialog bool `json:"donateDialog"`
DonateURL string `json:"donateURL"`