Merge lp:~fitojb/unity-2d/kill-unused-assets into lp:unity-2d

[Adolfo Jayme Barrientos]

[dash] Remove HomeShortcuts.qml and related assets

HomeShortcuts.qml is now unnecessary. As a result we can make Precise ISOs leaner by removing the unused asset files.

[Gerry Boland (gerboland)]

Thanks for this, however these assets are still referred to by HomeShortcuts.qml. It is best to remove HomeShortcuts.qml and the assets all in one go. I have Tiago Herrmann doing it now. Watch this space!

[Adolfo Jayme Barrientos (fitojb)]

OK, I've now merged Tiago's branch, thank you for your help!

[Gerry Boland (gerboland)]

Great, thanks to you and Tiago! Approving

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/168/console reported an error when processing this lp:~fitoschido/unity-2d/kill-unused-assets branch.
Not merging it.

=== modified file 'shell/dash/Home.qml'
--- shell/dash/Home.qml	2012-02-01 23:52:38 +0000
+++ shell/dash/Home.qml	2012-03-05 20:07:22 +0000
@@ -187,11 +187,5 @@
             anchors.fill: parent
             source: "HomeShortcutsCustomized.qml"
         }
-        Loader {
-            id: defaultShortcutsLoader
-            focus: !customShortcutsLoader.focus
-            anchors.fill: parent
-            source: (customShortcutsLoader.status == Loader.Error) ? "HomeShortcuts.qml" : ""
-        }
     }
 }

=== removed file 'shell/dash/HomeShortcuts.qml'
--- shell/dash/HomeShortcuts.qml	2012-02-08 12:18:08 +0000
+++ shell/dash/HomeShortcuts.qml	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-/*
- * This file is part of unity-2d
- *
- * Copyright 2010-2011 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * 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/>.
- */
-
-import QtQuick 1.0
-import Unity2d 1.0
-
-Item {
-    anchors.fill: parent
-    anchors.topMargin: 21
-    anchors.bottomMargin: 35
-    anchors.leftMargin: 46
-    anchors.rightMargin: 32
-
-    Grid {
-        id: buttons
-
-        // FIXME Need this invisible Rectangle so that alignment in RTL is not broken and tests pass.
-        //       Gerry says the Home lens is going away so we do not care about a better fix
-        //       Don't ask me why the transparent Rectangle fixes the alignment though
-        Rectangle {
-            anchors.fill: parent
-            opacity: 0
-        }
-
-        anchors.fill: parent
-        spacing: 51
-        columns: 4
-        rows: 2
-
-        HomeButton {
-            focus: true
-            label: u2d.tr("Media Apps")
-            icon: "artwork/find_media_apps.png"
-            onClicked: activateLensWithOptionFilter("applications.lens", "type", "media")
-        }
-
-        HomeButton {
-            label: u2d.tr("Internet Apps")
-            icon: "artwork/find_internet_apps.png"
-            onClicked: activateLensWithOptionFilter("applications.lens", "type", "internet")
-        }
-
-        HomeButton {
-            label: u2d.tr("More Apps")
-            icon: "artwork/find_more_apps.png"
-            onClicked: activateLensAndClearFilter("applications.lens", "type")
-        }
-
-        HomeButton {
-            label: u2d.tr("Find Files")
-            icon: "artwork/find_files.png"
-            onClicked: activateLens("files.lens")
-        }
-
-        /* FIXME: use user's preferred applications instead of hardcoding them */
-        HomeButtonDefaultApplication {
-            label: u2d.tr("Browse the Web")
-            contentType: "x-scheme-handler/http"
-        }
-
-        HomeButtonDefaultApplication {
-            label: u2d.tr("View Photos")
-            contentType: "image/jpeg"
-            desktopFile: "shotwell-viewer.desktop"
-        }
-
-        HomeButtonDefaultApplication {
-            label: u2d.tr("Check Email")
-            contentType: "x-scheme-handler/mailto"
-        }
-
-        HomeButtonDefaultApplication {
-            label: u2d.tr("Listen to Music")
-            contentType: "audio/x-vorbis+ogg"
-        }
-    }
-
-    FocusPath {
-        item: buttons
-        columns: buttons.columns
-    }
-}

=== removed file 'shell/dash/artwork/find_files.png'
Binary files shell/dash/artwork/find_files.png	2011-11-09 12:47:37 +0000 and shell/dash/artwork/find_files.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'shell/dash/artwork/find_internet_apps.png'
Binary files shell/dash/artwork/find_internet_apps.png	2011-11-09 12:47:37 +0000 and shell/dash/artwork/find_internet_apps.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'shell/dash/artwork/find_media_apps.png'
Binary files shell/dash/artwork/find_media_apps.png	2011-11-09 12:47:37 +0000 and shell/dash/artwork/find_media_apps.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'shell/dash/artwork/find_more_apps.png'
Binary files shell/dash/artwork/find_more_apps.png	2011-11-09 12:47:37 +0000 and shell/dash/artwork/find_more_apps.png	1970-01-01 00:00:00 +0000 differ