diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-09-01 09:56:28 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-09-14 19:20:06 +0000 |
commit | 8132cb655ad9f1479110d20c4f31f32a9da094d9 (patch) | |
tree | ff20cd03c881fc9180c08f366d555ac233a52294 /examples/widgets/widgets/icons/iconpreviewarea.h | |
parent | f3fd7b3d961ffed480e5851e594f6981f558f486 (diff) |
Polish the Icons example.
- Remove unneeded member variables.
- Use new connection syntax in createActions()
to assemble the menu there, removing the createMenus()
function.
- Use a QButtonGroup for the sizes with the style metrics as id.
- Streamline code, rename variables for clarity.
- Introduce static functions returning the list of states/modes and
their names in display order to IconPreviewArea, removing the
duplicates.
- Split actions to open sample icons provided from source directory
or standard pictures location to make sample icons more prominently
visible.
- Check and display @2x images and add tooltips showing device pixel
ratio and actual size.
- HighDPI: Add groupbox displaying screen name and device pixel
ratio, connect to screen changed signal and update icons panel
accordingly. Add check box for toggling Qt::AA_UseHighDpiPixmaps.
- Adjust documentation
Task-number: QTBUG-18680
Task-number: QTBUG-46615
Change-Id: Ice96e9898f168ef2a30e9f46cb260ed57ae015f0
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'examples/widgets/widgets/icons/iconpreviewarea.h')
-rw-r--r-- | examples/widgets/widgets/icons/iconpreviewarea.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/examples/widgets/widgets/icons/iconpreviewarea.h b/examples/widgets/widgets/icons/iconpreviewarea.h index c2e0a7b79d..693f8811d8 100644 --- a/examples/widgets/widgets/icons/iconpreviewarea.h +++ b/examples/widgets/widgets/icons/iconpreviewarea.h @@ -43,6 +43,8 @@ #include <QIcon> #include <QWidget> +#include <QStringList> +#include <QVector> QT_BEGIN_NAMESPACE class QLabel; @@ -54,11 +56,16 @@ class IconPreviewArea : public QWidget Q_OBJECT public: - IconPreviewArea(QWidget *parent = 0); + explicit IconPreviewArea(QWidget *parent = Q_NULLPTR); void setIcon(const QIcon &icon); void setSize(const QSize &size); + static QVector<QIcon::Mode> iconModes(); + static QVector<QIcon::State> iconStates(); + static QStringList iconModeNames(); + static QStringList iconStateNames(); + private: QLabel *createHeaderLabel(const QString &text); QLabel *createPixmapLabel(); |