diff options
Diffstat (limited to 'src/gui/kernel/qplatformtheme.h')
-rw-r--r-- | src/gui/kernel/qplatformtheme.h | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h index 50594bfdf0..c0193947b9 100644 --- a/src/gui/kernel/qplatformtheme.h +++ b/src/gui/kernel/qplatformtheme.h @@ -14,6 +14,7 @@ // #include <QtGui/qtguiglobal.h> +#include <QtCore/QObject> #include <QtCore/QScopedPointer> #if QT_CONFIG(shortcut) # include <QtGui/QKeySequence> @@ -87,7 +88,15 @@ public: InteractiveResizeAcrossScreens, ShowDirectoriesFirst, PreselectFirstFileInDirectory, - ButtonPressKeys + ButtonPressKeys, + SetFocusOnTouchRelease, + FlickStartDistance, + FlickMaximumVelocity, + FlickDeceleration, + MenuBarFocusOnAltPressRelease, + MouseCursorTheme, + MouseCursorSize, + UnderlineShortcut, }; Q_ENUM(ThemeHint) @@ -97,12 +106,7 @@ public: FontDialog, MessageDialog }; - - enum class Appearance { - Unknown = 0x0000, - Light = 0x0001, - Dark = 0x0002 - }; + Q_ENUM(DialogType); enum Palette { SystemPalette, @@ -125,6 +129,7 @@ public: TextLineEditPalette, NPalettes }; + Q_ENUM(Palette) enum Font { SystemFont, @@ -230,9 +235,20 @@ public: MediaVolume, MediaVolumeMuted, LineEditClearButton, + DialogYesToAllButton, + DialogNoToAllButton, + DialogSaveAllButton, + DialogAbortButton, + DialogRetryButton, + DialogIgnoreButton, + RestoreDefaultsButton, + TabCloseButton, + NStandardPixmap, // assertion value for sync with QStyle::StandardPixmap + // do not add any values below/greater than this CustomBase = 0xf0000000 }; + Q_ENUM(StandardPixmap) enum KeyboardSchemes { @@ -243,6 +259,7 @@ public: GnomeKeyboardScheme, CdeKeyboardScheme }; + Q_ENUM(KeyboardSchemes) enum UiEffect { @@ -255,6 +272,7 @@ public: AnimateToolBoxUiEffect = 0x40, HoverEffect = 0x80 }; + Q_ENUM(UiEffect) enum IconOption { DontUseCustomDirectoryIcons = 0x01 @@ -276,7 +294,7 @@ public: virtual QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const; #endif - virtual Appearance appearance() const; + virtual Qt::ColorScheme colorScheme() const; virtual const QPalette *palette(Palette type = SystemPalette) const; @@ -301,10 +319,14 @@ public: static QVariant defaultThemeHint(ThemeHint hint); static QString defaultStandardButtonText(int button); static QString removeMnemonics(const QString &original); + QString name() const; protected: explicit QPlatformTheme(QPlatformThemePrivate *priv); QScopedPointer<QPlatformThemePrivate> d_ptr; + +private: + friend class QPlatformThemeFactory; }; QT_END_NAMESPACE |