summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorNatalia Shubina <natalia.shubina@nokia.com>2012-01-20 12:08:44 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-20 04:26:58 +0100
commit7eb25dc4f7c3663476fa10bf059af32a45c2fd47 (patch)
treebcddb61a5656274a5b0b5ced66204617d0d575fc /examples
parent473a433aa3a37a92b6ba7b8c96070f9bf8f7fbc5 (diff)
downloadqtlocation-7eb25dc4f7c3663476fa10bf059af32a45c2fd47.tar.gz
Update example look and feel. Part 3.
Update example look and feel Removing unused images Change-Id: Id57f12354cf13e23432cdd14c5c7169996a473a6 Reviewed-by: abcd <amos.choy@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/common/common.qrc7
-rw-r--r--examples/declarative/common/imports/QtLocation/examples/components/style/ButtonStyle.qml2
-rw-r--r--examples/declarative/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml2
-rw-r--r--examples/declarative/common/resources/button.sci5
-rw-r--r--examples/declarative/common/resources/catch.pngbin984 -> 530 bytes
-rw-r--r--examples/declarative/common/resources/hmenuItem.sci5
-rw-r--r--examples/declarative/common/resources/menuItem.pngbin1436 -> 0 bytes
-rw-r--r--examples/declarative/common/resources/menuItem.sci5
-rw-r--r--examples/declarative/common/resources/menuItem_hovered.pngbin1380 -> 0 bytes
-rw-r--r--examples/declarative/common/resources/menuItem_pressed.pngbin1389 -> 0 bytes
-rw-r--r--examples/declarative/common/resources/vmenuItem.sci5
-rw-r--r--examples/declarative/mapviewer/content/dialogs/Message.qml4
-rw-r--r--examples/declarative/mapviewer/content/map/MapComponent.qml2
-rw-r--r--examples/declarative/places/content/places/OptionsDialog.qml2
14 files changed, 4 insertions, 35 deletions
diff --git a/examples/declarative/common/common.qrc b/examples/declarative/common/common.qrc
index a90ec581..9fc073af 100644
--- a/examples/declarative/common/common.qrc
+++ b/examples/declarative/common/common.qrc
@@ -18,7 +18,6 @@
<file>resources/busy.png</file>
<file>resources/button_pressed.png</file>
<file>resources/button.png</file>
- <file>resources/button.sci</file>
<file>resources/catch.png</file>
<file>resources/categories_pressed.png</file>
<file>resources/categories.png</file>
@@ -29,16 +28,11 @@
<file>resources/cross.png</file>
<file>resources/hmenuItem_pressed.png</file>
<file>resources/hmenuItem.png</file>
- <file>resources/hmenuItem.sci</file>
<file>resources/left_pressed.png</file>
<file>resources/left.png</file>
<file>resources/marker_hovered.png</file>
<file>resources/marker_selected.png</file>
<file>resources/marker.png</file>
- <file>resources/menuItem_hovered.png</file>
- <file>resources/menuItem_pressed.png</file>
- <file>resources/menuItem.png</file>
- <file>resources/menuItem.sci</file>
<file>resources/node_selected.png</file>
<file>resources/node.png</file>
<file>resources/option_button_selected.png</file>
@@ -59,6 +53,5 @@
<file>resources/titlebar.png</file>
<file>resources/titlebar.sci</file>
<file>resources/vmenuItem.png</file>
- <file>resources/vmenuItem.sci</file>
</qresource>
</RCC>
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/style/ButtonStyle.qml b/examples/declarative/common/imports/QtLocation/examples/components/style/ButtonStyle.qml
index f82a90db..fb5d786c 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/style/ButtonStyle.qml
+++ b/examples/declarative/common/imports/QtLocation/examples/components/style/ButtonStyle.qml
@@ -41,7 +41,7 @@ import QtQuick 2.0
QtObject {
id: buttonStyle
- property string background: "../../../../resources/button.sci"
+ property string background: "../../../../resources/button.png"
property string pressedBackground: "../../../../resources/button_pressed.png"
property string disabledBackground: "../../../../resources/button.png"
property color fontcolor_normal: "white"
diff --git a/examples/declarative/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml b/examples/declarative/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml
index 3bea1f82..194b3db4 100644
--- a/examples/declarative/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml
+++ b/examples/declarative/common/imports/QtLocation/examples/components/style/VMenuItemStyle.qml
@@ -40,5 +40,5 @@
import QtQuick 2.0
HMenuItemStyle {
- background: "../../../../resources/vmenuItem.sci"
+ background: "../../../../resources/vmenuItem.png"
}
diff --git a/examples/declarative/common/resources/button.sci b/examples/declarative/common/resources/button.sci
deleted file mode 100644
index a34a58b6..00000000
--- a/examples/declarative/common/resources/button.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 15
-border.top: 4
-border.bottom: 4
-border.right: 15
-source: button.png
diff --git a/examples/declarative/common/resources/catch.png b/examples/declarative/common/resources/catch.png
index 1c307544..c4fbba40 100644
--- a/examples/declarative/common/resources/catch.png
+++ b/examples/declarative/common/resources/catch.png
Binary files differ
diff --git a/examples/declarative/common/resources/hmenuItem.sci b/examples/declarative/common/resources/hmenuItem.sci
deleted file mode 100644
index 477ada8e..00000000
--- a/examples/declarative/common/resources/hmenuItem.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 10
-border.top: 12
-border.bottom: 12
-border.right: 10
-source: hmenuItem.png
diff --git a/examples/declarative/common/resources/menuItem.png b/examples/declarative/common/resources/menuItem.png
deleted file mode 100644
index 51c90082..00000000
--- a/examples/declarative/common/resources/menuItem.png
+++ /dev/null
Binary files differ
diff --git a/examples/declarative/common/resources/menuItem.sci b/examples/declarative/common/resources/menuItem.sci
deleted file mode 100644
index 0418d94c..00000000
--- a/examples/declarative/common/resources/menuItem.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 10
-border.top: 12
-border.bottom: 12
-border.right: 10
-source: titlebar.png
diff --git a/examples/declarative/common/resources/menuItem_hovered.png b/examples/declarative/common/resources/menuItem_hovered.png
deleted file mode 100644
index 16c1a94e..00000000
--- a/examples/declarative/common/resources/menuItem_hovered.png
+++ /dev/null
Binary files differ
diff --git a/examples/declarative/common/resources/menuItem_pressed.png b/examples/declarative/common/resources/menuItem_pressed.png
deleted file mode 100644
index 3ab14f1f..00000000
--- a/examples/declarative/common/resources/menuItem_pressed.png
+++ /dev/null
Binary files differ
diff --git a/examples/declarative/common/resources/vmenuItem.sci b/examples/declarative/common/resources/vmenuItem.sci
deleted file mode 100644
index 909567db..00000000
--- a/examples/declarative/common/resources/vmenuItem.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 10
-border.top: 12
-border.bottom: 12
-border.right: 10
-source: vmenuItem.png
diff --git a/examples/declarative/mapviewer/content/dialogs/Message.qml b/examples/declarative/mapviewer/content/dialogs/Message.qml
index abc44928..61456dac 100644
--- a/examples/declarative/mapviewer/content/dialogs/Message.qml
+++ b/examples/declarative/mapviewer/content/dialogs/Message.qml
@@ -59,7 +59,7 @@ Item {
Rectangle {
id: dialogRectangle
- color: "white"
+ color: "#ECECEC"
width: parent.width - gap;
height: titleBar.height + message.height + okButton.height + gap*3
anchors {
@@ -68,8 +68,6 @@ Item {
leftMargin: gap/2
}
- border.width: 1
- border.color: "dodgerblue"
radius: 5
TitleBar {
diff --git a/examples/declarative/mapviewer/content/map/MapComponent.qml b/examples/declarative/mapviewer/content/map/MapComponent.qml
index b2a090fa..b560c60b 100644
--- a/examples/declarative/mapviewer/content/map/MapComponent.qml
+++ b/examples/declarative/mapviewer/content/map/MapComponent.qml
@@ -487,7 +487,7 @@ Map {
id: infoRect
width: parent.width - catchImage.sourceSize.width
height: parent.height
- color: "white"
+ color: "#ECECEC"
opacity: 1
radius: 5
MouseArea {
diff --git a/examples/declarative/places/content/places/OptionsDialog.qml b/examples/declarative/places/content/places/OptionsDialog.qml
index a7078707..cc9d5c9c 100644
--- a/examples/declarative/places/content/places/OptionsDialog.qml
+++ b/examples/declarative/places/content/places/OptionsDialog.qml
@@ -71,8 +71,6 @@ Item {
leftMargin: gap/2
}
- border.width: 1
- border.color: "dodgerblue"
radius: 5
TitleBar {