Changeset 7383 for branches/HiveHiveEngine/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems

Timestamp:

01/20/12 13:52:51 (13 years ago)

Author:

ascheibe

Message:

#1745 merged trunk changes into branch

Location:

branches/HiveHiveEngine

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs (modified) (2 diffs)

branches/HiveHiveEngine

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user

branches/HiveHiveEngine/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Windows.Forms;
 using HeuristicLab.Clients.Hive;
 using HeuristicLab.MainForm;
@@ -38 +39 @@
       get { return 10000; }
     }
+    public override Keys ShortCutKeys {
+      get { return Keys.Control | Keys.H; }
+    }
   }
 }

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user