fixed regressions

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5046 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 24 insertions, 3 deletions

diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp
index 36cfbbe85..74e660786 100644
--- a/src/plugins/Ui/skinned/playlistheader.cpp
+++ b/src/plugins/Ui/skinned/playlistheader.cpp
@@ -96,6 +96,7 @@ PlayListHeader::~PlayListHeader()
     if (m_metrics)
         delete m_metrics;
     m_metrics = 0;
+    writeSettings();
     qDeleteAll(m_columns);
     m_columns.clear();
 }
@@ -123,7 +124,7 @@ void PlayListHeader::readSettings()
     {
         m_model->restoreSettings(&settings);
         QList<QVariant> sizes = settings.value("pl_column_sizes").toList();
-        int autoResizeColumn = settings.value("pl_autoresize_colum", -1).toInt();
+        int autoResizeColumn = settings.value("pl_autoresize_column", -1).toInt();
         for(int i = 0; i < m_model->count(); ++i)
         {
             Column *col = new Column();
@@ -669,3 +670,21 @@ int PlayListHeader::findColumn(QPoint pos)
     }
     return -1;
 }
+
+void PlayListHeader::writeSettings()
+{
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
+    settings.beginGroup("Skinned");
+    m_model->saveSettings(&settings);
+    QList<QVariant> sizes;
+    int autoResizeColumn = -1;
+    for(int i = 0; i < m_columns.count(); ++i)
+    {
+       sizes << m_columns[i]->size;
+       if(m_columns[i]->autoResize)
+           autoResizeColumn = i;
+    }
+    settings.setValue("pl_column_sizes", sizes);
+    settings.setValue("pl_autoresize_column", autoResizeColumn);
+    settings.endGroup();
+}
diff --git a/src/plugins/Ui/skinned/playlistheader.h b/src/plugins/Ui/skinned/playlistheader.h
index b4f4827c4..e70a31412 100644
--- a/src/plugins/Ui/skinned/playlistheader.h
+++ b/src/plugins/Ui/skinned/playlistheader.h
@@ -77,6 +77,7 @@ private:
     void paintEvent(QPaintEvent *);
     void loadColors();
     int findColumn(QPoint pos);
+    void writeSettings();
 
     struct Column
     {
diff --git a/src/qmmpui/playlistheadermodel.cpp b/src/qmmpui/playlistheadermodel.cpp
index 279aa501e..2cbb53140 100644
--- a/src/qmmpui/playlistheadermodel.cpp
+++ b/src/qmmpui/playlistheadermodel.cpp
@@ -54,16 +54,17 @@ void PlayListHeaderModel::restoreSettings(const QString &groupName)
 void PlayListHeaderModel::restoreSettings(QSettings *settings)
 {
     QStringList names = settings->value("pl_column_names").toStringList();
-    QStringList patterns = settings->value("pl_column_names").toStringList();
+    QStringList patterns = settings->value("pl_column_patterns").toStringList();
 
     if(!names.isEmpty() && (names.count() == patterns.count()))
     {
         m_columns.clear();
-        for(int i = 0; i < m_columns.count(); ++i)
+        for(int i = 0; i < names.count(); ++i)
         {
             ColumnHeader h = {names.at(i), patterns.at(i)};
             m_columns.append(h);
         }
+        m_helper->setTitleFormats(patterns);
     }
 }