Changeset 5867 for branches/VRP/HeuristicLab.Problems.VehicleRouting.Views

Timestamp:

03/29/11 15:40:01 (13 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4

Files:

• HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj (modified) (2 diffs)
• VRPImportDialog.Designer.cs (modified) (3 diffs)
• VRPSolutionView.Designer.cs (modified) (2 diffs)
• VehicleRoutingProblemView.Designer.cs (modified) (4 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.Problems.VehicleRouting.Views</RootNamespace>
     <AssemblyName>HeuristicLab.Problems.VehicleRouting.Views-3.4</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -34 +34 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs

@@ -100 +100 @@
       // 
       this.openVRPFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.openVRPFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
+      this.openVRPFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
       this.openVRPFileButton.Location = new System.Drawing.Point(520, 10);
       this.openVRPFileButton.Name = "openVRPFileButton";
@@ -131 +131 @@
       // 
       this.openTourFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.openTourFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
+      this.openTourFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
       this.openTourFileButton.Location = new System.Drawing.Point(520, 35);
       this.openTourFileButton.Name = "openTourFileButton";
@@ -161 +161 @@
       // 
       this.clearTourFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.clearTourFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Remove;
+      this.clearTourFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Remove;
       this.clearTourFileButton.Location = new System.Drawing.Point(550, 35);
       this.clearTourFileButton.Name = "clearTourFileButton";

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.Designer.cs

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      this.tabControl1 = new System.Windows.Forms.TabControl();
+      this.tabControl1 = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
       this.tabPage1 = new System.Windows.Forms.TabPage();
       this.problemInstanceView = new HeuristicLab.MainForm.WindowsForms.ViewHost();
@@ -119 +119 @@
     #endregion
 
-    private System.Windows.Forms.TabControl tabControl1;
+    private HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl1;
     private System.Windows.Forms.TabPage tabPage1;
     private MainForm.WindowsForms.ViewHost problemInstanceView;

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.Designer.cs

@@ -33 +33 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
+      this.nameTextBox.Location = new System.Drawing.Point(60, 0);
+      this.nameTextBox.Size = new System.Drawing.Size(405, 20);
+      // 
+      // infoLabel
+      // 
+      this.infoLabel.Location = new System.Drawing.Point(471, 3);
       // 
       // importButton
@@ -38 +44 @@
       this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.importButton.Location = new System.Drawing.Point(0, 55);
+      this.importButton.Location = new System.Drawing.Point(0, 26);
       this.importButton.Name = "importButton";
       this.importButton.Size = new System.Drawing.Size(490, 23);
@@ -53 +59 @@
       this.parameterCollectionView.Caption = "ParameterCollection View";
       this.parameterCollectionView.Content = null;
-      this.parameterCollectionView.Location = new System.Drawing.Point(0, 84);
+      this.parameterCollectionView.Location = new System.Drawing.Point(0, 55);
       this.parameterCollectionView.Name = "parameterCollectionView";
       this.parameterCollectionView.ReadOnly = false;
-      this.parameterCollectionView.Size = new System.Drawing.Size(490, 268);
+      this.parameterCollectionView.Size = new System.Drawing.Size(490, 210);
       this.parameterCollectionView.TabIndex = 9;
       // 
@@ -65 +71 @@
       this.Controls.Add(this.importButton);
       this.Name = "VehicleRoutingProblemView";
-      this.Size = new System.Drawing.Size(490, 352);
+      this.Size = new System.Drawing.Size(490, 275);
       this.Controls.SetChildIndex(this.importButton, 0);
       this.Controls.SetChildIndex(this.parameterCollectionView, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
-      this.Controls.SetChildIndex(this.descriptionLabel, 0);
-      this.Controls.SetChildIndex(this.descriptionTextBox, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);