diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 8e2b9bb94..2b59dd7c7 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -460,7 +460,6 @@ MainWindow::MainWindow(Application *app, std::shared_ptr tray_ic ui_->action_remove_duplicates->setIcon(IconLoader::Load("list-remove")); ui_->action_remove_unavailable->setIcon(IconLoader::Load("list-remove")); ui_->action_remove_from_playlist->setIcon(IconLoader::Load("list-remove")); - ui_->action_save_all_playlists->setIcon(IconLoader::Load("document-save-all")); // Configure @@ -566,7 +565,7 @@ MainWindow::MainWindow(Application *app, std::shared_ptr tray_ic ui_->button_scrobble->setDefaultAction(ui_->action_toggle_scrobbling); ui_->button_love->setDefaultAction(ui_->action_love); - ui_->playlist->SetActions(ui_->action_new_playlist, ui_->action_load_playlist, ui_->action_save_playlist, ui_->action_clear_playlist, ui_->action_next_playlist, /* These two actions aren't associated */ ui_->action_previous_playlist /* to a button but to the main window */, ui_->action_save_all_playlists); + ui_->playlist->SetActions(ui_->action_new_playlist, ui_->action_load_playlist, ui_->action_save_playlist, ui_->action_clear_playlist, ui_->action_next_playlist, /* These two actions aren't associated */ ui_->action_previous_playlist /* to a button but to the main window */); // Add the shuffle and repeat action groups to the menu ui_->action_shuffle_mode->setMenu(ui_->playlist_sequence->shuffle_menu()); ui_->action_repeat_mode->setMenu(ui_->playlist_sequence->repeat_menu()); diff --git a/src/core/mainwindow.ui b/src/core/mainwindow.ui index 302538bfa..95d82ef86 100644 --- a/src/core/mainwindow.ui +++ b/src/core/mainwindow.ui @@ -483,7 +483,6 @@ - @@ -748,11 +747,6 @@ Ctrl+Shift+O - - - &Save all playlists - - Go to next playlist tab diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp index 1a3c0c354..c1cc95397 100644 --- a/src/playlist/playlistcontainer.cpp +++ b/src/playlist/playlistcontainer.cpp @@ -132,7 +132,7 @@ PlaylistContainer::~PlaylistContainer() { delete ui_; } PlaylistView *PlaylistContainer::view() const { return ui_->playlist; } -void PlaylistContainer::SetActions(QAction *new_playlist, QAction *load_playlist, QAction *save_playlist, QAction *clear_playlist, QAction *next_playlist, QAction *previous_playlist, QAction *save_all_playlists) { +void PlaylistContainer::SetActions(QAction *new_playlist, QAction *load_playlist, QAction *save_playlist, QAction *clear_playlist, QAction *next_playlist, QAction *previous_playlist) { ui_->create_new->setDefaultAction(new_playlist); ui_->load->setDefaultAction(load_playlist); @@ -148,7 +148,6 @@ void PlaylistContainer::SetActions(QAction *new_playlist, QAction *load_playlist QObject::connect(next_playlist, &QAction::triggered, this, &PlaylistContainer::GoToNextPlaylistTab); QObject::connect(previous_playlist, &QAction::triggered, this, &PlaylistContainer::GoToPreviousPlaylistTab); QObject::connect(clear_playlist, &QAction::triggered, this, &PlaylistContainer::ClearPlaylist); - QObject::connect(save_all_playlists, &QAction::triggered, manager_, &PlaylistManager::SaveAllPlaylists); } diff --git a/src/playlist/playlistcontainer.h b/src/playlist/playlistcontainer.h index eacab4391..23dbb6092 100644 --- a/src/playlist/playlistcontainer.h +++ b/src/playlist/playlistcontainer.h @@ -53,7 +53,7 @@ class PlaylistContainer : public QWidget { static const char *kSettingsGroup; - void SetActions(QAction *new_playlist, QAction *load_playlist, QAction *save_playlist, QAction *clear_playlist, QAction *next_playlist, QAction *previous_playlist, QAction *save_all_playlists); + void SetActions(QAction *new_playlist, QAction *load_playlist, QAction *save_playlist, QAction *clear_playlist, QAction *next_playlist, QAction *previous_playlist); void SetManager(PlaylistManager *manager); void ReloadSettings(); diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp index 35318d7c1..6fbe8bf3a 100644 --- a/src/playlist/playlistmanager.cpp +++ b/src/playlist/playlistmanager.cpp @@ -628,15 +628,3 @@ void PlaylistManager::RateCurrentSong(const float rating) { void PlaylistManager::RateCurrentSong2(const int rating) { RateCurrentSong(static_cast(rating) / 5.0F); } - -void PlaylistManager::SaveAllPlaylists() { - - const QString path = QFileDialog::getExistingDirectory(nullptr, tr("Select directory for the playlists"), QDir::homePath(), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); - - for (QMap::const_iterator it = playlists_.constBegin(); it != playlists_.constEnd(); ++it) { - const Data &data = *it; - const QString filepath = path + "/" + data.name + ".m3u"; - Save(it.key(), filepath, PlaylistSettingsPage::PathType_Absolute); - } - -} diff --git a/src/playlist/playlistmanager.h b/src/playlist/playlistmanager.h index bb0271389..491e9d052 100644 --- a/src/playlist/playlistmanager.h +++ b/src/playlist/playlistmanager.h @@ -223,8 +223,6 @@ class PlaylistManager : public PlaylistManagerInterface { // Rate current song using 0 - 5 scale. void RateCurrentSong2(const int rating) override; - void SaveAllPlaylists(); - private slots: void SetActivePlaying() override; void SetActivePaused() override;