Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.Designer.cs
===================================================================
diff -u -r6791 -r6964
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.Designer.cs	(.../DamProjectCalculationSpecificationPropertyControl.Designer.cs)	(revision 6791)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.Designer.cs	(.../DamProjectCalculationSpecificationPropertyControl.Designer.cs)	(revision 6964)
@@ -30,6 +30,7 @@
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;
+        
 
         /// <summary> 
         /// Clean up any resources being used.
@@ -45,6 +46,11 @@
         }
 
         #region Component Designer generated code
+        private DevExpress.XtraEditors.PanelControl CalculationDefinitionPanelControl;
+        private DevExpress.XtraEditors.LabelControl FailureMechanismLabel;
+        private DevExpress.XtraEditors.ComboBoxEdit FailureMechanismCombobox;
+        private DevExpress.XtraEditors.ComboBoxEdit CalculationModelComboBox;
+        private DevExpress.XtraEditors.LabelControl CalculationModelLabel;
 
         /// <summary> 
         /// Required method for Designer support - do not modify 
@@ -54,15 +60,19 @@
         {
             this.CalculationSpecificationsGroupControl = new DevExpress.XtraEditors.GroupControl();
             this.damProjectCalculationOptionsPropertyControl1 = new Deltares.Dam.Forms.DamProjectCalculationOptionsPropertyControl();
-            this.Grid = new Deltares.Standard.Forms.DExpress.GridViewControl();
+            this.CalculationDefinitionPanelControl = new DevExpress.XtraEditors.PanelControl();
+            this.FailureMechanismLabel = new DevExpress.XtraEditors.LabelControl();
+            this.FailureMechanismCombobox = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.CalculationModelComboBox = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.CalculationModelLabel = new DevExpress.XtraEditors.LabelControl();
             ((System.ComponentModel.ISupportInitialize)(this.CalculationSpecificationsGroupControl)).BeginInit();
             this.CalculationSpecificationsGroupControl.SuspendLayout();
             this.SuspendLayout();
             // 
             // CalculationSpecificationsGroupControl
             // 
             this.CalculationSpecificationsGroupControl.Controls.Add(this.damProjectCalculationOptionsPropertyControl1);
-            this.CalculationSpecificationsGroupControl.Controls.Add(this.Grid);
+            this.CalculationSpecificationsGroupControl.Controls.Add(this.CalculationDefinitionPanelControl);
             this.CalculationSpecificationsGroupControl.Dock = System.Windows.Forms.DockStyle.Top;
             this.CalculationSpecificationsGroupControl.Location = new System.Drawing.Point(0, 0);
             this.CalculationSpecificationsGroupControl.Margin = new System.Windows.Forms.Padding(4);
@@ -82,25 +92,67 @@
             this.damProjectCalculationOptionsPropertyControl1.Size = new System.Drawing.Size(324, 668);
             this.damProjectCalculationOptionsPropertyControl1.TabIndex = 14;
             // 
-            // Grid
+            // Calculation specification groupbox
             // 
-            this.Grid.AdjustHeightToFit = false;
-            this.Grid.AllowAddDeleteOnly = false;
-            this.Grid.AllowedUserColumnFilters = null;
-            this.Grid.AllowInserts = true;
-            this.Grid.AllowUserColumnFilterEdit = true;
-            this.Grid.CurrentContext = null;
-            this.Grid.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.Grid.EnableMasterViewMode = true;
-            this.Grid.HideUnusedColumns = false;
-            this.Grid.Location = new System.Drawing.Point(2, 0);
-            this.Grid.Margin = new System.Windows.Forms.Padding(4);
-            this.Grid.Name = "Grid";
-            this.Grid.SendSelectionChanged = true;
-            this.Grid.ShowToolbar = true;
-            this.Grid.Size = new System.Drawing.Size(324, 120);
-            this.Grid.TabIndex = 13;
+            ((System.ComponentModel.ISupportInitialize)(this.CalculationModelComboBox.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.CalculationDefinitionPanelControl)).BeginInit();
+            this.CalculationDefinitionPanelControl.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.FailureMechanismCombobox.Properties)).BeginInit();
             // 
+            // CalculationModelComboBox
+            // 
+            this.CalculationModelComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.CalculationModelComboBox.Location = new System.Drawing.Point(233, 43);
+            this.CalculationModelComboBox.Margin = new System.Windows.Forms.Padding(4);
+            this.CalculationModelComboBox.Name = "TangentLineUpliftVanComboBox";
+            this.CalculationModelComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.CalculationModelComboBox.Size = new System.Drawing.Size(85, 22);
+            this.CalculationModelComboBox.TabIndex = 3;
+            // 
+            // CalculationModelLabel
+            // 
+            this.CalculationModelLabel.Location = new System.Drawing.Point(6, 46);
+            this.CalculationModelLabel.Margin = new System.Windows.Forms.Padding(4);
+            this.CalculationModelLabel.Name = "TangentLineUpliftVanLabel";
+            this.CalculationModelLabel.Size = new System.Drawing.Size(97, 16);
+            this.CalculationModelLabel.TabIndex = 2;
+            this.CalculationModelLabel.Text = "Calculation model";
+            // 
+            // CalculationDefinitionPanelControl
+            // 
+            this.CalculationDefinitionPanelControl.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+            this.CalculationDefinitionPanelControl.Controls.Add(this.FailureMechanismCombobox);
+            this.CalculationDefinitionPanelControl.Controls.Add(this.FailureMechanismLabel);
+            this.CalculationDefinitionPanelControl.Controls.Add(this.CalculationModelComboBox);
+            this.CalculationDefinitionPanelControl.Controls.Add(this.CalculationModelLabel);
+            this.CalculationDefinitionPanelControl.Dock = System.Windows.Forms.DockStyle.Top;
+            this.CalculationDefinitionPanelControl.Location = new System.Drawing.Point(2, 24);
+            this.CalculationDefinitionPanelControl.Name = "SearchMethodPanelControl";
+            this.CalculationDefinitionPanelControl.Size = new System.Drawing.Size(324, 69);
+            this.CalculationDefinitionPanelControl.TabIndex = 1;
+            // 
+            // FailureMechanismLabel
+            // 
+            this.FailureMechanismLabel.Location = new System.Drawing.Point(6, 14);
+            this.FailureMechanismLabel.Margin = new System.Windows.Forms.Padding(4);
+            this.FailureMechanismLabel.Name = "SearchMethodLabel";
+            this.FailureMechanismLabel.Size = new System.Drawing.Size(86, 16);
+            this.FailureMechanismLabel.TabIndex = 3;
+            this.FailureMechanismLabel.Text = "Failure mechanism";
+            // 
+            // SearchMethodCombobox
+            // 
+            this.FailureMechanismCombobox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.FailureMechanismCombobox.Location = new System.Drawing.Point(233, 11);
+            this.FailureMechanismCombobox.Margin = new System.Windows.Forms.Padding(4);
+            this.FailureMechanismCombobox.Name = "SearchMethodCombobox";
+            this.FailureMechanismCombobox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.FailureMechanismCombobox.Size = new System.Drawing.Size(85, 22);
+            this.FailureMechanismCombobox.TabIndex = 4;
+
+            // 
             // DamProjectCalculationSpecificationPropertyControl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
@@ -111,14 +163,19 @@
             this.Size = new System.Drawing.Size(328, 800);
             ((System.ComponentModel.ISupportInitialize)(this.CalculationSpecificationsGroupControl)).EndInit();
             this.CalculationSpecificationsGroupControl.ResumeLayout(false);
+
+            ((System.ComponentModel.ISupportInitialize)(this.CalculationModelComboBox.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.CalculationDefinitionPanelControl)).EndInit();
+            this.CalculationDefinitionPanelControl.ResumeLayout(false);
+            this.CalculationDefinitionPanelControl.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.FailureMechanismCombobox.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
         private DevExpress.XtraEditors.GroupControl CalculationSpecificationsGroupControl;
-        protected Standard.Forms.DExpress.GridViewControl Grid;
         private DamProjectCalculationOptionsPropertyControl damProjectCalculationOptionsPropertyControl1;