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>

1 files changed, 8 insertions, 10 deletions

diff --git a/examples/widgets/widgets/icons/imagedelegate.cpp b/examples/widgets/widgets/icons/imagedelegate.cpp
index a6df8f3b04..7c393594ca 100644
--- a/examples/widgets/widgets/icons/imagedelegate.cpp
+++ b/examples/widgets/widgets/icons/imagedelegate.cpp
@@ -41,6 +41,7 @@
 #include <QtWidgets>
 
 #include "imagedelegate.h"
+#include "iconpreviewarea.h"
 
 //! [0]
 ImageDelegate::ImageDelegate(QObject *parent)
@@ -55,17 +56,14 @@ QWidget *ImageDelegate::createEditor(QWidget *parent,
                                      const QModelIndex &index) const
 {
     QComboBox *comboBox = new QComboBox(parent);
-    if (index.column() == 1) {
-        comboBox->addItem(tr("Normal"));
-        comboBox->addItem(tr("Active"));
-        comboBox->addItem(tr("Disabled"));
-        comboBox->addItem(tr("Selected"));
-    } else if (index.column() == 2) {
-        comboBox->addItem(tr("Off"));
-        comboBox->addItem(tr("On"));
-    }
+    if (index.column() == 1)
+        comboBox->addItems(IconPreviewArea::iconModeNames());
+    else if (index.column() == 2)
+        comboBox->addItems(IconPreviewArea::iconStateNames());
 
-    connect(comboBox, SIGNAL(activated(int)), this, SLOT(emitCommitData()));
+    typedef void (QComboBox::*QComboBoxIntSignal)(int);
+    connect(comboBox, static_cast<QComboBoxIntSignal>(&QComboBox::activated),
+            this, &ImageDelegate::emitCommitData);
 
     return comboBox;
 }