Merge lp:~osomon/unity-2d/dash-custom-home-screen into lp:unity-2d/3.0

[Olivier Tilloy]

[dash] Customizable dash home page.

Try to load a custom version of the shortcuts first, and fall back on the default version if a custom one doesn’t exist.
This will make customizations extremely easy as the custom shortcuts page can be shipped as part of another package.

[Florian Boucault (fboucault)]

Works as advertised, nice!
Code makes sense.

review: Approve

=== modified file 'places/Home.qml'
--- places/Home.qml	2011-04-04 09:16:17 +0000
+++ places/Home.qml	2011-04-06 15:51:54 +0000
@@ -180,59 +180,17 @@
             onClicked: shortcutsActive = false
         }
 
-        Flow {
-            anchors.fill: parent
-            anchors.topMargin: 26
-            anchors.bottomMargin: 35
-            anchors.leftMargin: 32
-            anchors.rightMargin: 32
-            spacing: 61
-
-            /* FIXME: dummy icons need to be replaced by design's */
-            HomeButton {
-                label: u2d.tr("Media Apps")
-                icon: "artwork/find_media_apps.png"
-                onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 9)
-            }
-
-            HomeButton {
-                label: u2d.tr("Internet Apps")
-                icon: "artwork/find_internet_apps.png"
-                onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 8)
-            }
-
-            HomeButton {
-                label: u2d.tr("More Apps")
-                icon: "artwork/find_more_apps.png"
-                onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 0)
-            }
-
-            HomeButton {
-                label: u2d.tr("Find Files")
-                icon: "artwork/find_files.png"
-                onClicked: activatePlaceEntry("/usr/share/unity/places/files.place", "Files", 0)
-            }
-
-            /* FIXME: use user's preferred applications instead of hardcoding them */
-            HomeButtonApplication {
-                label: u2d.tr("Browse the Web")
-                key: "/desktop/gnome/applications/browser/exec"
-            }
-
-            HomeButtonApplication {
-                label: u2d.tr("View Photos")
-                desktopFile: "shotwell.desktop"
-            }
-
-            HomeButtonApplication {
-                label: u2d.tr("Check Email")
-                key: "/desktop/gnome/url-handlers/mailto/command"
-            }
-
-            HomeButtonApplication {
-                label: u2d.tr("Listen to Music")
-                key: "/desktop/gnome/applications/media/exec"
-            }
+        /* Try to load a custom version of the shortcuts first, and fall back
+           on the default version if a custom one doesn’t exist. */
+        Loader {
+            id: customShortcutsLoader
+            anchors.fill: parent
+            source: "HomeShortcutsCustomized.qml"
+        }
+        Loader {
+            id: defaultShortcutsLoader
+            anchors.fill: parent
+            source: (customShortcutsLoader.status == Loader.Error) ? "HomeShortcuts.qml" : ""
         }
     }
 }

=== added file 'places/HomeShortcuts.qml'
--- places/HomeShortcuts.qml	1970-01-01 00:00:00 +0000
+++ places/HomeShortcuts.qml	2011-04-06 15:51:54 +0000
@@ -0,0 +1,76 @@
+/*
+ * 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 Qt 4.7
+import UnityApplications 1.0 /* Necessary for the ImageProvider serving image://icons/theme_name/icon_name */
+
+Flow {
+    anchors.fill: parent
+    anchors.topMargin: 26
+    anchors.bottomMargin: 35
+    anchors.leftMargin: 32
+    anchors.rightMargin: 32
+    spacing: 61
+
+    /* FIXME: dummy icons need to be replaced by design's */
+    HomeButton {
+        label: u2d.tr("Media Apps")
+        icon: "artwork/find_media_apps.png"
+        onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 9)
+    }
+
+    HomeButton {
+        label: u2d.tr("Internet Apps")
+        icon: "artwork/find_internet_apps.png"
+        onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 8)
+    }
+
+    HomeButton {
+        label: u2d.tr("More Apps")
+        icon: "artwork/find_more_apps.png"
+        onClicked: activatePlaceEntry("/usr/share/unity/places/applications.place", "Files", 0)
+    }
+
+    HomeButton {
+        label: u2d.tr("Find Files")
+        icon: "artwork/find_files.png"
+        onClicked: activatePlaceEntry("/usr/share/unity/places/files.place", "Files", 0)
+    }
+
+    /* FIXME: use user's preferred applications instead of hardcoding them */
+    HomeButtonApplication {
+        label: u2d.tr("Browse the Web")
+        key: "/desktop/gnome/applications/browser/exec"
+    }
+
+    HomeButtonApplication {
+        label: u2d.tr("View Photos")
+        desktopFile: "shotwell.desktop"
+    }
+
+    HomeButtonApplication {
+        label: u2d.tr("Check Email")
+        key: "/desktop/gnome/url-handlers/mailto/command"
+    }
+
+    HomeButtonApplication {
+        label: u2d.tr("Listen to Music")
+        key: "/desktop/gnome/applications/media/exec"
+    }
+}
+