preparing for multicolumn support (latest working revesion: 4749)

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

1 files changed, 11 insertions, 12 deletions

diff --git a/src/qmmpui/qmmpuisettings.cpp b/src/qmmpui/qmmpuisettings.cpp
index c7355ecb3..3373c84e0 100644
--- a/src/qmmpui/qmmpuisettings.cpp
+++ b/src/qmmpui/qmmpuisettings.cpp
@@ -32,9 +32,9 @@ QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent)
     if(m_instance)
         qFatal("QmmpUiSettings: only one instance is allowed");
     m_instance = this;
+    m_colum_manager = new ColumnManager(this);
     QSettings s (Qmmp::configFile(), QSettings::IniFormat);
     s.beginGroup("PlayList");
-    m_title_format = s.value("title_format", "%p%if(%p&%t, - ,)%t").toString();
     m_group_format = s.value("group_format", "%p%if(%p&%a, - %if(%y,[%y] ,),)%a").toString();
     m_convertUnderscore = s.value ("convert_underscore", true).toBool();
     m_convertTwenty = s.value ("convert_twenty", true).toBool();
@@ -61,7 +61,6 @@ QmmpUiSettings::QmmpUiSettings(QObject *parent) : QObject(parent)
     connect(m_timer, SIGNAL(timeout()), SLOT(sync()));
 
     m_group_formatter.setPattern(m_group_format);
-    m_title_formatter.setPattern(m_title_format);
 }
 
 QmmpUiSettings::~QmmpUiSettings()
@@ -70,11 +69,6 @@ QmmpUiSettings::~QmmpUiSettings()
     sync();
 }
 
-const QString QmmpUiSettings::titleFormat() const
-{
-    return m_title_format;
-}
-
 const QString QmmpUiSettings::groupFormat() const
 {
     return m_group_format;
@@ -130,7 +124,7 @@ void  QmmpUiSettings::setConvertTwenty(bool yes)
     m_convertTwenty = yes;
 }
 
-void QmmpUiSettings::setTitleFormat(const QString &titleFormat)
+/*void QmmpUiSettings::setTitleFormat(const QString &titleFormat)
 {
     if(titleFormat != m_title_format)
     {
@@ -141,7 +135,7 @@ void QmmpUiSettings::setTitleFormat(const QString &titleFormat)
             model->updateMetaData();
         }
     }
-}
+}*/
 
 void QmmpUiSettings::setGroupFormat(const QString &groupFormat)
 {
@@ -185,7 +179,7 @@ void QmmpUiSettings::sync()
 {
     qDebug("%s", Q_FUNC_INFO);
     QSettings s(Qmmp::configFile(), QSettings::IniFormat);
-    s.setValue("PlayList/title_format", m_title_format);
+    //s.setValue("PlayList/title_format", m_title_format);
     s.setValue("PlayList/group_format", m_group_format);
     s.setValue("PlayList/convert_underscore", m_convertUnderscore);
     s.setValue("PlayList/convert_twenty", m_convertTwenty);
@@ -318,9 +312,14 @@ bool QmmpUiSettings::clearPreviousPlayList() const
     return m_clear_prev_playlist;
 }
 
-const MetaDataFormatter *QmmpUiSettings::titleFormatter() const
+ColumnManager *QmmpUiSettings::columnManager()
+{
+    return m_colum_manager;
+}
+
+const MetaDataFormatter *QmmpUiSettings::titleFormatter(int column) const
 {
-    return &m_title_formatter;
+    return m_colum_manager->titleFormatter(column);
 }
 
 const MetaDataFormatter *QmmpUiSettings::groupFormatter() const