Merge pull request #145 from SlavaRa/develop

closes #144
SlavaRa · Jun 11, 2016 · 7e5fc1c · 7e5fc1c
2 parents 235b8dd + e9815b1
commit 7e5fc1c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/QuickNavigate/Helpers/FormHelper.cs b/QuickNavigate/Helpers/FormHelper.cs
@@ -135,6 +135,8 @@ class ShortcutId
         public const string RecentProjects = "QuickNavigate.RecentProjects";
         public const string GotoNextMember = "QuickNavigate.GotoNextMember";
         public const string GotoPreviousMember = "QuickNavigate.GotoPreviousMember";
+        public const string GotoNextTab = "QuickNavigate.GotoNextTab";
+        public const string GotoPreviousTab = "QuickNavigate.GotoPreviousTab";
     }
 
     class QuickContextMenuItem

diff --git a/QuickNavigate/PluginMain.cs b/QuickNavigate/PluginMain.cs
@@ -123,11 +123,15 @@ public void HandleEvent(object sender, NotifyEvent e, HandlingPriority priority)
                     }
                     break;
                 case EventType.Keys:
-                    var ke = e as KeyEvent;
-                    if (ke.Value == PluginBase.MainForm.GetShortcutItemKeys(ShortcutId.GotoPreviousMember))
+                    var value = ((KeyEvent) e).Value;
+                    if (value == PluginBase.MainForm.GetShortcutItemKeys(ShortcutId.GotoPreviousMember))
                         GotoPreviousMember();
-                    else if (ke.Value == PluginBase.MainForm.GetShortcutItemKeys(ShortcutId.GotoNextMember))
+                    else if (value == PluginBase.MainForm.GetShortcutItemKeys(ShortcutId.GotoNextMember))
                         GotoNextMember();
+                    else if (value == PluginBase.MainForm.GetShortcutItemKeys(ShortcutId.GotoPreviousTab))
+                        GotoPreviousTab();
+                    else if (value == PluginBase.MainForm.GetShortcutItemKeys(ShortcutId.GotoNextTab))
+                        GotoNextTab();
                     break;
             }
 		}
@@ -198,6 +202,8 @@ void CreateMenuItems()
             menu.DropDownItems.Add(item);
             PluginBase.MainForm.RegisterShortcutItem(ShortcutId.GotoNextMember, Keys.None);
             PluginBase.MainForm.RegisterShortcutItem(ShortcutId.GotoPreviousMember, Keys.None);
+            PluginBase.MainForm.RegisterShortcutItem(ShortcutId.GotoPreviousTab, Keys.None);
+            PluginBase.MainForm.RegisterShortcutItem(ShortcutId.GotoNextTab, Keys.None);
         }
 
         /// <summary>
@@ -388,6 +394,24 @@ static List<MemberModel> GetCurrentFileMembers()
             return result;
         }
 
+        static void GotoPreviousTab()
+        {
+            var documents = PluginBase.MainForm.Documents;
+            if (documents.Length < 2) return;
+            var index = Array.IndexOf(documents, PluginBase.MainForm.CurrentDocument) - 1;
+            if (index == -1) index = documents.Length - 1;
+            documents[index].Activate();
+        }
+
+        static void GotoNextTab()
+        {
+            var documents = PluginBase.MainForm.Documents;
+            if (documents.Length < 2) return;
+            var index = Array.IndexOf(documents, PluginBase.MainForm.CurrentDocument) + 1;
+            if (index == documents.Length) index = 0;
+            documents[index].Activate();
+        }
+
         #endregion
 
         static void SetDocumentClass([NotNull] MemberModel model)