3 files changed, 46 insertions, 45 deletions
diff --git a/src/plugins/Input/cue/settingsdialog.cpp b/src/plugins/Input/cue/settingsdialog.cpp
index d0bb845ca..ad6731179 100644
--- a/src/plugins/Input/cue/settingsdialog.cpp
+++ b/src/plugins/Input/cue/settingsdialog.cpp
@@ -38,20 +38,19 @@ SettingsDialog::SettingsDialog(QWidget *parent)
     int pos = ui.cueEncComboBox->findText(settings.value("encoding","ISO-8859-1").toString());
     ui.cueEncComboBox->setCurrentIndex(pos);
     settings.endGroup();
-    connect(ui.okButton, SIGNAL(clicked()), SLOT(writeSettings()));
 }
 
 
 SettingsDialog::~SettingsDialog()
 {}
 
-void SettingsDialog::writeSettings()
+void SettingsDialog::accept()
 {
     QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
     settings.beginGroup("CUE");
     settings.setValue("encoding", ui.cueEncComboBox->currentText());
     settings.endGroup();
-    accept();
+    QDialog::accept();
 }
 
 void SettingsDialog::findCodecs()
diff --git a/src/plugins/Input/cue/settingsdialog.h b/src/plugins/Input/cue/settingsdialog.h
index 3c3d7a563..0f5535905 100644
--- a/src/plugins/Input/cue/settingsdialog.h
+++ b/src/plugins/Input/cue/settingsdialog.h
@@ -37,8 +37,8 @@ public:
     ~SettingsDialog();
 
 
-private slots:
-    void writeSettings();
+public slots:
+    virtual void accept();
 
 private:
     void findCodecs();
diff --git a/src/plugins/Input/cue/settingsdialog.ui b/src/plugins/Input/cue/settingsdialog.ui
index 8f4eb1ab7..978971033 100644
--- a/src/plugins/Input/cue/settingsdialog.ui
+++ b/src/plugins/Input/cue/settingsdialog.ui
@@ -6,16 +6,13 @@
     <x>0</x>
     <y>0</y>
     <width>261</width>
-    <height>72</height>
+    <height>78</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>CUE Plugin Settings</string>
   </property>
   <layout class="QGridLayout" name="gridLayout" >
-   <property name="margin" >
-    <number>5</number>
-   </property>
    <item row="0" column="0" >
     <widget class="QLabel" name="label_17_2_2" >
      <property name="focusPolicy" >
@@ -32,57 +29,62 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
+   <item row="0" column="1" colspan="2" >
     <widget class="QComboBox" name="cueEncComboBox" />
    </item>
    <item row="1" column="0" colspan="2" >
-    <layout class="QHBoxLayout" name="horizontalLayout" >
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>131</width>
-         <height>31</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okButton" >
-       <property name="text" >
-        <string>OK</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cancelButton" >
-       <property name="text" >
-        <string>Cancel</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>144</width>
+       <height>30</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="2" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
  <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>172</x>
+     <y>53</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>95</x>
+     <y>53</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
    <receiver>SettingsDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>336</x>
-     <y>210</y>
+     <x>238</x>
+     <y>51</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>179</x>
-     <y>224</y>
+     <x>130</x>
+     <y>63</y>
     </hint>
    </hints>
   </connection>