diff options
Diffstat (limited to 'src/imports')
218 files changed, 545 insertions, 2563 deletions
diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml index 8d285298..7353e2b5 100644 --- a/src/imports/controls/RangeSlider.qml +++ b/src/imports/controls/RangeSlider.qml @@ -41,13 +41,11 @@ T.RangeSlider { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - Math.max(background ? background.implicitWidth : 0, - first.handle ? first.handle.implicitWidth : 0, - second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) + Math.max(first.handle ? first.handle.implicitWidth : 0, + second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(background ? background.implicitHeight : 0, - first.handle ? first.handle.implicitHeight : 0, - second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) + Math.max(first.handle ? first.handle.implicitHeight : 0, + second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index a44a6c80..896dbca0 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -41,11 +41,9 @@ T.Slider { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - Math.max(background ? background.implicitWidth : 0, - handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) + (handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(background ? background.implicitHeight : 0, - handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) + (handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index aea83dde..2234646f 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -75,7 +75,7 @@ T.TextField { implicitWidth: 200 implicitHeight: 40 border.width: control.activeFocus ? 2 : 1 - color: control.enabled ? "transparent" : "#353637" + color: control.enabled ? "#ffffff" : "#353637" border.color: control.activeFocus ? "#0066ff" : (control.enabled ? "#bdbebf" : "transparent") } //! [background] diff --git a/src/imports/controls/designer/images/page-icon.png b/src/imports/controls/designer/images/page-icon.png Binary files differnew file mode 100644 index 00000000..ecd08c6e --- /dev/null +++ b/src/imports/controls/designer/images/page-icon.png diff --git a/src/imports/controls/designer/images/page-icon16.png b/src/imports/controls/designer/images/page-icon16.png Binary files differnew file mode 100644 index 00000000..2d761364 --- /dev/null +++ b/src/imports/controls/designer/images/page-icon16.png diff --git a/src/imports/controls/designer/images/page-icon16@2x.png b/src/imports/controls/designer/images/page-icon16@2x.png Binary files differnew file mode 100644 index 00000000..3857af28 --- /dev/null +++ b/src/imports/controls/designer/images/page-icon16@2x.png diff --git a/src/imports/controls/designer/images/page-icon@2x.png b/src/imports/controls/designer/images/page-icon@2x.png Binary files differnew file mode 100644 index 00000000..8780dfbe --- /dev/null +++ b/src/imports/controls/designer/images/page-icon@2x.png diff --git a/src/imports/controls/designer/images/rangeslider-icon.png b/src/imports/controls/designer/images/rangeslider-icon.png Binary files differnew file mode 100644 index 00000000..b97c6942 --- /dev/null +++ b/src/imports/controls/designer/images/rangeslider-icon.png diff --git a/src/imports/controls/designer/images/rangeslider-icon16.png b/src/imports/controls/designer/images/rangeslider-icon16.png Binary files differnew file mode 100644 index 00000000..33236566 --- /dev/null +++ b/src/imports/controls/designer/images/rangeslider-icon16.png diff --git a/src/imports/controls/designer/images/rangeslider-icon16@2x.png b/src/imports/controls/designer/images/rangeslider-icon16@2x.png Binary files differnew file mode 100644 index 00000000..c613a029 --- /dev/null +++ b/src/imports/controls/designer/images/rangeslider-icon16@2x.png diff --git a/src/imports/controls/designer/images/rangeslider-icon@2x.png b/src/imports/controls/designer/images/rangeslider-icon@2x.png Binary files differnew file mode 100644 index 00000000..60c12a4a --- /dev/null +++ b/src/imports/controls/designer/images/rangeslider-icon@2x.png diff --git a/src/imports/controls/designer/qtquickcontrols2.metainfo b/src/imports/controls/designer/qtquickcontrols2.metainfo index 4c876cf5..81a6d914 100644 --- a/src/imports/controls/designer/qtquickcontrols2.metainfo +++ b/src/imports/controls/designer/qtquickcontrols2.metainfo @@ -53,7 +53,7 @@ MetaInfo { version: "2.0" requiredImport: "QtQuick.Controls" - Property { name: "text"; type: "binding"; value: "qsTr('Check Delegate')" } + Property { name: "text"; type: "binding"; value: "qsTr(\"Check Delegate\")" } } } @@ -147,6 +147,22 @@ MetaInfo { } Type { + name: "QtQuick.Controls.Page" + icon: "images/page-icon16.png" + + ItemLibraryEntry { + name: "Page" + category: "Qt Quick - Controls 2" + libraryIcon: "images/page-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { name: "QtQuick.Controls.PageIndicator" icon: "images/pageindicator-icon16.png" @@ -218,7 +234,23 @@ MetaInfo { version: "2.0" requiredImport: "QtQuick.Controls" - Property { name: "text"; type: "binding"; value: "qsTr('Radio Delegate')" } + Property { name: "text"; type: "binding"; value: "qsTr(\"Radio Delegate\")" } + } + } + + Type { + name: "QtQuick.Controls.RangeSlider" + icon: "images/rangeslider-icon16.png" + + ItemLibraryEntry { + name: "Range Slider" + category: "Qt Quick - Controls 2" + libraryIcon: "images/rangeslider-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + + Property { name: "first.value"; type: "real"; value: 0.25 } + Property { name: "second.value"; type: "real"; value: 0.75 } } } @@ -251,6 +283,21 @@ MetaInfo { } Type { + name: "QtQuick.Controls.SwipeDelegate" + icon: "images/itemdelegate-icon16.png" + + ItemLibraryEntry { + name: "Swipe Delegate" + category: "Qt Quick - Controls 2" + libraryIcon: "images/itemdelegate-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Swipe Delegate\")" } + } + } + + Type { name: "QtQuick.Controls.Switch" icon: "images/switch-icon16.png" @@ -266,6 +313,21 @@ MetaInfo { } Type { + name: "QtQuick.Controls.SwitchDelegate" + icon: "images/switch-icon16.png" + + ItemLibraryEntry { + name: "Switch Delegate" + category: "Qt Quick - Controls 2" + libraryIcon: "images/switch-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + + Property { name: "text"; type: "binding"; value: "qsTr(\"Switch Delegate\")" } + } + } + + Type { name: "QtQuick.Controls.TextArea" icon: "images/textarea-icon16.png" diff --git a/src/imports/controls/doc/images/qtquickcontrols2-applicationwindow-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols2-applicationwindow-wireframe.png Binary files differindex f612c243..d9c8b261 100644 --- a/src/imports/controls/doc/images/qtquickcontrols2-applicationwindow-wireframe.png +++ b/src/imports/controls/doc/images/qtquickcontrols2-applicationwindow-wireframe.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png Binary files differdeleted file mode 100644 index 03cf98d0..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png Binary files differdeleted file mode 100644 index fb14cb86..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-background.png b/src/imports/controls/doc/images/qtquickcontrols2-button-background.png Binary files differdeleted file mode 100644 index 968e2d8f..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-button-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png Binary files differdeleted file mode 100644 index 06d2f688..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png Binary files differdeleted file mode 100644 index 91cca274..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png Binary files differdeleted file mode 100644 index 317cfd44..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png Binary files differdeleted file mode 100644 index a70cf051..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png Binary files differdeleted file mode 100644 index f12ce2b0..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png Binary files differdeleted file mode 100644 index 44fd90d1..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png Binary files differdeleted file mode 100644 index 023b7c38..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png Binary files differdeleted file mode 100644 index fab2357d..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png Binary files differdeleted file mode 100644 index fd885745..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-control.png b/src/imports/controls/doc/images/qtquickcontrols2-control.png Binary files differindex eb5ee349..28fcb742 100644 --- a/src/imports/controls/doc/images/qtquickcontrols2-control.png +++ b/src/imports/controls/doc/images/qtquickcontrols2-control.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png b/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png Binary files differdeleted file mode 100644 index 195e66f5..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png Binary files differdeleted file mode 100644 index a379d915..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png Binary files differdeleted file mode 100644 index fce96e99..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png Binary files differdeleted file mode 100644 index 27ab7167..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png Binary files differdeleted file mode 100644 index f9f96d75..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png Binary files differdeleted file mode 100644 index 9cb836cf..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-label-background.png b/src/imports/controls/doc/images/qtquickcontrols2-label-background.png Binary files differdeleted file mode 100644 index 1f6bdc91..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-label-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png Binary files differdeleted file mode 100644 index 5fee55d7..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png Binary files differdeleted file mode 100644 index 756b87f1..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png Binary files differdeleted file mode 100644 index cfce4ffb..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png b/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png Binary files differdeleted file mode 100644 index a379d915..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png b/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png Binary files differnew file mode 100644 index 00000000..787de5d4 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png Binary files differdeleted file mode 100644 index 59e81b2b..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png Binary files differdeleted file mode 100644 index 59e81b2b..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png Binary files differdeleted file mode 100644 index 31b83aad..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png Binary files differdeleted file mode 100644 index 4128b743..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png Binary files differdeleted file mode 100644 index a27e0560..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png Binary files differdeleted file mode 100644 index b3a8ed9f..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png Binary files differdeleted file mode 100644 index 3d51efd9..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png Binary files differdeleted file mode 100644 index f94d1ca4..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png Binary files differdeleted file mode 100644 index d7deb2cc..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png Binary files differdeleted file mode 100644 index c63e1c86..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png Binary files differdeleted file mode 100644 index 4912bfb6..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png Binary files differdeleted file mode 100644 index 9af7297a..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png Binary files differdeleted file mode 100644 index da3fb006..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png Binary files differdeleted file mode 100644 index dd8b691d..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png Binary files differdeleted file mode 100644 index de187be6..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png Binary files differdeleted file mode 100644 index 771e8635..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png Binary files differdeleted file mode 100644 index 55bf6da8..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png Binary files differdeleted file mode 100644 index 982cdd3f..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png Binary files differdeleted file mode 100644 index 4c01f313..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png Binary files differdeleted file mode 100644 index df1f515e..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png Binary files differdeleted file mode 100644 index 78bf690a..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png Binary files differdeleted file mode 100644 index 75c08122..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png Binary files differdeleted file mode 100644 index 768de3e4..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png Binary files differdeleted file mode 100644 index 16a32d1a..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png Binary files differdeleted file mode 100644 index 19676790..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png Binary files differdeleted file mode 100644 index f01d0a54..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png Binary files differdeleted file mode 100644 index 8f390b49..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png Binary files differdeleted file mode 100644 index fa883751..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png Binary files differdeleted file mode 100644 index 794692b0..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png Binary files differdeleted file mode 100644 index f52e4686..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png Binary files differdeleted file mode 100644 index 97e06e2c..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png Binary files differdeleted file mode 100644 index 3eb3ba35..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png Binary files differdeleted file mode 100644 index b066c565..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png Binary files differdeleted file mode 100644 index 12b4c348..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png Binary files differdeleted file mode 100644 index 1eb542c2..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png Binary files differdeleted file mode 100644 index dd85eced..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png Binary files differdeleted file mode 100644 index ae5674e4..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png Binary files differdeleted file mode 100644 index 3767afb6..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png Binary files differdeleted file mode 100644 index e2d4b2c8..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png Binary files differdeleted file mode 100644 index e2d4b2c8..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png +++ /dev/null diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf index 563fb771..f61fc77d 100644 --- a/src/imports/controls/doc/qtquickcontrols2.qdocconf +++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf @@ -83,7 +83,7 @@ macro.endstylemethod = "\\br" macro.stylecolor.HTML = "<div style=\"padding:10px;color:#fff;background:\1;\">\1 \2</div>" macro.nbsp.HTML = " " -macro.labs = "\\note \\e{Types in the Qt.labs module are not guaranteed to remain compatible in future versions.}" +macro.labs = "\\note \\e{Types in Qt.labs modules are not guaranteed to remain compatible in future versions.}" #Add output suffix to the html filenames outputsuffixes = QML diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml deleted file mode 100644 index b003cd82..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -BusyIndicator { - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml deleted file mode 100644 index 87a8a0fe..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -BusyIndicator { - Rectangle { - anchors.fill: contentItem - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml deleted file mode 100644 index 4c179384..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Button { - width: 80 - text: "Button" - Rectangle { - anchors.fill: background - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml deleted file mode 100644 index 482eee54..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Button { - width: 80 - text: "Button" - Rectangle { - anchors.fill: contentItem - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml deleted file mode 100644 index c53604b9..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckBox { - text: "CheckBox" - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml deleted file mode 100644 index 282cfb59..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckBox { - text: "CheckBox" - Rectangle { - anchors.fill: contentItem - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml deleted file mode 100644 index 041871f1..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckBox { - text: "CheckBox" - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml deleted file mode 100644 index ab868506..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckDelegate { - text: "CheckDelegate" - checked: true - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml deleted file mode 100644 index 377fa39f..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckDelegate { - text: "CheckDelegate" - checked: true - Rectangle { - anchors.fill: contentItem - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml deleted file mode 100644 index 0af46fbe..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckDelegate { - text: "CheckDelegate" - checked: true - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml deleted file mode 100644 index a61cf18d..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ComboBox { - model: ["ComboBox"] - Rectangle { - anchors.fill: background - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml deleted file mode 100644 index cd3383c7..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ComboBox { - model: ["ComboBox"] - Rectangle { - anchors.fill: contentItem - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml deleted file mode 100644 index 46187995..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Dial { - Rectangle { - anchors.fill: background - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml deleted file mode 100644 index 90537ddd..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Frame { - width: 100 - height: 100 - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml deleted file mode 100644 index c379a7ce..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -GroupBox { - width: 100 - height: 100 - title: "GroupBox" - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml deleted file mode 100644 index 81148ebd..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ItemDelegate { - text: "ItemDelegate" - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml deleted file mode 100644 index 76082088..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ItemDelegate { - text: "ItemDelegate" - Rectangle { - anchors.fill: contentItem - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml deleted file mode 100644 index 9a293d3c..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ItemDelegate { - text: "ItemDelegate" - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml deleted file mode 100644 index b08f2ff5..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Label { - text: "Label" - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml deleted file mode 100644 index ffbaa934..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Item { - id: window - width: menu.contentItem.width - height: menu.contentItem.height - visible: true - - Menu { - id: menu - contentItem.parent: window - - MenuItem { - text: "New..." - } - MenuItem { - text: "Open..." - } - MenuItem { - text: "Save" - } - } - - Rectangle { - parent: menu.contentItem - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml deleted file mode 100644 index a6a4a9e3..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -PageIndicator { - count: 5 - currentIndex: 2 - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml deleted file mode 100644 index 039a0507..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -PageIndicator { - count: 5 - currentIndex: 2 - Rectangle { - anchors.fill: contentItem - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml deleted file mode 100644 index 40a07495..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Pane { - width: 100 - height: 100 - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml deleted file mode 100644 index 2a5ddc4e..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ProgressBar { - value: 0.5 - Rectangle { - anchors.fill: background - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml deleted file mode 100644 index 068eff76..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ProgressBar { - value: 0.5 - Rectangle { - parent: contentItem - anchors.fill: parent - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml deleted file mode 100644 index 21f22e6f..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "RadioButton" - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml deleted file mode 100644 index 1d54af6b..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "RadioButton" - Rectangle { - anchors.fill: contentItem - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml deleted file mode 100644 index b138c25d..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "RadioButton" - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml deleted file mode 100644 index 99123371..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioDelegate { - text: "RadioDelegate" - checked: true - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml deleted file mode 100644 index b14a2f13..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioDelegate { - text: "RadioDelegate" - checked: true - Rectangle { - anchors.fill: contentItem - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml deleted file mode 100644 index d8b0e395..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioDelegate { - text: "RadioDelegate" - checked: true - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml deleted file mode 100644 index a948f319..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RangeSlider { - first.value: 0.25 - second.value: 0.75 - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml deleted file mode 100644 index eebb5157..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ScrollBar { - size: 0.5 - position: 0.5 - active: true - height: 100 - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml deleted file mode 100644 index f039e291..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ScrollBar { - size: 0.5 - position: 0.5 - active: true - height: 100 - Rectangle { - parent: contentItem - anchors.fill: parent - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml deleted file mode 100644 index 9e540cf9..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ScrollIndicator { - size: 0.5 - position: 0.5 - active: true - height: 100 - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml deleted file mode 100644 index c32539be..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ScrollIndicator { - size: 0.5 - position: 0.5 - active: true - height: 100 - Rectangle { - parent: contentItem - anchors.fill: parent - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml deleted file mode 100644 index 94f4a176..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Slider { - value: 0.5 - Rectangle { - anchors.fill: background - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml deleted file mode 100644 index 6cf47ac9..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -SpinBox { - value: 50 - Rectangle { - anchors.fill: parent - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml deleted file mode 100644 index e226fc09..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -SpinBox { - value: 50 - Rectangle { - anchors.fill: contentItem - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml deleted file mode 100644 index 4a37a13f..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -SwipeDelegate { - text: "SwipeDelegate" - Rectangle { - anchors.fill: background - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml deleted file mode 100644 index 8284f7e4..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -SwipeDelegate { - text: "SwipeDelegate" - Rectangle { - anchors.fill: contentItem - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml deleted file mode 100644 index 2a5be1a0..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -SwipeDelegate { - text: "SwipeDelegate" - checked: true - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml deleted file mode 100644 index 605df1f4..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Switch { - text: "Switch" - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml deleted file mode 100644 index 2e68086b..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Switch { - text: "Switch" - Rectangle { - anchors.fill: contentItem - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml deleted file mode 100644 index 7be24128..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Switch { - text: "Switch" - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml deleted file mode 100644 index 27be5e86..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -SwitchDelegate { - text: "SwitchDelegate" - checked: true - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml deleted file mode 100644 index 121904cd..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -SwitchDelegate { - text: "SwitchDelegate" - checked: true - Rectangle { - anchors.fill: contentItem - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml deleted file mode 100644 index b3b1d121..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -SwitchDelegate { - text: "SwitchDelegate" - checked: true - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml deleted file mode 100644 index 8e012d19..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -TextField { - width: 80 - text: "TextField" - Rectangle { - anchors.fill: background - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml deleted file mode 100644 index 6eed06bb..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ToolBar { - width: 100 - Rectangle { - parent: background - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml deleted file mode 100644 index 619fac71..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ToolButton { - text: "ToolButton" - Rectangle { - anchors.fill: background - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml deleted file mode 100644 index 6f78e45d..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ToolButton { - text: "ToolButton" - Rectangle { - anchors.fill: contentItem - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml deleted file mode 100644 index c05ee534..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 - -Item { - id: root - width: tip.width - height: tip.height - - ToolTip { - id: tip - text: "ToolTip" - visible: root.Window.active - - Rectangle { - parent: tip.contentItem - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml deleted file mode 100644 index dcb2d942..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Tumbler { - model: 5 - - Rectangle { - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml deleted file mode 100644 index 989c4521..00000000 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml +++ /dev/null @@ -1,39 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Tumbler { - model: 5 - - Rectangle { - anchors.fill: parent.contentItem - color: 'transparent' - border.color: 'red' - } -} diff --git a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc index ef084fcf..48b0097d 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-buttons.qdoc @@ -28,6 +28,8 @@ /*! \page qtquickcontrols2-buttons.html \title Button Controls + \ingroup qtquickcontrols2-guidelines + \brief Guidelines for button controls Qt Quick Controls 2 offers a selection of button-like controls. @@ -162,4 +164,8 @@ \b {See also} \l ToolButton + \section1 Related Information + \list + \li \l {Qt Quick Controls 2 Guidelines} + \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc index 1786a4f1..d19cff5a 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc @@ -28,6 +28,8 @@ /*! \page qtquickcontrols2-containers.html \title Container Controls + \ingroup qtquickcontrols2-guidelines + \brief Guidelines for container controls Qt Quick Controls 2 offers a selection of container-like controls. @@ -41,7 +43,8 @@ \image qtquickcontrols2-applicationwindow-wireframe.png - \l ApplicationWindow contains optional header and footer items. + \l ApplicationWindow creates the root window of an application, and makes + it easy to add an optional header and footer to that window. \section1 Frame Control @@ -62,19 +65,26 @@ \image qtquickcontrols2-page-wireframe.png \l Page provides page-specific header and footer items. + It is perfectly possible to use ApplicationWindow for setting the header + and the footer, but if you have a header and footer which varies per + screen, then it is better to use \l Page. \section1 Pane Control \image qtquickcontrols2-pane.png \l Pane provides a background color that matches with the application - style and theme. + style and theme. Pane does not provide a layout of its own, but requires + you to position its contents, for instance by using a \l RowLayout or + a \l ColumnLayout. \section1 StackView Control \image qtquickcontrols2-stackview-wireframe.png - \l StackView organizes content pages into a stack. + \l StackView organizes content pages into a stack using a last-in-first-out + principle: the last item to be "pushed" onto the stack is the first one to + be removed, and the top-most item is always the one that is visible. \section1 SwipeView Control diff --git a/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc index 3c8d5ea7..0ecfdf42 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc @@ -28,6 +28,8 @@ /*! \page qtquickcontrols2-delegates.html \title Delegate Controls + \ingroup qtquickcontrols2-guidelines + \brief Guidelines for delegate controls Qt Quick Controls 2 offers a selection of controls that are used as delegates in views. @@ -52,5 +54,20 @@ \l RadioDelegate presents a checkable control that can be toggled on (checked) or off (unchecked). Radio delegates are typically used to select one option from a set of options. + + \b {See also} \l {RadioButton Control}. + + \section1 SwitchDelegate Control + + \image qtquickcontrols2-switchdelegate.gif + + \l SwitchDelegate presents a switchable delegate that can be toggled on or off. + + \b {See also} \l {Switch Control}. + + \section1 Related Information + \list + \li \l {Qt Quick Controls 2 Guidelines} + \endlist */ diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml b/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc index 22444739..87ba4cf1 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml +++ b/src/imports/controls/doc/src/qtquickcontrols2-guidelines.qdoc @@ -25,25 +25,20 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +/*! + \page qtquickcontrols2-guidelines.html + \title Qt Quick Controls 2 Guidelines -Item { - id: root - width: tip.width - height: tip.height + Qt Quick Controls 2 offers a selection of controls that can be used to + build complete interfaces in Qt Quick. - ToolTip { - id: tip - text: "ToolTip" - visible: root.Window.active + Below you will find practical guidelines on how and when to use + the controls. - Rectangle { - parent: tip.background - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } - } -} + \annotatedlist qtquickcontrols2-guidelines + + \section1 Related Information + \list + \li \l{Qt Quick Controls 2 QML Types}{All Qt Quick Controls 2 QML Types} + \endlist +*/ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 3f4467d5..171239ce 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -62,6 +62,7 @@ \section1 Important Concepts in Qt Quick Controls 2 \list + \li \l{Qt Quick Controls 2 Guidelines} \li \l{Styling Qt Quick Controls 2} \li \l{Customizing Qt Quick Controls 2} \li \l{High-DPI Support in Qt Quick Controls 2} diff --git a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc index dcc0ff9e..010ff444 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-indicators.qdoc @@ -28,6 +28,8 @@ /*! \page qtquickcontrols2-indicators.html \title Indicator Controls + \ingroup qtquickcontrols2-guidelines + \brief Guidelines for indicator controls Qt Quick Controls 2 offers a selection of indicator-like controls. @@ -47,8 +49,8 @@ \image qtquickcontrols2-pageindicator.png - \l PageIndicator is used to indicate the currently active page in - a container of multiple pages. + \l BusyIndicator can be used to show that an operation is in progress, + and that the UI has to wait for the operation to complete. \section1 ScrollBar Control @@ -63,5 +65,11 @@ \image qtquickcontrols2-scrollindicator.png \l ScrollIndicator is a non-interactive indicator that indicates the - current scroll position in a \l Flickable. + current scroll position, and can be used to scroll to a specific position in a + \l {Flickable}. + + \section1 Related Information + \list + \li \l {Qt Quick Controls 2 Guidelines} + \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc index 60b2250f..681a9d89 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-input.qdoc @@ -28,6 +28,8 @@ /*! \page qtquickcontrols2-input.html \title Input Controls + \ingroup qtquickcontrols2-guidelines + \brief Guidelines for input controls Qt Quick Controls 2 offers a variety of input controls for both numeric and textual input. @@ -42,13 +44,30 @@ \image qtquickcontrols2-combobox.png - \l ComboBox is used to select a value from a drop-down list. + \l ComboBox is used to select a value from a static multiple-line drop-down list. + It is not possible to add new values, and only one option can be selected. + + Recommendations: + \list + \li If the number of values is very large, consider applying a filter. + \li If the list is very limited, consider using RadioButton. This has the + advantage that the user can see all options at the same time. + \li Select a default value, the value that will be chosen most often. + \endlist + + \b {See also} \l {CheckBox Control}, \l {Tumbler Control}. \section1 Dial Control \image qtquickcontrols2-dial.png - \l Dial is a circular dial that is rotated to set a value. + \l Dial is similar to a traditional dial knob that is found on devices such + as stereos or industrial equipment. + + The dial is rotated by clicking and dragging, with the handle indicating the + value of the dial. + + \b {See also} \l {Tumbler Control}. \section1 TextArea Control @@ -62,6 +81,8 @@ \l TextField is a single line text editor. + \b {See also} \l {Tumbler Control}. + \section1 Slider Control \image qtquickcontrols2-slider.png @@ -75,9 +96,19 @@ \l RangeSlider is used to select a range specified by two values, by sliding each handle along a track. + + \b {See also} \l {Slider Control}. + \section1 Tumbler Control \image qtquickcontrols2-tumbler.png \l Tumbler is a spinnable wheel of items that can be selected. + + \b {See also} \l {ComboBox Control}. + + \section1 Related Information + \list + \li \l {Qt Quick Controls 2 Guidelines} + \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc index d54b360c..faa8c3bc 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-menus.qdoc @@ -28,6 +28,8 @@ /*! \page qtquickcontrols2-menus.html \title Menu Controls + \ingroup qtquickcontrols2-guidelines + \brief Guidelines for menu controls \annotatedlist qtquickcontrols2-menus @@ -39,5 +41,15 @@ \image qtquickcontrols2-menu.png - \l Menu is a traditional menu. + \l Menu control can be used for context menus; for example, after + right-clicking. It can also be used for popup menus; for example, a + menu that is shown after clicking a button. + + \l MenuItem is an item in the Menu control. Each item in a menu: + \list + \li displays text to the user + \li allows checking/unchecking + \li is highlighted (for example, on keyboard navigation) + \li performs some action on activation + \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc index 8ddc2f3a..a2bd15a6 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc @@ -28,6 +28,8 @@ /*! \page qtquickcontrols2-navigation.html \title Navigation Controls + \ingroup qtquickcontrols2-guidelines + \brief Guidelines for navigation controls Qt Quick Controls 2 offers a selection of navigation models. @@ -40,17 +42,29 @@ \image qtquickcontrols2-stackview-wireframe.png - \l StackView provides a stack-based navigation model. + \l StackView provides a stack-based navigation model which can be used + with a set of interlinked pages. StackView works according to a last-in + first-out principle: the page pushed last on the stack is the one visible. + Popping a page removes the last page and makes the previous one visible. \section1 SwipeView Control \image qtquickcontrols2-swipeview-wireframe.png - \l SwipeView provides a swipe-based navigation model. + \l SwipeView provides a navigation model that simplifies horizontal paged + scrolling. The page indicator on the bottom shows which is the presently + active page. - \section1 TabBar and TabButton Controls + \section1 TabBar \image qtquickcontrols2-tabbar-wireframe.png - \l TabBar and \l TabButton provide a tab-based navigation model. + \l TabBar is a bar with icons or text that allows the user to switch + between different subtasks, views, or modes. + + \section1 TabButton Control + + \image qtquickcontrols2-tabbutton.png + + \l TabButton is a button with a layout suitable for a TabBar control. */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc index 0d70028f..aa2efb90 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc @@ -28,6 +28,8 @@ /*! \page qtquickcontrols2-popups.html \title Popup Controls + \ingroup qtquickcontrols2-guidelines + \brief Guidelines for popup controls \annotatedlist qtquickcontrols2-popups @@ -42,15 +44,36 @@ \l Drawer provides a swipe-based side panel, similar to those often used in touch interfaces to provide a central location for navigation. + The drawer can be positioned at any of the four edges of the screen. It allows + the user to add navigation without taking up valuable screen space. The user can + show and hide the drawer at any time with a simple swipe movement. + \section1 Menu Control \image qtquickcontrols2-menu.png - \l Menu is a traditional menu. + The \l Menu control displays a vertical list of items that can be selected. It can + be used for offering a list of actions that can be taken in a given context. + + \b {See also} \l {Drawer Control}. \section1 Popup Control - \l Popup is the base type of popup-like user interface controls. + \image qtquickcontrols2-popup-settings.png + + A \l Popup displays content over other application content. + It prompts the user to make a decision or enter information. + + Popups can be modal or non-modal. A modal popup blocks users from interacting + with the application until they have made a choice and closed the popup. + + A popup can be used for: + + \list + \li communicating a message to the user that he must read and acknowledge. + \li displaying an error message. + \li prompting the user to make a choice and/or enter a value. + \endlist \section1 ToolTip Control @@ -58,4 +81,19 @@ \l ToolTip shows a short piece of text that informs the user of a control's function. It is typically placed above or below the parent control. + + Recommendations: + \list + \li Use a tooltip if a control has little or no descriptive text, or needs + a short explanation. + \li Use a tooltip only if the information on a particular control is not + available elsewhere in the screen. + \li Keep the tooltip text short so that it does not cover other content + while being displayed. + \endlist + + \section1 Related Information + \list + \li \l {Qt Quick Controls 2 Guidelines} + \endlist */ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc index 13a7f24e..52da41a7 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc @@ -48,4 +48,9 @@ For more information on the Qt Quick Controls 2 module, see the \l {Qt Quick Controls 2} module documentation. + + \section1 Related Information + \list + \li \l {Qt Quick Controls 2 Guidelines} + \endlist */ diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index bf3d445e..387ffb71 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -47,7 +47,6 @@ T.BusyIndicator { padding: 6 - //! [contentItem] contentItem: ProgressRing { id: ring x: control.leftPadding + (control.availableWidth - width) / 2 @@ -68,5 +67,4 @@ T.BusyIndicator { running: control.visible && control.running } } - //! [contentItem] } diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index a7d99106..f2fad313 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -57,7 +57,6 @@ T.Button { : control.down ? 8 : 2 Material.background: flat ? "transparent" : undefined - //! [contentItem] contentItem: Text { text: control.text font: control.font @@ -68,9 +67,7 @@ T.Button { verticalAlignment: Text.AlignVCenter elide: Text.ElideRight } - //! [contentItem] - //! [background] // TODO: Add a proper ripple/ink effect for mouse/touch input and focus state background: Rectangle { implicitWidth: 64 @@ -106,5 +103,4 @@ T.Button { elevation: control.Material.elevation } } - //! [background] } diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index 0163e37d..1c6848d8 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -54,15 +54,12 @@ T.CheckBox { topPadding: padding + 7 bottomPadding: padding + 7 - //! [indicator] indicator: CheckIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 @@ -75,5 +72,4 @@ T.CheckBox { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [contentItem] } diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index 549a9577..d5785467 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -54,15 +54,12 @@ T.CheckDelegate { bottomPadding: 14 spacing: 16 - //! [indicator] indicator: CheckIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing @@ -75,14 +72,11 @@ T.CheckDelegate { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [contentItem] - //! [background] background: Rectangle { implicitHeight: 48 visible: control.down || control.highlighted color: control.down ? control.Material.buttonPressColor : control.Material.listHighlightColor } - //! [background] } diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml index c541e221..f64ca168 100644 --- a/src/imports/controls/material/CheckIndicator.qml +++ b/src/imports/controls/material/CheckIndicator.qml @@ -42,7 +42,7 @@ Rectangle { implicitWidth: 18 implicitHeight: 18 color: "transparent" - border.color: control.checked ? control.Material.accentColor : control.Material.secondaryTextColor + border.color: control.checked && control.enabled ? control.Material.accentColor : control.Material.secondaryTextColor border.width: control.checked ? width / 2 : 2 radius: 2 @@ -81,15 +81,31 @@ Rectangle { source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Material/images/check.png" fillMode: Image.PreserveAspectFit - scale: control.checked ? 1 : 0 + scale: control.checkState === Qt.Checked ? 1 : 0 Behavior on scale { NumberAnimation { duration: 100 } } } - states: State { - name: "checked" - when: control.checked + Rectangle { + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + width: 12 + height: 3 + + scale: control.checkState === Qt.PartiallyChecked ? 1 : 0 + Behavior on scale { NumberAnimation { duration: 100 } } } + states: [ + State { + name: "checked" + when: control.checkState === Qt.Checked + }, + State { + name: "partiallychecked" + when: control.checkState === Qt.PartiallyChecked + } + ] + transitions: Transition { SequentialAnimation { NumberAnimation { diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index b573a314..acbdf9c0 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -56,25 +56,20 @@ T.ComboBox { spacing: 6 padding: 16 - //! [delegate] delegate: MenuItem { width: control.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData Material.foreground: control.currentIndex === index ? control.Material.accent : control.Material.foreground highlighted: control.highlightedIndex === index } - //! [delegate] - //! [indicator] indicator: Image { x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 opacity: !control.enabled ? 0.5 : 1.0 source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Material/images/drop-indicator.png" } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: control.mirrored && control.indicator ? control.indicator.width + control.spacing : 0 rightPadding: !control.mirrored && control.indicator ? control.indicator.width + control.spacing : 0 @@ -86,9 +81,7 @@ T.ComboBox { verticalAlignment: Text.AlignVCenter elide: Text.ElideRight } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 120 implicitHeight: 48 @@ -115,9 +108,7 @@ T.ComboBox { color: control.Material.checkBoxUncheckedRippleColor } } - //! [background] - //! [popup] popup: T.Popup { width: control.width implicitHeight: listview.contentHeight @@ -160,5 +151,4 @@ T.ComboBox { } } } - //! [popup] } diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml index 5d1f6270..c07cd423 100644 --- a/src/imports/controls/material/Dial.qml +++ b/src/imports/controls/material/Dial.qml @@ -44,7 +44,6 @@ T.Dial { implicitWidth: 100 implicitHeight: 100 - //! [background] background: Rectangle { x: control.width / 2 - width / 2 y: control.height / 2 - height / 2 @@ -55,9 +54,7 @@ T.Dial { border.color: control.enabled ? control.Material.accentColor : control.Material.hintTextColor } - //! [background] - //! [handle] handle: Rectangle { id: handleItem @@ -78,5 +75,4 @@ T.Dial { radius: width / 2 color: control.enabled ? control.Material.accentColor : control.Material.hintTextColor } - //! [handle] } diff --git a/src/imports/controls/material/Drawer.qml b/src/imports/controls/material/Drawer.qml index 822bf1c7..b3ee94f7 100644 --- a/src/imports/controls/material/Drawer.qml +++ b/src/imports/controls/material/Drawer.qml @@ -48,19 +48,11 @@ T.Drawer { contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - //! [enter] enter: Transition { SmoothedAnimation { velocity: 5 } } - //! [enter] - - //! [exit] exit: Transition { SmoothedAnimation { velocity: 5 } } - //! [exit] - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [background] background: Rectangle { color: control.Material.dialogColor @@ -70,5 +62,4 @@ T.Drawer { fullHeight: true } } - //! [background] } diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml index 65eab21a..c7a2935a 100644 --- a/src/imports/controls/material/Frame.qml +++ b/src/imports/controls/material/Frame.qml @@ -37,6 +37,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.Frame { id: control @@ -49,15 +50,16 @@ T.Frame { padding: 12 - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [background] background: Rectangle { radius: 3 - color: "transparent" + color: control.Material.elevation > 0 ? control.Material.backgroundColor : "transparent" border.color: control.Material.frameColor + + layer.enabled: control.enabled && control.Material.elevation > 0 + layer.effect: ElevationEffect { + elevation: control.Material.elevation + } } - //! [background] } diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml index 8e7704a0..48380414 100644 --- a/src/imports/controls/material/GroupBox.qml +++ b/src/imports/controls/material/GroupBox.qml @@ -37,6 +37,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.GroupBox { id: control @@ -53,11 +54,8 @@ T.GroupBox { padding: 12 topPadding: padding + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) - //! [contentItem] contentItem: Item {} - //! [contentItem] - //! [label] label: Text { x: control.leftPadding width: control.availableWidth @@ -69,17 +67,19 @@ T.GroupBox { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [label] - //! [background] background: Rectangle { y: control.topPadding - control.padding width: parent.width height: parent.height - control.topPadding + control.padding radius: 3 - color: "transparent" + color: control.Material.elevation > 0 ? control.Material.backgroundColor : "transparent" border.color: control.Material.frameColor + + layer.enabled: control.enabled && control.Material.elevation > 0 + layer.effect: ElevationEffect { + elevation: control.Material.elevation + } } - //! [background] } diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index 19c832cd..e43fc981 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -51,7 +51,6 @@ T.ItemDelegate { padding: 16 spacing: 16 - //! [contentItem] contentItem: Text { leftPadding: control.checkable && !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 rightPadding: control.checkable && control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 @@ -64,14 +63,11 @@ T.ItemDelegate { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [contentItem] - //! [background] background: Rectangle { implicitHeight: 48 visible: control.down || control.highlighted color: control.down ? control.Material.buttonPressColor : control.Material.listHighlightColor } - //! [background] } diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 557c6912..b11c00b6 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -68,7 +68,6 @@ T.Menu { NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; easing.type: Easing.OutCubic; duration: 150 } } - //! [contentItem] contentItem: ListView { implicitHeight: contentHeight @@ -81,9 +80,7 @@ T.Menu { ScrollIndicator.vertical: ScrollIndicator {} } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 200 implicitHeight: 48 @@ -96,5 +93,4 @@ T.Menu { elevation: control.Material.elevation } } - //! [background] } diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index 85deb234..27c2922c 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -54,16 +54,13 @@ T.MenuItem { bottomPadding: 12 spacing: 16 - //! [indicator] indicator: CheckIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 visible: control.checkable control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: control.checkable && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.checkable && control.mirrored ? control.indicator.width + control.spacing : 0 @@ -76,14 +73,11 @@ T.MenuItem { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 200 implicitHeight: 48 visible: control.down || control.highlighted color: control.down ? control.Material.buttonPressColor : control.Material.listHighlightColor } - //! [background] } diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml index b155b2e1..92c85b58 100644 --- a/src/imports/controls/material/Page.qml +++ b/src/imports/controls/material/Page.qml @@ -41,13 +41,9 @@ import QtQuick.Controls.Material 2.0 T.Page { id: control - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [background] background: Rectangle { color: control.Material.backgroundColor } - //! [background] } diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml index 085a131d..78372afe 100644 --- a/src/imports/controls/material/PageIndicator.qml +++ b/src/imports/controls/material/PageIndicator.qml @@ -49,7 +49,6 @@ T.PageIndicator { padding: 6 spacing: 6 - //! [delegate] delegate: Rectangle { implicitWidth: 8 implicitHeight: 8 @@ -60,9 +59,7 @@ T.PageIndicator { opacity: index === currentIndex ? 0.95 : pressed ? 0.7 : 0.45 Behavior on opacity { OpacityAnimator { duration: 100 } } } - //! [delegate] - //! [contentItem] contentItem: Row { spacing: control.spacing @@ -71,5 +68,4 @@ T.PageIndicator { delegate: control.delegate } } - //! [contentItem] } diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml index 434c676c..6a02b25a 100644 --- a/src/imports/controls/material/Pane.qml +++ b/src/imports/controls/material/Pane.qml @@ -50,18 +50,15 @@ T.Pane { padding: 12 - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [background] background: Rectangle { color: control.Material.backgroundColor + radius: control.Material.elevation > 0 ? 3 : 0 layer.enabled: control.enabled && control.Material.elevation > 0 layer.effect: ElevationEffect { elevation: control.Material.elevation } } - //! [background] } diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml index d5e28700..eb8bf3ce 100644 --- a/src/imports/controls/material/ProgressBar.qml +++ b/src/imports/controls/material/ProgressBar.qml @@ -47,7 +47,6 @@ T.ProgressBar { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - //! [contentItem] contentItem: ProgressStrip { id: strip implicitHeight: 4 @@ -62,9 +61,7 @@ T.ProgressBar { running: control.visible && control.indeterminate } } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 200 implicitHeight: 4 @@ -75,5 +72,4 @@ T.ProgressBar { color: Qt.rgba(control.Material.accentColor.r, control.Material.accentColor.g, control.Material.accentColor.b, 0.25) } - //! [background] } diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml index ddf496ab..3ea2cf4d 100644 --- a/src/imports/controls/material/RadioButton.qml +++ b/src/imports/controls/material/RadioButton.qml @@ -54,15 +54,12 @@ T.RadioButton { topPadding: padding + 6 bottomPadding: padding + 6 - //! [indicator] indicator: RadioIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 @@ -75,5 +72,4 @@ T.RadioButton { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [contentItem] } diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index ba443be0..95bfb19b 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/RadioDelegate.qml @@ -53,15 +53,12 @@ T.RadioDelegate { bottomPadding: 8 spacing: 16 - //! [indicator] indicator: RadioIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing @@ -74,14 +71,11 @@ T.RadioDelegate { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [contentItem] - //! [background] background: Rectangle { implicitHeight: 48 visible: control.down || control.highlighted color: control.down ? control.Material.buttonPressColor : control.Material.listHighlightColor } - //! [background] } diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml index d7589cfd..dc2c25fa 100644 --- a/src/imports/controls/material/RangeSlider.qml +++ b/src/imports/controls/material/RangeSlider.qml @@ -43,17 +43,14 @@ T.RangeSlider { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - Math.max(background ? background.implicitWidth : 0, - first.handle ? first.handle.implicitWidth : 0, - second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) + Math.max(first.handle ? first.handle.implicitWidth : 0, + second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(background ? background.implicitHeight : 0, - first.handle ? first.handle.implicitHeight : 0, - second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) + Math.max(first.handle ? first.handle.implicitHeight : 0, + second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 - //! [firstHandle] first.handle: SliderHandle { x: control.leftPadding + (horizontal ? control.first.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height)) @@ -61,9 +58,7 @@ T.RangeSlider { handleHasFocus: activeFocus handlePressed: first.pressed } - //! [firstHandle] - //! [secondHandle] second.handle: SliderHandle { x: control.leftPadding + (horizontal ? control.second.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height)) @@ -71,16 +66,14 @@ T.RangeSlider { handleHasFocus: activeFocus handlePressed: second.pressed } - //! [secondHandle] - //! [background] background: Rectangle { x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) - implicitWidth: horizontal ? 200 : 1 - implicitHeight: horizontal ? 1 : 200 - width: horizontal ? control.availableWidth : implicitWidth - height: horizontal ? implicitHeight : control.availableHeight + implicitWidth: horizontal ? 200 : 48 + implicitHeight: horizontal ? 48 : 200 + width: horizontal ? control.availableWidth : 1 + height: horizontal ? 1 : control.availableHeight color: control.Material.primaryTextColor scale: horizontal && control.mirrored ? -1 : 1 @@ -95,5 +88,4 @@ T.RangeSlider { color: control.Material.accentColor } } - //! [background] } diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index 41ee5eff..84f2d33a 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -47,8 +47,10 @@ T.ScrollBar { contentItem.implicitHeight + topPadding + bottomPadding) padding: 2 + topPadding: padding + (control.orientation === Qt.Horizontal ? 12 : 0) + leftPadding: padding + (control.orientation === Qt.Vertical && !control.mirrored ? 12 : 0) + rightPadding: padding + (control.orientation === Qt.Vertical && control.mirrored ? 12 : 0) - //! [contentItem] contentItem: Rectangle { id: handle @@ -73,5 +75,4 @@ T.ScrollBar { } } } - //! [contentItem] } diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml index 0219aa2f..b5f25d33 100644 --- a/src/imports/controls/material/ScrollIndicator.qml +++ b/src/imports/controls/material/ScrollIndicator.qml @@ -48,7 +48,6 @@ T.ScrollIndicator { padding: 2 - //! [contentItem] contentItem: Rectangle { id: indicator @@ -75,5 +74,4 @@ T.ScrollIndicator { } ] } - //! [contentItem] } diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml index d6280b67..15c8edb2 100644 --- a/src/imports/controls/material/Slider.qml +++ b/src/imports/controls/material/Slider.qml @@ -43,15 +43,12 @@ T.Slider { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - Math.max(background ? background.implicitWidth : 0, - handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) + (handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(background ? background.implicitHeight : 0, - handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) + (handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 - //! [handle] handle: SliderHandle { x: control.leftPadding + (horizontal ? control.visualPosition * (control.availableWidth - width) : (control.availableWidth - width) / 2) y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height)) @@ -59,16 +56,14 @@ T.Slider { handleHasFocus: control.visualFocus handlePressed: control.pressed } - //! [handle] - //! [background] background: Rectangle { x: control.leftPadding + (horizontal ? 0 : (control.availableWidth - width) / 2) y: control.topPadding + (horizontal ? (control.availableHeight - height) / 2 : 0) - implicitWidth: horizontal ? 200 : 1 - implicitHeight: horizontal ? 1 : 200 - width: horizontal ? control.availableWidth : implicitWidth - height: horizontal ? implicitHeight : control.availableHeight + implicitWidth: horizontal ? 200 : 48 + implicitHeight: horizontal ? 48 : 200 + width: horizontal ? control.availableWidth : 1 + height: horizontal ? 1 : control.availableHeight color: control.Material.primaryTextColor scale: horizontal && control.mirrored ? -1 : 1 @@ -83,5 +78,4 @@ T.Slider { color: control.Material.accentColor } } - //! [background] } diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index 567fbfe5..bd3a2867 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -58,15 +58,12 @@ T.SpinBox { leftPadding: (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) rightPadding: (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) - //! [validator] validator: IntValidator { locale: control.locale.name bottom: Math.min(control.from, control.to) top: Math.max(control.from, control.to) } - //! [validator] - //! [contentItem] contentItem: TextInput { text: control.textFromValue(control.value, control.locale) @@ -106,9 +103,7 @@ T.SpinBox { validator: control.validator inputMethodHints: Qt.ImhFormattedNumbersOnly } - //! [contentItem] - //! [up.indicator] up.indicator: PaddedRectangle { x: control.mirrored ? 0 : parent.width - width implicitWidth: 48 @@ -136,9 +131,7 @@ T.SpinBox { color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor } } - //! [up.indicator] - //! [down.indicator] down.indicator: PaddedRectangle { x: control.mirrored ? parent.width - width : 0 implicitWidth: 48 @@ -159,9 +152,7 @@ T.SpinBox { color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor } } - //! [down.indicator] - //! [background] background: Item { implicitWidth: 192 implicitHeight: 48 @@ -174,5 +165,4 @@ T.SpinBox { color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor } } - //! [background] } diff --git a/src/imports/controls/material/StackView.qml b/src/imports/controls/material/StackView.qml index f3756307..982a37cb 100644 --- a/src/imports/controls/material/StackView.qml +++ b/src/imports/controls/material/StackView.qml @@ -40,51 +40,39 @@ import QtQuick.Templates 2.0 as T T.StackView { id: control - //! [popEnter] popEnter: Transition { // slide_in_left NumberAnimation { property: "x"; from: (control.mirrored ? -0.5 : 0.5) * -control.width; to: 0; duration: 200; easing.type: Easing.OutCubic } NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 200; easing.type: Easing.OutCubic } } - //! [popEnter] - //! [popExit] popExit: Transition { // slide_out_right NumberAnimation { property: "x"; from: 0; to: (control.mirrored ? -0.5 : 0.5) * control.width; duration: 200; easing.type: Easing.OutCubic } NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 200; easing.type: Easing.OutCubic } } - //! [popExit] - //! [pushEnter] pushEnter: Transition { // slide_in_right NumberAnimation { property: "x"; from: (control.mirrored ? -0.5 : 0.5) * control.width; to: 0; duration: 200; easing.type: Easing.OutCubic } NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 200; easing.type: Easing.OutCubic } } - //! [pushEnter] - //! [pushExit] pushExit: Transition { // slide_out_left NumberAnimation { property: "x"; from: 0; to: (control.mirrored ? -0.5 : 0.5) * -control.width; duration: 200; easing.type: Easing.OutCubic } NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 200; easing.type: Easing.OutCubic } } - //! [pushExit] - //! [replaceEnter] replaceEnter: Transition { // slide_in_right NumberAnimation { property: "x"; from: (control.mirrored ? -0.5 : 0.5) * control.width; to: 0; duration: 200; easing.type: Easing.OutCubic } NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; duration: 200; easing.type: Easing.OutCubic } } - //! [replaceEnter] - //! [replaceExit] replaceExit: Transition { // slide_out_left NumberAnimation { property: "x"; from: 0; to: (control.mirrored ? -0.5 : 0.5) * -control.width; duration: 200; easing.type: Easing.OutCubic } NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; duration: 200; easing.type: Easing.OutCubic } } - //! [replaceExit] } diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index e1375f76..dec2d12f 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/SwipeDelegate.qml @@ -54,7 +54,6 @@ T.SwipeDelegate { bottomPadding: 8 spacing: 16 - //! [contentItem] contentItem: Text { leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width + control.spacing : 0) : 0 rightPadding: control.mirrored ? (control.indicator ? control.indicator.width + control.spacing : 0) : 0 @@ -75,9 +74,7 @@ T.SwipeDelegate { } } } - //! [contentItem] - //! [background] background: Rectangle { implicitHeight: 48 @@ -100,5 +97,4 @@ T.SwipeDelegate { } } } - //! [background] } diff --git a/src/imports/controls/material/SwipeView.qml b/src/imports/controls/material/SwipeView.qml index ab53203d..38c12b6b 100644 --- a/src/imports/controls/material/SwipeView.qml +++ b/src/imports/controls/material/SwipeView.qml @@ -45,7 +45,6 @@ T.SwipeView { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - //! [contentItem] contentItem: ListView { model: control.contentModel currentIndex: control.currentIndex @@ -60,5 +59,4 @@ T.SwipeView { preferredHighlightEnd: 0 highlightMoveDuration: 250 } - //! [contentItem] } diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml index 37776100..ca739e62 100644 --- a/src/imports/controls/material/Switch.qml +++ b/src/imports/controls/material/Switch.qml @@ -52,15 +52,12 @@ T.Switch { padding: 8 spacing: 8 - //! [indicator] indicator: SwitchIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 @@ -73,5 +70,4 @@ T.Switch { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [contentItem] } diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index b729f01e..097f0acd 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/SwitchDelegate.qml @@ -54,15 +54,12 @@ T.SwitchDelegate { bottomPadding: 8 spacing: 16 - //! [indicator] indicator: SwitchIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing @@ -75,14 +72,11 @@ T.SwitchDelegate { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [contentItem] - //! [background] background: Rectangle { implicitHeight: 48 visible: control.down || control.highlighted color: control.down ? control.Material.buttonPressColor : control.Material.listHighlightColor } - //! [background] } diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml index 79238da4..22a80efa 100644 --- a/src/imports/controls/material/TabBar.qml +++ b/src/imports/controls/material/TabBar.qml @@ -37,6 +37,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T import QtQuick.Controls.Material 2.0 +import QtQuick.Controls.Material.impl 2.0 T.TabBar { id: control @@ -48,7 +49,6 @@ T.TabBar { spacing: 1 - //! [contentItem] contentItem: ListView { implicitWidth: contentWidth implicitHeight: 48 @@ -74,11 +74,14 @@ T.TabBar { } } } - //! [contentItem] - //! [background] background: Rectangle { color: control.Material.backgroundColor + + layer.enabled: control.Material.elevation > 0 + layer.effect: ElevationEffect { + elevation: control.Material.elevation + fullWidth: true + } } - //! [background] } diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index 9659205b..095645b4 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -49,7 +49,6 @@ T.TabButton { padding: 12 - //! [contentItem] contentItem: Text { text: control.text font: control.font @@ -58,11 +57,8 @@ T.TabButton { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } - //! [contentItem] - //! [background] background: Item { implicitHeight: 48 } - //! [background] } diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index 8098ac42..b37e2311 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -81,7 +81,6 @@ T.TextArea { } } - //! [placeholder] Text { id: placeholder x: control.leftPadding @@ -96,14 +95,11 @@ T.TextArea { elide: Text.ElideRight visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) } - //! [placeholder] - //! [background] background: Rectangle { y: parent.height - height - control.bottomPadding / 2 implicitWidth: 120 height: control.activeFocus ? 2 : 1 color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor } - //! [background] } diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index 2f3b9f2b..9c576ca6 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/TextField.qml @@ -79,7 +79,6 @@ T.TextField { } } - //! [placeholder] Text { id: placeholder x: control.leftPadding @@ -95,14 +94,11 @@ T.TextField { visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) } - //! [placeholder] - //! [background] background: Rectangle { y: control.height - height - control.bottomPadding / 2 implicitWidth: 120 height: control.activeFocus ? 2 : 1 color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor } - //! [background] } diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index e41c6695..1bcffd82 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -52,11 +52,8 @@ T.ToolBar { Material.foreground: Material.toolTextColor - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [background] background: Rectangle { implicitHeight: 48 color: control.Material.primaryColor @@ -67,5 +64,4 @@ T.ToolBar { fullWidth: true } } - //! [background] } diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index 2fcae7e8..d8c945a7 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -49,7 +49,6 @@ T.ToolButton { padding: 6 - //! [contentItem] contentItem: Text { text: control.text font: control.font @@ -58,9 +57,7 @@ T.ToolButton { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 48 implicitHeight: 48 @@ -68,5 +65,4 @@ T.ToolButton { color: control.down ? control.Material.buttonPressColor : control.Material.buttonHoverColor visible: control.enabled && (control.down || control.visualFocus || control.checked || control.highlighted) } - //! [background] } diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml index 5b1b9667..ab3b05d8 100644 --- a/src/imports/controls/material/ToolTip.qml +++ b/src/imports/controls/material/ToolTip.qml @@ -68,21 +68,17 @@ T.ToolTip { NumberAnimation { property: "opacity"; from: 1.0; to: 0.0; easing.type: Easing.InQuad; duration: 500 } } - //! [contentItem] contentItem: Text { text: control.text font: control.font // TODO: wrapMode: Label.Wrap color: control.Material.primaryTextColor } - //! [contentItem] - //! [background] background: Rectangle { implicitHeight: 32 color: control.Material.tooltipColor opacity: 0.9 radius: 2 } - //! [background] } diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index 67baa82a..7e914319 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.qml @@ -44,7 +44,6 @@ T.Tumbler { implicitWidth: 60 implicitHeight: 200 - //! [delegate] delegate: Text { id: label text: modelData @@ -54,9 +53,7 @@ T.Tumbler { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } - //! [delegate] - //! [contentItem] contentItem: PathView { id: pathView model: control.model @@ -78,5 +75,4 @@ T.Tumbler { property real delegateHeight: control.availableHeight / control.visibleItemCount } - //! [contentItem] } diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index acf94c54..e661056c 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -2071,4 +2071,240 @@ Module { Property { name: "tumbler"; type: "QQuickTumbler"; isReadonly: true; isPointer: true } Property { name: "displacement"; type: "double"; isReadonly: true } } + + Component { + name: "QQuickWindowQmlImpl" + defaultProperty: "data" + prototype: "QQuickWindow" + exports: ["QtQuick.Window/Window 2.1", "QtQuick.Window/Window 2.2"] + exportMetaObjectRevisions: [0, 1] + attachedType: "QQuickWindowAttached" + Property { name: "visible"; type: "bool" } + Property { name: "visibility"; type: "Visibility" } + Signal { + name: "visibleChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "visibilityChanged" + Parameter { name: "visibility"; type: "QWindow::Visibility" } + } + } + + Component { + name: "QQuickWindow" + defaultProperty: "data" + prototype: "QWindow" + exports: ["QtQuick.Window/Window 2.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "SceneGraphError" + values: { + "ContextNotAvailable": 1 + } + } + Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "color"; type: "QColor" } + Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } + Property { + name: "activeFocusItem" + revision: 1 + type: "QQuickItem" + isReadonly: true + isPointer: true + } + Signal { name: "frameSwapped" } + Signal { + name: "openglContextCreated" + revision: 2 + Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true } + } + Signal { name: "sceneGraphInitialized" } + Signal { name: "sceneGraphInvalidated" } + Signal { name: "beforeSynchronizing" } + Signal { name: "afterSynchronizing"; revision: 2 } + Signal { name: "beforeRendering" } + Signal { name: "afterRendering" } + Signal { name: "afterAnimating"; revision: 2 } + Signal { name: "sceneGraphAboutToStop"; revision: 2 } + Signal { + name: "closing" + revision: 1 + Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true } + } + Signal { + name: "colorChanged" + Parameter { type: "QColor" } + } + Signal { name: "activeFocusItemChanged"; revision: 1 } + Signal { + name: "sceneGraphError" + revision: 2 + Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" } + Parameter { name: "message"; type: "string" } + } + Method { name: "update" } + Method { name: "releaseResources" } + } + + Component { + name: "QWindow" + prototype: "QObject" + Enum { + name: "Visibility" + values: { + "Hidden": 0, + "AutomaticVisibility": 1, + "Windowed": 2, + "Minimized": 3, + "Maximized": 4, + "FullScreen": 5 + } + } + Property { name: "title"; type: "string" } + Property { name: "modality"; type: "Qt::WindowModality" } + Property { name: "flags"; type: "Qt::WindowFlags" } + Property { name: "x"; type: "int" } + Property { name: "y"; type: "int" } + Property { name: "width"; type: "int" } + Property { name: "height"; type: "int" } + Property { name: "minimumWidth"; type: "int" } + Property { name: "minimumHeight"; type: "int" } + Property { name: "maximumWidth"; type: "int" } + Property { name: "maximumHeight"; type: "int" } + Property { name: "visible"; type: "bool" } + Property { name: "active"; revision: 1; type: "bool"; isReadonly: true } + Property { name: "visibility"; revision: 1; type: "Visibility" } + Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" } + Property { name: "opacity"; revision: 1; type: "double" } + Signal { + name: "screenChanged" + Parameter { name: "screen"; type: "QScreen"; isPointer: true } + } + Signal { + name: "modalityChanged" + Parameter { name: "modality"; type: "Qt::WindowModality" } + } + Signal { + name: "windowStateChanged" + Parameter { name: "windowState"; type: "Qt::WindowState" } + } + Signal { + name: "windowTitleChanged" + revision: 2 + Parameter { name: "title"; type: "string" } + } + Signal { + name: "xChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "yChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "widthChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "heightChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "minimumWidthChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "minimumHeightChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "maximumWidthChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "maximumHeightChanged" + Parameter { name: "arg"; type: "int" } + } + Signal { + name: "visibleChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "visibilityChanged" + revision: 1 + Parameter { name: "visibility"; type: "QWindow::Visibility" } + } + Signal { name: "activeChanged"; revision: 1 } + Signal { + name: "contentOrientationChanged" + Parameter { name: "orientation"; type: "Qt::ScreenOrientation" } + } + Signal { + name: "focusObjectChanged" + Parameter { name: "object"; type: "QObject"; isPointer: true } + } + Signal { + name: "opacityChanged" + revision: 1 + Parameter { name: "opacity"; type: "double" } + } + Method { name: "requestActivate"; revision: 1 } + Method { + name: "setVisible" + Parameter { name: "visible"; type: "bool" } + } + Method { name: "show" } + Method { name: "hide" } + Method { name: "showMinimized" } + Method { name: "showMaximized" } + Method { name: "showFullScreen" } + Method { name: "showNormal" } + Method { name: "close"; type: "bool" } + Method { name: "raise" } + Method { name: "lower" } + Method { + name: "setTitle" + Parameter { type: "string" } + } + Method { + name: "setX" + Parameter { name: "arg"; type: "int" } + } + Method { + name: "setY" + Parameter { name: "arg"; type: "int" } + } + Method { + name: "setWidth" + Parameter { name: "arg"; type: "int" } + } + Method { + name: "setHeight" + Parameter { name: "arg"; type: "int" } + } + Method { + name: "setMinimumWidth" + Parameter { name: "w"; type: "int" } + } + Method { + name: "setMinimumHeight" + Parameter { name: "h"; type: "int" } + } + Method { + name: "setMaximumWidth" + Parameter { name: "w"; type: "int" } + } + Method { + name: "setMaximumHeight" + Parameter { name: "h"; type: "int" } + } + Method { + name: "alert" + revision: 1 + Parameter { name: "msec"; type: "int" } + } + Method { name: "requestUpdate"; revision: 3 } + } + } diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml index ef666417..fe2186a7 100644 --- a/src/imports/controls/universal/BusyIndicator.qml +++ b/src/imports/controls/universal/BusyIndicator.qml @@ -45,7 +45,6 @@ T.BusyIndicator { implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding - //! [contentItem] contentItem: ProgressRing { id: ring @@ -62,5 +61,4 @@ T.BusyIndicator { running: control.visible && control.running } } - //! [contentItem] } diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index 60a2ac51..6954d31a 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -53,7 +53,6 @@ T.Button { property bool useSystemFocusVisuals: true - //! [contentItem] contentItem: Text { text: control.text font: control.font @@ -64,9 +63,7 @@ T.Button { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 32 implicitHeight: 32 @@ -76,5 +73,4 @@ T.Button { control.enabled && (control.highlighted || control.checked) ? control.Universal.accent : control.Universal.baseLowColor } - //! [background] } diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml index 262f16b1..a1c3ba6b 100644 --- a/src/imports/controls/universal/CheckBox.qml +++ b/src/imports/controls/universal/CheckBox.qml @@ -54,15 +54,12 @@ T.CheckBox { property bool useSystemFocusVisuals: true - //! [indicator] indicator: CheckIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 @@ -77,5 +74,4 @@ T.CheckBox { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] } diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index 9441c7b0..c0ca272e 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -54,15 +54,12 @@ T.CheckDelegate { topPadding: padding - 1 bottomPadding: padding + 1 - //! [indicator] indicator: CheckIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing @@ -77,9 +74,7 @@ T.CheckDelegate { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] - //! [background] background: Rectangle { visible: control.down || control.highlighted || control.visualFocus color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor @@ -92,5 +87,4 @@ T.CheckDelegate { } } - //! [background] } diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 6d550aa2..007294b3 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -56,15 +56,12 @@ T.ComboBox { rightPadding: padding - 2 bottomPadding: padding - 5 - //! [delegate] delegate: ItemDelegate { width: control.width text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData highlighted: control.highlightedIndex === index } - //! [delegate] - //! [indicator] indicator: Image { x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding y: control.topPadding + (control.availableHeight - height) / 2 @@ -72,9 +69,7 @@ T.ComboBox { sourceSize.width: width sourceSize.height: height } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: control.mirrored && control.indicator ? control.indicator.width + control.spacing : 0 rightPadding: !control.mirrored && control.indicator ? control.indicator.width + control.spacing : 0 @@ -88,9 +83,7 @@ T.ComboBox { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 120 implicitHeight: 32 @@ -112,9 +105,7 @@ T.ComboBox { opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 } } - //! [background] - //! [popup] popup: T.Popup { width: control.width implicitHeight: Math.min(396, listview.contentHeight) @@ -139,5 +130,4 @@ T.ComboBox { border.width: 1 // FlyoutBorderThemeThickness } } - //! [popup] } diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml index 466c6023..56cc7080 100644 --- a/src/imports/controls/universal/Dial.qml +++ b/src/imports/controls/universal/Dial.qml @@ -44,7 +44,6 @@ T.Dial { implicitWidth: 100 implicitHeight: 100 - //! [background] background: Rectangle { x: control.width / 2 - width / 2 y: control.height / 2 - height / 2 @@ -55,9 +54,7 @@ T.Dial { border.color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseMediumColor border.width: 2 } - //! [background] - //! [handle] handle: Rectangle { implicitWidth: 20 implicitHeight: 20 @@ -80,5 +77,4 @@ T.Dial { } ] } - //! [handle] } diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml index e23403ae..95fef8d1 100644 --- a/src/imports/controls/universal/Drawer.qml +++ b/src/imports/controls/universal/Drawer.qml @@ -52,19 +52,11 @@ T.Drawer { rightPadding: control.edge === Qt.LeftEdge bottomPadding: control.edge === Qt.TopEdge - //! [enter] enter: Transition { SmoothedAnimation { velocity: 5 } } - //! [enter] - - //! [exit] exit: Transition { SmoothedAnimation { velocity: 5 } } - //! [exit] - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [background] background: Rectangle { color: control.Universal.chromeMediumLowColor Rectangle { @@ -76,5 +68,4 @@ T.Drawer { y: control.edge === Qt.TopEdge ? parent.height - 1 : 0 } } - //! [background] } diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml index 8d8b9d71..d5b327c1 100644 --- a/src/imports/controls/universal/Frame.qml +++ b/src/imports/controls/universal/Frame.qml @@ -49,14 +49,10 @@ T.Frame { padding: 12 - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [background] background: Rectangle { color: "transparent" border.color: control.Universal.chromeDisabledLowColor } - //! [background] } diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml index a163fb11..c75c81a6 100644 --- a/src/imports/controls/universal/GroupBox.qml +++ b/src/imports/controls/universal/GroupBox.qml @@ -53,11 +53,8 @@ T.GroupBox { padding: 12 topPadding: padding + (label && label.implicitWidth > 0 ? label.implicitHeight + spacing : 0) - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [label] label: Text { x: control.leftPadding width: control.availableWidth @@ -71,9 +68,7 @@ T.GroupBox { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [label] - //! [background] background: Rectangle { y: control.topPadding - control.padding width: parent.width @@ -82,5 +77,4 @@ T.GroupBox { color: "transparent" border.color: control.Universal.chromeDisabledLowColor } - //! [background] } diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index af239e4c..6822d658 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -54,7 +54,6 @@ T.ItemDelegate { topPadding: padding - 1 bottomPadding: padding + 1 - //! [contentItem] contentItem: Text { leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 rightPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 @@ -69,9 +68,7 @@ T.ItemDelegate { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] - //! [background] background: Rectangle { visible: control.down || control.highlighted || control.visualFocus color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor @@ -84,5 +81,4 @@ T.ItemDelegate { } } - //! [background] } diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index d506feac..5ee2c243 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -49,7 +49,6 @@ T.Menu { margins: 0 - //! [contentItem] contentItem: ListView { implicitHeight: contentHeight model: control.contentModel @@ -61,9 +60,7 @@ T.Menu { ScrollIndicator.vertical: ScrollIndicator {} } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 200 implicitHeight: 40 @@ -71,5 +68,4 @@ T.Menu { border.color: control.Universal.chromeHighColor border.width: 1 // FlyoutBorderThemeThickness } - //! [background] } diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 342c0d70..d8fdbcd0 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -53,7 +53,6 @@ T.MenuItem { bottomPadding: padding + 1 spacing: 12 - //! [contentItem] contentItem: Text { leftPadding: !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.mirrored ? control.indicator.width + control.spacing : 0 @@ -66,9 +65,7 @@ T.MenuItem { horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } - //! [contentItem] - //! [indicator] indicator: Image { x: control.text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 @@ -78,9 +75,7 @@ T.MenuItem { sourceSize.width: width sourceSize.height: height } - //! [indicator] - //! [background] background: Rectangle { implicitWidth: 200 implicitHeight: 40 @@ -98,5 +93,4 @@ T.MenuItem { opacity: control.Universal.theme === Universal.Light ? 0.4 : 0.6 } } - //! [background] } diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml index f4509b4b..3150715f 100644 --- a/src/imports/controls/universal/Page.qml +++ b/src/imports/controls/universal/Page.qml @@ -41,13 +41,9 @@ import QtQuick.Controls.Universal 2.0 T.Page { id: control - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [background] background: Rectangle { color: control.Universal.background } - //! [background] } diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml index 636f0297..0c4e3b80 100644 --- a/src/imports/controls/universal/PageIndicator.qml +++ b/src/imports/controls/universal/PageIndicator.qml @@ -49,7 +49,6 @@ T.PageIndicator { padding: 6 spacing: 7 - //! [delegate] delegate: Rectangle { implicitWidth: 5 implicitHeight: 5 @@ -58,9 +57,7 @@ T.PageIndicator { color: index === control.currentIndex ? control.Universal.baseMediumHighColor : pressed ? control.Universal.baseMediumLowColor : control.Universal.baseLowColor } - //! [delegate] - //! [contentItem] contentItem: Row { spacing: control.spacing @@ -69,5 +66,4 @@ T.PageIndicator { delegate: control.delegate } } - //! [contentItem] } diff --git a/src/imports/controls/universal/Pane.qml b/src/imports/controls/universal/Pane.qml index 7a97da55..cd62b65c 100644 --- a/src/imports/controls/universal/Pane.qml +++ b/src/imports/controls/universal/Pane.qml @@ -49,13 +49,9 @@ T.Pane { padding: 12 - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [background] background: Rectangle { color: control.Universal.background } - //! [background] } diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml index b8df774e..66d1aeb8 100644 --- a/src/imports/controls/universal/ProgressBar.qml +++ b/src/imports/controls/universal/ProgressBar.qml @@ -47,7 +47,6 @@ T.ProgressBar { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - //! [contentItem] contentItem: ProgressStrip { id: strip implicitHeight: 10 @@ -63,9 +62,7 @@ T.ProgressBar { running: control.visible && control.indeterminate } } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 100 implicitHeight: 10 @@ -78,5 +75,4 @@ T.ProgressBar { visible: !control.indeterminate color: control.Universal.baseLowColor } - //! [background] } diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml index b2f29661..b8986488 100644 --- a/src/imports/controls/universal/RadioButton.qml +++ b/src/imports/controls/universal/RadioButton.qml @@ -54,15 +54,12 @@ T.RadioButton { property bool useSystemFocusVisuals: true - //! [indicator] indicator: RadioIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 @@ -77,5 +74,4 @@ T.RadioButton { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] } diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 8bf05d2d..09f86f15 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -56,15 +56,12 @@ T.RadioDelegate { property Item control - //! [indicator] indicator: RadioIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing @@ -79,9 +76,7 @@ T.RadioDelegate { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] - //! [background] background: Rectangle { visible: control.down || control.highlighted || control.visualFocus color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor @@ -94,5 +89,4 @@ T.RadioDelegate { } } - //! [background] } diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index 061f95dd..ec2ff7c8 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -42,17 +42,14 @@ T.RangeSlider { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - Math.max(background ? background.implicitWidth : 0, - first.handle ? first.handle.implicitWidth : 0, - second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) + Math.max(first.handle ? first.handle.implicitWidth : 0, + second.handle ? second.handle.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(background ? background.implicitHeight : 0, - first.handle ? first.handle.implicitHeight : 0, - second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) + Math.max(first.handle ? first.handle.implicitHeight : 0, + second.handle ? second.handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 - //! [firstHandle] first.handle: Rectangle { implicitWidth: horizontal ? 8 : 24 implicitHeight: horizontal ? 24 : 8 @@ -65,9 +62,7 @@ T.RangeSlider { radius: 4 color: control.first.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor } - //! [firstHandle] - //! [secondHandle] second.handle: Rectangle { implicitWidth: horizontal ? 8 : 24 implicitHeight: horizontal ? 24 : 8 @@ -80,9 +75,7 @@ T.RangeSlider { radius: 4 color: control.second.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor } - //! [secondHandle] - //! [background] background: Item { implicitWidth: horizontal ? 200 : 18 implicitHeight: horizontal ? 18 : 200 @@ -114,5 +107,4 @@ T.RangeSlider { color: control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor } } - //! [background] } diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index 19087384..1ac627a7 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -48,7 +48,6 @@ T.ScrollBar { // TODO: arrows - //! [contentItem] contentItem: Rectangle { implicitWidth: 12 implicitHeight: 12 @@ -57,9 +56,7 @@ T.ScrollBar { visible: control.size < 1.0 opacity: 0.0 } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 12 implicitHeight: 12 @@ -68,7 +65,6 @@ T.ScrollBar { visible: control.size < 1.0 opacity: 0.0 } - //! [background] states: [ State { diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml index 9f9f3fcf..ce289ce3 100644 --- a/src/imports/controls/universal/ScrollIndicator.qml +++ b/src/imports/controls/universal/ScrollIndicator.qml @@ -46,7 +46,6 @@ T.ScrollIndicator { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - //! [contentItem] contentItem: Rectangle { id: indicator @@ -78,5 +77,4 @@ T.ScrollIndicator { } ] } - //! [contentItem] } diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml index 9662acdf..baf91211 100644 --- a/src/imports/controls/universal/Slider.qml +++ b/src/imports/controls/universal/Slider.qml @@ -42,17 +42,14 @@ T.Slider { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - Math.max(background ? background.implicitWidth : 0, - handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) + (handle ? handle.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(background ? background.implicitHeight : 0, - handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) + (handle ? handle.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 property bool useSystemFocusVisuals: true - //! [handle] handle: Rectangle { implicitWidth: horizontal ? 8 : 24 implicitHeight: horizontal ? 24 : 8 @@ -65,9 +62,7 @@ T.Slider { radius: 4 color: control.pressed ? control.Universal.chromeHighColor : control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor } - //! [handle] - //! [background] background: Item { implicitWidth: horizontal ? 200 : 18 implicitHeight: horizontal ? 18 : 200 @@ -99,5 +94,4 @@ T.Slider { color: control.enabled ? control.Universal.accent : control.Universal.chromeDisabledHighColor } } - //! [background] } diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index 4654aa01..d3647114 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.qml @@ -60,15 +60,12 @@ T.SpinBox { Universal.theme: activeFocus ? Universal.Light : undefined - //! [validator] validator: IntValidator { locale: control.locale.name bottom: Math.min(control.from, control.to) top: Math.max(control.from, control.to) } - //! [validator] - //! [contentItem] contentItem: TextInput { text: control.textFromValue(control.value, control.locale) @@ -84,9 +81,7 @@ T.SpinBox { validator: control.validator inputMethodHints: Qt.ImhFormattedNumbersOnly } - //! [contentItem] - //! [up.indicator] up.indicator: Item { implicitWidth: 28 height: parent.height + 4 @@ -112,9 +107,7 @@ T.SpinBox { sourceSize.height: height } } - //! [up.indicator] - //! [down.indicator] down.indicator: Item { implicitWidth: 28 height: parent.height + 4 @@ -140,9 +133,7 @@ T.SpinBox { sourceSize.height: height } } - //! [down.indicator] - //! [background] background: Rectangle { implicitWidth: 60 + 28 // TextControlThemeMinWidth - 4 (border) implicitHeight: 28 // TextControlThemeMinHeight - 4 (border) @@ -152,5 +143,4 @@ T.SpinBox { control.activeFocus ? control.Universal.accent : control.Universal.chromeDisabledLowColor color: control.enabled ? control.Universal.background : control.Universal.baseLowColor } - //! [background] } diff --git a/src/imports/controls/universal/StackView.qml b/src/imports/controls/universal/StackView.qml index 60239429..4f37bb76 100644 --- a/src/imports/controls/universal/StackView.qml +++ b/src/imports/controls/universal/StackView.qml @@ -41,48 +41,36 @@ import QtQuick.Controls.Universal 2.0 T.StackView { id: control - //! [popEnter] popEnter: Transition { ParallelAnimation { NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 200; easing.type: Easing.InQuint } NumberAnimation { property: "x"; from: (control.mirrored ? -0.3 : 0.3) * -control.width; to: 0; duration: 400; easing.type: Easing.OutCubic } } } - //! [popEnter] - //! [popExit] popExit: Transition { NumberAnimation { property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.OutQuint } } - //! [popExit] - //! [pushEnter] pushEnter: Transition { ParallelAnimation { NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 200; easing.type: Easing.InQuint } NumberAnimation { property: "x"; from: (control.mirrored ? -0.3 : 0.3) * control.width; to: 0; duration: 400; easing.type: Easing.OutCubic } } } - //! [pushEnter] - //! [pushExit] pushExit: Transition { NumberAnimation { property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.OutQuint } } - //! [pushExit] - //! [replaceEnter] replaceEnter: Transition { ParallelAnimation { NumberAnimation { property: "opacity"; from: 0; to: 1; duration: 200; easing.type: Easing.InQuint } NumberAnimation { property: "x"; from: (control.mirrored ? -0.3 : 0.3) * control.width; to: 0; duration: 400; easing.type: Easing.OutCubic } } } - //! [replaceEnter] - //! [replaceExit] replaceExit: Transition { NumberAnimation { property: "opacity"; from: 1; to: 0; duration: 200; easing.type: Easing.OutQuint } } - //! [replaceExit] } diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index d11983e3..82c1e744 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -54,7 +54,6 @@ T.SwipeDelegate { topPadding: padding - 1 bottomPadding: padding + 1 - //! [contentItem] contentItem: Text { leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 rightPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0 @@ -78,9 +77,7 @@ T.SwipeDelegate { } } } - //! [contentItem] - //! [background] background: Rectangle { color: control.Universal.background @@ -105,5 +102,4 @@ T.SwipeDelegate { } } } - //! [background] } diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index 988b328f..b42361dc 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -53,15 +53,12 @@ T.Switch { property bool useSystemFocusVisuals: true - //! [indicator] indicator: SwitchIndicator { x: text ? (control.mirrored ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 @@ -76,5 +73,4 @@ T.Switch { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] } diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index 43a1c4e2..558f5cfb 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -54,15 +54,12 @@ T.SwitchDelegate { topPadding: padding - 1 bottomPadding: padding + 1 - //! [indicator] indicator: SwitchIndicator { x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control } - //! [indicator] - //! [contentItem] contentItem: Text { leftPadding: !control.mirrored ? 0 : control.indicator.width + control.spacing rightPadding: control.mirrored ? 0 : control.indicator.width + control.spacing @@ -77,9 +74,7 @@ T.SwitchDelegate { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] - //! [background] background: Rectangle { visible: control.down || control.highlighted || control.visualFocus color: control.down ? control.Universal.listMediumColor : control.Universal.altMediumLowColor @@ -92,5 +87,4 @@ T.SwitchDelegate { } } - //! [background] } diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml index b25137c1..7c2e83a6 100644 --- a/src/imports/controls/universal/TabBar.qml +++ b/src/imports/controls/universal/TabBar.qml @@ -46,7 +46,6 @@ T.TabBar { implicitHeight: Math.max(background ? background.implicitHeight : 0, contentItem.implicitHeight + topPadding + bottomPadding) - //! [contentItem] contentItem: PathView { implicitWidth: 200 implicitHeight: 48 @@ -68,13 +67,10 @@ T.TabBar { } } } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 200 implicitHeight: 48 color: control.Universal.background } - //! [background] } diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index 3a1845a5..d503c86a 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -49,7 +49,6 @@ T.TabButton { padding: 12 // PivotItemMargin - //! [contentItem] contentItem: Text { text: control.text font: control.font @@ -60,5 +59,4 @@ T.TabButton { opacity: control.checked || control.down ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] } diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index b4c38135..5ca490e7 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -78,7 +78,6 @@ T.TextArea { elide: Text.ElideRight } - //! [background] background: Rectangle { implicitWidth: 60 // TextControlThemeMinWidth - 4 (border) implicitHeight: 28 // TextControlThemeMinHeight - 4 (border) @@ -88,5 +87,4 @@ T.TextArea { control.activeFocus ? control.Universal.accent : control.Universal.chromeDisabledLowColor color: control.enabled ? control.Universal.background : control.Universal.baseLowColor } - //! [background] } diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index 041cf0e8..13587b5a 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -79,7 +79,6 @@ T.TextField { elide: Text.ElideRight } - //! [background] background: Rectangle { implicitWidth: 60 // TextControlThemeMinWidth - 4 (border) implicitHeight: 28 // TextControlThemeMinHeight - 4 (border) @@ -89,5 +88,4 @@ T.TextField { control.activeFocus ? control.Universal.accent : control.Universal.chromeDisabledLowColor color: control.enabled ? control.Universal.background : control.Universal.baseLowColor } - //! [background] } diff --git a/src/imports/controls/universal/ToolBar.qml b/src/imports/controls/universal/ToolBar.qml index 721d817e..48e200c0 100644 --- a/src/imports/controls/universal/ToolBar.qml +++ b/src/imports/controls/universal/ToolBar.qml @@ -47,14 +47,10 @@ T.ToolBar { contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0) contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) - //! [contentItem] contentItem: Item { } - //! [contentItem] - //! [background] background: Rectangle { implicitHeight: 48 // AppBarThemeCompactHeight color: control.Universal.chromeMediumColor } - //! [background] } diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index 525623b5..cb87130d 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -51,7 +51,6 @@ T.ToolButton { property bool useSystemFocusVisuals: true - //! [contentItem] contentItem: Text { text: control.text font: control.font @@ -62,9 +61,7 @@ T.ToolButton { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] - //! [background] background: Rectangle { implicitWidth: 68 implicitHeight: 48 // AppBarThemeCompactHeight @@ -72,5 +69,4 @@ T.ToolButton { color: control.down ? control.Universal.listMediumColor : control.enabled && (control.highlighted || control.checked) ? control.Universal.accent : "transparent" } - //! [background] } diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml index 16576811..423e729d 100644 --- a/src/imports/controls/universal/ToolTip.qml +++ b/src/imports/controls/universal/ToolTip.qml @@ -56,7 +56,6 @@ T.ToolTip { closePolicy: T.Popup.CloseOnEscape | T.Popup.CloseOnPressOutsideParent | T.Popup.CloseOnReleaseOutsideParent - //! [contentItem] contentItem: Text { text: control.text font: control.font @@ -64,13 +63,10 @@ T.ToolTip { opacity: enabled ? 1.0 : 0.2 color: control.Universal.foreground } - //! [contentItem] - //! [background] background: Rectangle { color: control.Universal.chromeMediumLowColor border.color: control.Universal.chromeHighColor border.width: 1 // ToolTipBorderThemeThickness } - //! [background] } diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml index 6869f1eb..7b134b84 100644 --- a/src/imports/controls/universal/Tumbler.qml +++ b/src/imports/controls/universal/Tumbler.qml @@ -45,7 +45,6 @@ T.Tumbler { implicitWidth: 60 implicitHeight: 200 - //! [delegate] delegate: Text { text: modelData font: control.font @@ -54,9 +53,7 @@ T.Tumbler { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } - //! [delegate] - //! [contentItem] contentItem: PathView { id: pathView model: control.model @@ -78,5 +75,4 @@ T.Tumbler { property real delegateHeight: control.availableHeight / control.visibleItemCount } - //! [contentItem] } |
