From 36d12783c9f8eee133f9ab634f6b54e8a3cd75d4 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 30 Nov 2012 16:31:06 +0100 Subject: Fix linking of itemviews and graphicsview examples Change-Id: I6905cc6945e2eb396108f9fb16da042e576e3afb Reviewed-by: Gunnar Sletta --- .../doc/images/itemviews-editabletreemodel.png | Bin 0 -> 32534 bytes examples/widgets/doc/src/addressbook.qdoc | 2 +- examples/widgets/doc/src/basicgraphicslayouts.qdoc | 2 ++ examples/widgets/doc/src/basicsortfiltermodel.qdoc | 2 +- examples/widgets/doc/src/boxes.qdoc | 2 +- examples/widgets/doc/src/chart.qdoc | 2 +- examples/widgets/doc/src/chip.qdoc | 6 +++-- examples/widgets/doc/src/coloreditorfactory.qdoc | 2 +- examples/widgets/doc/src/combowidgetmapper.qdoc | 2 +- .../widgets/doc/src/customsortfiltermodel.qdoc | 2 +- examples/widgets/doc/src/diagramscene.qdoc | 2 +- examples/widgets/doc/src/dirview.qdoc | 2 ++ examples/widgets/doc/src/dragdroprobot.qdoc | 2 +- examples/widgets/doc/src/editabletreemodel.qdoc | 2 +- examples/widgets/doc/src/elasticnodes.qdoc | 6 +++-- examples/widgets/doc/src/embeddeddialogs.qdoc | 6 +++-- examples/widgets/doc/src/fetchmore.qdoc | 2 +- examples/widgets/doc/src/frozencolumn.qdoc | 2 +- examples/widgets/doc/src/interview.qdoc | 2 ++ examples/widgets/doc/src/itemviewspuzzle.qdoc | 2 +- examples/widgets/doc/src/padnavigator.qdoc | 2 +- examples/widgets/doc/src/pixelator.qdoc | 2 +- examples/widgets/doc/src/simpledommodel.qdoc | 2 +- examples/widgets/doc/src/simpletreemodel.qdoc | 3 +++ examples/widgets/doc/src/simplewidgetmapper.qdoc | 2 +- examples/widgets/doc/src/spinboxdelegate.qdoc | 2 +- examples/widgets/doc/src/spreadsheet.qdoc | 2 ++ examples/widgets/doc/src/stardelegate.qdoc | 2 +- src/widgets/doc/images/graphicsview-examples.png | Bin 0 -> 223121 bytes src/widgets/doc/images/itemviews-examples.png | Bin 0 -> 32534 bytes src/widgets/doc/src/qtwidgets-examples.qdoc | 29 ++++++++++++++++++++- 31 files changed, 70 insertions(+), 26 deletions(-) create mode 100644 examples/widgets/doc/images/itemviews-editabletreemodel.png create mode 100644 src/widgets/doc/images/graphicsview-examples.png create mode 100644 src/widgets/doc/images/itemviews-examples.png diff --git a/examples/widgets/doc/images/itemviews-editabletreemodel.png b/examples/widgets/doc/images/itemviews-editabletreemodel.png new file mode 100644 index 0000000000..a151ea857f Binary files /dev/null and b/examples/widgets/doc/images/itemviews-editabletreemodel.png differ diff --git a/examples/widgets/doc/src/addressbook.qdoc b/examples/widgets/doc/src/addressbook.qdoc index 65ed4b33bd..4712bf94ad 100644 --- a/examples/widgets/doc/src/addressbook.qdoc +++ b/examples/widgets/doc/src/addressbook.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/addressbook \title Address Book Example - + \ingroup examples-itemviews \brief The address book example shows how to use proxy models to display different views onto data from a single model. diff --git a/examples/widgets/doc/src/basicgraphicslayouts.qdoc b/examples/widgets/doc/src/basicgraphicslayouts.qdoc index 36ce914018..868943370c 100644 --- a/examples/widgets/doc/src/basicgraphicslayouts.qdoc +++ b/examples/widgets/doc/src/basicgraphicslayouts.qdoc @@ -28,6 +28,8 @@ /*! \example graphicsview/basicgraphicslayouts \title Basic Graphics Layouts Example + \ingroup examples-graphicsview + \brief This example shows how to use some basic layouts. \brief The Basic Graphics Layouts example shows how to use the layout classes in QGraphicsView: QGraphicsLinearLayout and QGraphicsGridLayout. diff --git a/examples/widgets/doc/src/basicsortfiltermodel.qdoc b/examples/widgets/doc/src/basicsortfiltermodel.qdoc index f9a3b94ba6..16f9fa61a2 100644 --- a/examples/widgets/doc/src/basicsortfiltermodel.qdoc +++ b/examples/widgets/doc/src/basicsortfiltermodel.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/basicsortfiltermodel \title Basic Sort/Filter Model Example - + \ingroup examples-itemviews \brief The Basic Sort/Filter Model example illustrates how to use QSortFilterProxyModel to perform basic sorting and filtering. diff --git a/examples/widgets/doc/src/boxes.qdoc b/examples/widgets/doc/src/boxes.qdoc index 96238f1efd..b3ed1f68c8 100644 --- a/examples/widgets/doc/src/boxes.qdoc +++ b/examples/widgets/doc/src/boxes.qdoc @@ -28,7 +28,7 @@ /*! \example graphicsview/boxes \title Boxes - + \ingroup examples-graphicsview \brief This demo shows Qt's ability to combine advanced OpenGL rendering with the the \l{Graphics View Framework}. diff --git a/examples/widgets/doc/src/chart.qdoc b/examples/widgets/doc/src/chart.qdoc index d12ee58422..a3b54f5328 100644 --- a/examples/widgets/doc/src/chart.qdoc +++ b/examples/widgets/doc/src/chart.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/chart \title Chart Example - + \ingroup examples-itemviews \brief The Chart example shows how to create a custom view for the model/view framework. \image chart-example.png diff --git a/examples/widgets/doc/src/chip.qdoc b/examples/widgets/doc/src/chip.qdoc index aa31227e43..e3adb26ced 100644 --- a/examples/widgets/doc/src/chip.qdoc +++ b/examples/widgets/doc/src/chip.qdoc @@ -28,9 +28,11 @@ /*! \example graphicsview/chip \title 40000 Chips - + \ingroup examples-graphicsview \brief This demo shows how to visualize a huge scene with 40000 chip items - using Graphics View. It also shows Graphics View's powerful navigation + using Graphics View. + + It also shows Graphics View's powerful navigation and interaction features, allowing you to zoom and rotate each of four views independently, and you can select and move items around the scene. diff --git a/examples/widgets/doc/src/coloreditorfactory.qdoc b/examples/widgets/doc/src/coloreditorfactory.qdoc index 377491939e..f34622f37e 100644 --- a/examples/widgets/doc/src/coloreditorfactory.qdoc +++ b/examples/widgets/doc/src/coloreditorfactory.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/coloreditorfactory \title Color Editor Factory Example - + \ingroup examples-itemviews \brief This example shows how to create an editor that can be used by a QItemDelegate. diff --git a/examples/widgets/doc/src/combowidgetmapper.qdoc b/examples/widgets/doc/src/combowidgetmapper.qdoc index df0d893f64..187934a816 100644 --- a/examples/widgets/doc/src/combowidgetmapper.qdoc +++ b/examples/widgets/doc/src/combowidgetmapper.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/combowidgetmapper \title Combo Widget Mapper Example - + \ingroup examples-itemviews \brief The Combo Widget Mapper example shows how to use a custom delegate to map information from a model to specific widgets on a form. diff --git a/examples/widgets/doc/src/customsortfiltermodel.qdoc b/examples/widgets/doc/src/customsortfiltermodel.qdoc index 2003dc767a..82f124606e 100644 --- a/examples/widgets/doc/src/customsortfiltermodel.qdoc +++ b/examples/widgets/doc/src/customsortfiltermodel.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/customsortfiltermodel \title Custom Sort/Filter Model Example - + \ingroup examples-itemviews \brief The Custom Sort/Filter Model example illustrates how to subclass QSortFilterProxyModel to perform advanced sorting and filtering. diff --git a/examples/widgets/doc/src/diagramscene.qdoc b/examples/widgets/doc/src/diagramscene.qdoc index 9b94ca2ab1..55043df475 100644 --- a/examples/widgets/doc/src/diagramscene.qdoc +++ b/examples/widgets/doc/src/diagramscene.qdoc @@ -28,7 +28,7 @@ /*! \example graphicsview/diagramscene \title Diagram Scene Example - + \ingroup examples-graphicsview \brief This example shows use of Qt's graphics framework. \image diagramscene.png diff --git a/examples/widgets/doc/src/dirview.qdoc b/examples/widgets/doc/src/dirview.qdoc index 8f860fd036..5deabcbb19 100644 --- a/examples/widgets/doc/src/dirview.qdoc +++ b/examples/widgets/doc/src/dirview.qdoc @@ -28,6 +28,8 @@ /*! \example itemviews/dirview \title Dir View Example + \ingroup examples-itemviews + \brief This example demonstrates the usage of a tree view. \brief The Dir View example shows a tree view onto the local filing system. It uses the QDirModel class to provide file and directory information. diff --git a/examples/widgets/doc/src/dragdroprobot.qdoc b/examples/widgets/doc/src/dragdroprobot.qdoc index cc5e6bd07d..8187cbfd46 100644 --- a/examples/widgets/doc/src/dragdroprobot.qdoc +++ b/examples/widgets/doc/src/dragdroprobot.qdoc @@ -28,7 +28,7 @@ /*! \example graphicsview/dragdroprobot \title Drag and Drop Robot Example - + \ingroup examples-graphicsview \brief The Drag and Drop Robot example shows how to implement Drag and Drop in a QGraphicsItem subclass, as well as how to animate items using Qt's \l{Animation Framework}. diff --git a/examples/widgets/doc/src/editabletreemodel.qdoc b/examples/widgets/doc/src/editabletreemodel.qdoc index fa72b77506..8c4c7cb89c 100644 --- a/examples/widgets/doc/src/editabletreemodel.qdoc +++ b/examples/widgets/doc/src/editabletreemodel.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/editabletreemodel \title Editable Tree Model Example - + \ingroup examples-itemviews \brief This example shows how to implement a simple item-based tree model that can be used with other classes the model/view framework. diff --git a/examples/widgets/doc/src/elasticnodes.qdoc b/examples/widgets/doc/src/elasticnodes.qdoc index 2c081613bc..75ad496592 100644 --- a/examples/widgets/doc/src/elasticnodes.qdoc +++ b/examples/widgets/doc/src/elasticnodes.qdoc @@ -28,9 +28,11 @@ /*! \example graphicsview/elasticnodes \title Elastic Nodes Example - + \ingroup examples-graphicsview \brief The Elastic Nodes example shows how to implement edges between nodes in a - graph, with basic interaction. You can click to drag a node around, and + graph, with basic interaction. + + You can click to drag a node around, and zoom in and out using the mouse wheel or the keyboard. Hitting the space bar will randomize the nodes. The example is also resolution independent; as you zoom in, the graphics remain crisp. diff --git a/examples/widgets/doc/src/embeddeddialogs.qdoc b/examples/widgets/doc/src/embeddeddialogs.qdoc index 878bb9f54a..964150ff0f 100644 --- a/examples/widgets/doc/src/embeddeddialogs.qdoc +++ b/examples/widgets/doc/src/embeddeddialogs.qdoc @@ -28,9 +28,11 @@ /*! \example graphicsview/embeddeddialogs \title Embedded Dialogs - + \ingroup examples-graphicsview \brief This example shows how to embed standard dialogs into - Graphics View. It also shows how you can customize the + Graphics View. + + It also shows how you can customize the proxy class and add window shadows. \image embeddeddialogs-demo.png diff --git a/examples/widgets/doc/src/fetchmore.qdoc b/examples/widgets/doc/src/fetchmore.qdoc index 8e3ec973aa..2c9c5d5b3b 100644 --- a/examples/widgets/doc/src/fetchmore.qdoc +++ b/examples/widgets/doc/src/fetchmore.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/fetchmore \title Fetch More Example - + \ingroup examples-itemviews \brief The Fetch More example shows how two add items to an item view model on demand. diff --git a/examples/widgets/doc/src/frozencolumn.qdoc b/examples/widgets/doc/src/frozencolumn.qdoc index 69e45de6df..39fe04c7bf 100644 --- a/examples/widgets/doc/src/frozencolumn.qdoc +++ b/examples/widgets/doc/src/frozencolumn.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/frozencolumn \title Frozen Column Example - + \ingroup examples-itemviews \brief This example demonstrates how to freeze a column within a QTableView. \image frozencolumn-example.png "Screenshot of the example" diff --git a/examples/widgets/doc/src/interview.qdoc b/examples/widgets/doc/src/interview.qdoc index 788af64f64..6528bef7d4 100644 --- a/examples/widgets/doc/src/interview.qdoc +++ b/examples/widgets/doc/src/interview.qdoc @@ -28,6 +28,8 @@ /*! \example itemviews/interview \title Interview + \ingroup examples-itemviews + \brief This example demonstrates the usage of the model/view framework. \brief The Interview example explores the flexibility and scalability of the model/view framework by presenting an infinitely deep data structure using a model diff --git a/examples/widgets/doc/src/itemviewspuzzle.qdoc b/examples/widgets/doc/src/itemviewspuzzle.qdoc index 68cbdc936d..2e37cd372c 100644 --- a/examples/widgets/doc/src/itemviewspuzzle.qdoc +++ b/examples/widgets/doc/src/itemviewspuzzle.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/puzzle \title Item Views Puzzle Example - + \ingroup examples-itemviews \brief The Puzzle example shows how to enable drag and drop with a custom model to allow items to be transferred between a view and another widget. diff --git a/examples/widgets/doc/src/padnavigator.qdoc b/examples/widgets/doc/src/padnavigator.qdoc index b063d6de59..90c7c00952 100644 --- a/examples/widgets/doc/src/padnavigator.qdoc +++ b/examples/widgets/doc/src/padnavigator.qdoc @@ -28,7 +28,7 @@ /*! \example graphicsview/padnavigator \title Pad Navigator Example - + \ingroup examples-graphicsview \brief The Pad Navigator Example shows how you can use Graphics View together with embedded widgets and Qt's \l{State Machine Framework} to create a simple but useful, dynamic, animated user interface. diff --git a/examples/widgets/doc/src/pixelator.qdoc b/examples/widgets/doc/src/pixelator.qdoc index 9eddcd9f11..ebcee4e5f9 100644 --- a/examples/widgets/doc/src/pixelator.qdoc +++ b/examples/widgets/doc/src/pixelator.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/pixelator \title Pixelator Example - + \ingroup examples-itemviews \brief The Pixelator example shows how delegates can be used to customize the way that items are rendered in standard item views. diff --git a/examples/widgets/doc/src/simpledommodel.qdoc b/examples/widgets/doc/src/simpledommodel.qdoc index 99df1e46ca..c48563f47c 100644 --- a/examples/widgets/doc/src/simpledommodel.qdoc +++ b/examples/widgets/doc/src/simpledommodel.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/simpledommodel \title Simple DOM Model Example - + \ingroup examples-itemviews \brief The Simple DOM Model example shows how an existing class can be adapted for use with the model/view framework. diff --git a/examples/widgets/doc/src/simpletreemodel.qdoc b/examples/widgets/doc/src/simpletreemodel.qdoc index 2b8884d5ca..df23617d5d 100644 --- a/examples/widgets/doc/src/simpletreemodel.qdoc +++ b/examples/widgets/doc/src/simpletreemodel.qdoc @@ -28,6 +28,9 @@ /*! \example itemviews/simpletreemodel \title Simple Tree Model Example + \ingroup examples-itemviews + \brief The Simple Tree Model example shows how to use a hierarchical model + with Qt's standard view classes. \brief The Simple Tree Model example shows how to create a basic, read-only hierarchical model to use with Qt's standard view classes. For a diff --git a/examples/widgets/doc/src/simplewidgetmapper.qdoc b/examples/widgets/doc/src/simplewidgetmapper.qdoc index ca5e47e13c..3e827a4a41 100644 --- a/examples/widgets/doc/src/simplewidgetmapper.qdoc +++ b/examples/widgets/doc/src/simplewidgetmapper.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/simplewidgetmapper \title Simple Widget Mapper Example - + \ingroup examples-itemviews \brief The Simple Widget Mapper example shows how to use a widget mapper to display data from a model in a collection of widgets. diff --git a/examples/widgets/doc/src/spinboxdelegate.qdoc b/examples/widgets/doc/src/spinboxdelegate.qdoc index f2add32286..3941afa95a 100644 --- a/examples/widgets/doc/src/spinboxdelegate.qdoc +++ b/examples/widgets/doc/src/spinboxdelegate.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/spinboxdelegate \title Spin Box Delegate Example - + \ingroup examples-itemviews \brief The Spin Box Delegate example shows how to create an editor for a custom delegate in the model/view framework by reusing a standard Qt editor widget. diff --git a/examples/widgets/doc/src/spreadsheet.qdoc b/examples/widgets/doc/src/spreadsheet.qdoc index cd94e08cec..a869c7dbe7 100644 --- a/examples/widgets/doc/src/spreadsheet.qdoc +++ b/examples/widgets/doc/src/spreadsheet.qdoc @@ -28,6 +28,8 @@ /*! \example itemviews/spreadsheet \title Spreadsheet + \ingroup examples-itemviews + \brief The Spreadsheet example shows how to create a simple spreadsheet application. \brief The Spreadsheet example shows how a table view can be used to create a simple spreadsheet application. Custom delegates are used to render different diff --git a/examples/widgets/doc/src/stardelegate.qdoc b/examples/widgets/doc/src/stardelegate.qdoc index 38e4cdfe22..f3da875422 100644 --- a/examples/widgets/doc/src/stardelegate.qdoc +++ b/examples/widgets/doc/src/stardelegate.qdoc @@ -28,7 +28,7 @@ /*! \example itemviews/stardelegate \title Star Delegate Example - + \ingroup examples-itemviews \brief The Star Delegate example shows how to create a delegate that can paint itself and that supports editing. diff --git a/src/widgets/doc/images/graphicsview-examples.png b/src/widgets/doc/images/graphicsview-examples.png new file mode 100644 index 0000000000..8889424023 Binary files /dev/null and b/src/widgets/doc/images/graphicsview-examples.png differ diff --git a/src/widgets/doc/images/itemviews-examples.png b/src/widgets/doc/images/itemviews-examples.png new file mode 100644 index 0000000000..a151ea857f Binary files /dev/null and b/src/widgets/doc/images/itemviews-examples.png differ diff --git a/src/widgets/doc/src/qtwidgets-examples.qdoc b/src/widgets/doc/src/qtwidgets-examples.qdoc index 07e1eb135c..d0b04b0823 100644 --- a/src/widgets/doc/src/qtwidgets-examples.qdoc +++ b/src/widgets/doc/src/qtwidgets-examples.qdoc @@ -95,7 +95,6 @@ */ - /*! \group examples-dialogs \ingroup all-examples @@ -111,4 +110,32 @@ interactions with users. */ +/*! + \ingroup all-examples + \title Itemview Examples + \brief Using the model/view framework. + \group examples-itemviews + + \image itemviews-examples.png + + Qt provides a lot of capabalities to display pre- and user-defined item models + in different ways. + The separation of functionality introduced by the model/view architecture gives + developers greater flexibility to customize the presentation of items. + +*/ + +/*! + \ingroup all-examples + \title Graphicsview Examples + \brief Using the Graphics View framework. + \group examples-graphicsview + + \image graphicsview-examples.png + + Qt provides powerful graphics engine that supports easy visualization of items, with + support for rotation and zooming. + Additionally it provides an event propagation architecture for interaction. + +*/ -- cgit v1.2.3