From 4517e5d2acef9a2ad2671fd78dfd9fb242a97dae Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 14 Dec 2014 17:50:35 +0100 Subject: [PATCH] [UI] minor source reorg --- src/ui/LmsApplication.cpp | 38 ++++++++++++++++++++++++-------------- src/ui/LmsApplication.hpp | 2 ++ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index a4328edc..ad803ae6 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -92,25 +92,35 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, boost::filesystem::p // If here is no account in the database, launch the first connection wizard if (firstConnection) - { - // Hack, use the auth widget builtin strings - builtinLocalizedStrings().useBuiltin(skeletons::AuthStrings_xml1); - - root()->addWidget( new Settings::FirstConnectionFormView(_sessionData)); - } + createFirstConnectionUI(); else - { - _sessionData.getDatabaseHandler().getLogin().changed().connect(this, &LmsApplication::handleAuthEvent); + createLmsUI(); - LmsAuth *authWidget = new LmsAuth(_sessionData.getDatabaseHandler()); +} - authWidget->model()->addPasswordAuth(&Database::Handler::getPasswordService()); - authWidget->setRegistrationEnabled(false); +void +LmsApplication::createFirstConnectionUI() +{ + // Hack, use the auth widget builtin strings + builtinLocalizedStrings().useBuiltin(skeletons::AuthStrings_xml1); - authWidget->processEnvironment(); + root()->addWidget( new Settings::FirstConnectionFormView(_sessionData)); +} - root()->addWidget(authWidget); - } +void +LmsApplication::createLmsUI() +{ + + _sessionData.getDatabaseHandler().getLogin().changed().connect(this, &LmsApplication::handleAuthEvent); + + LmsAuth *authWidget = new LmsAuth(_sessionData.getDatabaseHandler()); + + authWidget->model()->addPasswordAuth(&Database::Handler::getPasswordService()); + authWidget->setRegistrationEnabled(false); + + authWidget->processEnvironment(); + + root()->addWidget(authWidget); } diff --git a/src/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp index 6d4b1259..f1f814d0 100644 --- a/src/ui/LmsApplication.hpp +++ b/src/ui/LmsApplication.hpp @@ -38,6 +38,8 @@ class LmsApplication : public Wt::WApplication private: void handleAuthEvent(void); + void createFirstConnectionUI(); + void createLmsUI(); SessionData _sessionData;