diff options
| -rw-r--r-- | src/gui/doc/snippets/separations/finalwidget.cpp | 17 | ||||
| -rw-r--r-- | src/gui/doc/snippets/separations/finalwidget.h | 2 | ||||
| -rw-r--r-- | src/gui/doc/snippets/separations/separations.pro | 20 | ||||
| -rw-r--r-- | src/gui/doc/snippets/separations/viewer.cpp | 3 | ||||
| -rw-r--r-- | src/gui/doc/snippets/snippets.pro | 1 |
5 files changed, 27 insertions, 16 deletions
diff --git a/src/gui/doc/snippets/separations/finalwidget.cpp b/src/gui/doc/snippets/separations/finalwidget.cpp index 4cc8abe7aa8..25aa6b8d1c0 100644 --- a/src/gui/doc/snippets/separations/finalwidget.cpp +++ b/src/gui/doc/snippets/separations/finalwidget.cpp @@ -54,9 +54,16 @@ finalwidget.cpp A widget to display an image and a label containing a description. */ -#include <QtGui> #include "finalwidget.h" +#include <QApplication> +#include <QBuffer> +#include <QDrag> +#include <QLabel> +#include <QMimeData> +#include <QMouseEvent> +#include <QVBoxLayout> + FinalWidget::FinalWidget(QWidget *parent, const QString &name, const QSize &labelSize) : QFrame(parent) @@ -96,7 +103,7 @@ void FinalWidget::mouseMoveEvent(QMouseEvent *event) QByteArray output; QBuffer outputBuffer(&output); outputBuffer.open(QIODevice::WriteOnly); - imageLabel->pixmap()->toImage().save(&outputBuffer, "PNG"); + imageLabel->pixmap().toImage().save(&outputBuffer, "PNG"); mimeData->setData("image/png", output); //! [0] /* @@ -105,13 +112,11 @@ void FinalWidget::mouseMoveEvent(QMouseEvent *event) //! [1] */ drag->setMimeData(mimeData); - drag->setPixmap(imageLabel->pixmap()->scaled(64, 64, Qt::KeepAspectRatio)); + drag->setPixmap(imageLabel->pixmap().scaled(64, 64, Qt::KeepAspectRatio)); //! [2] drag->setHotSpot(QPoint(drag->pixmap().width()/2, drag->pixmap().height())); //! [2] - - drag->start(); } /*! @@ -124,7 +129,7 @@ void FinalWidget::mousePressEvent(QMouseEvent *event) dragStartPosition = event->pos(); } -const QPixmap* FinalWidget::pixmap() const +QPixmap FinalWidget::pixmap() const { return imageLabel->pixmap(); } diff --git a/src/gui/doc/snippets/separations/finalwidget.h b/src/gui/doc/snippets/separations/finalwidget.h index 886a5dfaf30..a7c092c92a9 100644 --- a/src/gui/doc/snippets/separations/finalwidget.h +++ b/src/gui/doc/snippets/separations/finalwidget.h @@ -68,7 +68,7 @@ class FinalWidget : public QFrame public: FinalWidget(QWidget *parent, const QString &name, const QSize &labelSize); void setPixmap(const QPixmap &pixmap); - const QPixmap *pixmap() const; + QPixmap pixmap() const; protected: void mouseMoveEvent(QMouseEvent *event) override; diff --git a/src/gui/doc/snippets/separations/separations.pro b/src/gui/doc/snippets/separations/separations.pro index 48af2c8472f..d16f0fb3f66 100644 --- a/src/gui/doc/snippets/separations/separations.pro +++ b/src/gui/doc/snippets/separations/separations.pro @@ -1,7 +1,13 @@ -HEADERS = finalwidget.h \ - screenwidget.h \ - viewer.h -SOURCES = finalwidget.cpp \ - main.cpp \ - screenwidget.cpp \ - viewer.cpp +TEMPLATE = lib +TARGET = separations_snippets +QT += core gui widgets + +HEADERS = \ + finalwidget.h \ + screenwidget.h \ + viewer.h +SOURCES = \ + finalwidget.cpp \ + main.cpp \ + screenwidget.cpp \ + viewer.cpp diff --git a/src/gui/doc/snippets/separations/viewer.cpp b/src/gui/doc/snippets/separations/viewer.cpp index 018b397f1a6..c1aca075244 100644 --- a/src/gui/doc/snippets/separations/viewer.cpp +++ b/src/gui/doc/snippets/separations/viewer.cpp @@ -145,7 +145,6 @@ QFrame* Viewer::createCentralWidget() QFrame* frame = new QFrame(this); grid = new QGridLayout(frame); grid->setSpacing(8); - grid->setMargin(4); layout()->setSizeConstraint(QLayout::SetFixedSize); @@ -324,7 +323,7 @@ void Viewer::saveImage() QString newImageFile = QFileInfo(info.absoluteDir(), info.baseName() + ".png").absoluteFilePath(); - if (!finalWidget->pixmap()->save(newImageFile, "PNG")) + if (!finalWidget->pixmap().save(newImageFile, "PNG")) (void) QMessageBox::warning(this, tr("Cannot save file"), tr("The file could not be saved."), QMessageBox::Cancel, QMessageBox::NoButton, diff --git a/src/gui/doc/snippets/snippets.pro b/src/gui/doc/snippets/snippets.pro index a0c9241551a..bf5b2f99d79 100644 --- a/src/gui/doc/snippets/snippets.pro +++ b/src/gui/doc/snippets/snippets.pro @@ -20,6 +20,7 @@ contains(QT_BUILD_PARTS, tests) { qstatustipevent \ qtextobject \ scribe-overview \ + separations \ textblock-formats \ textblock-fragments \ textdocument-blocks \ |