aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/designer
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-06-06 15:59:59 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-06-07 09:35:27 +0000
commit1dc9b5b03adebd483dd47ef28447671bea52c6e6 (patch)
tree85fb1000ff3feb600d9d4e7a6bf88e668b216952 /src/imports/controls/designer
parentf043b64c37d35775f5d6498a5d9dfe42cd28b0d7 (diff)
Update QML Designer support
Change-Id: I916ab905ade9c6c83cf4cb8bcf121bdd99e84974 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/designer')
-rw-r--r--src/imports/controls/designer/images/page-icon.pngbin0 -> 250 bytes
-rw-r--r--src/imports/controls/designer/images/page-icon16.pngbin0 -> 231 bytes
-rw-r--r--src/imports/controls/designer/images/page-icon16@2x.pngbin0 -> 268 bytes
-rw-r--r--src/imports/controls/designer/images/page-icon@2x.pngbin0 -> 303 bytes
-rw-r--r--src/imports/controls/designer/images/rangeslider-icon.pngbin0 -> 365 bytes
-rw-r--r--src/imports/controls/designer/images/rangeslider-icon16.pngbin0 -> 279 bytes
-rw-r--r--src/imports/controls/designer/images/rangeslider-icon16@2x.pngbin0 -> 550 bytes
-rw-r--r--src/imports/controls/designer/images/rangeslider-icon@2x.pngbin0 -> 824 bytes
-rw-r--r--src/imports/controls/designer/qtquickcontrols2.metainfo66
9 files changed, 64 insertions, 2 deletions
diff --git a/src/imports/controls/designer/images/page-icon.png b/src/imports/controls/designer/images/page-icon.png
new file mode 100644
index 00000000..ecd08c6e
--- /dev/null
+++ b/src/imports/controls/designer/images/page-icon.png
Binary files differ
diff --git a/src/imports/controls/designer/images/page-icon16.png b/src/imports/controls/designer/images/page-icon16.png
new file mode 100644
index 00000000..2d761364
--- /dev/null
+++ b/src/imports/controls/designer/images/page-icon16.png
Binary files differ
diff --git a/src/imports/controls/designer/images/page-icon16@2x.png b/src/imports/controls/designer/images/page-icon16@2x.png
new file mode 100644
index 00000000..3857af28
--- /dev/null
+++ b/src/imports/controls/designer/images/page-icon16@2x.png
Binary files differ
diff --git a/src/imports/controls/designer/images/page-icon@2x.png b/src/imports/controls/designer/images/page-icon@2x.png
new file mode 100644
index 00000000..8780dfbe
--- /dev/null
+++ b/src/imports/controls/designer/images/page-icon@2x.png
Binary files differ
diff --git a/src/imports/controls/designer/images/rangeslider-icon.png b/src/imports/controls/designer/images/rangeslider-icon.png
new file mode 100644
index 00000000..b97c6942
--- /dev/null
+++ b/src/imports/controls/designer/images/rangeslider-icon.png
Binary files differ
diff --git a/src/imports/controls/designer/images/rangeslider-icon16.png b/src/imports/controls/designer/images/rangeslider-icon16.png
new file mode 100644
index 00000000..33236566
--- /dev/null
+++ b/src/imports/controls/designer/images/rangeslider-icon16.png
Binary files differ
diff --git a/src/imports/controls/designer/images/rangeslider-icon16@2x.png b/src/imports/controls/designer/images/rangeslider-icon16@2x.png
new file mode 100644
index 00000000..c613a029
--- /dev/null
+++ b/src/imports/controls/designer/images/rangeslider-icon16@2x.png
Binary files differ
diff --git a/src/imports/controls/designer/images/rangeslider-icon@2x.png b/src/imports/controls/designer/images/rangeslider-icon@2x.png
new file mode 100644
index 00000000..60c12a4a
--- /dev/null
+++ b/src/imports/controls/designer/images/rangeslider-icon@2x.png
Binary files differ
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"