From 3dbe535deca66f2d4241cd4ef69daaa05cd9ed03 Mon Sep 17 00:00:00 2001 From: Artur Duque de Souza Date: Tue, 26 Apr 2011 16:46:14 -0300 Subject: [PATCH] Last bits to theme bindings We are going to need a proxy for the theme anyway, so we need this guy complete anyway. Let's forget about the idea of exporting Plasma::Theme directly. Signed-off-by: Artur Duque de Souza --- declarativeimports/core/theme.cpp | 19 +++++++++++++++++-- declarativeimports/core/theme_p.h | 18 ++++++++++++------ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/declarativeimports/core/theme.cpp b/declarativeimports/core/theme.cpp index 0735a9c89..1e640d1b2 100644 --- a/declarativeimports/core/theme.cpp +++ b/declarativeimports/core/theme.cpp @@ -31,7 +31,7 @@ ThemeProxy::~ThemeProxy() { } -QString ThemeProxy::name() const +QString ThemeProxy::themeName() const { return Plasma::Theme::defaultTheme()->themeName(); } @@ -46,11 +46,26 @@ bool ThemeProxy::windowTranslucencyEnabled() const return Plasma::Theme::defaultTheme()->windowTranslucencyEnabled(); } -QUrl ThemeProxy::homepage() const +KUrl ThemeProxy::homepage() const { return Plasma::Theme::defaultTheme()->homepage(); } +bool ThemeProxy::useGlobalSettings() const +{ + return Plasma::Theme::defaultTheme()->useGlobalSettings(); +} + +QString ThemeProxy::styleSheet() const +{ + return Plasma::Theme::defaultTheme()->styleSheet(); +} + +QString ThemeProxy::wallpaperPath() const +{ + return Plasma::Theme::defaultTheme()->wallpaperPath(); +} + QColor ThemeProxy::textColor() const { return Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor); diff --git a/declarativeimports/core/theme_p.h b/declarativeimports/core/theme_p.h index e2a86612c..820df1da5 100644 --- a/declarativeimports/core/theme_p.h +++ b/declarativeimports/core/theme_p.h @@ -21,7 +21,7 @@ #include -#include +#include #include #include @@ -29,10 +29,13 @@ class ThemeProxy : public QObject { Q_OBJECT - Q_PROPERTY(QString name READ name NOTIFY themeChanged) + Q_PROPERTY(QString themeName READ themeName NOTIFY themeChanged) Q_PROPERTY(QFont font READ font NOTIFY themeChanged) - Q_PROPERTY(bool translucent READ windowTranslucencyEnabled NOTIFY themeChanged) - Q_PROPERTY(QUrl homepage READ homepage NOTIFY themeChanged) + Q_PROPERTY(bool windowTranslucentEnabled READ windowTranslucencyEnabled NOTIFY themeChanged) + Q_PROPERTY(KUrl homepage READ homepage NOTIFY themeChanged) + Q_PROPERTY(bool useGlobalSettings READ useGlobalSettings NOTIFY themeChanged) + Q_PROPERTY(QString styleSheet READ styleSheet NOTIFY themeChanged) + Q_PROPERTY(QString wallpaperPath READ wallpaperPath NOTIFY themeChanged) // colors Q_PROPERTY(QColor textColor READ textColor NOTIFY themeChanged) @@ -54,10 +57,13 @@ public: ThemeProxy(QObject *parent = 0); ~ThemeProxy(); - QString name() const; + QString themeName() const; QFont font() const; bool windowTranslucencyEnabled() const; - QUrl homepage() const; + KUrl homepage() const; + bool useGlobalSettings() const; + QString styleSheet() const; + QString wallpaperPath() const; QColor textColor() const; QColor highlightColor() const;