summaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2021-03-10 22:36:26 +0100
committerRuben Pollan <meskio@sindominio.net>2021-03-11 17:05:46 +0100
commitc4bfc04603c361e6a3833f5846d311a73073cd18 (patch)
tree51064c031fc0863b0e6c2a2a9c98fd93039074c2 /gui
parent27d770b0bed12fb6b42b4e1a94b549ac559985d2 (diff)
[bug] inform backend when donate dialog is shown
a rather annoying bug, since it keeps popping up for every status change. to be included in a hotfix for 0.21.2 release. - Release: 0.21.2 - Closes: #459
Diffstat (limited to 'gui')
-rw-r--r--gui/backend.go5
-rw-r--r--gui/handlers.cpp5
-rw-r--r--gui/handlers.h1
-rw-r--r--gui/qml/main.qml3
4 files changed, 12 insertions, 2 deletions
diff --git a/gui/backend.go b/gui/backend.go
index 9453d88..96f50de 100644
--- a/gui/backend.go
+++ b/gui/backend.go
@@ -40,6 +40,11 @@ func DonateAccepted() {
backend.DonateAccepted()
}
+//export DonateSeen
+func DonateSeen() {
+ backend.DonateSeen()
+}
+
//export SubscribeToEvent
func SubscribeToEvent(event string, f unsafe.Pointer) {
backend.SubscribeToEvent(event, f)
diff --git a/gui/handlers.cpp b/gui/handlers.cpp
index 6cafab5..8f0e0d0 100644
--- a/gui/handlers.cpp
+++ b/gui/handlers.cpp
@@ -37,6 +37,11 @@ void Backend::donateAccepted()
DonateAccepted();
}
+void Backend::donateSeen()
+{
+ DonateSeen();
+}
+
void Backend::login(QString username, QString password)
{
Login(toGoStr(username), toGoStr(password));
diff --git a/gui/handlers.h b/gui/handlers.h
index c342a97..8283645 100644
--- a/gui/handlers.h
+++ b/gui/handlers.h
@@ -35,6 +35,7 @@ public slots:
void switchOn();
void switchOff();
void donateAccepted();
+ void donateSeen();
void login(QString username, QString password);
void resetError(QString errlabel);
void resetNotification(QString label);
diff --git a/gui/qml/main.qml b/gui/qml/main.qml
index 4ac1972..aed08ea 100644
--- a/gui/qml/main.qml
+++ b/gui/qml/main.qml
@@ -21,11 +21,10 @@ ApplicationWindow {
onDataChanged: {
ctx = JSON.parse(jsonModel.getJson())
- // FIXME -- we need to inform the backend that we've already seen
- // this. Otherwise this keeps popping randonmly on state changes.
if (ctx.donateDialog == 'true') {
console.debug(jsonModel.getJson())
donate.visible = true
+ backend.donateSeen()
}
if (ctx.loginDialog == 'true') {
console.debug(jsonModel.getJson())