Unverified Commit 45c13d49 authored by Kali Kaneko's avatar Kali Kaneko
Browse files

[feat] only show donate dialog after first connect when due

- Cloases: #470
parent 326dc244
......@@ -4,4 +4,5 @@
- First iteration of the gateway selector.
- Allow to select obfs4 gateways (bridges) to bypass censorship.
- Ability to define explicitly allowed addresses for local networks.
- Update translations. New locales: greek, farsi, hungarian, dutch, polish and uyghur.
- Make the donate dialog less intrusive (#470)
- Updated translations. New locales: greek, farsi, hungarian, dutch, polish and uyghur.
......@@ -48,6 +48,12 @@ StateGroup {
script: {
Logic.setNeedsReconnect(false);
brReconnect = false;
if (needsDonate && !shownDonate) {
donate.visible = true;
shownDonate = true;
backend.donateSeen();
}
}
}
......
let status = 'off';
let needsReconnect = false;
var status = 'off';
var needsReconnect = false;
function setNeedsReconnect(val) {
needsReconnect = val;
}
function getNeedsReconnect() {
return needsReconnect;
}
function setStatus(st) {
status = st;
......@@ -9,12 +17,8 @@ function getStatus() {
return status;
}
function setNeedsReconnect(val) {
needsReconnect = val;
}
function getNeedsReconnect() {
return needsReconnect;
function setNeedsDonate(val) {
needsDonate = val;
}
function toHuman(st) {
......
......@@ -21,7 +21,8 @@ ApplicationWindow {
property var loginDone
property var allowEmptyPass
property var needsRestart
property var needsDonate
property var shownDonate
onSceneGraphError: function(error, msg) {
console.debug("ERROR while initializing scene")
......@@ -189,9 +190,7 @@ ApplicationWindow {
gwSelector.model = Object.keys(ctx.locations)
if (ctx.donateDialog == 'true') {
console.debug(jsonModel.getJson())
donate.visible = true
backend.donateSeen()
Logic.setNeedsDonate(true);
}
if (ctx.loginDialog == 'true') {
console.debug(jsonModel.getJson())
......@@ -276,6 +275,7 @@ ApplicationWindow {
loginDone = false
allowEmptyPass = Logic.shouldAllowEmptyPass(providers)
needsRestart = false;
shownDonate = false;
if (!systrayAvailable) {
app.visible = true
app.raise()
......
......@@ -15,6 +15,8 @@ func runDonationReminder() {
}
}
}()
// to test manually, uncomment this line.
// time.AfterFunc(1*time.Minute, func() { showDonate() })
}
func needsDonationReminder() bool {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment