owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed overkill settings namespace

Browse Source
This commit is contained in:
emeric
2018-03-13 17:18:57 +01:00
parent acf769c129
commit 98f64e62f9
8 changed files with 38 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+1 -1
View File
@@ -26,7 +26,7 @@ lms_approot_DATA = \
approot/releases.xml \
approot/release.xml \
approot/settings-database.xml \
approot/settings-first-connection.xml \
approot/settings-admin-wizard.xml \
approot/templates.xml \
approot/tracks.xml
approot/settings-first-connection.xml → approot/settings-admin-wizard.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="template-settings-first-connection">
<message id="template-settings-admin-wizard">
<div class="container">
<div class="page-header">
<h2>${tr:msg-settings-admin-account}</h2>
src/Makefile.am
+2 -2
View File
@@ -39,8 +39,8 @@ lms_SOURCES = \
$(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp \
$(srcdir)/ui/resource/ImageResource.cpp \
$(srcdir)/ui/resource/TranscodeResource.cpp \
$(srcdir)/ui/settings/DatabaseView.cpp \
$(srcdir)/ui/settings/FirstConnectionView.cpp \
$(srcdir)/ui/settings/DatabaseSettingsView.cpp \
$(srcdir)/ui/settings/AdminWizardView.cpp \
$(srcdir)/utils/Config.cpp \
$(srcdir)/utils/Logger.cpp \
$(srcdir)/utils/Path.cpp \
src/ui/LmsApplication.cpp
+5 -5
View File
@@ -36,8 +36,8 @@
#include "MediaPlayer.hpp"
#include "PlayQueueView.hpp"
#include "settings/DatabaseView.hpp"
#include "settings/FirstConnectionView.hpp"
#include "settings/DatabaseSettingsView.hpp"
#include "settings/AdminWizardView.hpp"
#include "LmsApplication.hpp"
@@ -90,7 +90,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti
messageResourceBundle().use(appRoot() + "release");
messageResourceBundle().use(appRoot() + "releases");
messageResourceBundle().use(appRoot() + "settings-database");
messageResourceBundle().use(appRoot() + "settings-first-connection");
messageResourceBundle().use(appRoot() + "settings-admin-wizard");
messageResourceBundle().use(appRoot() + "tracks");
messageResourceBundle().use(appRoot() + "templates");
@@ -108,7 +108,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti
if (firstConnection)
{
root()->addWidget(new Settings::FirstConnectionView());
root()->addWidget(new AdminWizardView());
}
else
{
@@ -301,7 +301,7 @@ LmsApplication::handleAuthEvent(void)
auto playqueue = new PlayQueue();
mainStack->addWidget(playqueue);
auto databaseSettings = new Settings::DatabaseView();
auto databaseSettings = new DatabaseSettingsView();
mainStack->addWidget(databaseSettings);
explore->tracksAdd.connect(std::bind([=] (std::vector<Database::Track::pointer> tracks)
src/ui/settings/FirstConnectionView.cpp → src/ui/settings/AdminWizardView.cpp
+12 -14
View File
@@ -27,12 +27,11 @@
#include "common/Validators.hpp"
#include "LmsApplication.hpp"
#include "FirstConnectionView.hpp"
#include "AdminWizardView.hpp"
namespace UserInterface {
namespace Settings {
class FirstConnectionModel : public Wt::WFormModel
class AdminWizardModel : public Wt::WFormModel
{
public:
@@ -41,7 +40,7 @@ class FirstConnectionModel : public Wt::WFormModel
static const Field PasswordField;
static const Field PasswordConfirmField;
FirstConnectionModel(Wt::WObject *parent = 0)
AdminWizardModel(Wt::WObject *parent = 0)
: Wt::WFormModel(parent)
{
addField(AdminLoginField);
@@ -113,31 +112,31 @@ class FirstConnectionModel : public Wt::WFormModel
};
const Wt::WFormModel::Field FirstConnectionModel::AdminLoginField = "admin-login";
const Wt::WFormModel::Field FirstConnectionModel::PasswordField = "password";
const Wt::WFormModel::Field FirstConnectionModel::PasswordConfirmField = "password-confirm";
const Wt::WFormModel::Field AdminWizardModel::AdminLoginField = "admin-login";
const Wt::WFormModel::Field AdminWizardModel::PasswordField = "password";
const Wt::WFormModel::Field AdminWizardModel::PasswordConfirmField = "password-confirm";
FirstConnectionView::FirstConnectionView(Wt::WContainerWidget *parent)
AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent)
: Wt::WTemplateFormView(parent)
{
auto model = new FirstConnectionModel(this);
auto model = new AdminWizardModel(this);
setTemplateText(Wt::WString::tr("template-settings-first-connection"));
setTemplateText(Wt::WString::tr("template-settings-admin-wizard"));
addFunction("tr", &WTemplate::Functions::tr);
addFunction("id", &WTemplate::Functions::id);
// AdminLogin
Wt::WLineEdit* accountEdit = new Wt::WLineEdit();
setFormWidget(FirstConnectionModel::AdminLoginField, accountEdit);
setFormWidget(AdminWizardModel::AdminLoginField, accountEdit);
// Password
Wt::WLineEdit* passwordEdit = new Wt::WLineEdit();
setFormWidget(FirstConnectionModel::PasswordField, passwordEdit );
setFormWidget(AdminWizardModel::PasswordField, passwordEdit );
passwordEdit->setEchoMode(Wt::WLineEdit::Password);
// Password confirmation
Wt::WLineEdit* passwordConfirmEdit = new Wt::WLineEdit();
setFormWidget(FirstConnectionModel::PasswordConfirmField, passwordConfirmEdit);
setFormWidget(AdminWizardModel::PasswordConfirmField, passwordConfirmEdit);
passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password);
auto saveButton = new Wt::WPushButton(Wt::WString::tr("msg-create"));
@@ -159,6 +158,5 @@ FirstConnectionView::FirstConnectionView(Wt::WContainerWidget *parent)
updateView(model);
}
} // namespace Settings
} // namespace UserInterface
src/ui/settings/DatabaseView.hpp → src/ui/settings/AdminWizardView.hpp
+4 -5
View File
@@ -23,15 +23,14 @@
#include <Wt/WTemplateFormView>
namespace UserInterface {
namespace Settings {
class DatabaseView : public Wt::WTemplateFormView
class AdminWizardView : public Wt::WTemplateFormView
{
public:
DatabaseView(Wt::WContainerWidget *parent = 0);
AdminWizardView(Wt::WContainerWidget *parent = 0);
};
} // namespace Settings
} // namespace UserInterface
src/ui/settings/DatabaseView.cpp → src/ui/settings/DatabaseSettingsView.cpp
+11 -13
View File
@@ -33,14 +33,13 @@
#include "LmsApplication.hpp"
#include "DatabaseView.hpp"
#include "DatabaseSettingsView.hpp"
namespace UserInterface {
namespace Settings {
using namespace Database;
class DatabaseModel : public Wt::WFormModel
class DatabaseSettingsModel : public Wt::WFormModel
{
public:
// Associate each field with a unique string literal.
@@ -48,7 +47,7 @@ class DatabaseModel : public Wt::WFormModel
static const Field UpdatePeriodField;
static const Field UpdateStartTimeField;
DatabaseModel(Wt::WObject *parent = 0)
DatabaseSettingsModel(Wt::WObject *parent = 0)
: Wt::WFormModel(parent)
{
initializeModels();
@@ -220,15 +219,15 @@ class DatabaseModel : public Wt::WFormModel
};
const Wt::WFormModel::Field DatabaseModel::MediaDirectoryField = "media-directory";
const Wt::WFormModel::Field DatabaseModel::UpdatePeriodField = "update-period";
const Wt::WFormModel::Field DatabaseModel::UpdateStartTimeField = "update-start-time";
const Wt::WFormModel::Field DatabaseSettingsModel::MediaDirectoryField = "media-directory";
const Wt::WFormModel::Field DatabaseSettingsModel::UpdatePeriodField = "update-period";
const Wt::WFormModel::Field DatabaseSettingsModel::UpdateStartTimeField = "update-start-time";
DatabaseView::DatabaseView(Wt::WContainerWidget *parent)
DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent)
: Wt::WTemplateFormView(parent)
{
auto model = new DatabaseModel(this);
auto model = new DatabaseSettingsModel(this);
setTemplateText(tr("template-settings-database"));
addFunction("tr", &WTemplate::Functions::tr);
@@ -236,16 +235,16 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent)
// Media Directory
Wt::WLineEdit *mediaDirectoryEdit = new Wt::WLineEdit();
setFormWidget(DatabaseModel::MediaDirectoryField, mediaDirectoryEdit);
setFormWidget(DatabaseSettingsModel::MediaDirectoryField, mediaDirectoryEdit);
// Update Period
Wt::WComboBox *updatePeriodCB = new Wt::WComboBox();
setFormWidget(DatabaseModel::UpdatePeriodField, updatePeriodCB);
setFormWidget(DatabaseSettingsModel::UpdatePeriodField, updatePeriodCB);
updatePeriodCB->setModel(model->updatePeriodModel());
// Update Start Time
Wt::WComboBox *updateStartTimeCB = new Wt::WComboBox();
setFormWidget(DatabaseModel::UpdateStartTimeField, updateStartTimeCB);
setFormWidget(DatabaseSettingsModel::UpdateStartTimeField, updateStartTimeCB);
updateStartTimeCB->setModel(model->updateStartTimeModel());
// Buttons
@@ -291,7 +290,6 @@ DatabaseView::DatabaseView(Wt::WContainerWidget *parent)
updateView(model);
}
} // namespace Settings
} // namespace UserInterface
src/ui/settings/FirstConnectionView.hpp → src/ui/settings/DatabaseSettingsView.hpp
+2 -6
View File
@@ -23,17 +23,13 @@
#include <Wt/WTemplateFormView>
namespace UserInterface {
namespace Settings {
class FirstConnectionView : public Wt::WTemplateFormView
class DatabaseSettingsView : public Wt::WTemplateFormView
{
public:
FirstConnectionView(Wt::WContainerWidget *parent = 0);
DatabaseSettingsView(Wt::WContainerWidget *parent = 0);
};
} // namespace Settings
} // namespace UserInterface