Modified touch example color palette.

diff --git a/examples/touch/content/SliderPage.qml b/examples/touch/content/SliderPage.qml
index 3ce1800..5dc77f1 100644 (file)
--- a/examples/touch/content/SliderPage.qml
+++ b/examples/touch/content/SliderPage.qml
@@ -56,18 +56,19 @@ Item {
 
         Slider {
             anchors.margins: 20
-            //style: touchStyle
             value: 0
+            stepSize: 1
+            maximumValue: 100
         }
         Slider {
             anchors.margins: 20
-            //style: touchStyle
-            value: 0.5
+            stepSize: 1
+            value: 500
+            maximumValue: 1000
         }
         Slider {
             anchors.margins: 20
-            //style: touchStyle
-            value: 1.0
+            value: 0.3
             enabled:false
         }
 

diff --git a/examples/touch/content/TabBarPage.qml b/examples/touch/content/TabBarPage.qml
index c96314b..30e6ca2 100644 (file)
--- a/examples/touch/content/TabBarPage.qml
+++ b/examples/touch/content/TabBarPage.qml
@@ -52,51 +52,25 @@ Item {
 
     TabView {
         anchors.fill: parent
-        style: touchStyle
         Tab {
-            title: "Buttons"
+            title: "1"
             ButtonPage{ visible: true }
         }
         Tab {
-            title: "Sliders"
+            title: "2"
             SliderPage{ visible: true }
         }
         Tab {
-            title: "Progress"
+            title: "3"
             ProgressBarPage{ visible: true }
         }
-    }
-
-    Component {
-        id: touchStyle
-        TabViewStyle {
-            tabsAlignment: Qt.AlignVCenter
-            tabOverlap: 0
-            frame: Item { }
-            tab: Item {
-                implicitWidth: control.width/control.count
-                implicitHeight: 50
-                BorderImage {
-                    anchors.fill: parent
-                    border.bottom: 8
-                    border.top: 8
-                    source: tab.selected ? "../images/tab_selected.png":"../images/tabs_standard.png"
-                    Text {
-                        anchors.centerIn: parent
-                        color: "white"
-                        text: tab.title.toUpperCase()
-                        font.pixelSize: 16
-                    }
-                    Rectangle {
-                        visible: index > 0
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-                        anchors.margins: 10
-                        width:1
-                        color: "#3a3a3a"
-                    }
-                }
-            }
+        Tab {
+            title: "4"
+            CheckBoxPage{ visible: true }
+        }
+        Tab {
+            title: "5"
+            TextInputPage{ visible: true }
         }
-    }
+    }   
 }

diff --git a/examples/touch/content/TextInputPage.qml b/examples/touch/content/TextInputPage.qml
index 605afef..9d88ced 100644 (file)
--- a/examples/touch/content/TextInputPage.qml
+++ b/examples/touch/content/TextInputPage.qml
@@ -45,27 +45,12 @@
 import QtQuick 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Private 1.0
 
 Item {
     width: parent.width
     height: parent.height
 
-    property real progress: 0
-    SequentialAnimation on progress {
-        loops: Animation.Infinite
-        running: true
-        NumberAnimation {
-            from: 0
-            to: 1
-            duration: 3000
-        }
-        NumberAnimation {
-            from: 1
-            to: 0
-            duration: 3000
-        }
-    }
-
     Column {
         spacing: 40
         anchors.centerIn: parent
@@ -87,7 +72,7 @@ Item {
         id: touchStyle
 
         TextFieldStyle {
-            textColor: "white"
+            textColor: "black"
             font.pixelSize: 28
             background: Item {
                 implicitHeight: 50

diff --git a/examples/touch/main.qml b/examples/touch/main.qml
index 36e7dc9..5653880 100644 (file)
--- a/examples/touch/main.qml
+++ b/examples/touch/main.qml
@@ -47,7 +47,7 @@ ApplicationWindow {
     height: 1280
 
     Rectangle {
-        color: "#FFFFFF"
+        color: Qt.lighter("lightgrey")
         anchors.fill: parent
     }
 
@@ -96,7 +96,7 @@ ApplicationWindow {
             Behavior on x { NumberAnimation{ easing.type: Easing.OutCubic} }
             x: backButton.x + backButton.width + 20
             anchors.verticalCenter: parent.verticalCenter
-            color: "black"
+            color: "white"
             text: "Widget Gallery"
         }
     }