diff options
24 files changed, 339 insertions, 467 deletions
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>&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>&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> diff --git a/src/plugins/General/mpris/playerobject.cpp b/src/plugins/General/mpris/playerobject.cpp index 8175df301..4e3cc1a10 100644 --- a/src/plugins/General/mpris/playerobject.cpp +++ b/src/plugins/General/mpris/playerobject.cpp @@ -147,12 +147,13 @@ int PlayerObject::GetCaps() caps |= CAN_SEEK; caps |= CAN_GO_NEXT; caps |= CAN_GO_PREV; + caps |= CAN_PROVIDE_METADATA; return caps; } void PlayerObject::VolumeSet(int volume) { - int balance = (m_core->rightVolume() - m_core->leftVolume()) * 100/VolumeGet(); + int balance = (VolumeGet() > 0) ? (m_core->rightVolume() - m_core->leftVolume()) * 100/VolumeGet() : 0; m_core->setVolume(volume - qMax(balance,0)*volume/100, volume + qMin(balance,0)*volume/100); } diff --git a/src/plugins/General/notifier/settingsdialog.cpp b/src/plugins/General/notifier/settingsdialog.cpp index 3899216ec..297fae316 100644 --- a/src/plugins/General/notifier/settingsdialog.cpp +++ b/src/plugins/General/notifier/settingsdialog.cpp @@ -47,14 +47,13 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.psiCheckBox->setChecked(settings.value("psi_notification", FALSE).toBool()); ui.desktopCheckBox->setChecked(settings.value("desktop_notification", TRUE).toBool()); 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("Notifier"); @@ -69,5 +68,5 @@ void SettingsDialog::writeSettings() settings.setValue("psi_notification", ui.psiCheckBox->isChecked()); settings.setValue("desktop_notification", ui.desktopCheckBox->isChecked()); settings.endGroup(); - accept(); + QDialog::accept(); } diff --git a/src/plugins/General/notifier/settingsdialog.h b/src/plugins/General/notifier/settingsdialog.h index 6d5f39a15..04cbc0516 100644 --- a/src/plugins/General/notifier/settingsdialog.h +++ b/src/plugins/General/notifier/settingsdialog.h @@ -37,8 +37,8 @@ public: ~SettingsDialog(); -private slots: - void writeSettings(); +public slots: + virtual void accept(); private: Ui::SettingsDialog ui; diff --git a/src/plugins/General/notifier/settingsdialog.ui b/src/plugins/General/notifier/settingsdialog.ui index d77592dff..8b2df2d37 100644 --- a/src/plugins/General/notifier/settingsdialog.ui +++ b/src/plugins/General/notifier/settingsdialog.ui @@ -6,14 +6,14 @@ <x>0</x> <y>0</y> <width>278</width> - <height>355</height> + <height>330</height> </rect> </property> <property name="windowTitle" > <string>Notifier Plugin Settings</string> </property> - <layout class="QVBoxLayout" > - <item> + <layout class="QGridLayout" name="gridLayout" > + <item row="0" column="0" colspan="2" > <widget class="QGroupBox" name="groupBox_2" > <property name="title" > <string>Psi Notification</string> @@ -29,7 +29,7 @@ </layout> </widget> </item> - <item> + <item row="1" column="0" colspan="2" > <widget class="QGroupBox" name="groupBox" > <property name="title" > <string>Desktop Notification</string> @@ -201,7 +201,7 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>40</width> <height>20</height> @@ -212,69 +212,59 @@ </layout> </widget> </item> - <item> - <layout class="QHBoxLayout" > - <property name="spacing" > - <number>6</number> + <item row="2" column="0" > + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> </property> - <property name="leftMargin" > - <number>0</number> + <property name="sizeHint" stdset="0" > + <size> + <width>131</width> + <height>31</height> + </size> </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> + </spacer> + </item> + <item row="2" column="1" > + <widget class="QDialogButtonBox" name="buttonBox" > + <property name="standardButtons" > + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <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> + </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>183</x> + <y>303</y> + </hint> + <hint type="destinationlabel" > + <x>62</x> + <y>314</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>249</x> + <y>298</y> </hint> <hint type="destinationlabel" > - <x>179</x> - <y>224</y> + <x>95</x> + <y>299</y> </hint> </hints> </connection> diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp index d2050f88c..1c3118659 100644 --- a/src/plugins/General/statusicon/settingsdialog.cpp +++ b/src/plugins/General/statusicon/settingsdialog.cpp @@ -33,14 +33,13 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.messageDelaySpinBox->setValue(settings.value("message_delay", 2000).toInt()); ui.toolTipCheckBox->setChecked(settings.value("show_tooltip",FALSE).toBool()); 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("Tray"); @@ -48,5 +47,5 @@ void SettingsDialog::writeSettings() settings.setValue ("message_delay", ui.messageDelaySpinBox->value()); settings.setValue ("show_tooltip", ui.toolTipCheckBox->isChecked()); settings.endGroup(); - accept(); + QDialog::accept(); } diff --git a/src/plugins/General/statusicon/settingsdialog.h b/src/plugins/General/statusicon/settingsdialog.h index 0d5b21d52..81494dfb5 100644 --- a/src/plugins/General/statusicon/settingsdialog.h +++ b/src/plugins/General/statusicon/settingsdialog.h @@ -37,8 +37,8 @@ public: ~SettingsDialog(); -private slots: - void writeSettings(); +public slots: + virtual void accept(); private: Ui::SettingsDialog ui; diff --git a/src/plugins/General/statusicon/settingsdialog.ui b/src/plugins/General/statusicon/settingsdialog.ui index 7ef412e3c..7ffbb20db 100644 --- a/src/plugins/General/statusicon/settingsdialog.ui +++ b/src/plugins/General/statusicon/settingsdialog.ui @@ -6,13 +6,13 @@ <x>0</x> <y>0</y> <width>267</width> - <height>156</height> + <height>127</height> </rect> </property> <property name="windowTitle" > <string>Status Icon Plugin Settings</string> </property> - <layout class="QGridLayout" > + <layout class="QGridLayout" name="gridLayout" > <item row="0" column="0" > <widget class="QCheckBox" name="messageCheckBox" > <property name="text" > @@ -37,7 +37,7 @@ </property> </widget> </item> - <item row="2" column="1" > + <item row="2" column="1" colspan="2" > <widget class="QSpinBox" name="messageDelaySpinBox" > <property name="minimum" > <number>100</number> @@ -54,68 +54,58 @@ </widget> </item> <item row="3" column="0" colspan="2" > - <layout class="QHBoxLayout" > - <property name="spacing" > - <number>6</number> + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> </property> - <property name="leftMargin" > - <number>0</number> + <property name="sizeHint" stdset="0" > + <size> + <width>150</width> + <height>18</height> + </size> </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> + </spacer> + </item> + <item row="3" column="2" > + <widget class="QDialogButtonBox" name="buttonBox" > + <property name="standardButtons" > + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <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> + </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>180</x> + <y>102</y> + </hint> + <hint type="destinationlabel" > + <x>112</x> + <y>103</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>242</x> + <y>107</y> </hint> <hint type="destinationlabel" > - <x>179</x> - <y>224</y> + <x>27</x> + <y>106</y> </hint> </hints> </connection> 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> diff --git a/src/plugins/Input/mad/settingsdialog.cpp b/src/plugins/Input/mad/settingsdialog.cpp index ce3ff63cc..8f1746b95 100644 --- a/src/plugins/Input/mad/settingsdialog.cpp +++ b/src/plugins/Input/mad/settingsdialog.cpp @@ -48,7 +48,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.thirdTagComboBox->setCurrentIndex(settings.value("tag_3", Disabled).toInt()); settings.endGroup(); - connect(ui.okButton, SIGNAL(clicked()), SLOT(writeSettings())); + connect(ui.buttonBox, SIGNAL(accepted()), SLOT(writeSettings())); } diff --git a/src/plugins/Input/mad/settingsdialog.ui b/src/plugins/Input/mad/settingsdialog.ui index 3ace8fcec..22edeeb43 100644 --- a/src/plugins/Input/mad/settingsdialog.ui +++ b/src/plugins/Input/mad/settingsdialog.ui @@ -6,14 +6,14 @@ <x>0</x> <y>0</y> <width>242</width> - <height>303</height> + <height>264</height> </rect> </property> <property name="windowTitle" > <string>MPEG Plugin Settings</string> </property> - <layout class="QVBoxLayout" > - <item> + <layout class="QGridLayout" name="gridLayout" > + <item row="0" column="0" colspan="2" > <widget class="QGroupBox" name="groupBox_2" > <property name="title" > <string>Tag Priority</string> @@ -163,7 +163,7 @@ </layout> </widget> </item> - <item> + <item row="1" column="0" colspan="2" > <widget class="QGroupBox" name="groupBox" > <property name="title" > <string>Encodings</string> @@ -174,16 +174,7 @@ <property name="spacing" > <number>6</number> </property> - <property name="leftMargin" > - <number>0</number> - </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > + <property name="margin" > <number>0</number> </property> <item> @@ -206,16 +197,7 @@ <property name="spacing" > <number>6</number> </property> - <property name="leftMargin" > - <number>0</number> - </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > + <property name="margin" > <number>0</number> </property> <item> @@ -236,69 +218,43 @@ </layout> </widget> </item> - <item> - <layout class="QHBoxLayout" > - <property name="spacing" > - <number>6</number> + <item row="2" column="0" > + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> </property> - <property name="leftMargin" > - <number>0</number> + <property name="sizeHint" stdset="0" > + <size> + <width>125</width> + <height>18</height> + </size> </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> + </spacer> + </item> + <item row="2" column="1" > + <widget class="QDialogButtonBox" name="buttonBox" > + <property name="standardButtons" > + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <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> + </widget> </item> </layout> </widget> <resources/> <connections> <connection> - <sender>cancelButton</sender> - <signal>clicked()</signal> + <sender>buttonBox</sender> + <signal>rejected()</signal> <receiver>SettingsDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel" > - <x>336</x> - <y>210</y> + <x>162</x> + <y>245</y> </hint> <hint type="destinationlabel" > - <x>179</x> - <y>224</y> + <x>70</x> + <y>244</y> </hint> </hints> </connection> diff --git a/src/plugins/Input/modplug/settingsdialog.cpp b/src/plugins/Input/modplug/settingsdialog.cpp index e655e9df5..0bb8c192d 100644 --- a/src/plugins/Input/modplug/settingsdialog.cpp +++ b/src/plugins/Input/modplug/settingsdialog.cpp @@ -101,7 +101,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.loopSpinBox->setValue(l); } settings.endGroup(); - connect(ui.applyButton, SIGNAL(clicked()), SLOT(writeSettings())); + connect(ui.buttonBox, SIGNAL(clicked (QAbstractButton *)), SLOT(exec(QAbstractButton *))); } @@ -124,11 +124,11 @@ void SettingsDialog::writeSettings() //bits number settings.setValue("Bits", ui.bit8RadioButton->isChecked() ? 8 : 16 ); //resampling frequency - if(ui.khz48RadioButton->isChecked()) + if (ui.khz48RadioButton->isChecked()) settings.setValue("Frequency", 48000); - else if(ui.khz44RadioButton->isChecked()) + else if (ui.khz44RadioButton->isChecked()) settings.setValue("Frequency", 44100); - else if(ui.khz22RadioButton->isChecked()) + else if (ui.khz22RadioButton->isChecked()) settings.setValue("Frequency", 22050); else settings.setValue("Frequency", 11025); @@ -160,13 +160,13 @@ void SettingsDialog::writeSettings() //looping if (ui.dontLoopRadioButton->isChecked()) settings.setValue("LoopCount", 0); - else if(ui.loopForeverRadioButton->isChecked()) + else if (ui.loopForeverRadioButton->isChecked()) settings.setValue("LoopCount", -1); else settings.setValue("LoopCount", ui.loopSpinBox->value()); settings.endGroup(); //apply settings for the created decoder - if(DecoderModPlug::instance()) + if (DecoderModPlug::instance()) { DecoderModPlug::instance()->mutex()->lock(); DecoderModPlug::instance()->readSettings(); @@ -179,8 +179,16 @@ void SettingsDialog::setPreamp(int preamp) ui.preampLabel->setText(QString("%1").arg((double) preamp/10)); } -void SettingsDialog::accept() +void SettingsDialog::exec(QAbstractButton *button) { - writeSettings(); - QDialog::accept(); + switch ((int) ui.buttonBox->buttonRole(button)) + { + case QDialogButtonBox::AcceptRole: + writeSettings(); + accept(); + break; + case QDialogButtonBox::ApplyRole: + writeSettings(); + break; + } } diff --git a/src/plugins/Input/modplug/settingsdialog.h b/src/plugins/Input/modplug/settingsdialog.h index c25b881e7..5bbf2f445 100644 --- a/src/plugins/Input/modplug/settingsdialog.h +++ b/src/plugins/Input/modplug/settingsdialog.h @@ -36,12 +36,10 @@ public: ~SettingsDialog(); -public slots: - virtual void accept(); - private slots: void writeSettings(); void setPreamp(int); + void exec(QAbstractButton *); private: Ui::SettingsDialog ui; diff --git a/src/plugins/Input/modplug/settingsdialog.ui b/src/plugins/Input/modplug/settingsdialog.ui index 2db79d3c4..63b517f8d 100644 --- a/src/plugins/Input/modplug/settingsdialog.ui +++ b/src/plugins/Input/modplug/settingsdialog.ui @@ -6,14 +6,14 @@ <x>0</x> <y>0</y> <width>465</width> - <height>388</height> + <height>380</height> </rect> </property> <property name="windowTitle" > <string>ModPlug Plugin Settings</string> </property> - <layout class="QGridLayout" > - <item row="0" column="0" colspan="4" > + <layout class="QGridLayout" name="gridLayout" > + <item row="0" column="0" colspan="2" > <widget class="QTabWidget" name="tabWidget" > <property name="currentIndex" > <number>0</number> @@ -198,7 +198,7 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>10</width> <height>20</height> @@ -256,7 +256,7 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>10</width> <height>20</height> @@ -332,7 +332,7 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>10</width> <height>20</height> @@ -390,7 +390,7 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>10</width> <height>20</height> @@ -463,7 +463,7 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>10</width> <height>20</height> @@ -515,7 +515,7 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>10</width> <height>20</height> @@ -582,7 +582,7 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>10</width> <height>20</height> @@ -746,7 +746,7 @@ too high may cause clipping!</string> <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>10</width> <height>20</height> @@ -769,7 +769,7 @@ too high may cause clipping!</string> <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>20</width> <height>40</height> @@ -786,7 +786,7 @@ too high may cause clipping!</string> <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0" > <size> <width>211</width> <height>20</height> @@ -795,23 +795,9 @@ too high may cause clipping!</string> </spacer> </item> <item row="1" column="1" > - <widget class="QPushButton" name="okButton" > - <property name="text" > - <string>OK</string> - </property> - </widget> - </item> - <item row="1" column="2" > - <widget class="QPushButton" name="applyButton" > - <property name="text" > - <string>Apply</string> - </property> - </widget> - </item> - <item row="1" column="3" > - <widget class="QPushButton" name="cancelButton" > - <property name="text" > - <string>Cancel</string> + <widget class="QDialogButtonBox" name="buttonBox" > + <property name="standardButtons" > + <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> </widget> </item> @@ -826,8 +812,8 @@ too high may cause clipping!</string> <slot>setNum(int)</slot> <hints> <hint type="sourcelabel" > - <x>198</x> - <y>101</y> + <x>219</x> + <y>118</y> </hint> <hint type="destinationlabel" > <x>199</x> @@ -842,12 +828,12 @@ too high may cause clipping!</string> <slot>setNum(int)</slot> <hints> <hint type="sourcelabel" > - <x>170</x> - <y>153</y> + <x>191</x> + <y>172</y> </hint> <hint type="destinationlabel" > - <x>179</x> - <y>126</y> + <x>219</x> + <y>150</y> </hint> </hints> </connection> @@ -874,8 +860,8 @@ too high may cause clipping!</string> <slot>setNum(int)</slot> <hints> <hint type="sourcelabel" > - <x>172</x> - <y>298</y> + <x>193</x> + <y>316</y> </hint> <hint type="destinationlabel" > <x>187</x> @@ -890,8 +876,8 @@ too high may cause clipping!</string> <slot>setNum(int)</slot> <hints> <hint type="sourcelabel" > - <x>421</x> - <y>102</y> + <x>408</x> + <y>118</y> </hint> <hint type="destinationlabel" > <x>420</x> @@ -916,34 +902,18 @@ too high may cause clipping!</string> </hints> </connection> <connection> - <sender>cancelButton</sender> - <signal>clicked()</signal> + <sender>buttonBox</sender> + <signal>rejected()</signal> <receiver>SettingsDialog</receiver> <slot>reject()</slot> <hints> <hint type="sourcelabel" > - <x>430</x> - <y>356</y> + <x>294</x> + <y>362</y> </hint> <hint type="destinationlabel" > - <x>130</x> - <y>365</y> - </hint> - </hints> - </connection> - <connection> - <sender>okButton</sender> - <signal>clicked()</signal> - <receiver>SettingsDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel" > - <x>237</x> - <y>364</y> - </hint> - <hint type="destinationlabel" > - <x>33</x> - <y>352</y> + <x>170</x> + <y>371</y> </hint> </hints> </connection> 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> 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>&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>&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> |