From 73806e56cd39b11e46fc49532610fa1f983731a1 Mon Sep 17 00:00:00 2001
From: "harald.martini@student.tugraz.at" <harald.martini@student.tugraz.at>
Date: Mon, 4 Oct 2021 10:25:45 +0200
Subject: [PATCH] rename stage to step
---
.../Properties/GUILabels.Designer.cs | 36 +++++++++++++++++++
VECTO3GUI2020/Properties/GUILabels.resx | 14 +++++++-
.../Common/AdditionalJobInfoViewModel.cs | 2 +-
.../MultistageJobViewModel_v0_1.cs | 2 +-
.../NewMultiStageJobViewModel.cs | 2 +-
.../Implementation/StageInputViewModel.cs | 11 +++---
.../Multistage/ManufacturingStageView.xaml | 3 +-
.../Multistage/NewMultistageFileView.xaml | 3 +-
8 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/VECTO3GUI2020/Properties/GUILabels.Designer.cs b/VECTO3GUI2020/Properties/GUILabels.Designer.cs
index 8a5c88f6fb..0e03d5db72 100644
--- a/VECTO3GUI2020/Properties/GUILabels.Designer.cs
+++ b/VECTO3GUI2020/Properties/GUILabels.Designer.cs
@@ -168,6 +168,24 @@ namespace VECTO3GUI2020.Properties {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Edit Multistep Job.
+ /// </summary>
+ public static string Edit_Multistep_Job {
+ get {
+ return ResourceManager.GetString("Edit_Multistep_Job", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Edit step input.
+ /// </summary>
+ public static string Edit_step_input {
+ get {
+ return ResourceManager.GetString("Edit_step_input", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Invalid Airdrag Entries.
/// </summary>
@@ -186,6 +204,24 @@ namespace VECTO3GUI2020.Properties {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Manufacturing Step.
+ /// </summary>
+ public static string ManufacturingSteps {
+ get {
+ return ResourceManager.GetString("ManufacturingSteps", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to New Multistep File.
+ /// </summary>
+ public static string New_Multistep_File {
+ get {
+ return ResourceManager.GetString("New_Multistep_File", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to New Complete Job.
/// </summary>
diff --git a/VECTO3GUI2020/Properties/GUILabels.resx b/VECTO3GUI2020/Properties/GUILabels.resx
index 616d2ff6d6..43f525bcf0 100644
--- a/VECTO3GUI2020/Properties/GUILabels.resx
+++ b/VECTO3GUI2020/Properties/GUILabels.resx
@@ -172,7 +172,7 @@
<value>Components_Conventional_CompletedBusType</value>
</data>
<data name="CreateInterimCompletedInputToolTip" xml:space="preserve">
- <value></value>
+ <value />
</data>
<data name="CreateExemptedInterimCompletedInput" xml:space="preserve">
<value>Create Exempted Interim/Completed Input</value>
@@ -180,4 +180,16 @@
<data name="CreateExemptedInterimCompletedInputToolTip" xml:space="preserve">
<value>Create Exempted Interim/Completed Input</value>
</data>
+ <data name="ManufacturingSteps" xml:space="preserve">
+ <value>Manufacturing Step</value>
+ </data>
+ <data name="New_Multistep_File" xml:space="preserve">
+ <value>New Multistep File</value>
+ </data>
+ <data name="Edit_Multistep_Job" xml:space="preserve">
+ <value>Edit Multistep Job</value>
+ </data>
+ <data name="Edit_step_input" xml:space="preserve">
+ <value>Edit step input</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VECTO3GUI2020/ViewModel/Implementation/Common/AdditionalJobInfoViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/Common/AdditionalJobInfoViewModel.cs
index d3beb88035..1f3a1c9989 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/Common/AdditionalJobInfoViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/Common/AdditionalJobInfoViewModel.cs
@@ -55,7 +55,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation.Common
public AdditionalJobInfoViewModelMultiStage()
{
- Title = "Multistage Job Info";
+ Title = "Multistep Job Info";
InvalidEntries.CollectionChanged += (sender, args) => OnPropertyChanged(nameof(InvalidEntriesPresent));
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
index 385e3b5ac1..d2cc7c9dbe 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageJobViewModel_v0_1.cs
@@ -84,7 +84,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
{
_dataSource = inputData.DataSource;
- Title = $"Edit Multistage Job - {Path.GetFileName(_dataSource.SourceFile)}";
+ Title = GUILabels.Edit_Multistep_Job + $" - {Path.GetFileName(_dataSource.SourceFile)}";
_jobInputData = inputData.JobInputData;
_jobListViewModel = jobListViewModel;
_inputData = inputData;
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/NewMultiStageJobViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/NewMultiStageJobViewModel.cs
index 5d4332410d..b3bfb612b3 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/NewMultiStageJobViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/NewMultiStageJobViewModel.cs
@@ -54,7 +54,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
_dialogHelper = dialogHelper;
_vmFactory = vmFactory;
_jobListViewModel = jobListViewModel;
- Title = "New Multistage File";
+ Title = GUILabels.New_Multistep_File;
VifPath = "Select VIF File";
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
index 5a6d36aa54..4c6d542c02 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageInputViewModel.cs
@@ -6,6 +6,7 @@ using Castle.Core.Smtp;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Utils;
+using VECTO3GUI2020.Properties;
using VECTO3GUI2020.ViewModel.Implementation.Common;
using VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle;
using VECTO3GUI2020.ViewModel.Interfaces;
@@ -42,9 +43,9 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
? InterimStageBusVehicleViewModel_v2_8.VERSION_EXEMPTED
: InterimStageBusVehicleViewModel_v2_8.VERSION) as IMultistageVehicleViewModel;
- Title = "Edit Stage Input - New File";
+ Title = $"{GUILabels.Edit_step_input} - New file";
- _documentName = $"New {(exemptedVehicle ? "Exempted " : "")}Stage Input {++_newDocumentCounter}";
+ _documentName = $"New {(exemptedVehicle ? "exempted " : "")}step input {++_newDocumentCounter}";
Init();
}
@@ -58,7 +59,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
_dataSource = inputData.DataSource;
VehicleInputDataFilePath = _dataSource.SourceFile;
- Title = $"Edit Stage Input - {Path.GetFileName(_dataSource.SourceFile)}";
+ Title = $"{GUILabels.Edit_step_input} - {Path.GetFileName(_dataSource.SourceFile)}";
Init();
}
@@ -79,9 +80,9 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
private void UpdateTitle()
{
- Title = "Edit Stage Input - " + ((_dataSource?.SourceFile != null)
+ Title = GUILabels.Edit_step_input + " - " + ((_dataSource?.SourceFile != null)
? Path.GetFileName(_dataSource.SourceFile)
- : "New File");
+ : "New file");
}
private void Init()
diff --git a/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml b/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml
index 5d2b36a12f..32721a7d21 100644
--- a/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml
+++ b/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml
@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:VECTO3GUI2020.Views.Multistage"
xmlns:implementation="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation"
xmlns:system="clr-namespace:System;assembly=mscorlib"
+ xmlns:properties="clr-namespace:VECTO3GUI2020.Properties"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance implementation:ManufacturingStageViewModel_v0_1 }">
<Grid>
@@ -32,7 +33,7 @@
</Binding>
</PriorityBinding>
</StackPanel.Visibility>
- <Label>Manufacturing Stage</Label>
+ <Label Content="{x:Static properties:GUILabels.ManufacturingSteps}"></Label>
<Label>
<PriorityBinding>
<Binding Path="StageCount"></Binding>
diff --git a/VECTO3GUI2020/Views/Multistage/NewMultistageFileView.xaml b/VECTO3GUI2020/Views/Multistage/NewMultistageFileView.xaml
index c199a09aca..4a6ebd9a22 100644
--- a/VECTO3GUI2020/Views/Multistage/NewMultistageFileView.xaml
+++ b/VECTO3GUI2020/Views/Multistage/NewMultistageFileView.xaml
@@ -6,6 +6,7 @@
xmlns:local="clr-namespace:VECTO3GUI2020.Views.Multistage"
xmlns:implementation="clr-namespace:VECTO3GUI2020.ViewModel.MultiStage.Implementation"
xmlns:customControls="clr-namespace:VECTO3GUI2020.Views.Multistage.CustomControls"
+ xmlns:properties="clr-namespace:VECTO3GUI2020.Properties"
mc:Ignorable="d"
d:DesignHeight="450" x:Name="NewMultistageJobView" d:DesignWidth="800" d:DataContext="{d:DesignInstance implementation:NewMultiStageJobViewModel }">
<Grid>
@@ -24,7 +25,7 @@
<Binding Path="MultiStageJobViewModel" Mode="TwoWay" >
<Binding.TargetNullValue>
<Grid HorizontalAlignment="Center" VerticalAlignment="Stretch">
- <TextBlock>Load VIF File to add new manufacturing Stage</TextBlock>
+ <TextBlock>Load VIF to add new manufacturing step</TextBlock>
</Grid>
</Binding.TargetNullValue>
</Binding>
--
GitLab