Merge lp:~3v1n0/unity/dynamic-ws-shortcuts into lp:unity

[Marco Trevisan (Treviño)]

shortcut: cleanup the code making it more dynamic and model-dependent

Cleanup the shortcut hints code to make it to be more model-dependent, move the positioning code to the Controller (adding tests for it, and allowing to have a better standalone overlay). Fix some redrawing issues and a potential crash (disconnecting signals).

Directly connect to launcher size changes, removing some wrapping on the launcher controller.

Added new tests that covers both changes to the model, to the view and to the controller.

[Andrea Azzarone (azzar1)]

A lot of unrelated changes but overall looks good.

+#include <stdexcept>

??

review: Approve

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2013-01-18 18:22:03 +0000
+++ launcher/LauncherController.cpp	2013-01-21 21:26:21 +0000
@@ -333,10 +333,6 @@
   launcher_window->InputWindowEnableStruts(parent_->options()->hide_mode == LAUNCHER_HIDE_NEVER);
   launcher_window->SetEnterFocusInputArea(launcher);
 
-  launcher_window->geometry_changed.connect([this] (nux::Area* /*area*/, nux::Geometry const& geo) {
-    parent_->launcher_width_changed.emit(geo.width);
-  });
-
   launcher->add_request.connect(sigc::mem_fun(this, &Impl::OnLauncherAddRequest));
   launcher->remove_request.connect(sigc::mem_fun(this, &Impl::OnLauncherRemoveRequest));
 

=== modified file 'launcher/LauncherController.h'
--- launcher/LauncherController.h	2013-01-08 11:47:00 +0000
+++ launcher/LauncherController.h	2013-01-21 21:26:21 +0000
@@ -83,8 +83,6 @@
 
   void UpdateSuperTapDuration(int const super_tap_duration);
 
-  sigc::signal<void, int> launcher_width_changed;
-
 protected:
   // Introspectable methods
   std::string GetName() const;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-01-14 12:06:45 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-01-21 21:26:21 +0000
@@ -1729,13 +1729,9 @@
 
   if (!shortcut_controller_->Visible() && shortcut_controller_->IsEnabled())
   {
-    int launcher_width = optionGetIconSize() + 18;
-    int panel_height = panel_style_.panel_height;
-
     if (shortcut_controller_->Show())
     {
       LOG_DEBUG(logger) << "Showing shortcut hint.";
-      shortcut_controller_->SetAdjustment(launcher_width, panel_height);
       EnableCancelAction(CancelActionTarget::SHORTCUT_HINT, true, action->key().modifiers());
     }
   }
@@ -3153,12 +3149,14 @@
 
   AddChild(dash_controller_.get());
 
-  launcher_controller_->launcher_width_changed.connect([this] (int launcher_width) {
+  launcher_controller_->launcher().size_changed.connect([this] (nux::Area*, int w, int h) {
     /* The launcher geometry includes 1px used to draw the right margin
      * that must not be considered when drawing an overlay */
-    hud_controller_->launcher_width = launcher_width - 1;
-    dash_controller_->launcher_width = launcher_width - 1;
-    panel_controller_->launcher_width = launcher_width - 1;
+    int launcher_width = w - 1;
+    hud_controller_->launcher_width = launcher_width;
+    dash_controller_->launcher_width = launcher_width;
+    panel_controller_->launcher_width = launcher_width;
+    shortcut_controller_->SetAdjustment(launcher_width, panel_style_.panel_height);
   });
 
   ScheduleRelayout(0);
@@ -3229,37 +3227,37 @@
 
   hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", _(" (Hold)"),
                                                    _("Opens the Launcher, displays shortcuts."),
-                                                   shortcut::COMPIZ_KEY_OPTION,
+                                                   shortcut::OptionType::COMPIZ_KEY,
                                                    COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                    COMPIZ_UNITYSHELL_OPTION_SHOW_LAUNCHER));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", "",
                                                     _("Opens Launcher keyboard navigation mode."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_KEYBOARD_FOCUS));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", "",
                                                     _("Switches applications via the Launcher."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_LAUNCHER_SWITCHER_FORWARD));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", _(" + 1 to 9"),
                                                     _("Same as clicking on a Launcher icon."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_SHOW_LAUNCHER));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", _(" + Shift + 1 to 9"),
                                                     _("Opens a new window in the app."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_SHOW_LAUNCHER));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(launcher, "", " + T",
                                                     _("Opens the Trash."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_SHOW_LAUNCHER));
 
@@ -3269,47 +3267,47 @@
 
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", _(" (Tap)"),
                                                     _("Opens the Dash Home."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_SHOW_LAUNCHER));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + A",
                                                     _("Opens the Dash App Lens."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_SHOW_LAUNCHER));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + F",
                                                     _("Opens the Dash Files Lens."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_SHOW_LAUNCHER));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + M",
                                                     _("Opens the Dash Music Lens."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_SHOW_LAUNCHER));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + V",
                                                     _("Opens the Dash Video Lens."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_SHOW_LAUNCHER));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "",
                                                     _("Switches between Lenses."),
-                                                    shortcut::HARDCODED_OPTION,
+                                                    shortcut::OptionType::HARDCODED,
                                                     _("Ctrl + Tab")));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "",
                                                     _("Moves the focus."),
-                                                    shortcut::HARDCODED_OPTION,
+                                                    shortcut::OptionType::HARDCODED,
                                                     _("Arrow Keys")));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "",
                                                     _("Opens the currently focused item."),
-                                                    shortcut::HARDCODED_OPTION,
+                                                    shortcut::OptionType::HARDCODED,
                                                     _("Enter")));
 
   // Menu Bar
@@ -3317,24 +3315,24 @@
 
   hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", _(" (Tap)"),
                                                     _("Opens the HUD."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_SHOW_HUD));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", _(" (Hold)"),
                                                     _("Reveals the application menu."),
-                                                    shortcut::HARDCODED_OPTION,
+                                                    shortcut::OptionType::HARDCODED,
                                                     "Alt"));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "",
                                                     _("Opens the indicator menu."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_PANEL_FIRST_MENU));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(menubar, "", "",
                                                     _("Moves focus between indicators."),
-                                                    shortcut::HARDCODED_OPTION,
+                                                    shortcut::OptionType::HARDCODED,
                                                     _("Cursor Left or Right")));
 
   // Switching
@@ -3342,19 +3340,19 @@
 
   hints_.push_back(std::make_shared<shortcut::Hint>(switching, "", "",
                                                     _("Switches between applications."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_ALT_TAB_FORWARD));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(switching, "", "",
                                                     _("Switches windows of current applications."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_UNITYSHELL_PLUGIN_NAME,
                                                     COMPIZ_UNITYSHELL_OPTION_ALT_TAB_NEXT_WINDOW));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(switching, "", "",
                                                     _("Moves the focus."),
-                                                    shortcut::HARDCODED_OPTION,
+                                                    shortcut::OptionType::HARDCODED,
                                                     _("Cursor Left or Right")));
 
   // Workspaces
@@ -3362,19 +3360,19 @@
 
   hints_.push_back(std::make_shared<shortcut::Hint>(workspaces, "", "",
                                                     _("Switches between workspaces."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_EXPO_PLUGIN_NAME,
                                                     COMPIZ_EXPO_OPTION_EXPO_KEY));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(workspaces, "", _(" + Arrow Keys"),
                                                     _("Switches workspaces."),
-                                                    shortcut::COMPIZ_METAKEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_WALL_PLUGIN_NAME,
                                                     COMPIZ_WALL_OPTION_LEFT_KEY));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(workspaces, "", _(" + Arrow Keys"),
                                                     _("Moves focused window to another workspace."),
-                                                    shortcut::COMPIZ_METAKEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_WALL_PLUGIN_NAME,
                                                     COMPIZ_WALL_OPTION_LEFT_WINDOW_KEY));
 
@@ -3384,60 +3382,60 @@
 
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
                                                     _("Spreads all windows in the current workspace."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_SCALE_PLUGIN_NAME,
                                                     COMPIZ_SCALE_OPTION_INITIATE_ALL_KEY));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
                                                     _("Minimises all windows."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_CORE_PLUGIN_NAME,
                                                     COMPIZ_CORE_OPTION_SHOW_DESKTOP_KEY));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
                                                     _("Maximises the current window."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_CORE_PLUGIN_NAME,
                                                     COMPIZ_CORE_OPTION_MAXIMIZE_WINDOW_KEY));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
                                                     _("Restores or minimises the current window."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_CORE_PLUGIN_NAME,
                                                     COMPIZ_CORE_OPTION_UNMAXIMIZE_WINDOW_KEY));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" or Right"),
                                                     _("Semi-maximise the current window."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_GRID_PLUGIN_NAME,
                                                     COMPIZ_GRID_OPTION_PUT_LEFT_KEY));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
                                                     _("Closes the current window."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_CORE_PLUGIN_NAME,
                                                     COMPIZ_CORE_OPTION_CLOSE_WINDOW_KEY));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
                                                     _("Opens the window accessibility menu."),
-                                                    shortcut::COMPIZ_KEY_OPTION,
+                                                    shortcut::OptionType::COMPIZ_KEY,
                                                     COMPIZ_CORE_PLUGIN_NAME,
                                                     COMPIZ_CORE_OPTION_WINDOW_MENU_KEY));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
                                                     _("Places the window in corresponding position."),
-                                                    shortcut::HARDCODED_OPTION,
+                                                    shortcut::OptionType::HARDCODED,
                                                     _("Ctrl + Alt + Num")));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" Drag"),
                                                     _("Moves the window."),
-                                                    shortcut::COMPIZ_MOUSE_OPTION,
+                                                    shortcut::OptionType::COMPIZ_MOUSE,
                                                     COMPIZ_MOVE_PLUGIN_NAME,
                                                     COMPIZ_MOVE_OPTION_INITIATE_BUTTON));
 
   hints_.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" Drag"),
                                                     _("Resizes the window."),
-                                                    shortcut::COMPIZ_MOUSE_OPTION,
+                                                    shortcut::OptionType::COMPIZ_MOUSE,
                                                     COMPIZ_RESIZE_PLUGIN_NAME,
                                                     COMPIZ_RESIZE_OPTION_INITIATE_BUTTON));
 }

=== modified file 'shortcuts/AbstractShortcutHint.h'
--- shortcuts/AbstractShortcutHint.h	2012-09-11 10:38:31 +0000
+++ shortcuts/AbstractShortcutHint.h	2013-01-21 21:26:21 +0000
@@ -31,14 +31,14 @@
 namespace shortcut
 {
 
-enum OptionType
+enum class OptionType : unsigned
 {
-  COMPIZ_KEY_OPTION = 0,
-  COMPIZ_METAKEY_OPTION,
-  COMPIZ_MOUSE_OPTION,
-  HARDCODED_OPTION
-  /* GSETTINGS_OPTION,
-   * GCONF_OPTION */
+  COMPIZ_KEY = 0,
+  COMPIZ_METAKEY,
+  COMPIZ_MOUSE,
+  HARDCODED
+  /* GSETTINGS,
+   * GCONF */
 };
 
 class AbstractHint

=== modified file 'shortcuts/MockShortcutHint.h'
--- shortcuts/MockShortcutHint.h	2012-09-11 10:38:31 +0000
+++ shortcuts/MockShortcutHint.h	2013-01-21 21:26:21 +0000
@@ -37,34 +37,34 @@
            std::string const& postfix,
            std::string const& description,
            OptionType const type,
-           std::string const& arg1, 
+           std::string const& arg1,
            std::string const& arg2 = "",
            std::string const& arg3 = "")
     : AbstractHint(category, prefix, postfix, description, type, arg1, arg2, arg3)
   {}
-  
+
   // Methods...
   bool Fill()
   {
     switch (type())
     {
-      case COMPIZ_MOUSE_OPTION:
-      case COMPIZ_KEY_OPTION:
-      case COMPIZ_METAKEY_OPTION:
+      case OptionType::COMPIZ_MOUSE:
+      case OptionType::COMPIZ_KEY:
+      case OptionType::COMPIZ_METAKEY:
         value = arg1() + "-" + arg2();
         shortkey = prefix() + value() + postfix();
         return true;
-      
-      case HARDCODED_OPTION:
+
+      case OptionType::HARDCODED:
         value = arg1();
         shortkey = prefix() + value() + postfix();
         return true;
     }
-    
+
     return false;
   }
 };
-  
+
 }
 }
 

=== modified file 'shortcuts/ShortcutController.cpp'
--- shortcuts/ShortcutController.cpp	2012-12-14 17:38:35 +0000
+++ shortcuts/ShortcutController.cpp	2013-01-21 21:26:21 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Canonical Ltd
+ * Copyright (C) 2011-2013 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -14,11 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Andrea Azzarone <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #include "ShortcutController.h"
 
 #include "unity-shared/UBusMessages.h"
+#include "unity-shared/UScreen.h"
 
 namespace na = nux::animation;
 
@@ -101,8 +103,10 @@
 
   base_window_raiser_->Raise(view_window_);
 
-  nux::Geometry geo;
-  if (!view_->GetBaseGeometry(geo))
+  int monitor = UScreen::GetDefault()->GetMonitorWithMouse();
+  auto const& geo = GetGeometryPerMonitor(monitor);
+
+  if (geo.IsNull())
     return false;
 
   view_window_->SetGeometry(geo);
@@ -125,6 +129,27 @@
   return false;
 }
 
+nux::Geometry Controller::GetGeometryPerMonitor(int monitor)
+{
+  if (!view_)
+    ConstructView();
+
+  auto const& view_geo = view_->GetAbsoluteGeometry();
+  auto const& monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(monitor);
+
+  if (adjustment_.x + view_geo.width > monitor_geo.width ||
+      adjustment_.y + view_geo.height > monitor_geo.height)
+  {
+    return nux::Geometry();
+  }
+
+  nux::Geometry geo(monitor_geo.x, monitor_geo.y, view_geo.width, view_geo.height);
+  geo.x += adjustment_.x + (monitor_geo.width - view_geo.width - adjustment_.x) / 2;
+  geo.y += adjustment_.y + (monitor_geo.height - view_geo.height - adjustment_.y) / 2;
+
+  return geo;
+}
+
 void Controller::ConstructView()
 {
   view_ = View::Ptr(new View());
@@ -158,12 +183,10 @@
 
 void Controller::SetAdjustment(int x, int y)
 {
-  EnsureView();
-
-  view_->SetAdjustment(x, y);
+  adjustment_.x = x;
+  adjustment_.y = y;
 }
 
-
 void Controller::Hide()
 {
   if (!visible_)

=== modified file 'shortcuts/ShortcutController.h'
--- shortcuts/ShortcutController.h	2012-12-14 17:38:35 +0000
+++ shortcuts/ShortcutController.h	2013-01-21 21:26:21 +0000
@@ -63,6 +63,7 @@
   // Introspectable
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
+  virtual nux::Geometry GetGeometryPerMonitor(int monitor);
 
 private:
   void ConstructView();
@@ -77,6 +78,7 @@
   nux::Geometry workarea_;
   nux::ObjectPtr<nux::BaseWindow> view_window_;
   nux::HLayout* main_layout_;
+  nux::Point adjustment_;
 
   bool visible_;
   bool enabled_;
@@ -86,6 +88,8 @@
 
   glib::Source::UniquePtr show_timer_;
   UBusManager ubus_manager_;
+
+  friend class TestShortcutController;
 };
 
 }

=== modified file 'shortcuts/ShortcutHint.cpp'
--- shortcuts/ShortcutHint.cpp	2012-10-29 09:34:54 +0000
+++ shortcuts/ShortcutHint.cpp	2013-01-21 21:26:21 +0000
@@ -58,7 +58,7 @@
 {
   switch(type())
   {
-    case COMPIZ_MOUSE_OPTION:
+    case OptionType::COMPIZ_MOUSE:
     {
       // Arg1 = Plugin name
       // Arg2 = key Option name
@@ -88,7 +88,7 @@
     }
     break;
     
-    case COMPIZ_KEY_OPTION:
+    case OptionType::COMPIZ_KEY:
     {
       // Arg1 = Plugin name
       // Arg2 = key Option name
@@ -116,7 +116,7 @@
 
       break;
     }
-    case COMPIZ_METAKEY_OPTION:
+    case OptionType::COMPIZ_METAKEY:
     {
       // Arg1 = Plugin name
       // Arg2 = key Option name
@@ -145,7 +145,7 @@
 
       break;
     }
-    case HARDCODED_OPTION:
+    case OptionType::HARDCODED:
       if (value != arg1())
       {
         value = arg1();
@@ -154,7 +154,7 @@
       return true;
 
     default:
-      LOG_WARNING(logger) << "Unable to find the option type" << type(); 
+      LOG_WARNING(logger) << "Unable to find the option type" << static_cast<unsigned>(type()); 
   }
 
   return false;

=== modified file 'shortcuts/ShortcutModel.cpp'
--- shortcuts/ShortcutModel.cpp	2012-09-10 21:03:34 +0000
+++ shortcuts/ShortcutModel.cpp	2013-01-21 21:26:21 +0000
@@ -25,8 +25,17 @@
 {
 
 Model::Model(std::list<AbstractHint::Ptr> const& hints)
+  : categories_per_column(3, [] (int& target, int const& new_value) {
+      int cat_per_col = std::max<int>(1, new_value);
+      if (cat_per_col != target)
+      {
+        target = cat_per_col;
+        return true;
+      }
+      return false;
+    })
 {
-  for (auto hint : hints)
+  for (auto const& hint : hints)
     AddHint(hint);
 }
 
@@ -44,8 +53,8 @@
 
 void Model::Fill()
 {
-  for (auto category : categories_)
-    for (auto item : hints_[category])
+  for (auto const& category : categories_)
+    for (auto const& item : hints_[category])
       item->Fill();
 }
 

=== modified file 'shortcuts/ShortcutModel.h'
--- shortcuts/ShortcutModel.h	2012-09-10 21:03:34 +0000
+++ shortcuts/ShortcutModel.h	2013-01-21 21:26:21 +0000
@@ -41,8 +41,9 @@
 
   Model(std::list<AbstractHint::Ptr> const& hints);
 
-  std::vector<std::string>& categories() { return categories_; }
-  std::map<std::string, std::list<AbstractHint::Ptr>>& hints() { return hints_; }
+  nux::Property<int> categories_per_column;
+  std::vector<std::string> const& categories() const { return categories_; }
+  std::map<std::string, std::list<AbstractHint::Ptr>> const& hints() const { return hints_; }
 
   void Fill();
 

=== modified file 'shortcuts/ShortcutView.cpp'
--- shortcuts/ShortcutView.cpp	2012-08-10 11:47:10 +0000
+++ shortcuts/ShortcutView.cpp	2013-01-21 21:26:21 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Canonical Ltd
+ * Copyright (C) 2011-2013 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -15,17 +15,16 @@
  *
  * Authored by: Andrea Azzarone <[e-mail]>
  *              Jay Taoko <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #include "ShortcutView.h"
 
 #include <glib/gi18n-lib.h>
-#include <boost/algorithm/string.hpp>
 #include <UnityCore/GLibWrapper.h>
 
 #include "unity-shared/LineSeparator.h"
 #include "unity-shared/StaticCairoText.h"
-#include "unity-shared/UScreen.h"
 
 namespace unity
 {
@@ -33,12 +32,12 @@
 {
 namespace
 {
-  int SECTION_NAME_FONT_SIZE = 17/1.33;
-  int SHORTKEY_ENTRY_FONT_SIZE = 13/1.33;
-  int INTER_SPACE_SHORTKEY_DESCRIPTION = 10;
-  int SHORTKEY_COLUMN_WIDTH = 150;
-  int DESCRIPTION_COLUMN_WIDTH = 265;
-  int LINE_SPACING = 5;
+  const unsigned SECTION_NAME_FONT_SIZE = 17/1.33;
+  const unsigned SHORTKEY_ENTRY_FONT_SIZE = 13/1.33;
+  const unsigned INTER_SPACE_SHORTKEY_DESCRIPTION = 10;
+  const unsigned SHORTKEY_COLUMN_WIDTH = 150;
+  const unsigned DESCRIPTION_COLUMN_WIDTH = 265;
+  const unsigned LINE_SPACING = 5;
 
   // We need this class because SetVisible doesn't work for layouts.
   class SectionView : public nux::View
@@ -46,13 +45,18 @@
     public:
       SectionView(NUX_FILE_LINE_DECL)
         : nux::View(NUX_FILE_LINE_PARAM)
+      {}
+
+      ~SectionView()
       {
+        key_changed_conn.disconnect();
       }
 
+      sigc::connection key_changed_conn;
+
     protected:
       void Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
-      {
-      }
+      {}
 
       void DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
       {
@@ -67,45 +71,30 @@
 
 View::View()
   : ui::UnityWindowView()
-  , x_adjustment_(0)
-  , y_adjustment_(0)
 {
-  layout_ = new nux::VLayout();
-  layout_->SetPadding(50, 38);
-  layout_->SetSpaceBetweenChildren(20);
-  SetLayout(layout_);
+  auto main_layout = new nux::VLayout();
+  main_layout->SetPadding(50, 38);
+  main_layout->SetSpaceBetweenChildren(20);
+  SetLayout(main_layout);
 
-  std::string header = "<b>";
-  header += _("Keyboard Shortcuts");
-  header += "</b>";
+  std::string header = "<b>"+std::string(_("Keyboard Shortcuts"))+"</b>";
 
   nux::StaticText* header_view = new nux::StaticText(header, NUX_TRACKER_LOCATION);
   header_view->SetTextPointSize(20/1.33);
   header_view->SetFontName("Ubuntu");
-  layout_->AddView(header_view, 1 , nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  main_layout->AddView(header_view, 1 , nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
-  layout_->AddView(new HSeparator(), 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  main_layout->AddView(new HSeparator(), 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
   columns_layout_ = new nux::HLayout();
   columns_layout_->SetSpaceBetweenChildren(30);
-  layout_->AddLayout(columns_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-
-  // Column 1...
-  columns_.push_back(new nux::VLayout());
-  columns_layout_->AddLayout(columns_[0], 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-
-  // Column 2...
-  columns_.push_back(new nux::VLayout());
-  columns_layout_->AddLayout(columns_[1], 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-}
-
-View::~View()
-{
+  main_layout->AddLayout(columns_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 }
 
 void View::SetModel(Model::Ptr model)
 {
   model_ = model;
+  model_->categories_per_column.changed.connect(sigc::hide(sigc::mem_fun(this, &View::RenderColumns)));
 
   // Fills the columns...
   RenderColumns();
@@ -116,41 +105,11 @@
   return model_;
 }
 
-void View::SetAdjustment(int x, int y)
-{
-  x_adjustment_ = x;
-  y_adjustment_ = y;
-}
-
-bool View::GetBaseGeometry(nux::Geometry& geo)
-{
-  UScreen* uscreen = UScreen::GetDefault();
-  int primary_monitor = uscreen->GetMonitorWithMouse();
-  auto monitor_geo = uscreen->GetMonitorGeometry(primary_monitor);
-
-  int w = GetAbsoluteWidth();
-  int h = GetAbsoluteHeight();
-
-  if (x_adjustment_ + w > monitor_geo.width ||
-      y_adjustment_ + h > monitor_geo.height)
-    return false;
-
-  geo.width = w;
-  geo.height = h;
-
-  geo.x = monitor_geo.x + x_adjustment_ + (monitor_geo.width - geo.width -  x_adjustment_) / 2;
-  geo.y = monitor_geo.y + y_adjustment_ + (monitor_geo.height - geo.height -  y_adjustment_) / 2;
-  return true;
-}
-
-nux::LinearLayout* View::CreateSectionLayout(const char* section_name)
+nux::LinearLayout* View::CreateSectionLayout(std::string const& section_name)
 {
   nux::VLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);
 
-  std::string name("<b>");
-  name += glib::String(g_markup_escape_text(section_name, -1)).Str();
-  name += "</b>";
-
+  std::string name("<b>"+glib::String(g_markup_escape_text(section_name.c_str(), -1)).Str()+"</b>");
   nux::StaticText* section_name_view = new nux::StaticText(name, NUX_TRACKER_LOCATION);
   section_name_view->SetTextPointSize(SECTION_NAME_FONT_SIZE);
   section_name_view->SetFontName("Ubuntu");
@@ -163,7 +122,7 @@
 
 nux::View* View::CreateShortKeyEntryView(AbstractHint::Ptr const& hint)
 {
-  nux::View* view = new SectionView(NUX_TRACKER_LOCATION);
+  auto* view = new SectionView(NUX_TRACKER_LOCATION);
 
   nux::HLayout* layout = new nux::HLayout("EntryLayout", NUX_TRACKER_LOCATION);
   view->SetLayout(layout);
@@ -173,10 +132,7 @@
 
   glib::String shortkey(g_markup_escape_text(hint->shortkey().c_str(), -1));
 
-  std::string skey = "<b>";
-  skey += shortkey.Str();
-  skey += "</b>";
-
+  std::string skey = "<b>"+shortkey.Str()+"</b>";
   nux::StaticText* shortkey_view = new nux::StaticText(skey, NUX_TRACKER_LOCATION);
   shortkey_view->SetTextAlignment(nux::StaticText::ALIGN_LEFT);
   shortkey_view->SetFontName("Ubuntu");
@@ -208,16 +164,14 @@
   layout->SetSpaceBetweenChildren(INTER_SPACE_SHORTKEY_DESCRIPTION);
   description_layout->SetContentDistribution(nux::MAJOR_POSITION_START);
 
-   auto on_shortkey_changed = [view, shortkey_view] (std::string const& new_shortkey) {
-      std::string skey("<b>");
-      skey += new_shortkey;
-      skey += "</b>";
-
-      shortkey_view->SetText(skey);
-      view->SetVisible(!new_shortkey.empty());
-   };
-
-  hint->shortkey.changed.connect(on_shortkey_changed);
+  view->key_changed_conn = hint->shortkey.changed.connect([this, view, shortkey_view] (std::string const& new_key) {
+    bool enabled = !new_key.empty();
+    shortkey_view->SetText(enabled ? "<b>"+new_key+"</b>" : "");
+    view->SetVisible(enabled);
+    QueueRelayout();
+  });
+
+  view->SetVisible(!shortkey.Str().empty());
 
   return view;
 }
@@ -245,46 +199,62 @@
 
 void View::DrawOverlay(nux::GraphicsEngine& GfxContext, bool force_draw, nux::Geometry clip)
 {
-  layout_->ProcessDraw(GfxContext, force_draw);
+  view_layout_->ProcessDraw(GfxContext, force_draw);
 }
 
 void View::RenderColumns()
 {
+  columns_layout_->Clear();
+
   int i = 0;
-  int column = 0;
+  int column_idx = 0;
+  auto const& columns = columns_layout_->GetChildren();
 
-  for (auto category : model_->categories())
+  for (auto const& category : model_->categories())
   {
-    // Three sections in the fist column...
-    if (i > 2)
-      column = 1;
+    // Computing column index based on current index
+    column_idx = i/model_->categories_per_column();
 
-    nux::LinearLayout* section_layout = CreateSectionLayout(category.c_str());
+    nux::LinearLayout* section_layout = CreateSectionLayout(category);
     nux::LinearLayout* intermediate_layout = CreateIntermediateLayout();
     intermediate_layout->SetContentDistribution(nux::MAJOR_POSITION_START);
 
-    for (auto hint : model_->hints()[category])
+    for (auto const& hint : model_->hints().at(category))
     {
       nux::View* view = CreateShortKeyEntryView(hint);
-      view->SetVisible(!hint->shortkey().empty());
       intermediate_layout->AddView(view, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
     }
 
     section_layout->AddLayout(intermediate_layout, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
-    if (i == 0 or i==1 or i==3 or i==4)
+    if ((i + 1) % model_->categories_per_column() != 0 && category != model_->categories().back())
     {
-      // Add space before the line
+      // Add a line with some padding after and before each category that is not
+      // the last of the column.
       section_layout->AddView(new nux::SpaceLayout(23, 23, 23, 23), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
       section_layout->AddView(new HSeparator(), 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-      // Add space after the line
       section_layout->AddView(new nux::SpaceLayout(20, 20, 20, 20), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
     }
 
-    columns_[column]->AddView(section_layout, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
+    nux::VLayout* column = nullptr;
+    auto column_it = std::next(columns.begin(), column_idx);
+
+    if (column_it == columns.end())
+    {
+      column = new nux::VLayout();
+      columns_layout_->AddLayout(column, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+    }
+    else
+    {
+      column = static_cast<nux::VLayout*>(*column_it);
+    }
+
+    column->AddView(section_layout, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
 
     i++;
   }
+
+  QueueRelayout();
 }
 
 //

=== modified file 'shortcuts/ShortcutView.h'
--- shortcuts/ShortcutView.h	2012-07-09 13:34:41 +0000
+++ shortcuts/ShortcutView.h	2013-01-21 21:26:21 +0000
@@ -43,13 +43,10 @@
 public:
   typedef nux::ObjectPtr<View> Ptr;
 
-  // Ctor and dtor
+  // Ctor
   View();
-  ~View();
 
   // Public methods
-  bool GetBaseGeometry(nux::Geometry&);
-  void SetAdjustment(int x, int y);
   void SetModel(Model::Ptr model);
   Model::Ptr GetModel();
 
@@ -63,7 +60,7 @@
 
 private:
   // Private methods
-  nux::LinearLayout* CreateSectionLayout(const char* section_name);
+  nux::LinearLayout* CreateSectionLayout(std::string const& section_name);
   nux::View* CreateShortKeyEntryView(AbstractHint::Ptr const& hint);
   nux::LinearLayout* CreateIntermediateLayout();
 
@@ -71,13 +68,9 @@
 
   // Private members
   Model::Ptr model_;
-
-  nux::VLayout* layout_;
   nux::HLayout* columns_layout_;
-  std::vector<nux::VLayout*> columns_;
 
-  int x_adjustment_;
-  int y_adjustment_;
+  friend class TestShortcutView;
 };
 
 } // namespace shortcut

=== modified file 'shortcuts/StandaloneShortcuts.cpp'
--- shortcuts/StandaloneShortcuts.cpp	2012-12-11 20:39:16 +0000
+++ shortcuts/StandaloneShortcuts.cpp	2013-01-21 21:26:21 +0000
@@ -33,6 +33,25 @@
 
 using namespace unity;
 
+namespace unity
+{
+namespace shortcut
+{
+struct StandaloneController : Controller
+{
+  StandaloneController(std::list<AbstractHint::Ptr> const& hints,
+                       BaseWindowRaiser::Ptr const& raiser)
+    : Controller(hints, raiser)
+  {}
+
+  nux::Geometry GetGeometryPerMonitor(int monitor) override
+  {
+    return nux::Geometry(0, 0, 1024, 700);
+  }
+};
+}
+}
+
 struct ShortcutsWindow
 {
   ShortcutsWindow()
@@ -68,133 +87,133 @@
   // Launcher...
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", _(" (Hold)"),
                                                                                  _("Opens the Launcher, displays shortcuts."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "show_launcher" )));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", "",
                                                                                  _("Opens Launcher keyboard navigation mode."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "keyboard_focus")));
 
   // FIXME: Implemstd::shared_ptr<shortcut::AbstractHint>(ent it...
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", "",
                                                                                  _("Switches applications via the Launcher."),
-                                                                                 shortcut::HARDCODED_OPTION,
+                                                                                 shortcut::OptionType::HARDCODED,
                                                                                  "Super + Tab")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", _(" + 1 to 9"),
                                                                                  _("Same as clicking on a Launcher icon."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "show_launcher")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", _(" + Shift + 1 to 9"),
                                                                                  _("Opens a new window in the app."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "show_launcher")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Launcher"), "", " + T",
                                                                                  _("Opens the Trash."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "show_launcher")));
 
   // Dash...
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", _(" (Tap)"),
                                                                                  _("Opens the Dash Home."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "show_launcher")));
 
   // These are notstd::shared_ptr<shortcut::AbstractHint>( really hardcoded...
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", " + A",
                                                                                  _("Opens the Dash App Lens."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "show_launcher")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", " + F",
                                                                                  _("Opens the Dash Files Lens."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "show_launcher")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", " + M",
                                                                                  _("Opens the Dash Music Lens."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "show_launcher")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", "",
                                                                                  _("Switches between Lenses."),
-                                                                                 shortcut::HARDCODED_OPTION,
+                                                                                 shortcut::OptionType::HARDCODED,
                                                                                  "Ctrl + Tab")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", "",
                                                                                  _("Moves the focus."),
-                                                                                 shortcut::HARDCODED_OPTION,
+                                                                                 shortcut::OptionType::HARDCODED,
                                                                                  _("Arrow Keys"))));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Dash"), "", "",
                                                                                  _("Opens the currently focused item."),
-                                                                                 shortcut::HARDCODED_OPTION,
+                                                                                 shortcut::OptionType::HARDCODED,
                                                                                  _("Enter"))));
 
   // Hud Menu Bar
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("HUD & Menu Bar"), "", _(" (Tap)"),
                                                                                   _("Opens the HUD."),
-                                                                                  shortcut::COMPIZ_KEY_OPTION,
+                                                                                  shortcut::OptionType::COMPIZ_KEY,
                                                                                   "unityshell",
                                                                                   "show_hud")));
 
   // Is it really std::shared_ptr<shortcut::AbstractHint>(hard coded?
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("HUD & Menu Bar"), "", _(" (Hold)"),
                                                                                  _("Reveals the application menu."),
-                                                                                 shortcut::HARDCODED_OPTION,
+                                                                                 shortcut::OptionType::HARDCODED,
                                                                                  "Alt")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("HUD & Menu Bar"), "", "",
                                                                                  _("Opens the indicator menu."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "panel_first_menu")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("HUD & Menu Bar"), "", "",
                                                                                  _("Moves focus between indicators."),
-                                                                                 shortcut::HARDCODED_OPTION,
+                                                                                 shortcut::OptionType::HARDCODED,
                                                                                  _("Cursor Left or Right"))));
 
   // Switching
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "",
                                                                                  _("Switches between applications."),
-                                                                                shortcut::COMPIZ_KEY_OPTION,
+                                                                                shortcut::OptionType::COMPIZ_KEY,
                                                                                 "unityshell",
                                                                                 "alt_tab_forward")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "",
                                                                                  _("Switches windows of current applications."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "unityshell",
                                                                                  "alt_tab_next_window")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "",
                                                                                  _("Moves the focus."),
-                                                                                 shortcut::HARDCODED_OPTION,
+                                                                                 shortcut::OptionType::HARDCODED,
                                                                                  _("Cursor Left or Right"))));
 
   // Workspaces
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Workspaces"), "", "",
                                                                                  _("Switches between workspaces."),
-                                                                                  shortcut::COMPIZ_KEY_OPTION,
+                                                                                  shortcut::OptionType::COMPIZ_KEY,
                                                                                  "expo",
                                                                                  "expo_key")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Workspaces"), "", "",
                                                                                  _("Switches workspaces."),
-                                                                                 shortcut::HARDCODED_OPTION,
+                                                                                 shortcut::OptionType::HARDCODED,
                                                                                  _("Arrow Keys"))));
 
   //hints.push_bacstd::shared_ptr<shortcut::AbstractHint>(k(new shortcut::MockHint(_("Workspaces"), "", "", _("Move focused window to other workspace."), ...)
@@ -202,65 +221,65 @@
   // Windows
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "",
                                                                                  _("Spreads all windows in the current workspace."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "scale",
                                                                                  "initiate_output_key")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "",
                                                                                  _("Minimises all windows."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "core",
                                                                                  "show_desktop_key")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "",
                                                                                  _("Maximises the current window."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "core",
                                                                                  "maximize_window_key")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "",
                                                                                  _("Restores or minimises the current window."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "core",
                                                                                  "unmaximize_window_key")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", _(" or Right"),
                                                                                  _("Semi-maximises the current window."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "grid",
                                                                                  "put_left_key")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "",
                                                                                  _("Closes the current window."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "core",
                                                                                  "close_window_key")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "",
                                                                                  _("Opens the window accessibility menu."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "core",
                                                                                  "window_menu_key")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "",
                                                                                  _("Places the window in corresponding position."),
-                                                                                 shortcut::HARDCODED_OPTION,
+                                                                                 shortcut::OptionType::HARDCODED,
                                                                                  "Ctrl + Alt + Num")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "",
                                                                                  _("Moves the window."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "move",
                                                                                  "initiate_key")));
 
   hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Windows"), "", "",
                                                                                  _("Resizes the current window."),
-                                                                                 shortcut::COMPIZ_KEY_OPTION,
+                                                                                 shortcut::OptionType::COMPIZ_KEY,
                                                                                  "resize",
                                                                                  "initiate_key")));
 
   auto base_window_raiser_ = std::make_shared<shortcut::BaseWindowRaiserImp>();
-  controller = std::make_shared<shortcut::Controller>(hints, base_window_raiser_);
+  controller = std::make_shared<shortcut::StandaloneController>(hints, base_window_raiser_);
   controller->Show();
 }
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-01-19 02:52:02 +0000
+++ tests/CMakeLists.txt	2013-01-21 21:26:21 +0000
@@ -229,6 +229,7 @@
                  test_resultviewgrid.cpp
                  test_searchbar.cpp
                  test_shortcut_controller.cpp
+                 test_shortcut_view.cpp
                  test_single_monitor_launcher_icon.cpp
                  test_expo_launcher_icon.cpp
                  test_showdesktop_handler.cpp

=== modified file 'tests/test_shortcut_controller.cpp'
--- tests/test_shortcut_controller.cpp	2012-12-14 18:20:13 +0000
+++ tests/test_shortcut_controller.cpp	2013-01-21 21:26:21 +0000
@@ -26,6 +26,7 @@
 using namespace unity;
 
 #include "test_utils.h"
+#include "test_uscreen_mock.h"
 
 #include <NuxCore/AnimationController.h>
 
@@ -38,24 +39,32 @@
 
   MOCK_METHOD1 (Raise, void(nux::ObjectPtr<nux::BaseWindow> window));
 };
-
-struct MockShortcutController : public shortcut::Controller
-{
-  MockShortcutController(std::list<shortcut::AbstractHint::Ptr> const& hints,
-                         shortcut::BaseWindowRaiser::Ptr const& base_window_raiser)
-    : Controller(hints, base_window_raiser)
-  {}
-
-  MOCK_METHOD1(SetOpacity, void(double));
-
-  void RealSetOpacity(double value)
-  {
-    Controller::SetOpacity(value);
-  }
-};
-
+}
+
+namespace unity
+{
+namespace shortcut
+{
 class TestShortcutController : public Test
 {
+  struct MockShortcutController : public Controller
+  {
+    MockShortcutController(std::list<AbstractHint::Ptr> const& hints,
+                           BaseWindowRaiser::Ptr const& base_window_raiser)
+      : Controller(hints, base_window_raiser)
+    {}
+
+    MOCK_METHOD1(SetOpacity, void(double));
+    using Controller::GetGeometryPerMonitor;
+    using Controller::ConstructView;
+    using Controller::view_;
+
+    void RealSetOpacity(double value)
+    {
+      Controller::SetOpacity(value);
+    }
+  };
+
 public:
   TestShortcutController()
     : base_window_raiser_(std::make_shared<MockBaseWindowRaiser>())
@@ -66,10 +75,11 @@
       .WillByDefault(Invoke(&controller_, &MockShortcutController::RealSetOpacity));
   }
 
+  MockUScreen uscreen;
   Settings unity_settings;
   std::list<shortcut::AbstractHint::Ptr> hints_;
   MockBaseWindowRaiser::Ptr base_window_raiser_;
-  MockShortcutController controller_;
+  NiceMock<MockShortcutController> controller_;
 
   nux::animation::TickSource tick_source_;
   nux::animation::AnimationController animation_controller_;
@@ -101,5 +111,24 @@
   tick_source_.tick(1000);
 }
 
-
+TEST_F (TestShortcutController, GetGeometryPerMonitor)
+{
+  nux::Geometry good_monitor(0, 0, 1366, 768);
+  nux::Geometry invalid_monitor(good_monitor.x + good_monitor.width, 0, 1, 1);
+  uscreen.SetMonitors({good_monitor, invalid_monitor});
+
+  nux::Point offset(g_random_int_range(0, 100), g_random_int_range(0, 100));
+  controller_.SetAdjustment(offset.x, offset.y);
+  controller_.ConstructView();
+
+  nux::Geometry expected = controller_.view_->GetAbsoluteGeometry();
+  expected.x = good_monitor.x + offset.x + (good_monitor.width - expected.width - offset.x) / 2;
+  expected.y = good_monitor.y + offset.y + (good_monitor.height - expected.height - offset.y) / 2;
+  EXPECT_EQ(controller_.GetGeometryPerMonitor(0), expected);
+
+  EXPECT_TRUE(controller_.GetGeometryPerMonitor(1).IsNull());
+}
+
+
+}
 }

=== modified file 'tests/test_shortcut_model.cpp'
--- tests/test_shortcut_model.cpp	2012-03-29 05:14:03 +0000
+++ tests/test_shortcut_model.cpp	2013-01-21 21:26:21 +0000
@@ -18,6 +18,7 @@
  */
 
 #include <memory>
+#include <stdexcept>
 #include <gtest/gtest.h>
 
 #include "MockShortcutHint.h"
@@ -31,55 +32,79 @@
 {
   std::list<AbstractHint::Ptr> hints;
 
-  hints.push_back(std::make_shared<MockHint>("Launcher", "", "", "Description 1", COMPIZ_KEY_OPTION, "Plugin 1", "key_option_1"));
-  hints.push_back(std::make_shared<MockHint>("Launcher", "", "", "Description 2", HARDCODED_OPTION, "Value 2"));
-  hints.push_back(std::make_shared<MockHint>("Dash", "Prefix", "Postfix", "Description 3", COMPIZ_KEY_OPTION, "Plugin 3", "key_option_3"));
-  hints.push_back(std::make_shared<MockHint>("Menu Bar", "Prefix", "Postfix", "Description 4", HARDCODED_OPTION, "Value4"));
+  hints.push_back(std::make_shared<MockHint>("Launcher", "", "", "Description 1", OptionType::COMPIZ_KEY, "Plugin 1", "key_option_1"));
+  hints.push_back(std::make_shared<MockHint>("Launcher", "", "", "Description 2", OptionType::HARDCODED, "Value 2"));
+  hints.push_back(std::make_shared<MockHint>("Dash", "Prefix", "Postfix", "Description 3", OptionType::COMPIZ_KEY, "Plugin 3", "key_option_3"));
+  hints.push_back(std::make_shared<MockHint>("Menu Bar", "Prefix", "Postfix", "Description 4", OptionType::HARDCODED, "Value4"));
 
   Model model(hints);
 
+  EXPECT_EQ(model.categories_per_column(), 3);
   EXPECT_EQ(model.categories().size(), 3);
-  EXPECT_EQ(model.hints()["Launcher"].size(), 2);
-  EXPECT_EQ(model.hints()["Dash"].size(), 1);
-  EXPECT_EQ(model.hints()["Menu Bar"].size(), 1);
-  EXPECT_EQ(model.hints()["Unity"].size(), 0);
+  EXPECT_EQ(model.hints().at("Launcher").size(), 2);
+  EXPECT_EQ(model.hints().at("Dash").size(), 1);
+  EXPECT_EQ(model.hints().at("Menu Bar").size(), 1);
+  EXPECT_EQ(model.hints().find("Unity"), model.hints().end());
 }
 
 TEST(TestShortcutModel, TestFill)
 {
   std::list<AbstractHint::Ptr> hints;
 
-  hints.push_back(std::make_shared<MockHint>("Launcher", "", "", "Description 1", COMPIZ_KEY_OPTION, "Plugin 1", "key_option_1"));
-  hints.push_back(std::make_shared<MockHint>("Launcher", "", "", "Description 2", HARDCODED_OPTION, "Value 2"));
-  hints.push_back(std::make_shared<MockHint>("Dash", "Prefix", "Postfix", "Description 3", COMPIZ_KEY_OPTION, "Plugin 3", "key_option_3"));
-  hints.push_back(std::make_shared<MockHint>("Menu Bar", "Prefix", "Postfix", "Description 4", HARDCODED_OPTION, "Value 4"));
+  hints.push_back(std::make_shared<MockHint>("Launcher", "", "", "Description 1", OptionType::COMPIZ_KEY, "Plugin 1", "key_option_1"));
+  hints.push_back(std::make_shared<MockHint>("Launcher", "", "", "Description 2", OptionType::HARDCODED, "Value 2"));
+  hints.push_back(std::make_shared<MockHint>("Dash", "Prefix", "Postfix", "Description 3", OptionType::COMPIZ_KEY, "Plugin 3", "key_option_3"));
+  hints.push_back(std::make_shared<MockHint>("Menu Bar", "Prefix", "Postfix", "Description 4", OptionType::HARDCODED, "Value 4"));
 
   Model model(hints);
 
   model.Fill();
 
   // We cannot test CompOption here... :/
-  EXPECT_EQ(model.hints()["Launcher"].front()->value(), "Plugin 1-key_option_1");
-  EXPECT_EQ(model.hints()["Launcher"].back()->value(), "Value 2");
-  EXPECT_EQ(model.hints()["Dash"].front()->value(),"Plugin 3-key_option_3");
-  EXPECT_EQ(model.hints()["Menu Bar"].front()->value(), "Value 4");
+  EXPECT_EQ(model.hints().at("Launcher").front()->value(), "Plugin 1-key_option_1");
+  EXPECT_EQ(model.hints().at("Launcher").back()->value(), "Value 2");
+  EXPECT_EQ(model.hints().at("Dash").front()->value(),"Plugin 3-key_option_3");
+  EXPECT_EQ(model.hints().at("Menu Bar").front()->value(), "Value 4");
 }
 
 TEST(TestShortcutModel, TestProperty)
 {
   std::list<AbstractHint::Ptr> hints;
 
-  hints.push_back(std::make_shared<MockHint>("Launcher", "Prefix1", "Postfix1", "Description1", COMPIZ_KEY_OPTION, "Plugin1", "key_option1"));
-
-  Model model(hints);
-
-  EXPECT_EQ(model.hints()["Launcher"].front()->category(), "Launcher");
-  EXPECT_EQ(model.hints()["Launcher"].front()->prefix(), "Prefix1");
-  EXPECT_EQ(model.hints()["Launcher"].front()->postfix(), "Postfix1");
-  EXPECT_EQ(model.hints()["Launcher"].front()->description(), "Description1");
-  EXPECT_EQ(model.hints()["Launcher"].front()->type(), COMPIZ_KEY_OPTION);
-  EXPECT_EQ(model.hints()["Launcher"].front()->arg1(), "Plugin1");
-  EXPECT_EQ(model.hints()["Launcher"].front()->arg2(), "key_option1");
+  hints.push_back(std::make_shared<MockHint>("Launcher", "Prefix1", "Postfix1", "Description1", OptionType::COMPIZ_KEY, "Plugin1", "key_option1"));
+
+  Model model(hints);
+
+  EXPECT_EQ(model.hints().at("Launcher").front()->category(), "Launcher");
+  EXPECT_EQ(model.hints().at("Launcher").front()->prefix(), "Prefix1");
+  EXPECT_EQ(model.hints().at("Launcher").front()->postfix(), "Postfix1");
+  EXPECT_EQ(model.hints().at("Launcher").front()->description(), "Description1");
+  EXPECT_EQ(model.hints().at("Launcher").front()->type(), OptionType::COMPIZ_KEY);
+  EXPECT_EQ(model.hints().at("Launcher").front()->arg1(), "Plugin1");
+  EXPECT_EQ(model.hints().at("Launcher").front()->arg2(), "key_option1");
+}
+
+TEST(TestShortcutModel, CategoriesPerColumnSetter)
+{
+  std::list<AbstractHint::Ptr> hints;
+  Model model(hints);
+
+  bool changed = false;
+  model.categories_per_column.changed.connect([&changed] (int) {changed = true;});
+
+  model.categories_per_column = 3456789;
+  EXPECT_TRUE(changed);
+  EXPECT_EQ(model.categories_per_column(), 3456789);
+
+  changed = false;
+  model.categories_per_column = 0;
+  EXPECT_TRUE(changed);
+  EXPECT_EQ(model.categories_per_column(), 1);
+
+  changed = false;
+  model.categories_per_column = -1;
+  EXPECT_FALSE(changed);
+  EXPECT_EQ(model.categories_per_column(), 1);
 }
 
 } // anonymouse namespace

=== added file 'tests/test_shortcut_view.cpp'
--- tests/test_shortcut_view.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_shortcut_view.cpp	2013-01-21 21:26:21 +0000
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY 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
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Marco Trevisan <[e-mail]>
+ */
+
+#include <gmock/gmock.h>
+using namespace testing;
+
+#include "ShortcutView.h"
+#include "ShortcutModel.h"
+#include "MockShortcutHint.h"
+#include "UnitySettings.h"
+#include "LineSeparator.h"
+
+namespace unity
+{
+namespace shortcut
+{
+struct TestShortcutView : Test
+{
+  struct MockShortcutView : View
+  {
+    using View::columns_layout_;
+  };
+
+  Model::Ptr GetMockModel(std::vector<std::string> const& categories, unsigned number)
+  {
+    std::list<AbstractHint::Ptr> hints;
+
+    for (auto const& category : categories)
+    {
+      for (unsigned i = 0; i < number; ++i)
+      {
+        auto str_id = category + std::to_string(i);
+        auto hint = std::make_shared<MockHint>(category, "", "", "Description "+str_id, OptionType::HARDCODED, "Value "+str_id);
+        hints.push_back(hint);
+      }
+    }
+
+    return std::make_shared<Model>(hints);
+  }
+
+  Settings settings;
+  MockShortcutView view;
+};
+
+TEST_F(TestShortcutView, Construction)
+{
+  EXPECT_NE(view.GetLayout(), nullptr);
+  auto const& children = view.GetLayout()->GetChildren();
+  EXPECT_NE(std::find(children.begin(), children.end(), view.columns_layout_), children.end());
+}
+
+TEST_F(TestShortcutView, SetModel)
+{
+  auto model = GetMockModel({}, 0);
+  view.SetModel(model);
+  EXPECT_EQ(view.GetModel(), model);
+  EXPECT_FALSE(model->categories_per_column.changed.empty());
+}
+
+TEST_F(TestShortcutView, SettingModelAddsColumns)
+{
+  auto model = GetMockModel({"Cat1", "Cat2"}, 1);
+  model->categories_per_column = 1;
+  view.SetModel(model);
+
+  EXPECT_EQ(view.columns_layout_->GetChildren().size(), 2);
+}
+
+TEST_F(TestShortcutView, SettingModelRebuildsColumns)
+{
+  auto model1 = GetMockModel({"Cat1", "Cat2"}, 1);
+  model1->categories_per_column = 1;
+  view.SetModel(model1);
+  ASSERT_EQ(view.columns_layout_->GetChildren().size(), 2);
+
+  auto model2 = GetMockModel({"Cat1"}, 1);
+  model2->categories_per_column = 1;
+  view.SetModel(model2);
+  EXPECT_EQ(view.columns_layout_->GetChildren().size(), 1);
+}
+
+TEST_F(TestShortcutView, ChangingModelParametersRebuildsColumns)
+{
+  auto model = GetMockModel({"Cat1", "Cat2", "Cat3", "Cat4", "Cat5"}, 1);
+  model->categories_per_column = std::numeric_limits<int>::max();
+  view.SetModel(model);
+
+  for (unsigned i = 1; i <= model->categories().size() * 10; ++i)
+  {
+    model->categories_per_column = i;
+    int expected_columns = std::ceil(model->categories().size() / static_cast<double>(model->categories_per_column));
+    ASSERT_EQ(view.columns_layout_->GetChildren().size(), expected_columns);
+
+    int added_cats = 0;
+    for (auto col : view.columns_layout_->GetChildren())
+    {
+      int expected_cats = model->categories_per_column();
+
+      if (expected_cats > int(model->categories().size()) ||
+          added_cats == (expected_columns - 1) * model->categories_per_column)
+      {
+        expected_cats = model->categories().size() - added_cats;
+      }
+
+      ASSERT_EQ(dynamic_cast<nux::Layout*>(col)->GetChildren().size(), expected_cats);
+      added_cats += expected_cats;
+    }
+  }
+}
+
+TEST_F(TestShortcutView, CategoryHasSeparator)
+{
+  auto model = GetMockModel({"Cat1", "Cat2", "Cat3", "Cat4", "Cat5"}, 1);
+  model->categories_per_column = std::numeric_limits<int>::max();
+  view.SetModel(model);
+
+  for (unsigned i = 1; i <= model->categories().size(); ++i)
+  {
+    model->categories_per_column = i;
+
+    for (auto col : view.columns_layout_->GetChildren())
+    {
+      auto column = dynamic_cast<nux::Layout*>(col);
+
+      for (auto section : column->GetChildren())
+      {
+        unsigned found_separators = 0;
+        for (auto item : dynamic_cast<nux::Layout*>(section)->GetChildren())
+          if (dynamic_cast<HSeparator*>(item))
+            ++found_separators;
+
+        ASSERT_EQ(found_separators, section != column->GetChildren().back() ? 1 : 0);
+      }
+    }
+
+  }
+}
+
+TEST_F(TestShortcutView, QueueRelayoutOnHintChange)
+{
+  auto model = GetMockModel({"Cat"}, 1);
+  view.SetModel(model);
+
+  // Removing any queued relayout from WT, so that we can check if we queue a new one
+  nux::GetWindowThread()->RemoveObjectFromLayoutQueue(&view);
+  ASSERT_FALSE(nux::GetWindowThread()->RemoveObjectFromLayoutQueue(&view));
+
+  // Changing a shortkey should queue a relayout
+  model->hints().at("Cat").front()->shortkey.changed.emit("New Key!");
+  EXPECT_TRUE(nux::GetWindowThread()->RemoveObjectFromLayoutQueue(&view));
+}
+
+TEST_F(TestShortcutView, HintSignalsDisconnectedOnCleanup)
+{
+  AbstractHint::Ptr hint;
+  {
+    MockShortcutView mock_view;
+    mock_view.SetModel(GetMockModel({"Cat"}, 1));
+    hint = mock_view.GetModel()->hints().at("Cat").front();
+    ASSERT_FALSE(hint->shortkey.changed.empty());
+  }
+
+  ASSERT_TRUE(hint->shortkey.changed.empty());
+  hint->shortkey.changed.emit("New Key!");
+}
+
+TEST_F(TestShortcutView, HintSignalsDisconnectedOnModelReplace)
+{
+  AbstractHint::Ptr hint;
+  view.SetModel(GetMockModel({"Cat"}, 1));
+  hint = view.GetModel()->hints().at("Cat").front();
+  ASSERT_FALSE(hint->shortkey.changed.empty());
+
+  // Replacing the model with a new one
+  view.SetModel(GetMockModel({"Cat"}, 1));
+
+  ASSERT_TRUE(hint->shortkey.changed.empty());
+  hint->shortkey.changed.emit("New Key!");
+}
+
+}
+}

=== modified file 'tests/test_uscreen_mock.h'
--- tests/test_uscreen_mock.h	2012-11-23 02:11:55 +0000
+++ tests/test_uscreen_mock.h	2013-01-21 21:26:21 +0000
@@ -79,6 +79,15 @@
         changed.emit(primary_, monitors_);
     }
   }
+
+  void SetMonitors(std::vector<nux::Geometry> const& monitors)
+  {
+    if (!std::equal(monitors_.begin(), monitors_.end(), monitors.begin()))
+    {
+      monitors_ = monitors;
+      changed.emit(primary_, monitors_);
+    }
+  }
 };
 
 }