summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-10-16 07:18:53 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-10-16 07:18:53 (GMT)
commit80c1dbf6799be4d62b399fb8e1e15052069adc81 (patch)
treeef0599a1d017bcc3b538be4e49e4791422b79cb2 /examples/declarative
parent5094685a683ca81d7d0f4325e8a27f7d5a48439d (diff)
downloadQt-80c1dbf6799be4d62b399fb8e1e15052069adc81.zip
Qt-80c1dbf6799be4d62b399fb8e1e15052069adc81.tar.gz
Qt-80c1dbf6799be4d62b399fb8e1e15052069adc81.tar.bz2
More loader improvement
Diffstat (limited to 'examples/declarative')
-rw-r--r--examples/declarative/loader/Browser.qml14
-rw-r--r--examples/declarative/loader/images/titlebar.pngbin0 -> 1436 bytes
-rw-r--r--examples/declarative/loader/images/titlebar.sci5
-rw-r--r--examples/declarative/loader/loader.qrc2
4 files changed, 14 insertions, 7 deletions
diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index 464c994..15e7b12 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -111,7 +111,6 @@ Rectangle {
model: folders1
delegate: folderDelegate
highlight: Rectangle { color: palette.highlight; visible: root.keyPressed }
- clip: true
focus: true
pressDelay: 100
state: current
@@ -149,10 +148,10 @@ Rectangle {
anchors.bottom: parent.bottom
x: parent.right
width: parent.width
+// state: "exitRight"
model: folders2
delegate: folderDelegate
highlight: Rectangle { color: palette.highlight; visible: root.keyPressed }
- clip: true
focus: true
pressDelay: 100
states: [
@@ -191,11 +190,12 @@ Rectangle {
}
Keys.onLeftPressed: up()
- Rectangle {
- id: titleBar
- width: parent.width
+ BorderImage {
+ source: "images/titlebar.sci";
+ width: parent.width;
height: 48
- color: palette.lighter(palette.window); border.color: palette.mid
+ y: -7
+ id: titleBar
Rectangle {
id: upButton
@@ -219,7 +219,7 @@ Rectangle {
Text {
anchors.left: upButton.right; anchors.right: parent.right; height: parent.height
anchors.leftMargin: 4; anchors.rightMargin: 4
- text: folders.folder; color: palette.text
+ text: folders.folder; color: "white"
elide: "ElideLeft"; horizontalAlignment: "AlignRight"; verticalAlignment: "AlignVCenter"
font.pixelSize: 32
}
diff --git a/examples/declarative/loader/images/titlebar.png b/examples/declarative/loader/images/titlebar.png
new file mode 100644
index 0000000..51c9008
--- /dev/null
+++ b/examples/declarative/loader/images/titlebar.png
Binary files differ
diff --git a/examples/declarative/loader/images/titlebar.sci b/examples/declarative/loader/images/titlebar.sci
new file mode 100644
index 0000000..0418d94
--- /dev/null
+++ b/examples/declarative/loader/images/titlebar.sci
@@ -0,0 +1,5 @@
+border.left: 10
+border.top: 12
+border.bottom: 12
+border.right: 10
+source: titlebar.png
diff --git a/examples/declarative/loader/loader.qrc b/examples/declarative/loader/loader.qrc
index 671940f..94d7b92 100644
--- a/examples/declarative/loader/loader.qrc
+++ b/examples/declarative/loader/loader.qrc
@@ -5,5 +5,7 @@
<file>images/up.png</file>
<file>Button.qml</file>
<file>images/folder.png</file>
+ <file>images/titlebar.sci</file>
+ <file>images/titlebar.png</file>
</qresource>
</RCC>