From 6efe729881303f2198d61817174e9695aea63246 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 4 Jul 2011 10:30:18 +0200 Subject: Remove more references to demos. Change-Id: I431184cd0534c86047706fdaa1045b2935de5d7a Reviewed-on: http://codereview.qt.nokia.com/1307 Reviewed-by: Qt Sanity Bot Reviewed-by: David Boddie --- doc/src/demos/affine.qdoc | 48 -------------------------------------- doc/src/examples/affine.qdoc | 48 ++++++++++++++++++++++++++++++++++++++ doc/src/examples/books.qdoc | 4 ++-- doc/src/examples/styledemo.qdoc | 33 -------------------------- doc/src/examples/styleexample.qdoc | 33 ++++++++++++++++++++++++++ doc/src/tutorials/modelview.qdoc | 23 ++++++++---------- 6 files changed, 93 insertions(+), 96 deletions(-) delete mode 100644 doc/src/demos/affine.qdoc create mode 100644 doc/src/examples/affine.qdoc delete mode 100644 doc/src/examples/styledemo.qdoc create mode 100644 doc/src/examples/styleexample.qdoc (limited to 'doc') diff --git a/doc/src/demos/affine.qdoc b/doc/src/demos/affine.qdoc deleted file mode 100644 index c14a452849..0000000000 --- a/doc/src/demos/affine.qdoc +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example painting/affine - \title Affine Transformations - - In this demo we show Qt's ability to perform affine transformations - on painting operations. - - \image affine-demo.png - - Transformations can be performed on any kind of graphics drawn using QPainter. - The transformations used to display the vector graphics, images, and text can be adjusted - in the following ways: - - \list - \o Dragging the red circle in the centre of each drawing moves it to a new position. - \o Dragging the displaced red circle causes the current drawing to be rotated about the - central circle. Rotation can also be controlled with the \key Rotate slider. - \o Scaling is controlled with the \key Scale slider. - \o Each drawing can be sheared with the \key Shear slider. - \endlist -*/ diff --git a/doc/src/examples/affine.qdoc b/doc/src/examples/affine.qdoc new file mode 100644 index 0000000000..2d70fa8951 --- /dev/null +++ b/doc/src/examples/affine.qdoc @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example painting/affine + \title Affine Transformations + + In this example we show Qt's ability to perform affine transformations + on painting operations. + + \image affine-demo.png + + Transformations can be performed on any kind of graphics drawn using QPainter. + The transformations used to display the vector graphics, images, and text can be adjusted + in the following ways: + + \list + \o Dragging the red circle in the centre of each drawing moves it to a new position. + \o Dragging the displaced red circle causes the current drawing to be rotated about the + central circle. Rotation can also be controlled with the \key Rotate slider. + \o Scaling is controlled with the \key Scale slider. + \o Each drawing can be sheared with the \key Shear slider. + \endlist +*/ diff --git a/doc/src/examples/books.qdoc b/doc/src/examples/books.qdoc index 64a4613b13..9fa7fdfc8c 100644 --- a/doc/src/examples/books.qdoc +++ b/doc/src/examples/books.qdoc @@ -27,9 +27,9 @@ /*! \example sql/books - \title Books Demonstration + \title Books - The Books demonstration shows how Qt's SQL classes can be used with the model/view + The Books example shows how Qt's SQL classes can be used with the model/view framework to create rich user interfaces for information stored in a database. \image books-demo.png diff --git a/doc/src/examples/styledemo.qdoc b/doc/src/examples/styledemo.qdoc deleted file mode 100644 index 5a5bb5b47d..0000000000 --- a/doc/src/examples/styledemo.qdoc +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example embedded/styledemo - \title Embedded Styles - - \image styledemo-demo.png -*/ diff --git a/doc/src/examples/styleexample.qdoc b/doc/src/examples/styleexample.qdoc new file mode 100644 index 0000000000..f3ab3b17d6 --- /dev/null +++ b/doc/src/examples/styleexample.qdoc @@ -0,0 +1,33 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example embedded/styleexample + \title Embedded Styles + + \image styledemo-demo.png +*/ diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc index 35454f4268..9cbba47b60 100644 --- a/doc/src/tutorials/modelview.qdoc +++ b/doc/src/tutorials/modelview.qdoc @@ -777,7 +777,7 @@ \section2 4.2 Qt Documentation - Qt 4.7 comes with 17 examples and 2 Demonstrations for model/view. + Qt 5.0 comes with 19 examples for model/view. The examples can be found on the \l{Item Views Examples} page. \table @@ -841,6 +841,11 @@ \o QTableView \o QStandardItemModel \o + \row + \o Interview + \o Multiple + \o Custom item model + \o Multiple views \row \o Pixelator \o QTableView @@ -871,24 +876,16 @@ \o QTableView \o QStandardItemModel \o Custom delegate that uses a spin box as a cell editor + \row + \o Spreadsheet + \o {2, 1} QTableView + \o Custom delegates \row \o Star Delegate \o {2, 1} QTableWidget \o Comprehensive custom delegate example. \endtable - \l{Qt Demonstrations}{Demonstrations} are similar to examples except that no - walkthrough is provided for the code. Demonstrations are typically more - feature rich than examples. - - \list - \o The \bold Interview demonstration shows the same model and - selection being shared between three different views. - \o The \bold Spreadsheet demonstration illustrates the use of a - table view as a spreadsheet, using custom delegates to render - each item according to the type of data it contains. - \endlist - A \l{Model/View Programming}{reference document} for model/view technology is also available. */ -- cgit v1.2.3