From 98b7e6c5423e47f96a758c0fc8cfec4ce03de49d Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 13 Sep 2025 18:20:09 +0200 Subject: [PATCH] Removed unused category in toasts --- src/lms/ui/LmsApplication.cpp | 7 +++---- src/lms/ui/LmsApplication.hpp | 2 +- src/lms/ui/NotificationContainer.cpp | 9 ++++----- src/lms/ui/NotificationContainer.hpp | 4 +--- src/lms/ui/SettingsView.cpp | 4 ++-- src/lms/ui/admin/MediaLibrariesView.cpp | 6 +++--- src/lms/ui/admin/ScanSettingsView.cpp | 2 +- src/lms/ui/admin/ScannerController.cpp | 4 ++-- src/lms/ui/admin/UserView.cpp | 4 +--- src/lms/ui/explore/Filters.cpp | 4 +--- 10 files changed, 19 insertions(+), 27 deletions(-) diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index ee067557..45e47fe2 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -546,7 +546,6 @@ namespace lms::ui { _scannerEvents.scanComplete.connect([this](const scanner::ScanStats& stats) { notifyMsg(Notification::Type::Info, - Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.Admin.Database.scan-complete") .arg(static_cast(stats.getTotalFileCount())) .arg(static_cast(stats.additions)) @@ -596,9 +595,9 @@ namespace lms::ui WApplication::setTitle(title); } - void LmsApplication::notifyMsg(Notification::Type type, const Wt::WString& category, const Wt::WString& message, std::chrono::milliseconds duration) + void LmsApplication::notifyMsg(Notification::Type type, const Wt::WString& message, std::chrono::milliseconds duration) { - LMS_LOG(UI, INFO, "Notifying message '" << message.toUTF8() << "' for category '" << category.toUTF8() << "'"); - _notificationContainer->add(type, category, message, duration); + LMS_LOG(UI, INFO, "Notifying message '" << message.toUTF8() << "'"); + _notificationContainer->add(type, message, duration); } } // namespace lms::ui \ No newline at end of file diff --git a/src/lms/ui/LmsApplication.hpp b/src/lms/ui/LmsApplication.hpp index f5a54586..75dfee52 100644 --- a/src/lms/ui/LmsApplication.hpp +++ b/src/lms/ui/LmsApplication.hpp @@ -80,7 +80,7 @@ namespace lms::ui void setTitle(const Wt::WString& title = ""); // Used to classify the message sent to the user - void notifyMsg(Notification::Type type, const Wt::WString& category, const Wt::WString& message, std::chrono::milliseconds duration = std::chrono::milliseconds{ 5000 }); + void notifyMsg(Notification::Type type, const Wt::WString& message, std::chrono::milliseconds duration = std::chrono::milliseconds{ 5000 }); MediaPlayer& getMediaPlayer() const { return *_mediaPlayer; } PlayQueue& getPlayQueue() const { return *_playQueue; } diff --git a/src/lms/ui/NotificationContainer.cpp b/src/lms/ui/NotificationContainer.cpp index d76f2ea2..9f3196b5 100644 --- a/src/lms/ui/NotificationContainer.cpp +++ b/src/lms/ui/NotificationContainer.cpp @@ -34,12 +34,12 @@ namespace lms::ui class NotificationWidget : public Wt::WTemplate { public: - NotificationWidget(Notification::Type type, const Wt::WString& category, const Wt::WString& message, std::chrono::milliseconds duration); + NotificationWidget(Notification::Type type, const Wt::WString& message, std::chrono::milliseconds duration); Wt::JSignal<> closed{ this, "closed" }; }; } // namespace - NotificationWidget::NotificationWidget(Notification::Type type, const Wt::WString& category, const Wt::WString& message, std::chrono::milliseconds duration) + NotificationWidget::NotificationWidget(Notification::Type type, const Wt::WString& message, std::chrono::milliseconds duration) : Wt::WTemplate{ Wt::WString::tr("Lms.notifications.template.entry") } { switch (type) @@ -58,7 +58,6 @@ namespace lms::ui break; } - bindString("category", category); bindString("message", message); bindInt("duration", duration.count()); @@ -78,9 +77,9 @@ namespace lms::ui doJavaScript(oss.str()); } - void NotificationContainer::add(Notification::Type type, const Wt::WString& category, const Wt::WString& message, std::chrono::milliseconds duration) + void NotificationContainer::add(Notification::Type type, const Wt::WString& message, std::chrono::milliseconds duration) { - NotificationWidget* notification{ addNew(type, category, message, duration) }; + NotificationWidget* notification{ addNew(type, message, duration) }; notification->closed.connect([this, notification] { removeWidget(notification); diff --git a/src/lms/ui/NotificationContainer.hpp b/src/lms/ui/NotificationContainer.hpp index d4ba3921..828ef4e6 100644 --- a/src/lms/ui/NotificationContainer.hpp +++ b/src/lms/ui/NotificationContainer.hpp @@ -31,8 +31,6 @@ namespace lms::ui class NotificationContainer : public Wt::WContainerWidget { public: - void add(Notification::Type type, const Wt::WString& category, const Wt::WString& message, std::chrono::milliseconds duration); - - private: + void add(Notification::Type type, const Wt::WString& message, std::chrono::milliseconds duration); }; } // namespace lms::ui diff --git a/src/lms/ui/SettingsView.cpp b/src/lms/ui/SettingsView.cpp index 70d891b0..94a3078a 100644 --- a/src/lms/ui/SettingsView.cpp +++ b/src/lms/ui/SettingsView.cpp @@ -758,7 +758,7 @@ namespace lms::ui { if (LmsApp->getUserType() == db::UserType::DEMO) { - LmsApp->notifyMsg(Notification::Type::Warning, Wt::WString::tr("Lms.Settings.settings"), Wt::WString::tr("Lms.Settings.demo-cannot-save")); + LmsApp->notifyMsg(Notification::Type::Warning, Wt::WString::tr("Lms.Settings.demo-cannot-save")); return; } } @@ -768,7 +768,7 @@ namespace lms::ui if (model->validate()) { model->saveData(); - LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Settings.settings"), Wt::WString::tr("Lms.Settings.settings-saved")); + LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Settings.settings-saved")); } // Udate the view: Delete any validation message in the view, etc. diff --git a/src/lms/ui/admin/MediaLibrariesView.cpp b/src/lms/ui/admin/MediaLibrariesView.cpp index 315ec5e6..633c8860 100644 --- a/src/lms/ui/admin/MediaLibrariesView.cpp +++ b/src/lms/ui/admin/MediaLibrariesView.cpp @@ -47,7 +47,7 @@ namespace lms::ui Wt::WTemplate* entry{ addEntry() }; updateEntry(newMediaLibraryId, entry); // No need to stop the current scan if we add stuff - LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.Admin.MediaLibrary.library-created")); + LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibrary.library-created")); LmsApp->getModalManager().dispose(mediaLibraryModalPtr); }); @@ -99,7 +99,7 @@ namespace lms::ui // Don't want the scanner to go on with wrong settings core::Service::get()->requestReload(); - LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.Admin.MediaLibrary.library-deleted")); + LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibrary.library-deleted")); _libraries->removeWidget(libraryEntry); @@ -138,7 +138,7 @@ namespace lms::ui // Don't want the scanner to go on with wrong settings core::Service::get()->requestReload(); - LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.MediaLibraries.media-libraries"), Wt::WString::tr("Lms.settings-saved")); + LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.settings-saved")); LmsApp->getModalManager().dispose(mediaLibraryModalPtr); }); diff --git a/src/lms/ui/admin/ScanSettingsView.cpp b/src/lms/ui/admin/ScanSettingsView.cpp index 2d2ec69e..020df4bc 100644 --- a/src/lms/ui/admin/ScanSettingsView.cpp +++ b/src/lms/ui/admin/ScanSettingsView.cpp @@ -493,7 +493,7 @@ namespace lms::ui core::Service::get()->load(); // Don't want the scanner to go on with wrong settings core::Service::get()->requestReload(); - LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.settings-saved")); + LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.settings-saved")); } // Udate the view: Delete any validation message in the view, etc. diff --git a/src/lms/ui/admin/ScannerController.cpp b/src/lms/ui/admin/ScannerController.cpp index fd45bb0b..df431fe0 100644 --- a/src/lms/ui/admin/ScannerController.cpp +++ b/src/lms/ui/admin/ScannerController.cpp @@ -88,10 +88,10 @@ namespace lms::ui auto onDbEvent{ [&]() { refreshContents(); } }; LmsApp->getScannerEvents().scanAborted.connect(this, [] { - LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.Admin.Database.scan-aborted")); + LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.scan-aborted")); }); LmsApp->getScannerEvents().scanStarted.connect(this, [] { - LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.database"), Wt::WString::tr("Lms.Admin.Database.scan-launched")); + LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.Database.scan-launched")); }); LmsApp->getScannerEvents().scanComplete.connect(this, onDbEvent); LmsApp->getScannerEvents().scanInProgress.connect(this, onDbEvent); diff --git a/src/lms/ui/admin/UserView.cpp b/src/lms/ui/admin/UserView.cpp index 631a9482..8ab44a40 100644 --- a/src/lms/ui/admin/UserView.cpp +++ b/src/lms/ui/admin/UserView.cpp @@ -263,9 +263,7 @@ namespace lms::ui if (model->validate()) { model->saveData(); - LmsApp->notifyMsg(Notification::Type::Info, - Wt::WString::tr("Lms.Admin.Users.users"), - Wt::WString::tr(userId ? "Lms.Admin.User.user-updated" : "Lms.Admin.User.user-created")); + LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr(userId ? "Lms.Admin.User.user-updated" : "Lms.Admin.User.user-created")); LmsApp->setInternalPath("/admin/users", true); } else diff --git a/src/lms/ui/explore/Filters.cpp b/src/lms/ui/explore/Filters.cpp index e618e9e1..7d90ef87 100644 --- a/src/lms/ui/explore/Filters.cpp +++ b/src/lms/ui/explore/Filters.cpp @@ -326,9 +326,7 @@ namespace lms::ui void Filters::emitFilterAddedNotification() { - LmsApp->notifyMsg(Notification::Type::Info, - Wt::WString::tr("Lms.Explore.filters"), - Wt::WString::tr("Lms.Explore.filter-added"), std::chrono::seconds{ 2 }); + LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Explore.filter-added"), std::chrono::seconds{ 2 }); _sigUpdated.emit(); }