From 0f4e3270cf9003bdaddcf995236073838dfa6802 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 13 May 2020 19:56:33 +0200 Subject: [PATCH] Remove quit message (actually quite annoying) --- approot/messages.xml | 1 - approot/messages_fr.xml | 1 - src/lms/ui/LmsApplication.cpp | 6 ------ 3 files changed, 8 deletions(-) diff --git a/approot/messages.xml b/approot/messages.xml index e1f7327a..6098431f 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -20,7 +20,6 @@ Old password Password too weak Passwords don't match -Are you sure? Another session has been open. Reopen this one? Save User diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 65428acd..e49d0fac 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -20,7 +20,6 @@ Ancien mot de passe Mot de passe trop faible Les mots de passe ne correspondent pas -Êtes-vous sûr ? Une autre session a été ouverte. Reouvrir celle-ci ? Sauvegarder Utilisateur diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index a5fd841e..3e144228 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -314,7 +314,6 @@ LmsApplication::handleException(LmsApplicationException& e) Wt::WPushButton* btn {t->bindNew("btn-go-home", Wt::WString::tr("Lms.Error.go-home"))}; btn->clicked().connect([this]() { - setConfirmCloseMessage(""); redirect("."); }); } @@ -322,7 +321,6 @@ LmsApplication::handleException(LmsApplicationException& e) void LmsApplication::goHomeAndQuit() { - setConfirmCloseMessage(""); WApplication::quit(""); redirect("."); } @@ -394,7 +392,6 @@ LmsApplication::handleUserLoggedOut() getUser().modify()->clearAuthTokens(); } - setConfirmCloseMessage(""); goHomeAndQuit(); } @@ -426,8 +423,6 @@ LmsApplication::createHome() _audioTranscodeResource = std::make_shared(); _audioFileResource = std::make_shared(); - setConfirmCloseMessage(Wt::WString::tr("Lms.quit-confirm")); - Wt::WTemplate* main {root()->addWidget(std::make_unique(Wt::WString::tr("Lms.template")))}; main->addFunction("tr", &Wt::WTemplate::Functions::tr); @@ -579,7 +574,6 @@ LmsApplication::createHome() // Only one active session by user if (!LmsApp->isUserDemo()) { - setConfirmCloseMessage(""); quit(Wt::WString::tr("Lms.quit-other-session")); } });