alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make a config dialog even if the applet has a package and a config.xml but lacks a config.ui

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=973264
This commit is contained in:
Aaron J. Seigo 2009-05-26 18:04:02 +00:00
parent 376de3b3b7
commit 53d2c9970a
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
applet.cpp
View File

@ -1535,30 +1535,30 @@ void Applet::showConfigurationInterface()
} }
if (d->package && d->configLoader) { if (d->package && d->configLoader) {
QString uiFile = d->package->filePath("mainconfigui");
if (uiFile.isEmpty()) {
return;
}
KConfigDialog *dialog = new KConfigDialog(0, d->configDialogId(), d->configLoader); KConfigDialog *dialog = new KConfigDialog(0, d->configDialogId(), d->configLoader);
dialog->setWindowTitle(d->configWindowTitle());
dialog->setAttribute(Qt::WA_DeleteOnClose, true);
QUiLoader loader; QString uiFile = d->package->filePath("mainconfigui");
QFile f(uiFile); if (!uiFile.isEmpty()) {
if (!f.open(QIODevice::ReadOnly)) { dialog->setWindowTitle(d->configWindowTitle());
delete dialog; dialog->setAttribute(Qt::WA_DeleteOnClose, true);
if (d->script) { QUiLoader loader;
d->script->showConfigurationInterface(); QFile f(uiFile);
if (!f.open(QIODevice::ReadOnly)) {
delete dialog;
if (d->script) {
d->script->showConfigurationInterface();
}
return;
} }
return;
QWidget *w = loader.load(&f);
f.close();
dialog->addPage(w, i18n("Settings"), icon(), i18n("%1 Settings", name()));
} }
QWidget *w = loader.load(&f);
f.close();
dialog->addPage(w, i18n("Settings"), icon(), i18n("%1 Settings", name()));
d->addGlobalShortcutsPage(dialog); d->addGlobalShortcutsPage(dialog);
connect(dialog, SIGNAL(applyClicked()), this, SLOT(configDialogFinished())); connect(dialog, SIGNAL(applyClicked()), this, SLOT(configDialogFinished()));
connect(dialog, SIGNAL(okClicked()), this, SLOT(configDialogFinished())); connect(dialog, SIGNAL(okClicked()), this, SLOT(configDialogFinished()));