Clean up diagramscene example's toolbutton icons.

Remove artefacts from pointer.png.

Replace several PNGs with images without artefacts (used FreeSerif as
the font).

Stopped scaling images up in MainWindow::createColorToolButtonIcon.

Change-Id: I7adf2deea73b89c631d39d575804e8d3f58c9fe1
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>

diff --git a/examples/widgets/graphicsview/diagramscene/images/bold.png b/examples/widgets/graphicsview/diagramscene/images/bold.png
index 986e65e..47e7591 100644 (file)
Binary files a/examples/widgets/graphicsview/diagramscene/images/bold.png and b/examples/widgets/graphicsview/diagramscene/images/bold.png differ

diff --git a/examples/widgets/graphicsview/diagramscene/images/italic.png b/examples/widgets/graphicsview/diagramscene/images/italic.png
index 9a438b5..9a9b535 100644 (file)
Binary files a/examples/widgets/graphicsview/diagramscene/images/italic.png and b/examples/widgets/graphicsview/diagramscene/images/italic.png differ

diff --git a/examples/widgets/graphicsview/diagramscene/images/pointer.png b/examples/widgets/graphicsview/diagramscene/images/pointer.png
index 0b0b0aa..f705bde 100644 (file)
Binary files a/examples/widgets/graphicsview/diagramscene/images/pointer.png and b/examples/widgets/graphicsview/diagramscene/images/pointer.png differ

diff --git a/examples/widgets/graphicsview/diagramscene/images/textpointer.png b/examples/widgets/graphicsview/diagramscene/images/textpointer.png
index b25832c..5a2ca2e 100644 (file)
Binary files a/examples/widgets/graphicsview/diagramscene/images/textpointer.png and b/examples/widgets/graphicsview/diagramscene/images/textpointer.png differ

diff --git a/examples/widgets/graphicsview/diagramscene/images/underline.png b/examples/widgets/graphicsview/diagramscene/images/underline.png
index 9b8209f..5f8ecb4 100644 (file)
Binary files a/examples/widgets/graphicsview/diagramscene/images/underline.png and b/examples/widgets/graphicsview/diagramscene/images/underline.png differ

diff --git a/examples/widgets/graphicsview/diagramscene/mainwindow.cpp b/examples/widgets/graphicsview/diagramscene/mainwindow.cpp
index 3e15848..39ebe48 100644 (file)
--- a/examples/widgets/graphicsview/diagramscene/mainwindow.cpp
+++ b/examples/widgets/graphicsview/diagramscene/mainwindow.cpp
@@ -340,8 +340,7 @@ void MainWindow::createToolBox()
     QToolButton *textButton = new QToolButton;
     textButton->setCheckable(true);
     buttonGroup->addButton(textButton, InsertTextButton);
-    textButton->setIcon(QIcon(QPixmap(":/images/textpointer.png")
-                        .scaled(30, 30)));
+    textButton->setIcon(QIcon(QPixmap(":/images/textpointer.png")));
     textButton->setIconSize(QSize(50, 50));
     QGridLayout *textLayout = new QGridLayout;
     textLayout->addWidget(textButton, 0, 0, Qt::AlignHCenter);
@@ -639,8 +638,9 @@ QIcon MainWindow::createColorToolButtonIcon(const QString &imageFile,
     pixmap.fill(Qt::transparent);
     QPainter painter(&pixmap);
     QPixmap image(imageFile);
-    QRect target(0, 0, 50, 60);
-    QRect source(0, 0, 42, 42);
+    // Draw icon centred horizontally on button.
+    QRect target(4, 0, 42, 43);
+    QRect source(0, 0, 42, 43);
     painter.fillRect(QRect(0, 60, 50, 80), color);
     painter.drawPixmap(target, image, source);