From fcc385fc5c74fb0af9483fefa5be64b95d299189 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Wed, 17 Dec 2008 13:09:55 +0000
Subject: using standard dialog buttons

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@690 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Effect/srconverter/settingsdialog.cpp |  5 +-
 src/plugins/Effect/srconverter/settingsdialog.h   |  4 +-
 src/plugins/Effect/srconverter/settingsdialog.ui  | 69 +++++++++++++----------
 3 files changed, 43 insertions(+), 35 deletions(-)

(limited to 'src/plugins/Effect')

diff --git a/src/plugins/Effect/srconverter/settingsdialog.cpp b/src/plugins/Effect/srconverter/settingsdialog.cpp
index d4e017bba..349feab03 100644
--- a/src/plugins/Effect/srconverter/settingsdialog.cpp
+++ b/src/plugins/Effect/srconverter/settingsdialog.cpp
@@ -31,7 +31,6 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
     ui.srSpinBox->setValue(settings.value("SRC/sample_rate",48000).toInt());
     ui.engineComboBox->setCurrentIndex(settings.value("SRC/engine", 0).toInt());
-    connect (ui.okButton, SIGNAL(clicked()),SLOT(writeSettings()));
 }
 
 
@@ -39,10 +38,10 @@ SettingsDialog::~SettingsDialog()
 {
 }
 
-void SettingsDialog::writeSettings()
+void SettingsDialog::accept()
 {
     QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
     settings.setValue("SRC/sample_rate",ui.srSpinBox->value());
     settings.setValue("SRC/engine", ui.engineComboBox->currentIndex());
-    accept();
+    QDialog::accept();
 }
diff --git a/src/plugins/Effect/srconverter/settingsdialog.h b/src/plugins/Effect/srconverter/settingsdialog.h
index b7c466477..24316909d 100644
--- a/src/plugins/Effect/srconverter/settingsdialog.h
+++ b/src/plugins/Effect/srconverter/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/Effect/srconverter/settingsdialog.ui b/src/plugins/Effect/srconverter/settingsdialog.ui
index e837c9cf0..197cd504d 100644
--- a/src/plugins/Effect/srconverter/settingsdialog.ui
+++ b/src/plugins/Effect/srconverter/settingsdialog.ui
@@ -6,13 +6,13 @@
     <x>0</x>
     <y>0</y>
     <width>357</width>
-    <height>107</height>
+    <height>99</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Sample Rate Converter Plugin Settings</string>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" >
     <widget class="QLabel" name="label" >
      <property name="text" >
@@ -69,32 +69,25 @@
      </item>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="1" >
-    <layout class="QHBoxLayout" >
+   <item row="2" column="0" colspan="2" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
      <item>
-      <widget class="QPushButton" name="okButton" >
-       <property name="text" >
-        <string>&amp;OK</string>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
        </property>
-      </widget>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>228</width>
+         <height>24</height>
+        </size>
+       </property>
+      </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="cancelButton" >
-       <property name="text" >
-        <string>&amp;Cancel</string>
+      <widget class="QDialogButtonBox" name="buttonBox" >
+       <property name="standardButtons" >
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
@@ -105,18 +98,34 @@
  <resources/>
  <connections>
   <connection>
-   <sender>cancelButton</sender>
-   <signal>clicked()</signal>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
    <receiver>SettingsDialog</receiver>
-   <slot>reject()</slot>
+   <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>302</x>
+     <x>270</x>
+     <y>76</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>91</x>
      <y>88</y>
     </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>SettingsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>326</x>
+     <y>78</y>
+    </hint>
     <hint type="destinationlabel" >
-     <x>42</x>
-     <y>69</y>
+     <x>139</x>
+     <y>60</y>
     </hint>
    </hints>
   </connection>
-- 
cgit v1.2.3-13-gbd6f