diff options
Diffstat (limited to 'src/widgets/doc/src')
-rw-r--r-- | src/widgets/doc/src/model-view-programming.qdoc | 22 | ||||
-rw-r--r-- | src/widgets/doc/src/widgets-and-layouts/styles.qdoc | 2 | ||||
-rw-r--r-- | src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc | 31 | ||||
-rw-r--r-- | src/widgets/doc/src/widgets-tutorial.qdoc | 12 |
4 files changed, 45 insertions, 22 deletions
diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc index 3a8fd54bcf..8978efa1e3 100644 --- a/src/widgets/doc/src/model-view-programming.qdoc +++ b/src/widgets/doc/src/model-view-programming.qdoc @@ -214,7 +214,7 @@ classes, such as QListView, QTableView, and QTreeView with QStandardItemModel. - \section1 Using models and views + \section1 Using Models and Views The following sections explain how to use the model/view pattern in Qt. Each section includes an example and is followed by a @@ -282,7 +282,7 @@ of items. This subject is covered in more detail in the section about \l{Handling Selections in Item Views}. - \section1 Model classes + \section1 Model Classes Before examining how selections are handled, you may find it useful to examine the concepts used in the model/view framework. @@ -518,7 +518,7 @@ section, we demonstrate this by creating a convenient ready-to-use model for holding lists of strings. - \section1 View classes + \section1 View Classes \section2 Concepts @@ -678,7 +678,7 @@ each view; for example, a contiguous selection in a table view can be represented as a fragmented set of highlighted items in a tree view. - \section1 Delegate classes + \section1 Delegate Classes \section2 Concepts @@ -863,7 +863,7 @@ be less integrated into applications, and will be less usable than those that emit hints to support common editing actions. - \section1 Handling selections in item views + \section1 Handling Selections in Item Views \section2 Concepts @@ -1139,7 +1139,7 @@ determine whether any given item is the parent of another level of items. - \section1 Creating new models + \section1 Creating New Models The separation of functionality between the model/view components allows models to be created that can take advantage of existing views. This @@ -1405,7 +1405,7 @@ virtual functions that must be implemented to enable various features in different types of models. - \section1 Item view convenience classes + \section1 Item View Convenience Classes The item-based widgets have names which reflect their uses: \c QListWidget provides a list of items, \c QTreeWidget displays a @@ -1832,7 +1832,7 @@ \sa {itemviews/puzzle}{Item Views Puzzle Example} - \section1 Proxy models + \section1 Proxy Models In the model/view framework, items of data supplied by a single model can be shared by any number of views, and each of these can possibly represent the same information @@ -1917,7 +1917,7 @@ \l{QSortFilterProxyModel::lessThan()}{lessThan()} function to perform custom comparisons. - \section1 Model subclassing reference + \section1 Model Subclassing Reference Model subclasses need to provide implementations of many of the virtual functions defined in the QAbstractItemModel base class. The number of these functions that need @@ -2299,7 +2299,7 @@ false and does nothing. \keyword Model/View Classes - \section1 The model/view classes + \section1 The Model/View Classes These classes use the model/view design pattern in which the underlying data (in the model) is kept separate from the way the @@ -2307,7 +2307,7 @@ \annotatedlist model-view - \section1 Related examples + \section1 Related Examples \list \li \l{itemviews/dirview}{Dir View} diff --git a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc index f8b3d80b67..042a0c9f14 100644 --- a/src/widgets/doc/src/widgets-and-layouts/styles.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc @@ -84,7 +84,7 @@ \annotatedlist appearance - \section1 The QStyle implementation + \section1 The QStyle Implementation The API of QStyle contains functions that draw the widgets, static helper functions to do common and difficult tasks (e.g., diff --git a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc index e8c1be4c46..9f22ee1540 100644 --- a/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -512,7 +512,7 @@ In contrast, setting a font and propagate using QWidget::setFont() and QWidget::setPalette() propagates to child widgets. - \section1 Widgets inside C++ namespaces + \section1 Widgets Inside C++ Namespaces The Type Selector can be used to style widgets of a particular type. For example, @@ -528,7 +528,7 @@ \snippet code/doc_src_stylesheet.cpp 27 - \section1 Setting QObject properties + \section1 Setting QObject Properties From 4.3 and above, any designable Q_PROPERTY can be set using the qproperty-<property name> syntax. @@ -862,6 +862,9 @@ \l{#lineedit-password-character-prop}{lineedit-password-character} property. + The password mask delay can be changed using the + \l{#lineedit-password-mask-delay-prop}{lineedit-password-mask-delay} + See \l{Qt Style Sheets Examples#Customizing QLineEdit}{Customizing QLineEdit} for an example. @@ -2009,6 +2012,23 @@ \snippet code/doc_src_stylesheet.qdoc 61 \row + \li \b{\c lineedit-password-mask-delay*} \target lineedit-password-mask-delay-prop + \li \l{#Number}{Number} + \li The QLineEdit password mask delay in milliseconds before + \l{#lineedit-password-character-prop}{lineedit-password-character} is applied to visible character. + + If this property is not specified, it defaults to the + value specified by the current style for the + \l{QStyle::}{SH_LineEdit_PasswordMaskDelay} style hint. + + \b{This property was added in Qt 5.4.} + + Example: + + \snippet code/doc_src_stylesheet.qdoc 160 + + + \row \li \b{\c margin} \target margin-prop \li \l {Box Lengths} \li The widget's margins. Equivalent to specifying \c @@ -2881,6 +2901,9 @@ \li \c ex: the ex width of the font (i.e., the height of 'x') \endlist + However, Qt is limited to font sizes in \c pt and \c px and any other + size must be in \c px, \c em or \c ex. + \row \li \b{Number} \target Number \li A decimal integer or a real number @@ -3526,7 +3549,7 @@ [Hint: The \l{The Style Sheet Syntax#Conflict Resolution}{Conflict Resolution} section above explains what happens in cases like this.] - \section1 Customizing specific widgets + \section1 Customizing Specific Widgets This section provides examples to customize specific widgets using Style Sheets. @@ -3907,7 +3930,7 @@ \sa {Style Sheet Example}, {Supported HTML Subset}, QStyle - \section1 Common mistakes + \section1 Common Mistakes This section lists some common mistakes when using stylesheets. diff --git a/src/widgets/doc/src/widgets-tutorial.qdoc b/src/widgets/doc/src/widgets-tutorial.qdoc index d4cf063231..3e65d3e22d 100644 --- a/src/widgets/doc/src/widgets-tutorial.qdoc +++ b/src/widgets/doc/src/widgets-tutorial.qdoc @@ -36,9 +36,9 @@ Widgets are the basic building blocks for graphical user interface (GUI) applications built with Qt. Each GUI component (e.g. - buttons, labels, text editor) is a \l{QWidget}{widget} that is + buttons, labels, text editors) is a \l{QWidget}{widget} that is placed somewhere within a user interface window, or is displayed - as an independent window. Each type of widge is provided by a + as an independent window. Each type of widget is provided by a subclass of QWidget, which is itself a subclass of QObject. QWidget is not an abstract class. It can be used as a container @@ -49,12 +49,12 @@ As with \l{QObject}s, \l{QWidget}s can be created with parent objects to indicate ownership, ensuring that objects are deleted when they are no longer used. With widgets, these parent-child - relationships have an additional meaning: Each child widget is + relationships have an additional meaning: each child widget is displayed within the screen area occupied by its parent widget. This means that when you delete a window widget, all the child widgets it contains are also deleted. - \section1 Writing a main Function + \section1 Writing a Main Function Many of the GUI examples provided with Qt follow the pattern of having a \c{main.cpp} file, which contains the standard code to @@ -72,7 +72,7 @@ function returns. Finally, \c{main()} returns the value returned by QApplication::exec(). - \section1 Simple widget examples + \section1 Simple Widget Examples Each of theses simple widget examples is written entirely within the \c main() function. @@ -87,7 +87,7 @@ \li \l {tutorials/widgets/nestedlayouts} {Nested layouts} \endlist - \section1 Real world widget examples + \section1 Real World Widget Examples In these \l{Qt Widgets Examples} {more advanced examples}, the code that creates the widgets and layouts is stored in other files. For |