Changeset 7270 for branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms

Timestamp:

01/04/12 16:45:02 (13 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (1 prop)
• HeuristicLab.MainForm.WindowsForms/3.3/ActionUserInterfaceItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ControlExtensions.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/Sidebar.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/Sidebar.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs (modified) (5 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockingMainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockingMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DocumentForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DocumentForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MultipleDocumentMainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MultipleDocumentMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/SingleDocumentMainForm.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MainForms/SingleDocumentMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/MenuItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/ToolBarItem.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/AsynchronousContentView.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/AsynchronousContentView.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/ContentView.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/ContentView.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/View.Designer.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.3/Views/View.cs (modified) (1 diff)

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/ActionUserInterfaceItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ControlExtensions.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Controls/Sidebar.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Controls/Sidebar.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewContextMenuStrip.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ViewHost));
       this.messageLabel = new System.Windows.Forms.Label();
       this.viewsLabel = new System.Windows.Forms.Label();
@@ -73 +72 @@
       this.viewsLabel.Size = new System.Drawing.Size(16, 16);
       this.viewsLabel.TabIndex = 0;
-      this.toolTip.SetToolTip(this.viewsLabel, "Double-click to open a new window of the current view.\r\nRight-click to change cur" +
-              "rent view.\r\nDrag icon to copy or link content to another view.");
+      this.toolTip.SetToolTip(this.viewsLabel,
+        "Double-click to open a new window of the current view." + System.Environment.NewLine +
+        "Right-click to change current view." + System.Environment.NewLine +
+        "Drag icon to copy or link content to another view.");
       this.viewsLabel.DoubleClick += new System.EventHandler(this.viewsLabel_DoubleClick);
       this.viewsLabel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.viewsLabel_MouseDown);
@@ -95 +96 @@
       this.configurationLabel.Name = "configurationLabel";
       this.configurationLabel.Size = new System.Drawing.Size(16, 16);
-      this.configurationLabel.TabIndex = 0;
+      this.configurationLabel.TabIndex = 1;
+      this.toolTip.SetToolTip(this.configurationLabel, "Double-click to open view configuration.");
       this.configurationLabel.Visible = false;
-      this.configurationLabel.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.configurationLabel_MouseDoubleClick);
+      this.configurationLabel.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.configurationLabel_DoubleClick);
       // 
       // ViewHost
@@ -111 +113 @@
 
     }
+    #endregion
 
-    #endregion
     private System.Windows.Forms.Label viewsLabel;
     private System.Windows.Forms.Label messageLabel;

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Controls/ViewHost.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -293 +293 @@
     }
 
-    private void configurationLabel_MouseDoubleClick(object sender, MouseEventArgs e) {
+    private void configurationLabel_DoubleClick(object sender, MouseEventArgs e) {
       ((IConfigureableView)ActiveView).ShowConfiguration();
     }

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockingMainForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DockingMainForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DocumentForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/DocumentForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MainForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MultipleDocumentMainForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/MultipleDocumentMainForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/SingleDocumentMainForm.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MainForms/SingleDocumentMainForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/MenuItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 
 namespace HeuristicLab.MainForm.WindowsForms {
-  [Plugin("HeuristicLab.MainForm.WindowsForms", "3.3.5.$WCREV$")]
+  [Plugin("HeuristicLab.MainForm.WindowsForms", "3.3.6.$WCREV$")]
   [PluginFile("HeuristicLab.MainForm.WindowsForms-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/ToolBarItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Views/AsynchronousContentView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Views/AsynchronousContentView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Views/ContentView.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Views/ContentView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Views/View.Designer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HeuristicLab.Hive.Azure/HeuristicLab.MainForm.WindowsForms/3.3/Views/View.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.