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/Output/alsa/settingsdialog.cpp |   5 +-
 src/plugins/Output/alsa/settingsdialog.h   |   4 +-
 src/plugins/Output/alsa/settingsdialog.ui  | 115 ++++++++++-------------------
 3 files changed, 46 insertions(+), 78 deletions(-)

(limited to 'src/plugins/Output')

diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp
index cbb129795..2062c6584 100644
--- a/src/plugins/Output/alsa/settingsdialog.cpp
+++ b/src/plugins/Output/alsa/settingsdialog.cpp
@@ -35,7 +35,6 @@ SettingsDialog::SettingsDialog ( QWidget *parent )
     ui.deviceComboBox->setEditable ( TRUE );
     getCards();
     connect (ui.deviceComboBox, SIGNAL(activated(int)),SLOT(setText(int)));
-    connect(ui.okButton, SIGNAL(clicked()), SLOT(writeSettings()));
     connect(ui.mixerCardComboBox, SIGNAL(activated(int)), SLOT(showMixerDevices(int)));
     QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
     settings.beginGroup("ALSA");
@@ -179,7 +178,7 @@ void SettingsDialog::setText(int n)
     ui.deviceComboBox->setEditText(m_devices.at(n));
 }
 
-void SettingsDialog::writeSettings()
+void SettingsDialog::accept()
 {
     qDebug("SettingsDialog (ALSA):: writeSettings()");
     QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
@@ -195,7 +194,7 @@ void SettingsDialog::writeSettings()
     settings.setValue("mixer_device", ui.mixerDeviceComboBox->currentText ());
     settings.setValue("use_mmap", ui.mmapCheckBox->isChecked());
     settings.endGroup();
-    accept();
+    QDialog::accept();
 }
 
 int SettingsDialog::getMixer(snd_mixer_t **mixer, QString card)
diff --git a/src/plugins/Output/alsa/settingsdialog.h b/src/plugins/Output/alsa/settingsdialog.h
index b6410747e..8b2867ff3 100644
--- a/src/plugins/Output/alsa/settingsdialog.h
+++ b/src/plugins/Output/alsa/settingsdialog.h
@@ -39,9 +39,11 @@ public:
 
     ~SettingsDialog();
 
+public slots:
+    virtual void accept();
+
 private slots:
     void setText(int);
-    void writeSettings();
     void showMixerDevices(int);
 
 private:
diff --git a/src/plugins/Output/alsa/settingsdialog.ui b/src/plugins/Output/alsa/settingsdialog.ui
index 6eda3c05a..461c671fd 100644
--- a/src/plugins/Output/alsa/settingsdialog.ui
+++ b/src/plugins/Output/alsa/settingsdialog.ui
@@ -12,26 +12,8 @@
   <property name="windowTitle" >
    <string>ALSA Plugin Settings</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>9</number>
-   </property>
-   <property name="topMargin" >
-    <number>9</number>
-   </property>
-   <property name="rightMargin" >
-    <number>9</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>9</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" colspan="3" >
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" colspan="2" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="currentIndex" >
       <number>0</number>
@@ -44,16 +26,7 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
+       <property name="margin" >
         <number>9</number>
        </property>
        <item>
@@ -79,22 +52,10 @@
           <string>Mixer</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
-           <number>9</number>
-          </property>
-          <property name="topMargin" >
+          <property name="margin" >
            <number>9</number>
           </property>
-          <property name="rightMargin" >
-           <number>9</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>9</number>
-          </property>
-          <property name="horizontalSpacing" >
-           <number>6</number>
-          </property>
-          <property name="verticalSpacing" >
+          <property name="spacing" >
            <number>6</number>
           </property>
           <item row="0" column="1" >
@@ -136,16 +97,7 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="leftMargin" >
-        <number>9</number>
-       </property>
-       <property name="topMargin" >
-        <number>9</number>
-       </property>
-       <property name="rightMargin" >
-        <number>9</number>
-       </property>
-       <property name="bottomMargin" >
+       <property name="margin" >
         <number>9</number>
        </property>
        <item>
@@ -182,7 +134,7 @@
             <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>188</width>
               <height>20</height>
@@ -218,7 +170,7 @@
             <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>188</width>
               <height>20</height>
@@ -238,7 +190,7 @@
             <property name="orientation" >
              <enum>Qt::Vertical</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>60</width>
               <height>81</height>
@@ -258,7 +210,7 @@
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>191</width>
        <height>20</height>
@@ -266,17 +218,16 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="2" >
-    <widget class="QPushButton" name="cancelButton" >
-     <property name="text" >
-      <string>Cancel</string>
-     </property>
-    </widget>
-   </item>
    <item row="1" column="1" >
-    <widget class="QPushButton" name="okButton" >
-     <property name="text" >
-      <string>OK</string>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -285,18 +236,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>270</x>
+     <y>284</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>130</x>
+     <y>281</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
    <receiver>SettingsDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>338</x>
-     <y>283</y>
+     <x>377</x>
+     <y>286</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>164</x>
-     <y>294</y>
+     <x>152</x>
+     <y>301</y>
     </hint>
    </hints>
   </connection>
-- 
cgit v1.2.3-13-gbd6f