Merge lp:~gerboland/unity-2d/unity-core5-change-fix into lp:unity-2d

[Gerry Boland]

[core] Update compatibility with UnityCore5 API.

Changes
- *SearchFinished signals passing Lens::Hints
- Lens active property changed to a ViewType enum of HIDDEN, HOME_VIEW, LENS_VIEW

As Home lens is a QML file, we only need only use HIDDEN/LENS_VIEW.

[Michal Hruby (mhr3)]

1) Please don't ignore setting HOME_VIEW on lenses, they might not update properly if it's not set. (setting it on all lenses is fine as well).

2) It would also be nice to make sure the viewtype is set to HIDDEN when the dash is closed (optional as this point though).

3) The plain dbus call probably shouldn't be there :)

review: Needs Fixing

[lp:~gerboland/unity-2d/unity-core5-change-fix]

829. By Gerry Boland on 2011-12-14

placeentry deprecated, jumk removed

[Mikkel Kamstrup Erlandsen (kamstrup)]

We could land this in order to unbreak trunk; as it'll work in most cases - under the promise that we have a quick follow up that gets things proper?

[Gerry Boland (gerboland)]

I've no objection to that idea. I will continue to work on this to satisfy Michal's objections.

[Michal Hruby (mhr3)]

The merger is still not working, so there's no hurry...

[Mikkel Kamstrup Erlandsen (kamstrup)]

On 14 December 2011 14:52, Michal Hruby <email address hidden> wrote:
> The merger is still not working, so there's no hurry...

Is too! :-)

Unmerged revisions

829. By Gerry Boland on 2011-12-14

placeentry deprecated, jumk removed

828. By Gerry Boland on 2011-12-14

Add comment to explain use of HIDDEN and LENS_VIEW only

827. By Gerry Boland on 2011-12-14

Active property changed to a ViewType enum. In U2D the home lens is a QML file, so we only need to set Lens with either the HIDDEN or LENS_VIEW view type.

826. By Gerry Boland on 2011-12-13

*SearchFinished signals passing Lens::Hints

=== modified file 'libunity-2d-private/src/lens.cpp'
--- libunity-2d-private/src/lens.cpp	2011-09-12 13:29:41 +0000
+++ libunity-2d-private/src/lens.cpp	2011-12-14 12:09:25 +0000
@@ -109,7 +109,7 @@
 
 bool Lens::active() const
 {
-    return m_unityLens->active();
+    return m_unityLens->view_type() != unity::dash::HIDDEN;
 }
 
 Filters* Lens::filters() const
@@ -129,7 +129,11 @@
 
 void Lens::setActive(bool active)
 {
-    m_unityLens->active = active;
+    /* Note that in Unity-Core5, view_type is an enum of HIDDEN, HOME_VIEW and LENS_VIEW
+       As home lens managed very differently in Unity2D, we simply maintain an active property
+       for all lenses by just using HIDDEN and LENS_VIEW.
+    */
+    m_unityLens->view_type = active ? unity::dash::LENS_VIEW : unity::dash::HIDDEN;
 }
 
 void Lens::setSearchQuery(const QString& search_query)
@@ -246,7 +250,7 @@
     m_unityLens->global_results()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onGlobalResultsSwarmNameChanged));
     m_unityLens->categories.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesChanged));
     m_unityLens->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Lens::onCategoriesSwarmNameChanged));
-    m_unityLens->active.changed.connect(sigc::mem_fun(this, &Lens::activeChanged));
+    m_unityLens->view_type.changed.connect(sigc::mem_fun(this, &Lens::onViewTypeChanged));
 
     /* Signals forwarding */
     m_unityLens->search_finished.connect(sigc::mem_fun(this, &Lens::searchFinished));
@@ -305,4 +309,9 @@
     m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
 }
 
+void Lens::onViewTypeChanged(unity::dash::ViewType viewType)
+{
+    Q_EMIT activeChanged( viewType != unity::dash::HIDDEN );
+}
+
 #include "lens.moc"

=== modified file 'libunity-2d-private/src/lens.h'
--- libunity-2d-private/src/lens.h	2011-09-12 13:29:41 +0000
+++ libunity-2d-private/src/lens.h	2011-12-14 12:09:25 +0000
@@ -107,8 +107,8 @@
     void categoriesChanged();
     void activeChanged(bool);
     void filtersChanged();
-    void searchFinished(std::string const&);
-    void globalSearchFinished(std::string const&);
+    void searchFinished(unity::dash::Lens::Hints const&);
+    void globalSearchFinished(unity::dash::Lens::Hints const&);
     void searchQueryChanged();
     void globalSearchQueryChanged();
 
@@ -122,6 +122,7 @@
     void onGlobalResultsChanged(unity::dash::Results::Ptr);
     void onCategoriesSwarmNameChanged(std::string);
     void onCategoriesChanged(unity::dash::Categories::Ptr);
+    void onViewTypeChanged(unity::dash::ViewType);
 
     void onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&);
     void fallbackActivate(const QString& uri);