diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-10-08 07:21:51 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-10-08 07:21:51 (GMT) |
| commit | 904b56a9cc810b340d1b7db81199fc0e15b4aab6 (patch) | |
| tree | 5792edd70546f6500210164327d0014f147d1ffe /demos/declarative/flickr/mobile/ToolBar.qml | |
| parent | 91396846206e6b41d32fa8a30888261581bd28dc (diff) | |
| parent | 8130fcbffe365c0e019f45baae7f1b273d8e17e7 (diff) | |
| download | Qt-904b56a9cc810b340d1b7db81199fc0e15b4aab6.zip Qt-904b56a9cc810b340d1b7db81199fc0e15b4aab6.tar.gz Qt-904b56a9cc810b340d1b7db81199fc0e15b4aab6.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'demos/declarative/flickr/mobile/ToolBar.qml')
| -rw-r--r-- | demos/declarative/flickr/mobile/ToolBar.qml | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/demos/declarative/flickr/mobile/ToolBar.qml b/demos/declarative/flickr/mobile/ToolBar.qml index 55f19d2..d8abb14 100644 --- a/demos/declarative/flickr/mobile/ToolBar.qml +++ b/demos/declarative/flickr/mobile/ToolBar.qml @@ -46,20 +46,24 @@ Item { property alias button1Label: button1.text property alias button2Label: button2.text + property alias button2Visible: button2.visible + signal button1Clicked signal button2Clicked BorderImage { source: "images/titlebar.sci"; width: parent.width; height: parent.height + 14; y: -7 } - Button { - id: button1 - anchors.left: parent.left; anchors.leftMargin: 5; y: 3; width: 140; height: 32 - onClicked: toolbar.button1Clicked() - } + Row { + anchors.right: parent.right; anchors.rightMargin: 5; y: 3; height: 32; spacing: 30 + Button { + id: button1 + width: 140; height: 32 + onClicked: toolbar.button1Clicked() + } - Button { - id: button2 - anchors.right: parent.right; anchors.rightMargin: 5; y: 3; width: 140; height: 32 - onClicked: toolbar.button2Clicked() + Button { + id: button2; width: 140; height: 32 + onClicked: toolbar.button2Clicked() + } } } |