Merge lp:~3v1n0/unity/switcher-alt+q into lp:unity

[Marco Trevisan (Treviño)]

Switcher{View,Controller}: close active selection on Alt+q

'Q' should be instead the first key in the row, near to tab.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3986
http://jenkins.qa.ubuntu.com/job/unity-ci/1326/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/104/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/102/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/102/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1326/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2015-11-04 09:56:24 +0000
+++ launcher/SwitcherController.cpp	2015-11-04 09:56:24 +0000
@@ -154,6 +154,24 @@
   }
 }
 
+void Controller::Impl::CloseSelection()
+{
+  if (obj_->detail())
+  {
+    if (model_->detail_selection)
+    {
+      WindowManager::Default().Close(model_->DetailSelectionWindow());
+    }
+  }
+  else
+  {
+    // Using model_->Selection()->Close() would be nicer, but it wouldn't take
+    // in consideration the workspace related settings
+    for (auto window : model_->DetailXids())
+      WindowManager::Default().Close(window);
+  }
+}
+
 void Controller::Next()
 {
   impl_->Next();
@@ -443,6 +461,7 @@
   view_->switcher_prev.connect(sigc::mem_fun(this, &Impl::Prev));
   view_->switcher_start_detail.connect(sigc::mem_fun(this, &Impl::StartDetailMode));
   view_->switcher_stop_detail.connect(sigc::mem_fun(this, &Impl::StopDetailMode));
+  view_->switcher_close_current.connect(sigc::mem_fun(this, &Impl::CloseSelection));
 
   ConstructWindow();
   main_layout_->AddView(view_.GetPointer(), 1);

=== modified file 'launcher/SwitcherControllerImpl.h'
--- launcher/SwitcherControllerImpl.h	2015-11-04 09:56:24 +0000
+++ launcher/SwitcherControllerImpl.h	2015-11-04 09:56:24 +0000
@@ -62,6 +62,8 @@
   void NextDetail();
   void PrevDetail();
 
+  void CloseSelection();
+
   void NextDetailRow();
   void PrevDetailRow();
   bool HasNextDetailRow() const;

=== modified file 'launcher/SwitcherModel.cpp'
--- launcher/SwitcherModel.cpp	2015-11-04 09:56:24 +0000
+++ launcher/SwitcherModel.cpp	2015-11-04 09:56:24 +0000
@@ -51,7 +51,7 @@
 }
 
 
-SwitcherModel::SwitcherModel(std::vector<AbstractLauncherIcon::Ptr> const& icons, bool sort_by_priority)
+SwitcherModel::SwitcherModel(Applications const& icons, bool sort_by_priority)
   : detail_selection(false)
   , detail_selection_index(0)
   , only_apps_on_viewport(true)

=== modified file 'launcher/SwitcherModel.h'
--- launcher/SwitcherModel.h	2015-11-04 09:56:24 +0000
+++ launcher/SwitcherModel.h	2015-11-04 09:56:24 +0000
@@ -61,7 +61,7 @@
   nux::Property<unsigned int> detail_selection_index;
   nux::Property<bool>         only_apps_on_viewport;
 
-  SwitcherModel(std::vector<launcher::AbstractLauncherIcon::Ptr> const& icons, bool sort_by_priority);
+  SwitcherModel(Applications const&, bool sort_by_priority);
   virtual ~SwitcherModel() = default;
 
   iterator begin();

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2015-11-04 09:56:24 +0000
+++ launcher/SwitcherView.cpp	2015-11-04 09:56:24 +0000
@@ -500,8 +500,8 @@
       case NUX_VK_DOWN:
         switcher_start_detail.emit();
         break;
-      default:
-        return false;
+      case NUX_VK_q:
+        switcher_close_current.emit();
         break;
     }
   }

=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2014-07-15 16:28:45 +0000
+++ launcher/SwitcherView.h	2015-11-04 09:56:24 +0000
@@ -85,6 +85,7 @@
   sigc::signal<void> switcher_prev;
   sigc::signal<void> switcher_start_detail;
   sigc::signal<void> switcher_stop_detail;
+  sigc::signal<void> switcher_close_current;
 
   /* void; bool visible */
   sigc::signal<void, bool> hide_request;