Merge lp:~ajalkane/ubuntu-filemanager-app/remove-bookmark-functionality into lp:ubuntu-filemanager-app

Proposed by Arto Jalkanen
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 33
Merged at revision: 33
Proposed branch: lp:~ajalkane/ubuntu-filemanager-app/remove-bookmark-functionality
Merge into: lp:ubuntu-filemanager-app
Diff against target: 74 lines (+1/-48)
3 files modified
BookmarksPage.qml (+0/-33)
FolderListView.qml (+0/-5)
ubuntu-filemanager-app.qml (+1/-10)
To merge this branch: bzr merge lp:~ajalkane/ubuntu-filemanager-app/remove-bookmark-functionality
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+165912@code.launchpad.net

Commit message

Remove Bookmarks functionality (no time for it)

Description of the change

Remove Bookmarks functionality (no time for it)

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

Agreed, unless someone else picks up development.

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=== removed file 'BookmarksPage.qml'
2--- BookmarksPage.qml 2013-04-17 17:55:41 +0000
3+++ BookmarksPage.qml 1970-01-01 00:00:00 +0000
4@@ -1,33 +0,0 @@
5-/*
6- * Copyright (C) 2013 Canonical Ltd
7- *
8- * This program is free software: you can redistribute it and/or modify
9- * it under the terms of the GNU General Public License version 3 as
10- * published by the Free Software Foundation.
11- *
12- * This program is distributed in the hope that it will be useful,
13- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15- * GNU General Public License for more details.
16- *
17- * You should have received a copy of the GNU General Public License
18- * along with this program. If not, see <http://www.gnu.org/licenses/>.
19- *
20- * Authored by: Arto Jalkanen <ajalkane@gmail.com>
21- */
22-import QtQuick 2.0
23-import Ubuntu.Components 0.1
24-
25-Page {
26- anchors.margins: units.gu(2)
27-
28- Column {
29- anchors.centerIn: parent
30- Label {
31- id: label
32- objectName: "label"
33-
34- text: i18n.tr("TODO: listing of bookmarks")
35- }
36- }
37-}
38
39=== modified file 'FolderListView.qml'
40--- FolderListView.qml 2013-05-16 19:04:42 +0000
41+++ FolderListView.qml 2013-05-27 16:09:45 +0000
42@@ -91,11 +91,6 @@
43 property var model
44 actions: ActionList {
45 Action {
46- text: i18n.tr("Add as bookmark")
47- // TODO
48- onTriggered: print(text)
49- }
50- Action {
51 text: i18n.tr("Show details")
52 onTriggered: {
53 print(text)
54
55=== modified file 'ubuntu-filemanager-app.qml'
56--- ubuntu-filemanager-app.qml 2013-04-17 17:55:41 +0000
57+++ ubuntu-filemanager-app.qml 2013-05-27 16:09:45 +0000
58@@ -46,15 +46,6 @@
59 // Tab content begins here
60 page: FolderListPage {
61 }
62- }
63-
64- // Second tab begins here
65- Tab {
66- objectName: "bookmarksPage"
67-
68- title: i18n.tr("Bookmarks")
69- page: BookmarksPage {
70- }
71- }
72+ }
73 }
74 }

Subscribers

People subscribed via source and target branches