diff options
Diffstat (limited to 'examples/quickcontrols2/chattutorial')
28 files changed, 14 insertions, 14 deletions
diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png Binary files differindex ee03535f..aa3c4bb5 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png Binary files differindex c2c49e3e..af25cff9 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png Binary files differindex 9ca0fe69..1c8ffbf4 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png Binary files differindex acbe1886..b2f4c2ad 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png Binary files differindex e4a578cc..ea75b1dc 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png Binary files differindex 9a3d00bd..8b8f05fa 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png Binary files differindex 501ea772..29e149df 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png Binary files differindex 57782b58..23d744e7 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png Binary files differindex 22183c82..2aef535c 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png Binary files differindex 327076d3..c18a341b 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png Binary files differindex 19a7b685..f15c7d7d 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png Binary files differindex 4cc4caa3..b33fc74e 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png Binary files differindex bdc9bcd3..31833164 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png Binary files differindex f10d6cb6..b4bd7e9f 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png diff --git a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png Binary files differindex a6913c3c..09ed5ceb 100644 --- a/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png +++ b/examples/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc index f7cbd32f..49e98068 100644 --- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc +++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc @@ -28,13 +28,13 @@ /*! \example chattutorial \keyword Qt Quick Controls - Chat Tutorial - \title Qt Quick Controls - Chat Tutorial - \keyword Qt Quick Controls 2 - Chat Tutorial -\brief Tutorial about writing a basic chat client using Qt Quick Controls 2. +\title Qt Quick Controls - Chat Tutorial +\keyword Qt Quick Controls 2 - Chat Tutorial +\brief Tutorial about writing a basic chat client using Qt Quick Controls. \ingroup qtquickcontrols2-examples This tutorial shows how to write a basic chat application using Qt Quick -Controls 2. It will also explain how to integrate an SQL database into a Qt +Controls. It will also explain how to integrate an SQL database into a Qt application. \section1 Chapter 1: Setting Up @@ -88,7 +88,7 @@ arguments provided by the user. Next, the QML engine is created. \l QQmlApplicationEngine is a convenient wrapper over QQmlEngine, providing the \l {QQmlApplicationEngine::load}{load()} function to easily load QML for an application. It also adds some convenience -for using \l {Using File Selectors with Qt Quick Controls 2}{file selectors}. +for using \l {Using File Selectors with Qt Quick Controls}{file selectors}. Once we've set up things in C++, we can move on to the user interface in QML. @@ -105,7 +105,7 @@ access to graphical primitives such as \l Item, \l Rectangle, \l Text, and so on. For the full list of types, see the \l {Qt Quick QML Types} documentation. -Next, import the Qt Quick Controls 2 module. Amongst other things, this +Next, import the Qt Quick Controls module. Amongst other things, this provides access to \l ApplicationWindow, which will replace the existing root type, \c Window: @@ -156,7 +156,7 @@ property. Then, we assign a \l Label to its \l {Page::}{header} property. Label extends the primitive \l Text item from the Qt Quick module by adding -\l{Styling Qt Quick Controls 2}{styling} and \l {Control::}{font} inheritance. +\l{Styling Qt Quick Controls}{styling} and \l {Control::}{font} inheritance. This means that a Label can look different depending on which style is in use, and can also propagate its pixel size to its children. @@ -228,7 +228,7 @@ In this chapter, we'll explain how to create a list of interactive items using ListView comes from the Qt Quick module, and displays a list of items populated from a \l {Models and Views in Qt Quick}{model}. ItemDelegate comes from -the Qt Quick Controls 2 module, and provides a standard view item for use in views +the Qt Quick Controls module, and provides a standard view item for use in views and controls such as ListView and \l ComboBox. For example, each ItemDelegate can display text, be checked on and off, and react to mouse clicks. @@ -309,7 +309,7 @@ in an application. Here's the revised \c main.qml: \printuntil } \printuntil } -\section2 StackView +\section2 Navigating with StackView As its name suggests, StackView provides stack-based navigation. The last item to be \e "pushed" onto the stack is the first one to be removed, and the @@ -746,7 +746,7 @@ text field to make way for future input. \section1 Chapter 5: Styling -Styles in Qt Quick Controls 2 are designed to work on any platform. In this +Styles in Qt Quick Controls are designed to work on any platform. In this chapter, we'll do some minor visual tweaks to make sure our application looks good when run with the \l {Default Style}{Default}, \l {Material Style}{Material}, and \l {Universal Style}{Universal} styles. @@ -784,8 +784,8 @@ Material style plugin \e must be deployed with the application, even if the target device doesn't use it, otherwise the QML engine will fail to find the import. -Instead, it is better to rely on Qt Quick Controls 2's built-in support for -\l {Using File Selectors with Qt Quick Controls 2}{style-based file selectors}. +Instead, it is better to rely on Qt Quick Controls's built-in support for +\l {Using File Selectors with Qt Quick Controls}{style-based file selectors}. To do this, we must move the ToolBar out into its own file. We'll call it \c ChatToolBar.qml. This will be the \e "default" version of the file, which means that it will be used when the \l {Default Style}{Default style} is in @@ -796,7 +796,7 @@ use. Here's the new file: \printuntil } As we only use the ToolBar type within this file, we only need the -Qt Quick Controls 2 import. The code itself has not changed from how it was +Qt Quick Controls import. The code itself has not changed from how it was in \c ContactPage.qml, which is how it should be; for the default version of the file, nothing needs to be different. @@ -876,7 +876,7 @@ After building and running the application, you should see these results: \section1 Summary In this tutorial, we've taken you through the following steps of writing a -basic application using Qt Quick Controls 2: +basic application using Qt Quick Controls: \list \li Creating a new project using Qt Creator. diff --git a/examples/quickcontrols2/chattutorial/shared/Albert_Einstein.png b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein.png Binary files differindex 47cb15f6..7c44b90b 100644 --- a/examples/quickcontrols2/chattutorial/shared/Albert_Einstein.png +++ b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein.png diff --git a/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@2x.png b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@2x.png Binary files differindex c80ddd15..6ce9c39b 100644 --- a/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@2x.png +++ b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@2x.png diff --git a/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@3x.png b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@3x.png Binary files differindex 41778835..aab6a6a1 100644 --- a/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@3x.png +++ b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@3x.png diff --git a/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@4x.png b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@4x.png Binary files differindex 88768902..3611284d 100644 --- a/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@4x.png +++ b/examples/quickcontrols2/chattutorial/shared/Albert_Einstein@4x.png diff --git a/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway.png b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway.png Binary files differindex 988c2416..3ac8992f 100644 --- a/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway.png +++ b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway.png diff --git a/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@2x.png b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@2x.png Binary files differindex efffc1f2..122d9f1e 100644 --- a/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@2x.png +++ b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@2x.png diff --git a/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@3x.png b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@3x.png Binary files differindex 12633ec2..2fe9c2cc 100644 --- a/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@3x.png +++ b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@3x.png diff --git a/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@4x.png b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@4x.png Binary files differindex f5639280..96fb6788 100644 --- a/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@4x.png +++ b/examples/quickcontrols2/chattutorial/shared/Ernest_Hemingway@4x.png diff --git a/examples/quickcontrols2/chattutorial/shared/Hans_Gude.png b/examples/quickcontrols2/chattutorial/shared/Hans_Gude.png Binary files differindex 7367a4a4..907e38bc 100644 --- a/examples/quickcontrols2/chattutorial/shared/Hans_Gude.png +++ b/examples/quickcontrols2/chattutorial/shared/Hans_Gude.png diff --git a/examples/quickcontrols2/chattutorial/shared/Hans_Gude@2x.png b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@2x.png Binary files differindex c3a394e1..6837796a 100644 --- a/examples/quickcontrols2/chattutorial/shared/Hans_Gude@2x.png +++ b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@2x.png diff --git a/examples/quickcontrols2/chattutorial/shared/Hans_Gude@3x.png b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@3x.png Binary files differindex 38ec67ee..29af422a 100644 --- a/examples/quickcontrols2/chattutorial/shared/Hans_Gude@3x.png +++ b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@3x.png diff --git a/examples/quickcontrols2/chattutorial/shared/Hans_Gude@4x.png b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@4x.png Binary files differindex 8c75d3e0..bc35eeaa 100644 --- a/examples/quickcontrols2/chattutorial/shared/Hans_Gude@4x.png +++ b/examples/quickcontrols2/chattutorial/shared/Hans_Gude@4x.png |
