Merge lp:~ajalkane/ubuntu-filemanager-app/placeholder-icons-for-clickandhold into lp:ubuntu-filemanager-app

Proposed by Arto Jalkanen
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 32
Merged at revision: 31
Proposed branch: lp:~ajalkane/ubuntu-filemanager-app/placeholder-icons-for-clickandhold
Merge into: lp:ubuntu-filemanager-app
Diff against target: 40 lines (+9/-0)
1 file modified
FolderListView.qml (+9/-0)
To merge this branch: bzr merge lp:~ajalkane/ubuntu-filemanager-app/placeholder-icons-for-clickandhold
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+164249@code.launchpad.net

Commit message

Placeholders for popup items (though current SDK does not seem to support them)

Description of the change

Placeholders for popup items (though current SDK does not seem to support them)

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

Aye

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 'FolderListView.qml'
2--- FolderListView.qml 2013-05-16 16:14:35 +0000
3+++ FolderListView.qml 2013-05-16 19:07:34 +0000
4@@ -108,6 +108,9 @@
5 }
6 Action {
7 text: i18n.tr("Copy")
8+ // TODO: temporary.
9+ iconSource: "/usr/share/icons/Humanity/actions/48/edit-copy.svg"
10+
11 onTriggered: {
12 console.log("Copy on row called for", actionSelectionPopover.model.fileName, actionSelectionPopover.model.index)
13 model.copyIndex(actionSelectionPopover.model.index)
14@@ -116,6 +119,8 @@
15 }
16 Action {
17 text: i18n.tr("Cut")
18+ // TODO: temporary
19+ iconSource: "/usr/share/icons/Humanity/actions/48/edit-cut.svg"
20 onTriggered: {
21 console.log("Cut on row called for", actionSelectionPopover.model.fileName, actionSelectionPopover.model.index)
22 model.cutIndex(actionSelectionPopover.model.index)
23@@ -124,6 +129,8 @@
24 }
25 Action {
26 text: i18n.tr("Delete")
27+ // TODO: temporary
28+ iconSource: "/usr/share/icons/Humanity/actions/48/edit-delete.svg"
29 onTriggered: {
30 print(text)
31 PopupUtils.open(confirmSingleDeleteDialog, actionSelectionPopover.caller,
32@@ -134,6 +141,8 @@
33 }
34 Action {
35 text: i18n.tr("Rename")
36+ // TODO: temporary
37+ iconSource: "/usr/share/icons/Humanity/actions/48/rotate.svg"
38 onTriggered: {
39 print(text)
40 PopupUtils.open(confirmRenameDialog, actionSelectionPopover.caller,

Subscribers

People subscribed via source and target branches