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

themeName, useGlobalSettings and wallpaperPath move into Plasma::Theme

Browse Source
This commit is contained in:
Sebastian Kügler 2014-01-12 19:17:37 +01:00
parent 69efa8d941
commit eba1a79b57
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/declarativeimports/core/theme.cpp
View File

@ -72,11 +72,6 @@ void ThemeProxy::updateSpacing()
m_largeSpacing = _s; m_largeSpacing = _s;
} }
QString ThemeProxy::themeName() const
{
return Plasma::Theme::themeName();
}
QFont ThemeProxy::defaultFont() const QFont ThemeProxy::defaultFont() const
{ {
return QApplication::font(); return QApplication::font();
@ -102,16 +97,6 @@ int ThemeProxy::largeSpacing() const
return m_largeSpacing; return m_largeSpacing;
} }
bool ThemeProxy::useGlobalSettings() const
{
return Plasma::Theme::useGlobalSettings();
}
QString ThemeProxy::wallpaperPath() const
{
return Plasma::Theme::wallpaperPath();
}
QString ThemeProxy::wallpaperPathForSize(int width, int height) const QString ThemeProxy::wallpaperPathForSize(int width, int height) const
{ {
return Plasma::Theme::wallpaperPath(QSize(width, height)); return Plasma::Theme::wallpaperPath(QSize(width, height));
@ -226,7 +211,6 @@ void ThemeProxy::iconLoaderSettingsChanged()
m_iconSizes->insert("small", KIconLoader::global()->currentSize(KIconLoader::Small)); m_iconSizes->insert("small", KIconLoader::global()->currentSize(KIconLoader::Small));
m_iconSizes->insert("dialog", KIconLoader::global()->currentSize(KIconLoader::Dialog)); m_iconSizes->insert("dialog", KIconLoader::global()->currentSize(KIconLoader::Dialog));
emit defaultIconSizeChanged(); emit defaultIconSizeChanged();
emit iconSizesChanged(); emit iconSizesChanged();
} }
@ -242,4 +226,3 @@ QQmlPropertyMap *ThemeProxy::iconSizes() const
} }
#include "moc_theme.cpp" #include "moc_theme.cpp"

4
src/declarativeimports/core/theme.h
View File

@ -40,10 +40,6 @@ class ThemeProxy : public Plasma::Theme
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString themeName READ themeName NOTIFY themeChanged)
Q_PROPERTY(bool useGlobalSettings READ useGlobalSettings NOTIFY themeChanged)
Q_PROPERTY(QString wallpaperPath READ wallpaperPath NOTIFY themeChanged)
//fonts //fonts
Q_PROPERTY(QFont defaultFont READ defaultFont NOTIFY defaultFontChanged) Q_PROPERTY(QFont defaultFont READ defaultFont NOTIFY defaultFontChanged)
Q_PROPERTY(QFont smallestFont READ smallestFont NOTIFY smallestFontChanged) Q_PROPERTY(QFont smallestFont READ smallestFont NOTIFY smallestFontChanged)

5
src/plasma/theme.h
View File

@ -52,6 +52,11 @@ class PLASMA_EXPORT Theme : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString themeName READ themeName NOTIFY themeChanged)
Q_PROPERTY(bool useGlobalSettings READ useGlobalSettings NOTIFY themeChanged)
Q_PROPERTY(QString wallpaperPath READ wallpaperPath NOTIFY themeChanged)
public: public:
enum ColorRole { enum ColorRole {
TextColor = 0, /**< the text color to be used by items resting on the background */ TextColor = 0, /**< the text color to be used by items resting on the background */