From 195640ac7fd158d537093b9ee7414f3faa44120b Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Thu, 9 Feb 2012 16:06:56 +0000
Subject: fixed settings synchronzation, added some option to configuration
 dialog (not implemented yet)

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2586 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/qmmp/qmmpsettings.h          |   5 +-
 src/qmmpui/configdialog.cpp      |   1 +
 src/qmmpui/forms/configdialog.ui | 131 +++++++++++++++++++++++++--------------
 src/qmmpui/playlistmanager.h     |   1 +
 4 files changed, 91 insertions(+), 47 deletions(-)

(limited to 'src')

diff --git a/src/qmmp/qmmpsettings.h b/src/qmmp/qmmpsettings.h
index 3decebc07..f3dd158cb 100644
--- a/src/qmmp/qmmpsettings.h
+++ b/src/qmmp/qmmpsettings.h
@@ -191,7 +191,10 @@ signals:
      */
     void eqSettingsChanged();
 
-private slots:
+public slots:
+    /*!
+     * Writes all unsaved settings to configuration file
+     */
     void sync();
 
 private:
diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp
index 3a17a0f9d..2d6909b60 100644
--- a/src/qmmpui/configdialog.cpp
+++ b/src/qmmpui/configdialog.cpp
@@ -344,6 +344,7 @@ void ConfigDialog::saveSettings()
     gs->setAudioSettings(m_ui->softVolumeCheckBox->isChecked(), m_ui->use16BitCheckBox->isChecked());
     gs->setBufferSize(m_ui->bufferSizeSpinBox->value());
     gs->setDetermineFileTypeByContent(m_ui->byContentCheckBox->isChecked());
+    gs->sync();
     QList <OutputFactory *> *outputs = Output::factories();
     if(m_ui->outputComboBox->currentIndex() >= 0 && outputs->count())
         Output::setCurrentFactory(outputs->at(m_ui->outputComboBox->currentIndex()));
diff --git a/src/qmmpui/forms/configdialog.ui b/src/qmmpui/forms/configdialog.ui
index a862d79d6..5a1712d57 100644
--- a/src/qmmpui/forms/configdialog.ui
+++ b/src/qmmpui/forms/configdialog.ui
@@ -170,6 +170,35 @@
           </layout>
          </widget>
         </item>
+        <item>
+         <widget class="QGroupBox" name="groupBox_2">
+          <property name="title">
+           <string>Directory Scanning Options</string>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_20">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label">
+             <property name="text">
+              <string>Restrict files to:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="dirExcludeLineEdit"/>
+           </item>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label_2">
+             <property name="text">
+              <string>Exclude files:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLineEdit" name="dirIncludeLineEdit"/>
+           </item>
+          </layout>
+         </widget>
+        </item>
         <item>
          <widget class="QGroupBox" name="groupBox_9">
           <property name="title">
@@ -343,8 +372,40 @@
        </layout>
       </widget>
       <widget class="QWidget" name="page_2">
-       <layout class="QGridLayout" name="gridLayout_5">
-        <item row="1" column="0" colspan="2">
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QGroupBox" name="groupBox">
+          <property name="title">
+           <string>User Interface</string>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="QComboBox" name="uiComboBox"/>
+           </item>
+           <item>
+            <widget class="QPushButton" name="uiInformationButton">
+             <property name="text">
+              <string>Information</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item>
          <widget class="QGroupBox" name="groupBox_4">
           <property name="title">
            <string>File Dialog</string>
@@ -376,74 +437,52 @@
           </layout>
          </widget>
         </item>
-        <item row="3" column="0" colspan="2">
-         <spacer name="verticalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="2" column="0" colspan="2">
+        <item>
          <widget class="QGroupBox" name="groupBox_6">
           <property name="title">
            <string>Playback</string>
           </property>
-          <layout class="QVBoxLayout" name="verticalLayout_8">
-           <item>
+          <layout class="QGridLayout" name="gridLayout_21">
+           <item row="0" column="0" colspan="2">
             <widget class="QCheckBox" name="continuePlaybackCheckBox">
              <property name="text">
               <string>Continue playback on startup</string>
              </property>
             </widget>
            </item>
-           <item>
+           <item row="1" column="0" colspan="2">
             <widget class="QCheckBox" name="byContentCheckBox">
              <property name="text">
               <string>Determine file type by content</string>
              </property>
             </widget>
            </item>
-          </layout>
-         </widget>
-        </item>
-        <item row="0" column="0" colspan="2">
-         <widget class="QGroupBox" name="groupBox">
-          <property name="title">
-           <string>User Interface</string>
-          </property>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <item>
-            <widget class="QComboBox" name="uiComboBox"/>
-           </item>
-           <item>
-            <widget class="QPushButton" name="uiInformationButton">
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_3">
              <property name="text">
-              <string>Information</string>
+              <string>Add files from command line to this playlist:</string>
              </property>
             </widget>
            </item>
-           <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
+           <item row="2" column="1">
+            <widget class="QLineEdit" name="lineEdit"/>
            </item>
           </layout>
          </widget>
         </item>
+        <item>
+         <spacer name="verticalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="network">
diff --git a/src/qmmpui/playlistmanager.h b/src/qmmpui/playlistmanager.h
index 85db4b96b..150964428 100644
--- a/src/qmmpui/playlistmanager.h
+++ b/src/qmmpui/playlistmanager.h
@@ -125,6 +125,7 @@ public:
      */
     bool isShuffle() const;
 
+
 signals:
     /*!
      * Emitted when current playlist changes.
-- 
cgit v1.2.3-13-gbd6f