Skip to content
Snippets Groups Projects
Unverified Commit 2f1f3523 authored by Kali Kaneko's avatar Kali Kaneko
Browse files

[feat] reset notification

parent 339a30fd
No related branches found
No related tags found
1 merge request!105Sip login
......@@ -81,6 +81,11 @@ func ResetError(errname string) {
backend.ResetError(errname)
}
//export ResetNotification
func ResetNotification(label string) {
backend.ResetNotification(label)
}
//export InstallHelpers
func InstallHelpers() {
backend.InstallHelpers()
......
......@@ -52,6 +52,11 @@ void Backend::resetError(QString errlabel)
ResetError(toGoStr(errlabel));
}
void Backend::resetNotification(QString label)
{
ResetNotification(toGoStr(label));
}
void Backend::quit()
{
Quit();
......
......@@ -40,6 +40,7 @@ public slots:
void donateAccepted();
void login(QString username, QString password);
void resetError(QString errlabel);
void resetNotification(QString label);
void quit();
};
......
......@@ -13,7 +13,8 @@ Dialog {
}
function _loginOk() {
backend.resetError("bad_auth")
visible: false;
backend.resetNotification("login_ok");
}
visible: false
......
......@@ -16,12 +16,12 @@ ApplicationWindow {
target: jsonModel
onDataChanged: {
ctx = JSON.parse(jsonModel.getJson());
if (ctx.donateDialog == 'true') {
console.debug(jsonModel.getJson())
donate.visible = true
}
if (ctx.loginDialog == 'true') {
console.debug(jsonModel.getJson())
login.visible = true
}
if (ctx.loginOk == 'true') {
......
......@@ -86,8 +86,20 @@ func RefreshContext() *C.char {
}
func ResetError(errname string) {
log.Println("DEBUG: resetting error", errname)
resetErrors(errname)
if ctx.Errors == errname {
ctx.Errors = ""
}
}
func ResetNotification(label string) {
switch label {
case "login_ok":
ctx.LoginOk = false
break
default:
break
}
go trigger(OnStatusChanged)
}
func InstallHelpers() {
......
......@@ -40,13 +40,6 @@ func checkErrors(errCh chan string) {
}
}
func resetErrors(errname string) {
if ctx.Errors == errname {
ctx.Errors = ""
log.Println("DEBUG: reset error", errname)
}
}
func initializeBitmask(errCh chan string, opts *InitOpts) {
if ctx == nil {
log.Println("bug: cannot initialize bitmask, ctx is nil!")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment