SVN: PLDSetupAssistant: PLDSetupAssistant.cpp PLDSetupAssistant.h
cactus
cactus at pld-linux.org
Tue May 11 01:38:39 CEST 2010
Author: cactus
Date: Tue May 11 01:38:39 2010
New Revision: 11446
Modified:
PLDSetupAssistant/PLDSetupAssistant.cpp
PLDSetupAssistant/PLDSetupAssistant.h
Log:
- add debug to show available modules
Modified: PLDSetupAssistant/PLDSetupAssistant.cpp
==============================================================================
--- PLDSetupAssistant/PLDSetupAssistant.cpp (original)
+++ PLDSetupAssistant/PLDSetupAssistant.cpp Tue May 11 01:38:39 2010
@@ -102,17 +102,17 @@
QWidget * StartAssistant::kcmLayout(KCMultiDialog* dialog)
{
- QVBoxLayout *layout = new QVBoxLayout;
+ QVBoxLayout *layout = new QVBoxLayout(this);
layout->addWidget(dialog);
layout->setMargin(0);
- QWidget *widget = new QWidget;
+ QWidget *widget = new QWidget(this);
widget->setLayout(layout);
widget->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
return widget;
}
-KCMultiDialog* StartAssistant::kcmDialog(const QString lib, const QString name)
+KCMultiDialog* StartAssistant::kcmDialog(const QString lib, const QString name, bool debug)
{
KService::List serviceList = KServiceTypeTrader::self()->query("KCModule");
serviceList.append(KServiceTypeTrader::self()->query("SystemSettingsCategory"));
@@ -120,7 +120,7 @@
foreach (const KService::Ptr service, serviceList) {
if (service->library() == lib && ( name.isEmpty() || service->desktopEntryName() == name))
{
- kDebug() <<service->library() << service->desktopEntryName() << service->name();
+ if (debug) kDebug() <<service->library() << service->desktopEntryName() << service->name();
KCMultiDialog *dlg = new KCMultiDialog(this);
dlg->addModule(KCModuleInfo(service));
dlg->showButton(KDialog::Apply, false);
@@ -130,7 +130,7 @@
dlg->showButton(KDialog::Default, false);
dlg->showButtonSeparator(false);
return dlg;
- } else kDebug() <<service->library() << service->desktopEntryName() << service->name();
+ } else if (debug) kDebug() <<service->library() << service->desktopEntryName() << service->name();
}
return 0;
Modified: PLDSetupAssistant/PLDSetupAssistant.h
==============================================================================
--- PLDSetupAssistant/PLDSetupAssistant.h (original)
+++ PLDSetupAssistant/PLDSetupAssistant.h Tue May 11 01:38:39 2010
@@ -36,7 +36,7 @@
KPageWidgetItem *netPage;
QWidget * kcmLayout(KCMultiDialog* dialog);
- KCMultiDialog* kcmDialog(const QString lib, const QString name = "");
+ KCMultiDialog* kcmDialog(const QString lib, const QString name = "", bool debug = false);
public:
StartAssistant( QWidget * parent = 0 );
More information about the pld-cvs-commit
mailing list