Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs
===================================================================
diff -u -r61569f97d5456bf2b2b30c6e45476617f89667ed -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs (.../AssessmentSectionExtensions.cs) (revision 61569f97d5456bf2b2b30c6e45476617f89667ed)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs (.../AssessmentSectionExtensions.cs) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -142,7 +142,7 @@
/// database that contains them.
///
/// The to get the lookup from.
- /// A lookup mapping the and file name of the hydraulic boundary
+ /// A lookup mapping between the and the file name of the hydraulic boundary
/// database that contains them.
/// Thrown when is null.
public static IReadOnlyDictionary GetHydraulicBoundaryLocationLookup(this IAssessmentSection assessmentSection)
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r4febf042d52802022309cf1609abd2ea237f80b2 -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4febf042d52802022309cf1609abd2ea237f80b2)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -245,69 +245,6 @@
}
///
- /// Looks up a localized string similar to Berekenen.
- ///
- public static string CalculatableView_ButtonGroupBox_Text {
- get {
- return ResourceManager.GetString("CalculatableView_ButtonGroupBox_Text", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Berekenen.
- ///
- public static string CalculatableView_Calculate {
- get {
- return ResourceManager.GetString("CalculatableView_Calculate", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Bereken voor geselecteerde locaties.
- ///
- public static string CalculatableView_CalculateForSelectedButton_Text {
- get {
- return ResourceManager.GetString("CalculatableView_CalculateForSelectedButton_Text", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Deselecteer alles.
- ///
- public static string CalculatableView_DeselectAllButton_Text {
- get {
- return ResourceManager.GetString("CalculatableView_DeselectAllButton_Text", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Toon HRD bestand.
- ///
- public static string CalculatableView_HideHydraulicBoundaryDatabaseColumnCheckBox_Text {
- get {
- return ResourceManager.GetString("CalculatableView_HideHydraulicBoundaryDatabaseColumnCheckBox_Text", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Selecteer alles.
- ///
- public static string CalculatableView_SelectAllButton_Text {
- get {
- return ResourceManager.GetString("CalculatableView_SelectAllButton_Text", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Er zijn geen berekeningen geselecteerd..
- ///
- public static string CalculatableViews_No_calculations_selected {
- get {
- return ResourceManager.GetString("CalculatableViews_No_calculations_selected", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Be&rekenen.
///
public static string Calculate {
@@ -2504,6 +2441,69 @@
}
///
+ /// Looks up a localized string similar to Berekenen.
+ ///
+ public static string LocationCalculationsView_ButtonGroupBox_Text {
+ get {
+ return ResourceManager.GetString("LocationCalculationsView_ButtonGroupBox_Text", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Berekenen.
+ ///
+ public static string LocationCalculationsView_Calculate {
+ get {
+ return ResourceManager.GetString("LocationCalculationsView_Calculate", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Bereken voor geselecteerde locaties.
+ ///
+ public static string LocationCalculationsView_CalculateForSelectedButton_Text {
+ get {
+ return ResourceManager.GetString("LocationCalculationsView_CalculateForSelectedButton_Text", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Deselecteer alles.
+ ///
+ public static string LocationCalculationsView_DeselectAllButton_Text {
+ get {
+ return ResourceManager.GetString("LocationCalculationsView_DeselectAllButton_Text", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Er zijn geen berekeningen geselecteerd..
+ ///
+ public static string LocationCalculationsView_No_calculations_selected {
+ get {
+ return ResourceManager.GetString("LocationCalculationsView_No_calculations_selected", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Selecteer alles.
+ ///
+ public static string LocationCalculationsView_SelectAllButton_Text {
+ get {
+ return ResourceManager.GetString("LocationCalculationsView_SelectAllButton_Text", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Toon HRD bestand.
+ ///
+ public static string LocationCalculationsView_ShowHydraulicBoundaryDatabaseColumnCheckBox_Text {
+ get {
+ return ResourceManager.GetString("LocationCalculationsView_ShowHydraulicBoundaryDatabaseColumnCheckBox_Text", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to De gemiddelde waarde van de lognormale verdeling..
///
public static string LogNormalDistribution_Mean_Description {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r4febf042d52802022309cf1609abd2ea237f80b2 -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4febf042d52802022309cf1609abd2ea237f80b2)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -646,19 +646,19 @@
Berekende belastingen bij verschillende waterstanden
-
+
Berekenen
-
+
Berekenen
-
+
Bereken voor geselecteerde locaties
-
+
Deselecteer alles
-
+
Selecteer alles
@@ -904,7 +904,7 @@
Weet u zeker dat u wilt doorgaan?
-
+
Er zijn geen berekeningen geselecteerd.
@@ -1601,7 +1601,7 @@
De som van de bijdragen van de maatgevende scenario's voor dit vak is gelijk aan {0}%
-
+
Toon HRD bestand
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/DesignWaterLevelCalculationsView.Designer.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/DesignWaterLevelCalculationsView.Designer.cs (.../DesignWaterLevelCalculationsView.Designer.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/DesignWaterLevelCalculationsView.Designer.cs (.../DesignWaterLevelCalculationsView.Designer.cs) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -40,7 +40,7 @@
//
// ButtonGroupBox
//
- resources.ApplyResources(this.ButtonGroupBox, "ButtonGroupBox");
+ resources.ApplyResources(this.buttonGroupBox, "buttonGroupBox");
//
// DesignWaterLevelCalculationsView
//
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/DesignWaterLevelCalculationsView.resx
===================================================================
diff -u -r528b27af049364e9311a2bef5aeea3aeaa2e9725 -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/DesignWaterLevelCalculationsView.resx (.../DesignWaterLevelCalculationsView.resx) (revision 528b27af049364e9311a2bef5aeea3aeaa2e9725)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/DesignWaterLevelCalculationsView.resx (.../DesignWaterLevelCalculationsView.resx) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -133,25 +133,25 @@
0
-
+
0, 344
-
+
523, 61
-
+
Berekenen
-
- ButtonGroupBox
+
+ buttonGroupBox
-
+
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
+
1
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs
===================================================================
diff -u -r2099f5c28f0980f31e91d886ae368b32006ec9a2 -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs (.../HydraulicBoundaryCalculationsView.Designer.cs) (revision 2099f5c28f0980f31e91d886ae368b32006ec9a2)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.Designer.cs (.../HydraulicBoundaryCalculationsView.Designer.cs) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -40,17 +40,17 @@
{
this.components = new System.ComponentModel.Container();
this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl();
- this.CalculateForSelectedButton = new Core.Common.Controls.Forms.EnhancedButton();
- this.DeselectAllButton = new Core.Common.Controls.Forms.EnhancedButton();
- this.SelectAllButton = new Core.Common.Controls.Forms.EnhancedButton();
- this.ButtonGroupBox = new System.Windows.Forms.GroupBox();
- this.CalculateForSelectedButtonErrorProvider = new System.Windows.Forms.ErrorProvider(this.components);
+ this.calculateForSelectedButton = new Core.Common.Controls.Forms.EnhancedButton();
+ this.deselectAllButton = new Core.Common.Controls.Forms.EnhancedButton();
+ this.selectAllButton = new Core.Common.Controls.Forms.EnhancedButton();
+ this.buttonGroupBox = new System.Windows.Forms.GroupBox();
+ this.calculateForSelectedButtonErrorProvider = new System.Windows.Forms.ErrorProvider(this.components);
this.splitContainer = new System.Windows.Forms.SplitContainer();
this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox = new System.Windows.Forms.CheckBox();
this.illustrationPointsControl = new Riskeer.Common.Forms.Views.IllustrationPointsControl();
- this.ButtonGroupBox.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize) (this.CalculateForSelectedButtonErrorProvider)).BeginInit();
+ this.buttonGroupBox.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize) (this.calculateForSelectedButtonErrorProvider)).BeginInit();
((System.ComponentModel.ISupportInitialize) (this.splitContainer)).BeginInit();
this.splitContainer.Panel1.SuspendLayout();
this.splitContainer.Panel2.SuspendLayout();
@@ -71,51 +71,51 @@
//
// CalculateForSelectedButton
//
- this.CalculateForSelectedButton.Enabled = false;
- this.CalculateForSelectedButtonErrorProvider.SetIconPadding(this.CalculateForSelectedButton, 2);
- this.CalculateForSelectedButton.Location = new System.Drawing.Point(227, 29);
- this.CalculateForSelectedButton.Name = "CalculateForSelectedButton";
- this.CalculateForSelectedButton.Size = new System.Drawing.Size(207, 23);
- this.CalculateForSelectedButton.TabIndex = 2;
- this.CalculateForSelectedButton.UseVisualStyleBackColor = true;
- this.CalculateForSelectedButton.Click += new System.EventHandler(this.CalculateForSelectedButton_Click);
+ this.calculateForSelectedButton.Enabled = false;
+ this.calculateForSelectedButtonErrorProvider.SetIconPadding(this.calculateForSelectedButton, 2);
+ this.calculateForSelectedButton.Location = new System.Drawing.Point(227, 29);
+ this.calculateForSelectedButton.Name = "calculateForSelectedButton";
+ this.calculateForSelectedButton.Size = new System.Drawing.Size(207, 23);
+ this.calculateForSelectedButton.TabIndex = 2;
+ this.calculateForSelectedButton.UseVisualStyleBackColor = true;
+ this.calculateForSelectedButton.Click += new System.EventHandler(this.CalculateForSelectedButton_Click);
//
// DeselectAllButton
//
- this.DeselectAllButton.Location = new System.Drawing.Point(110, 29);
- this.DeselectAllButton.Name = "DeselectAllButton";
- this.DeselectAllButton.Size = new System.Drawing.Size(111, 23);
- this.DeselectAllButton.TabIndex = 1;
- this.DeselectAllButton.UseVisualStyleBackColor = true;
- this.DeselectAllButton.Click += new System.EventHandler(this.DeselectAllButton_Click);
+ this.deselectAllButton.Location = new System.Drawing.Point(110, 29);
+ this.deselectAllButton.Name = "deselectAllButton";
+ this.deselectAllButton.Size = new System.Drawing.Size(111, 23);
+ this.deselectAllButton.TabIndex = 1;
+ this.deselectAllButton.UseVisualStyleBackColor = true;
+ this.deselectAllButton.Click += new System.EventHandler(this.DeselectAllButton_Click);
//
// SelectAllButton
//
- this.SelectAllButton.Location = new System.Drawing.Point(6, 29);
- this.SelectAllButton.Name = "SelectAllButton";
- this.SelectAllButton.Size = new System.Drawing.Size(98, 23);
- this.SelectAllButton.TabIndex = 0;
- this.SelectAllButton.UseVisualStyleBackColor = true;
- this.SelectAllButton.Click += new System.EventHandler(this.SelectAllButton_Click);
+ this.selectAllButton.Location = new System.Drawing.Point(6, 29);
+ this.selectAllButton.Name = "selectAllButton";
+ this.selectAllButton.Size = new System.Drawing.Size(98, 23);
+ this.selectAllButton.TabIndex = 0;
+ this.selectAllButton.UseVisualStyleBackColor = true;
+ this.selectAllButton.Click += new System.EventHandler(this.SelectAllButton_Click);
//
// ButtonGroupBox
//
- this.ButtonGroupBox.Controls.Add(this.CalculateForSelectedButton);
- this.ButtonGroupBox.Controls.Add(this.DeselectAllButton);
- this.ButtonGroupBox.Controls.Add(this.SelectAllButton);
- this.ButtonGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
- this.ButtonGroupBox.Location = new System.Drawing.Point(3, 361);
- this.ButtonGroupBox.MinimumSize = new System.Drawing.Size(445, 61);
- this.ButtonGroupBox.Name = "ButtonGroupBox";
- this.ButtonGroupBox.Size = new System.Drawing.Size(536, 61);
- this.ButtonGroupBox.TabIndex = 3;
- this.ButtonGroupBox.TabStop = false;
+ this.buttonGroupBox.Controls.Add(this.calculateForSelectedButton);
+ this.buttonGroupBox.Controls.Add(this.deselectAllButton);
+ this.buttonGroupBox.Controls.Add(this.selectAllButton);
+ this.buttonGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.buttonGroupBox.Location = new System.Drawing.Point(3, 361);
+ this.buttonGroupBox.MinimumSize = new System.Drawing.Size(445, 61);
+ this.buttonGroupBox.Name = "buttonGroupBox";
+ this.buttonGroupBox.Size = new System.Drawing.Size(536, 61);
+ this.buttonGroupBox.TabIndex = 3;
+ this.buttonGroupBox.TabStop = false;
//
// CalculateForSelectedButtonErrorProvider
//
- this.CalculateForSelectedButtonErrorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
- this.CalculateForSelectedButtonErrorProvider.ContainerControl = this;
- this.CalculateForSelectedButtonErrorProvider.Icon = Core.Gui.Properties.Resources.warning;
+ this.calculateForSelectedButtonErrorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
+ this.calculateForSelectedButtonErrorProvider.ContainerControl = this;
+ this.calculateForSelectedButtonErrorProvider.Icon = Core.Gui.Properties.Resources.warning;
//
// splitContainer
//
@@ -146,7 +146,7 @@
this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel.Controls.Add(this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox, 0, 0);
this.tableLayoutPanel.Controls.Add(this.dataGridViewControl, 0, 1);
- this.tableLayoutPanel.Controls.Add(this.ButtonGroupBox, 0, 2);
+ this.tableLayoutPanel.Controls.Add(this.buttonGroupBox, 0, 2);
this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel.Name = "tableLayoutPanel";
@@ -185,8 +185,8 @@
this.Controls.Add(this.splitContainer);
this.Name = "HydraulicBoundaryCalculationsView";
this.Size = new System.Drawing.Size(991, 425);
- this.ButtonGroupBox.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize) (this.CalculateForSelectedButtonErrorProvider)).EndInit();
+ this.buttonGroupBox.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize) (this.calculateForSelectedButtonErrorProvider)).EndInit();
this.splitContainer.Panel1.ResumeLayout(false);
this.splitContainer.Panel1.PerformLayout();
this.splitContainer.Panel2.ResumeLayout(false);
@@ -202,12 +202,12 @@
#endregion
protected Core.Common.Controls.DataGrid.DataGridViewControl dataGridViewControl;
- private Core.Common.Controls.Forms.EnhancedButton CalculateForSelectedButton;
- private Core.Common.Controls.Forms.EnhancedButton DeselectAllButton;
- private Core.Common.Controls.Forms.EnhancedButton SelectAllButton;
- protected System.Windows.Forms.GroupBox ButtonGroupBox;
+ private Core.Common.Controls.Forms.EnhancedButton calculateForSelectedButton;
+ private Core.Common.Controls.Forms.EnhancedButton deselectAllButton;
+ private Core.Common.Controls.Forms.EnhancedButton selectAllButton;
+ protected System.Windows.Forms.GroupBox buttonGroupBox;
private System.Windows.Forms.CheckBox showHydraulicBoundaryDatabaseFileNameColumnCheckBox;
- private System.Windows.Forms.ErrorProvider CalculateForSelectedButtonErrorProvider;
+ private System.Windows.Forms.ErrorProvider calculateForSelectedButtonErrorProvider;
private System.Windows.Forms.SplitContainer splitContainer;
private IllustrationPointsControl illustrationPointsControl;
}
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs
===================================================================
diff -u -r61569f97d5456bf2b2b30c6e45476617f89667ed -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs (.../HydraulicBoundaryCalculationsView.cs) (revision 61569f97d5456bf2b2b30c6e45476617f89667ed)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs (.../HydraulicBoundaryCalculationsView.cs) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -122,7 +122,7 @@
protected virtual void InitializeDataGridView()
{
dataGridViewControl.AddCheckBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.ShouldCalculate),
- Resources.CalculatableView_Calculate);
+ Resources.LocationCalculationsView_Calculate);
dataGridViewControl.AddCheckBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.IncludeIllustrationPoints),
Resources.HydraulicBoundaryLocationCalculationInput_IncludeIllustrationPoints_DisplayName);
dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationCalculationRow.Name),
@@ -219,7 +219,7 @@
{
if (!GetCalculatableRows().Any(r => r.ShouldCalculate))
{
- return Resources.CalculatableViews_No_calculations_selected;
+ return Resources.LocationCalculationsView_No_calculations_selected;
}
return null;
@@ -230,13 +230,13 @@
string validationText = ValidateCalculatableObjects();
if (!string.IsNullOrEmpty(validationText))
{
- CalculateForSelectedButton.Enabled = false;
- CalculateForSelectedButtonErrorProvider.SetError(CalculateForSelectedButton, validationText);
+ calculateForSelectedButton.Enabled = false;
+ calculateForSelectedButtonErrorProvider.SetError(calculateForSelectedButton, validationText);
}
else
{
- CalculateForSelectedButton.Enabled = true;
- CalculateForSelectedButtonErrorProvider.SetError(CalculateForSelectedButton, "");
+ calculateForSelectedButton.Enabled = true;
+ calculateForSelectedButtonErrorProvider.SetError(calculateForSelectedButton, "");
}
}
@@ -260,11 +260,11 @@
private void LocalizeControls()
{
- CalculateForSelectedButton.Text = Resources.CalculatableView_CalculateForSelectedButton_Text;
- DeselectAllButton.Text = Resources.CalculatableView_DeselectAllButton_Text;
- SelectAllButton.Text = Resources.CalculatableView_SelectAllButton_Text;
- ButtonGroupBox.Text = Resources.CalculatableView_ButtonGroupBox_Text;
- showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Text = Resources.CalculatableView_HideHydraulicBoundaryDatabaseColumnCheckBox_Text;
+ calculateForSelectedButton.Text = Resources.LocationCalculationsView_CalculateForSelectedButton_Text;
+ deselectAllButton.Text = Resources.LocationCalculationsView_DeselectAllButton_Text;
+ selectAllButton.Text = Resources.LocationCalculationsView_SelectAllButton_Text;
+ buttonGroupBox.Text = Resources.LocationCalculationsView_ButtonGroupBox_Text;
+ showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Text = Resources.LocationCalculationsView_ShowHydraulicBoundaryDatabaseColumnCheckBox_Text;
}
private void InitializeEventHandlers()
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.resx
===================================================================
diff -u -rcd66114d9af655f71f133ceb542da2bf2c0693e4 -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.resx (.../HydraulicBoundaryCalculationsView.resx) (revision cd66114d9af655f71f133ceb542da2bf2c0693e4)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/HydraulicBoundaryCalculationsView.resx (.../HydraulicBoundaryCalculationsView.resx) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -117,7 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
17, 17
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/WaveHeightCalculationsView.Designer.cs
===================================================================
diff -u -r6e3bc0437167a40cf4a79f0f04e31dc61ef4407f -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/WaveHeightCalculationsView.Designer.cs (.../WaveHeightCalculationsView.Designer.cs) (revision 6e3bc0437167a40cf4a79f0f04e31dc61ef4407f)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/WaveHeightCalculationsView.Designer.cs (.../WaveHeightCalculationsView.Designer.cs) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -40,7 +40,7 @@
//
// ButtonGroupBox
//
- resources.ApplyResources(this.ButtonGroupBox, "ButtonGroupBox");
+ resources.ApplyResources(this.buttonGroupBox, "buttonGroupBox");
//
// WaveHeightCalculationsView
//
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/WaveHeightCalculationsView.resx
===================================================================
diff -u -r528b27af049364e9311a2bef5aeea3aeaa2e9725 -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/WaveHeightCalculationsView.resx (.../WaveHeightCalculationsView.resx) (revision 528b27af049364e9311a2bef5aeea3aeaa2e9725)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/WaveHeightCalculationsView.resx (.../WaveHeightCalculationsView.resx) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -133,25 +133,25 @@
0
-
+
0, 344
-
+
523, 61
-
+
Berekenen
-
- ButtonGroupBox
+
+ buttonGroupBox
-
+
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
$this
-
+
1
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.Designer.cs
===================================================================
diff -u -r21f561c73f0a7dcee27f6989b84da9d40868069c -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.Designer.cs (.../DuneLocationCalculationsView.Designer.cs) (revision 21f561c73f0a7dcee27f6989b84da9d40868069c)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.Designer.cs (.../DuneLocationCalculationsView.Designer.cs) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -40,14 +40,14 @@
{
this.components = new System.ComponentModel.Container();
this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl();
- this.CalculateForSelectedButton = new Core.Common.Controls.Forms.EnhancedButton();
- this.DeselectAllButton = new Core.Common.Controls.Forms.EnhancedButton();
- this.SelectAllButton = new Core.Common.Controls.Forms.EnhancedButton();
- this.ButtonGroupBox = new System.Windows.Forms.GroupBox();
+ this.calculateForSelectedButton = new Core.Common.Controls.Forms.EnhancedButton();
+ this.deselectAllButton = new Core.Common.Controls.Forms.EnhancedButton();
+ this.selectAllButton = new Core.Common.Controls.Forms.EnhancedButton();
+ this.buttonGroupBox = new System.Windows.Forms.GroupBox();
this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox = new System.Windows.Forms.CheckBox();
- this.CalculateForSelectedButtonErrorProvider = new System.Windows.Forms.ErrorProvider(this.components);
- this.ButtonGroupBox.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize) (this.CalculateForSelectedButtonErrorProvider)).BeginInit();
+ this.calculateForSelectedButtonErrorProvider = new System.Windows.Forms.ErrorProvider(this.components);
+ this.buttonGroupBox.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize) (this.calculateForSelectedButtonErrorProvider)).BeginInit();
this.SuspendLayout();
//
// dataGridViewControl
@@ -63,44 +63,44 @@
//
// CalculateForSelectedButton
//
- this.CalculateForSelectedButton.Enabled = false;
- this.CalculateForSelectedButton.Location = new System.Drawing.Point(227, 29);
- this.CalculateForSelectedButton.Name = "CalculateForSelectedButton";
- this.CalculateForSelectedButton.Size = new System.Drawing.Size(207, 23);
- this.CalculateForSelectedButton.TabIndex = 2;
- this.CalculateForSelectedButton.UseVisualStyleBackColor = true;
- this.CalculateForSelectedButton.Click += new System.EventHandler(this.CalculateForSelectedButton_Click);
+ this.calculateForSelectedButton.Enabled = false;
+ this.calculateForSelectedButton.Location = new System.Drawing.Point(227, 29);
+ this.calculateForSelectedButton.Name = "calculateForSelectedButton";
+ this.calculateForSelectedButton.Size = new System.Drawing.Size(207, 23);
+ this.calculateForSelectedButton.TabIndex = 2;
+ this.calculateForSelectedButton.UseVisualStyleBackColor = true;
+ this.calculateForSelectedButton.Click += new System.EventHandler(this.CalculateForSelectedButton_Click);
//
// DeselectAllButton
//
- this.DeselectAllButton.Location = new System.Drawing.Point(110, 29);
- this.DeselectAllButton.Name = "DeselectAllButton";
- this.DeselectAllButton.Size = new System.Drawing.Size(111, 23);
- this.DeselectAllButton.TabIndex = 1;
- this.DeselectAllButton.UseVisualStyleBackColor = true;
- this.DeselectAllButton.Click += new System.EventHandler(this.DeselectAllButton_Click);
+ this.deselectAllButton.Location = new System.Drawing.Point(110, 29);
+ this.deselectAllButton.Name = "deselectAllButton";
+ this.deselectAllButton.Size = new System.Drawing.Size(111, 23);
+ this.deselectAllButton.TabIndex = 1;
+ this.deselectAllButton.UseVisualStyleBackColor = true;
+ this.deselectAllButton.Click += new System.EventHandler(this.DeselectAllButton_Click);
//
// SelectAllButton
//
- this.SelectAllButton.Location = new System.Drawing.Point(6, 29);
- this.SelectAllButton.Name = "SelectAllButton";
- this.SelectAllButton.Size = new System.Drawing.Size(98, 23);
- this.SelectAllButton.TabIndex = 0;
- this.SelectAllButton.UseVisualStyleBackColor = true;
- this.SelectAllButton.Click += new System.EventHandler(this.SelectAllButton_Click);
+ this.selectAllButton.Location = new System.Drawing.Point(6, 29);
+ this.selectAllButton.Name = "selectAllButton";
+ this.selectAllButton.Size = new System.Drawing.Size(98, 23);
+ this.selectAllButton.TabIndex = 0;
+ this.selectAllButton.UseVisualStyleBackColor = true;
+ this.selectAllButton.Click += new System.EventHandler(this.SelectAllButton_Click);
//
// ButtonGroupBox
//
- this.ButtonGroupBox.Controls.Add(this.CalculateForSelectedButton);
- this.ButtonGroupBox.Controls.Add(this.DeselectAllButton);
- this.ButtonGroupBox.Controls.Add(this.SelectAllButton);
- this.ButtonGroupBox.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.ButtonGroupBox.Location = new System.Drawing.Point(0, 85);
- this.ButtonGroupBox.MinimumSize = new System.Drawing.Size(445, 61);
- this.ButtonGroupBox.Name = "ButtonGroupBox";
- this.ButtonGroupBox.Size = new System.Drawing.Size(533, 61);
- this.ButtonGroupBox.TabIndex = 3;
- this.ButtonGroupBox.TabStop = false;
+ this.buttonGroupBox.Controls.Add(this.calculateForSelectedButton);
+ this.buttonGroupBox.Controls.Add(this.deselectAllButton);
+ this.buttonGroupBox.Controls.Add(this.selectAllButton);
+ this.buttonGroupBox.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.buttonGroupBox.Location = new System.Drawing.Point(0, 85);
+ this.buttonGroupBox.MinimumSize = new System.Drawing.Size(445, 61);
+ this.buttonGroupBox.Name = "buttonGroupBox";
+ this.buttonGroupBox.Size = new System.Drawing.Size(533, 61);
+ this.buttonGroupBox.TabIndex = 3;
+ this.buttonGroupBox.TabStop = false;
//
// showHydraulicBoundaryDatabaseFileNameColumnCheckBox
//
@@ -117,10 +117,10 @@
//
// CalculateForSelectedButtonErrorProvider
//
- this.CalculateForSelectedButtonErrorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
- this.CalculateForSelectedButtonErrorProvider.ContainerControl = this;
- this.CalculateForSelectedButtonErrorProvider.Icon = Core.Gui.Properties.Resources.warning;
- this.CalculateForSelectedButtonErrorProvider.SetIconPadding(CalculateForSelectedButton, 2);
+ this.calculateForSelectedButtonErrorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
+ this.calculateForSelectedButtonErrorProvider.ContainerControl = this;
+ this.calculateForSelectedButtonErrorProvider.Icon = Core.Gui.Properties.Resources.warning;
+ this.calculateForSelectedButtonErrorProvider.SetIconPadding(calculateForSelectedButton, 2);
//
// DuneLocationCalculationsView
//
@@ -129,24 +129,24 @@
this.AutoScroll = true;
this.AutoScrollMinSize = new System.Drawing.Size(526, 85);
this.Controls.Add(this.dataGridViewControl);
- this.Controls.Add(this.ButtonGroupBox);
+ this.Controls.Add(this.buttonGroupBox);
this.Controls.Add(this.showHydraulicBoundaryDatabaseFileNameColumnCheckBox);
this.Name = "DuneLocationCalculationsView";
this.Size = new System.Drawing.Size(533, 146);
- this.ButtonGroupBox.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize) (this.CalculateForSelectedButtonErrorProvider)).EndInit();
+ this.buttonGroupBox.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize) (this.calculateForSelectedButtonErrorProvider)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
protected Core.Common.Controls.DataGrid.DataGridViewControl dataGridViewControl;
- private Core.Common.Controls.Forms.EnhancedButton CalculateForSelectedButton;
- private Core.Common.Controls.Forms.EnhancedButton DeselectAllButton;
- private Core.Common.Controls.Forms.EnhancedButton SelectAllButton;
- protected System.Windows.Forms.GroupBox ButtonGroupBox;
- private System.Windows.Forms.ErrorProvider CalculateForSelectedButtonErrorProvider;
+ private Core.Common.Controls.Forms.EnhancedButton calculateForSelectedButton;
+ private Core.Common.Controls.Forms.EnhancedButton deselectAllButton;
+ private Core.Common.Controls.Forms.EnhancedButton selectAllButton;
+ protected System.Windows.Forms.GroupBox buttonGroupBox;
+ private System.Windows.Forms.ErrorProvider calculateForSelectedButtonErrorProvider;
private System.Windows.Forms.CheckBox showHydraulicBoundaryDatabaseFileNameColumnCheckBox;
}
}
\ No newline at end of file
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs
===================================================================
diff -u -ra9e42f8780d495ad99f86c0c4a84fd4fcfa6a23b -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision a9e42f8780d495ad99f86c0c4a84fd4fcfa6a23b)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -188,7 +188,7 @@
private void InitializeDataGridView()
{
dataGridViewControl.AddCheckBoxColumn(nameof(DuneLocationCalculationRow.ShouldCalculate),
- RiskeerCommonFormsResources.CalculatableView_Calculate);
+ RiskeerCommonFormsResources.LocationCalculationsView_Calculate);
dataGridViewControl.AddTextBoxColumn(nameof(DuneLocationCalculationRow.Name),
RiskeerCommonFormsResources.HydraulicBoundaryDatabase_Location_Name_DisplayName);
dataGridViewControl.AddTextBoxColumn(nameof(DuneLocationCalculationRow.Id),
@@ -230,7 +230,7 @@
{
if (!GetCalculatableRows().Any(r => r.ShouldCalculate))
{
- return RiskeerCommonFormsResources.CalculatableViews_No_calculations_selected;
+ return RiskeerCommonFormsResources.LocationCalculationsView_No_calculations_selected;
}
return null;
@@ -241,23 +241,23 @@
string validationText = ValidateCalculatableObjects();
if (!string.IsNullOrEmpty(validationText))
{
- CalculateForSelectedButton.Enabled = false;
- CalculateForSelectedButtonErrorProvider.SetError(CalculateForSelectedButton, validationText);
+ calculateForSelectedButton.Enabled = false;
+ calculateForSelectedButtonErrorProvider.SetError(calculateForSelectedButton, validationText);
}
else
{
- CalculateForSelectedButton.Enabled = true;
- CalculateForSelectedButtonErrorProvider.SetError(CalculateForSelectedButton, "");
+ calculateForSelectedButton.Enabled = true;
+ calculateForSelectedButtonErrorProvider.SetError(calculateForSelectedButton, "");
}
}
private void LocalizeControls()
{
- CalculateForSelectedButton.Text = RiskeerCommonFormsResources.CalculatableView_CalculateForSelectedButton_Text;
- DeselectAllButton.Text = RiskeerCommonFormsResources.CalculatableView_DeselectAllButton_Text;
- SelectAllButton.Text = RiskeerCommonFormsResources.CalculatableView_SelectAllButton_Text;
- ButtonGroupBox.Text = RiskeerCommonFormsResources.CalculatableView_ButtonGroupBox_Text;
- showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Text = RiskeerCommonFormsResources.CalculatableView_HideHydraulicBoundaryDatabaseColumnCheckBox_Text;
+ calculateForSelectedButton.Text = RiskeerCommonFormsResources.LocationCalculationsView_CalculateForSelectedButton_Text;
+ deselectAllButton.Text = RiskeerCommonFormsResources.LocationCalculationsView_DeselectAllButton_Text;
+ selectAllButton.Text = RiskeerCommonFormsResources.LocationCalculationsView_SelectAllButton_Text;
+ buttonGroupBox.Text = RiskeerCommonFormsResources.LocationCalculationsView_ButtonGroupBox_Text;
+ showHydraulicBoundaryDatabaseFileNameColumnCheckBox.Text = RiskeerCommonFormsResources.LocationCalculationsView_ShowHydraulicBoundaryDatabaseColumnCheckBox_Text;
}
private void InitializeEventHandlers()
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.resx
===================================================================
diff -u -ra8862f6a2c03c22a430f2905efdf3c7ca4a3bf8e -r504417a716d138b81f35f779ff20d82013b0bec5
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.resx (.../DuneLocationCalculationsView.resx) (revision a8862f6a2c03c22a430f2905efdf3c7ca4a3bf8e)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.resx (.../DuneLocationCalculationsView.resx) (revision 504417a716d138b81f35f779ff20d82013b0bec5)
@@ -117,7 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
17, 17
\ No newline at end of file