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 --- examples/painting/transformations/main.cpp | 51 ------ examples/painting/transformations/renderarea.cpp | 172 -------------------- examples/painting/transformations/renderarea.h | 90 ----------- .../transformations/transformations.desktop | 11 -- .../painting/transformations/transformations.pro | 13 -- examples/painting/transformations/window.cpp | 180 --------------------- examples/painting/transformations/window.h | 80 --------- 7 files changed, 597 deletions(-) delete mode 100644 examples/painting/transformations/main.cpp delete mode 100644 examples/painting/transformations/renderarea.cpp delete mode 100644 examples/painting/transformations/renderarea.h delete mode 100644 examples/painting/transformations/transformations.desktop delete mode 100644 examples/painting/transformations/transformations.pro delete mode 100644 examples/painting/transformations/window.cpp delete mode 100644 examples/painting/transformations/window.h (limited to 'examples/painting/transformations') diff --git a/examples/painting/transformations/main.cpp b/examples/painting/transformations/main.cpp deleted file mode 100644 index dcbf1c0449..0000000000 --- a/examples/painting/transformations/main.cpp +++ /dev/null @@ -1,51 +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 "window.h" - -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); - Window window; - window.show(); - return app.exec(); -} diff --git a/examples/painting/transformations/renderarea.cpp b/examples/painting/transformations/renderarea.cpp deleted file mode 100644 index 58be8143c3..0000000000 --- a/examples/painting/transformations/renderarea.cpp +++ /dev/null @@ -1,172 +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 "renderarea.h" - -//! [0] -RenderArea::RenderArea(QWidget *parent) - : QWidget(parent) -{ - QFont newFont = font(); - newFont.setPixelSize(12); - setFont(newFont); - - QFontMetrics fontMetrics(newFont); - xBoundingRect = fontMetrics.boundingRect(tr("x")); - yBoundingRect = fontMetrics.boundingRect(tr("y")); -} -//! [0] - -//! [1] -void RenderArea::setOperations(const QList &operations) -{ - this->operations = operations; - update(); -} -//! [1] - -//! [2] -void RenderArea::setShape(const QPainterPath &shape) -{ - this->shape = shape; - update(); -} -//! [2] - -//! [3] -QSize RenderArea::minimumSizeHint() const -{ - return QSize(182, 182); -} -//! [3] - -//! [4] -QSize RenderArea::sizeHint() const -{ - return QSize(232, 232); -} -//! [4] - -//! [5] -void RenderArea::paintEvent(QPaintEvent *event) -{ - QPainter painter(this); - painter.setRenderHint(QPainter::Antialiasing); - painter.fillRect(event->rect(), QBrush(Qt::white)); - - painter.translate(66, 66); -//! [5] - -//! [6] - painter.save(); - transformPainter(painter); - drawShape(painter); - painter.restore(); -//! [6] - -//! [7] - drawOutline(painter); -//! [7] - -//! [8] - transformPainter(painter); - drawCoordinates(painter); -} -//! [8] - -//! [9] -void RenderArea::drawCoordinates(QPainter &painter) -{ - painter.setPen(Qt::red); - - painter.drawLine(0, 0, 50, 0); - painter.drawLine(48, -2, 50, 0); - painter.drawLine(48, 2, 50, 0); - painter.drawText(60 - xBoundingRect.width() / 2, - 0 + xBoundingRect.height() / 2, tr("x")); - - painter.drawLine(0, 0, 0, 50); - painter.drawLine(-2, 48, 0, 50); - painter.drawLine(2, 48, 0, 50); - painter.drawText(0 - yBoundingRect.width() / 2, - 60 + yBoundingRect.height() / 2, tr("y")); -} -//! [9] - -//! [10] -void RenderArea::drawOutline(QPainter &painter) -{ - painter.setPen(Qt::darkGreen); - painter.setPen(Qt::DashLine); - painter.setBrush(Qt::NoBrush); - painter.drawRect(0, 0, 100, 100); -} -//! [10] - -//! [11] -void RenderArea::drawShape(QPainter &painter) -{ - painter.fillPath(shape, Qt::blue); -} -//! [11] - -//! [12] -void RenderArea::transformPainter(QPainter &painter) -{ - for (int i = 0; i < operations.size(); ++i) { - switch (operations[i]) { - case Translate: - painter.translate(50, 50); - break; - case Scale: - painter.scale(0.75, 0.75); - break; - case Rotate: - painter.rotate(60); - break; - case NoTransformation: - default: - ; - } - } -} -//! [12] diff --git a/examples/painting/transformations/renderarea.h b/examples/painting/transformations/renderarea.h deleted file mode 100644 index adc6c1ad7f..0000000000 --- a/examples/painting/transformations/renderarea.h +++ /dev/null @@ -1,90 +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 RENDERAREA_H -#define RENDERAREA_H - -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE -class QPaintEvent; -QT_END_NAMESPACE - -//! [0] -enum Operation { NoTransformation, Translate, Rotate, Scale }; -//! [0] - -//! [1] -class RenderArea : public QWidget -{ - Q_OBJECT - -public: - RenderArea(QWidget *parent = 0); - - void setOperations(const QList &operations); - void setShape(const QPainterPath &shape); - - QSize minimumSizeHint() const; - QSize sizeHint() const; - -protected: - void paintEvent(QPaintEvent *event); -//! [1] - -//! [2] -private: - void drawCoordinates(QPainter &painter); - void drawOutline(QPainter &painter); - void drawShape(QPainter &painter); - void transformPainter(QPainter &painter); - - QList operations; - QPainterPath shape; - QRect xBoundingRect; - QRect yBoundingRect; -}; -//! [2] - -#endif diff --git a/examples/painting/transformations/transformations.desktop b/examples/painting/transformations/transformations.desktop deleted file mode 100644 index 2f53891069..0000000000 --- a/examples/painting/transformations/transformations.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Transformations -Exec=/opt/usr/bin/transformations -Icon=transformations -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/painting/transformations/transformations.pro b/examples/painting/transformations/transformations.pro deleted file mode 100644 index a261c53371..0000000000 --- a/examples/painting/transformations/transformations.pro +++ /dev/null @@ -1,13 +0,0 @@ -HEADERS = renderarea.h \ - window.h -SOURCES = main.cpp \ - renderarea.cpp \ - window.cpp - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/transformations -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS transformations.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/transformations -INSTALLS += target sources - -QT += widgets diff --git a/examples/painting/transformations/window.cpp b/examples/painting/transformations/window.cpp deleted file mode 100644 index 5f9296be7f..0000000000 --- a/examples/painting/transformations/window.cpp +++ /dev/null @@ -1,180 +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 "window.h" - -//! [0] -Window::Window() -{ - originalRenderArea = new RenderArea; - - shapeComboBox = new QComboBox; - shapeComboBox->addItem(tr("Clock")); - shapeComboBox->addItem(tr("House")); - shapeComboBox->addItem(tr("Text")); - shapeComboBox->addItem(tr("Truck")); - - QGridLayout *layout = new QGridLayout; - layout->addWidget(originalRenderArea, 0, 0); - layout->addWidget(shapeComboBox, 1, 0); -//! [0] - -//! [1] - for (int i = 0; i < NumTransformedAreas; ++i) { - transformedRenderAreas[i] = new RenderArea; - - operationComboBoxes[i] = new QComboBox; - operationComboBoxes[i]->addItem(tr("No transformation")); - operationComboBoxes[i]->addItem(tr("Rotate by 60\xC2\xB0")); - operationComboBoxes[i]->addItem(tr("Scale to 75%")); - operationComboBoxes[i]->addItem(tr("Translate by (50, 50)")); - - connect(operationComboBoxes[i], SIGNAL(activated(int)), - this, SLOT(operationChanged())); - - layout->addWidget(transformedRenderAreas[i], 0, i + 1); - layout->addWidget(operationComboBoxes[i], 1, i + 1); - } -//! [1] - -//! [2] - setLayout(layout); - setupShapes(); - shapeSelected(0); - - setWindowTitle(tr("Transformations")); -} -//! [2] - -//! [3] -void Window::setupShapes() -{ - QPainterPath truck; -//! [3] - truck.setFillRule(Qt::WindingFill); - truck.moveTo(0.0, 87.0); - truck.lineTo(0.0, 60.0); - truck.lineTo(10.0, 60.0); - truck.lineTo(35.0, 35.0); - truck.lineTo(100.0, 35.0); - truck.lineTo(100.0, 87.0); - truck.lineTo(0.0, 87.0); - truck.moveTo(17.0, 60.0); - truck.lineTo(55.0, 60.0); - truck.lineTo(55.0, 40.0); - truck.lineTo(37.0, 40.0); - truck.lineTo(17.0, 60.0); - truck.addEllipse(17.0, 75.0, 25.0, 25.0); - truck.addEllipse(63.0, 75.0, 25.0, 25.0); - -//! [4] - QPainterPath clock; -//! [4] - clock.addEllipse(-50.0, -50.0, 100.0, 100.0); - clock.addEllipse(-48.0, -48.0, 96.0, 96.0); - clock.moveTo(0.0, 0.0); - clock.lineTo(-2.0, -2.0); - clock.lineTo(0.0, -42.0); - clock.lineTo(2.0, -2.0); - clock.lineTo(0.0, 0.0); - clock.moveTo(0.0, 0.0); - clock.lineTo(2.732, -0.732); - clock.lineTo(24.495, 14.142); - clock.lineTo(0.732, 2.732); - clock.lineTo(0.0, 0.0); - -//! [5] - QPainterPath house; -//! [5] - house.moveTo(-45.0, -20.0); - house.lineTo(0.0, -45.0); - house.lineTo(45.0, -20.0); - house.lineTo(45.0, 45.0); - house.lineTo(-45.0, 45.0); - house.lineTo(-45.0, -20.0); - house.addRect(15.0, 5.0, 20.0, 35.0); - house.addRect(-35.0, -15.0, 25.0, 25.0); - -//! [6] - QPainterPath text; -//! [6] - QFont font; - font.setPixelSize(50); - QRect fontBoundingRect = QFontMetrics(font).boundingRect(tr("Qt")); - text.addText(-QPointF(fontBoundingRect.center()), font, tr("Qt")); - -//! [7] - shapes.append(clock); - shapes.append(house); - shapes.append(text); - shapes.append(truck); - - connect(shapeComboBox, SIGNAL(activated(int)), - this, SLOT(shapeSelected(int))); -} -//! [7] - -//! [8] -void Window::operationChanged() -{ - static const Operation operationTable[] = { - NoTransformation, Rotate, Scale, Translate - }; - - QList operations; - for (int i = 0; i < NumTransformedAreas; ++i) { - int index = operationComboBoxes[i]->currentIndex(); - operations.append(operationTable[index]); - transformedRenderAreas[i]->setOperations(operations); - } -} -//! [8] - -//! [9] -void Window::shapeSelected(int index) -{ - QPainterPath shape = shapes[index]; - originalRenderArea->setShape(shape); - for (int i = 0; i < NumTransformedAreas; ++i) - transformedRenderAreas[i]->setShape(shape); -} -//! [9] diff --git a/examples/painting/transformations/window.h b/examples/painting/transformations/window.h deleted file mode 100644 index f28e53e494..0000000000 --- a/examples/painting/transformations/window.h +++ /dev/null @@ -1,80 +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 WINDOW_H -#define WINDOW_H - -#include -#include -#include - -#include "renderarea.h" - -QT_BEGIN_NAMESPACE -class QComboBox; -QT_END_NAMESPACE - -//! [0] -class Window : public QWidget -{ - Q_OBJECT - -public: - Window(); - -public slots: - void operationChanged(); - void shapeSelected(int index); -//! [0] - -//! [1] -private: - void setupShapes(); - - enum { NumTransformedAreas = 3 }; - RenderArea *originalRenderArea; - RenderArea *transformedRenderAreas[NumTransformedAreas]; - QComboBox *shapeComboBox; - QComboBox *operationComboBoxes[NumTransformedAreas]; - QList shapes; -}; -//! [1] - -#endif -- cgit v1.2.3