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

use kdeclarative in configview

Browse Source 
export current containment actions
This commit is contained in:
Marco Martin 2013-08-23 15:35:56 +02:00
parent 4fcedcbc46
commit d025f583b2
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shell/configview.cpp
View File

@ -32,6 +32,7 @@
#include <KGlobal>
#include <KLocalizedString>
#include <kdeclarative/kdeclarative.h>
#include <Plasma/Corona>
#include <Plasma/PluginLoader>
@ -266,6 +267,9 @@ ConfigView::ConfigView(Plasma::Applet *applet, QWindow *parent)
m_applet(applet)
{
applet->setUserConfiguring(true);
KDeclarative kdeclarative;
kdeclarative.setDeclarativeEngine(engine());
kdeclarative.setupBindings();
qmlRegisterType<ConfigModel>("org.kde.plasma.configuration", 2, 0, "ConfigModel");
qmlRegisterType<ConfigCategory>("org.kde.plasma.configuration", 2, 0, "ConfigCategory");

15
src/shell/containmentconfigview.cpp
View File

@ -31,6 +31,7 @@
#include <KLocalizedString>
#include <Plasma/Corona>
#include <Plasma/ContainmentActions>
#include <Plasma/PluginLoader>
@ -88,6 +89,20 @@ ConfigModel *ContainmentConfigView::containmentActionConfigModel()
return m_containmentActionConfigModel;
}
QVariantMap ContainmentConfigView::currentContainmentActions() const
{
QHash<QString, Plasma::ContainmentActions*> actions = m_containment->containmentActions();
QVariantMap actionsMap;
QHash<QString, Plasma::ContainmentActions*>::const_iterator i = actions.constBegin();
while (i != actions.constEnd()) {
actionsMap[i.key()] = i.value()->pluginInfo().name();
}
return actionsMap;
}
ConfigModel *ContainmentConfigView::wallpaperConfigModel()
{
if (!m_wallpaperConfigModel) {

3
src/shell/containmentconfigview.h
View File

@ -34,6 +34,7 @@ class ContainmentConfigView : public ConfigView
{
Q_OBJECT
Q_PROPERTY(ConfigModel *containmentActionConfigModel READ containmentActionConfigModel CONSTANT)
Q_PROPERTY(QVariantMap currentContainmentActions READ currentContainmentActions NOTIFY currentContainmentActionsChanged)
Q_PROPERTY(ConfigModel *wallpaperConfigModel READ wallpaperConfigModel CONSTANT)
Q_PROPERTY(ConfigPropertyMap *wallpaperConfiguration READ wallpaperConfiguration NOTIFY wallpaperConfigurationChanged)
Q_PROPERTY(QString currentWallpaper READ currentWallpaper WRITE setCurrentWallpaper NOTIFY currentWallpaperChanged)
@ -45,6 +46,7 @@ public:
virtual void init();
ConfigModel *containmentActionConfigModel();
QVariantMap currentContainmentActions() const;
ConfigModel *wallpaperConfigModel();
QString currentWallpaper() const;
void setCurrentWallpaper(const QString &wallpaper);
@ -55,6 +57,7 @@ public:
Q_SIGNALS:
void currentWallpaperChanged();
void wallpaperConfigurationChanged();
void currentContainmentActionsChanged();
protected:
void syncWallpaperObjects();