diff options
author | Jørgen Lind <jorgen.lind@digia.com> | 2013-04-08 14:12:43 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-17 07:43:11 +0200 |
commit | 3ae271523ff7fb951df16cfccfaf84c0aa298e16 (patch) | |
tree | 446402cb007ac348c67ea35b44baedb4f8c3681e /src/platformsupport/themes/genericunix/qgenericunixthemes_p.h | |
parent | d42e54c8626ee0d42d4df40e8f2a83df0698190a (diff) |
Move Fusion styles palette into QtGui
So that it can be used as the standard palette for QtGui
applications instead of the absolutely useless black palette.
Change-Id: Ie001439fcd8840a66275009c9f42cbf8bab4864a
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/platformsupport/themes/genericunix/qgenericunixthemes_p.h')
-rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes_p.h | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h index b0ac13efe4..03445776f4 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h @@ -61,8 +61,11 @@ public: QFont *fonts[QPlatformTheme::NFonts]; }; +class QGenericUnixThemePrivate; + class QGenericUnixTheme : public QPlatformTheme { + Q_DECLARE_PRIVATE(QGenericUnixTheme) public: QGenericUnixTheme(); @@ -75,55 +78,39 @@ public: static QStringList xdgIconThemePaths(); static const char *name; - -private: - const QFont m_systemFont; }; #ifndef QT_NO_SETTINGS +class QKdeThemePrivate; + class QKdeTheme : public QPlatformTheme { + Q_DECLARE_PRIVATE(QKdeTheme) QKdeTheme(const QString &kdeHome, int kdeVersion); public: static QPlatformTheme *createKdeTheme(); virtual QVariant themeHint(ThemeHint hint) const; - virtual const QPalette *palette(Palette type = SystemPalette) const - { return m_resources.palettes[type]; } + virtual const QPalette *palette(Palette type = SystemPalette) const; - virtual const QFont *font(Font type) const - { return m_resources.fonts[type]; } + virtual const QFont *font(Font type) const; static const char *name; - -private: - QString globalSettingsFile() const; - void refresh(); - - const QString m_kdeHome; - const int m_kdeVersion; - - ResourceHelper m_resources; - QString m_iconThemeName; - QString m_iconFallbackThemeName; - QStringList m_styleNames; - int m_toolButtonStyle; - int m_toolBarIconSize; }; #endif // QT_NO_SETTINGS +class QGnomeThemePrivate; + class QGnomeTheme : public QPlatformTheme { + Q_DECLARE_PRIVATE(QGnomeTheme) public: QGnomeTheme(); virtual QVariant themeHint(ThemeHint hint) const; virtual const QFont *font(Font type) const; static const char *name; - -private: - const QFont m_systemFont; }; QPlatformTheme *qt_createUnixTheme(); |