Merge lp:~azzar1/unity/fix-939517 into lp:unity

[Andrea Azzarone]

= The Problem =

The shortcut overlay uses hardcoded value for switching ws.

= The Fix =

Add a new type of shortcut option COMPIZ_METAKEY_OPTION.

= Testing =

Added.

[Mirco Müller (macslow)]

Code looks ok, unity compiles and runs, test is provided and passes... approved.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/429/console reported an error when processing this lp:~andyrock/unity/fix-939517 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/450/console reported an error when processing this lp:~andyrock/unity/fix-939517 branch.
Not merging it.

=== modified file 'plugins/unityshell/src/AbstractShortcutHint.h'
--- plugins/unityshell/src/AbstractShortcutHint.h	2011-12-19 22:02:10 +0000
+++ plugins/unityshell/src/AbstractShortcutHint.h	2012-02-28 12:15:23 +0000
@@ -33,6 +33,7 @@
 enum OptionType
 {
   COMPIZ_KEY_OPTION = 0,
+  COMPIZ_METAKEY_OPTION,
   COMPIZ_MOUSE_OPTION,
   HARDCODED_OPTION
   /* GSETTINGS_OPTION,

=== modified file 'plugins/unityshell/src/MockShortcutHint.h'
--- plugins/unityshell/src/MockShortcutHint.h	2011-12-19 22:02:10 +0000
+++ plugins/unityshell/src/MockShortcutHint.h	2012-02-28 12:15:23 +0000
@@ -52,6 +52,7 @@
     {
       case COMPIZ_MOUSE_OPTION:
       case COMPIZ_KEY_OPTION:
+      case COMPIZ_METAKEY_OPTION:
         value = arg1() + "-" + arg2();
         shortkey = prefix() + value() + postfix();
         return true;

=== modified file 'plugins/unityshell/src/ShortcutHint.cpp'
--- plugins/unityshell/src/ShortcutHint.cpp	2011-12-19 22:02:10 +0000
+++ plugins/unityshell/src/ShortcutHint.cpp	2012-02-28 12:15:23 +0000
@@ -118,6 +118,35 @@
 
       break;
     }
+    case COMPIZ_METAKEY_OPTION:
+    {
+      // Arg1 = Plugin name
+      // Arg2 = key Option name
+      CompPlugin* p = CompPlugin::find(arg1().c_str());
+
+      if (!p) 
+        return false;
+
+      foreach (CompOption &opt, p->vTable->getOptions())
+      {
+          if (opt.name() == arg2())
+          {
+            std::string temp(impl::GetMetaKey(opt.value().action().keyToString()));
+            temp = impl::FixShortcutFormat(temp);
+            temp = impl::ProperCase(temp);
+            
+            if (value() != temp)
+            {
+              value = temp;
+              shortkey = prefix() + value() + postfix();
+            }
+              
+            return true;
+          }
+      }
+
+      break;
+    }
     case HARDCODED_OPTION:
       if (value != arg1())
       {

=== modified file 'plugins/unityshell/src/ShortcutHintPrivate.cpp'
--- plugins/unityshell/src/ShortcutHintPrivate.cpp	2012-02-18 11:47:22 +0000
+++ plugins/unityshell/src/ShortcutHintPrivate.cpp	2012-02-28 12:15:23 +0000
@@ -29,6 +29,15 @@
 namespace impl
 {
 
+std::string GetMetaKey(std::string const& scut)
+{
+  size_t index = scut.find_last_of( ">");
+  if (index >= 0)
+    return std::string(scut.begin(), scut.begin() + index + 1);
+  else
+    return "";
+}
+
 std::string FixShortcutFormat(std::string const& scut)
 {
   std::string ret(scut.begin(), scut.end() - 1);

=== modified file 'plugins/unityshell/src/ShortcutHintPrivate.h'
--- plugins/unityshell/src/ShortcutHintPrivate.h	2011-12-19 22:02:10 +0000
+++ plugins/unityshell/src/ShortcutHintPrivate.h	2012-02-28 12:15:23 +0000
@@ -28,6 +28,7 @@
 namespace impl
 {
 
+std::string GetMetaKey(std::string const& scut);
 std::string FixShortcutFormat(std::string const& scut);
 std::string FixMouseShortcut(std::string const& scut);
 std::string ProperCase(std::string const& str);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-02-28 08:29:22 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-02-28 12:15:23 +0000
@@ -2641,8 +2641,8 @@
   // Workspaces
   std::string const workspaces = _("Workspaces");
   hints_.push_back(new shortcut::Hint(workspaces, "", "", _("Spread workspaces."), shortcut::COMPIZ_KEY_OPTION, "expo", "expo_key"));
-  hints_.push_back(new shortcut::Hint(workspaces, "", "", _("Switch workspaces."), shortcut::HARDCODED_OPTION, _("Control + Alt + Cursor Keys")));
-  hints_.push_back(new shortcut::Hint(workspaces, "", "", _("Move focused window to different workspace."), shortcut::HARDCODED_OPTION, _("Control + Alt + Shift + Cursor Keys")));
+  hints_.push_back(new shortcut::Hint(workspaces, "",  _(" + Cursor Keys"), _("Switch workspaces."), shortcut::COMPIZ_METAKEY_OPTION, "wall", "left_key"));
+  hints_.push_back(new shortcut::Hint(workspaces, "",  _(" + Cursor Keys"), _("Move focused window to different workspace."), shortcut::COMPIZ_METAKEY_OPTION, "wall", "left_window_key"));
 
   // Windows
   std::string const windows = _("Windows");

=== modified file 'tests/test_shortcut_private.cpp'
--- tests/test_shortcut_private.cpp	2011-12-19 22:15:05 +0000
+++ tests/test_shortcut_private.cpp	2012-02-28 12:15:23 +0000
@@ -68,7 +68,15 @@
   EXPECT_EQ(FixMouseShortcut("Super<Button1>"), "Super<Left Mouse>");
   EXPECT_EQ(FixMouseShortcut("Super<Button2>"), "Super<Middle Mouse>");
   EXPECT_EQ(FixMouseShortcut("Super<Button3>"), "Super<Right Mouse>");
+}
 
+TEST(TestShortcutHintPrivate, TestGetMetaKey)
+{
+  EXPECT_EQ(GetMetaKey("<Super>"), "<Super>");
+  EXPECT_EQ(GetMetaKey("<Super><Alt>"), "<Super><Alt>");
+  EXPECT_EQ(GetMetaKey("<Super>A"), "<Super>");
+  EXPECT_EQ(GetMetaKey("<Super><Alt>A"), "<Super><Alt>");
+  EXPECT_EQ(GetMetaKey("ABC"), "");
 }
 
 } // anonymouse namespace