Merge pull request #4495 from gavinhoward/playlist_save

Playlist Save Fixes

src/playlist/playlistcontainer.cpp

@@ -51,9 +51,9 @@ PlaylistContainer::PlaylistContainer(QWidget* parent)
       filter_timer_(new QTimer(this)) {
   ui_->setupUi(this);
 
-  ui_->file_path_box->addItem("Automatic");
-  ui_->file_path_box->addItem("Absolute");
-  ui_->file_path_box->addItem("Relative");
+  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)));
@@ -111,7 +111,7 @@ PlaylistContainer::PlaylistContainer(QWidget* parent)
 PlaylistContainer::~PlaylistContainer() { delete ui_; }
 
 void PlaylistContainer::ReloadSettings() {
-  bool show_menu = settings_.value(Playlist::kQuickChangeMenu, true).toBool();
+  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);

src/playlistparsers/m3uparser.cpp

@@ -19,6 +19,8 @@
 #include "core/logging.h"
 #include "core/timeconstants.h"
 
+#include "playlist/playlist.h"
+
 #include <QBuffer>
 #include <QtDebug>
 

src/playlistparsers/parserbase.cpp

@@ -92,7 +92,7 @@ QString ParserBase::URLOrRelativeFilename(const QUrl& url,
 
   QSettings s;
   s.beginGroup(Playlist::kSettingsGroup);
-  int p = s.value("path_type", Playlist::Path_Automatic).toInt();
+  int p = s.value(Playlist::kPathType, Playlist::Path_Automatic).toInt();
   const Playlist::Path path = static_cast<Playlist::Path>(p);
   s.endGroup();
 

src/playlistparsers/parserbase.h

@@ -22,7 +22,6 @@
 #include <QDir>
 
 #include "core/song.h"
-#include "playlist/playlist.h"
 
 class LibraryBackendInterface;
 

src/playlistparsers/xspfparser.cpp

@@ -19,6 +19,8 @@
 #include "core/timeconstants.h"
 #include "core/utilities.h"
 
+#include "playlist/playlist.h"
+
 #include <QDomDocument>
 #include <QFile>
 #include <QIODevice>
@@ -113,7 +115,7 @@ void XSPFParser::Save(const SongList& songs, QIODevice* device,
 
   QSettings s;
   s.beginGroup(Playlist::kSettingsGroup);
-  bool writeMetadata = s.value("write_metadata", true).toBool();
+  bool writeMetadata = s.value(Playlist::kWriteMetadata, true).toBool();
   s.endGroup();
 
   StreamElement tracklist("trackList", &writer);