qsui: feature to reset visualization colors

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

3 files changed, 55 insertions, 21 deletions

diff --git a/src/plugins/Ui/qsui/forms/qsuisettings.ui b/src/plugins/Ui/qsui/forms/qsuisettings.ui
index 8cbac743c..f69395c7a 100644
--- a/src/plugins/Ui/qsui/forms/qsuisettings.ui
+++ b/src/plugins/Ui/qsui/forms/qsuisettings.ui
@@ -188,18 +188,18 @@
        <item>
         <widget class="QGroupBox" name="groupBox_4">
          <property name="title">
-          <string>Analyzer Colors</string>
+          <string>Visualization Colors</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_4">
           <item row="0" column="0">
            <widget class="QLabel" name="label">
             <property name="text">
-             <string>Analyzer #1:</string>
+             <string>Color #1:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="ColorWidget" name="aColor1">
+           <widget class="ColorWidget" name="vColor1">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -261,12 +261,12 @@
           <item row="1" column="0">
            <widget class="QLabel" name="label_4">
             <property name="text">
-             <string>Analyzer #2:</string>
+             <string>Color #2:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="ColorWidget" name="aColor2">
+           <widget class="ColorWidget" name="vColor2">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -325,12 +325,12 @@
           <item row="2" column="0">
            <widget class="QLabel" name="label_6">
             <property name="text">
-             <string>Analyzer #3:</string>
+             <string>Color #3:</string>
             </property>
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="ColorWidget" name="aColor3">
+           <widget class="ColorWidget" name="vColor3">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -354,7 +354,7 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="3" colspan="2">
+          <item row="2" column="3" colspan="3">
            <spacer name="horizontalSpacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
@@ -370,32 +370,56 @@
             </property>
            </spacer>
           </item>
-          <item row="0" column="5" rowspan="3">
-           <spacer name="horizontalSpacer_3">
+          <item row="0" column="2" rowspan="3">
+           <spacer name="horizontalSpacer_4">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>10</width>
+              <width>40</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
-          <item row="0" column="2" rowspan="3">
-           <spacer name="horizontalSpacer_4">
+          <item row="0" column="5" rowspan="2">
+           <spacer name="horizontalSpacer_3">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>40</width>
+              <width>10</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
+          <item row="3" column="0" colspan="6">
+           <layout class="QHBoxLayout" name="horizontalLayout_6">
+            <item>
+             <spacer name="horizontalSpacer_12">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QPushButton" name="resetColorsButton">
+              <property name="text">
+               <string>Reset colors</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/src/plugins/Ui/qsui/qsuisettings.cpp b/src/plugins/Ui/qsui/qsuisettings.cpp
index 64c6267c7..c84ce26f1 100644
--- a/src/plugins/Ui/qsui/qsuisettings.cpp
+++ b/src/plugins/Ui/qsui/qsuisettings.cpp
@@ -151,6 +151,15 @@ void QSUiSettings::on_resetFontsButton_clicked()
     loadFonts();
 }
 
+void QSUiSettings::on_resetColorsButton_clicked()
+{
+    m_ui.vColor1->setColor("#BECBFF");
+    m_ui.vColor2->setColor("#BECBFF");
+    m_ui.vColor3->setColor( "#BECBFF");
+    m_ui.peaksColor->setColor("#DDDDDD");
+    m_ui.bgColor->setColor("Black");
+}
+
 void QSUiSettings::readSettings()
 {
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
@@ -171,10 +180,10 @@ void QSUiSettings::readSettings()
     m_ui.hiddenCheckBox->setChecked(settings.value("start_hidden", false).toBool());
     m_ui.hideOnCloseCheckBox->setChecked(settings.value("hide_on_close", false).toBool());
     m_ui.windowTitleLineEdit->setText(settings.value("window_title_format","%if(%p,%p - %t,%t)").toString());
-    //analyzer colors
-    m_ui.aColor1->setColor(settings.value("vis_color1", "#BECBFF").toString());
-    m_ui.aColor2->setColor(settings.value("vis_color2", "#BECBFF").toString());
-    m_ui.aColor3->setColor(settings.value("vis_color3", "#BECBFF").toString());
+    //visualization colors
+    m_ui.vColor1->setColor(settings.value("vis_color1", "#BECBFF").toString());
+    m_ui.vColor2->setColor(settings.value("vis_color2", "#BECBFF").toString());
+    m_ui.vColor3->setColor(settings.value("vis_color3", "#BECBFF").toString());
     m_ui.peaksColor->setColor(settings.value("vis_peak_color", "#DDDDDD").toString());
     m_ui.bgColor->setColor(settings.value("vis_bg_color", "Black").toString());
     //playlist colors
@@ -221,9 +230,9 @@ void QSUiSettings::writeSettings()
     settings.setValue("start_hidden", m_ui.hiddenCheckBox->isChecked());
     settings.setValue("hide_on_close", m_ui.hideOnCloseCheckBox->isChecked());
     settings.setValue("window_title_format", m_ui.windowTitleLineEdit->text());
-    settings.setValue("vis_color1", m_ui.aColor1->colorName());
-    settings.setValue("vis_color2", m_ui.aColor2->colorName());
-    settings.setValue("vis_color3", m_ui.aColor3->colorName());
+    settings.setValue("vis_color1", m_ui.vColor1->colorName());
+    settings.setValue("vis_color2", m_ui.vColor2->colorName());
+    settings.setValue("vis_color3", m_ui.vColor3->colorName());
     settings.setValue("vis_peak_color", m_ui.peaksColor->colorName());
     settings.setValue("vis_bg_color", m_ui.bgColor->colorName());
     settings.setValue("pl_system_colors", m_ui.plSystemColorsCheckBox->isChecked());
diff --git a/src/plugins/Ui/qsui/qsuisettings.h b/src/plugins/Ui/qsui/qsuisettings.h
index 91a7bf732..d5874896d 100644
--- a/src/plugins/Ui/qsui/qsuisettings.h
+++ b/src/plugins/Ui/qsui/qsuisettings.h
@@ -44,6 +44,7 @@ private slots:
     void on_popupTemplateButton_clicked();
     void on_customizeToolBarButton_clicked();
     void on_resetFontsButton_clicked();
+    void on_resetColorsButton_clicked();
     void addWindowTitleString(const QString &str);
 
 private: