oss: using standard button box

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

3 files changed, 51 insertions, 55 deletions

diff --git a/src/plugins/Output/oss/settingsdialog.cpp b/src/plugins/Output/oss/settingsdialog.cpp
index 441fe5c90..5e9787103 100644
--- a/src/plugins/Output/oss/settingsdialog.cpp
+++ b/src/plugins/Output/oss/settingsdialog.cpp
@@ -25,15 +25,14 @@
 SettingsDialog::SettingsDialog ( QWidget *parent )
         : QDialog ( parent )
 {
-    ui.setupUi ( this );
+    m_ui.setupUi ( this );
     setAttribute ( Qt::WA_DeleteOnClose );
-    connect(ui.okButton, SIGNAL(clicked()), SLOT(writeSettings()));
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("OSS");
-    ui.lineEdit->insert(settings.value("device","/dev/dsp").toString());
-    ui.lineEdit_2->insert(settings.value("mixer_device","/dev/mixer").toString());
-    ui.bufferSpinBox->setValue(settings.value("buffer_time",500).toInt());
-    ui.periodSpinBox->setValue(settings.value("period_time",100).toInt());
+    m_ui.lineEdit->insert(settings.value("device","/dev/dsp").toString());
+    m_ui.lineEdit_2->insert(settings.value("mixer_device","/dev/mixer").toString());
+    m_ui.bufferSpinBox->setValue(settings.value("buffer_time",500).toInt());
+    m_ui.periodSpinBox->setValue(settings.value("period_time",100).toInt());
 
     settings.endGroup();
 }
@@ -44,17 +43,17 @@ SettingsDialog::~SettingsDialog()
 
 
 
-void SettingsDialog::writeSettings()
+void SettingsDialog::accept()
 {
     qDebug("SettingsDialog (OSS):: writeSettings()");
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("OSS");
-    settings.setValue("device", ui.lineEdit->text());
-    settings.setValue("buffer_time",ui.bufferSpinBox->value());
-    settings.setValue("period_time",ui.periodSpinBox->value());
-    settings.setValue("mixer_device", ui.lineEdit_2->text());
+    settings.setValue("device", m_ui.lineEdit->text());
+    settings.setValue("buffer_time",m_ui.bufferSpinBox->value());
+    settings.setValue("period_time",m_ui.periodSpinBox->value());
+    settings.setValue("mixer_device", m_ui.lineEdit_2->text());
     settings.endGroup();
-    accept();
+    QDialog::accept();
 }
 
 
diff --git a/src/plugins/Output/oss/settingsdialog.h b/src/plugins/Output/oss/settingsdialog.h
index bd03466a4..b68767f46 100644
--- a/src/plugins/Output/oss/settingsdialog.h
+++ b/src/plugins/Output/oss/settingsdialog.h
@@ -21,12 +21,10 @@
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
-
-
 #include "ui_settingsdialog.h"
 
 /**
-	@author Yuriy Zhuravlev <stalkerg@gmail.com>
+    @author Yuriy Zhuravlev <stalkerg@gmail.com>
 */
 class SettingsDialog : public QDialog
 {
@@ -36,11 +34,11 @@ public:
 
     ~SettingsDialog();
 
-private slots:
-    void writeSettings();
+public slots:
+    void accept();
 
 private:
-    Ui::SettingsDialog ui;
+    Ui::SettingsDialog m_ui;
 
 };
 
diff --git a/src/plugins/Output/oss/settingsdialog.ui b/src/plugins/Output/oss/settingsdialog.ui
index 73e4db393..ec6bafcbd 100644
--- a/src/plugins/Output/oss/settingsdialog.ui
+++ b/src/plugins/Output/oss/settingsdialog.ui
@@ -6,21 +6,24 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>422</width>
-    <height>223</height>
+    <width>430</width>
+    <height>230</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>OSS Plugin Settings</string>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>9</number>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
    </property>
-   <property name="spacing">
+   <property name="bottomMargin">
     <number>6</number>
    </property>
-   <item row="0" column="0" colspan="3">
+   <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -205,30 +208,10 @@
      </widget>
     </widget>
    </item>
-   <item row="1" column="0">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>191</width>
-       <height>20</height>
-      </size>
-     </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>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -237,18 +220,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>293</x>
+     <y>213</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>17</x>
+     <y>227</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>325</x>
+     <y>205</y>
     </hint>
     <hint type="destinationlabel">
-     <x>164</x>
-     <y>294</y>
+     <x>432</x>
+     <y>193</y>
     </hint>
    </hints>
   </connection>