From f174e76156759cf28cbe067d1270395cee425758 Mon Sep 17 00:00:00 2001 From: "kali kaneko (leap communications)" Date: Tue, 16 Jun 2020 21:36:12 +0200 Subject: [feat] open help url --- gui/qml/main.qml | 8 +++----- pkg/backend/bitmask.go | 2 ++ pkg/backend/status.go | 2 ++ 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"` -- cgit v1.2.3