Merge lp:~smartboyhw/ubuntu/raring/homerun/0.2.1-0ubuntu1-version-1 into lp:ubuntu/raring/homerun

[Howard Chan]

New upstream version 0.2.1.

[lp:~smartboyhw/ubuntu/raring/homerun/0.2.1-0ubuntu1-version-1]

6. By Howard Chan on 2013-03-01

Added watch file

[Philip Muškovac (yofel)]

Great, thanks!
I fixed one additional thing:
W: libhomerun-dev: wrong-section-according-to-package-name libhomerun-dev => libdevel

review: Approve

[Philip Muškovac (yofel)]

Meh, noticed one thing too late: the watch file is missing.
Can you please file a new request for ubuntu2 that actually adds it? I'll upload it asap then.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-12-18 19:55:12 +0000
+++ CMakeLists.txt	2013-03-01 15:15:27 +0000
@@ -3,7 +3,7 @@
 SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 
 # Packaging
-set(HOMERUN_VERSION "0.1.1")
+set(HOMERUN_VERSION "0.2.1")
 
 set(HOMERUN_SOURCE_VERSION "")
 set(HOMERUN_SOURCE_DATE "")
@@ -23,23 +23,11 @@
 message(STATUS "Source date: ${HOMERUN_SOURCE_DATE}")
 
 # Dependencies
-find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
+find_package(KDE4 4.9.97 REQUIRED)
 include(KDE4Defaults)
 find_package(KDE4Workspace REQUIRED)
 find_package(KDeclarative REQUIRED)
 
-# Check whether KDeclarative::setupQmlJsDebugger() exists
-set(CMAKE_REQUIRED_INCLUDES "${KDE4_INCLUDES}")
-set(CMAKE_REQUIRED_LIBRARIES "${KDECLARATIVE_LIBRARIES}")
-check_cxx_source_compiles("
-#include <kdeclarative.h>
-int main()
-{
-    KDeclarative::setupQmlJsDebugger();
-    return 0;
-}
-" HAVE_KDECLARATIVE_SETUPQMLJSDEBUGGER)
-
 # Compile options
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)

=== removed file 'ExtraDesktop.sh'
--- ExtraDesktop.sh	2012-11-14 21:30:06 +0000
+++ ExtraDesktop.sh	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#! /bin/sh
-#This file outputs in a separate line each file with a .desktop syntax
-#that needs to be translated but has a non .desktop extension
-
-#We output homerunrc because we want the title of Homerun tabs to be translated
-echo ./config/homerunrc

=== modified file 'NEWS'
--- NEWS	2012-12-18 19:55:12 +0000
+++ NEWS	2013-03-01 15:15:27 +0000
@@ -1,3 +1,27 @@
+# 2013.02.27 - 0.2.1
+
+- Fix shutdown and halt items in the Power source
+- Improve appearance of header titles
+
+# 2013.02.26 - 0.2.0
+
+- Support for single runners
+- Items can now have more than one action. The other actions are accessible
+  through a context menu, which can be triggered by:
+  - Left-clicking the arrow in the top-right corner of the item
+  - Long-clicking the item
+  - Right-clicking the item
+  - Pressing M or the "Menu" key
+- Some sources expose more actions:
+  - Recent documents can now forget items
+  - Items from the Dir and FavoritePlaces sources show the relevant "Open with" actions
+- Add a "Reset tabs to default" action to the configuration menu
+- Fix window not showing on correct desktop at startup
+- Improved session handling: opened sessions are now listed in the "Power" tab
+- Hide unavailable sleep modes in Power source
+- No more border around full view
+- Show a shadow behind text in containment mode
+
 # 2012.12.18 - 0.1.1
 
 - Add support for selecting the launcher icon

=== modified file 'README.md'
--- README.md	2012-11-14 21:30:06 +0000
+++ README.md	2013-03-01 15:15:27 +0000
@@ -21,16 +21,34 @@
 
 ## Dependencies
 
-kdelibs 4.8
-
-## Package Manager integration
+kdelibs 4.10
+
+## Build instructions
+
+Homerun currently requires kdelibs and kde-runtime 4.10.
+
+To build it, do the following:
+
+    mkdir build
+    cd build
+    cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` ..
+
+Assuming cmake did not complain about missing dependencies, run:
+
+    make
+
+Then to install it, run as root:
+
+    make install
+
+## For packagers: Package manager integration
 
 You can integrate your package manager with Homerun.
 
 When browsing installed applications by category, Homerun can provide an item to
 install more applications from this category. To do so you need to:
 
-First, Create a .desktop file whose Exec= line contains a "@category" placeholder.
+First, create a .desktop file whose Exec= line contains a "@category" placeholder.
 This placeholder will be replaced by the category Homerun is browsing.
 
 For example, here is muon-discover-category.desktop:

=== modified file 'applet/plasma-applet-homerunlauncher.desktop.cmake'
--- applet/plasma-applet-homerunlauncher.desktop.cmake	2012-12-18 19:55:12 +0000
+++ applet/plasma-applet-homerunlauncher.desktop.cmake	2013-03-01 15:15:27 +0000
@@ -4,32 +4,45 @@
 Name=KDE Homerun Launcher
 Name[da]=KDE Homerun-startmenu
 Name[el]=Εκτελεστής KDE Homerun
+Name[es]=Lanzador Homerun de KDE
 Name[et]=KDE Homeruni käivitaja
+Name[fi]=KDE Homerun -käynnistin
 Name[fr]=Lanceur Homerun pour KDE
+Name[gl]=Lanzador de KDE Homerun
 Name[hu]=KDE Homerun indító
+Name[lt]=KDE Homerun leidiklis
 Name[nl]=Programmastarter van KDE Homerun
 Name[pa]=ਕੇਡੀਈ ਹੋਮਰਨ ਲਾਂਚਰ
 Name[pt]=Lançador Homerun do KDE
 Name[pt_BR]=Lançador Homerun do KDE
+Name[ro]=Lansator KDE Homerun
 Name[sk]=Spúšťač KDE Homerun
 Name[sv]=KDE Homerun startprogram
 Name[uk]=Засіб запуску KDE Homerun
 Name[x-test]=xxKDE Homerun Launcherxx
+Name[zh_CN]=KDE Homerun 启动器
 
 Comment=An application launcher
 Comment[da]=Programstarter
+Comment[de]=Ein Anwendungsstarter
 Comment[el]=Ένας εκτελεστής εφαρμογών
+Comment[es]=Un lanzador de aplicaciones
 Comment[et]=Rakenduste käivitaja
+Comment[fi]=Sovelluskäynnistin
 Comment[fr]=Un lanceur d'applications
+Comment[gl]=Un lanzador de aplicativos
 Comment[hu]=Egy alkalmazásindító
+Comment[lt]=Programų leidiklis
 Comment[nl]=Een programmastarter
 Comment[pa]=ਐਪਲੀਕੇਸ਼ਨ ਲਾਂਚਰ
 Comment[pt]=Um lançador de aplicações
 Comment[pt_BR]=Um lançador de aplicativos
+Comment[ro]=Lansator de aplicații
 Comment[sk]=Spúšťač aplikácií
 Comment[sv]=Ett startprogram
 Comment[uk]=Засіб для запуску програм
 Comment[x-test]=xxAn application launcherxx
+Comment[zh_CN]=一个应用程序启动器
 
 Type=Service
 ServiceTypes=Plasma/Applet

=== modified file 'components/CMakeLists.txt'
--- components/CMakeLists.txt	2012-11-14 21:30:06 +0000
+++ components/CMakeLists.txt	2013-03-01 15:15:27 +0000
@@ -4,30 +4,36 @@
     ${CMAKE_SOURCE_DIR}/internal/aboutdata.cpp
     abstractsourceregistry.cpp
     componentsplugin.cpp
-    dirconfigurationwidget.cpp
-    dirmodel.cpp
-    favoriteappsmodel.cpp
-    favoriteplacesmodel.cpp
-    groupedinstalledappsmodel.cpp
     helpmenuactions.cpp
     icondialog.cpp
-    installedappsconfigurationwidget.cpp
-    installedappsmodel.cpp
-    powermodel.cpp
-    runnerconfigurationwidget.cpp
-    runnermodel.cpp
-    sessionmodel.cpp
+    messagebox.cpp
+    shadoweffect.cpp
     sourceconfigurationdialog.cpp
-    sourceid.cpp
     sourcemodel.cpp
     sourceregistry.cpp
+    sources/dir/dirconfigurationwidget.cpp
+    sources/dir/dirmodel.cpp
+    sources/favorites/favoriteappsmodel.cpp
+    sources/favorites/favoriteplacesmodel.cpp
+    sources/installedapps/groupedinstalledappsmodel.cpp
+    sources/installedapps/installedappsconfigurationwidget.cpp
+    sources/installedapps/installedappsmodel.cpp
+    sources/power/powermodel.cpp
+    sources/runners/querymatchmodel.cpp
+    sources/runners/singlerunnermodel.cpp
+    sources/runners/runnerconfigurationwidget.cpp
+    sources/runners/runnermodel.cpp
+    sources/session/openedsessionsmodel.cpp
+    sources/session/sessionmodel.cpp
+    sources/session/sessionswatcher.cpp
+    standarditemmodel.cpp
     tabmodel.cpp
     )
 
 kde4_add_ui_files(components_SRCS
-    dirconfigurationwidget.ui
-    installedappsconfigurationwidget.ui
-    runnerconfigurationwidget.ui
+    sources/dir/dirconfigurationwidget.ui
+    sources/installedapps/installedappsconfigurationwidget.ui
+    sources/runners/runnerconfigurationwidget.ui
     )
 
 qt4_automoc(${components_SRCS})
@@ -36,6 +42,12 @@
     ${lib_BINARY_DIR}
     ${lib_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/internal
+    ${CMAKE_CURRENT_SOURCE_DIR}/sources/dir
+    ${CMAKE_CURRENT_SOURCE_DIR}/sources/favorites
+    ${CMAKE_CURRENT_SOURCE_DIR}/sources/installedapps
+    ${CMAKE_CURRENT_SOURCE_DIR}/sources/power
+    ${CMAKE_CURRENT_SOURCE_DIR}/sources/runners
+    ${CMAKE_CURRENT_SOURCE_DIR}/sources/session
     )
 
 kde4_add_library(componentsplugin SHARED ${components_SRCS})
@@ -46,6 +58,7 @@
         ${KDE4_PLASMA_LIBS}
         ${KDE4_KIO_LIBS}
         ${KDE4_KFILE_LIBS}
+        ${KDE4_SOLID_LIBS}
         ${KDE4WORKSPACE_KWORKSPACE_LIBS}
         homerun
         )

=== modified file 'components/componentsplugin.cpp'
--- components/componentsplugin.cpp	2012-11-14 21:30:06 +0000
+++ components/componentsplugin.cpp	2013-03-01 15:15:27 +0000
@@ -24,14 +24,18 @@
 
 #include <helpmenuactions.h>
 #include <icondialog.h>
+#include <messagebox.h>
+#include <shadoweffect.h>
 #include <sourceregistry.h>
 #include <tabmodel.h>
 
 void ComponentsPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("org.kde.homerun.components"));
+    qmlRegisterType<ShadowEffect>(uri, 0, 1, "ShadowEffect");
     qmlRegisterType<HelpMenuActions>(uri, 0, 1, "HelpMenuActions");
     qmlRegisterType<IconDialog>(uri, 0, 1, "IconDialog");
+    qmlRegisterType<MessageBox>(uri, 0, 1, "MessageBox");
     qmlRegisterType<Homerun::AbstractSourceRegistry>(uri, 0, 1, "AbstractSourceRegistry");
     qmlRegisterType<Homerun::SourceRegistry>(uri, 0, 1, "SourceRegistry");
     qmlRegisterType<TabModel>(uri, 0, 1, "TabModel");

=== removed file 'components/dirconfigurationwidget.cpp'
--- components/dirconfigurationwidget.cpp	2012-11-14 21:30:06 +0000
+++ components/dirconfigurationwidget.cpp	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// Self
-#include <dirconfigurationwidget.h>
-
-// Local
-#include <ui_dirconfigurationwidget.h>
-
-// KDE
-#include <KGlobalSettings>
-#include <KUrlRequester>
-
-// Qt
-#include <QDir>
-#include <QVBoxLayout>
-
-using namespace Homerun;
-
-DirConfigurationWidget::DirConfigurationWidget(const KConfigGroup &group)
-: SourceConfigurationWidget(group)
-, m_ui(new Ui_DirConfigurationWidget)
-{
-    m_ui->setupUi(this);
-
-    QFont helpFont = KGlobalSettings::smallestReadableFont();
-    m_ui->titleHelpLabel->setFont(helpFont);
-
-    KUrl url = group.readPathEntry("rootUrl", QDir::homePath());
-    if (url.isValid()) {
-        m_ui->urlRequester->setUrl(url);
-    }
-
-    m_ui->titleLineEdit->setText(group.readEntry("rootName", QString()));
-}
-
-DirConfigurationWidget::~DirConfigurationWidget()
-{
-    delete m_ui;
-}
-
-void DirConfigurationWidget::save()
-{
-    KUrl url = m_ui->urlRequester->url().url();
-    QString title = m_ui->titleLineEdit->text();
-
-    configGroup().writePathEntry("rootUrl", url.url());
-    configGroup().writeEntry("rootName", title);
-}
-
-#include <dirconfigurationwidget.moc>

=== removed file 'components/dirconfigurationwidget.h'
--- components/dirconfigurationwidget.h	2012-11-14 21:30:06 +0000
+++ components/dirconfigurationwidget.h	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef DIRCONFIGURATIONWIDGET_H
-#define DIRCONFIGURATIONWIDGET_H
-
-// Local
-#include <sourceconfigurationwidget.h>
-
-// Qt
-
-// KDE
-
-class Ui_DirConfigurationWidget;
-
-/**
- * Configuration widget for the Dir source
- */
-class DirConfigurationWidget : public Homerun::SourceConfigurationWidget
-{
-    Q_OBJECT
-public:
-    DirConfigurationWidget(const KConfigGroup &group);
-    ~DirConfigurationWidget();
-
-    void save(); // reimp
-
-private:
-    Ui_DirConfigurationWidget *m_ui;
-};
-
-#endif /* DIRCONFIGURATIONWIDGET_H */

=== removed file 'components/dirconfigurationwidget.ui'
--- components/dirconfigurationwidget.ui	2012-11-14 21:30:06 +0000
+++ components/dirconfigurationwidget.ui	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DirConfigurationWidget</class>
- <widget class="QWidget" name="DirConfigurationWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>85</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>400</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QFormLayout" name="formLayout">
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Folder to show:</string>
-     </property>
-     <property name="buddy">
-      <cstring>urlRequester</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="KUrlRequester" name="urlRequester">
-     <property name="mode">
-      <set>KFile::Directory|KFile::ExistingOnly</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QLineEdit" name="titleLineEdit"/>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Title:</string>
-     </property>
-     <property name="buddy">
-      <cstring>titleLineEdit</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QLabel" name="titleHelpLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>If title is left empty, the folder name will be used</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>KUrlRequester</class>
-   <extends>QFrame</extends>
-   <header>kurlrequester.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

=== removed file 'components/dirmodel.cpp'
--- components/dirmodel.cpp	2012-12-18 19:55:12 +0000
+++ components/dirmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,240 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// Self
-#include <dirmodel.h>
-
-// Local
-#include <dirconfigurationwidget.h>
-#include <pathmodel.h>
-#include <favoriteplacesmodel.h>
-
-// KDE
-#include <KConfigGroup>
-#include <KDebug>
-#include <KDirModel>
-#include <KDirLister>
-
-// Qt
-#include <QDir>
-
-namespace Homerun
-{
-
-static const char *SOURCE_ID = "Dir";
-
-static inline KFileItem itemForIndex(const QModelIndex &index)
-{
-    return index.data(KDirModel::FileItemRole).value<KFileItem>();
-}
-
-//- DirModel ------------------------------------------------------
-QVariantMap DirModel::sourceArguments(const KUrl &rootUrl, const QString &rootName, const KUrl &url)
-{
-    QVariantMap args;
-    args.insert("rootUrl", rootUrl.url());
-    args.insert("rootName", rootName);
-    args.insert("url", url.url());
-    return args;
-}
-
-
-DirModel::DirModel(QObject *parent)
-: KDirSortFilterProxyModel(parent)
-, m_pathModel(new PathModel(this))
-{
-    setSourceModel(new KDirModel(this));
-    setSortFoldersFirst(true);
-
-    QHash<int, QByteArray> roles;
-    roles.insert(Qt::DisplayRole, "display");
-    roles.insert(Qt::DecorationRole, "decoration");
-    roles.insert(DirModel::FavoriteIdRole, "favoriteId");
-    setRoleNames(roles);
-
-    dirLister()->setDelayedMimeTypes(true);
-    connect(dirLister(), SIGNAL(started(KUrl)), SLOT(emitRunningChanged()));
-    connect(dirLister(), SIGNAL(completed()), SLOT(emitRunningChanged()));
-}
-
-void DirModel::init(const KUrl &rootUrl, const QString &rootName, const KUrl &url)
-{
-    m_rootUrl = rootUrl;
-    m_rootName = rootName;
-    initPathModel(url);
-    dirLister()->openUrl(url);
-}
-
-void DirModel::initPathModel(const KUrl &openedUrl)
-{
-    QVariantMap args = sourceArguments(m_rootUrl, m_rootName, m_rootUrl);
-    m_pathModel->addPath(m_rootName, SOURCE_ID, args);
-
-    KUrl rootUrl = m_rootUrl;
-    // Needed for KUrl::relativeUrl
-    rootUrl.adjustPath(KUrl::AddTrailingSlash);
-    QString relativePath = KUrl::relativeUrl(rootUrl, openedUrl);
-    if (relativePath == "./") {
-        return;
-    }
-    KUrl url = m_rootUrl;
-    Q_FOREACH(const QString &token, relativePath.split('/')) {
-        if (token.isEmpty()) {
-            // Just in case relativePath ends with '/'
-            continue;
-        }
-        url.addPath(token);
-        args["url"] = url.url();
-        m_pathModel->addPath(token, SOURCE_ID, args);
-    }
-}
-
-KDirLister *DirModel::dirLister() const
-{
-    return static_cast<KDirModel *>(sourceModel())->dirLister();
-}
-
-QVariant DirModel::data(const QModelIndex &index, int role) const
-{
-    if (role != FavoriteIdRole) {
-        return QSortFilterProxyModel::data(index, role);
-    }
-    if (index.row() < 0 || index.row() >= rowCount()) {
-        return QVariant();
-    }
-
-    KFileItem item = itemForIndex(index);
-    if (item.isDir()) {
-        return FavoritePlacesModel::favoriteIdFromUrl(item.url());
-    } else {
-        return QString();
-    }
-}
-
-int DirModel::count() const
-{
-    return rowCount(QModelIndex());
-}
-
-QString DirModel::name() const
-{
-    return m_rootName;
-}
-
-bool DirModel::running() const
-{
-    return !dirLister()->isFinished();
-}
-
-PathModel *DirModel::pathModel() const
-{
-    return m_pathModel;
-}
-
-QString DirModel::query() const
-{
-    return filterRegExp().pattern();
-}
-
-void DirModel::setQuery(const QString &value)
-{
-    if (value == query()) {
-        return;
-    }
-    setFilterRegExp(QRegExp(value, Qt::CaseInsensitive));
-    queryChanged(value);
-}
-
-void DirModel::emitRunningChanged()
-{
-    runningChanged(running());
-}
-
-bool DirModel::trigger(int row)
-{
-    bool closed = false;
-    QModelIndex idx = index(row, 0);
-
-    KFileItem item = itemForIndex(idx);
-    if (item.isDir()) {
-        openSourceRequested(SOURCE_ID, sourceArguments(m_rootUrl, m_rootName, item.url()));
-    } else {
-        item.run();
-        closed = true;
-    }
-    return closed;
-}
-
-//- DirSource -------------------------------------------------------
-DirSource::DirSource(QObject *parent)
-: AbstractSource(parent)
-{}
-
-QAbstractItemModel *DirSource::createModelFromArguments(const QVariantMap &args)
-{
-    KUrl rootUrl = args.value("rootUrl").toString();
-    QString rootName = args.value("rootName").toString();
-    KUrl url = args.value("url").toString();
-    return createModel(rootUrl, rootName, url);
-}
-
-QAbstractItemModel *DirSource::createModelFromConfigGroup(const KConfigGroup &group)
-{
-    KUrl rootUrl = group.readPathEntry("rootUrl", QDir::homePath());
-    QString rootName = group.readEntry("rootName", QString());
-    return createModel(rootUrl, rootName, KUrl());
-}
-
-QAbstractItemModel *DirSource::createModel(const KUrl &rootUrl_, const QString &rootName_, const KUrl &url_)
-{
-    KUrl rootUrl = rootUrl_;
-    QString rootName = rootName_;
-    KUrl url = url_;
-    if (!rootUrl.isValid()) {
-        rootUrl = KUrl::fromPath(QDir::homePath());
-    }
-
-    if (rootName.isEmpty()) {
-        rootName = rootUrl.fileName();
-        if (rootName.isEmpty()) {
-            rootName = rootUrl.prettyUrl();
-        }
-    }
-    if (!url.isValid()) {
-        url = rootUrl;
-    }
-
-    DirModel *model = new DirModel;
-    model->init(rootUrl, rootName, url);
-    return model;
-}
-
-bool DirSource::isConfigurable() const
-{
-    return true;
-}
-
-SourceConfigurationWidget *DirSource::createConfigurationWidget(const KConfigGroup &group)
-{
-    return new DirConfigurationWidget(group);
-}
-
-} // namespace Homerun
-
-#include <dirmodel.moc>

=== removed file 'components/dirmodel.h'
--- components/dirmodel.h	2012-11-14 21:30:06 +0000
+++ components/dirmodel.h	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef DIRMODEL_H
-#define DIRMODEL_H
-
-// Local
-#include <abstractsource.h>
-
-// Qt
-
-// KDE
-#include <KDirSortFilterProxyModel>
-#include <KUrl>
-
-class KDirLister;
-
-namespace Homerun {
-
-class PathModel;
-
-/**
- * Internal
- */
-class DirModel : public KDirSortFilterProxyModel
-{
-    Q_OBJECT
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(QString name READ name CONSTANT)
-
-    Q_PROPERTY(bool running READ running NOTIFY runningChanged)
-    Q_PROPERTY(QObject *pathModel READ pathModel CONSTANT)
-    Q_PROPERTY(QString query READ query WRITE setQuery NOTIFY queryChanged)
-public:
-    explicit DirModel(QObject *parent = 0);
-
-    void init(const KUrl &rootUrl, const QString &rootName, const KUrl &url);
-
-    enum {
-        FavoriteIdRole = Qt::UserRole + 1,
-    };
-
-    Q_INVOKABLE bool trigger(int row);
-
-    KDirLister *dirLister() const;
-
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; // reimp
-
-    PathModel *pathModel() const;
-
-    int count() const;
-
-    QString name() const;
-
-    bool running() const;
-
-    QString query() const;
-
-    void setQuery(const QString &query);
-
-    static QVariantMap sourceArguments(const KUrl &rootUrl, const QString &rootName, const KUrl &url);
-
-Q_SIGNALS:
-    void countChanged();
-    void runningChanged(bool);
-    void openSourceRequested(const QString &sourceId, const QVariantMap &sourceArguments);
-    void queryChanged(const QString &);
-
-private Q_SLOTS:
-    void emitRunningChanged();
-
-private:
-    PathModel *m_pathModel;
-    KUrl m_rootUrl;
-    QString m_rootName;
-
-    void initPathModel(const KUrl &url);
-};
-
-class DirSource : public AbstractSource
-{
-public:
-    DirSource(QObject *parent);
-    QAbstractItemModel *createModelFromConfigGroup(const KConfigGroup &group);
-    QAbstractItemModel *createModelFromArguments(const QVariantMap &args);
-    bool isConfigurable() const;
-    SourceConfigurationWidget *createConfigurationWidget(const KConfigGroup &group);
-
-private:
-    QAbstractItemModel *createModel(const KUrl &rootUrl, const QString &rootName, const KUrl &url);
-};
-
-} // namespace Homerun
-
-#endif /* DIRMODEL_H */

=== removed file 'components/favoriteappsmodel.cpp'
--- components/favoriteappsmodel.cpp	2012-11-14 21:30:06 +0000
+++ components/favoriteappsmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,215 +0,0 @@
-/*
-    Copyright 2009 Ivan Cukic <[e-mail]>
-    Copyright 2010 Marco Martin <[e-mail]>
-    Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-// Own
-#include "favoriteappsmodel.h"
-
-// Qt
-
-// KDE
-#include <KDebug>
-#include <KIcon>
-#include <KConfigGroup>
-#include <KLocale>
-#include <KRun>
-#include <KService>
-
-namespace Homerun {
-
-static QString serviceIdFromFavoriteId(const QString &favoriteId)
-{
-    if (!favoriteId.startsWith("app:")) {
-        kWarning() << "Wrong favoriteId" << favoriteId;
-        return QString();
-    }
-    return favoriteId.mid(4);
-}
-
-FavoriteAppsModel::FavoriteAppsModel(QObject *parent)
-: QAbstractListModel(parent)
-{
-    QHash<int, QByteArray> roles;
-    roles.insert(Qt::DisplayRole, "display");
-    roles.insert(Qt::DecorationRole, "decoration");
-    roles.insert(FavoriteIdRole, "favoriteId");
-    setRoleNames(roles);
-    setConfig(KSharedConfig::openConfig("homerunrc"));
-}
-
-FavoriteAppsModel::~FavoriteAppsModel()
-{
-}
-
-void FavoriteAppsModel::setConfig(const KSharedConfig::Ptr &ptr)
-{
-    m_config = ptr;
-
-    KConfigGroup baseGroup(m_config, "favorites");
-
-    // get all the favorites
-    QMap<int, KService::Ptr> favoriteMap;
-    foreach (const QString &favoriteGroup, baseGroup.groupList()) {
-        if (favoriteGroup.startsWith("favorite-")) {
-            KConfigGroup favoriteConfig(&baseGroup, favoriteGroup);
-            int rank = favoriteGroup.split("-").last().toInt();
-            QString id = favoriteConfig.readEntry("serviceId");
-            KService::Ptr service = KService::serviceByStorageId(id);
-            if (!service.isNull()) {
-                favoriteMap.insert(rank, service);
-            }
-        }
-    }
-
-    beginResetModel();
-    m_favoriteList.clear();
-    auto it = favoriteMap.constBegin(), end = favoriteMap.constEnd();
-    for (; it != end; ++it) {
-        FavoriteInfo info = { it.key(), it.value() };
-        m_favoriteList << info;
-    }
-    endResetModel();
-    countChanged();
-}
-
-void FavoriteAppsModel::addFavorite(const QString &favoriteId)
-{
-    QString serviceId = serviceIdFromFavoriteId(favoriteId);
-    if (serviceId.isEmpty()) {
-        return;
-    }
-    KService::Ptr service = KService::serviceByStorageId(serviceId);
-    if (service.isNull()) {
-        kWarning() << "Could not find a service for" << serviceId;
-        return;
-    }
-    int rank;
-    if (!m_favoriteList.isEmpty()) {
-        rank = m_favoriteList.last().rank + 1;
-    } else {
-        rank = 0;
-    }
-    FavoriteInfo info = { rank, service };
-
-    int row = m_favoriteList.count();
-    beginInsertRows(QModelIndex(), row, row);
-    m_favoriteList << info;
-    endInsertRows();
-    countChanged();
-
-    KConfigGroup baseGroup(m_config, "favorites");
-    KConfigGroup group(&baseGroup, QString("favorite-%1").arg(rank));
-    group.writeEntry("serviceId", serviceId);
-    baseGroup.sync();
-}
-
-void FavoriteAppsModel::removeFavorite(const QString &favoriteId)
-{
-    int row = rowForFavoriteId(favoriteId);
-    if (row == -1) {
-        kWarning() << "Could not find favorite" << favoriteId;
-        return;
-    }
-    beginRemoveRows(QModelIndex(), row, row);
-    FavoriteInfo info = m_favoriteList.takeAt(row);
-    endRemoveRows();
-    countChanged();
-
-    KConfigGroup baseGroup(m_config, "favorites");
-    KConfigGroup group(&baseGroup, QString("favorite-%1").arg(info.rank));
-    group.deleteGroup();
-    baseGroup.sync();
-}
-
-bool FavoriteAppsModel::isFavorite(const QString &favoriteId) const
-{
-    return rowForFavoriteId(favoriteId) != -1;
-}
-
-int FavoriteAppsModel::rowForFavoriteId(const QString& favoriteId) const
-{
-    QString serviceId = serviceIdFromFavoriteId(favoriteId);
-    if (serviceId.isEmpty()) {
-        return -1;
-    }
-
-    for (int row = m_favoriteList.count() - 1; row >= 0; --row) {
-        const FavoriteInfo& info = m_favoriteList.at(row);
-        if (info.service->storageId() == serviceId) {
-            return row;
-        }
-    }
-    return -1;
-}
-
-int FavoriteAppsModel::count() const
-{
-    return m_favoriteList.count();
-}
-
-QString FavoriteAppsModel::name() const
-{
-    return i18n("Favorite Applications");
-}
-
-QString FavoriteAppsModel::favoritePrefix() const
-{
-    return "app";
-}
-
-int FavoriteAppsModel::rowCount(const QModelIndex &index) const
-{
-    if (index.isValid()) {
-        return 0;
-    }
-    return m_favoriteList.count();
-}
-
-QVariant FavoriteAppsModel::data(const QModelIndex &index, int role) const
-{
-    KService::Ptr service = m_favoriteList.value(index.row()).service;
-    if (service.isNull()) {
-        return QVariant();
-    }
-    if (role == Qt::DisplayRole) {
-        return service->name();
-    } else if (role == Qt::DecorationRole) {
-        return KIcon(service->icon());
-    } else if (role == FavoriteIdRole) {
-        return QVariant("app:" + service->storageId());
-    } else {
-        kWarning() << "Unhandled role" << role;
-        return QVariant();
-    }
-}
-
-bool FavoriteAppsModel::trigger(int row)
-{
-    KService::Ptr service = m_favoriteList.value(row).service;
-    if (service.isNull()) {
-        kWarning() << "Invalid row";
-        return false;
-    }
-    return KRun::run(*service, KUrl::List(), 0);
-}
-
-} // namespace Homerun
-
-#include "favoriteappsmodel.moc"

=== removed file 'components/favoriteappsmodel.h'
--- components/favoriteappsmodel.h	2012-11-14 21:30:06 +0000
+++ components/favoriteappsmodel.h	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-/*
-    Copyright 2009 Ivan Cukic <[e-mail]>
-    Copyright 2010 Marco Martin <[e-mail]>
-    Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef FAVORITEAPPSMODEL_H
-#define FAVORITEAPPSMODEL_H
-
-#include <QAbstractListModel>
-
-#include <KService>
-#include <KSharedConfig>
-
-namespace Homerun {
-
-struct FavoriteInfo
-{
-    int rank;
-    KService::Ptr service;
-};
-
-class FavoriteAppsModel : public QAbstractListModel
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-
-    Q_PROPERTY(QString favoritePrefix READ favoritePrefix CONSTANT)
-
-public:
-    FavoriteAppsModel(QObject *parent = 0);
-    ~FavoriteAppsModel();
-
-    enum {
-        FavoriteIdRole = Qt::UserRole + 1
-    };
-
-    int count() const;
-    QString name() const;
-    QString favoritePrefix() const;
-
-    void setConfig(const KSharedConfig::Ptr &);
-
-    int rowCount(const QModelIndex & = QModelIndex()) const;
-    QVariant data(const QModelIndex &, int role = Qt::DisplayRole) const;
-
-    Q_INVOKABLE bool isFavorite(const QString &favoriteId) const;
-    Q_INVOKABLE void addFavorite(const QString &favoriteId);
-    Q_INVOKABLE void removeFavorite(const QString &favoriteId);
-
-    Q_INVOKABLE bool trigger(int row);
-
-Q_SIGNALS:
-    void countChanged();
-
-private:
-    KSharedConfig::Ptr m_config;
-    QList<FavoriteInfo> m_favoriteList;
-
-    int rowForFavoriteId(const QString &favoriteId) const;
-};
-
-} // namespace Homerun
-
-#endif // FAVORITEAPPSMODEL_H

=== removed file 'components/favoriteplacesmodel.cpp'
--- components/favoriteplacesmodel.cpp	2012-11-14 21:30:06 +0000
+++ components/favoriteplacesmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,138 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "favoriteplacesmodel.h"
-
-// Local
-#include <dirmodel.h>
-
-// KDE
-#include <KDebug>
-#include <KLocale>
-
-// Qt
-
-namespace Homerun {
-
-KUrl FavoritePlacesModel::urlFromFavoriteId(const QString &favoriteId)
-{
-    if (!favoriteId.startsWith("place:")) {
-        kWarning() << "Wrong favoriteId" << favoriteId;
-        return QString();
-    }
-    return KUrl(favoriteId.mid(6));
-}
-
-QString FavoritePlacesModel::favoriteIdFromUrl(const KUrl &url)
-{
-    return "place:" + url.url();
-}
-
-//- FavoritePlacesModel ------------------------------------------------
-FavoritePlacesModel::FavoritePlacesModel(QObject *parent)
-: KFilePlacesModel(parent)
-{
-    QHash<int, QByteArray> roles;
-    roles.insert(Qt::DisplayRole, "display");
-    roles.insert(Qt::DecorationRole, "decoration");
-    roles.insert(FavoritePlacesModel::FavoriteIdRole, "favoriteId");
-    setRoleNames(roles);
-}
-
-QString FavoritePlacesModel::favoritePrefix() const
-{
-    return "place";
-}
-
-bool FavoritePlacesModel::isFavorite(const QString &favoriteId) const
-{
-    return indexForFavoriteId(favoriteId).isValid();
-}
-
-void FavoritePlacesModel::addFavorite(const QString &favoriteId)
-{
-    KUrl favoriteUrl = urlFromFavoriteId(favoriteId);
-    if (favoriteUrl.isEmpty()) {
-        return;
-    }
-    addPlace(favoriteUrl.fileName(), favoriteUrl);
-}
-
-void FavoritePlacesModel::removeFavorite(const QString &favoriteId)
-{
-    QModelIndex index = indexForFavoriteId(favoriteId);
-    if (!index.isValid()) {
-        kWarning() << "No favorite place for" << favoriteId;
-        return;
-    }
-    removePlace(index);
-}
-
-QModelIndex FavoritePlacesModel::indexForFavoriteId(const QString &favoriteId) const
-{
-    KUrl favoriteUrl = urlFromFavoriteId(favoriteId);
-    if (favoriteUrl.isEmpty()) {
-        return QModelIndex();
-    }
-    for (int row = rowCount() - 1; row >= 0; --row) {
-        QModelIndex idx = index(row, 0);
-        if (url(idx).equals(favoriteUrl, KUrl::CompareWithoutTrailingSlash)) {
-            return idx;
-        }
-    }
-    return QModelIndex();
-}
-
-QVariant FavoritePlacesModel::data(const QModelIndex &index, int role) const
-{
-    if (role != FavoriteIdRole) {
-        return KFilePlacesModel::data(index, role);
-    }
-
-    if (index.row() < 0 || index.row() >= rowCount()) {
-        return QVariant();
-    }
-    return QVariant(favoriteIdFromUrl(url(index)));
-}
-
-bool FavoritePlacesModel::trigger(int row)
-{
-    QModelIndex idx = index(row, 0);
-
-    KUrl theUrl = idx.data(KFilePlacesModel::UrlRole).value<QUrl>();
-    theUrl.adjustPath(KUrl::AddTrailingSlash);
-    QString rootName = idx.data(Qt::DisplayRole).toString();
-    openSourceRequested("Dir", DirModel::sourceArguments(theUrl, rootName, theUrl));
-
-    return false;
-}
-
-QString FavoritePlacesModel::name() const
-{
-    return i18n("Favorite Places");
-}
-
-int FavoritePlacesModel::count() const
-{
-    return rowCount(QModelIndex());
-}
-
-} // namespace Homerun
-
-#include "favoriteplacesmodel.moc"

=== removed file 'components/favoriteplacesmodel.h'
--- components/favoriteplacesmodel.h	2012-11-14 21:30:06 +0000
+++ components/favoriteplacesmodel.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef PLACESMODEL_H
-#define PLACESMODEL_H
-
-// Local
-
-// Qt
-
-// KDE
-#include <KFilePlacesModel>
-
-namespace Homerun {
-
-/**
- * Adapts KFilePlacesModel to make it usable as a Homerun favorite model
- */
-class FavoritePlacesModel : public KFilePlacesModel
-{
-    Q_OBJECT
-    Q_PROPERTY(QString favoritePrefix READ favoritePrefix CONSTANT)
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(QString name READ name CONSTANT)
-
-public:
-    enum {
-        FavoriteIdRole = Qt::UserRole + 1,
-    };
-
-    FavoritePlacesModel(QObject *parent = 0);
-
-    Q_INVOKABLE bool isFavorite(const QString &favoriteId) const;
-    Q_INVOKABLE void addFavorite(const QString &favoriteId);
-    Q_INVOKABLE void removeFavorite(const QString &favoriteId);
-    Q_INVOKABLE bool trigger(int row);
-
-    QString favoritePrefix() const;
-
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; // reimp
-
-    QString name() const;
-
-    int count() const;
-
-    static KUrl urlFromFavoriteId(const QString &favoriteId);
-    static QString favoriteIdFromUrl(const KUrl &url);
-
-Q_SIGNALS:
-    void openSourceRequested(const QString &sourceId, const QVariantMap &sourceArguments);
-    void countChanged();
-
-private:
-    QModelIndex indexForFavoriteId(const QString &favoriteId) const;
-};
-
-} // namespace Homerun
-
-#endif /* PLACESMODEL_H */

=== removed file 'components/groupedinstalledappsmodel.cpp'
--- components/groupedinstalledappsmodel.cpp	2012-11-14 21:30:06 +0000
+++ components/groupedinstalledappsmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,134 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// Self
-#include <groupedinstalledappsmodel.h>
-
-// Local
-#include <abstractsourceregistry.h>
-#include <installedappsmodel.h>
-
-// KDE
-#include <KConfigGroup>
-#include <KDebug>
-
-// Qt
-
-namespace Homerun {
-
-GroupedInstalledAppsModel::GroupedInstalledAppsModel(const QString &installer, QObject *parent)
-: QAbstractListModel(parent)
-, m_installer(installer)
-{
-    loadRootEntries();
-}
-
-GroupedInstalledAppsModel::~GroupedInstalledAppsModel()
-{
-}
-
-QObject *GroupedInstalledAppsModel::modelForRow(int row) const
-{
-    if (row < 0 || row >= m_models.count()) {
-        kWarning() << "No model for row" << row << "!";
-        return 0;
-    }
-    return m_models.value(row);
-}
-
-void GroupedInstalledAppsModel::loadRootEntries()
-{
-    KServiceGroup::Ptr group = KServiceGroup::root();
-    KServiceGroup::List list = group->entries(false /* sorted: set to false as it does not seem to work */);
-
-    QMap<QString, KServiceGroup::Ptr> groupMap;
-    for( KServiceGroup::List::ConstIterator it = list.constBegin(); it != list.constEnd(); it++) {
-        const KSycocaEntry::Ptr p = (*it);
-
-        if (p->isType(KST_KServiceGroup)) {
-            KServiceGroup::Ptr subGroup = KServiceGroup::Ptr::staticCast(p);
-
-            if (!subGroup->noDisplay() && subGroup->childCount() > 0) {
-                groupMap.insert(subGroup->caption().toLower(), subGroup);
-            }
-        }
-    }
-    m_pendingGroupList = groupMap.values();
-    QMetaObject::invokeMethod(this, "loadNextGroup", Qt::QueuedConnection);
-}
-
-void GroupedInstalledAppsModel::loadNextGroup()
-{
-    if (m_pendingGroupList.isEmpty()) {
-        return;
-    }
-    KServiceGroup::Ptr group = m_pendingGroupList.takeFirst();
-    InstalledAppsModel *model = createInstalledAppsModel(group);
-    beginInsertRows(QModelIndex(), m_models.count(), m_models.count());
-    m_models << model;
-    endInsertRows();
-    QMetaObject::invokeMethod(this, "loadNextGroup", Qt::QueuedConnection);
-}
-
-int GroupedInstalledAppsModel::rowCount(const QModelIndex &parent) const
-{
-    if (parent.isValid()) {
-        return 0;
-    }
-    return m_models.count();
-}
-
-QVariant GroupedInstalledAppsModel::data(const QModelIndex &index, int role) const
-{
-    if (index.parent().isValid()) {
-        return QVariant();
-    }
-
-    InstalledAppsModel *model = m_models.value(index.row());
-    if (!model) {
-        return QVariant();
-    }
-
-    if (role == Qt::DisplayRole) {
-        return model->name();
-    } else {
-        return QVariant();
-    }
-}
-
-InstalledAppsModel *GroupedInstalledAppsModel::createInstalledAppsModel(KServiceGroup::Ptr group)
-{
-    return new InstalledAppsModel(group->entryPath(), m_installer, this);
-}
-
-//- GroupedInstalledAppsSource --------------------------------------
-GroupedInstalledAppsSource::GroupedInstalledAppsSource(QObject *parent)
-: AbstractSource(parent)
-{}
-
-QAbstractItemModel *GroupedInstalledAppsSource::createModelFromConfigGroup(const KConfigGroup &)
-{
-    KConfigGroup group(config(), "PackageManagement");
-    QString installer = group.readEntry("categoryInstaller");
-    return new GroupedInstalledAppsModel(installer);
-}
-
-} // namespace Homerun
-
-#include <groupedinstalledappsmodel.moc>

=== removed file 'components/groupedinstalledappsmodel.h'
--- components/groupedinstalledappsmodel.h	2012-11-14 21:30:06 +0000
+++ components/groupedinstalledappsmodel.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef GROUPEDINSTALLEDAPPSMODEL_H
-#define GROUPEDINSTALLEDAPPSMODEL_H
-
-// Local
-#include <abstractsource.h>
-
-// Qt
-#include <QAbstractListModel>
-
-// KDE
-#include <KServiceGroup>
-
-namespace Homerun {
-
-class InstalledAppsModel;
-
-/**
- * A model which returns all services in grouped sub-models
- */
-class GroupedInstalledAppsModel : public QAbstractListModel
-{
-    Q_OBJECT
-public:
-    explicit GroupedInstalledAppsModel(const QString &installer, QObject *parent = 0);
-    ~GroupedInstalledAppsModel();
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const; // reimp
-    QVariant data(const QModelIndex &, int role = Qt::DisplayRole) const; // reimp
-
-    Q_INVOKABLE QObject *modelForRow(int row) const;
-
-Q_SIGNALS:
-    void installerChanged(const QString &);
-
-private Q_SLOTS:
-    void loadRootEntries();
-    void loadNextGroup();
-
-private:
-    QString m_installer;
-    QList<KServiceGroup::Ptr> m_pendingGroupList;
-    QList<InstalledAppsModel *> m_models;
-
-    InstalledAppsModel *createInstalledAppsModel(KServiceGroup::Ptr group);
-};
-
-class GroupedInstalledAppsSource : public AbstractSource
-{
-public:
-    GroupedInstalledAppsSource(QObject *parent);
-    QAbstractItemModel *createModelFromConfigGroup(const KConfigGroup &);
-};
-
-} // namespace Homerun
-
-#endif /* GROUPEDINSTALLEDAPPSMODEL_H */

=== removed file 'components/installedappsconfigurationwidget.cpp'
--- components/installedappsconfigurationwidget.cpp	2012-11-14 21:30:06 +0000
+++ components/installedappsconfigurationwidget.cpp	1970-01-01 00:00:00 +0000
@@ -1,145 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// Self
-#include <installedappsconfigurationwidget.h>
-
-// Local
-#include <ui_installedappsconfigurationwidget.h>
-
-// KDE
-#include <KDebug>
-#include <KIcon>
-#include <KServiceGroup>
-#include <KSycocaEntry>
-
-// Qt
-#include <QStandardItem>
-#include <QStandardItemModel>
-
-enum {
-    EntryPathRole = Qt::UserRole + 1,
-    SortRole,
-};
-
-namespace Homerun
-{
-
-InstalledAppsConfigurationWidget::InstalledAppsConfigurationWidget(const KConfigGroup &group)
-: SourceConfigurationWidget(group)
-, m_ui(new Ui_InstalledAppsConfigurationWidget)
-, m_model(new QStandardItemModel(this))
-{
-    // Init model
-    QStandardItem *defaultItem = fillModel(group.readEntry("entryPath"));
-    m_model->setSortRole(SortRole);
-    m_model->sort(0);
-
-    m_ui->setupUi(this);
-    m_ui->treeView->setModel(m_model);
-
-    // Select currently configured item
-    Q_ASSERT(defaultItem);
-    QModelIndex index = defaultItem->index();
-    m_ui->treeView->selectionModel()->select(index, QItemSelectionModel::Select);
-
-    // Expand up to the configured item
-    index = index.parent();
-    for (; index.isValid(); index = index.parent()) {
-        m_ui->treeView->setExpanded(index, true);
-    }
-
-    // Always expand top level
-    m_ui->treeView->setExpanded(m_model->index(0, 0), true);
-}
-
-InstalledAppsConfigurationWidget::~InstalledAppsConfigurationWidget()
-{
-    delete m_ui;
-}
-
-void InstalledAppsConfigurationWidget::save()
-{
-    QModelIndex index = m_ui->treeView->selectionModel()->currentIndex();
-    if (!index.isValid()) {
-        kWarning() << "No item selected!";
-        return;
-    }
-    QString entryPath = index.data(EntryPathRole).toString();
-    configGroup().writeEntry("entryPath", entryPath);
-}
-
-
-// Helper struct for fillModel
-struct ItemCreator
-{
-    ItemCreator()
-    : m_item(0)
-    {}
-    QString m_entryPath;
-    QStandardItem *m_item;
-
-    void createItemChildren(QStandardItem *parent, KServiceGroup::Ptr parentGroup)
-    {
-        KServiceGroup::List list = parentGroup->entries(false /* sorted: set to false as it does not seem to work */);
-
-        Q_FOREACH(const KSycocaEntry::Ptr entry, list) {
-            if (!entry->isType(KST_KServiceGroup)) {
-                continue;
-            }
-            KServiceGroup::Ptr group = KServiceGroup::Ptr::staticCast(entry);
-
-            if (group->noDisplay() || group->childCount() == 0) {
-                continue;
-            }
-            QString entryPath = group->entryPath();
-
-            QStandardItem *item = new QStandardItem;
-            item->setText(group->caption());
-            item->setIcon(KIcon(group->icon()));
-            item->setData(entryPath, EntryPathRole);
-            item->setData(group->caption().toLower(), SortRole);
-
-            parent->appendRow(item);
-            createItemChildren(item, group);
-
-            if (m_entryPath == entryPath) {
-                m_item = item;
-            }
-        }
-    }
-};
-
-QStandardItem *InstalledAppsConfigurationWidget::fillModel(const QString &entryPath)
-{
-    KServiceGroup::Ptr group = KServiceGroup::root();
-    QStandardItem *rootItem = new QStandardItem;
-    rootItem->setText(i18n("All Applications"));
-    rootItem->setData(QString(), EntryPathRole);
-    m_model->appendRow(rootItem);
-
-    ItemCreator creator;
-    creator.m_entryPath = entryPath;
-    creator.createItemChildren(rootItem, group);
-    return creator.m_item ? creator.m_item : rootItem;
-}
-
-} // namespace Homerun
-
-#include <installedappsconfigurationwidget.moc>

=== removed file 'components/installedappsconfigurationwidget.h'
--- components/installedappsconfigurationwidget.h	2012-11-14 21:30:06 +0000
+++ components/installedappsconfigurationwidget.h	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef INSTALLEDAPPSCONFIGURATIONWIDGET_H
-#define INSTALLEDAPPSCONFIGURATIONWIDGET_H
-
-// Local
-#include <sourceconfigurationwidget.h>
-
-// Qt
-
-// KDE
-#include <KServiceGroup>
-
-class QStandardItem;
-class QStandardItemModel;
-
-class Ui_InstalledAppsConfigurationWidget;
-
-namespace Homerun
-{
-
-/**
- * Configuration widget for the InstalledApps source
- */
-class InstalledAppsConfigurationWidget : public SourceConfigurationWidget
-{
-    Q_OBJECT
-public:
-    explicit InstalledAppsConfigurationWidget(const KConfigGroup &group);
-    ~InstalledAppsConfigurationWidget();
-
-    void save(); // reimp
-
-private:
-    Ui_InstalledAppsConfigurationWidget *m_ui;
-    QStandardItemModel *m_model;
-
-    /**
-     * Fill m_model, returns the item which corresponds to defaultEntryPath
-     */
-    QStandardItem *fillModel(const QString &defaultEntryPath);
-};
-
-} // namespace Homerun
-
-#endif /* INSTALLEDAPPSCONFIGURATIONWIDGET_H */

=== removed file 'components/installedappsconfigurationwidget.ui'
--- components/installedappsconfigurationwidget.ui	2012-11-14 21:30:06 +0000
+++ components/installedappsconfigurationwidget.ui	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>InstalledAppsConfigurationWidget</class>
- <widget class="QWidget" name="InstalledAppsConfigurationWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>408</width>
-    <height>327</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Pick the application folder to display:</string>
-     </property>
-     <property name="buddy">
-      <cstring>treeView</cstring>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTreeView" name="treeView">
-     <property name="minimumSize">
-      <size>
-       <width>400</width>
-       <height>300</height>
-      </size>
-     </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::NoEditTriggers</set>
-     </property>
-     <property name="showDropIndicator" stdset="0">
-      <bool>false</bool>
-     </property>
-     <property name="rootIsDecorated">
-      <bool>false</bool>
-     </property>
-     <property name="headerHidden">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

=== removed file 'components/installedappsmodel.cpp'
--- components/installedappsmodel.cpp	2012-11-14 21:30:06 +0000
+++ components/installedappsmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,319 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// Local
-#include <pathmodel.h>
-#include <installedappsmodel.h>
-#include <installedappsconfigurationwidget.h>
-#include <sourceregistry.h>
-
-// Qt
-#include <QIcon>
-#include <QAction>
-#include <QTimer>
-
-// KDE
-#include <KDebug>
-#include <KLocale>
-#include <kmacroexpander.h>
-#include <KRun>
-#include <KService>
-#include <KServiceTypeTrader>
-#include <KSycocaEntry>
-
-#include <Plasma/RunnerManager>
-
-namespace Homerun {
-
-static const char *SOURCE_ID = "InstalledApps";
-
-//- AbstractNode ---------------------------------------------------------------
-AbstractNode::~AbstractNode()
-{
-}
-
-bool AbstractNode::lessThan(AbstractNode *n1, AbstractNode *n2)
-{
-    Q_ASSERT(n1);
-    Q_ASSERT(n2);
-    return n1->m_sortKey < n2->m_sortKey;
-}
-
-//- GroupNode ------------------------------------------------------------------
-GroupNode::GroupNode(KServiceGroup::Ptr group, InstalledAppsModel *model)
-: m_model(model)
-{
-    m_icon = group->icon();
-    m_name = group->caption();
-    m_entryPath = group->entryPath();
-    m_sortKey = m_name.toLower();
-}
-
-bool GroupNode::trigger()
-{
-    QVariantMap args;
-    args.insert("entryPath", m_entryPath);
-    m_model->openSourceRequested(SOURCE_ID, args);
-    return false;
-}
-
-//- AppNode --------------------------------------------------------------------
-AppNode::AppNode(KService::Ptr service)
-: m_service(service)
-{
-    m_icon = service->icon();
-    m_name = service->name();
-    m_service = service;
-    m_sortKey = m_name.toLower();
-}
-
-bool AppNode::trigger()
-{
-    return KRun::run(*m_service, KUrl::List(), 0);
-}
-
-QString AppNode::favoriteId() const
-{
-    return QString("app:") + m_service->storageId();
-}
-
-//- InstallerNode --------------------------------------------------------------
-InstallerNode::InstallerNode(KServiceGroup::Ptr group, KService::Ptr installerService)
-: m_group(group)
-, m_service(installerService)
-{
-    m_icon = m_service->icon();
-    m_name = m_service->name();
-}
-
-bool InstallerNode::trigger()
-{
-    QHash<QString, QString> map;
-    QString category = m_group->entryPath();
-    if (category.endsWith('/')) {
-        category.truncate(category.length() - 1);
-    }
-    map.insert("category", category);
-
-    QString command = KMacroExpander::expandMacros(m_service->exec(), map, '@');
-    return KRun::run(command, KUrl::List(), 0, m_service->name(), m_service->icon());
-}
-
-//- InstalledAppsModel ------------------------------------------------------------
-InstalledAppsModel::InstalledAppsModel(const QString &entryPath, const QString &installer, QObject *parent)
-: QAbstractListModel(parent)
-, m_pathModel(new PathModel(this))
-, m_installer(installer)
-{
-    QHash<int, QByteArray> roles;
-    roles.insert(Qt::DisplayRole, "display");
-    roles.insert(Qt::DecorationRole, "decoration");
-    roles.insert(FavoriteIdRole, "favoriteId");
-
-    setRoleNames(roles);
-
-    load(entryPath);
-}
-
-InstalledAppsModel::~InstalledAppsModel()
-{
-    qDeleteAll(m_nodeList);
-}
-
-int InstalledAppsModel::rowCount(const QModelIndex& index) const
-{
-    return index.isValid() ? 0 : m_nodeList.count();
-}
-
-int InstalledAppsModel::count() const
-{
-    return m_nodeList.count();
-}
-
-QVariant InstalledAppsModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid() || index.row() >= m_nodeList.count()) {
-        return QVariant();
-    }
-
-    const AbstractNode *node = m_nodeList.at(index.row());
-    if (role == Qt::DisplayRole) {
-        return node->name();
-    } else if (role == Qt::DecorationRole) {
-        // at least show the oxygen question-mark, otherwise it looks weird blank.
-        return node->icon().isEmpty() ? QLatin1String("unknown") : node->icon();
-    } else if (role == FavoriteIdRole) {
-        return node->favoriteId();
-    }
-
-    return QVariant();
-}
-
-bool InstalledAppsModel::trigger(int row)
-{
-    return m_nodeList.at(row)->trigger();
-}
-
-void InstalledAppsModel::load(const QString &entryPath)
-{
-    m_pathModel->clear();
-    beginResetModel();
-    qDeleteAll(m_nodeList);
-    m_nodeList.clear();
-
-    if (entryPath.isEmpty()) {
-        loadRootEntries();
-    } else {
-        KServiceGroup::Ptr group = KServiceGroup::group(entryPath);
-        loadServiceGroup(group);
-        QVariantMap args;
-        args.insert("entryPath", entryPath);
-        m_pathModel->addPath(group->caption(), SOURCE_ID, args);
-    }
-
-    endResetModel();
-
-    emit countChanged();
-}
-
-void InstalledAppsModel::loadRootEntries()
-{
-    KServiceGroup::Ptr group = KServiceGroup::root();
-    KServiceGroup::List list = group->entries(false /* sorted: set to false as it does not seem to work */);
-
-    for( KServiceGroup::List::ConstIterator it = list.constBegin(); it != list.constEnd(); it++) {
-        const KSycocaEntry::Ptr p = (*it);
-
-        if (p->isType(KST_KServiceGroup)) {
-            KServiceGroup::Ptr subGroup = KServiceGroup::Ptr::staticCast(p);
-
-            if (!subGroup->noDisplay() && subGroup->childCount() > 0) {
-                m_nodeList << new GroupNode(subGroup, this);
-            }
-        }
-    }
-    qSort(m_nodeList.begin(), m_nodeList.end(), AbstractNode::lessThan);
-}
-
-void InstalledAppsModel::loadServiceGroup(KServiceGroup::Ptr group)
-{
-    doLoadServiceGroup(group);
-
-    qSort(m_nodeList.begin(), m_nodeList.end(), AbstractNode::lessThan);
-
-    if (!m_installer.isEmpty()) {
-        KService::Ptr service = KService::serviceByDesktopName(m_installer);
-        if (service) {
-            m_nodeList << new InstallerNode(group, service);
-        } else {
-            kWarning() << "Could not find service for" << m_installer;
-        }
-    }
-}
-
-void InstalledAppsModel::doLoadServiceGroup(KServiceGroup::Ptr group)
-{
-    /* This method is separate from loadServiceGroup so that
-     * - only one installer node is added at the end
-     * - sorting is done only once
-     */
-    if (!group || !group->isValid()) {
-        return;
-    }
-
-    KServiceGroup::List list = group->entries(false /* see above */);
-
-    for( KServiceGroup::List::ConstIterator it = list.constBegin();
-        it != list.constEnd(); it++) {
-        const KSycocaEntry::Ptr p = (*it);
-
-        if (p->isType(KST_KService)) {
-            const KService::Ptr service = KService::Ptr::staticCast(p);
-
-            if (!service->noDisplay()) {
-                QString genericName = service->genericName();
-                if (genericName.isNull()) {
-                    genericName = service->comment();
-                }
-                m_nodeList << new AppNode(service);
-            }
-
-        } else if (p->isType(KST_KServiceGroup)) {
-            const KServiceGroup::Ptr subGroup = KServiceGroup::Ptr::staticCast(p);
-
-            if (!subGroup->noDisplay() && subGroup->childCount() > 0) {
-                doLoadServiceGroup(subGroup);
-            }
-        }
-    }
-}
-
-PathModel *InstalledAppsModel::pathModel() const
-{
-    return m_pathModel;
-}
-
-QString InstalledAppsModel::name() const
-{
-    if (m_pathModel->count() > 0) {
-        QModelIndex index = m_pathModel->index(m_pathModel->count() - 1, 0);
-        return index.data().toString();
-    } else {
-        return i18n("Applications");
-    }
-}
-
-//- InstalledAppsSource ---------------------------------------------
-InstalledAppsSource::InstalledAppsSource(QObject *parent)
-: AbstractSource(parent)
-{}
-
-QAbstractItemModel *InstalledAppsSource::createModelFromConfigGroup(const KConfigGroup &group)
-{
-    QString entryPath = group.readEntry("entryPath");
-    return createModel(entryPath);
-}
-
-QAbstractItemModel *InstalledAppsSource::createModelFromArguments(const QVariantMap &arguments)
-{
-    QString entryPath = arguments.value("entryPath").toString();
-    return createModel(entryPath);
-}
-
-QAbstractItemModel *InstalledAppsSource::createModel(const QString &entryPath)
-{
-    KConfigGroup group(config(), "PackageManagement");
-    QString installer = group.readEntry("categoryInstaller");
-
-    return new InstalledAppsModel(entryPath, installer);
-}
-
-bool InstalledAppsSource::isConfigurable() const
-{
-    return true;
-}
-
-SourceConfigurationWidget *InstalledAppsSource::createConfigurationWidget(const KConfigGroup &group)
-{
-    return new InstalledAppsConfigurationWidget(group);
-}
-
-} // namespace Homerun
-
-#include "installedappsmodel.moc"

=== removed file 'components/installedappsmodel.h'
--- components/installedappsmodel.h	2012-11-14 21:30:06 +0000
+++ components/installedappsmodel.h	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef INSTALLEDAPPSMODEL_H
-#define INSTALLEDAPPSMODEL_H
-
-// Local
-#include <abstractsource.h>
-
-// Qt
-#include <QAbstractListModel>
-#include <QStringList>
-
-// KDE
-#include <KIcon>
-#include <KService>
-#include <KServiceGroup>
-#include <KUrl>
-
-namespace Homerun {
-
-class PathModel;
-
-class InstalledAppsModel;
-class InstalledAppsSource;
-
-class AbstractNode
-{
-public:
-    virtual ~AbstractNode();
-
-    virtual bool trigger() = 0;
-    virtual QString favoriteId() const { return QString(); }
-
-    QString icon() const { return m_icon; }
-    QString name() const { return m_name; }
-
-    static bool lessThan(AbstractNode *n1, AbstractNode *n2);
-
-protected:
-    QString m_sortKey;
-    QString m_icon;
-    QString m_name;
-};
-
-class GroupNode : public AbstractNode
-{
-public:
-    GroupNode(KServiceGroup::Ptr group, InstalledAppsModel *model);
-
-    bool trigger(); // reimp
-
-private:
-    InstalledAppsModel *m_model;
-    QString m_entryPath;
-};
-
-class AppNode : public AbstractNode
-{
-public:
-    AppNode(KService::Ptr service);
-
-    bool trigger(); // reimp;
-    QString favoriteId() const; // reimp
-
-private:
-    KService::Ptr m_service;
-};
-
-class InstallerNode : public AbstractNode
-{
-public:
-    InstallerNode(KServiceGroup::Ptr group, KService::Ptr installerService);
-
-    bool trigger(); // reimp
-
-private:
-    InstalledAppsModel *m_model;
-    KServiceGroup::Ptr m_group;
-    KService::Ptr m_service;
-};
-
-class InstalledAppsModel : public QAbstractListModel
-{
-    Q_OBJECT
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(QObject* pathModel READ pathModel CONSTANT)
-    Q_PROPERTY(QString name READ name CONSTANT)
-
-public:
-    enum Roles {
-        FavoriteIdRole = Qt::UserRole + 1,
-    };
-
-    InstalledAppsModel(const QString &entryPath, const QString &installer, QObject *parent = 0);
-    ~InstalledAppsModel();
-
-    int rowCount(const QModelIndex&) const;
-    int count() const;
-    QVariant data(const QModelIndex&, int) const;
-
-    PathModel *pathModel() const;
-
-    Q_INVOKABLE bool trigger(int row);
-
-    QString name() const;
-
-Q_SIGNALS:
-    void countChanged();
-    void openSourceRequested(const QString &sourceId, const QVariantMap &args);
-
-private:
-    void loadRootEntries();
-    void loadServiceGroup(KServiceGroup::Ptr group);
-    void doLoadServiceGroup(KServiceGroup::Ptr group);
-
-    PathModel *m_pathModel;
-    QList<AbstractNode *> m_nodeList;
-    QString m_installer;
-    QString m_arguments;
-
-    void load(const QString &entryPath);
-
-    friend class GroupNode;
-};
-
-class InstalledAppsSource : public AbstractSource
-{
-public:
-    InstalledAppsSource(QObject *parent);
-    QAbstractItemModel *createModelFromConfigGroup(const KConfigGroup &group); // reimp
-    QAbstractItemModel *createModelFromArguments(const QVariantMap &arguments); // reimp
-
-    bool isConfigurable() const; // reimp
-    SourceConfigurationWidget *createConfigurationWidget(const KConfigGroup &group); // reimp
-
-private:
-    QAbstractItemModel *createModel(const QString &entryPath);
-};
-
-} // namespace Homerun
-
-#endif

=== added file 'components/messagebox.cpp'
--- components/messagebox.cpp	1970-01-01 00:00:00 +0000
+++ components/messagebox.cpp	2013-03-01 15:15:27 +0000
@@ -0,0 +1,45 @@
+/*
+Copyright 2013 Aurélien Gâteau <[e-mail]>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License or (at your option) version 3 or any later version
+accepted by the membership of KDE e.V. (or its successor approved
+by the membership of KDE e.V.), which shall act as a proxy
+defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Self
+#include <messagebox.h>
+
+// Local
+
+// KDE
+
+// Qt
+#include <QApplication>
+
+MessageBox::MessageBox(QObject *parent)
+: QObject(parent)
+{
+}
+
+int MessageBox::warningContinueCancel(const QString& text, const QString& caption, const QString& continueText, const QString& cancelText)
+{
+    KGuiItem cont = continueText.isEmpty() ? KStandardGuiItem::cont() : KGuiItem(continueText);
+    KGuiItem cancel = cancelText.isEmpty() ? KStandardGuiItem::cancel() : KGuiItem(cancelText);
+    int ret = KMessageBox::warningContinueCancel(QApplication::activeWindow(),
+        text, caption, cont, cancel);
+
+    return ret;
+}
+
+#include <messagebox.moc>

=== added file 'components/messagebox.h'
--- components/messagebox.h	1970-01-01 00:00:00 +0000
+++ components/messagebox.h	2013-03-01 15:15:27 +0000
@@ -0,0 +1,60 @@
+/*
+Copyright 2013 Aurélien Gâteau <[e-mail]>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License or (at your option) version 3 or any later version
+accepted by the membership of KDE e.V. (or its successor approved
+by the membership of KDE e.V.), which shall act as a proxy
+defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef MESSAGEBOX_H
+#define MESSAGEBOX_H
+
+// Local
+
+// Qt
+#include <QObject>
+
+// KDE
+#include <KMessageBox>
+
+/**
+ * Wrapper around KMessageBox
+ */
+class MessageBox : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(ButtonCode)
+public:
+    explicit MessageBox(QObject *parent = 0);
+
+    enum ButtonCode {
+        Ok = KMessageBox::Ok,
+        Cancel = KMessageBox::Cancel,
+        Yes = KMessageBox::Yes,
+        No = KMessageBox::No,
+        Continue = KMessageBox::Continue,
+    };
+
+    /**
+     * Return value is a MessageBox::ButtonCode
+     */
+    Q_INVOKABLE int warningContinueCancel(
+        const QString &text,
+        const QString &caption = QString(),
+        const QString &continueText = QString(),
+        const QString &cancelText = QString()
+    );
+};
+
+#endif /* MESSAGEBOX_H */

=== removed file 'components/powermodel.cpp'
--- components/powermodel.cpp	2012-12-18 19:55:12 +0000
+++ components/powermodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-/*
-    Copyright 2012 Aurélien Gâteau <[e-mail]>
-    Copyright (C) 2012 Shaun Reich <[e-mail]>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-// Own
-#include "powermodel.h"
-
-//Qt
-#include <QDBusMessage>
-#include <QDBusConnection>
-#include <QDBusPendingCall>
-
-// KDE
-#include <KDebug>
-#include <KIcon>
-#include <KLocale>
-#include <KRun>
-#include <KService>
-#include <kworkspace/kworkspace.h>
-
-//Plasma
-#include <Plasma/AbstractRunner>
-#include <Plasma/RunnerManager>
-
-namespace Homerun {
-
-PowerModel::PowerModel(QObject *parent)
-: QAbstractListModel(parent)
-{
-    PowerAction suspend;
-    suspend.name = i18nc("an action", "Suspend");
-    suspend.type = Suspend;
-    suspend.iconName = "system-suspend";
-    m_powerList.append(suspend);
-
-    PowerAction hibernate;
-    hibernate.name = i18nc("an action", "Hibernate");
-    hibernate.type = Hibernate;
-    hibernate.iconName = "system-suspend-hibernate";
-    m_powerList.append(hibernate);
-
-    PowerAction restart;
-    restart.name = i18nc("an action", "Restart");
-    restart.type = Restart;
-    restart.iconName = "system-reboot";
-    m_powerList.append(restart);
-
-    PowerAction shutdown;
-    shutdown.name = i18nc("an action", "Shutdown");
-    shutdown.type = Shutdown;
-    shutdown.iconName = "system-shutdown";
-    m_powerList.append(shutdown);
-}
-
-PowerModel::~PowerModel()
-{
-}
-
-int PowerModel::count() const
-{
-    return m_powerList.count();
-}
-
-QString PowerModel::name() const
-{
-    return i18n("Power");
-}
-
-int PowerModel::rowCount(const QModelIndex &index) const
-{
-    if (index.isValid()) {
-        return 0;
-    }
-    return m_powerList.count();
-}
-
-QVariant PowerModel::data(const QModelIndex &index, int role) const
-{
-    PowerAction action = m_powerList.value(index.row());
-
-    if (role == Qt::DisplayRole) {
-        return action.name;
-    } else if (role == Qt::DecorationRole) {
-        return KIcon(action.iconName);
-    } else {
-        kWarning() << "Unhandled role" << role;
-        return QVariant();
-    }
-}
-
-bool PowerModel::trigger(int row)
-{
-    PowerAction action = m_powerList.value(row);
-
-    switch (action.type) {
-        case Shutdown:
-            KWorkSpace::requestShutDown(KWorkSpace::ShutdownConfirmDefault, KWorkSpace::ShutdownTypeHalt);
-            break;
-
-        case Restart:
-            KWorkSpace::requestShutDown(KWorkSpace::ShutdownConfirmDefault, KWorkSpace::ShutdownTypeReboot);
-            break;
-
-        case Suspend:
-            suspend("suspendToRam");
-            break;
-
-        case Hibernate:
-            suspend("suspendToDisk");
-            break;
-    }
-
-    return true;
-}
-
-void PowerModel::suspend(const QString& type)
-{
-    QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.Solid.PowerManagement",
-                                                      "/org/kde/Solid/PowerManagement",
-                                                      "org.kde.Solid.PowerManagement",
-                                                      type);
-    QDBusConnection::sessionBus().asyncCall(msg);
-}
-
-} // namespace Homerun
-
-#include "powermodel.moc"

=== removed file 'components/powermodel.h'
--- components/powermodel.h	2012-11-14 21:30:06 +0000
+++ components/powermodel.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
-    Copyright 2012 Aurélien Gâteau <[e-mail]>
-    Copyright 2012 (C) Shaun Reich <[e-mail]>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef POWERMODEL_H
-#define POWERMODEL_H
-
-#include <QAbstractListModel>
-
-#include <KService>
-
-class QString;
-
-namespace Homerun {
-
-enum PowerType {
-    Shutdown,
-    Restart,
-    Hibernate,
-    Suspend
-};
-
-struct PowerAction
-{
-    QString name;
-    QString iconName;
-    PowerType type;
-};
-
-class PowerModel : public QAbstractListModel
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-
-public:
-    PowerModel(QObject *parent = 0);
-    ~PowerModel();
-
-    int count() const;
-    QString name() const;
-
-    int rowCount(const QModelIndex & = QModelIndex()) const;
-    QVariant data(const QModelIndex &, int role = Qt::DisplayRole) const;
-
-    Q_INVOKABLE bool trigger(int row);
-
-    void suspend(const QString& type);
-
-Q_SIGNALS:
-    void countChanged();
-
-private:
-    QList<PowerAction> m_powerList;
-};
-
-} // namespace Homerun
-
-#endif

=== added file 'components/qml/Label.qml'
--- components/qml/Label.qml	1970-01-01 00:00:00 +0000
+++ components/qml/Label.qml	2013-03-01 15:15:27 +0000
@@ -0,0 +1,68 @@
+/*
+Copyright 2013 Aurélien Gâteau <[e-mail]>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License or (at your option) version 3 or any later version
+accepted by the membership of KDE e.V. (or its successor approved
+by the membership of KDE e.V.), which shall act as a proxy
+defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+import QtQuick 1.1
+import org.kde.homerun.components 0.1 as HomerunComponents
+import org.kde.plasma.components 0.1 as PlasmaComponents
+
+/**
+ * A label which uses Plasma colors by default, but appears differently when
+ * run as a containment: it shows a shadow behind itself and both shadow and
+ * text colors can be customized.
+ */
+PlasmaComponents.Label {
+    id: main
+
+    Component {
+        id: shadowComponent
+        HomerunComponents.ShadowEffect {
+            xOffset: 0
+            yOffset: 1
+            blurRadius: 2
+        }
+    }
+
+    Component.onCompleted: {
+        var isContainment = "plasmoid" in this;
+        if (isContainment) {
+            readConfig();
+            plasmoid.addEventListener("ConfigChanged", readConfig);
+        } else {
+            main.color = theme.textColor;
+        }
+    }
+
+    function readConfig() {
+        main.color = plasmoid.readConfig("textColor");
+        if (plasmoid.readConfig("shadowModeNone") == true) {
+            if (main.effect) {
+                main.effect.destroy();
+            }
+            return;
+        }
+        if (!main.effect) {
+            main.effect = shadowComponent.createObject(main);
+        }
+        if (plasmoid.readConfig("shadowModeCustom") == true) {
+            main.effect.color = plasmoid.readConfig("shadowColor");
+        } else {
+            main.effect.resetColor();
+        }
+    }
+}

=== modified file 'components/qml/TabButton.qml'
--- components/qml/TabButton.qml	2012-11-14 21:30:06 +0000
+++ components/qml/TabButton.qml	2013-03-01 15:15:27 +0000
@@ -81,7 +81,7 @@
 **/
 
 import QtQuick 1.1
-import org.kde.plasma.components 0.1
+import org.kde.plasma.components 0.1 as PlasmaComponents
 import "private" as Private
 
 Item {
@@ -127,6 +127,15 @@
         }
     }
 
+    /*
+    HACK: We use a HomerunComponents.Label for the normal text and
+    a PlasmaComponents.Label for the current text.
+
+    This is necessary for containment mode:
+    It makes it possible to have custom color + shadow for normal text (to
+    ensure it remains readable) and buttonTextColor + no-shadow for button text
+    (because it is drawn on top of a button frame)
+    */
     Label {
         id: label
 
@@ -144,7 +153,24 @@
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
 
-        color: root.ListView.isCurrentItem ? theme.buttonTextColor : theme.textColor
+        color: theme.textColor
+        opacity: root.ListView.isCurrentItem ? 0 : 1
+        Behavior on opacity { NumberAnimation { duration: 250 }}
+    }
+
+    PlasmaComponents.Label {
+        id: currentLabel
+        text: label.text
+
+        anchors.fill: label
+
+        elide: label.elide
+        horizontalAlignment: label.horizontalAlignment
+        verticalAlignment: label.verticalAlignment
+
+        color: theme.buttonTextColor
+        opacity: root.ListView.isCurrentItem ? 1 : 0
+        Behavior on opacity { NumberAnimation { duration: 250 }}
     }
 
     MouseArea {

=== modified file 'components/qml/qmldir'
--- components/qml/qmldir	2012-11-14 21:30:06 +0000
+++ components/qml/qmldir	2013-03-01 15:15:27 +0000
@@ -3,3 +3,4 @@
 TabBar 0.1 TabBar.qml
 TabButton 0.1 TabButton.qml
 TabGroup 0.1 TabGroup.qml
+Label 0.1 Label.qml

=== removed file 'components/runnerconfigurationwidget.cpp'
--- components/runnerconfigurationwidget.cpp	2012-11-14 21:30:06 +0000
+++ components/runnerconfigurationwidget.cpp	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// Self
-#include <runnerconfigurationwidget.h>
-
-// Local
-
-// KDE
-#include <KDebug>
-#include <KPluginInfo>
-#include <Plasma/RunnerManager>
-
-// Qt
-#include <QListWidgetItem>
-
-Q_DECLARE_METATYPE(KPluginInfo)
-
-static const char *WHITELIST_KEY = "whitelist";
-
-namespace Homerun
-{
-
-static QListWidgetItem *createWidgetItem(const KPluginInfo &info)
-{
-    QListWidgetItem *item = new QListWidgetItem(info.name());
-    item->setIcon(KIcon(info.icon()));
-    item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
-    item->setData(Qt::UserRole, QVariant::fromValue(info));
-    return item;
-}
-
-RunnerConfigurationWidget::RunnerConfigurationWidget(const KConfigGroup &group)
-: SourceConfigurationWidget(group)
-{
-    setupUi(this);
-    m_searchLine->setListWidget(m_listWidget);
-
-    // A runner is enabled if there is either a whitelist and it is part of it
-    // or if there is no whitelist and its EnabledByDefault key is true
-
-    QStringList whiteList = group.readEntry(WHITELIST_KEY, QStringList());
-    bool hasWhiteList = !whiteList.isEmpty();
-
-    KPluginInfo::List list = Plasma::RunnerManager::listRunnerInfo();
-    Q_FOREACH(const KPluginInfo &info, list) {
-        QListWidgetItem *item = createWidgetItem(info);
-        bool selected;
-        if (hasWhiteList) {
-            selected = whiteList.contains(info.pluginName());
-        } else {
-            selected = info.isPluginEnabledByDefault();
-        }
-        item->setCheckState(selected ? Qt::Checked : Qt::Unchecked);
-        m_listWidget->addItem(item);
-    }
-    m_listWidget->sortItems();
-}
-
-void RunnerConfigurationWidget::save()
-{
-    QStringList whiteList;
-    bool hasChanges = false;
-
-    // Only write a whiteList if the selected runner list is not the same as
-    // the list of all EnabledByDefault runners
-
-    for (int idx = 0; idx < m_listWidget->count(); ++idx) {
-        QListWidgetItem *item = m_listWidget->item(idx);
-        KPluginInfo info = item->data(Qt::UserRole).value<KPluginInfo>();
-
-        bool selected = item->checkState() == Qt::Checked;
-        if (selected != info.isPluginEnabledByDefault()) {
-            hasChanges = true;
-        }
-        if (selected) {
-            whiteList << info.pluginName();
-        }
-    }
-    if (hasChanges) {
-        configGroup().writeEntry(WHITELIST_KEY, whiteList);
-    } else {
-        configGroup().deleteEntry(WHITELIST_KEY);
-    }
-}
-
-} // namespace Homerun
-
-#include <runnerconfigurationwidget.moc>

=== removed file 'components/runnerconfigurationwidget.h'
--- components/runnerconfigurationwidget.h	2012-11-14 21:30:06 +0000
+++ components/runnerconfigurationwidget.h	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef RUNNERCONFIGURATIONWIDGET_H
-#define RUNNERCONFIGURATIONWIDGET_H
-
-// Local
-#include <sourceconfigurationwidget.h>
-#include <ui_runnerconfigurationwidget.h>
-
-// Qt
-
-// KDE
-
-namespace Homerun
-{
-
-/**
- * A configuration widget for the Runner source
- */
-class RunnerConfigurationWidget : public SourceConfigurationWidget, private Ui_RunnerConfigurationWidget
-{
-    Q_OBJECT
-public:
-    explicit RunnerConfigurationWidget(const KConfigGroup &);
-
-    void save(); // reimp
-};
-
-} // namespace
-
-#endif /* RUNNERCONFIGURATIONWIDGET_H */

=== removed file 'components/runnerconfigurationwidget.ui'
--- components/runnerconfigurationwidget.ui	2012-11-14 21:30:06 +0000
+++ components/runnerconfigurationwidget.ui	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>RunnerConfigurationWidget</class>
- <widget class="QWidget" name="RunnerConfigurationWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Pick the runners you would like to use in this source:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="KListWidgetSearchLine" name="m_searchLine"/>
-   </item>
-   <item>
-    <widget class="KListWidget" name="m_listWidget"/>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>KListWidgetSearchLine</class>
-   <extends>KLineEdit</extends>
-   <header>klistwidgetsearchline.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KListWidget</class>
-   <extends>QListWidget</extends>
-   <header>klistwidget.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

=== removed file 'components/runnermodel.cpp'
--- components/runnermodel.cpp	2012-11-14 21:30:06 +0000
+++ components/runnermodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,408 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-Based on RunnerModel class. RunnerModel class copyright:
-
-Copyright 2011 Aaron Seigo <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with this library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
-*/
-// Self
-#include <runnermodel.h>
-
-// Local
-#include <runnerconfigurationwidget.h>
-
-// KDE
-#include <KDebug>
-#include <KPluginInfo>
-#include <Plasma/AbstractRunner>
-#include <Plasma/RunnerManager>
-
-// Qt
-#include <QStandardItemModel>
-#include <QTimer>
-
-static const char *WHITELIST_KEY = "whitelist";
-
-namespace Homerun {
-
-RunnerSubModel::RunnerSubModel(const QString &runnerId, const QString &name, QObject *parent)
-: QAbstractListModel(parent)
-, m_runnerId(runnerId)
-, m_name(name)
-{
-    QHash<int, QByteArray> roles;
-    roles.insert(Qt::DisplayRole, "display");
-    roles.insert(Qt::DecorationRole, "decoration");
-    roles.insert(FavoriteIdRole, "favoriteId");
-    /*
-    roles.insert(Type, "type");
-    roles.insert(Relevance, "relevance");
-    roles.insert(Data, "data");
-    roles.insert(Id, "id");
-    roles.insert(SubText, "description");
-    roles.insert(Enabled, "enabled");
-    roles.insert(RunnerId, "runnerid");
-    roles.insert(RunnerName, "runnerName");
-    roles.insert(Actions, "actions");
-    */
-    setRoleNames(roles);
-}
-
-int RunnerSubModel::count() const
-{
-    return m_matches.count();
-}
-
-int RunnerSubModel::rowCount(const QModelIndex& parent) const
-{
-    return parent.isValid() ? 0 : m_matches.count();
-}
-
-QVariant RunnerSubModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid() || index.parent().isValid() ||
-        index.column() > 0 || index.row() < 0 || index.row() >= m_matches.count()) {
-        // index requested must be valid, but we have no child items!
-        //kDebug() << "invalid index requested";
-        return QVariant();
-    }
-
-    const Plasma::QueryMatch &match = m_matches.at(index.row());
-    if (role == Qt::DisplayRole) {
-        return match.text();
-    } else if (role == Qt::DecorationRole) {
-        return match.icon();
-    } else if (role == FavoriteIdRole) {
-        QString runnerId = match.runner()->id();
-        if (runnerId == "services") {
-            return QVariant("app:" + match.data().toString());
-        } else if (runnerId == "locations") {
-            KUrl url(match.data().toString());
-            return QVariant("place:" + url.url());
-        } else {
-            return QString();
-        }
-    } /*else if (role == Type) {
-        return m_matches.at(index.row()).type();
-    } else if (role == Relevance) {
-        return m_matches.at(index.row()).relevance();
-    } else if (role == Data) {
-        return m_matches.at(index.row()).data();
-    } else if (role == Id) {
-        return m_matches.at(index.row()).id();
-    } else if (role == SubText) {
-        return m_matches.at(index.row()).subtext();
-    } else if (role == Enabled) {
-        return m_matches.at(index.row()).isEnabled();
-    } else if (role == RunnerId) {
-        return m_matches.at(index.row()).runner()->id();
-    } else if (role == RunnerName) {
-        return m_matches.at(index.row()).runner()->name();
-    } else if (role == Actions) {
-        QVariantList actions;
-        Plasma::QueryMatch amatch = m_matches.at(index.row());
-        QList<QAction*> theactions = m_manager->actionsForMatch(amatch);
-        foreach(QAction* action, theactions) {
-            actions += qVariantFromValue<QObject*>(action);
-        }
-        return actions;
-    }*/
-
-    return QVariant();
-}
-
-void RunnerSubModel::setMatches(const QList<Plasma::QueryMatch> &matches)
-{
-    bool fullReset = false;
-    int oldCount = m_matches.count();
-    int newCount = matches.count();
-    if (newCount > oldCount) {
-        // We received more matches than we had. If all common matches are the
-        // same, we can just append new matches instead of resetting the whole
-        // model
-        for (int row = 0; row < oldCount; ++row) {
-            if (!(m_matches.at(row) == matches.at(row))) {
-                fullReset = true;
-                break;
-            }
-        }
-        if (!fullReset) {
-            // Not a full reset, inserting rows
-            beginInsertRows(QModelIndex(), oldCount, newCount);
-            m_matches = matches;
-            endInsertRows();
-            emit countChanged();
-        }
-    } else {
-        fullReset = true;
-    }
-
-    if (fullReset) {
-        beginResetModel();
-        m_matches = matches;
-        endResetModel();
-        emit countChanged();
-    }
-}
-
-bool RunnerSubModel::trigger(int row)
-{
-    if (row >= 0 && row < m_matches.count()) {
-        triggerRequested(m_matches.at(row));
-    }
-    return true;
-}
-
-//--------------------------------------------------------------------
-
-RunnerModel::RunnerModel(QObject *parent)
-: QAbstractListModel(parent)
-, m_manager(0)
-, m_startQueryTimer(new QTimer(this))
-, m_runningChangedTimeout(new QTimer(this))
-, m_running(false)
-{
-    m_startQueryTimer->setSingleShot(true);
-    m_startQueryTimer->setInterval(10);
-    connect(m_startQueryTimer, SIGNAL(timeout()), this, SLOT(startQuery()));
-
-    //FIXME: HACK: some runners stay in a running but finished state, not possible to say if it's actually over
-    m_runningChangedTimeout->setSingleShot(true);
-    connect(m_runningChangedTimeout, SIGNAL(timeout()), this, SLOT(queryHasFinished()));
-}
-
-RunnerModel::~RunnerModel()
-{
-}
-
-int RunnerModel::rowCount(const QModelIndex &parent) const
-{
-    if (parent.isValid()) {
-        return 0;
-    }
-    return m_models.count();
-}
-
-QVariant RunnerModel::data(const QModelIndex &index, int role) const
-{
-    if (index.parent().isValid()) {
-        return QVariant();
-    }
-
-    RunnerSubModel *model = m_models.value(index.row());
-    if (!model) {
-        return QVariant();
-    }
-
-    if (role == Qt::DisplayRole) {
-        return model->name();
-    } else {
-        return QVariant();
-    }
-}
-
-bool RunnerModel::running() const
-{
-    return m_running;
-}
-
-QObject *RunnerModel::modelForRow(int row) const
-{
-    if (row < 0 || row >= m_models.count()) {
-        kWarning() << "No model for row" << row << "!";
-        return 0;
-    }
-    return m_models.value(row);
-}
-
-void RunnerModel::setAllowedRunners(const QStringList &list)
-{
-    QStringList existingList = m_manager ? m_manager->allowedRunners() : m_pendingRunnersList;
-
-    if (existingList.toSet() == list.toSet()) {
-        return;
-    }
-    m_pendingRunnersList = list;
-    if (m_manager) {
-        loadRunners();
-    }
-}
-
-QString RunnerModel::currentQuery() const
-{
-    return m_manager ? m_manager->query() : QString();
-}
-
-void RunnerModel::scheduleQuery(const QString &query)
-{
-    m_pendingQuery = query;
-    m_startQueryTimer->start();
-}
-
-void RunnerModel::startQuery()
-{
-    if (m_pendingQuery.isEmpty()) {
-        clear();
-    }
-
-    if (!m_manager && m_pendingQuery.isEmpty()) {
-        // avoid creating a manager just so we can run nothing
-        return;
-    }
-
-    createManager();
-    /* DEBUG
-    kWarning() << "Start query" << m_pendingQuery << "on runners:";
-    Q_FOREACH(Plasma::AbstractRunner *runner, m_manager->runners()) {
-        kWarning() << "-" << runner->name();
-    }
-    */
-    m_manager->launchQuery(m_pendingQuery);
-    emit queryChanged();
-    m_running = true;
-    emit runningChanged(true);
-}
-
-void RunnerModel::createManager()
-{
-    if (!m_manager) {
-        m_manager = new Plasma::RunnerManager(this);
-        connect(m_manager, SIGNAL(matchesChanged(QList<Plasma::QueryMatch>)),
-                this, SLOT(matchesChanged(QList<Plasma::QueryMatch>)));
-        connect(m_manager, SIGNAL(queryFinished()),
-                this, SLOT(queryHasFinished()));
-
-        if (!m_pendingRunnersList.isEmpty()) {
-            loadRunners();
-        }
-        //connect(m_manager, SIGNAL(queryFinished()), this, SLOT(queryFinished()));
-    }
-}
-
-void RunnerModel::matchesChanged(const QList<Plasma::QueryMatch> &matches)
-{
-    // Group matches by runner
-    // We do not use a QMultiHash here because it keeps values in LIFO order, while we want FIFO.
-    QHash<QString, QList<Plasma::QueryMatch> > matchesForRunner;
-    Q_FOREACH(const Plasma::QueryMatch &match, matches) {
-        QString runnerId = match.runner()->id();
-        auto it = matchesForRunner.find(runnerId);
-        if (it == matchesForRunner.end()) {
-            it = matchesForRunner.insert(runnerId, QList<Plasma::QueryMatch>());
-        }
-        it.value().append(match);
-    }
-
-    // Assign matches to existing models. If there is no match for a model, delete it.
-    for (int row = m_models.count() - 1; row >= 0; --row) {
-        RunnerSubModel *subModel = m_models.at(row);
-        QList<Plasma::QueryMatch> matches = matchesForRunner.take(subModel->runnerId());
-        if (matches.isEmpty()) {
-            beginRemoveRows(QModelIndex(), row, row);
-            m_models.removeAt(row);
-            delete subModel;
-            endRemoveRows();
-        } else {
-            subModel->setMatches(matches);
-        }
-    }
-
-    // At this point, matchesForRunner contains only matches for runners which
-    // do not have a model yet. Create new models for them.
-    if (!matchesForRunner.isEmpty()) {
-        beginInsertRows(QModelIndex(), rowCount(), rowCount() + matchesForRunner.size() - 1);
-        auto it = matchesForRunner.constBegin();
-        auto end = matchesForRunner.constEnd();
-        for (; it != end; ++it) {
-            QList<Plasma::QueryMatch> matches = it.value();
-            Q_ASSERT(!matches.isEmpty());
-            QString name = matches.first().runner()->name();
-            RunnerSubModel *subModel = new RunnerSubModel(it.key(), name, this);
-            connect(subModel, SIGNAL(triggerRequested(Plasma::QueryMatch)), SLOT(trigger(Plasma::QueryMatch)));
-            subModel->setMatches(matches);
-            m_models.append(subModel);
-        }
-        endInsertRows();
-    }
-
-    m_runningChangedTimeout->start(3000);
-}
-
-void RunnerModel::queryHasFinished()
-{
-    m_running = false;
-    emit runningChanged(false);
-}
-
-void RunnerModel::clear()
-{
-    if (m_models.isEmpty()) {
-        return;
-    }
-    beginResetModel();
-    qDeleteAll(m_models);
-    m_models.clear();
-    endResetModel();
-}
-
-void RunnerModel::trigger(const Plasma::QueryMatch& match)
-{
-    m_manager->run(match);
-}
-
-void RunnerModel::loadRunners()
-{
-    Q_ASSERT(m_manager);
-    if (m_pendingRunnersList.count() > 0) {
-        KPluginInfo::List list = Plasma::RunnerManager::listRunnerInfo();
-        Q_FOREACH(const KPluginInfo &info, list) {
-            if (m_pendingRunnersList.contains(info.pluginName())) {
-                m_manager->loadRunner(info.service());
-            }
-        }
-    }
-    m_manager->setSingleMode(m_pendingRunnersList.count() == 1);
-    m_pendingRunnersList.clear();
-}
-
-//- RunnerSource ------------------------------
-RunnerSource::RunnerSource(QObject *parent)
-: AbstractSource(parent)
-{}
-
-QAbstractItemModel *RunnerSource::createModelFromConfigGroup(const KConfigGroup &group)
-{
-    RunnerModel *model = new RunnerModel;
-    QStringList lst = group.readEntry(WHITELIST_KEY, QStringList());
-    model->setAllowedRunners(lst);
-    return model;
-};
-
-bool RunnerSource::isConfigurable() const
-{
-    return true;
-}
-
-SourceConfigurationWidget *RunnerSource::createConfigurationWidget(const KConfigGroup &group)
-{
-    return new RunnerConfigurationWidget(group);
-}
-
-} // namespace Homerun
-
-#include <runnermodel.moc>

=== removed file 'components/runnermodel.h'
--- components/runnermodel.h	2012-11-14 21:30:06 +0000
+++ components/runnermodel.h	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-Based on RunnerModel class. RunnerModel class copyright:
-
-Copyright 2011 Aaron Seigo <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public License
-along with this library; see the file COPYING.LIB.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
-*/
-#ifndef RUNNERMODEL_H
-#define RUNNERMODEL_H
-
-// Local
-#include <abstractsource.h>
-
-// Qt
-#include <QAbstractListModel>
-#include <QStringList>
-
-// KDE
-#include <KConfig>
-#include <KConfigGroup>
-#include <Plasma/QueryMatch>
-
-class QTimer;
-
-namespace Plasma {
-class RunnerManager;
-}
-
-namespace Homerun {
-
-class RunnerSubModel : public QAbstractListModel
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-public:
-    explicit RunnerSubModel(const QString &runnerId, const QString &name, QObject *parent = 0);
-
-    enum {
-        FavoriteIdRole = Qt::UserRole + 1
-    };
-
-    QString runnerId() const { return m_runnerId; }
-    QString name() const { return m_name; }
-
-    void setMatches(const QList<Plasma::QueryMatch> &matches);
-
-    int count() const;
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-
-    Q_INVOKABLE bool trigger(int row);
-
-Q_SIGNALS:
-    void countChanged();
-
-    void triggerRequested(const Plasma::QueryMatch&);
-
-private:
-    QString m_runnerId;
-    QString m_name;
-
-    QList<Plasma::QueryMatch> m_matches;
-};
-
-/**
- *
- */
-class RunnerModel : public QAbstractListModel
-{
-    Q_OBJECT
-    /**
-     * @property string set the KRunner query
-     */
-    Q_PROPERTY(QString query WRITE scheduleQuery READ currentQuery NOTIFY queryChanged)
-
-    Q_PROPERTY(bool running READ running NOTIFY runningChanged)
-
-public:
-    explicit RunnerModel(QObject *parent = 0);
-    ~RunnerModel();
-
-    Q_INVOKABLE QObject *modelForRow(int row) const;
-
-    void setAllowedRunners(const QStringList &runners);
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const; // reimp
-    QVariant data(const QModelIndex &, int role = Qt::DisplayRole) const; // reimp
-
-    bool running() const;
-
-    QString currentQuery() const;
-
-public Q_SLOTS:
-    void scheduleQuery(const QString &query);
-
-Q_SIGNALS:
-    void queryChanged();
-    void runningChanged(bool);
-
-private Q_SLOTS:
-    void startQuery();
-    void queryHasFinished();
-    void matchesChanged(const QList<Plasma::QueryMatch> &matches);
-    void trigger(const Plasma::QueryMatch&);
-
-private:
-    void createManager();
-    void loadRunners();
-    void clear();
-
-    Plasma::RunnerManager *m_manager;
-    QTimer *m_startQueryTimer;
-    QTimer *m_runningChangedTimeout;
-
-    QList<RunnerSubModel *> m_models;
-    QStringList m_pendingRunnersList;
-    bool m_running;
-    QString m_pendingQuery;
-};
-
-class RunnerSource : public AbstractSource
-{
-public:
-    RunnerSource(QObject *parent);
-    QAbstractItemModel *createModelFromConfigGroup(const KConfigGroup &group);
-    SourceConfigurationWidget *createConfigurationWidget(const KConfigGroup &group);
-    bool isConfigurable() const;
-};
-
-} // namespace Homerun
-
-#endif /* RUNNERMODEL_H */

=== removed file 'components/sessionmodel.cpp'
--- components/sessionmodel.cpp	2012-11-14 21:30:06 +0000
+++ components/sessionmodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-/*
-    Copyright 2012 Aurélien Gâteau <[e-mail]>
-    Copyright (C) 2012 Shaun Reich <[e-mail]>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-// Own
-#include "sessionmodel.h"
-
-//Qt
-#include <QDBusConnection>
-#include <QDBusInterface>
-#include <QDBusPendingCall>
-
-// KDE
-#include <KAuthorized>
-#include <KDebug>
-#include <KIcon>
-#include <KLocale>
-#include <kworkspace/kdisplaymanager.h>
-#include <kworkspace/kworkspace.h>
-
-namespace Homerun {
-
-SessionModel::SessionModel(QObject *parent)
-: QAbstractListModel(parent)
-{
-    //FIXME: instead of just hiding these things..it'd be awesome if we could grey them out and/or provide a reason why they're not there.
-    //otherwise the user is hunting for the power buttons and for some reason it isn't where it should be.
-    if (KAuthorized::authorizeKAction("lock_screen")) {
-        SessionAction lock;
-        lock.name = i18nc("an action", "Lock");
-        lock.type = Lock;
-        lock.iconName = "system-lock-screen";
-        m_sessionList.append(lock);
-    }
-
-    if (KDisplayManager().isSwitchable() && KAuthorized::authorize(QLatin1String("switch_user"))) {
-        SessionAction switchUser;
-        switchUser.name = i18nc("an action", "Switch User");
-        switchUser.type = SwitchUser;
-        switchUser.iconName = "system-switch-user";
-        m_sessionList.append(switchUser);
-    }
-
-    const bool canLogout = KAuthorized::authorizeKAction("logout") && KAuthorized::authorize("logout");
-    if (canLogout) {
-        SessionAction logout;
-        logout.name = i18nc("an action", "Logout");
-        logout.type = Logout;
-        logout.iconName = "system-log-out";
-        m_sessionList.append(logout);
-    }
-}
-
-SessionModel::~SessionModel()
-{
-}
-
-int SessionModel::count() const
-{
-    return m_sessionList.count();
-}
-
-QString SessionModel::name() const
-{
-    return i18n("Session");
-}
-
-int SessionModel::rowCount(const QModelIndex &index) const
-{
-    if (index.isValid()) {
-        return 0;
-    }
-    return m_sessionList.count();
-}
-
-QVariant SessionModel::data(const QModelIndex &index, int role) const
-{
-    SessionAction action = m_sessionList.value(index.row());
-
-    if (role == Qt::DisplayRole) {
-        return action.name;
-    } else if (role == Qt::DecorationRole) {
-        return KIcon(action.iconName);
-    } else {
-        kWarning() << "Unhandled role" << role;
-        return QVariant();
-    }
-}
-
-bool SessionModel::trigger(int row)
-{
-    SessionAction action = m_sessionList.value(row);
-
-    switch (action.type) {
-        case Logout:
-            KWorkSpace::requestShutDown(KWorkSpace::ShutdownConfirmDefault, KWorkSpace::ShutdownTypeNone);
-            break;
-
-        case SwitchUser: {
-            QDBusConnection bus = QDBusConnection::sessionBus();
-            QDBusInterface interface("org.kde.krunner", "/App", "org.kde.krunner", bus);
-
-            interface.asyncCall("switchUser");
-        }
-            break;
-
-        case Lock: {
-            QDBusConnection bus = QDBusConnection::sessionBus();
-            QDBusInterface interface("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", bus);
-
-            interface.asyncCall("Lock");
-        }
-            break;
-    }
-
-    return true;
-}
-
-} // namespace Homerun
-
-#include "sessionmodel.moc"

=== removed file 'components/sessionmodel.h'
--- components/sessionmodel.h	2012-11-14 21:30:06 +0000
+++ components/sessionmodel.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
-    Copyright 2012 Aurélien Gâteau <[e-mail]>
-    Copyright 2012 (C) Shaun Reich <[e-mail]>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef SESSIONMODEL_H
-#define SESSIONMODEL_H
-
-#include <QAbstractListModel>
-
-#include <KService>
-
-class QString;
-
-namespace Homerun {
-
-enum ActionType {
-    Logout,
-    SwitchUser,
-    Lock
-};
-
-struct SessionAction
-{
-    QString name;
-    QString iconName;
-    ActionType type;
-};
-
-class SessionModel : public QAbstractListModel
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-
-public:
-    SessionModel(QObject *parent = 0);
-    ~SessionModel();
-
-    int count() const;
-    QString name() const;
-
-    int rowCount(const QModelIndex & = QModelIndex()) const;
-    QVariant data(const QModelIndex &, int role = Qt::DisplayRole) const;
-
-    Q_INVOKABLE bool trigger(int row);
-
-Q_SIGNALS:
-    void countChanged();
-
-private:
-    QList<SessionAction> m_sessionList;
-};
-
-} // namespace Homerun
-
-#endif

=== added file 'components/shadoweffect.cpp'
--- components/shadoweffect.cpp	1970-01-01 00:00:00 +0000
+++ components/shadoweffect.cpp	2013-03-01 15:15:27 +0000
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2013 Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+// Self
+#include <shadoweffect.h>
+
+// Local
+
+// KDE
+#include <KDebug>
+#include <Plasma/PaintUtils>
+
+// Qt
+#include <QPainter>
+#include <QPaintEngine>
+
+ShadowEffect::ShadowEffect(QObject *parent)
+: QGraphicsEffect(parent)
+, m_xOffset(0)
+, m_yOffset(1)
+, m_blurRadius(3)
+{
+}
+
+ShadowEffect::~ShadowEffect()
+{
+}
+
+qreal ShadowEffect::xOffset() const
+{
+    return m_xOffset;
+}
+
+qreal ShadowEffect::yOffset() const
+{
+    return m_yOffset;
+}
+
+qreal ShadowEffect::blurRadius() const
+{
+    return m_blurRadius;
+}
+
+QColor ShadowEffect::color() const
+{
+    return m_color;
+}
+
+#define SETTER(prop) \
+    if (prop == value) { \
+        return; \
+    } \
+    prop = value;
+
+#define SETTER_REAL(prop) \
+    if (qFuzzyCompare(prop, value)) { \
+        return; \
+    } \
+    prop = value;
+
+void ShadowEffect::setXOffset(qreal value)
+{
+    SETTER_REAL(m_xOffset);
+    m_shadow = QImage();
+    updateBoundingRect();
+    xOffsetChanged(m_xOffset);
+}
+
+void ShadowEffect::setYOffset(qreal value)
+{
+    SETTER_REAL(m_yOffset);
+    m_shadow = QImage();
+    updateBoundingRect();
+    yOffsetChanged(m_yOffset);
+}
+
+void ShadowEffect::setBlurRadius(qreal value)
+{
+    SETTER_REAL(m_blurRadius);
+    m_shadow = QImage();
+    updateBoundingRect();
+    blurRadiusChanged(m_blurRadius);
+}
+
+void ShadowEffect::setColor(const QColor &value)
+{
+    SETTER(m_color);
+    m_shadow = QImage();
+    update();
+    colorChanged(m_color);
+}
+
+void ShadowEffect::resetColor()
+{
+    setColor(QColor());
+}
+
+QRectF ShadowEffect::boundingRectFor(const QRectF &rect) const
+{
+    qreal padding = m_blurRadius * 2;
+    return rect.united(
+        rect.translated(m_xOffset, m_yOffset)
+        .adjusted(-padding, -padding, padding, padding)
+        );
+}
+
+QImage ShadowEffect::generateShadow(const QPixmap &px) const
+{
+    if (px.isNull()) {
+        return QImage();
+    }
+
+    // Generate shadow in tmp
+    QImage tmp(px.size(), QImage::Format_ARGB32_Premultiplied);
+    tmp.fill(0);
+    QPainter tmpPainter(&tmp);
+    tmpPainter.setCompositionMode(QPainter::CompositionMode_Source);
+    tmpPainter.drawPixmap(m_xOffset, m_yOffset, px);
+    tmpPainter.end();
+    QColor color = m_color.isValid() ? m_color : computeColorFromSource();
+    Plasma::PaintUtils::shadowBlur(tmp, m_blurRadius, color);
+    return tmp;
+}
+
+void ShadowEffect::draw(QPainter *painter)
+{
+    if (m_blurRadius <= 0 && qFuzzyIsNull(m_xOffset) && qFuzzyIsNull(m_yOffset)) {
+        drawSource(painter);
+        return;
+    }
+
+    PixmapPadMode mode = PadToEffectiveBoundingRect;
+    if (painter->paintEngine()->type() == QPaintEngine::OpenGL2) {
+        mode = NoPad;
+    }
+
+    // Draw pixmap in device coordinates to avoid pixmap scaling.
+    QPoint offset;
+    const QPixmap pixmap = sourcePixmap(Qt::DeviceCoordinates, &offset, mode);
+    if (pixmap.isNull()) {
+        return;
+    }
+
+    QTransform restoreTransform = painter->worldTransform();
+    painter->setWorldTransform(QTransform());
+    if (m_shadow.isNull()) {
+        m_shadow = generateShadow(pixmap);
+    }
+    // Draw shadow (draw it twice to darken it)
+    painter->drawImage(offset, m_shadow);
+    painter->drawImage(offset, m_shadow);
+    // Draw the actual pixmap
+    painter->drawPixmap(offset, pixmap);
+    painter->setWorldTransform(restoreTransform);
+}
+
+void ShadowEffect::sourceChanged(ChangeFlags flags)
+{
+    switch (flags) {
+    case SourceAttached:
+    case SourceBoundingRectChanged:
+    case SourceInvalidated:
+        m_shadow = QImage();
+        break;
+    case SourceDetached:
+        break;
+    }
+}
+
+
+/**********************************************************
+ * UGLYNESS
+ * This is a severely trimmed copy of an internal class defined in qt:
+ * src/gui/effects/qgraphicseffect_p.h
+ *********************************************************/
+class QGraphicsEffectSource
+{
+public:
+    const QGraphicsItem *graphicsItem() const;
+};
+/**********************************************************
+ * /UGLYNESS
+ *********************************************************/
+
+
+QColor ShadowEffect::computeColorFromSource() const
+{
+    const QGraphicsItem *item = source()->graphicsItem();
+    if (!item) {
+        kWarning() << "No source item!";
+        return Qt::black;
+    }
+    const QGraphicsObject *obj = item->toGraphicsObject();
+    if (!obj) {
+        kWarning() << "Source is not a QGraphicsObject";
+        return Qt::black;
+    }
+    QVariant variant = obj->property("color");
+    if (!variant.canConvert<QColor>()) {
+        kWarning() << "Source has no 'color' property, or its 'color' property is not a QColor!";
+        return Qt::black;
+    }
+    int value = variant.value<QColor>().value();
+    return value > 128 ? Qt::black : Qt::white;
+}
+
+#include <shadoweffect.moc>

=== added file 'components/shadoweffect.h'
--- components/shadoweffect.h	1970-01-01 00:00:00 +0000
+++ components/shadoweffect.h	2013-03-01 15:15:27 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+#ifndef SHADOWEFFECT_H
+#define SHADOWEFFECT_H
+
+// Local
+
+// Qt
+#include <QGraphicsEffect>
+
+// KDE
+
+/**
+ * An effect which draws a halo
+ */
+class ShadowEffect : public QGraphicsEffect
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal xOffset READ xOffset WRITE setXOffset NOTIFY xOffsetChanged)
+    Q_PROPERTY(qreal yOffset READ yOffset WRITE setYOffset NOTIFY yOffsetChanged)
+    Q_PROPERTY(qreal blurRadius READ blurRadius WRITE setBlurRadius NOTIFY blurRadiusChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+public:
+    explicit ShadowEffect(QObject *parent = 0);
+    ~ShadowEffect();
+
+    QRectF boundingRectFor(const QRectF &rect) const; // reimp
+
+    qreal xOffset() const;
+
+    qreal yOffset() const;
+
+    qreal blurRadius() const;
+    QColor color() const;
+
+    /**
+     * Use this method if you set the color manually and now want ShadowEffect
+     * to pick the color automatically, based on the source object.
+     */
+    Q_INVOKABLE void resetColor();
+
+public Q_SLOTS:
+    void setXOffset(qreal dx);
+    void setYOffset(qreal dy);
+    void setBlurRadius(qreal blurRadius);
+    void setColor(const QColor &color);
+
+Q_SIGNALS:
+    void xOffsetChanged(qreal);
+    void yOffsetChanged(qreal);
+    void blurRadiusChanged(qreal blurRadius);
+    void colorChanged(const QColor &color);
+
+protected:
+    void draw(QPainter *painter); // reimp
+    void sourceChanged(ChangeFlags flags); // reimp
+
+private:
+    qreal m_xOffset;
+    qreal m_yOffset;
+    qreal m_blurRadius;
+    QColor m_color;
+
+    QImage m_shadow;
+
+    QImage generateShadow(const QPixmap &px) const;
+
+    QColor computeColorFromSource() const;
+};
+
+#endif /* SHADOWEFFECT_H */

=== removed file 'components/sourceid.cpp'
--- components/sourceid.cpp	2012-11-14 21:30:06 +0000
+++ components/sourceid.cpp	1970-01-01 00:00:00 +0000
@@ -1,163 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-// Self
-#include <sourceid.h>
-
-// Local
-
-// KDE
-#include <KDebug>
-
-// Qt
-#include <QStringList>
-
-static const char SOURCE_NAME_SEPARATOR = ':';
-
-#define ARG_SEPARATOR ';'
-#define ARG_SEPARATOR_STR ";"
-static const char ARG_KEY_VALUE_SEPARATOR = '=';
-
-//- SourceId ----------------------------------
-QString SourceId::name() const
-{
-    return m_name;
-}
-
-void SourceId::setName(const QString &name)
-{
-    m_name = name;
-}
-
-SourceArguments &SourceId::arguments()
-{
-    return m_arguments;
-}
-
-const SourceArguments &SourceId::arguments() const
-{
-    return m_arguments;
-}
-
-QString SourceId::toString() const
-{
-    if (m_arguments.isEmpty()) {
-        return m_name;
-    }
-    return m_name % SOURCE_NAME_SEPARATOR % m_arguments.toString();
-}
-
-SourceId SourceId::fromString(const QString &sourceString, bool *ok)
-{
-    *ok = true;
-    SourceId sourceId;
-
-    int idx = sourceString.indexOf(SOURCE_NAME_SEPARATOR);
-    if (idx == -1) {
-        sourceId.setName(sourceString);
-        return sourceId;
-    }
-
-    sourceId.m_name = sourceString.left(idx);
-    QString args = sourceString.mid(idx + 1);
-
-    sourceId.m_arguments = SourceArguments::fromString(args, ok);
-    if (!*ok) {
-        return SourceId();
-    }
-    return sourceId;
-}
-
-bool SourceId::isValid() const
-{
-    return !m_name.isEmpty();
-}
-
-//- SourceArguments ---------------------------
-static QString escapeValue(const QString &src)
-{
-    QString dst = src;
-    dst.replace('\\', "\\\\"); // must be done first
-    dst.replace(ARG_SEPARATOR, "\\" ARG_SEPARATOR_STR);
-    return dst;
-}
-
-static QStringList split(const QString &src)
-{
-    bool escaped = false;
-    QStringList lst;
-    QString token;
-    auto it = src.constBegin(), end = src.constEnd();
-    for (; it != end; ++it) {
-        const QChar ch = *it;
-        if (escaped) {
-            escaped = false;
-        } else if (ch == '\\') {
-            escaped = true;
-            continue;
-        } else if (ch == ARG_SEPARATOR) {
-            lst.append(token);
-            token.clear();
-            continue;
-        }
-        token.append(ch);
-    }
-    lst.append(token);
-    return lst;
-}
-
-SourceArguments SourceArguments::fromString(const QString &str, bool *ok)
-{
-    Q_ASSERT(ok);
-    *ok = true;
-    SourceArguments args;
-    if (str.isEmpty()) {
-        return args;
-    }
-
-    QStringList tokens = split(str);
-    Q_FOREACH(const QString &token, tokens) {
-        int idx = token.indexOf(ARG_KEY_VALUE_SEPARATOR);
-        if (idx == -1) {
-            kWarning() << "Invalid argument" << token << "in" << str;
-            *ok = false;
-            return SourceArguments();
-        }
-        QString key = token.left(idx);
-        QString value = token.mid(idx + 1);
-        args.insert(key, value);
-    }
-    return args;
-}
-
-SourceArguments &SourceArguments::add(const QString &key, const QString &value)
-{
-    insert(key, value);
-    return *this;
-}
-
-QString SourceArguments::toString() const
-{
-    QStringList lst;
-    auto it = constBegin(), end = constEnd();
-    for (; it != end ; ++it) {
-        lst << it.key() % ARG_KEY_VALUE_SEPARATOR % escapeValue(it.value());
-    }
-    return lst.join(ARG_SEPARATOR_STR);
-}

=== removed file 'components/sourceid.h'
--- components/sourceid.h	2012-11-14 21:30:06 +0000
+++ components/sourceid.h	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
-Copyright 2012 Aurélien Gâteau <[e-mail]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) version 3, or any
-later version accepted by the membership of KDE e.V. (or its
-successor approved by the membership of KDE e.V.), which shall
-act as a proxy defined in Section 6 of version 3 of the license.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef SOURCEID_H
-#define SOURCEID_H
-
-// Local
-
-// Qt
-#include <QHash>
-#include <QString>
-
-// KDE
-
-/**
- * The arguments of a source. Used within a SourceId instance.
- */
-class SourceArguments : public QHash<QString, QString>
-{
-public:
-    SourceArguments &add(const QString &key, const QString &value);
-
-    QString toString() const;
-
-    static SourceArguments fromString(const QString &, bool *ok);
-};
-
-/**
- * Represents a source and its optional arguments
- */
-class SourceId
-{
-public:
-    void setName(const QString &);
-    QString name() const;
-    SourceArguments &arguments();
-    const SourceArguments &arguments() const;
-
-    QString toString() const;
-
-    static SourceId fromString(const QString &, bool *ok);
-
-    bool isValid() const;
-
-private:
-    QString m_name;
-    SourceArguments m_arguments;
-};
-
-#endif /* SOURCEID_H */

=== modified file 'components/sourceregistry.cpp'
--- components/sourceregistry.cpp	2012-11-14 21:30:06 +0000
+++ components/sourceregistry.cpp	2013-03-01 15:15:27 +0000
@@ -23,18 +23,20 @@
 // Local
 #include <abstractsource.h>
 #include <customtypes.h>
-#include <dirmodel.h>
-#include <favoriteappsmodel.h>
-
-#include <groupedinstalledappsmodel.h>
 #include <libhomerun_config.h>
-#include <favoriteplacesmodel.h>
-#include <powermodel.h>
-#include <runnermodel.h>
-#include <installedappsmodel.h>
-#include <sessionmodel.h>
 #include <sourceconfigurationdialog.h>
 
+#include <sources/dir/dirmodel.h>
+#include <sources/favorites/favoriteappsmodel.h>
+#include <sources/favorites/favoriteplacesmodel.h>
+#include <sources/installedapps/installedappsmodel.h>
+#include <sources/installedapps/groupedinstalledappsmodel.h>
+#include <sources/power/powermodel.h>
+#include <sources/runners/singlerunnermodel.h>
+#include <sources/runners/runnermodel.h>
+#include <sources/session/openedsessionsmodel.h>
+#include <sources/session/sessionmodel.h>
+
 // KDE
 #include <KConfigGroup>
 #include <KDebug>
@@ -42,6 +44,7 @@
 #include <KPluginInfo>
 #include <KPluginLoader>
 #include <KServiceTypeTrader>
+#include <Plasma/PluginLoader>
 
 // Qt
 #include <QApplication>
@@ -218,6 +221,20 @@
         }
         return sourceInfo->source;
     }
+
+    void registerSingleRunnerSources()
+    {
+        KPluginInfo::List list = Plasma::PluginLoader::pluginLoader()->listRunnerInfo();
+        Q_FOREACH(const KPluginInfo &info, list) {
+            if (!info.property("X-Plasma-AdvertiseSingleRunnerQueryMode").toBool()) {
+                continue;
+            }
+            QString runnerId = info.pluginName();
+            SingleRunnerSource *source = new SingleRunnerSource(runnerId, q);
+            QString name = i18n("Runner: %1", info.name());
+            registerSource("SingleRunner/" + runnerId, source, name, info.comment());
+        }
+    }
 };
 
 //- SourceRegistry --------------------------------------------
@@ -259,11 +276,17 @@
         i18n("Session"),
         i18n("Provide buttons to lock the screen, log out, or switch to another user")
     );
+    d->registerSource("OpenedSessions", new SimpleSource<OpenedSessionsModel>(this),
+        i18n("Opened Sessions"),
+        i18n("Provide buttons to switch to opened sessions")
+    );
     d->registerSource("Runner", new RunnerSource(this),
         i18n("KRunner"),
         i18n("Perform searchs using a selection of runners")
     );
 
+    d->registerSingleRunnerSources();
+
     d->listSourcePlugins();
 }
 

=== added directory 'components/sources'
=== added directory 'components/sources/dir'
=== added file 'components/sources/dir/dirconfigurationwidget.cpp'
--- components/sources/dir/dirconfigurationwidget.cpp	1970-01-01 00:00:00 +0000
+++ components/sources/dir/dirconfigurationwidget.cpp	2013-03-01 15:15:27 +0000
@@ -0,0 +1,67 @@
+/*
+Copyright 2012 Aurélien Gâteau <[e-mail]>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) version 3, or any
+later version accepted by the membership of KDE e.V. (or its
+successor approved by the membership of KDE e.V.), which shall
+act as a proxy defined in Section 6 of version 3 of the license.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Self
+#include <dirconfigurationwidget.h>
+
+// Local
+#include <ui_dirconfigurationwidget.h>
+
+// KDE
+#include <KGlobalSettings>
+#include <KUrlRequester>
+
+// Qt
+#include <QDir>
+#include <QVBoxLayout>
+
+using namespace Homerun;
+
+DirConfigurationWidget::DirConfigurationWidget(const KConfigGroup &group)
+: SourceConfigurationWidget(group)
+, m_ui(new Ui_DirConfigurationWidget)
+{
+    m_ui->setupUi(this);
+
+    QFont helpFont = KGlobalSettings::smallestReadableFont();
+    m_ui->titleHelpLabel->setFont(helpFont);
+
+    KUrl url = group.readPathEntry("rootUrl", QDir::homePath());
+    if (url.isValid()) {
+        m_ui->urlRequester->setUrl(url);
+    }
+
+    m_ui->titleLineEdit->setText(group.readEntry("rootName", QString()));
+}
+
+DirConfigurationWidget::~DirConfigurationWidget()
+{
+    delete m_ui;
+}
+
+void DirConfigurationWidget::save()
+{
+    KUrl url = m_ui->urlRequester->url().url();
+    QString title = m_ui->titleLineEdit->text();
+
+    configGroup().writePathEntry("rootUrl", url.url());
+    configGroup().writeEntry("rootName", title);
+}
+
+#include <dirconfigurationwidget.moc>

=== added file 'components/sources/dir/dirconfigurationwidget.h'
--- components/sources/dir/dirconfigurationwidget.h	1970-01-01 00:00:00 +0000
+++ components/sources/dir/dirconfigurationwidget.h	2013-03-01 15:15:27 +0000
@@ -0,0 +1,48 @@
+/*
+Copyright 2012 Aurélien Gâteau <[e-mail]>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) version 3, or any
+later version accepted by the membership of KDE e.V. (or its
+successor approved by the membership of KDE e.V.), which shall
+act as a proxy defined in Section 6 of version 3 of the license.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DIRCONFIGURATIONWIDGET_H
+#define DIRCONFIGURATIONWIDGET_H
+
+// Local
+#include <sourceconfigurationwidget.h>
+
+// Qt
+
+// KDE
+
+class Ui_DirConfigurationWidget;
+
+/**
+ * Configuration widget for the Dir source
+ */
+class DirConfigurationWidget : public Homerun::SourceConfigurationWidget
+{
+    Q_OBJECT
+public:
+    DirConfigurationWidget(const KConfigGroup &group);
+    ~DirConfigurationWidget();
+
+    void save(); // reimp
+
+private:
+    Ui_DirConfigurationWidget *m_ui;
+};
+
+#endif /* DIRCONFIGURATIONWIDGET_H */

=== added file 'components/sources/dir/dirconfigurationwidget.ui'
--- components/sources/dir/dirconfigurationwidget.ui	1970-01-01 00:00:00 +0000
+++ components/sources/dir/dirconfigurationwidget.ui	2013-03-01 15:15:27 +0000
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DirConfigurationWidget</class>
+ <widget class="QWidget" name="DirConfigurationWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>85</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>400</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Folder to show:</string>
+     </property>
+     <property name="buddy">
+      <cstring>urlRequester</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="KUrlRequester" name="urlRequester">
+     <property name="mode">
+      <set>KFile::Directory|KFile::ExistingOnly</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="titleLineEdit"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Title:</string>
+     </property>
+     <property name="buddy">
+      <cstring>titleLineEdit</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLabel" name="titleHelpLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>If title is left empty, the folder name will be used</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KUrlRequester</class>
+   <extends>QFrame</extends>
+   <header>kurlrequester.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

=== added file 'components/sources/dir/dirmodel.cpp'
--- components/sources/dir/dirmodel.cpp	1970-01-01 00:00:00 +0000
+++ components/sources/dir/dirmodel.cpp	2013-03-01 15:15:27 +0000
@@ -0,0 +1,259 @@
+/*
+Copyright 2012 Aurélien Gâteau <[e-mail]>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) version 3, or any
+later version accepted by the membership of KDE e.V. (or its
+successor approved by the membership of KDE e.V.), which shall
+act as a proxy defined in Section 6 of version 3 of the license.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// Self
+#include <dirmodel.h>
+
+// Local
+#include <dirconfigurationwidget.h>
+#include <favoriteplacesmodel.h>
+
+// libhomerun
+#include <actionlist.h>
+#include <pathmodel.h>
+
+// KDE
+#include <KConfigGroup>
+#include <KDebug>
+#include <KDirModel>
+#include <KDirLister>
+
+// Qt
+#include <QDir>
+
+namespace Homerun
+{
+
+static const char *SOURCE_ID = "Dir";
+
+static inline KFileItem itemForIndex(const QModelIndex &index)
+{
+    return index.data(KDirModel::FileItemRole).value<KFileItem>();
+}
+
+//- DirModel ------------------------------------------------------
+QVariantMap DirModel::sourceArguments(const KUrl &rootUrl, const QString &rootName, const KUrl &url)
+{
+    QVariantMap args;
+    args.insert("rootUrl", rootUrl.url());
+    args.insert("rootName", rootName);
+    args.insert("url", url.url());
+    return args;
+}
+
+
+DirModel::DirModel(QObject *parent)
+: KDirSortFilterProxyModel(parent)
+, m_pathModel(new PathModel(this))
+{
+    setSourceModel(new KDirModel(this));
+    setSortFoldersFirst(true);
+
+    QHash<int, QByteArray> roles;
+    roles.insert(Qt::DisplayRole, "display");
+    roles.insert(Qt::DecorationRole, "decoration");
+    roles.insert(DirModel::FavoriteIdRole, "favoriteId");
+    roles.insert(DirModel::HasActionListRole, "hasActionList");
+    roles.insert(DirModel::ActionListRole, "actionList");
+    setRoleNames(roles);
+
+    dirLister()->setDelayedMimeTypes(true);
+    connect(dirLister(), SIGNAL(started(KUrl)), SLOT(emitRunningChanged()));
+    connect(dirLister(), SIGNAL(completed()), SLOT(emitRunningChanged()));
+}
+
+void DirModel::init(const KUrl &rootUrl, const QString &rootName, const KUrl &url)
+{
+    m_rootUrl = rootUrl;
+    m_rootName = rootName;
+    initPathModel(url);
+    dirLister()->openUrl(url);
+}
+
+void DirModel::initPathModel(const KUrl &openedUrl)
+{
+    QVariantMap args = sourceArguments(m_rootUrl, m_rootName, m_rootUrl);
+    m_pathModel->addPath(m_rootName, SOURCE_ID, args);
+
+    KUrl rootUrl = m_rootUrl;
+    // Needed for KUrl::relativeUrl
+    rootUrl.adjustPath(KUrl::AddTrailingSlash);
+    QString relativePath = KUrl::relativeUrl(rootUrl, openedUrl);
+    if (relativePath == "./") {
+        return;
+    }
+    KUrl url = m_rootUrl;
+    Q_FOREACH(const QString &token, relativePath.split('/')) {
+        if (token.isEmpty()) {
+            // Just in case relativePath ends with '/'
+            continue;
+        }
+        url.addPath(token);
+        args["url"] = url.url();
+        m_pathModel->addPath(token, SOURCE_ID, args);
+    }
+}
+
+KDirLister *DirModel::dirLister() const
+{
+    return static_cast<KDirModel *>(sourceModel())->dirLister();
+}
+
+QVariant DirModel::data(const QModelIndex &index, int role) const
+{
+    if (role != FavoriteIdRole && role != HasActionListRole && role != ActionListRole) {
+        return QSortFilterProxyModel::data(index, role);
+    }
+    if (index.row() < 0 || index.row() >= rowCount()) {
+        return QVariant();
+    }
+    if (role == HasActionListRole) {
+        return true;
+    }
+    KFileItem item = itemForIndex(index);
+    if (role == FavoriteIdRole) {
+        if (item.isDir()) {
+            return FavoritePlacesModel::favoriteIdFromUrl(item.url());
+        } else {
+            return QString();
+        }
+    } else if (role == ActionListRole) {
+        return ActionList::createListForFileItem(item);
+    }
+    // Never reached
+    return QVariant();
+}
+
+int DirModel::count() const
+{
+    return rowCount(QModelIndex());
+}
+
+QString DirModel::name() const
+{
+    return m_rootName;
+}
+
+bool DirModel::running() const
+{
+    return !dirLister()->isFinished();
+}
+
+PathModel *DirModel::pathModel() const
+{
+    return m_pathModel;
+}
+
+QString DirModel::query() const
+{
+    return filterRegExp().pattern();
+}
+
+void DirModel::setQuery(const QString &value)
+{
+    if (value == query()) {
+        return;
+    }
+    setFilterRegExp(QRegExp(value, Qt::CaseInsensitive));
+    queryChanged(value);
+}
+
+void DirModel::emitRunningChanged()
+{
+    runningChanged(running());
+}
+
+bool DirModel::trigger(int row, const QString &actionId, const QVariant &actionArg)
+{
+    QModelIndex idx = index(row, 0);
+    KFileItem item = itemForIndex(idx);
+
+    if (actionId.isEmpty()) {
+        if (item.isDir()) {
+            openSourceRequested(SOURCE_ID, sourceArguments(m_rootUrl, m_rootName, item.url()));
+            return false;
+        } else {
+            item.run();
+            return true;
+        }
+    }
+    bool close = false;
+    if (ActionList::handleFileItemAction(item, actionId, actionArg, &close)) {
+        return close;
+    }
+    return false;
+}
+
+//- DirSource -------------------------------------------------------
+DirSource::DirSource(QObject *parent)
+: AbstractSource(parent)
+{}
+
+QAbstractItemModel *DirSource::createModelFromArguments(const QVariantMap &args)
+{
+    KUrl rootUrl = args.value("rootUrl").toString();
+    QString rootName = args.value("rootName").toString();
+    KUrl url = args.value("url").toString();
+    return createModel(rootUrl, rootName, url);
+}
+
+QAbstractItemModel *DirSource::createModelFromConfigGroup(const KConfigGroup &group)
+{
+    KUrl rootUrl = group.readPathEntry("rootUrl", QDir::homePath());
+    QString rootName = group.readEntry("rootName", QString());
+    return createModel(rootUrl, rootName, KUrl());
+}
+
+QAbstractItemModel *DirSource::createModel(const KUrl &rootUrl_, const QString &rootName_, const KUrl &url_)
+{
+    KUrl rootUrl = rootUrl_;
+    QString rootName = rootName_;
+    KUrl url = url_;
+    if (!rootUrl.isValid()) {
+        rootUrl = KUrl::fromPath(QDir::homePath());
+    }
+
+    if (rootName.isEmpty()) {
+        rootName = rootUrl.fileName();
+        if (rootName.isEmpty()) {
+            rootName = rootUrl.prettyUrl();
+        }
+    }
+    if (!url.isValid()) {
+        url = rootUrl;
+    }
+
+    DirModel *model = new DirModel;
+    model->init(rootUrl, rootName, url);
+    return model;
+}
+
+bool DirSource::isConfigurable() const
+{
+    return true;
+}
+
+SourceConfigurationWidget *DirSource::createConfigurationWidget(const KConfigGroup &group)
+{
+    return new DirConfigurationWidget(group);
+}
+
+} // namespace Homerun
+
+#include <dirmodel.moc>

=== added file 'components/sources/dir/dirmodel.h'
--- components/sources/dir/dirmodel.h	1970-01-01 00:00:00 +0000
+++ components/sources/dir/dirmodel.h	2013-03-01 15:15:27 +0000
@@ -0,0 +1,113 @@
+/*
+Copyright 2012 Aurélien Gâteau <[e-mail]>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) version 3, or any
+later version accepted by the membership of KDE e.V. (or its
+successor approved by the membership of KDE e.V.), which shall
+act as a proxy defined in Section 6 of version 3 of the license.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef DIRMODEL_H
+#define DIRMODEL_H
+
+// Local
+#include <abstractsource.h>
+
+// Qt
+
+// KDE
+#include <KDirSortFilterProxyModel>
+#include <KUrl>
+
+class KDirLister;
+
+namespace Homerun {
+
+class PathModel;
+
+/**