diff options
Diffstat (limited to 'src/imports/controls/doc')
11 files changed, 27 insertions, 27 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-default-thumbnail.png b/src/imports/controls/doc/images/qtquickcontrols2-basic-thumbnail.png Binary files differindex e971a7aa..e971a7aa 100644 --- a/src/imports/controls/doc/images/qtquickcontrols2-default-thumbnail.png +++ b/src/imports/controls/doc/images/qtquickcontrols2-basic-thumbnail.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-default.png b/src/imports/controls/doc/images/qtquickcontrols2-basic.png Binary files differindex 099db170..099db170 100644 --- a/src/imports/controls/doc/images/qtquickcontrols2-default.png +++ b/src/imports/controls/doc/images/qtquickcontrols2-basic.png diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml index 36d1f848..d7400005 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml @@ -29,6 +29,6 @@ import QtQuick import QtQuick.Controls Button { - icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png" + icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png" display: Button.IconOnly } diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml index 3fe434e4..3e2aa619 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml @@ -30,6 +30,6 @@ import QtQuick.Controls Button { text: "Button" - icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png" + icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png" display: Button.TextBesideIcon } diff --git a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-basic.qdoc index 779f3241..ee8d3ce4 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-basic.qdoc @@ -26,23 +26,23 @@ ****************************************************************************/ /*! - \page qtquickcontrols2-default.html - \title Default Style + \page qtquickcontrols2-basic.html + \title Basic Style - The Default style is a basic all-round style. + The Basic style is a basic all-round style. - The Default style is a simple and light-weight style that offers the maximum + The Basic style is a simple and light-weight style that offers the maximum performance for Qt Quick Controls. It is built with a minimal amount of Qt Quick primitives, and keeps animations and transitions to the minimum. - \image qtquickcontrols2-default.png + \image qtquickcontrols2-basic.png The style is selected by default when running Qt Quick Controls applications. It is built into the module's resources, so by default it is shipped with any application that depends on the Qt Quick Controls module - \note The Default style is used as a fallback for other styles. If a style - does not implement a certain control, the Default style implementation of + \note The Basic style is used as a fallback for other styles. If a style + does not implement a certain control, the Basic style implementation of that control is selected. \b {See also} \l {Material Style}, \l {Universal Style} diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc index 7790ddc5..e7149852 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc @@ -77,7 +77,7 @@ \li \c FallbackStyle \li Specifies the style to use for controls that are not implemented. The style must be one of the \l {Available Styles}{built-in styles}. - By default, the \l {Default Style}{Default} style is used. + By default, the \l {Basic Style}{Basic} style is used. \endtable \section1 Imagine Section @@ -108,7 +108,7 @@ be defined in two alternative ways: \code - [Default] + [Basic] Font\Family=Open Sans Font\PixelSize=20 diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 484cc5b2..e1ddd1e3 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -44,7 +44,7 @@ The first way to create this button is to simply define it in-place, wherever it is needed. For example, perhaps you're not satisfied with the - default style's Button having square corners. To make them rounded, you + Basic style's Button having square corners. To make them rounded, you can override the \l {Control::}{background} item and set the radius property of Rectangle: @@ -54,11 +54,11 @@ button in several places. It involves moving the code into its own QML file within your project. - For this approach, we'll copy the background code from the default style's + For this approach, we'll copy the background code from the Basic style's \c Button.qml. This file can be found in the following path in your Qt installation: - \c {$QTDIR/qml/QtQuick/Controls/Default/Button.qml} + \c {$QTDIR/qml/QtQuick/Controls/Basic/Button.qml} After doing that, we'll simply add the following line: @@ -158,7 +158,7 @@ \e mystyle or \e MYSTYLE is not supported. \endlist - By default, the styling system uses the Default style as a fallback for + By default, the styling system uses the Basic style as a fallback for controls that aren't implemented. To customize or extend any other built-in style, it is possible to specify a different fallback style using \l[QtQuickControls2]{QQuickStyle}. @@ -413,8 +413,8 @@ } \endcode - We then copy \c Button.qml from the Default style in - \c {$QTDIR/qml/QtQuick/Controls/Default/} into a new \c myproject folder in our + We then copy \c Button.qml from the Basic style in + \c {$QTDIR/qml/QtQuick/Controls/Basic/} into a new \c myproject folder in our project directory. Add the newly copied \c Button.qml to \c qml.qrc, which is the resource file that contains our QML files. @@ -497,7 +497,7 @@ \section1 Customization Reference - The following snippets present examples where the default style's controls + The following snippets present examples where the Basic style's controls have been customized using the same approach as the \l {Customizing a Control} section. The code can be used as a starting point to implement a custom look and feel. diff --git a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc index 135cae71..a99e56fd 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-fusion.qdoc @@ -83,7 +83,7 @@ \image qtquickcontrols2-fusion-violet.png \endtable - \b {See also} \l {Default Style}, \l {Material Style}, \l {Universal Style} + \b {See also} \l {Basic Style}, \l {Material Style}, \l {Universal Style} \section1 Related Information diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc index a146843a..f08c5ec3 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc @@ -220,7 +220,7 @@ \value Material.ShadeA400 \value Material.ShadeA700 - \b {See also} \l {Default Style}, \l {Universal Style} + \b {See also} \l {Basic Style}, \l {Universal Style} \section2 Variants diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc index ddf41771..29e73540 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc @@ -33,10 +33,10 @@ Qt Quick Controls comes with a selection of styles. - \section2 Default Style + \section2 Basic Style - \image qtquickcontrols2-default-thumbnail.png - The \l {Default Style} is a simple and light-weight all-round style that offers + \image qtquickcontrols2-basic-thumbnail.png + The \l {Basic Style} is a simple and light-weight all-round style that offers the maximum performance for Qt Quick Controls. \section2 Fusion Style @@ -58,14 +58,14 @@ The \l {Material Style} offers an appealing design based on the \l {https://www.google.com/design/spec/material-design/introduction.html} {Google Material Design Guidelines}, but requires more system resources than - the Default style. + the Basic style. \section2 Universal Style \image qtquickcontrols2-universal-thumbnail.png The \l {Universal Style} offers an appealing design based on the \l {https://dev.windows.com/design}{Microsoft Universal Design Guidelines}, - but requires more system resources than the Default style. + but requires more system resources than the Basic style. \section1 Using Styles in Qt Quick Controls @@ -141,7 +141,7 @@ \section1 Related Information \list - \li \l {Default Style} + \li \l {Basic Style} \li \l {Fusion Style} \li \l {Imagine Style} \li \l {Material Style} diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc index 1e67dd75..72267050 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc @@ -172,7 +172,7 @@ \value Universal.Mauve \stylecolor {#76608A} {} \value Universal.Taupe \stylecolor {#87794E} {} - \b {See also} \l {Default Style}, \l {Material Style} + \b {See also} \l {Basic Style}, \l {Material Style} \section1 Attached Property Documentation |
