using standard dialog buttons

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

3 files changed, 32 insertions, 48 deletions

diff --git a/src/plugins/Visual/analyzer/settingsdialog.cpp b/src/plugins/Visual/analyzer/settingsdialog.cpp
index cfbd84594..479e1f299 100644
--- a/src/plugins/Visual/analyzer/settingsdialog.cpp
+++ b/src/plugins/Visual/analyzer/settingsdialog.cpp
@@ -37,7 +37,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     ui.colorWidget3->setColor(settings.value("Analyzer/color3", "Red").toString());
     ui.bgColorWidget->setColor(settings.value("Analyzer/bg_color", "Black").toString());
     ui.peakColorWidget->setColor(settings.value("Analyzer/peak_color", "Cyan").toString());
-    connect (ui.okButton, SIGNAL(clicked()),SLOT(writeSettings()));
 }
 
 
@@ -45,7 +44,7 @@ SettingsDialog::~SettingsDialog()
 {
 }
 
-void SettingsDialog::writeSettings()
+void SettingsDialog::accept()
 {
     QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
     settings.setValue("Analyzer/analyzer_falloff", ui.analyzerComboBox->currentIndex() + 1);
@@ -57,5 +56,5 @@ void SettingsDialog::writeSettings()
     settings.setValue("Analyzer/color3", ui.colorWidget3->colorName());
     settings.setValue("Analyzer/bg_color", ui.bgColorWidget->colorName());
     settings.setValue("Analyzer/peak_color", ui.peakColorWidget->colorName());
-    accept();
+    QDialog::accept();
 }
diff --git a/src/plugins/Visual/analyzer/settingsdialog.h b/src/plugins/Visual/analyzer/settingsdialog.h
index b7c466477..24316909d 100644
--- a/src/plugins/Visual/analyzer/settingsdialog.h
+++ b/src/plugins/Visual/analyzer/settingsdialog.h
@@ -35,8 +35,8 @@ public:
 
     ~SettingsDialog();
 
-private slots:
-    void writeSettings();
+public slots:
+    virtual void accept();
 
 private:
     Ui::SettingsDialog ui;
diff --git a/src/plugins/Visual/analyzer/settingsdialog.ui b/src/plugins/Visual/analyzer/settingsdialog.ui
index b4f0abd35..e19e5c79c 100644
--- a/src/plugins/Visual/analyzer/settingsdialog.ui
+++ b/src/plugins/Visual/analyzer/settingsdialog.ui
@@ -12,8 +12,8 @@
   <property name="windowTitle" >
    <string>Analyzer Plugin Settings</string>
   </property>
-  <layout class="QGridLayout" >
-   <item row="0" column="0" colspan="3" >
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
@@ -159,7 +159,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" colspan="3" >
+   <item row="1" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
@@ -334,40 +334,9 @@
     </spacer>
    </item>
    <item row="2" column="1" >
-    <widget class="QPushButton" name="okButton" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize" >
-      <size>
-       <width>16777215</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="text" >
-      <string>&amp;OK</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2" >
-    <widget class="QPushButton" name="cancelButton" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximumSize" >
-      <size>
-       <width>16777215</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="text" >
-      <string>&amp;Cancel</string>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -384,18 +353,34 @@
  <resources/>
  <connections>
   <connection>
-   <sender>cancelButton</sender>
-   <signal>clicked()</signal>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>SettingsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>204</x>
+     <y>303</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>53</x>
+     <y>308</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
    <receiver>SettingsDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>282</x>
-     <y>317</y>
+     <x>228</x>
+     <y>307</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>276</x>
-     <y>309</y>
+     <x>78</x>
+     <y>288</y>
     </hint>
    </hints>
   </connection>