diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/controls/gallery/gallery.qml | 12 | ||||
-rw-r--r-- | examples/controls/gallery/pages/BusyIndicatorPage.qml | 2 | ||||
-rw-r--r-- | examples/controls/gallery/pages/ComboBoxPage.qml | 4 | ||||
-rw-r--r-- | examples/controls/gallery/pages/GroupBoxPage.qml | 2 | ||||
-rw-r--r-- | examples/controls/gallery/pages/StackViewPage.qml | 4 | ||||
-rw-r--r-- | examples/controls/gallery/pages/SwipeViewPage.qml | 3 | ||||
-rw-r--r-- | examples/controls/gallery/pages/TabBarPage.qml | 3 |
7 files changed, 19 insertions, 11 deletions
diff --git a/examples/controls/gallery/gallery.qml b/examples/controls/gallery/gallery.qml index ac808649..fd019c65 100644 --- a/examples/controls/gallery/gallery.qml +++ b/examples/controls/gallery/gallery.qml @@ -63,8 +63,10 @@ ApplicationWindow { anchors.fill: parent ToolButton { - label: Image { - anchors.centerIn: parent + contentItem: Image { + fillMode: Image.Pad + horizontalAlignment: Image.AlignHCenter + verticalAlignment: Image.AlignVCenter source: "qrc:/images/drawer.png" } onClicked: drawer.open() @@ -81,8 +83,10 @@ ApplicationWindow { } ToolButton { - label: Image { - anchors.centerIn: parent + contentItem: Image { + fillMode: Image.Pad + horizontalAlignment: Image.AlignHCenter + verticalAlignment: Image.AlignVCenter source: "qrc:/images/menu.png" } onClicked: optionsMenu.open() diff --git a/examples/controls/gallery/pages/BusyIndicatorPage.qml b/examples/controls/gallery/pages/BusyIndicatorPage.qml index 2d538216..5aed6e59 100644 --- a/examples/controls/gallery/pages/BusyIndicatorPage.qml +++ b/examples/controls/gallery/pages/BusyIndicatorPage.qml @@ -53,7 +53,7 @@ Pane { wrapMode: Label.Wrap horizontalAlignment: Qt.AlignHCenter text: "BusyIndicator is used to indicate activity while content is being loaded," - + " or the UI is blocked waiting for a resource to become available." + + " or when the UI is blocked waiting for a resource to become available." } BusyIndicator { diff --git a/examples/controls/gallery/pages/ComboBoxPage.qml b/examples/controls/gallery/pages/ComboBoxPage.qml index 3c497c48..4400612f 100644 --- a/examples/controls/gallery/pages/ComboBoxPage.qml +++ b/examples/controls/gallery/pages/ComboBoxPage.qml @@ -52,8 +52,8 @@ Pane { width: parent.width wrapMode: Label.Wrap horizontalAlignment: Qt.AlignHCenter - text: "ComboBox is a combined button and popup list. It provides means of presenting a " - + "list of options to the user in a way that takes up the minimum amount of screen space." + text: "ComboBox is a combined button and popup list. It presents " + + "a list of options to the user that occupies minimal screen space." } ComboBox { diff --git a/examples/controls/gallery/pages/GroupBoxPage.qml b/examples/controls/gallery/pages/GroupBoxPage.qml index e9d67849..996e65d2 100644 --- a/examples/controls/gallery/pages/GroupBoxPage.qml +++ b/examples/controls/gallery/pages/GroupBoxPage.qml @@ -54,7 +54,7 @@ Pane { width: parent.width wrapMode: Label.Wrap horizontalAlignment: Qt.AlignHCenter - text: "GroupBox is used to layout a logical group of controls together, within a titled visual frame." + text: "A GroupBox provides a frame, a title on top of it, and a logical group of controls within that frame." } GroupBox { diff --git a/examples/controls/gallery/pages/StackViewPage.qml b/examples/controls/gallery/pages/StackViewPage.qml index 42e1df43..19416aa6 100644 --- a/examples/controls/gallery/pages/StackViewPage.qml +++ b/examples/controls/gallery/pages/StackViewPage.qml @@ -60,7 +60,9 @@ StackView { width: parent.width wrapMode: Label.Wrap horizontalAlignment: Qt.AlignHCenter - text: "StackView provides a stack-based navigation model." + text: "StackView provides a stack-based navigation model which can be used with a set of interlinked pages. " + + "Items are pushed onto the stack as the user navigates deeper into the material, and popped off again " + + "when he chooses to go back." } Button { diff --git a/examples/controls/gallery/pages/SwipeViewPage.qml b/examples/controls/gallery/pages/SwipeViewPage.qml index 29739451..aded5d73 100644 --- a/examples/controls/gallery/pages/SwipeViewPage.qml +++ b/examples/controls/gallery/pages/SwipeViewPage.qml @@ -64,7 +64,8 @@ Pane { width: parent.width wrapMode: Label.Wrap horizontalAlignment: Qt.AlignHCenter - text: "SwipeView provides a swipe-based navigation model." + text: "SwipeView provides a navigation model that simplifies horizontal paged scrolling. " + + "The page indicator on the bottom shows which is the presently active page." } Image { diff --git a/examples/controls/gallery/pages/TabBarPage.qml b/examples/controls/gallery/pages/TabBarPage.qml index 0ab4a100..ba170f2c 100644 --- a/examples/controls/gallery/pages/TabBarPage.qml +++ b/examples/controls/gallery/pages/TabBarPage.qml @@ -66,7 +66,8 @@ Pane { width: parent.width wrapMode: Label.Wrap horizontalAlignment: Qt.AlignHCenter - text: "TabBar provides a tab-based navigation model." + text: "TabBar is a bar with icons or text which allows the user" + + "to switch between different subtasks, views, or modes." } Image { |