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

[Arto Jalkanen]

Remove Bookmarks functionality (no time for it)

Remove Bookmarks functionality (no time for it)

[Arto Jalkanen (ajalkane)]

Agreed, unless someone else picks up development.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== removed file 'BookmarksPage.qml'
--- BookmarksPage.qml	2013-04-17 17:55:41 +0000
+++ BookmarksPage.qml	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Arto Jalkanen <[e-mail]>
- */
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-Page {
-    anchors.margins: units.gu(2)
-
-    Column {
-        anchors.centerIn: parent
-        Label {
-            id: label
-            objectName: "label"
-
-            text: i18n.tr("TODO: listing of bookmarks")
-        }
-    }
-}
 
=== modified file 'FolderListView.qml'
--- FolderListView.qml	2013-05-16 19:04:42 +0000
+++ FolderListView.qml	2013-05-27 16:09:45 +0000
@@ -91,11 +91,6 @@
         property var model
         actions: ActionList {
             Action {
-                text: i18n.tr("Add as bookmark")
-                // TODO
-                onTriggered: print(text)
-            }
-            Action {
                 text: i18n.tr("Show details")
                 onTriggered: {
                     print(text)
 
=== modified file 'ubuntu-filemanager-app.qml'
--- ubuntu-filemanager-app.qml	2013-04-17 17:55:41 +0000
+++ ubuntu-filemanager-app.qml	2013-05-27 16:09:45 +0000
@@ -46,15 +46,6 @@
             // Tab content begins here
             page: FolderListPage {
             }
-        }
-        
-        // Second tab begins here
-        Tab {
-            objectName: "bookmarksPage"
-            
-            title: i18n.tr("Bookmarks")
-            page: BookmarksPage {
-            }
-        }
+        }        
     }
 }