summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@nokia.com>2010-08-20 06:40:41 -0400
committerZeno Albisser <zeno.albisser@nokia.com>2010-08-20 06:40:41 -0400
commit2894c5017bd0d40428eecf3ef63185976e97d578 (patch)
treed7a4bd4b86c985aec4a68e01c4282fc0078a92cf
parent48ae7768726979d59274cf83bcdd45cf030d908c (diff)
parent364c509cf7949440bba354b80a558a7179481c40 (diff)
Merge branch 'fancygraphics'
-rw-r--r--multilayer-dashboard/ColumnFour.qml12
-rw-r--r--multilayer-dashboard/images/1.jpgbin66904 -> 0 bytes
-rw-r--r--multilayer-dashboard/images/1.pngbin0 -> 475381 bytes
-rw-r--r--multilayer-dashboard/images/2.jpgbin50734 -> 0 bytes
-rw-r--r--multilayer-dashboard/images/2.pngbin0 -> 310017 bytes
-rw-r--r--multilayer-dashboard/images/3.jpgbin73570 -> 0 bytes
-rw-r--r--multilayer-dashboard/images/3.pngbin0 -> 459841 bytes
-rw-r--r--multilayer-dashboard/images/4.jpgbin54669 -> 0 bytes
-rw-r--r--multilayer-dashboard/images/4.pngbin0 -> 374758 bytes
-rw-r--r--multilayer-dashboard/images/5.jpgbin57354 -> 0 bytes
-rw-r--r--multilayer-dashboard/images/5.pngbin0 -> 372444 bytes
-rw-r--r--multilayer-dashboard/images/6.jpgbin31973 -> 0 bytes
-rw-r--r--multilayer-dashboard/images/6.pngbin0 -> 233423 bytes
13 files changed, 6 insertions, 6 deletions
diff --git a/multilayer-dashboard/ColumnFour.qml b/multilayer-dashboard/ColumnFour.qml
index 5de2fda..2bc5fab 100644
--- a/multilayer-dashboard/ColumnFour.qml
+++ b/multilayer-dashboard/ColumnFour.qml
@@ -58,12 +58,12 @@ Item {
Repeater {
model: [
- "images/1.jpg",
- "images/2.jpg",
- "images/3.jpg",
- "images/4.jpg",
- "images/5.jpg",
- "images/6.jpg"
+ "images/1.png",
+ "images/2.png",
+ "images/3.png",
+ "images/4.png",
+ "images/5.png",
+ "images/6.png"
]
ExpandableWidget {
id: me
diff --git a/multilayer-dashboard/images/1.jpg b/multilayer-dashboard/images/1.jpg
deleted file mode 100644
index 4a799cc..0000000
--- a/multilayer-dashboard/images/1.jpg
+++ /dev/null
Binary files differ
diff --git a/multilayer-dashboard/images/1.png b/multilayer-dashboard/images/1.png
new file mode 100644
index 0000000..03a0a94
--- /dev/null
+++ b/multilayer-dashboard/images/1.png
Binary files differ
diff --git a/multilayer-dashboard/images/2.jpg b/multilayer-dashboard/images/2.jpg
deleted file mode 100644
index d2616aa..0000000
--- a/multilayer-dashboard/images/2.jpg
+++ /dev/null
Binary files differ
diff --git a/multilayer-dashboard/images/2.png b/multilayer-dashboard/images/2.png
new file mode 100644
index 0000000..c85b283
--- /dev/null
+++ b/multilayer-dashboard/images/2.png
Binary files differ
diff --git a/multilayer-dashboard/images/3.jpg b/multilayer-dashboard/images/3.jpg
deleted file mode 100644
index e470595..0000000
--- a/multilayer-dashboard/images/3.jpg
+++ /dev/null
Binary files differ
diff --git a/multilayer-dashboard/images/3.png b/multilayer-dashboard/images/3.png
new file mode 100644
index 0000000..17733ba
--- /dev/null
+++ b/multilayer-dashboard/images/3.png
Binary files differ
diff --git a/multilayer-dashboard/images/4.jpg b/multilayer-dashboard/images/4.jpg
deleted file mode 100644
index fc6ed3b..0000000
--- a/multilayer-dashboard/images/4.jpg
+++ /dev/null
Binary files differ
diff --git a/multilayer-dashboard/images/4.png b/multilayer-dashboard/images/4.png
new file mode 100644
index 0000000..5631513
--- /dev/null
+++ b/multilayer-dashboard/images/4.png
Binary files differ
diff --git a/multilayer-dashboard/images/5.jpg b/multilayer-dashboard/images/5.jpg
deleted file mode 100644
index 25d7f56..0000000
--- a/multilayer-dashboard/images/5.jpg
+++ /dev/null
Binary files differ
diff --git a/multilayer-dashboard/images/5.png b/multilayer-dashboard/images/5.png
new file mode 100644
index 0000000..e181e49
--- /dev/null
+++ b/multilayer-dashboard/images/5.png
Binary files differ
diff --git a/multilayer-dashboard/images/6.jpg b/multilayer-dashboard/images/6.jpg
deleted file mode 100644
index 313749a..0000000
--- a/multilayer-dashboard/images/6.jpg
+++ /dev/null
Binary files differ
diff --git a/multilayer-dashboard/images/6.png b/multilayer-dashboard/images/6.png
new file mode 100644
index 0000000..d493886
--- /dev/null
+++ b/multilayer-dashboard/images/6.png
Binary files differ