Merge lp:~ajalkane/ubuntu-filemanager-app/copy-paste into lp:ubuntu-filemanager-app

Proposed by Arto Jalkanen
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 23
Merged at revision: 23
Proposed branch: lp:~ajalkane/ubuntu-filemanager-app/copy-paste
Merge into: lp:ubuntu-filemanager-app
Diff against target: 37 lines (+16/-0)
2 files modified
FolderListPage.qml (+8/-0)
FolderListView.qml (+8/-0)
To merge this branch: bzr merge lp:~ajalkane/ubuntu-filemanager-app/copy-paste
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+160560@code.launchpad.net

Commit message

Copy-paste of single item

Description of the change

Copy-paste of single item

To post a comment you must log in.
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Approved

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FolderListPage.qml'
2--- FolderListPage.qml 2013-04-17 17:55:41 +0000
3+++ FolderListPage.qml 2013-04-24 08:21:26 +0000
4@@ -58,6 +58,14 @@
5 }
6 visible: pageModel.path != "/"
7 }
8+ Action {
9+ text: i18n.tr("Paste" + " (" + pageModel.clipboardUrlsCounter + ")")
10+ onTriggered: {
11+ console.log("Pasting to current folder items of count " + pageModel.clipboardUrlsCounter)
12+ pageModel.paste()
13+ }
14+ visible: pageModel.clipboardUrlsCounter > 0
15+ }
16
17 // IMPROVE: would rather have this as more hidden, in a separate menu that has
18 // file manipulation operations
19
20=== modified file 'FolderListView.qml'
21--- FolderListView.qml 2013-04-17 17:55:41 +0000
22+++ FolderListView.qml 2013-04-24 08:21:26 +0000
23@@ -107,6 +107,14 @@
24 }
25 }
26 Action {
27+ text: i18n.tr("Copy")
28+ onTriggered: {
29+ console.log("Copy on row called for", actionSelectionPopover.model.fileName, actionSelectionPopover.model.index)
30+ model.copyIndex(actionSelectionPopover.model.index)
31+ console.log("CliboardUrlsCounter after copy", folderListModel.clipboardUrlsCounter)
32+ }
33+ }
34+ Action {
35 text: i18n.tr("Delete")
36 onTriggered: {
37 print(text)

Subscribers

People subscribed via source and target branches