Merge lp:~fboucault/unity-2d/dash_home_shortcuts_filter into lp:unity-2d

[Florian Boucault]

[dash] Home buttons 'Media' and 'Internet' apps now also activate the right filter and open up the 'Filter results' pane.

=== modified file 'libunity-2d-private/src/filters.cpp'
--- libunity-2d-private/src/filters.cpp	2011-08-24 08:36:07 +0000
+++ libunity-2d-private/src/filters.cpp	2011-08-31 10:59:42 +0000
@@ -76,6 +76,16 @@
     }
 }
 
+Filter* Filters::getFilter(const QString& id) const
+{
+    Q_FOREACH (Filter* filter, m_filters) {
+        if (filter->id() == id) {
+            return filter;
+        }
+    }
+    return NULL;
+}
+
 void Filters::onFilterAdded(unity::dash::Filter::Ptr unityFilter)
 {
     if (unityFilter == NULL) {

=== modified file 'libunity-2d-private/src/filters.h'
--- libunity-2d-private/src/filters.h	2011-08-19 17:12:24 +0000
+++ libunity-2d-private/src/filters.h	2011-08-31 10:59:42 +0000
@@ -48,6 +48,8 @@
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
     int rowCount(const QModelIndex& parent = QModelIndex()) const;
 
+    Q_INVOKABLE Filter* getFilter(const QString& id) const;
+
 private:
     unity::dash::Filters::Ptr m_unityFilters;
     QList<Filter*> m_filters;

=== modified file 'libunity-2d-private/src/listmodelwrapper.h'
--- libunity-2d-private/src/listmodelwrapper.h	2011-08-25 12:41:57 +0000
+++ libunity-2d-private/src/listmodelwrapper.h	2011-08-31 10:59:42 +0000
@@ -46,6 +46,8 @@
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
     int rowCount(const QModelIndex& parent = QModelIndex()) const;
 
+    const QList<WrapperItem*>& rawList() const;
+
 private:
     void onItemAdded(ItemClass item);
     void onItemRemoved(ItemClass item);
@@ -95,6 +97,12 @@
 }
 
 template <class WrapperItem, class ItemClass>
+const QList<WrapperItem*>& ListModelWrapper<WrapperItem, ItemClass>::rawList() const
+{
+    return m_list;
+}
+
+template <class WrapperItem, class ItemClass>
 QVariant ListModelWrapper<WrapperItem, ItemClass>::data(const QModelIndex& index, int role) const
 {
     if (!index.isValid()) {

=== modified file 'libunity-2d-private/src/radiooptionfilter.cpp'
--- libunity-2d-private/src/radiooptionfilter.cpp	2011-08-24 12:24:38 +0000
+++ libunity-2d-private/src/radiooptionfilter.cpp	2011-08-31 10:59:42 +0000
@@ -30,6 +30,16 @@
     return m_options;
 }
 
+FilterOption* RadioOptionFilter::getOption(const QString& id) const
+{
+    Q_FOREACH (FilterOption* option, m_options->rawList()) {
+        if (option->id() == id) {
+            return option;
+        }
+    }
+    return NULL;
+}
+
 void RadioOptionFilter::setUnityFilter(unity::dash::Filter::Ptr filter)
 {
     Filter::setUnityFilter(filter);

=== modified file 'libunity-2d-private/src/radiooptionfilter.h'
--- libunity-2d-private/src/radiooptionfilter.h	2011-08-24 12:36:27 +0000
+++ libunity-2d-private/src/radiooptionfilter.h	2011-08-31 10:59:42 +0000
@@ -43,6 +43,8 @@
     /* getters */
     FilterOptions* options() const;
 
+    Q_INVOKABLE FilterOption* getOption(const QString& id) const;
+
 Q_SIGNALS:
     void optionsChanged();
 

=== modified file 'places/HomeShortcuts.qml'
--- places/HomeShortcuts.qml	2011-08-11 16:12:07 +0000
+++ places/HomeShortcuts.qml	2011-08-31 10:59:42 +0000
@@ -55,23 +55,19 @@
         focus: true
         label: u2d.tr("Media Apps")
         icon: "artwork/find_media_apps.png"
-        /* FIXME: this should not only activate the applications lens but also
-                  activate the types filter. */
-        onClicked: activateLens("applications.lens")
+        onClicked: activateLensWithOptionFilter("applications.lens", "type", "media")
     }
 
     HomeButton {
         label: u2d.tr("Internet Apps")
         icon: "artwork/find_internet_apps.png"
-        /* FIXME: this should not only activate the applications lens but also
-                  activate the types filter. */
-        onClicked: activateLens("applications.lens")
+        onClicked: activateLensWithOptionFilter("applications.lens", "type", "internet")
     }
 
     HomeButton {
         label: u2d.tr("More Apps")
         icon: "artwork/find_more_apps.png"
-        onClicked: activateLens("applications.lens")
+        onClicked: activateLensAndClearFilter("applications.lens", "type")
     }
 
     HomeButton {

=== modified file 'places/dash.qml'
--- places/dash.qml	2011-08-23 22:16:05 +0000
+++ places/dash.qml	2011-08-31 10:59:42 +0000
@@ -104,6 +104,23 @@
         dashView.activeLens = ""
     }
 
+    function activateLensWithOptionFilter(lensId, filterId, optionId) {
+        var lens = lenses.get(lensId)
+        var filter = lens.filters.getFilter(filterId)
+        var option = filter.getOption(optionId)
+        filter.clear()
+        option.active = true
+        filterPane.folded = false
+        activateLens(lensId)
+    }
+
+    function activateLensAndClearFilter(lensId, filterId) {
+        var lens = lenses.get(lensId)
+        var filter = lens.filters.getFilter(filterId)
+        filter.clear()
+        activateLens(lensId)
+    }
+
     property variant lenses: Lenses {}
 
     Item {