From 806dda08d685bc5f9ed71dfe8b61f21848d48066 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Fri, 17 Aug 2012 13:23:19 +0200 Subject: Moving .qdoc files under examples/widgets/doc Updated those .qdoc files to refer to the new relative examples emplacement. Images and snippets to be moved later. Also grouped all widgets related examples under widgets. Change-Id: Ib29696e2d8948524537f53e8dda88f9ee26a597f Reviewed-by: J-P Nurmi --- .../painting/imagecomposition/imagecomposer.cpp | 211 --------------------- examples/painting/imagecomposition/imagecomposer.h | 87 --------- .../imagecomposition/imagecomposition.desktop | 11 -- .../painting/imagecomposition/imagecomposition.pro | 13 -- .../painting/imagecomposition/imagecomposition.qrc | 6 - .../imagecomposition/images/background.png | Bin 18579 -> 0 bytes .../imagecomposition/images/blackrectangle.png | Bin 90 -> 0 bytes .../painting/imagecomposition/images/butterfly.png | Bin 36868 -> 0 bytes .../painting/imagecomposition/images/checker.png | Bin 10384 -> 0 bytes examples/painting/imagecomposition/main.cpp | 55 ------ 10 files changed, 383 deletions(-) delete mode 100644 examples/painting/imagecomposition/imagecomposer.cpp delete mode 100644 examples/painting/imagecomposition/imagecomposer.h delete mode 100644 examples/painting/imagecomposition/imagecomposition.desktop delete mode 100644 examples/painting/imagecomposition/imagecomposition.pro delete mode 100644 examples/painting/imagecomposition/imagecomposition.qrc delete mode 100644 examples/painting/imagecomposition/images/background.png delete mode 100644 examples/painting/imagecomposition/images/blackrectangle.png delete mode 100644 examples/painting/imagecomposition/images/butterfly.png delete mode 100644 examples/painting/imagecomposition/images/checker.png delete mode 100644 examples/painting/imagecomposition/main.cpp (limited to 'examples/painting/imagecomposition') diff --git a/examples/painting/imagecomposition/imagecomposer.cpp b/examples/painting/imagecomposition/imagecomposer.cpp deleted file mode 100644 index 38b04a27b0..0000000000 --- a/examples/painting/imagecomposition/imagecomposer.cpp +++ /dev/null @@ -1,211 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include "imagecomposer.h" - -//! [0] -static const QSize resultSize(200, 200); -//! [0] - -//! [1] -ImageComposer::ImageComposer() -{ - sourceButton = new QToolButton; - sourceButton->setIconSize(resultSize); - - operatorComboBox = new QComboBox; - addOp(QPainter::CompositionMode_SourceOver, tr("SourceOver")); - addOp(QPainter::CompositionMode_DestinationOver, tr("DestinationOver")); - addOp(QPainter::CompositionMode_Clear, tr("Clear")); - addOp(QPainter::CompositionMode_Source, tr("Source")); - addOp(QPainter::CompositionMode_Destination, tr("Destination")); - addOp(QPainter::CompositionMode_SourceIn, tr("SourceIn")); - addOp(QPainter::CompositionMode_DestinationIn, tr("DestinationIn")); - addOp(QPainter::CompositionMode_SourceOut, tr("SourceOut")); - addOp(QPainter::CompositionMode_DestinationOut, tr("DestinationOut")); - addOp(QPainter::CompositionMode_SourceAtop, tr("SourceAtop")); - addOp(QPainter::CompositionMode_DestinationAtop, tr("DestinationAtop")); - addOp(QPainter::CompositionMode_Xor, tr("Xor")); - addOp(QPainter::CompositionMode_Plus, tr("Plus")); - addOp(QPainter::CompositionMode_Multiply, tr("Multiply")); - addOp(QPainter::CompositionMode_Screen, tr("Screen")); - addOp(QPainter::CompositionMode_Overlay, tr("Overlay")); - addOp(QPainter::CompositionMode_Darken, tr("Darken")); - addOp(QPainter::CompositionMode_Lighten, tr("Lighten")); - addOp(QPainter::CompositionMode_ColorDodge, tr("ColorDodge")); - addOp(QPainter::CompositionMode_ColorBurn, tr("ColorBurn")); - addOp(QPainter::CompositionMode_HardLight, tr("HardLight")); - addOp(QPainter::CompositionMode_SoftLight, tr("SoftLight")); - addOp(QPainter::CompositionMode_Difference, tr("Difference")); - addOp(QPainter::CompositionMode_Exclusion, tr("Exclusion")); -//! [1] - -//! [2] - destinationButton = new QToolButton; - destinationButton->setIconSize(resultSize); - - equalLabel = new QLabel(tr("=")); - - resultLabel = new QLabel; - resultLabel->setMinimumWidth(resultSize.width()); -//! [2] - -//! [3] - connect(sourceButton, SIGNAL(clicked()), this, SLOT(chooseSource())); - connect(operatorComboBox, SIGNAL(activated(int)), - this, SLOT(recalculateResult())); - connect(destinationButton, SIGNAL(clicked()), - this, SLOT(chooseDestination())); -//! [3] - -//! [4] - QGridLayout *mainLayout = new QGridLayout; - mainLayout->addWidget(sourceButton, 0, 0, 3, 1); - mainLayout->addWidget(operatorComboBox, 1, 1); - mainLayout->addWidget(destinationButton, 0, 2, 3, 1); - mainLayout->addWidget(equalLabel, 1, 3); - mainLayout->addWidget(resultLabel, 0, 4, 3, 1); - mainLayout->setSizeConstraint(QLayout::SetFixedSize); - setLayout(mainLayout); -//! [4] - -//! [5] - resultImage = QImage(resultSize, QImage::Format_ARGB32_Premultiplied); - - loadImage(":/images/butterfly.png", &sourceImage, sourceButton); - loadImage(":/images/checker.png", &destinationImage, destinationButton); - - setWindowTitle(tr("Image Composition")); -} -//! [5] - -//! [6] -void ImageComposer::chooseSource() -{ - chooseImage(tr("Choose Source Image"), &sourceImage, sourceButton); -} -//! [6] - -//! [7] -void ImageComposer::chooseDestination() -{ - chooseImage(tr("Choose Destination Image"), &destinationImage, - destinationButton); -} -//! [7] - -//! [8] -void ImageComposer::recalculateResult() -{ - QPainter::CompositionMode mode = currentMode(); - - QPainter painter(&resultImage); - painter.setCompositionMode(QPainter::CompositionMode_Source); - painter.fillRect(resultImage.rect(), Qt::transparent); - painter.setCompositionMode(QPainter::CompositionMode_SourceOver); - painter.drawImage(0, 0, destinationImage); - painter.setCompositionMode(mode); - painter.drawImage(0, 0, sourceImage); - painter.setCompositionMode(QPainter::CompositionMode_DestinationOver); - painter.fillRect(resultImage.rect(), Qt::white); - painter.end(); - - resultLabel->setPixmap(QPixmap::fromImage(resultImage)); -} -//! [8] - -//! [9] -void ImageComposer::addOp(QPainter::CompositionMode mode, const QString &name) -{ - operatorComboBox->addItem(name, mode); -} -//! [9] - -//! [10] -void ImageComposer::chooseImage(const QString &title, QImage *image, - QToolButton *button) -{ - QString fileName = QFileDialog::getOpenFileName(this, title); - if (!fileName.isEmpty()) - loadImage(fileName, image, button); -} -//! [10] - -//! [11] -void ImageComposer::loadImage(const QString &fileName, QImage *image, - QToolButton *button) -{ - image->load(fileName); - - // Scale the image to given size - *image = image->scaled(resultSize, Qt::KeepAspectRatio); - - QImage fixedImage(resultSize, QImage::Format_ARGB32_Premultiplied); - QPainter painter(&fixedImage); - painter.setCompositionMode(QPainter::CompositionMode_Source); - painter.fillRect(fixedImage.rect(), Qt::transparent); - painter.setCompositionMode(QPainter::CompositionMode_SourceOver); - painter.drawImage(imagePos(*image), *image); - painter.end(); - button->setIcon(QPixmap::fromImage(fixedImage)); - - *image = fixedImage; - - recalculateResult(); -} -//! [11] - -//! [12] -QPainter::CompositionMode ImageComposer::currentMode() const -{ - return (QPainter::CompositionMode) - operatorComboBox->itemData(operatorComboBox->currentIndex()).toInt(); -} -//! [12] - -//! [13] -QPoint ImageComposer::imagePos(const QImage &image) const -{ - return QPoint((resultSize.width() - image.width()) / 2, - (resultSize.height() - image.height()) / 2); -} -//! [13] diff --git a/examples/painting/imagecomposition/imagecomposer.h b/examples/painting/imagecomposition/imagecomposer.h deleted file mode 100644 index 7ec0207e2c..0000000000 --- a/examples/painting/imagecomposition/imagecomposer.h +++ /dev/null @@ -1,87 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef IMAGECOMPOSER_H -#define IMAGECOMPOSER_H - -#include -#include - -QT_BEGIN_NAMESPACE -class QComboBox; -class QLabel; -class QToolButton; -QT_END_NAMESPACE - -//! [0] -class ImageComposer : public QWidget -{ - Q_OBJECT - -public: - ImageComposer(); - -private slots: - void chooseSource(); - void chooseDestination(); - void recalculateResult(); -//! [0] - -//! [1] -private: - void addOp(QPainter::CompositionMode mode, const QString &name); - void chooseImage(const QString &title, QImage *image, QToolButton *button); - void loadImage(const QString &fileName, QImage *image, QToolButton *button); - QPainter::CompositionMode currentMode() const; - QPoint imagePos(const QImage &image) const; - - QToolButton *sourceButton; - QToolButton *destinationButton; - QComboBox *operatorComboBox; - QLabel *equalLabel; - QLabel *resultLabel; - - QImage sourceImage; - QImage destinationImage; - QImage resultImage; -}; -//! [1] - -#endif diff --git a/examples/painting/imagecomposition/imagecomposition.desktop b/examples/painting/imagecomposition/imagecomposition.desktop deleted file mode 100644 index 854fc862f0..0000000000 --- a/examples/painting/imagecomposition/imagecomposition.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Image Composition -Exec=/opt/usr/bin/imagecomposition -Icon=imagecomposition -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/painting/imagecomposition/imagecomposition.pro b/examples/painting/imagecomposition/imagecomposition.pro deleted file mode 100644 index edf434f5d2..0000000000 --- a/examples/painting/imagecomposition/imagecomposition.pro +++ /dev/null @@ -1,13 +0,0 @@ -HEADERS = imagecomposer.h -SOURCES = imagecomposer.cpp \ - main.cpp -RESOURCES = imagecomposition.qrc - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/imagecomposition -sources.files = $$SOURCES $$HEADERS $$RESOURCES images *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/imagecomposition -INSTALLS += target sources - -QT += widgets - diff --git a/examples/painting/imagecomposition/imagecomposition.qrc b/examples/painting/imagecomposition/imagecomposition.qrc deleted file mode 100644 index ebba7b2913..0000000000 --- a/examples/painting/imagecomposition/imagecomposition.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - images/butterfly.png - images/checker.png - - diff --git a/examples/painting/imagecomposition/images/background.png b/examples/painting/imagecomposition/images/background.png deleted file mode 100644 index f6ad899823..0000000000 Binary files a/examples/painting/imagecomposition/images/background.png and /dev/null differ diff --git a/examples/painting/imagecomposition/images/blackrectangle.png b/examples/painting/imagecomposition/images/blackrectangle.png deleted file mode 100644 index 5f2ecf8318..0000000000 Binary files a/examples/painting/imagecomposition/images/blackrectangle.png and /dev/null differ diff --git a/examples/painting/imagecomposition/images/butterfly.png b/examples/painting/imagecomposition/images/butterfly.png deleted file mode 100644 index f3e050eca2..0000000000 Binary files a/examples/painting/imagecomposition/images/butterfly.png and /dev/null differ diff --git a/examples/painting/imagecomposition/images/checker.png b/examples/painting/imagecomposition/images/checker.png deleted file mode 100644 index 546609de3f..0000000000 Binary files a/examples/painting/imagecomposition/images/checker.png and /dev/null differ diff --git a/examples/painting/imagecomposition/main.cpp b/examples/painting/imagecomposition/main.cpp deleted file mode 100644 index 6b17c4d370..0000000000 --- a/examples/painting/imagecomposition/main.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -#include "imagecomposer.h" - -//! [0] -int main(int argc, char *argv[]) -{ - Q_INIT_RESOURCE(imagecomposition); - - QApplication app(argc, argv); - ImageComposer composer; - composer.show(); - return app.exec(); -} -//! [0] -- cgit v1.2.3