Merge lp:~ajalkane/ubuntu-filemanager-app/fileopendialog into lp:ubuntu-filemanager-app

Proposed by Arto Jalkanen
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 13
Merged at revision: 12
Proposed branch: lp:~ajalkane/ubuntu-filemanager-app/fileopendialog
Merge into: lp:ubuntu-filemanager-app
Diff against target: 51 lines (+34/-0)
2 files modified
FileActionDialog.qml (+27/-0)
FolderListView.qml (+7/-0)
To merge this branch: bzr merge lp:~ajalkane/ubuntu-filemanager-app/fileopendialog
Reviewer Review Type Date Requested Status
Arto Jalkanen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+153936@code.launchpad.net

Commit message

Added file opening dialog

Description of the change

Added file opening dialog

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

If it's fine by Jenkins, it's fine by me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'FileActionDialog.qml'
--- FileActionDialog.qml 1970-01-01 00:00:00 +0000
+++ FileActionDialog.qml 2013-03-18 21:26:20 +0000
@@ -0,0 +1,27 @@
1import QtQuick 2.0
2import Ubuntu.Components 0.1
3import Ubuntu.Components.Popups 0.1
4
5Dialog {
6 id: root
7
8 property string fileName
9 property string filePath
10
11 title: i18n.tr("Choose action")
12 text: i18n.tr("For file: ") + fileName
13
14 Button {
15 text: i18n.tr("Open")
16 onClicked: {
17 console.log("Opening file", filePath)
18 Qt.openUrlExternally("file://" + filePath)
19 onClicked: PopupUtils.close(root)
20 }
21 }
22
23 Button {
24 text: i18n.tr("Cancel")
25 onClicked: PopupUtils.close(root)
26 }
27}
028
=== modified file 'FolderListView.qml'
--- FolderListView.qml 2013-03-13 21:13:08 +0000
+++ FolderListView.qml 2013-03-18 21:26:20 +0000
@@ -75,8 +75,15 @@
75 }75 }
76 } else {76 } else {
77 console.log("Non dir clicked")77 console.log("Non dir clicked")
78 PopupUtils.open(Qt.resolvedUrl("FileActionDialog.qml"), delegate,
79 {
80 fileName: model.fileName,
81 filePath: model.filePath
82
83 })
78 }84 }
79 }85 }
86
80 onPressAndHold: {87 onPressAndHold: {
81 console.log("FolderListDelegate onPressAndHold")88 console.log("FolderListDelegate onPressAndHold")
82 actionSelectionPopover.caller = delegate89 actionSelectionPopover.caller = delegate

Subscribers

People subscribed via source and target branches