diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-12-01 01:18:47 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-12-01 01:18:47 (GMT) |
| commit | e39c34683e821affdabb2f6fab922cb94b00043b (patch) | |
| tree | 16d14ec4fa436f5df96c52268846b7b02e88bdf1 | |
| parent | 913dd563064e8047fe738fc9c79135adfb928977 (diff) | |
| parent | d83baff44e5f8992509ffde4a7df90bd3c87ff8f (diff) | |
| download | Qt-e39c34683e821affdabb2f6fab922cb94b00043b.zip Qt-e39c34683e821affdabb2f6fab922cb94b00043b.tar.gz Qt-e39c34683e821affdabb2f6fab922cb94b00043b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | examples/declarative/loader/Browser.diff | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/examples/declarative/loader/Browser.diff b/examples/declarative/loader/Browser.diff deleted file mode 100644 index adc0f60..0000000 --- a/examples/declarative/loader/Browser.diff +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml -index 96c2a76..00e1bb6 100644 ---- a/examples/declarative/loader/Browser.qml -+++ b/examples/declarative/loader/Browser.qml -@@ -17,9 +17,16 @@ Rect { - id: FolderDelegate - Rect { - id: Wrapper -+ function launch() { -+ if (folders.isFolder(index)) { -+ folders.folder = filePath; -+ } else { -+ qmlLauncher.launch(filePath); -+ } -+ } - width: Root.width - height: 32 -- color: activePalette.base -+ color: "transparent" - Rect { - id: Highlight; visible: false - anchors.fill: parent -@@ -42,13 +49,7 @@ Rect { - MouseRegion { - id: Mouse - anchors.fill: parent -- onClicked: { -- if (folders.isFolder(index)) { -- folders.folder = filePath; -- } else { -- qmlLauncher.launch(filePath); -- } -- } -+ onClicked: { launch() } - } - states: [ - State { -@@ -69,13 +70,22 @@ Rect { - } - - ListView { -+ id: View - anchors.top: TitleBar.bottom - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - model: folders - delegate: FolderDelegate -+ highlight: Rect { color: "#FFFBAF" } - clip: true -+ focus: true -+ onKeyPress: { -+ if (event.key == Qt.Key_Return || event.key == Qt.Key_Select) { -+ View.current.launch(); -+ event.accepted = true; -+ } -+ } - } - - Rect { |