fixed bunch of small bugs woo

(bzr r2419.6.13)

43 files changed, 240 insertions, 55 deletions

diff --git a/dash/DashController.cpp b/dash/DashController.cpp
index d03549b63..6e49b9f30 100644
--- a/dash/DashController.cpp
+++ b/dash/DashController.cpp
@@ -138,13 +138,6 @@ void Controller::RegisterUBusInterests()
 }
 });
 
- ubus_manager_.RegisterInterest(UBUS_DASH_SPLIT_COORD_CHANGED, [&] (GVariant *data) 
- {
- SplitPosition position_type;
- int position = -1;
- g_variant_get(data, "(ii)", &position_type, &position);
- preview_state_machine_.SetSplitPosition(position_type, position);
- });
 }
 
 void Controller::EnsureDash()
diff --git a/dash/DashController.h b/dash/DashController.h
index ad6a456f2..df41ad1d3 100644
--- a/dash/DashController.h
+++ b/dash/DashController.h
@@ -33,7 +33,6 @@
 #include "unity-shared/Animator.h"
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/UBusWrapper.h"
-#include "PreviewStateMachine.h"
 
 namespace unity
 {
@@ -100,7 +99,6 @@ private:
 glib::TimeoutSeconds ensure_timeout_;
 Animator timeline_animator_;
 UBusManager ubus_manager_;
- PreviewStateMachine preview_state_machine_;
 };
 
 
diff --git a/dash/DashView.cpp b/dash/DashView.cpp
index 289d26291..a9d6c4bf8 100644
--- a/dash/DashView.cpp
+++ b/dash/DashView.cpp
@@ -80,6 +80,8 @@ NUX_IMPLEMENT_OBJECT_TYPE(DashView);
 DashView::DashView()
 : nux::View(NUX_TRACKER_LOCATION)
 , home_lens_(new HomeLens(_("Home"), _("Home screen"), _("Search")))
+ , preview_container_(nullptr)
+ , preview_displaying_(false)
 , active_lens_view_(0)
 , last_activated_uri_("")
 , search_in_progress_(false)
@@ -97,7 +99,7 @@ DashView::DashView()
 Settings::Instance().changed.connect(sigc::mem_fun(this, &DashView::Relayout));
 lenses_.lens_added.connect(sigc::mem_fun(this, &DashView::OnLensAdded));
 mouse_down.connect(sigc::mem_fun(this, &DashView::OnMouseButtonDown));
-
+ preview_state_machine_.PreviewActivated.connect(sigc::mem_fun(this, &DashView::BuildPreview));
 Relayout();
 
 home_lens_->AddLenses(lenses_);
@@ -240,6 +242,17 @@ void DashView::SetupUBusConnections()
 {
 ubus_manager_.RegisterInterest(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
 sigc::mem_fun(this, &DashView::OnActivateRequest));
+
+ ubus_manager_.RegisterInterest(UBUS_DASH_PREVIEW_INFO_PAYLOAD, [&] (GVariant *data) 
+ {
+ int position = -1;
+ int results_to_the_left = 0;
+ int results_to_the_right = 0;
+ g_variant_get(data, "(iii)", &position, &results_to_the_left, &results_to_the_right);
+ preview_state_machine_.SetSplitPosition(SplitPosition::CONTENT_AREA, position);
+ preview_state_machine_.left_results = results_to_the_left;
+ preview_state_machine_.right_results = results_to_the_right;
+ });
 }
 
 long DashView::PostLayoutManagement (long LayoutResult)
@@ -324,15 +337,19 @@ void DashView::DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw)
 renderer_.DrawInner(gfx_context, content_geo_, GetAbsoluteGeometry(), GetGeometry());
 
 if (IsFullRedraw())
- {
 nux::GetPainter().PushBackgroundStack();
- layout_->ProcessDraw(gfx_context, force_draw);
- nux::GetPainter().PopBackgroundStack();
+ 
+ if (preview_displaying_ && preview_container_)
+ {
+ preview_container_->ProcessDraw(gfx_context, force_draw);
 }
 else
 {
 layout_->ProcessDraw(gfx_context, force_draw);
 }
+ 
+ if (IsFullRedraw())
+ nux::GetPainter().PopBackgroundStack();
 
 renderer_.DrawInnerCleanup(gfx_context, content_geo_, GetAbsoluteGeometry(), GetGeometry());
 }
@@ -469,6 +486,11 @@ void DashView::OnLensAdded(Lens::Ptr& lens)
 AddChild(view);
 view->SetVisible(false);
 view->uri_activated.connect(sigc::mem_fun(this, &DashView::OnUriActivated));
+ view->uri_preview_activated.connect([&] (std::string const& uri) 
+ {
+ stored_preview_uri_identifier_ = uri;
+ });
+
 lenses_layout_->AddView(view, 1);
 lens_views_[lens->id] = view;
 
@@ -485,6 +507,12 @@ void DashView::OnLensAdded(Lens::Ptr& lens)
 }
 });
 
+ // Hook up to the new preview infrastructure
+ lens->preview_ready.connect([&] (std::string const& uri, Preview::Ptr model)
+ {
+ preview_state_machine_.ActivatePreview(model); // this does not immediately display a preview - we now wait.
+ });
+
 // global search done is handled by the home lens, no need to connect to it
 // BUT, we will special case global search finished coming from
 // the applications lens, because we want to be able to launch applications
@@ -496,6 +524,49 @@ void DashView::OnLensAdded(Lens::Ptr& lens)
 }
 }
 
+void DashView::BuildPreview(Preview::Ptr model)
+{
+ if (!preview_displaying_)
+ {
+ preview_container_ = previews::PreviewContainer::Ptr(new previews::PreviewContainer());
+ preview_container_->Preview(model, previews::Navigation::NONE); // no swipe left or right
+
+ nux::Geometry preview_geo = GetGeometry();
+ preview_geo.height -= 120;
+ preview_geo.width -= 120;
+ //preview_geo.x += 60;
+ //preview_geo.y += 60;
+
+ preview_container_->SetGeometry(preview_geo);
+ 
+ preview_displaying_ = true;
+ 
+ preview_container_->navigate_left.connect([&] () {
+ ubus_manager_.SendMessage(UBUS_DASH_PREVIEW_NAVIGATION_REQUEST, g_variant_new("(is)", -1, stored_preview_uri_identifier_.c_str()));
+ });
+
+ preview_container_->navigate_right.connect([&] () {
+ ubus_manager_.SendMessage(UBUS_DASH_PREVIEW_NAVIGATION_REQUEST, g_variant_new("(is)", 1, stored_preview_uri_identifier_.c_str()));
+ });
+ }
+ else
+ {
+ // got a new preview whilst already displaying, we probably clicked a navigation button.
+ preview_container_->Preview(model, previews::Navigation::LEFT); // TODO
+ }
+
+ if (G_LIKELY(preview_state_machine_.left_results() > 0 && preview_state_machine_.right_results() > 0))
+ preview_container_->DisableNavButton(previews::Navigation::NONE);
+ else if (preview_state_machine_.left_results() > 0)
+ preview_container_->DisableNavButton(previews::Navigation::RIGHT);
+ else if (preview_state_machine_.right_results() > 0)
+ preview_container_->DisableNavButton(previews::Navigation::LEFT);
+ else
+ preview_container_->DisableNavButton(previews::Navigation::BOTH);
+
+ QueueDraw();
+}
+
 void DashView::OnLensBarActivated(std::string const& id)
 {
 if (lens_views_.find(id) == lens_views_.end())
@@ -948,5 +1019,24 @@ nux::Area* DashView::FindKeyFocusArea(unsigned int key_symbol,
 return nullptr;
 }
 
+nux::Area* DashView::FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type)
+{
+ nux::Area* view = nullptr;
+ if (preview_displaying_)
+ {
+ nux::Point newpos = mouse_position;
+ // COMPLETE HACK OMG LOL, if this makes it into a merge request just slap gord. seriously.
+ //newpos.x -= 32;
+ //newpos.y -= 24;
+ view = dynamic_cast<nux::Area*>(preview_container_.GetPointer())->FindAreaUnderMouse(newpos, event_type);
+ }
+ else
+ {
+ view = View::FindAreaUnderMouse(mouse_position, event_type);
+ }
+
+ return (view == nullptr) ? this : view;
+}
+
 }
 }
diff --git a/dash/DashView.h b/dash/DashView.h
index 95024a909..f6c74cd64 100644
--- a/dash/DashView.h
+++ b/dash/DashView.h
@@ -36,7 +36,7 @@
 #include "unity-shared/OverlayRenderer.h"
 #include "UnityCore/Preview.h"
 #include "previews/PreviewContainer.h"
-
+#include "PreviewStateMachine.h"
 
 namespace unity
 {
@@ -85,7 +85,9 @@ private:
 void Draw(nux::GraphicsEngine& gfx_context, bool force_draw);
 void DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw);
 virtual long PostLayoutManagement (long LayoutResult);
-
+ nux::Area* FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type);
+ 
+ void BuildPreview(Preview::Ptr model);
 void OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key);
 void OnBackgroundColorChanged(GVariant* args);
 void OnSearchChanged(std::string const& search_string);
@@ -112,15 +114,17 @@ private:
 
 nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 
-private:
 UBusManager ubus_manager_;
 FilesystemLenses lenses_;
 HomeLens::Ptr home_lens_;
 LensViews lens_views_;
 
 // View related
+ PreviewStateMachine preview_state_machine_;
 previews::PreviewContainer::Ptr preview_container_;
 bool preview_displaying_;
+ std::string stored_preview_uri_identifier_;
+
 nux::VLayout* layout_;
 DashLayout* content_layout_;
 nux::HLayout* search_bar_layout_;
diff --git a/dash/LensView.cpp b/dash/LensView.cpp
index 29fe48b87..31644e2fd 100644
--- a/dash/LensView.cpp
+++ b/dash/LensView.cpp
@@ -300,6 +300,7 @@ void LensView::OnCategoryAdded(Category const& category)
 } break;
 case ResultView::ActivateType::PREVIEW:
 {
+ uri_preview_activated.emit(uri);
 lens_->Preview(uri);
 } break;
 default: break;
diff --git a/dash/LensView.h b/dash/LensView.h
index b600d10ab..28915b886 100644
--- a/dash/LensView.h
+++ b/dash/LensView.h
@@ -69,6 +69,7 @@ public:
 nux::Property<bool> can_refine_search;
 
 sigc::signal<void, std::string const&> uri_activated;
+ sigc::signal<void, std::string const&> uri_preview_activated;
 
 void PerformSearch(std::string const& search_query);
 void CheckNoResults(Lens::Hints const& hints);
diff --git a/dash/PreviewStateMachine.cpp b/dash/PreviewStateMachine.cpp
index c991565e2..7f278af5c 100644
--- a/dash/PreviewStateMachine.cpp
+++ b/dash/PreviewStateMachine.cpp
@@ -25,12 +25,17 @@ namespace dash
 
 PreviewStateMachine::PreviewStateMachine()
 : preview_active(false)
+ , left_results(-1)
+ , right_results(-1)
 , stored_preview_(nullptr)
 {
 for (int pos = SplitPosition::START; pos != SplitPosition::END; pos++)
 {
- split_positions_[static_cast<SplitPosition>(pos)] = -1;
+ split_positions_[pos] = -1;
 }
+
+ left_results.changed.connect([&] (int value) { CheckPreviewRequirementsFulfilled();});
+ right_results.changed.connect([&] (int value) { CheckPreviewRequirementsFulfilled();});
 }
 
 PreviewStateMachine::~PreviewStateMachine()
@@ -51,13 +56,13 @@ void PreviewStateMachine::ClosePreview()
 
 void PreviewStateMachine::SetSplitPosition(SplitPosition position, int coord)
 {
- split_positions_[position] = coord;
+ split_positions_[static_cast<int>(position)] = coord;
 CheckPreviewRequirementsFulfilled();
 }
 
 int PreviewStateMachine::GetSplitPosition(SplitPosition position)
 {
- return split_positions_[position];
+ return split_positions_[static_cast<int>(position)];
 }
 
 void PreviewStateMachine::CheckPreviewRequirementsFulfilled()
@@ -68,10 +73,19 @@ void PreviewStateMachine::CheckPreviewRequirementsFulfilled()
 if (stored_preview_ == nullptr)
 return;
 
+ /* right now this is disabled as long as we aren't doing the fancy splitting animation
+ * as we don't care about positions
+ *
 if (GetSplitPosition(CONTENT_AREA) < 0) return;
 if (GetSplitPosition(FILTER_BAR) < 0) return;
 if (GetSplitPosition(LENS_BAR) < 0) return;
 if (GetSplitPosition(SEARCH_BAR) < 0) return;
+ */
+ 
+ if (left_results < 0 &&
+ right_results < 0)
+ return;
+
 
 preview_active = true;
 PreviewActivated(stored_preview_);
diff --git a/dash/PreviewStateMachine.h b/dash/PreviewStateMachine.h
index ce64d761b..5fa76a14a 100644
--- a/dash/PreviewStateMachine.h
+++ b/dash/PreviewStateMachine.h
@@ -43,13 +43,16 @@ public:
 PreviewStateMachine();
 ~PreviewStateMachine();
 
- void ActivatePreview(Preview::Ptr preview); // async call.
+ void ActivatePreview(Preview::Ptr preview); // potentially async call.
 void ClosePreview();
 
 void SetSplitPosition(SplitPosition position, int coord);
 int GetSplitPosition(SplitPosition position);
 
 nux::Property<bool> preview_active;
+ nux::Property<int> left_results;
+ nux::Property<int> right_results;
+ 
 sigc::signal<void, Preview::Ptr> PreviewActivated;
 
 private:
@@ -57,7 +60,7 @@ private:
 
 // all stored co-ordinates are absolute geometry
 // to make dealing with the views inside the scrollview easier to understand
- std::unordered_map<SplitPosition, int> split_positions_;
+ std::unordered_map<int, int> split_positions_;
 
 Preview::Ptr stored_preview_;
 };
diff --git a/dash/ResultViewGrid.cpp b/dash/ResultViewGrid.cpp
index 1cfb26b50..217ffe61b 100644
--- a/dash/ResultViewGrid.cpp
+++ b/dash/ResultViewGrid.cpp
@@ -52,6 +52,7 @@ ResultViewGrid::ResultViewGrid(NUX_FILE_LINE_DECL)
 , mouse_over_index_(-1)
 , active_index_(-1)
 , selected_index_(-1)
+ , activated_uri_("NULL")
 , last_lazy_loaded_result_(0)
 , last_mouse_down_x_(-1)
 , last_mouse_down_y_(-1)
@@ -100,6 +101,36 @@ ResultViewGrid::ResultViewGrid(NUX_FILE_LINE_DECL)
 g_variant_get (data, "(ii)", &recorded_dash_width_, &recorded_dash_height_);
 });
 
+ ubus_.RegisterInterest(UBUS_DASH_PREVIEW_NAVIGATION_REQUEST, [&] (GVariant* data) {
+ int nav_mode = 0;
+ gchar* uri;
+ g_variant_get(data, "(is)", &nav_mode, &uri);
+ 
+ if (std::string(uri) == activated_uri_)
+ {
+ int current_index = GetIndexForUri(activated_uri_);
+ if (nav_mode == -1)
+ {
+ current_index--; 
+ }
+ else if (nav_mode == 1)
+ {
+ current_index++;
+ }
+ 
+ if (nav_mode == 0)
+ {
+ activated_uri_ = "";
+ }
+ else
+ {
+ activated_uri_ = GetUriForIndex(current_index);
+ UriActivated.emit(activated_uri_, ActivateType::PREVIEW);
+ }
+ }
+
+ });
+
 SetDndEnabled(true, false);
 }
 
@@ -637,9 +668,19 @@ void ResultViewGrid::MouseClick(int x, int y, unsigned long button_flags, unsign
 selected_index_ = index;
 focused_uri_ = result.uri;
 if (nux::GetEventButton(button_flags) == nux::MouseButton::MOUSE_BUTTON3)
+ {
+ activated_uri_ = result.uri();
 UriActivated.emit(result.uri, ResultView::ActivateType::PREVIEW);
+ int left_results = index;
+ int right_results = (results_.size() - index) - 1;
+ //FIXME - just uses y right now, needs to use the absolute position of the bottom of the result 
+ ubus_.SendMessage(UBUS_DASH_PREVIEW_INFO_PAYLOAD, 
+ g_variant_new("(iii)", y, left_results, right_results));
+ }
 else
+ {
 UriActivated.emit(result.uri, ResultView::ActivateType::DIRECT);
+ }
 }
 }
 
diff --git a/dash/ResultViewGrid.h b/dash/ResultViewGrid.h
index e483566e9..6acb38de3 100644
--- a/dash/ResultViewGrid.h
+++ b/dash/ResultViewGrid.h
@@ -93,6 +93,8 @@ private:
 nux::Property<int> selected_index_;
 std::string focused_uri_;
 
+ std::string activated_uri_;
+
 int last_lazy_loaded_result_;
 int last_mouse_down_x_;
 int last_mouse_down_y_;
diff --git a/po/ar.po b/po/ar.po
index 2e0c42c03..d9381cdf4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Arabic\n"
@@ -269,6 +269,7 @@ msgstr "حذف من برنامج Launcher"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 065b47ba4..08db79816 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Bulgarian\n"
@@ -269,6 +269,7 @@ msgstr "Премахни от програмата за стартиране"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index d7f57666e..ef295c2dc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Czech\n"
@@ -270,6 +270,7 @@ msgstr "Odebrat ze Spouštěče"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index c7f9f6baa..1e9c92928 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Danish\n"
@@ -270,6 +270,7 @@ msgstr "Fjern fra Launcher"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 7177e17de..2eeb4f3d8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: German\n"
@@ -270,6 +270,7 @@ msgstr "Aus Startprogramm entfernen"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 9b32dc82c..c628c3fcc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Greek\n"
@@ -270,6 +270,7 @@ msgstr "Κατάργηση από το πρόγραμμα εκκίνησης"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 34b48897f..3873b8388 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Spanish\n"
@@ -270,6 +270,7 @@ msgstr "Quitar del iniciador"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index e4159e394..3b5511541 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Finnish\n"
@@ -270,6 +270,7 @@ msgstr "Poista Launcherista"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 4ee3c97e6..01a75d692 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: French\n"
@@ -270,6 +270,7 @@ msgstr "Supprimer du lanceur"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/he.po b/po/he.po
index 70ac3c745..4f8e0da3f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Hebrew\n"
@@ -270,6 +270,7 @@ msgstr "מהסר מ- Launcher"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index 10b1a536c..4b53e21ed 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Hindi\n"
@@ -269,6 +269,7 @@ msgstr "लॉन्चर से निकालें"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 1eae24ba8..040ff1a09 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Croatian\n"
@@ -271,6 +271,7 @@ msgstr "Ukloni iz programa za pokretanje"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index da6c5a57b..bffa87075 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Hungarian\n"
@@ -270,6 +270,7 @@ msgstr "Eltávolítás a Launcherből"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index b0211115d..31b382ea6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Italian\n"
@@ -270,6 +270,7 @@ msgstr "Rimuovi da Launcher"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 257bbc1bc..2e1338ac8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Japanese\n"
@@ -270,6 +270,7 @@ msgstr "Launcher から削除"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index 935511ba3..f7f9472ee 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Korean\n"
@@ -270,6 +270,7 @@ msgstr "시작 관리자에서 제거"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 113b495da..2a81005ca 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Norwegian Bokmal\n"
@@ -270,6 +270,7 @@ msgstr "Fjern fra oppstartsprogram"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 867193493..8774100ae 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Dutch\n"
@@ -270,6 +270,7 @@ msgstr "Verwijderen uit starter"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 2174ac66a..c7371df4d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Polish\n"
@@ -271,6 +271,7 @@ msgstr "Usuń z obszaru uruchamiania"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index 076a88022..f502cea3e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Portuguese\n"
@@ -270,6 +270,7 @@ msgstr "Remover do Launcher"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fd32442d4..9192b9dc4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -270,6 +270,7 @@ msgstr "Remover do Inicializador"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index b381729be..54fdcb424 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Romanian\n"
@@ -271,6 +271,7 @@ msgstr "Îndepărtează din programul de lansare"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 34cc7c9f0..c7b6c1b88 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Russian\n"
@@ -271,6 +271,7 @@ msgstr "Удалить из модуля запуска"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index ff4788224..e984d73b1 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Slovak\n"
@@ -270,6 +270,7 @@ msgstr "Odstrániť z aplikácie Launcher"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index 27ad01d0a..26d54c820 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Slovenian\n"
@@ -271,6 +271,7 @@ msgstr "Odstrani iz zaganjalnika"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 4ccc7a4ef..4e22dd02f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Serbian\n"
@@ -271,6 +271,7 @@ msgstr "Ukloni iz pokretača"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 8b2f780f1..4993d23a2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:36-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Swedish\n"
@@ -270,6 +270,7 @@ msgstr "Ta bort från startprogram"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 64c351771..d2eae63ac 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:37-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Thai\n"
@@ -269,6 +269,7 @@ msgstr "ออกจากโปรแกรมเรียกทำงาน"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 74721d3e1..f0e427305 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:37-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Turkish\n"
@@ -270,6 +270,7 @@ msgstr "Başlatıcıdan Kaldır"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/unity.pot b/po/unity.pot
index 33d962ed0..0f09f85cc 100644
--- a/po/unity.pot
+++ b/po/unity.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-25 11:41+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,6 +86,7 @@ msgstr ""
 msgid "Workspace Switcher"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9f7d3f77b..4e03d18bd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:37-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Chinese (simplified)\n"
@@ -269,6 +269,7 @@ msgstr "从启动程序中删除"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a2924907a..9ebb53416 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: ayatana-dev@lists.launchpad.net\n"
-"POT-Creation-Date: 2012-07-12 17:07+0100\n"
+"POT-Creation-Date: 2012-08-08 14:49+0100\n"
 "PO-Revision-Date: 2010-03-02 12:37-0500\n"
 "Last-Translator: Canonical OEM\n"
 "Language-Team: Chinese (traditional)\n"
@@ -269,6 +269,7 @@ msgstr "從啟動程式中刪除"
 msgid "Unmount"
 msgstr ""
 
+#. Application is being installed, or hasn't been installed yet
 msgid "Waiting to install"
 msgstr ""
 
diff --git a/unity-shared/UBusMessages.h b/unity-shared/UBusMessages.h
index 2126fd7df..777217e0c 100644
--- a/unity-shared/UBusMessages.h
+++ b/unity-shared/UBusMessages.h
@@ -82,8 +82,14 @@
 // FIXME - fix the nux focus api so we don't need this
 #define UBUS_RESULT_VIEW_KEYNAV_CHANGED "RESULT_VIEW_KEYNAV_CHANGED"
 
-// for communicating positions to the preview state machine (ii)
-#define UBUS_DASH_SPLIT_COORD_CHANGED "DASH_SPLIT_COORD_CHANGED"
+// for communicating positions to the preview state machine (iii)
+// (split y coord in absolute geometry, results to the left, results to the right)
+#define UBUS_DASH_PREVIEW_INFO_PAYLOAD "DASH_PREVIEW_INFO_PAYLOAD"
+
+// called when previews wish to navigate left/right or close (is)
+// -1 = left, 0 = close, 1 = right, 
+// string is the uri string that last result activated was
+#define UBUS_DASH_PREVIEW_NAVIGATION_REQUEST "DASH_PREVIEW_NAVIGATION_REQUEST"
 
 // Sends a string datatype containing the new icon name
 #define UBUS_HUD_ICON_CHANGED "HUD_ICON_CHANGED"