Provide a basic UI for the "Services" settings dialog. It's open yet whether installi...

svn path=/trunk/KDE/kdebase/apps/; revision=931854

diff --git a/src/settings/servicessettingspage.cpp b/src/settings/servicessettingspage.cpp
index 09a1999d955ac4754f22cd17095b198bce39b7a0..1fd66b645d5a0d7e6250bbab442e9369afcc52aa 100644 (file)
--- a/src/settings/servicessettingspage.cpp
+++ b/src/settings/servicessettingspage.cpp
@@ -19,18 +19,35 @@
 
 #include "servicessettingspage.h"
 
 
 #include "servicessettingspage.h"
 

-#include "dolphinsettings.h"
-
-#include "dolphin_generalsettings.h"
-
-#include <kdialog.h>
+#include <kdesktopfileactions.h>
+#include <kicon.h>

 #include <klocale.h>
 #include <klocale.h>

-#include <kvbox.h>
+#include <kservice.h>
+#include <kservicetypetrader.h>
+#include <kstandarddirs.h>
+
+#include <QEvent>
+#include <QLabel>
+#include <QListWidget>
+#include <QVBoxLayout>

 
 ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
 
 ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :

-    SettingsPageBase(parent)
+    SettingsPageBase(parent),
+    m_initialized(false),
+    m_servicesList(0)

 {
 {

-    loadSettings();
+    QVBoxLayout* topLayout = new QVBoxLayout(this);
+
+    QLabel* label = new QLabel(i18nc("@label:textbox",
+                                     "Configure which services should "
+                                     "be shown in the context menu."), this);
+
+    m_servicesList = new QListWidget(this);
+    m_servicesList->setSortingEnabled(true);
+    m_servicesList->setSelectionMode(QAbstractItemView::NoSelection);
+
+    topLayout->addWidget(label);
+    topLayout->addWidget(m_servicesList);

 }
 
 ServicesSettingsPage::~ServicesSettingsPage()
 }
 
 ServicesSettingsPage::~ServicesSettingsPage()


@@ -43,14 +60,39 @@ void ServicesSettingsPage::applySettings()
 
 void ServicesSettingsPage::restoreDefaults()
 {
 
 void ServicesSettingsPage::restoreDefaults()
 {

-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->useDefaults(true);
-    loadSettings();
-    settings->useDefaults(false);
+    const int count = m_servicesList->count();
+    for (int i = 0; i < count; ++i) {
+        QListWidgetItem* item = m_servicesList->item(i);
+        item->setCheckState(Qt::Checked);
+    }

 }
 
 }
 

-void ServicesSettingsPage::loadSettings()
+bool ServicesSettingsPage::event(QEvent* event)

 {
 {

+    if ((event->type() == QEvent::Polish) && !m_initialized) {
+        QMetaObject::invokeMethod(this, "loadServices", Qt::QueuedConnection);
+        m_initialized = true;
+    }
+    return SettingsPageBase::event(event);
+}
+
+void ServicesSettingsPage::loadServices()
+{
+    const KService::List entries = KServiceTypeTrader::self()->query("KonqPopupMenu/Plugin");
+    foreach (const KSharedPtr<KService>& service, entries) {
+        const QString file = KStandardDirs::locate("services", service->entryPath());
+        const QList<KServiceAction> serviceActions =
+                                    KDesktopFileActions::userDefinedServices(file, true);
+
+        foreach (const KServiceAction& action, serviceActions) {
+            if (!action.noDisplay() && !action.isSeparator()) {
+                QListWidgetItem* item = new QListWidgetItem(KIcon(action.icon()),
+                                                            action.text(),
+                                                            m_servicesList);
+                item->setCheckState(Qt::Checked);
+            }
+        }
+    }

 }
 
 #include "servicessettingspage.moc"
 }
 
 #include "servicessettingspage.moc"

diff --git a/src/settings/servicessettingspage.h b/src/settings/servicessettingspage.h
index a64602f13886a107c50510e79b0061ceca5898d9..ee1b16264ab42a0a8440e2e28c5bd95a6c2ef2d1 100644 (file)
--- a/src/settings/servicessettingspage.h
+++ b/src/settings/servicessettingspage.h
@@ -21,8 +21,7 @@
 
 #include <settings/settingspagebase.h>
 
 
 #include <settings/settingspagebase.h>
 

-class QLineEdit;
-class QCheckBox;
+class QListWidget;

 
 /**
  * @brief Page for the 'Services' settings of the Dolphin settings dialog.
 
 /**
  * @brief Page for the 'Services' settings of the Dolphin settings dialog.


@@ -41,10 +40,15 @@ public:
     /** @see SettingsPageBase::restoreDefaults() */
     virtual void restoreDefaults();
 
     /** @see SettingsPageBase::restoreDefaults() */
     virtual void restoreDefaults();
 

-private:
-    void loadSettings();
+protected:
+    virtual bool event(QEvent* event);
+
+private slots:
+    void loadServices();

 
 private:
 
 private:

+    bool m_initialized;
+    QListWidget* m_servicesList;

 };
 
 #endif
 };
 
 #endif