Revert "Finished the changes to the quick change menu. Everything should work."

This reverts commit a468085c3a.

Conflicts:
	src/playlist/playlistcontainer.cpp
	src/playlist/playlistcontainer.h
	src/ui/behavioursettingspage.cpp

src/playlist/playlist.cpp

@@ -89,10 +89,6 @@ const QRgb Playlist::kDynamicHistoryColor = qRgb(0x80, 0x80, 0x80);
 
 const char* Playlist::kSettingsGroup = "Playlist";
 
-const char* Playlist::kPathType = "path_type";
-const char* Playlist::kWriteMetadata = "write_metadata";
-const char* Playlist::kQuickChangeMenu = "quick_change_menu";
-
 const int Playlist::kUndoStackSize = 20;
 const int Playlist::kUndoItemLimit = 500;
 

src/playlist/playlist.h

@@ -152,10 +152,6 @@ class Playlist : public QAbstractListModel {
 
   static const char* kSettingsGroup;
 
-  static const char* kPathType;
-  static const char* kWriteMetadata;
-  static const char* kQuickChangeMenu;
-
   static const int kUndoStackSize;
   static const int kUndoItemLimit;
 

src/playlist/playlistcontainer.cpp

@@ -51,13 +51,6 @@ PlaylistContainer::PlaylistContainer(QWidget* parent)
       filter_timer_(new QTimer(this)) {
   ui_->setupUi(this);
 
-  ui_->file_path_box->addItem(tr("Automatic"));
-  ui_->file_path_box->addItem(tr("Absolute"));
-  ui_->file_path_box->addItem(tr("Relative"));
-
-  connect(ui_->file_path_box, SIGNAL(currentIndexChanged(int)),
-          SLOT(PathSettingChanged(int)));
-
   no_matches_label_ = new QLabel(ui_->playlist);
   no_matches_label_->setAlignment(Qt::AlignTop | Qt::AlignHCenter);
   no_matches_label_->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -82,8 +75,6 @@ PlaylistContainer::PlaylistContainer(QWidget* parent)
 
   settings_.beginGroup(kSettingsGroup);
 
-  ReloadSettings();
-
   // Tab bar
   ui_->tab_bar->setExpanding(false);
   ui_->tab_bar->setMovable(true);
@@ -110,28 +101,6 @@ PlaylistContainer::PlaylistContainer(QWidget* parent)
 
 PlaylistContainer::~PlaylistContainer() { delete ui_; }
 
-void PlaylistContainer::ReloadSettings() {
-  bool show_menu = settings_.value(Playlist::kQuickChangeMenu, false).toBool();
-  ui_->line->setVisible(show_menu);
-  ui_->file_path_label->setVisible(show_menu);
-  ui_->file_path_box->setVisible(show_menu);
-
-  int value =
-      settings_.value(Playlist::kPathType, Playlist::Path_Automatic).toInt();
-  Playlist::Path path = static_cast<Playlist::Path>(value);
-  switch (path) {
-    case Playlist::Path_Automatic:
-      ui_->file_path_box->setCurrentIndex(0);
-      break;
-    case Playlist::Path_Absolute:
-      ui_->file_path_box->setCurrentIndex(1);
-      break;
-    case Playlist::Path_Relative:
-      ui_->file_path_box->setCurrentIndex(2);
-      break;
-  }
-}
-
 PlaylistView* PlaylistContainer::view() const { return ui_->playlist; }
 
 void PlaylistContainer::SetActions(QAction* new_playlist,
@@ -470,7 +439,3 @@ bool PlaylistContainer::eventFilter(QObject* objectWatched, QEvent* event) {
   }
   return QWidget::eventFilter(objectWatched, event);
 }
-
-void PlaylistContainer::PathSettingChanged(int index) {
-  settings_.setValue(Playlist::kPathType, index);
-}

src/playlist/playlistcontainer.h

@@ -46,8 +46,6 @@ class PlaylistContainer : public QWidget {
                   QAction* previous_playlist);
   void SetManager(PlaylistManager* manager);
 
-  void ReloadSettings();
-
   PlaylistView* view() const;
 
   bool eventFilter(QObject* objectWatched, QEvent* event);
@@ -92,8 +90,6 @@ signals:
 
   void UpdateNoMatchesLabel();
 
-  void PathSettingChanged(int index);
-
  private:
   void UpdateActiveIcon(const QIcon& icon);
   void RepositionNoMatchesLabel(bool force = false);

src/playlist/playlistmanager.cpp

@@ -50,8 +50,6 @@ PlaylistManager::PlaylistManager(Application* app, QObject* parent)
   connect(app_->player(), SIGNAL(Paused()), SLOT(SetActivePaused()));
   connect(app_->player(), SIGNAL(Playing()), SLOT(SetActivePlaying()));
   connect(app_->player(), SIGNAL(Stopped()), SLOT(SetActiveStopped()));
-
-  settings_.beginGroup(Playlist::kSettingsGroup);
 }
 
 PlaylistManager::~PlaylistManager() {
@@ -198,7 +196,10 @@ void PlaylistManager::ItemsLoadedForSavePlaylist(QFutureWatcher<Song>* watcher,
 }
 
 void PlaylistManager::SaveWithUI(int id, const QString& suggested_filename) {
-  QString filename = settings_.value("last_save_playlist").toString();
+  QSettings settings;
+  settings.beginGroup(Playlist::kSettingsGroup);
+  QString filename = settings.value("last_save_playlist").toString();
+  settings.endGroup();
 
   // We want to use the playlist tab name as a default filename, but in the
   // same directory as the last saved file.
@@ -223,9 +224,13 @@ void PlaylistManager::SaveWithUI(int id, const QString& suggested_filename) {
       nullptr, tr("Save playlist", "Title of the playlist save dialog."),
       filename, parser()->filters(), &default_filter);
 
-  if (filename.isNull()) return;
+  if (filename.isNull()) {
+    settings.endGroup();
+    return;
+  }
 
-  settings_.setValue("last_save_playlist", filename);
+  settings.setValue("last_save_playlist", filename);
+  settings.endGroup();
 
   Save(id == -1 ? current_id() : id, filename);
 }

src/playlist/playlistmanager.h

@@ -255,8 +255,6 @@ class PlaylistManager : public PlaylistManagerInterface {
   PlaylistParser* parser_;
   PlaylistContainer* playlist_container_;
 
-  QSettings settings_;
-
   // key = id
   QMap<int, Data> playlists_;
 

src/ui/behavioursettingspage.cpp

@@ -149,8 +149,6 @@ void BehaviourSettingsPage::Load() {
   }
   ui_->b_write_metadata->setChecked(
       s.value(Playlist::kWriteMetadata, true).toBool());
-  ui_->b_quickchange_menu->setChecked(
-      s.value(Playlist::kQuickChangeMenu, false).toBool());
   s.endGroup();
 
   s.beginGroup(PlaylistTabBar::kSettingsGroup);
@@ -211,7 +209,6 @@ void BehaviourSettingsPage::Save() {
   s.setValue("click_edit_inline", ui_->b_click_edit_inline_->isChecked());
   s.setValue(Playlist::kPathType, static_cast<int>(path));
   s.setValue(Playlist::kWriteMetadata, ui_->b_write_metadata->isChecked());
-  s.setValue(Playlist::kQuickChangeMenu, ui_->b_quickchange_menu->isChecked());
   s.endGroup();
 
   s.beginGroup(PlaylistTabBar::kSettingsGroup);

src/ui/mainwindow.cpp

@@ -983,7 +983,6 @@ void MainWindow::ReloadAllSettings() {
   library_view_->ReloadSettings();
   song_info_view_->ReloadSettings();
   app_->player()->engine()->ReloadSettings();
-  ui_->playlist->ReloadSettings();
   ui_->playlist->view()->ReloadSettings();
   app_->internet_model()->ReloadSettings();
 #ifdef HAVE_WIIMOTEDEV