From 170f2857803344a198eaf71d8f15b07e3ff0e2ad Mon Sep 17 00:00:00 2001 From: Michael Brasser Date: Fri, 1 May 2009 15:46:24 +1000 Subject: Doc work. --- doc/src/declarative/elements.qdoc | 47 +++++++++++++++++++++++--------- doc/src/declarative/index.qdoc | 51 ----------------------------------- doc/src/declarative/qmlfordesign.qdoc | 42 +++++++++++++++++++++++++++++ doc/src/index.qdoc | 2 +- 4 files changed, 78 insertions(+), 64 deletions(-) delete mode 100644 doc/src/declarative/index.qdoc create mode 100644 doc/src/declarative/qmlfordesign.qdoc diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 3e88e5a..b6dec25 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -7,10 +7,11 @@ The following table lists the Qml elements provided by the Qt Declarative module \bold {Standard Qt Declarative Elements} -\table 100% +\table 80% \header \o \bold {States} \o \bold {Animation and Transitions} +\o \bold {Working with Data} \o \bold {Utility} \row @@ -40,22 +41,30 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \list -\o \l Script \o \l Bind -\o \l Connection -\o \l Component \o \l ListModel +\o \l XmlListModel +\o \l SqlQuery, \l SqlConnection, and \l SqlBind \o \l DateTimeFormatter +\o \l NumberFormatter +\endlist + +\o +\list +\o \l Script +\o \l Connection +\o \l Component \endlist \endtable \bold {Fluid UI Primitives} -\table 100% +\table 80% \header -\o \bold {Basic Items} -\o \bold {Utility} +\o \bold {Basic Visual Items} +\o \bold {Basic Interaction Items} \o \bold {Widgets} +\o \bold {Utility} \row \o @@ -65,20 +74,17 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \l Text \o \l TextEdit \o \l Rect -\o \l MouseRegion -\o \l KeyActions \o \l AnimatedImage \o \l BlendedImage \endlist \o \list -\o \l Repeater -\o \l Content +\o \l MouseRegion +\o \l KeyActions \o \l FocusPanel \o \l FocusRealm \o \l KeyProxy -\o \l ComponentInstance \endlist \o @@ -88,9 +94,18 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \l WebView \endlist +\o +\list +\o \l Repeater +\o \l Content +\o \l ComponentInstance +\o \l WidgetContainer +\endlist + \header \o \bold {Views} \o \bold {Layouts} +\o \bold {Transforms} \o \bold {Effects} \row @@ -122,6 +137,14 @@ The following table lists the Qml elements provided by the Qt Declarative module \o \list +\o \l Squish +\o \l Perspective +\o \l Rotation3D +\o \l Translation3D +\endlist + +\o +\list \o \l Shadow \o \l Reflection \o \l Blur diff --git a/doc/src/declarative/index.qdoc b/doc/src/declarative/index.qdoc deleted file mode 100644 index fe1b46e..0000000 --- a/doc/src/declarative/index.qdoc +++ /dev/null @@ -1,51 +0,0 @@ -/*! - \page qml.html - \title 'Qt Declarative' Documentation - - \target qtdeclarativemainpage - - The Qt Declarative module provides a declarative framework for building - highly dynamic and fluid applications. It is targetted at the sorts of user - interface (and the sorts of hardware) in embedded devices such as phones, media - players, and set-top boxes. It is also appropriate for highly custom desktop - user-interfaces, or special elements in more traditional desktop - user-interfaces. - - Building fluid applications is done declaratively, rather than procedurally. - That is, you specify \e what the UI should look like and how it should behave - in an declarative format called QML, rather than specifying step-by-step \e how to - build it in a language like C++ or JavaScript. Specifying a UI declaratively - does not just include the layout of the interface items, but also the way each - individual item looks and behaves and the overall flow of the application. - - Getting Started: - \list - \o \l {qmlexamples}{Examples} - \o \l {tutorial}{Tutorial: 'Hello World'} - \o \l {tutorials-declarative-contacts.html}{Tutorial: 'Introduction to QML'} - \o \l {qmlforcpp}{Qt Declarative Markup Language For C++ Programmers} - \endlist - - Core Features: - \list - \o \l {binding}{Data Binding} - \o \l {anchor-layout}{Layout Anchors} - \o \l {qmlanimation}{Animation} - \o \l {qmleffects}{Visual Effects} - \o \l {components}{Components} - \o \l {qmlmodules}{Modules} - \o \l {qmlfocus}{Keyboard Focus} - \endlist - - QML Reference: - \list - \o \l {elements}{Qml Elements} - \endlist - - C++ Reference: - \list - \o \l {qtprogrammers}{QML for Qt programmers} - \o \l {qtbinding}{C++ Data Binding} - \o \l {cppitem}{C++ Components} - \endlist -*/ diff --git a/doc/src/declarative/qmlfordesign.qdoc b/doc/src/declarative/qmlfordesign.qdoc new file mode 100644 index 0000000..35e47df --- /dev/null +++ b/doc/src/declarative/qmlfordesign.qdoc @@ -0,0 +1,42 @@ +/*! + \page qmlfordesigners.html + \title Qt Declarative for Designers + + \target qtdeclarativemainpage + + The Qt Declarative module provides a declarative framework for building + highly dynamic and fluid applications. It is targetted at the sorts of user + interface (and the sorts of hardware) in embedded devices such as phones, media + players, and set-top boxes. It is also appropriate for highly custom desktop + user-interfaces, or special elements in more traditional desktop + user-interfaces. + + Building fluid applications is done declaratively, rather than procedurally. + That is, you specify \e what the UI should look like and how it should behave + rather than specifying step-by-step \e how to build it. Specifying a UI declaratively + does not just include the layout of the interface items, but also the way each + individual item looks and behaves and the overall flow of the application. + + Getting Started: + \list + \o \l {qmlexamples}{Examples} + \o \l {tutorial}{Tutorial: 'Hello World'} + \o \l {tutorials-declarative-contacts.html}{Tutorial: 'Introduction to QML'} + \endlist + + Core Features: + \list + \o \l {binding}{Data Binding} + \o \l {anchor-layout}{Layout Anchors} + \o \l {qmlanimation}{Animation} + \o \l {qmleffects}{Visual Effects} + \o \l {components}{Components} + \o \l {qmlmodules}{Modules} + \o \l {qmlfocus}{Keyboard Focus} + \endlist + + QML Reference: + \list + \o \l {elements}{Qml Elements} + \endlist +*/ diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 8a856ea..f0debdb 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -188,7 +188,7 @@
  • XML Patterns: XQuery & XPath
  • Phonon Multimedia Framework
  • Script Tools Module
    • -
  • Qt Markup Language
    • +
  • Declarative Module
  • ActiveQt Framework
    • -- cgit v0.12