Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

9 files changed, 21 insertions, 21 deletions

diff --git a/demos/declarative/flickr/mobile/Button.qml b/demos/declarative/flickr/mobile/Button.qml
index 275408c..3a0b42e 100644
--- a/demos/declarative/flickr/mobile/Button.qml
+++ b/demos/declarative/flickr/mobile/Button.qml
@@ -9,13 +9,13 @@ Item {
 
     BorderImage {
         id: Image
-        source: "images/toolbutton2.sci"
+        source: "images/toolbutton.sci"
         width: Container.width; height: Container.height
     }
     BorderImage {
         id: Pressed
         opacity: 0
-        source: "images/toolbutton2.sci"
+        source: "images/toolbutton.sci"
         width: Container.width; height: Container.height
     }
     MouseRegion {
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 5ab4d3a..91e7c8d 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -48,23 +48,20 @@
                      name: "Details"; extend: "Show"
                      ParentChange { target: Wrapper; parent: ImageDetails.frontContainer }
                      PropertyChanges { target: Wrapper; x: 20; y: 60 }
-                     PropertyChanges { target: ImageDetails; x: 0 }
-                     PropertyChanges { target: Views; x: -parent.width }
-                     PropertyChanges { target: ToolBar.button2; text: "Back" }
-                     PropertyChanges { target: ToolBar; onButton2Clicked: { } }
+                     PropertyChanges { target: Background; state: "DetailedView" }
                  }
              ]
              transitions: [
                  Transition {
                      from: "Show"; to: "Details"
                      ParentAction { }
-                     NumberAnimation { properties: "x,y,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+                     NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" }
                  },
                  Transition {
                      from: "Details"; to: "Show"
                      SequentialAnimation {
                          ParentAction { }
-                         NumberAnimation { properties: "x,y,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
+                         NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" }
                          PropertyAction { target: Wrapper; properties: "z" }
                      }
                  }
diff --git a/demos/declarative/flickr/mobile/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index b74e414..79c1326 100644
--- a/demos/declarative/flickr/mobile/TitleBar.qml
+++ b/demos/declarative/flickr/mobile/TitleBar.qml
@@ -5,7 +5,7 @@ Item {
     property string untaggedString: "Uploads from everyone"
     property string taggedString: "Recent uploads tagged "
 
-    BorderImage { source: "images/titlebar2.sci"; width: parent.width; height: parent.height + 14; y: -7 }
+    BorderImage { source: "images/titlebar.sci"; width: parent.width; height: parent.height + 14; y: -7 }
 
     Item {
         id: Container
@@ -13,8 +13,9 @@ Item {
 
         Script {
             function accept() {
-                RssModel.tags = Editor.text
                 TitleBar.state = ""
+                Background.state = ""
+                RssModel.tags = Editor.text
             }
         }
 
diff --git a/demos/declarative/flickr/mobile/ToolBar.qml b/demos/declarative/flickr/mobile/ToolBar.qml
index 80897cc..cfdc8fe 100644
--- a/demos/declarative/flickr/mobile/ToolBar.qml
+++ b/demos/declarative/flickr/mobile/ToolBar.qml
@@ -3,20 +3,22 @@ import Qt 4.6
 Item {
     id: Toolbar
 
-    property var button1Label
-    property var button2Label
+    property alias button1Label: Button1.text
+    property alias button2Label: Button2.text
     signal button1Clicked
     signal button2Clicked
 
-    BorderImage { source: "images/titlebar2.sci"; width: parent.width; height: parent.height + 14; y: -7 }
+    BorderImage { source: "images/titlebar.sci"; width: parent.width; height: parent.height + 14; y: -7 }
 
     Button {
-        anchors.left: parent.left; anchors.leftMargin: 5; y: 3; width: 140; height: 32; text: button1Label
+        id: Button1
+        anchors.left: parent.left; anchors.leftMargin: 5; y: 3; width: 140; height: 32
         onClicked: Toolbar.button1Clicked()
     }
 
     Button {
-        anchors.right: parent.right; anchors.rightMargin: 5; y: 3; width: 140; height: 32; text: button2Label
+        id: Button2
+        anchors.right: parent.right; anchors.rightMargin: 5; y: 3; width: 140; height: 32
         onClicked: Toolbar.button2Clicked()
     }
 }
diff --git a/demos/declarative/flickr/mobile/images/titlebar2.png b/demos/declarative/flickr/mobile/images/titlebar.png
index 51c9008..51c9008 100644
--- a/demos/declarative/flickr/mobile/images/titlebar2.png
+++ b/demos/declarative/flickr/mobile/images/titlebar.png
diff --git a/demos/declarative/flickr/mobile/images/titlebar.sci b/demos/declarative/flickr/mobile/images/titlebar.sci
new file mode 100644
index 0000000..50444e1
--- /dev/null
+++ b/demos/declarative/flickr/mobile/images/titlebar.sci
@@ -0,0 +1,5 @@
+gridLeft: 10
+gridTop: 12
+gridBottom: 12
+gridRight: 10
+imageFile: titlebar.png
diff --git a/demos/declarative/flickr/mobile/images/titlebar2.sci b/demos/declarative/flickr/mobile/images/titlebar2.sci
deleted file mode 100644
index e8fc2d1..0000000
--- a/demos/declarative/flickr/mobile/images/titlebar2.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-gridLeft: 22
-gridTop: 10
-gridBottom: 10
-gridRight: 22
-imageFile: titlebar2.png
diff --git a/demos/declarative/flickr/mobile/images/toolbutton2.png b/demos/declarative/flickr/mobile/images/toolbutton.png
index 8862898..8862898 100644
--- a/demos/declarative/flickr/mobile/images/toolbutton2.png
+++ b/demos/declarative/flickr/mobile/images/toolbutton.png
diff --git a/demos/declarative/flickr/mobile/images/toolbutton2.sci b/demos/declarative/flickr/mobile/images/toolbutton.sci
index e3118b0..a0a885f 100644
--- a/demos/declarative/flickr/mobile/images/toolbutton2.sci
+++ b/demos/declarative/flickr/mobile/images/toolbutton.sci
@@ -2,4 +2,4 @@ gridLeft: 15
 gridTop: 4
 gridBottom: 4
 gridRight: 15
-imageFile: toolbutton2.png
+imageFile: toolbutton.png