diff options
Diffstat (limited to 'src/plugins')
8 files changed, 12 insertions, 13 deletions
diff --git a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp index 922962c67..567614673 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp +++ b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp @@ -37,8 +37,10 @@ General *DBUSControlFactory::create(QObject *parent) return new DBUSControl(parent); } -void DBUSControlFactory::showSettings(QWidget *) -{} +QDialog *DBUSControlFactory::createConfigDialog(QWidget *parent) +{ + return 0; +} void DBUSControlFactory::showAbout(QWidget *parent) { diff --git a/src/plugins/General/dbuscontrol/dbuscontrolfactory.h b/src/plugins/General/dbuscontrol/dbuscontrolfactory.h index 98121edec..af06b30bc 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrolfactory.h +++ b/src/plugins/General/dbuscontrol/dbuscontrolfactory.h @@ -36,7 +36,7 @@ Q_INTERFACES(GeneralFactory); public: const GeneralProperties properties() const; General *create(QObject *parent); - void showSettings(QWidget *parent); + QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); QTranslator *createTranslator(QObject *parent); diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp index 77bbb0f2b..7f1fe7757 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.cpp +++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp @@ -38,10 +38,9 @@ General *ScrobblerFactory::create(QObject *parent) return new Scrobbler(parent); } -void ScrobblerFactory::showSettings(QWidget *parent) +QDialog *ScrobblerFactory::createConfigDialog(QWidget *parent) { - SettingsDialog *dialog = new SettingsDialog(parent); - dialog->show(); + return new SettingsDialog(parent); } void ScrobblerFactory::showAbout(QWidget *parent) diff --git a/src/plugins/General/scrobbler/scrobblerfactory.h b/src/plugins/General/scrobbler/scrobblerfactory.h index 240749714..a0bd0a626 100644 --- a/src/plugins/General/scrobbler/scrobblerfactory.h +++ b/src/plugins/General/scrobbler/scrobblerfactory.h @@ -36,7 +36,7 @@ Q_INTERFACES(GeneralFactory); public: const GeneralProperties properties() const; General *create(QObject *parent); - void showSettings(QWidget *parent); + QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); QTranslator *createTranslator(QObject *parent); diff --git a/src/plugins/General/scrobbler/settingsdialog.cpp b/src/plugins/General/scrobbler/settingsdialog.cpp index 8dc2dfe22..9280550f1 100644 --- a/src/plugins/General/scrobbler/settingsdialog.cpp +++ b/src/plugins/General/scrobbler/settingsdialog.cpp @@ -27,7 +27,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { ui.setupUi(this); - setAttribute(Qt::WA_DeleteOnClose); QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); settings.beginGroup("Scrobbler"); ui.userLineEdit->setText(settings.value("login").toString()); diff --git a/src/plugins/General/statusicon/settingsdialog.cpp b/src/plugins/General/statusicon/settingsdialog.cpp index 7cb6bb1e5..5dc1ab4eb 100644 --- a/src/plugins/General/statusicon/settingsdialog.cpp +++ b/src/plugins/General/statusicon/settingsdialog.cpp @@ -27,7 +27,6 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) { ui.setupUi(this); - setAttribute(Qt::WA_DeleteOnClose); QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat); settings.beginGroup("Tray"); ui.messageCheckBox->setChecked(settings.value("show_message",TRUE).toBool()); diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp index 1d3beaa0b..12c57261c 100644 --- a/src/plugins/General/statusicon/statusiconfactory.cpp +++ b/src/plugins/General/statusicon/statusiconfactory.cpp @@ -38,10 +38,9 @@ General *StatusIconFactory::create(QObject *parent) return new StatusIcon(parent); } -void StatusIconFactory::showSettings(QWidget *parent) +QDialog *StatusIconFactory::createConfigDialog(QWidget *parent) { - SettingsDialog *s = new SettingsDialog(parent); - s->show(); + return new SettingsDialog(parent); } void StatusIconFactory::showAbout(QWidget *parent) diff --git a/src/plugins/General/statusicon/statusiconfactory.h b/src/plugins/General/statusicon/statusiconfactory.h index b09fb1ef1..c2dc76bc5 100644 --- a/src/plugins/General/statusicon/statusiconfactory.h +++ b/src/plugins/General/statusicon/statusiconfactory.h @@ -25,6 +25,7 @@ */ #include <QObject> #include <QTranslator> +#include <QDialog> #include <qmmpui/general.h> #include <qmmpui/generalfactory.h> @@ -36,7 +37,7 @@ Q_INTERFACES(GeneralFactory); public: const GeneralProperties properties() const; General *create(QObject *parent); - void showSettings(QWidget *parent); + QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); QTranslator *createTranslator(QObject *parent); |