From bc26ddae502ebbe06f75e838d2cd75adab015529 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 14 Mar 2018 13:17:04 +0100 Subject: [PATCH] Reorganized the UI/xml part to better handle next steps --- Makefile.am | 10 ++- ...ttings-database.xml => admin-database.xml} | 10 +-- ...ings-admin-wizard.xml => admin-wizard.xml} | 10 +-- approot/artist.xml | 12 +-- approot/artists.xml | 6 +- approot/explore.xml | 45 ++++++++++ approot/home.xml | 9 ++ approot/login.xml | 10 +-- approot/messages.xml | 90 ++++++++++--------- approot/playqueue.xml | 2 +- approot/release.xml | 10 +-- approot/releases.xml | 11 ++- approot/templates.xml | 48 +--------- approot/tracks.xml | 10 +-- src/Makefile.am | 22 ++--- src/ui/Auth.cpp | 4 +- src/ui/HomeView.cpp | 2 +- src/ui/LmsApplication.cpp | 58 +++++++----- .../{settings => admin}/AdminWizardView.cpp | 6 +- .../{settings => admin}/AdminWizardView.hpp | 0 .../DatabaseSettingsView.cpp | 20 ++--- .../DatabaseSettingsView.hpp | 0 src/ui/common/Validators.cpp | 2 +- src/ui/{ => explore}/ArtistView.cpp | 14 +-- src/ui/{ => explore}/ArtistView.hpp | 0 src/ui/{ => explore}/ArtistsView.cpp | 8 +- src/ui/{ => explore}/ArtistsView.hpp | 0 src/ui/{ => explore}/Explore.cpp | 2 +- src/ui/{ => explore}/Explore.hpp | 0 src/ui/{ => explore}/Filters.cpp | 16 ++-- src/ui/{ => explore}/Filters.hpp | 0 src/ui/{ => explore}/ReleaseView.cpp | 16 ++-- src/ui/{ => explore}/ReleaseView.hpp | 0 src/ui/{ => explore}/ReleasesView.cpp | 16 ++-- src/ui/{ => explore}/ReleasesView.hpp | 0 src/ui/{ => explore}/TracksView.cpp | 16 ++-- src/ui/{ => explore}/TracksView.hpp | 0 37 files changed, 257 insertions(+), 228 deletions(-) rename approot/{settings-database.xml => admin-database.xml} (83%) rename approot/{settings-admin-wizard.xml => admin-wizard.xml} (87%) create mode 100644 approot/explore.xml create mode 100644 approot/home.xml rename src/ui/{settings => admin}/AdminWizardView.cpp (95%) rename src/ui/{settings => admin}/AdminWizardView.hpp (100%) rename src/ui/{settings => admin}/DatabaseSettingsView.cpp (93%) rename src/ui/{settings => admin}/DatabaseSettingsView.hpp (100%) rename src/ui/{ => explore}/ArtistView.cpp (85%) rename src/ui/{ => explore}/ArtistView.hpp (100%) rename src/ui/{ => explore}/ArtistsView.cpp (87%) rename src/ui/{ => explore}/ArtistsView.hpp (100%) rename src/ui/{ => explore}/Explore.cpp (98%) rename src/ui/{ => explore}/Explore.hpp (100%) rename src/ui/{ => explore}/Filters.cpp (87%) rename src/ui/{ => explore}/Filters.hpp (100%) rename src/ui/{ => explore}/ReleaseView.cpp (86%) rename src/ui/{ => explore}/ReleaseView.hpp (100%) rename src/ui/{ => explore}/ReleasesView.cpp (84%) rename src/ui/{ => explore}/ReleasesView.hpp (100%) rename src/ui/{ => explore}/TracksView.cpp (85%) rename src/ui/{ => explore}/TracksView.hpp (100%) diff --git a/Makefile.am b/Makefile.am index deedb672..9b4a576f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,16 +17,18 @@ lms_images_DATA = \ docroot/images/unknown-artist.jpg lms_approot_DATA = \ - approot/artists.xml \ + approot/admin-database.xml \ + approot/admin-wizard.xml \ approot/artist.xml \ + approot/artists.xml \ + approot/explore.xml \ + approot/home.xml \ approot/login.xml \ approot/mediaplayer.xml \ approot/messages.xml \ approot/playqueue.xml \ - approot/releases.xml \ approot/release.xml \ - approot/settings-database.xml \ - approot/settings-admin-wizard.xml \ + approot/releases.xml \ approot/templates.xml \ approot/tracks.xml diff --git a/approot/settings-database.xml b/approot/admin-database.xml similarity index 83% rename from approot/settings-database.xml rename to approot/admin-database.xml index f5107fcc..839d7dac 100644 --- a/approot/settings-database.xml +++ b/approot/admin-database.xml @@ -3,13 +3,13 @@ - - ${tr:msg-settings-database} + + ${tr:Lms.Admin.Database.database}
${media-directory} @@ -21,7 +21,7 @@
${update-period} @@ -33,7 +33,7 @@
${update-start-time} diff --git a/approot/settings-admin-wizard.xml b/approot/admin-wizard.xml similarity index 87% rename from approot/settings-admin-wizard.xml rename to approot/admin-wizard.xml index 4618b6c8..c2af28e8 100644 --- a/approot/settings-admin-wizard.xml +++ b/approot/admin-wizard.xml @@ -3,15 +3,15 @@ - +
-

${tr:msg-settings-admin-account}

+

${tr:Lms.AdminWizard.header}

${admin-login} @@ -23,7 +23,7 @@
${password} @@ -35,7 +35,7 @@
${password-confirm} diff --git a/approot/artist.xml b/approot/artist.xml index b3252bf0..d9946518 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -2,15 +2,15 @@ - + - + - +

${name}

${clusters} @@ -19,11 +19,11 @@ ${releases class="list-group"} - + ${name} - +
${cover class="media-object"} @@ -31,7 +31,7 @@

${name}

- ${}${tr:msg-various-artists}${} + ${}${tr:Lms.Explore.various-artists}${}

${}${year}${}${} (${orig-year})${}

${play-btn}${add-btn}
diff --git a/approot/artists.xml b/approot/artists.xml index 933930f3..368eb13f 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -2,9 +2,9 @@ - +
-

${tr:msg-artists}

+

${tr:Lms.Explore.artists}

@@ -16,7 +16,7 @@ ${show-more} - +
${nb-release} ${name} diff --git a/approot/explore.xml b/approot/explore.xml new file mode 100644 index 00000000..f20c320b --- /dev/null +++ b/approot/explore.xml @@ -0,0 +1,45 @@ + + + + + ${filters} + ${contents} + + + + ${tr:Lms.Explore.show-more} + + + +
+ ${add-filter}${filters} +
+ + + +
+
+ +
+ ${type} +
+
+
+ +
+ ${value} +
+
+
+
+ ${add-btn class="btn-primary"} ${cancel-btn} +
+
+
+ + + diff --git a/approot/home.xml b/approot/home.xml new file mode 100644 index 00000000..8b877520 --- /dev/null +++ b/approot/home.xml @@ -0,0 +1,9 @@ + + + + + ${tr:Lms.Home.welcome} + + + + diff --git a/approot/login.xml b/approot/login.xml index e031a36b..16e5c1b2 100644 --- a/approot/login.xml +++ b/approot/login.xml @@ -2,15 +2,15 @@ - +
-

${tr:msg-login-welcome}

+

${tr:Lms.Auth.welcome}

${user-name} @@ -22,7 +22,7 @@
${password} @@ -34,7 +34,7 @@
${remember-me} diff --git a/approot/messages.xml b/approot/messages.xml index 74ab5522..6d8f9fb0 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -1,54 +1,62 @@ - + + +Add +Apply +Discard +Administration +Cancel +Create +Login +Logout +Not a directory +Password +Confirm password +Play Queue +Are you sure? +Settings + + +Daily +Database +Scan now! +Monthly +Never +Media root directory +Scan complete: {1} total files, {2} additions, {3} deletions, {4} duplicates, {5} errors +Scan launched! +New settings saved! +Update period +Update start time +Weekly -

Welcome!

 + +Administration account created. Please refresh to continue! +Create administrator account -Various artists -Artists -Albums -Tracks -Play Queue -Add filter -Search... + +Remember me +Welcome! -Add -Cancel + +

Welcome!

 -Type -Value + +Add filter +Artists +Albums +Search... +Show more +Tracks +Type +Value +Various artists -Show more -Login -Password -Verify password -Create -Remember me -Welcome! -Logout + -Administrator account -Account created. Please refresh to continue! - -Settings -Database -Media root directory -Update period -Update start time -Update start time -Never -Daily -Weekly -Monthly -Not a directory -Apply -Discard -Scan now! -Scan launched! -New settings saved! -Scan complete: {1} total files, {2} additions, {3} deletions, {4} duplicates, {5} errors diff --git a/approot/playqueue.xml b/approot/playqueue.xml index a48b1570..8e8ff74d 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -16,7 +16,7 @@
-

${tr:msg-playqueue}

+

${tr:Lms.playqueue}

${save-btn} ${load-btn} ${clear-btn}
${entries} diff --git a/approot/release.xml b/approot/release.xml index dcefa70c..b42206a2 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -2,15 +2,15 @@ - + - + - + ${cover}

${name}

@@ -22,11 +22,11 @@ ${tracks} - + ${name} - + ${}${disc-number}-${}${}${track-number}. ${} ${}${artist-name} - ${} ${name} diff --git a/approot/releases.xml b/approot/releases.xml index 23957a5f..5c784d39 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -1,11 +1,10 @@ - - +
-

${tr:msg-releases}

+

${tr:Lms.Explore.releases}

@@ -17,15 +16,15 @@ ${show-more} - + - + - +
${cover class="media-object"} diff --git a/approot/templates.xml b/approot/templates.xml index d0b47ac9..76e1f019 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -1,56 +1,10 @@ - - + ${navbar-top class="main-nav"} ${contents class="container"} ${player} - - ${tr:msg-home-welcome} - - - - ${filters} - ${contents} - - - - ${tr:msg-show-more} - - - -
- ${add-filter}${filters} -
- - - -
-
- -
- ${type} -
-
-
- -
- ${value} -
-
-
-
- ${add class="btn-primary"} ${cancel} -
-
-
- - diff --git a/approot/tracks.xml b/approot/tracks.xml index ef3d7320..41f92006 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -3,9 +3,9 @@ - +
-

${tr:msg-tracks}

+

${tr:Lms.Explore.tracks}

${play-btn}${add-btn}
@@ -18,15 +18,15 @@ ${show-more} - + - + - +
${cover class="media-object"} diff --git a/src/Makefile.am b/src/Makefile.am index 9adb8fc1..6289feca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,26 +21,26 @@ lms_SOURCES = \ $(srcdir)/metadata/AvFormat.cpp \ $(srcdir)/metadata/TagLibParser.cpp \ $(srcdir)/scanner/MediaScanner.cpp \ - $(srcdir)/ui/ArtistView.cpp \ - $(srcdir)/ui/ArtistsView.cpp \ - $(srcdir)/ui/Explore.cpp \ - $(srcdir)/ui/Filters.cpp \ + $(srcdir)/ui/explore/ArtistView.cpp \ + $(srcdir)/ui/explore/ArtistsView.cpp \ + $(srcdir)/ui/explore/Explore.cpp \ + $(srcdir)/ui/explore/Filters.cpp \ + $(srcdir)/ui/explore/ReleasesView.cpp \ + $(srcdir)/ui/explore/ReleaseView.cpp \ + $(srcdir)/ui/explore/TracksView.cpp \ + $(srcdir)/ui/Auth.cpp \ $(srcdir)/ui/HomeView.cpp \ $(srcdir)/ui/LmsApplication.cpp \ - $(srcdir)/ui/Auth.cpp \ $(srcdir)/ui/MediaPlayer.cpp \ $(srcdir)/ui/PlayQueueView.cpp \ - $(srcdir)/ui/ReleasesView.cpp \ - $(srcdir)/ui/ReleaseView.cpp \ - $(srcdir)/ui/TracksView.cpp \ - $(srcdir)/ui/common/Validators.cpp \ + $(srcdir)/ui/admin/DatabaseSettingsView.cpp \ + $(srcdir)/ui/admin/AdminWizardView.cpp \ $(srcdir)/ui/common/InputRange.cpp \ $(srcdir)/ui/common/LineEdit.cpp \ + $(srcdir)/ui/common/Validators.cpp \ $(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp \ $(srcdir)/ui/resource/ImageResource.cpp \ $(srcdir)/ui/resource/TranscodeResource.cpp \ - $(srcdir)/ui/settings/DatabaseSettingsView.cpp \ - $(srcdir)/ui/settings/AdminWizardView.cpp \ $(srcdir)/utils/Config.cpp \ $(srcdir)/utils/Logger.cpp \ $(srcdir)/utils/Path.cpp \ diff --git a/src/ui/Auth.cpp b/src/ui/Auth.cpp index 70bd63c9..bf242a64 100644 --- a/src/ui/Auth.cpp +++ b/src/ui/Auth.cpp @@ -38,7 +38,7 @@ Auth::Auth(Wt::WContainerWidget *parent) _model->addPasswordAuth(&Database::Handler::getPasswordService()); - setTemplateText(Wt::WString::tr("template-login")); + setTemplateText(Wt::WString::tr("Lms.Auth.template")); addFunction("tr", &WTemplate::Functions::tr); addFunction("id", &WTemplate::Functions::id); @@ -55,7 +55,7 @@ Auth::Auth(Wt::WContainerWidget *parent) auto rememberMe = new Wt::WCheckBox(); setFormWidget(Wt::Auth::AuthModel::RememberMeField, rememberMe); - auto loginBtn = new Wt::WPushButton(Wt::WString::tr("msg-login")); + auto loginBtn = new Wt::WPushButton(Wt::WString::tr("Lms.login")); bindWidget("login-btn", loginBtn); loginBtn->clicked().connect(std::bind([=] { diff --git a/src/ui/HomeView.cpp b/src/ui/HomeView.cpp index e97d8b33..9d857b4c 100644 --- a/src/ui/HomeView.cpp +++ b/src/ui/HomeView.cpp @@ -31,7 +31,7 @@ namespace UserInterface { Home::Home(Wt::WContainerWidget *parent) : Wt::WContainerWidget(parent) { - auto t = new Wt::WTemplate(Wt::WString::tr("template-home"), this); + auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Home.template"), this); t->addFunction("tr", &Wt::WTemplate::Functions::tr); } diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp index a64f6d64..7fff12f9 100644 --- a/src/ui/LmsApplication.cpp +++ b/src/ui/LmsApplication.cpp @@ -31,13 +31,13 @@ #include "utils/Logger.hpp" #include "utils/Utils.hpp" -#include "Explore.hpp" +#include "explore/Explore.hpp" #include "HomeView.hpp" #include "MediaPlayer.hpp" #include "PlayQueueView.hpp" -#include "settings/DatabaseSettingsView.hpp" -#include "settings/AdminWizardView.hpp" +#include "admin/DatabaseSettingsView.hpp" +#include "admin/AdminWizardView.hpp" #include "LmsApplication.hpp" @@ -81,16 +81,18 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti useStyleSheet("resources/font-awesome/css/font-awesome.min.css"); // Add a resource bundle + messageResourceBundle().use(appRoot() + "admin-database"); + messageResourceBundle().use(appRoot() + "admin-wizard"); messageResourceBundle().use(appRoot() + "artist"); messageResourceBundle().use(appRoot() + "artists"); + messageResourceBundle().use(appRoot() + "home"); + messageResourceBundle().use(appRoot() + "explore"); messageResourceBundle().use(appRoot() + "login"); messageResourceBundle().use(appRoot() + "mediaplayer"); messageResourceBundle().use(appRoot() + "messages"); messageResourceBundle().use(appRoot() + "playqueue"); messageResourceBundle().use(appRoot() + "release"); messageResourceBundle().use(appRoot() + "releases"); - messageResourceBundle().use(appRoot() + "settings-database"); - messageResourceBundle().use(appRoot() + "settings-admin-wizard"); messageResourceBundle().use(appRoot() + "tracks"); messageResourceBundle().use(appRoot() + "templates"); @@ -183,7 +185,7 @@ enum IdxRoot IdxHome = 0, IdxExplore, IdxPlayQueue, - IdxSettingsDatabase, + IdxAdminDatabase, }; static void @@ -198,7 +200,7 @@ handlePathChange(Wt::WStackedWidget* stack) { "/release", IdxExplore }, { "/tracks", IdxExplore }, { "/playqueue", IdxPlayQueue }, - { "/settings/database", IdxSettingsDatabase }, + { "/admin/database", IdxAdminDatabase }, }; LMS_LOG(UI, DEBUG) << "Internal path changed to '" << wApp->internalPath() << "'"; @@ -231,9 +233,9 @@ LmsApplication::handleAuthEvent(void) _imageResource = new ImageResource(_db, root()); _transcodeResource = new TranscodeResource(_db, root()); - setConfirmCloseMessage(Wt::WString::tr("msg-quit-confirm")); + setConfirmCloseMessage(Wt::WString::tr("Lms.quit-confirm")); - auto main = new Wt::WTemplate(Wt::WString::tr("template-main"), root()); + auto main = new Wt::WTemplate(Wt::WString::tr("Lms.template"), root()); // Navbar auto navbar = new Wt::WNavigationBar(); @@ -244,42 +246,54 @@ LmsApplication::handleAuthEvent(void) auto menu = new Wt::WMenu(); { - auto menuItem = menu->insertItem(0, Wt::WString::tr("msg-artists")); + auto menuItem = menu->insertItem(0, Wt::WString::tr("Lms.Explore.artists")); menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/artists")); menuItem->setSelectable(false); } { - auto menuItem = menu->insertItem(1, Wt::WString::tr("msg-releases")); + auto menuItem = menu->insertItem(1, Wt::WString::tr("Lms.Explore.releases")); menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/releases")); menuItem->setSelectable(false); } { - auto menuItem = menu->insertItem(2, Wt::WString::tr("msg-tracks")); + auto menuItem = menu->insertItem(2, Wt::WString::tr("Lms.Explore.tracks")); menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/tracks")); menuItem->setSelectable(false); } { - auto menuItem = menu->insertItem(3, Wt::WString::tr("msg-playqueue")); + auto menuItem = menu->insertItem(3, Wt::WString::tr("Lms.playqueue")); menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/playqueue")); menuItem->setSelectable(false); } navbar->addMenu(menu); auto rightMenu = new Wt::WMenu(); + std::size_t itemCounter = 0; + { - auto menuItem = rightMenu->insertItem(0, Wt::WString::tr("msg-settings")); - menuItem->setSelectable(false); + Wt::Dbo::Transaction transaction (DboSession()); - Wt::WPopupMenu *settings = new Wt::WPopupMenu(); - auto dbSettings = settings->insertItem(0, Wt::WString::tr("msg-settings-database")); - dbSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/settings/database")); - dbSettings->setSelectable(false); + if (CurrentUser()->isAdmin()) + { + auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.administration")); + menuItem->setSelectable(false); - menuItem->setMenu(settings); + Wt::WPopupMenu *admin = new Wt::WPopupMenu(); + auto dbSettings = admin->insertItem(0, Wt::WString::tr("Lms.Admin.Database.database")); + dbSettings->setLink(Wt::WLink(Wt::WLink::InternalPath, "/admin/database")); + dbSettings->setSelectable(false); + + menuItem->setMenu(admin); + } } { - auto menuItem = rightMenu->insertItem(1, Wt::WString::tr("msg-logout")); + auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.settings")); + menuItem->setLink(Wt::WLink(Wt::WLink::InternalPath, "/settings")); + menuItem->setSelectable(false); + } + { + auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.logout")); menuItem->setSelectable(true); menuItem->triggered().connect(std::bind([=] { @@ -326,7 +340,7 @@ LmsApplication::handleAuthEvent(void) { Wt::WServer::instance()->post(sessionId, [=] { - notify(Wt::WString::tr("msg-notify-scan-complete") + notify(Wt::WString::tr("Lms.Admin.Database.scan-complete") .arg(stats.nbFiles()) .arg(stats.additions) .arg(stats.deletions) diff --git a/src/ui/settings/AdminWizardView.cpp b/src/ui/admin/AdminWizardView.cpp similarity index 95% rename from src/ui/settings/AdminWizardView.cpp rename to src/ui/admin/AdminWizardView.cpp index aa78b04f..44cc6e76 100644 --- a/src/ui/settings/AdminWizardView.cpp +++ b/src/ui/admin/AdminWizardView.cpp @@ -121,7 +121,7 @@ AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) { auto model = new AdminWizardModel(this); - setTemplateText(Wt::WString::tr("template-settings-admin-wizard")); + setTemplateText(Wt::WString::tr("Lms.AdminWizard.template")); addFunction("tr", &WTemplate::Functions::tr); addFunction("id", &WTemplate::Functions::id); @@ -139,7 +139,7 @@ AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) setFormWidget(AdminWizardModel::PasswordConfirmField, passwordConfirmEdit); passwordConfirmEdit->setEchoMode(Wt::WLineEdit::Password); - auto saveButton = new Wt::WPushButton(Wt::WString::tr("msg-create")); + auto saveButton = new Wt::WPushButton(Wt::WString::tr("Lms.create")); bindWidget("create-btn", saveButton); saveButton->clicked().connect(std::bind([=] { @@ -148,7 +148,7 @@ AdminWizardView::AdminWizardView(Wt::WContainerWidget *parent) if (model->validate()) { model->saveData(); - LmsApp->notify(Wt::WString::tr("msg-settings-first-connection-done")); + LmsApp->notify(Wt::WString::tr("Lms.AdminWizard.done")); saveButton->setEnabled(false); } diff --git a/src/ui/settings/AdminWizardView.hpp b/src/ui/admin/AdminWizardView.hpp similarity index 100% rename from src/ui/settings/AdminWizardView.hpp rename to src/ui/admin/AdminWizardView.hpp diff --git a/src/ui/settings/DatabaseSettingsView.cpp b/src/ui/admin/DatabaseSettingsView.cpp similarity index 93% rename from src/ui/settings/DatabaseSettingsView.cpp rename to src/ui/admin/DatabaseSettingsView.cpp index b801529f..6db7b934 100644 --- a/src/ui/settings/DatabaseSettingsView.cpp +++ b/src/ui/admin/DatabaseSettingsView.cpp @@ -181,16 +181,16 @@ class DatabaseSettingsModel : public Wt::WFormModel _updatePeriodModel = new Wt::WStringListModel(this); - _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-never")); + _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.never")); _updatePeriodModel->setData(0, 0, Scanner::UpdatePeriod::Never, Wt::UserRole); - _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-daily")); + _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.daily")); _updatePeriodModel->setData(1, 0, Scanner::UpdatePeriod::Daily, Wt::UserRole); - _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-weekly")); + _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.weekly")); _updatePeriodModel->setData(2, 0, Scanner::UpdatePeriod::Weekly, Wt::UserRole); - _updatePeriodModel->addString(Wt::WString::tr("msg-update-period-monthly")); + _updatePeriodModel->addString(Wt::WString::tr("Lms.Admin.Database.monthly")); _updatePeriodModel->setData(3, 0, Scanner::UpdatePeriod::Monthly, Wt::UserRole); _updateStartTimeModel = new Wt::WStringListModel(this); @@ -229,7 +229,7 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) { auto model = new DatabaseSettingsModel(this); - setTemplateText(tr("template-settings-database")); + setTemplateText(tr("Lms.Admin.Database.template")); addFunction("tr", &WTemplate::Functions::tr); addFunction("id", &WTemplate::Functions::id); @@ -249,13 +249,13 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) // Buttons - Wt::WPushButton *saveBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-apply")); + Wt::WPushButton *saveBtn = new Wt::WPushButton(Wt::WString::tr("Lms.apply")); bindWidget("apply-btn", saveBtn); - Wt::WPushButton *discardBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-discard")); + Wt::WPushButton *discardBtn = new Wt::WPushButton(Wt::WString::tr("Lms.discard")); bindWidget("discard-btn", discardBtn); - Wt::WPushButton *immScanBtn = new Wt::WPushButton(Wt::WString::tr("msg-btn-immediate-scan")); + Wt::WPushButton *immScanBtn = new Wt::WPushButton(Wt::WString::tr("Lms.Admin.Database.immediate-scan")); bindWidget("immediate-scan-btn", immScanBtn); saveBtn->clicked().connect(std::bind([=] () @@ -267,7 +267,7 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) model->saveData(); LmsApp->getMediaScanner().reschedule(); - LmsApp->notify(Wt::WString::tr("msg-notify-settings-saved")); + LmsApp->notify(Wt::WString::tr("Lms.Admin.Database.settings-saved")); } // Udate the view: Delete any validation message in the view, etc. @@ -284,7 +284,7 @@ DatabaseSettingsView::DatabaseSettingsView(Wt::WContainerWidget *parent) immScanBtn->clicked().connect(std::bind([=] () { LmsApp->getMediaScanner().scheduleImmediateScan(); - LmsApp->notify(Wt::WString::tr("msg-notify-scan-launched")); + LmsApp->notify(Wt::WString::tr("Lms.Admin.Database.scan-launched")); })); updateView(model); diff --git a/src/ui/settings/DatabaseSettingsView.hpp b/src/ui/admin/DatabaseSettingsView.hpp similarity index 100% rename from src/ui/settings/DatabaseSettingsView.hpp rename to src/ui/admin/DatabaseSettingsView.hpp diff --git a/src/ui/common/Validators.cpp b/src/ui/common/Validators.cpp index 2d8b2170..39308989 100644 --- a/src/ui/common/Validators.cpp +++ b/src/ui/common/Validators.cpp @@ -60,7 +60,7 @@ DirectoryValidator::validate(const Wt::WString& input) const else if (res) return Wt::WValidator::Result(Wt::WValidator::Valid); else - return Wt::WValidator::Result(Wt::WValidator::Invalid, Wt::WString::tr("msg-error-not-a-directory")); + return Wt::WValidator::Result(Wt::WValidator::Invalid, Wt::WString::tr("Lms.not-a-directory")); } diff --git a/src/ui/ArtistView.cpp b/src/ui/explore/ArtistView.cpp similarity index 85% rename from src/ui/ArtistView.cpp rename to src/ui/explore/ArtistView.cpp index 1a524ba0..1f443339 100644 --- a/src/ui/ArtistView.cpp +++ b/src/ui/explore/ArtistView.cpp @@ -71,7 +71,7 @@ Artist::refresh() return; } - auto t = new Wt::WTemplate(Wt::WString::tr("template-artist"), this); + auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artist.template"), this); t->addFunction("tr", &Wt::WTemplate::Functions::tr); auto clusterContainers = new Wt::WContainerWidget(); @@ -82,7 +82,7 @@ Artist::refresh() for (auto cluster : clusters) { - auto entry = new Wt::WTemplate(Wt::WString::tr("template-artist-cluster-entry"), clusterContainers); + auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artist.template.cluster-entry"), clusterContainers); entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::PlainText); } @@ -90,7 +90,7 @@ Artist::refresh() t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::PlainText); { - auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.play"), Wt::XHTMLText); t->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] @@ -100,7 +100,7 @@ Artist::refresh() } { - auto addBtn = new Wt::WText(Wt::WString::tr("btn-artist-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.add"), Wt::XHTMLText); t->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] @@ -117,7 +117,7 @@ Artist::refresh() { auto releaseId = release.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-artist-entry"), releasesContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artist.template.entry"), releasesContainer); entry->addFunction("tr", Wt::WTemplate::Functions::tr); { @@ -153,14 +153,14 @@ Artist::refresh() } } - auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.play"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { releasePlay.emit(releaseId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("btn-artist-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Artist.add"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { diff --git a/src/ui/ArtistView.hpp b/src/ui/explore/ArtistView.hpp similarity index 100% rename from src/ui/ArtistView.hpp rename to src/ui/explore/ArtistView.hpp diff --git a/src/ui/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp similarity index 87% rename from src/ui/ArtistsView.cpp rename to src/ui/explore/ArtistsView.cpp index b5d1addb..b48ce1b6 100644 --- a/src/ui/ArtistsView.cpp +++ b/src/ui/explore/ArtistsView.cpp @@ -39,18 +39,18 @@ Artists::Artists(Filters* filters, Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent), _filters(filters) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-artists"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template"), this); container->addFunction("tr", &Wt::WTemplate::Functions::tr); _search = new Wt::WLineEdit(); container->bindWidget("search", _search); - _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); _search->textInput().connect(this, &Artists::refresh); _artistsContainer = new Wt::WContainerWidget(); container->bindWidget("artists", _artistsContainer); - _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); container->bindWidget("show-more", _showMore); @@ -88,7 +88,7 @@ Artists::addSome() for (auto artist : artists) { - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-artists-entry"), _artistsContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template.entry"), _artistsContainer); entry->bindInt("nb-release", artist->getReleases(clusterIds).size()); diff --git a/src/ui/ArtistsView.hpp b/src/ui/explore/ArtistsView.hpp similarity index 100% rename from src/ui/ArtistsView.hpp rename to src/ui/explore/ArtistsView.hpp diff --git a/src/ui/Explore.cpp b/src/ui/explore/Explore.cpp similarity index 98% rename from src/ui/Explore.cpp rename to src/ui/explore/Explore.cpp index 7a8d463c..42be7b49 100644 --- a/src/ui/Explore.cpp +++ b/src/ui/explore/Explore.cpp @@ -73,7 +73,7 @@ handlePathChange(Wt::WStackedWidget* stack) Explore::Explore(Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-explore"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template"), this); _filters = new Filters(); container->bindWidget("filters", _filters); diff --git a/src/ui/Explore.hpp b/src/ui/explore/Explore.hpp similarity index 100% rename from src/ui/Explore.hpp rename to src/ui/explore/Explore.hpp diff --git a/src/ui/Filters.cpp b/src/ui/explore/Filters.cpp similarity index 87% rename from src/ui/Filters.cpp rename to src/ui/explore/Filters.cpp index efc2ae07..719e5444 100644 --- a/src/ui/Filters.cpp +++ b/src/ui/explore/Filters.cpp @@ -31,9 +31,9 @@ namespace UserInterface { void Filters::showDialog() { - auto dialog = new Wt::WDialog("Go to cell"); + auto dialog = new Wt::WDialog(Wt::WString::tr("Lms.Explore.add-filter")); - auto container = new Wt::WTemplate(Wt::WString::tr("template-filter-add")); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.add-filter")); container->addFunction("tr", &Wt::WTemplate::Functions::tr); dialog->contents()->addWidget(container); @@ -44,12 +44,12 @@ Filters::showDialog() auto valueCombo = new Wt::WComboBox(); container->bindWidget("value", valueCombo); - auto addBtn = new Wt::WPushButton(Wt::WString::tr("msg-add")); - container->bindWidget("add", addBtn); + auto addBtn = new Wt::WPushButton(Wt::WString::tr("Lms.add")); + container->bindWidget("add-btn", addBtn); addBtn->clicked().connect(dialog, &Wt::WDialog::accept); - auto cancelBtn = new Wt::WPushButton(Wt::WString::tr("msg-cancel")); - container->bindWidget("cancel", cancelBtn); + auto cancelBtn = new Wt::WPushButton(Wt::WString::tr("Lms.cancel")); + container->bindWidget("cancel-btn", cancelBtn); cancelBtn->clicked().connect(dialog, &Wt::WDialog::reject); // Populate data @@ -140,10 +140,10 @@ Filters::showDialog() Filters::Filters(Wt::WContainerWidget *parent) : Wt::WContainerWidget(parent) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-filters"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.filters"), this); // Filters - Wt::WPushButton *addFilterBtn = new Wt::WPushButton(Wt::WText::tr("msg-filter-add")); + Wt::WPushButton *addFilterBtn = new Wt::WPushButton(Wt::WText::tr("Lms.Explore.add-filter")); container->bindWidget("add-filter", addFilterBtn); _filters = new Wt::WContainerWidget(); diff --git a/src/ui/Filters.hpp b/src/ui/explore/Filters.hpp similarity index 100% rename from src/ui/Filters.hpp rename to src/ui/explore/Filters.hpp diff --git a/src/ui/ReleaseView.cpp b/src/ui/explore/ReleaseView.cpp similarity index 86% rename from src/ui/ReleaseView.cpp rename to src/ui/explore/ReleaseView.cpp index 123b7eea..37c2487a 100644 --- a/src/ui/ReleaseView.cpp +++ b/src/ui/explore/ReleaseView.cpp @@ -72,7 +72,7 @@ Release::refresh() return; } - auto t = new Wt::WTemplate(Wt::WString::tr("template-release"), this); + auto t = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Release.template"), this); t->addFunction("tr", &Wt::WTemplate::Functions::tr); t->bindString("name", Wt::WString::fromUTF8(release->getName()), Wt::PlainText); @@ -95,7 +95,7 @@ Release::refresh() auto artists = release->getArtists(); if (artists.size() > 1) { - t->bindString("artist-name", Wt::WString::tr("msg-various-artists")); + t->bindString("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); } else { @@ -118,14 +118,14 @@ Release::refresh() for (auto cluster : clusters) { - auto entry = new Wt::WTemplate(Wt::WString::tr("template-release-cluster-entry"), clusterContainers); + auto entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Release.template.cluster-entry"), clusterContainers); entry->bindString("name", Wt::WString::fromUTF8(cluster->getName()), Wt::PlainText); } } { - auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.play"), Wt::XHTMLText); t->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { @@ -134,7 +134,7 @@ Release::refresh() } { - auto addBtn = new Wt::WText(Wt::WString::tr("btn-release-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.add"), Wt::XHTMLText); t->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { @@ -154,7 +154,7 @@ Release::refresh() { auto trackId = track.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-release-entry"), tracksContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Release.template.entry"), tracksContainer); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); @@ -182,14 +182,14 @@ Release::refresh() entry->bindInt("disc-number", *discNumber); } - auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.play"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { trackPlay.emit(trackId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("btn-release-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Release.add"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { diff --git a/src/ui/ReleaseView.hpp b/src/ui/explore/ReleaseView.hpp similarity index 100% rename from src/ui/ReleaseView.hpp rename to src/ui/explore/ReleaseView.hpp diff --git a/src/ui/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp similarity index 84% rename from src/ui/ReleasesView.cpp rename to src/ui/explore/ReleasesView.cpp index 1cb5a00a..6bf9dddf 100644 --- a/src/ui/ReleasesView.cpp +++ b/src/ui/explore/ReleasesView.cpp @@ -40,18 +40,18 @@ Releases::Releases(Filters* filters, Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent), _filters(filters) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-releases"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template"), this); container->addFunction("tr", &Wt::WTemplate::Functions::tr); _search = new Wt::WLineEdit(); container->bindWidget("search", _search); - _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); _search->textInput().connect(this, &Releases::refresh); _releasesContainer = new Wt::WContainerWidget(); container->bindWidget("releases", _releasesContainer); - _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); container->bindWidget("show-more", _showMore); @@ -88,7 +88,7 @@ Releases::addSome() { auto releaseId = release.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-releases-entry"), _releasesContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template.entry"), _releasesContainer); entry->addFunction("tr", Wt::WTemplate::Functions::tr); Wt::WAnchor* coverAnchor = LmsApplication::createReleaseAnchor(releaseId); @@ -109,7 +109,7 @@ Releases::addSome() auto artists = release->getArtists(); if (artists.size() > 1) { - entry->bindString("artist-name", Wt::WString::tr("msg-various-artists")); + entry->bindString("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); } else { @@ -119,14 +119,14 @@ Releases::addSome() entry->bindWidget("artist-name", artistAnchor); } - auto playBtn = new Wt::WText(Wt::WString::tr("btn-releases-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Releases.play"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { releasePlay.emit(releaseId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("btn-releases-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Releases.add"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { @@ -134,8 +134,6 @@ Releases::addSome() })); } - std::cerr << "if-show-more = " << moreResults << "\n"; - _showMore->setHidden(!moreResults); } diff --git a/src/ui/ReleasesView.hpp b/src/ui/explore/ReleasesView.hpp similarity index 100% rename from src/ui/ReleasesView.hpp rename to src/ui/explore/ReleasesView.hpp diff --git a/src/ui/TracksView.cpp b/src/ui/explore/TracksView.cpp similarity index 85% rename from src/ui/TracksView.cpp rename to src/ui/explore/TracksView.cpp index 81341975..4875e597 100644 --- a/src/ui/TracksView.cpp +++ b/src/ui/explore/TracksView.cpp @@ -39,15 +39,15 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) : Wt::WContainerWidget(parent), _filters(filters) { - auto container = new Wt::WTemplate(Wt::WString::tr("template-tracks"), this); + auto container = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Tracks.template"), this); container->addFunction("tr", &Wt::WTemplate::Functions::tr); _search = new Wt::WLineEdit(); container->bindWidget("search", _search); - _search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder")); + _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); _search->textInput().connect(this, &Tracks::refresh); - auto playBtn = new Wt::WText(Wt::WString::tr("btn-tracks-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::XHTMLText); container->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { @@ -55,7 +55,7 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) tracksPlay.emit(getTracks()); })); - auto addBtn = new Wt::WText(Wt::WString::tr("btn-tracks-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.add"), Wt::XHTMLText); container->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { @@ -66,7 +66,7 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent) _tracksContainer = new Wt::WContainerWidget(); container->bindWidget("tracks", _tracksContainer); - _showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more")); + _showMore = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.show-more")); _showMore->addFunction("tr", &Wt::WTemplate::Functions::tr); container->bindWidget("show-more", _showMore); @@ -116,7 +116,7 @@ Tracks::addSome() for (auto track : tracks) { auto trackId = track.id(); - Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-tracks-entry"), _tracksContainer); + Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("Lms.Explore.Tracks.template.entry"), _tracksContainer); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText); @@ -146,14 +146,14 @@ Tracks::addSome() cover->setWidth(64); entry->bindWidget("cover", cover); - auto playBtn = new Wt::WText(Wt::WString::tr("btn-tracks-play-btn"), Wt::XHTMLText); + auto playBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.play"), Wt::XHTMLText); entry->bindWidget("play-btn", playBtn); playBtn->clicked().connect(std::bind([=] { trackPlay.emit(trackId); })); - auto addBtn = new Wt::WText(Wt::WString::tr("btn-tracks-add-btn"), Wt::XHTMLText); + auto addBtn = new Wt::WText(Wt::WString::tr("Lms.Explore.Tracks.add"), Wt::XHTMLText); entry->bindWidget("add-btn", addBtn); addBtn->clicked().connect(std::bind([=] { diff --git a/src/ui/TracksView.hpp b/src/ui/explore/TracksView.hpp similarity index 100% rename from src/ui/TracksView.hpp rename to src/ui/explore/TracksView.hpp