diff --git a/examples/widgets/doc/src/affine.qdoc b/examples/widgets/doc/src/affine.qdoc index 46c97a307f6..da4a103a007 100644 --- a/examples/widgets/doc/src/affine.qdoc +++ b/examples/widgets/doc/src/affine.qdoc @@ -28,6 +28,8 @@ /*! \example painting/affine \title Affine Transformations + \ingroup examples-painting + \brief Demonstrates how affine transformations in QPainter works. \brief In this example we show Qt's ability to perform affine transformations on painting operations. diff --git a/examples/widgets/doc/src/basicdrawing.qdoc b/examples/widgets/doc/src/basicdrawing.qdoc index 295822d7bca..b8ff5801fc7 100644 --- a/examples/widgets/doc/src/basicdrawing.qdoc +++ b/examples/widgets/doc/src/basicdrawing.qdoc @@ -28,6 +28,10 @@ /*! \example painting/basicdrawing \title Basic Drawing Example + \ingroup examples-painting + \brief The Basic Drawing example shows how to display basic + graphics primitives in a variety of styles using the QPainter + class. \brief The Basic Drawing example shows how to display basic graphics primitives in a variety of styles using the QPainter class. diff --git a/examples/widgets/doc/src/calendar.qdoc b/examples/widgets/doc/src/calendar.qdoc index 9168bfdd1be..ea7b563c372 100644 --- a/examples/widgets/doc/src/calendar.qdoc +++ b/examples/widgets/doc/src/calendar.qdoc @@ -28,6 +28,9 @@ /*! \example richtext/calendar \title Calendar Example + \ingroup examples-richtext + \brief The Calendar example shows how to create rich text content + and display it using a rich text editor. \brief The Calendar example shows how to create rich text content and display it using a rich text editor. diff --git a/examples/widgets/doc/src/calendarwidget.qdoc b/examples/widgets/doc/src/calendarwidget.qdoc index 027da90df22..18ac8dbc8d9 100644 --- a/examples/widgets/doc/src/calendarwidget.qdoc +++ b/examples/widgets/doc/src/calendarwidget.qdoc @@ -29,7 +29,7 @@ \title Calendar Widget Example \example widgets/calendarwidget \ingroup examples-widgets - \brief The Calendar Widget example shows use of \c QCalendarWidget. + \brief The Calendar Widget example shows use of QCalendarWidget. \image calendarwidgetexample.png diff --git a/examples/widgets/doc/src/composition.qdoc b/examples/widgets/doc/src/composition.qdoc index e39083b4c11..bb34d397814 100644 --- a/examples/widgets/doc/src/composition.qdoc +++ b/examples/widgets/doc/src/composition.qdoc @@ -28,6 +28,8 @@ /*! \example painting/composition \title Composition Modes + \ingroup examples-painting + \brief Demonstrates how Composition Modes work in QPainter. \brief This demo shows some of the more advanced composition modes supported by Qt. diff --git a/examples/widgets/doc/src/concentriccircles.qdoc b/examples/widgets/doc/src/concentriccircles.qdoc index 5633833ff82..40a4d195192 100644 --- a/examples/widgets/doc/src/concentriccircles.qdoc +++ b/examples/widgets/doc/src/concentriccircles.qdoc @@ -28,6 +28,8 @@ /*! \example painting/concentriccircles \title Concentric Circles Example + \ingroup examples-painting + \brief Demonstrates the improved quality that antialiasing and floating point precision gives. \brief The Concentric Circles example shows the improved rendering quality that can be obtained using floating point precision and diff --git a/examples/widgets/doc/src/deform.qdoc b/examples/widgets/doc/src/deform.qdoc index 742f5528f97..3439c768720 100644 --- a/examples/widgets/doc/src/deform.qdoc +++ b/examples/widgets/doc/src/deform.qdoc @@ -28,6 +28,8 @@ /*! \example painting/deform \title Vector Deformation + \ingroup examples-painting + \brief Demonstrates how to manipulate the elements of a QPainterPath. \brief This example shows how to use advanced vector techniques to draw text using a \c QPainterPath. diff --git a/examples/widgets/doc/src/fontsampler.qdoc b/examples/widgets/doc/src/fontsampler.qdoc index 753e5b06922..e112927905e 100644 --- a/examples/widgets/doc/src/fontsampler.qdoc +++ b/examples/widgets/doc/src/fontsampler.qdoc @@ -28,8 +28,10 @@ /*! \example painting/fontsampler \title Font Sampler Example - + \ingroup examples-painting \brief The Font Sampler example shows how to preview and print multi-page documents. + + The Font Sampler example shows how to preview and print multi-page documents. \image fontsampler-example.png */ diff --git a/examples/widgets/doc/src/gradients.qdoc b/examples/widgets/doc/src/gradients.qdoc index a730154784d..0137f7610d9 100644 --- a/examples/widgets/doc/src/gradients.qdoc +++ b/examples/widgets/doc/src/gradients.qdoc @@ -28,6 +28,8 @@ /*! \example painting/gradients \title Gradients + \ingroup examples-painting + \brief Shows how gradients can be used with QPainter. \brief In this example we show the various types of gradients that can be used in Qt. diff --git a/examples/widgets/doc/src/imagecomposition.qdoc b/examples/widgets/doc/src/imagecomposition.qdoc index 31ef4c7785f..537d8ec1a16 100644 --- a/examples/widgets/doc/src/imagecomposition.qdoc +++ b/examples/widgets/doc/src/imagecomposition.qdoc @@ -28,6 +28,8 @@ /*! \example painting/imagecomposition \title Image Composition Example + \ingroup examples-painting + \brief Shows how composition modes work in QPainter. \brief The Image Composition example lets the user combine images together using any composition mode supported by QPainter, described diff --git a/examples/widgets/doc/src/orderform.qdoc b/examples/widgets/doc/src/orderform.qdoc index 5b2f9a0feca..80814b5d2fd 100644 --- a/examples/widgets/doc/src/orderform.qdoc +++ b/examples/widgets/doc/src/orderform.qdoc @@ -28,6 +28,10 @@ /*! \example richtext/orderform \title Order Form Example + \ingroup examples-richtext + \brief The Order Form example shows how to generate rich text + documents by combining a simple template with data input by the + user in a dialog. \brief The Order Form example shows how to generate rich text documents by combining a simple template with data input by the user in a dialog. Data diff --git a/examples/widgets/doc/src/painterpaths.qdoc b/examples/widgets/doc/src/painterpaths.qdoc index 2266cecf705..46e52288f6d 100644 --- a/examples/widgets/doc/src/painterpaths.qdoc +++ b/examples/widgets/doc/src/painterpaths.qdoc @@ -28,6 +28,9 @@ /*! \example painting/painterpaths \title Painter Paths Example + \ingroup examples-painting + \brief The Painter Paths example shows how painter paths can be + used to beuild complex shapes for rendering. \brief The Painter Paths example shows how painter paths can be used to build complex shapes for rendering. diff --git a/examples/widgets/doc/src/pathstroke.qdoc b/examples/widgets/doc/src/pathstroke.qdoc index b11cc1bd138..6a21eb7ea98 100644 --- a/examples/widgets/doc/src/pathstroke.qdoc +++ b/examples/widgets/doc/src/pathstroke.qdoc @@ -28,6 +28,9 @@ /*! \example painting/pathstroke \title Path Stroking + \ingroup examples-painting + \brief The Path Stroking example shows various types of pens that + can be used with QPainter. \brief In this example we show some of the various types of pens that can be used in Qt. diff --git a/examples/widgets/doc/src/screenshot.qdoc b/examples/widgets/doc/src/screenshot.qdoc index f0d2f2b78d3..72f366f46bc 100644 --- a/examples/widgets/doc/src/screenshot.qdoc +++ b/examples/widgets/doc/src/screenshot.qdoc @@ -28,6 +28,9 @@ /*! \example desktop/screenshot \title Screenshot Example + \ingroup examples-desktop + \brief The Screenshot example shows how to take a screenshot of the + desktop. \brief The Screenshot example shows how to take a screenshot of the desktop using QApplication and QDesktopWidget. It also shows how diff --git a/examples/widgets/doc/src/syntaxhighlighter.qdoc b/examples/widgets/doc/src/syntaxhighlighter.qdoc index 8167137abed..b417499f6fb 100644 --- a/examples/widgets/doc/src/syntaxhighlighter.qdoc +++ b/examples/widgets/doc/src/syntaxhighlighter.qdoc @@ -28,6 +28,9 @@ /*! \example richtext/syntaxhighlighter \title Syntax Highlighter Example + \group examples-richtext + \brief The Syntax Highligher example shows how to perform + simple syntax highlighing. \brief The Syntax Highlighter example shows how to perform simple syntax highlighting by subclassing the QSyntaxHighlighter class. diff --git a/examples/widgets/doc/src/textedit.qdoc b/examples/widgets/doc/src/textedit.qdoc index 4f1f618cde0..c3651a0b25a 100644 --- a/examples/widgets/doc/src/textedit.qdoc +++ b/examples/widgets/doc/src/textedit.qdoc @@ -28,6 +28,9 @@ /*! \example richtext/textedit \title Text Edit + \ingroup examples-richtext + \brief The Text Edit example shows Qt's rich text editing facilities + in action. \brief The Text Edit example shows Qt's rich text editing facilities in action, providing an example document for you to experiment with. diff --git a/examples/widgets/doc/src/transformations.qdoc b/examples/widgets/doc/src/transformations.qdoc index 47d84455517..2824d4a894b 100644 --- a/examples/widgets/doc/src/transformations.qdoc +++ b/examples/widgets/doc/src/transformations.qdoc @@ -28,6 +28,9 @@ /*! \example painting/transformations \title Transformations Example + \ingroup examples-painting + \brief The Transformations example shows how transformations + influence the way that QPainter renders graphics primitives. \brief The Transformations example shows how transformations influence the way that QPainter renders graphics primitives. In particular diff --git a/src/widgets/doc/images/desktop-examples.png b/src/widgets/doc/images/desktop-examples.png new file mode 100644 index 00000000000..86b16b478bb Binary files /dev/null and b/src/widgets/doc/images/desktop-examples.png differ diff --git a/src/widgets/doc/images/painting-examples.png b/src/widgets/doc/images/painting-examples.png new file mode 100644 index 00000000000..214004ce398 Binary files /dev/null and b/src/widgets/doc/images/painting-examples.png differ diff --git a/src/widgets/doc/images/richtext-examples.png b/src/widgets/doc/images/richtext-examples.png new file mode 100644 index 00000000000..1091c204541 Binary files /dev/null and b/src/widgets/doc/images/richtext-examples.png differ diff --git a/src/widgets/doc/src/qtwidgets-examples.qdoc b/src/widgets/doc/src/qtwidgets-examples.qdoc index b199c978236..05402d98bce 100644 --- a/src/widgets/doc/src/qtwidgets-examples.qdoc +++ b/src/widgets/doc/src/qtwidgets-examples.qdoc @@ -45,4 +45,59 @@ \annotatedlist examples-widgets -*/ \ No newline at end of file +*/ + +/*! + \page examples-painting.html + \ingroup all-examples + \title Painting Examples + \brief How to use the Qt painting system. + \group examples-painting + + \image painting-examples.png + + Qt's painting system is able to render vector graphics, images, and outline + font-based text with sub-pixel accuracy accuracy using anti-aliasing to + improve rendering quality. + + These examples show the most common techniques that are used when painting + with Qt, from basic concepts such as drawing simple primitives to the use of + transformations. + + \annotatedlist{painting-examples} +*/ + +/*! + \page examples-richtext.html + \ingroup all-examples + \title Rich Text Examples + \brief Using the document-oriented rich text engine. + \group examples-richtext + + \image richtext-examples.png + + Qt provides powerful document-oriented rich text engine that supports Unicode + and right-to-left scripts. Documents can be manipulated using a cursor-based + API, and their contents can be imported and exported as both HTML and in a + custom XML format. + + */ + +/*! + \page examples-desktop.html + \ingroup all-examples + \title Desktop Examples + \brief Integrating your Qt application with your favorite desktop. + \group examples-desktop + + \image desktop-examples.png + + Qt provides features to enable applications to integrate with the user's + preferred desktop environment. + + Features such as system tray icons, access to the desktop widget, and + support for desktop services can be used to improve the appearance of + applications and take advantage of underlying desktop facilities. + +*/ +