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/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 ++++++++++----------- 7 files changed, 93 insertions(+), 114 deletions(-) (limited to 'src/plugins/General') 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 -- cgit v1.2.3-13-gbd6f