From a56c1032fb7722124b0cb83f78b6c9ecf9dd258b Mon Sep 17 00:00:00 2001
From: Yann Bodson <yann.bodson@nokia.com>
Date: Tue, 1 Sep 2009 12:55:49 +1000
Subject: cleanup

---
 demos/declarative/flickr/mobile/Button.qml             |   4 ++--
 demos/declarative/flickr/mobile/TitleBar.qml           |   2 +-
 demos/declarative/flickr/mobile/ToolBar.qml            |   2 +-
 demos/declarative/flickr/mobile/images/titlebar.png    | Bin 0 -> 1436 bytes
 demos/declarative/flickr/mobile/images/titlebar.sci    |   5 +++++
 demos/declarative/flickr/mobile/images/titlebar2.png   | Bin 1436 -> 0 bytes
 demos/declarative/flickr/mobile/images/titlebar2.sci   |   5 -----
 demos/declarative/flickr/mobile/images/toolbutton.png  | Bin 0 -> 2619 bytes
 demos/declarative/flickr/mobile/images/toolbutton.sci  |   5 +++++
 demos/declarative/flickr/mobile/images/toolbutton2.png | Bin 2619 -> 0 bytes
 demos/declarative/flickr/mobile/images/toolbutton2.sci |   5 -----
 11 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 demos/declarative/flickr/mobile/images/titlebar.png
 create mode 100644 demos/declarative/flickr/mobile/images/titlebar.sci
 delete mode 100644 demos/declarative/flickr/mobile/images/titlebar2.png
 delete mode 100644 demos/declarative/flickr/mobile/images/titlebar2.sci
 create mode 100644 demos/declarative/flickr/mobile/images/toolbutton.png
 create mode 100644 demos/declarative/flickr/mobile/images/toolbutton.sci
 delete mode 100644 demos/declarative/flickr/mobile/images/toolbutton2.png
 delete mode 100644 demos/declarative/flickr/mobile/images/toolbutton2.sci

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/TitleBar.qml b/demos/declarative/flickr/mobile/TitleBar.qml
index 9d40323..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
diff --git a/demos/declarative/flickr/mobile/ToolBar.qml b/demos/declarative/flickr/mobile/ToolBar.qml
index 8ac5127..cfdc8fe 100644
--- a/demos/declarative/flickr/mobile/ToolBar.qml
+++ b/demos/declarative/flickr/mobile/ToolBar.qml
@@ -8,7 +8,7 @@ Item {
     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 {
         id: Button1
diff --git a/demos/declarative/flickr/mobile/images/titlebar.png b/demos/declarative/flickr/mobile/images/titlebar.png
new file mode 100644
index 0000000..51c9008
Binary files /dev/null and b/demos/declarative/flickr/mobile/images/titlebar.png differ
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.png b/demos/declarative/flickr/mobile/images/titlebar2.png
deleted file mode 100644
index 51c9008..0000000
Binary files a/demos/declarative/flickr/mobile/images/titlebar2.png and /dev/null differ
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/toolbutton.png b/demos/declarative/flickr/mobile/images/toolbutton.png
new file mode 100644
index 0000000..8862898
Binary files /dev/null and b/demos/declarative/flickr/mobile/images/toolbutton.png differ
diff --git a/demos/declarative/flickr/mobile/images/toolbutton.sci b/demos/declarative/flickr/mobile/images/toolbutton.sci
new file mode 100644
index 0000000..a0a885f
--- /dev/null
+++ b/demos/declarative/flickr/mobile/images/toolbutton.sci
@@ -0,0 +1,5 @@
+gridLeft: 15
+gridTop: 4
+gridBottom: 4
+gridRight: 15
+imageFile: toolbutton.png
diff --git a/demos/declarative/flickr/mobile/images/toolbutton2.png b/demos/declarative/flickr/mobile/images/toolbutton2.png
deleted file mode 100644
index 8862898..0000000
Binary files a/demos/declarative/flickr/mobile/images/toolbutton2.png and /dev/null differ
diff --git a/demos/declarative/flickr/mobile/images/toolbutton2.sci b/demos/declarative/flickr/mobile/images/toolbutton2.sci
deleted file mode 100644
index e3118b0..0000000
--- a/demos/declarative/flickr/mobile/images/toolbutton2.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-gridLeft: 15
-gridTop: 4
-gridBottom: 4
-gridRight: 15
-imageFile: toolbutton2.png
-- 
cgit v0.12