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

5 files changed, 34 insertions, 26 deletions

diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp
index d042628e4..5942c5e22 100644
--- a/src/qmmpui/configdialog.cpp
+++ b/src/qmmpui/configdialog.cpp
@@ -104,7 +104,7 @@ void ConfigDialog::readSettings()
     {
         //playlist options
         QmmpUiSettings *guis = QmmpUiSettings::instance();
-        m_ui->formatLineEdit->setText(guis->titleFormat());
+        //m_ui->formatLineEdit->setText(guis->titleFormat());
         m_ui->groupLineEdit->setText(guis->groupFormat());
         m_ui->metadataCheckBox->setChecked(guis->useMetadata());
         m_ui->underscoresCheckBox->setChecked(guis->convertUnderscore());
@@ -402,7 +402,7 @@ void ConfigDialog::saveSettings()
 {
     if (QmmpUiSettings *guis = QmmpUiSettings::instance())
     {
-        guis->setTitleFormat(m_ui->formatLineEdit->text().trimmed());
+        //guis->setTitleFormat(m_ui->formatLineEdit->text().trimmed());
         guis->setGroupFormat(m_ui->groupLineEdit->text().trimmed());
         guis->setUseMetadata(m_ui->metadataCheckBox->isChecked());
         guis->setConvertUnderscore(m_ui->underscoresCheckBox->isChecked());
diff --git a/src/qmmpui/forms/configdialog.ui b/src/qmmpui/forms/configdialog.ui
index 49dc8730e..d94e1302a 100644
--- a/src/qmmpui/forms/configdialog.ui
+++ b/src/qmmpui/forms/configdialog.ui
@@ -138,6 +138,9 @@
            </item>
            <item row="3" column="0">
             <widget class="QLabel" name="label_4">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
              <property name="text">
               <string>Title format:</string>
              </property>
@@ -165,10 +168,17 @@
             </widget>
            </item>
            <item row="3" column="2">
-            <widget class="QLineEdit" name="formatLineEdit"/>
+            <widget class="QLineEdit" name="formatLineEdit">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+            </widget>
            </item>
            <item row="3" column="3">
             <widget class="QToolButton" name="titleButton">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
              <property name="text">
               <string>...</string>
              </property>
diff --git a/src/qmmpui/playlisttrack.cpp b/src/qmmpui/playlisttrack.cpp
index b9262c72b..13690362f 100644
--- a/src/qmmpui/playlisttrack.cpp
+++ b/src/qmmpui/playlisttrack.cpp
@@ -128,9 +128,9 @@ bool PlayListTrack::isUsed() const
 
 const QString PlayListTrack::formattedTitle()
 {
-    if(m_formattedTitle.isEmpty() || m_titleFormat != m_settings->titleFormat())
+    if(m_formattedTitle.isEmpty() || m_titleFormat != m_settings->columnManager()->pattern(0))
     {
-        m_titleFormat = m_settings->titleFormat();
+        m_titleFormat = m_settings->columnManager()->pattern(0);
         formatTitle();
     }
     return m_formattedTitle;
@@ -166,7 +166,7 @@ const QString PlayListTrack::url() const
 
 void PlayListTrack::formatTitle()
 {
-    m_formattedTitle = m_settings->titleFormatter()->format(this);
+    m_formattedTitle = m_settings->columnManager()->titleFormatter(0)->format(this);
     if (m_formattedTitle.isEmpty())
         m_formattedTitle = value(Qmmp::URL).section('/',-1);
     if (m_formattedTitle.isEmpty())
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
diff --git a/src/qmmpui/qmmpuisettings.h b/src/qmmpui/qmmpuisettings.h
index 0380135ca..46a483697 100644
--- a/src/qmmpui/qmmpuisettings.h
+++ b/src/qmmpui/qmmpuisettings.h
@@ -23,6 +23,7 @@
 
 #include <QObject>
 #include <QStringList>
+#include "columnmanager.h"
 #include "metadataformatter.h"
 
 class QTimer;
@@ -57,10 +58,6 @@ public:
      */
     bool useMetadata() const;
     /*!
-     * Returns playlist short title format.
-     */
-    const QString titleFormat() const;
-    /*!
      * Returns playlist group format.
      */
     const QString groupFormat() const;
@@ -98,7 +95,7 @@ public:
      * Sets short title template.
      * @param titleFormat title template. \sa MetaDataFormatter
      */
-    void setTitleFormat(const QString &titleFormat);
+    //void setTitleFormat(const QString &titleFormat);
     /*!
      * Sets group format.
      * \param groupFormat group format. \sa MetaDataFormatter
@@ -182,7 +179,8 @@ public:
      */
     bool clearPreviousPlayList() const;
 
-    const MetaDataFormatter* titleFormatter() const;
+    ColumnManager *columnManager();
+    const MetaDataFormatter* titleFormatter(int column) const;
     const MetaDataFormatter* groupFormatter() const;
 
     /*!
@@ -256,7 +254,6 @@ private slots:
 private:
     static QmmpUiSettings* m_instance;
     //playlist
-    QString m_title_format;
     QString m_group_format;
     bool m_convertUnderscore, m_convertTwenty;
     bool m_useMetadata;
@@ -278,7 +275,9 @@ private:
     //timer
     QTimer *m_timer;
     //formatters
-    MetaDataFormatter m_group_formatter, m_title_formatter;
+    MetaDataFormatter m_group_formatter;
+    //column settings
+    ColumnManager *m_colum_manager;
 };
 
 #endif // QMMPUISETTINGS_H