summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-09-01 02:55:49 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-09-01 02:55:49 (GMT)
commita56c1032fb7722124b0cb83f78b6c9ecf9dd258b (patch)
tree7d4dab6577ded75e36854ad70be4657c91503504
parente9e9b0bcb2cc413871eb9e4596750635c11ddee4 (diff)
downloadQt-a56c1032fb7722124b0cb83f78b6c9ecf9dd258b.zip
Qt-a56c1032fb7722124b0cb83f78b6c9ecf9dd258b.tar.gz
Qt-a56c1032fb7722124b0cb83f78b6c9ecf9dd258b.tar.bz2
cleanup
-rw-r--r--demos/declarative/flickr/mobile/Button.qml4
-rw-r--r--demos/declarative/flickr/mobile/TitleBar.qml2
-rw-r--r--demos/declarative/flickr/mobile/ToolBar.qml2
-rw-r--r--demos/declarative/flickr/mobile/images/titlebar.png (renamed from demos/declarative/flickr/mobile/images/titlebar2.png)bin1436 -> 1436 bytes
-rw-r--r--demos/declarative/flickr/mobile/images/titlebar.sci5
-rw-r--r--demos/declarative/flickr/mobile/images/titlebar2.sci5
-rw-r--r--demos/declarative/flickr/mobile/images/toolbutton.png (renamed from demos/declarative/flickr/mobile/images/toolbutton2.png)bin2619 -> 2619 bytes
-rw-r--r--demos/declarative/flickr/mobile/images/toolbutton.sci (renamed from demos/declarative/flickr/mobile/images/toolbutton2.sci)2
8 files changed, 10 insertions, 10 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/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/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
Binary files 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.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
Binary files differ
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