From fcc385fc5c74fb0af9483fefa5be64b95d299189 Mon Sep 17 00:00:00 2001 From: trialuser02 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 +++++++------ src/plugins/General/mpris/playerobject.cpp | 3 +- src/plugins/General/notifier/settingsdialog.cpp | 5 +- src/plugins/General/notifier/settingsdialog.h | 4 +- src/plugins/General/notifier/settingsdialog.ui | 96 ++++++++---------- src/plugins/General/statusicon/settingsdialog.cpp | 5 +- src/plugins/General/statusicon/settingsdialog.h | 4 +- src/plugins/General/statusicon/settingsdialog.ui | 90 ++++++++--------- src/plugins/Input/cue/settingsdialog.cpp | 5 +- src/plugins/Input/cue/settingsdialog.h | 4 +- src/plugins/Input/cue/settingsdialog.ui | 82 +++++++-------- src/plugins/Input/mad/settingsdialog.cpp | 2 +- src/plugins/Input/mad/settingsdialog.ui | 100 ++++++------------- src/plugins/Input/modplug/settingsdialog.cpp | 26 +++-- src/plugins/Input/modplug/settingsdialog.h | 4 +- src/plugins/Input/modplug/settingsdialog.ui | 94 ++++++------------ src/plugins/Output/alsa/settingsdialog.cpp | 5 +- src/plugins/Output/alsa/settingsdialog.h | 4 +- src/plugins/Output/alsa/settingsdialog.ui | 115 ++++++++-------------- src/plugins/Visual/analyzer/settingsdialog.cpp | 5 +- src/plugins/Visual/analyzer/settingsdialog.h | 4 +- src/plugins/Visual/analyzer/settingsdialog.ui | 71 ++++++------- 24 files changed, 339 insertions(+), 467 deletions(-) (limited to 'src') 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 @@ 0 0 357 - 107 + 99 Sample Rate Converter Plugin Settings - + @@ -69,32 +69,25 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + - - - &OK + + + Qt::Horizontal - + + + 228 + 24 + + + - - - &Cancel + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -105,18 +98,34 @@ - cancelButton - clicked() + buttonBox + accepted() SettingsDialog - reject() + accept() - 302 + 270 + 76 + + + 91 88 + + + + buttonBox + rejected() + SettingsDialog + reject() + + + 326 + 78 + - 42 - 69 + 139 + 60 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 @@ 0 0 278 - 355 + 330 Notifier Plugin Settings - - + + Psi Notification @@ -29,7 +29,7 @@ - + Desktop Notification @@ -201,7 +201,7 @@ Qt::Horizontal - + 40 20 @@ -212,69 +212,59 @@ - - - - 6 + + + + Qt::Horizontal - - 0 + + + 131 + 31 + - - 0 - - - 0 - - - 0 + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - Qt::Horizontal - - - - 131 - 31 - - - - - - - - OK - - - - - - - Cancel - - - - + - cancelButton - clicked() + buttonBox + accepted() + SettingsDialog + accept() + + + 183 + 303 + + + 62 + 314 + + + + + buttonBox + rejected() SettingsDialog reject() - 336 - 210 + 249 + 298 - 179 - 224 + 95 + 299 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 @@ 0 0 267 - 156 + 127 Status Icon Plugin Settings - + @@ -37,7 +37,7 @@ - + 100 @@ -54,68 +54,58 @@ - - - 6 + + + Qt::Horizontal - - 0 + + + 150 + 18 + - - 0 - - - 0 - - - 0 + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - Qt::Horizontal - - - - 131 - 31 - - - - - - - - OK - - - - - - - Cancel - - - - + - cancelButton - clicked() + buttonBox + accepted() + SettingsDialog + accept() + + + 180 + 102 + + + 112 + 103 + + + + + buttonBox + rejected() SettingsDialog reject() - 336 - 210 + 242 + 107 - 179 - 224 + 27 + 106 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 @@ 0 0 261 - 72 + 78 CUE Plugin Settings - - 5 - @@ -32,57 +29,62 @@ - + - - - - - Qt::Horizontal - - - - 131 - 31 - - - - - - - - OK - - - - - - - Cancel - - - - + + + Qt::Horizontal + + + + 144 + 30 + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + - cancelButton - clicked() + buttonBox + accepted() + SettingsDialog + accept() + + + 172 + 53 + + + 95 + 53 + + + + + buttonBox + rejected() SettingsDialog reject() - 336 - 210 + 238 + 51 - 179 - 224 + 130 + 63 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 @@ 0 0 242 - 303 + 264 MPEG Plugin Settings - - + + Tag Priority @@ -163,7 +163,7 @@ - + Encodings @@ -174,16 +174,7 @@ 6 - - 0 - - - 0 - - - 0 - - + 0 @@ -206,16 +197,7 @@ 6 - - 0 - - - 0 - - - 0 - - + 0 @@ -236,69 +218,43 @@ - - - - 6 + + + + Qt::Horizontal - - 0 + + + 125 + 18 + - - 0 - - - 0 - - - 0 + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - Qt::Horizontal - - - - 131 - 31 - - - - - - - - OK - - - - - - - Cancel - - - - + - cancelButton - clicked() + buttonBox + rejected() SettingsDialog reject() - 336 - 210 + 162 + 245 - 179 - 224 + 70 + 244 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 @@ 0 0 465 - 388 + 380 ModPlug Plugin Settings - - + + 0 @@ -198,7 +198,7 @@ Qt::Horizontal - + 10 20 @@ -256,7 +256,7 @@ Qt::Horizontal - + 10 20 @@ -332,7 +332,7 @@ Qt::Horizontal - + 10 20 @@ -390,7 +390,7 @@ Qt::Horizontal - + 10 20 @@ -463,7 +463,7 @@ Qt::Horizontal - + 10 20 @@ -515,7 +515,7 @@ Qt::Horizontal - + 10 20 @@ -582,7 +582,7 @@ Qt::Horizontal - + 10 20 @@ -746,7 +746,7 @@ too high may cause clipping! Qt::Horizontal - + 10 20 @@ -769,7 +769,7 @@ too high may cause clipping! Qt::Vertical - + 20 40 @@ -786,7 +786,7 @@ too high may cause clipping! Qt::Horizontal - + 211 20 @@ -795,23 +795,9 @@ too high may cause clipping! - - - OK - - - - - - - Apply - - - - - - - Cancel + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -826,8 +812,8 @@ too high may cause clipping! setNum(int) - 198 - 101 + 219 + 118 199 @@ -842,12 +828,12 @@ too high may cause clipping! setNum(int) - 170 - 153 + 191 + 172 - 179 - 126 + 219 + 150 @@ -874,8 +860,8 @@ too high may cause clipping! setNum(int) - 172 - 298 + 193 + 316 187 @@ -890,8 +876,8 @@ too high may cause clipping! setNum(int) - 421 - 102 + 408 + 118 420 @@ -916,34 +902,18 @@ too high may cause clipping! - cancelButton - clicked() + buttonBox + rejected() SettingsDialog reject() - 430 - 356 + 294 + 362 - 130 - 365 - - - - - okButton - clicked() - SettingsDialog - accept() - - - 237 - 364 - - - 33 - 352 + 170 + 371 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 @@ ALSA Plugin Settings - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - 6 - - + + 0 @@ -44,16 +26,7 @@ 6 - - 9 - - - 9 - - - 9 - - + 9 @@ -79,22 +52,10 @@ Mixer - - 9 - - + 9 - - 9 - - - 9 - - - 6 - - + 6 @@ -136,16 +97,7 @@ 6 - - 9 - - - 9 - - - 9 - - + 9 @@ -182,7 +134,7 @@ Qt::Horizontal - + 188 20 @@ -218,7 +170,7 @@ Qt::Horizontal - + 188 20 @@ -238,7 +190,7 @@ Qt::Vertical - + 60 81 @@ -258,7 +210,7 @@ Qt::Horizontal - + 191 20 @@ -266,17 +218,16 @@ - - - - Cancel - - - - - - OK + + + + 0 + 0 + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -285,18 +236,34 @@ - cancelButton - clicked() + buttonBox + accepted() + SettingsDialog + accept() + + + 270 + 284 + + + 130 + 281 + + + + + buttonBox + rejected() SettingsDialog reject() - 338 - 283 + 377 + 286 - 164 - 294 + 152 + 301 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 @@ Analyzer Plugin Settings - - + + @@ -159,7 +159,7 @@ - + @@ -334,40 +334,9 @@ - - - - 0 - 0 - - - - - 16777215 - 30 - - - - &OK - - - - - - - - 0 - 0 - - - - - 16777215 - 30 - - - - &Cancel + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -384,18 +353,34 @@ - cancelButton - clicked() + buttonBox + accepted() + SettingsDialog + accept() + + + 204 + 303 + + + 53 + 308 + + + + + buttonBox + rejected() SettingsDialog reject() - 282 - 317 + 228 + 307 - 276 - 309 + 78 + 288 -- cgit v1.2.3-13-gbd6f