diff --git a/VECTO3GUI2020/MainWindow.xaml b/VECTO3GUI2020/MainWindow.xaml
index fc6bf48426db11b767a14290d4aeecf0e4a0e190..452f847cdd7ec991742ee9056b1f25b3e47cec15 100644
--- a/VECTO3GUI2020/MainWindow.xaml
+++ b/VECTO3GUI2020/MainWindow.xaml
@@ -25,23 +25,21 @@
<Menu IsMainMenu="True">
<MenuItem Header="File" VerticalAlignment="Stretch">
<MenuItem Header="New File">
- <MenuItem Header="{x:Static resx:GUILabels.NewInterimOrCompletedJob}" Command="{Binding JobListVm.NewManufacturingStageFileCommand}"/>
- <MenuItem Header="{x:Static resx:GUILabels.NewPrimaryAndInterimJob}"
- Command="{Binding JobListVm.NewVifCommand}" >
+ <MenuItem Header="{x:Static resx:GUILabels.NewInterimOrCompletedJob}" Command="{Binding JobListVm.NewManufacturingStageFileCommand}" ToolTip="{x:Static resx:GUILabels.NewInterimOrCompletedJobToolTip}"/>
+ <MenuItem Header="{x:Static resx:GUILabels.NewPrimaryAndInterimJob}" Command="{Binding JobListVm.NewVifCommand}" ToolTip="{x:Static resx:GUILabels.NewPrimaryAndInterimJobToolTip}">
<MenuItem.CommandParameter>
<system:Boolean>False</system:Boolean>
</MenuItem.CommandParameter>
</MenuItem>
- <MenuItem Header="{x:Static resx:GUILabels.NewCompleteJob}"
- Command="{Binding JobListVm.NewVifCommand}">
+ <MenuItem Header="{x:Static resx:GUILabels.NewCompleteJob}" Command="{Binding JobListVm.NewVifCommand}" ToolTip="{x:Static resx:GUILabels.NewCompleteJobToolTip}">
<MenuItem.CommandParameter>
<system:Boolean>True</system:Boolean>
</MenuItem.CommandParameter>
</MenuItem>
- <Separator></Separator>
- <MenuItem Header="Create Interim/Completeted Input" Command="{Binding JobListVm.NewCompletedInputCommand}"/>
- <MenuItem Header="Create Exempted Interim/Completed Input" Command="{Binding JobListVm.NewExemptedCompletedInputCommand}"/>
+ <Separator></Separator>
+ <MenuItem Header="{x:Static resx:GUILabels.CreateInterimCompletedInput}" Command="{Binding JobListVm.NewCompletedInputCommand}" ToolTip="{x:Static resx:GUILabels.CreateInterimCompletedInputToolTip}"/>
+ <MenuItem Header="{x:Static resx:GUILabels.CreateExemptedInterimCompletedInput}" Command="{Binding JobListVm.NewExemptedCompletedInputCommand}" ToolTip="{x:Static resx:GUILabels.CreateExemptedInterimCompletedInputToolTip}"/>
</MenuItem>
<MenuItem Header="Load File" Command="{Binding JobListVm.AddJobAsyncCommand}"/>
<MenuItem Header="Settings" Command="{Binding OpenSettings}"/>
@@ -56,28 +54,28 @@
</MenuItem>
</Menu>
</StackPanel>
- <UniformGrid Margin="0 10 0 0 " Rows="1" DockPanel.Dock="Top" Width="400" HorizontalAlignment="Left">
- <Border x:Name="JobsButtonBorder" BorderThickness ="0 0 0 3">
- <Border.Style>
- <Style TargetType="Border">
- <Style.Triggers>
- <DataTrigger Binding="{Binding JobsSelected}" Value="true">
- <Setter Property="BorderBrush" Value="{StaticResource AccentColorButton}"></Setter>
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </Border.Style>
-
-
- <Button x:Name="Jobs" Margin="0 0 0 0"
+ <UniformGrid Margin="0 10 0 0 " Rows="1" DockPanel.Dock="Top" Width="400" HorizontalAlignment="Left">
+ <Border x:Name="JobsButtonBorder" BorderThickness ="0 0 0 3">
+ <Border.Style>
+ <Style TargetType="Border">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding JobsSelected}" Value="true">
+ <Setter Property="BorderBrush" Value="{StaticResource AccentColorButton}"></Setter>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Border.Style>
+
+
+ <Button x:Name="Jobs" Margin="0 0 0 0"
VerticalAlignment="Stretch"
DockPanel.Dock="Top"
Content="Jobs"
Command="{Binding SwitchTopView}"
CommandParameter="Jobs"
Style="{DynamicResource MultiStageButtonStyle1}">
- </Button>
- </Border>
+ </Button>
+ </Border>
<Border BorderThickness="{Binding ElementName=JobsButtonBorder, Path=BorderThickness}">
<Border.Style>
@@ -97,7 +95,7 @@
CommandParameter="Settings"
Style="{DynamicResource MultiStageButtonStyle1}">
</Button>
- </Border>
+ </Border>
<Border BorderThickness="{Binding ElementName=JobsButtonBorder, Path=BorderThickness}">
<Border.Style>
<Style TargetType="Border">
diff --git a/VECTO3GUI2020/Properties/GUILabels.Designer.cs b/VECTO3GUI2020/Properties/GUILabels.Designer.cs
index 256681312598709f52706ee0aa158239fc1c9928..8067f9f78e09135fefe941f5db827e5bf8ae55a4 100644
--- a/VECTO3GUI2020/Properties/GUILabels.Designer.cs
+++ b/VECTO3GUI2020/Properties/GUILabels.Designer.cs
@@ -123,6 +123,42 @@ namespace VECTO3GUI2020.Properties {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Create Exempted Interim/Completed Input.
+ /// </summary>
+ public static string CreateExemptedInterimCompletedInput {
+ get {
+ return ResourceManager.GetString("CreateExemptedInterimCompletedInput", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Create Exempted Interim/Completed Input.
+ /// </summary>
+ public static string CreateExemptedInterimCompletedInputToolTip {
+ get {
+ return ResourceManager.GetString("CreateExemptedInterimCompletedInputToolTip", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Create Interim/Completed Input.
+ /// </summary>
+ public static string CreateInterimCompletedInput {
+ get {
+ return ResourceManager.GetString("CreateInterimCompletedInput", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Create Interim/Completed Input.
+ /// </summary>
+ public static string CreateInterimCompletedInputToolTip {
+ get {
+ return ResourceManager.GetString("CreateInterimCompletedInputToolTip", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to VECTO.
/// </summary>
@@ -159,6 +195,15 @@ namespace VECTO3GUI2020.Properties {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Create a new Complete Job.
+ /// </summary>
+ public static string NewCompleteJobToolTip {
+ get {
+ return ResourceManager.GetString("NewCompleteJobToolTip", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to New Interim/Completed Job.
/// </summary>
@@ -168,6 +213,15 @@ namespace VECTO3GUI2020.Properties {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Create a new Interim/Completed Job.
+ /// </summary>
+ public static string NewInterimOrCompletedJobToolTip {
+ get {
+ return ResourceManager.GetString("NewInterimOrCompletedJobToolTip", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to New Primary Job with Interim Input.
/// </summary>
@@ -177,6 +231,15 @@ namespace VECTO3GUI2020.Properties {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Create a new Primary Job with Interim Input.
+ /// </summary>
+ public static string NewPrimaryAndInterimJobToolTip {
+ get {
+ return ResourceManager.GetString("NewPrimaryAndInterimJobToolTip", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to No Manufacturing Steps.
/// </summary>
diff --git a/VECTO3GUI2020/Properties/GUILabels.resx b/VECTO3GUI2020/Properties/GUILabels.resx
index 1d9a9b8a37042a3da4309758d3f8ae072435ee5c..ac2e3599c035e1bcc1cb5d0bdd48ce2e39ace7f8 100644
--- a/VECTO3GUI2020/Properties/GUILabels.resx
+++ b/VECTO3GUI2020/Properties/GUILabels.resx
@@ -123,12 +123,24 @@
<data name="NewPrimaryAndInterimJob" xml:space="preserve">
<value>New Primary Job with Interim Input</value>
</data>
+ <data name="NewPrimaryAndInterimJobToolTip" xml:space="preserve">
+ <value>Create a new Primary Job with Interim Input</value>
+ </data>
<data name="NewInterimOrCompletedJob" xml:space="preserve">
<value>New Interim/Completed Job</value>
</data>
+ <data name="NewInterimOrCompletedJobToolTip" xml:space="preserve">
+ <value>Create a new Interim/Completed Job</value>
+ </data>
<data name="NewCompleteJob" xml:space="preserve">
<value>New Complete Job</value>
</data>
+ <data name="NewCompleteJobToolTip" xml:space="preserve">
+ <value>Create a new Complete Job</value>
+ </data>
+ <data name="CreateInterimCompletedInput" xml:space="preserve">
+ <value>Create Interim/Completed Input</value>
+ </data>
<data name="no manufacturing stages" xml:space="preserve">
<value>No Manufacturing Steps</value>
</data>
@@ -159,4 +171,13 @@
<data name="Components_Conventional_CompletedBusType" xml:space="preserve">
<value>Components_Conventional_CompletedBusType</value>
</data>
+ <data name="CreateInterimCompletedInputToolTip" xml:space="preserve">
+ <value>Create Interim/Completed Input</value>
+ </data>
+ <data name="CreateExemptedInterimCompletedInput" xml:space="preserve">
+ <value>Create Exempted Interim/Completed Input</value>
+ </data>
+ <data name="CreateExemptedInterimCompletedInputToolTip" xml:space="preserve">
+ <value>Create Exempted Interim/Completed Input</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
index 43e4465b4209f77b57b67825f0b1091197b898d9..ff7190924fb7456f9c7aa8ee593ed667e808d89c 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
@@ -1185,7 +1185,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
case nameof(PredictiveCruiseControlNullable):
case nameof(ATEcoRollReleaseLockupClutch):
if (AdasEditingEnabled == true && this.GetType().GetProperty(propertyName).GetValue(this) == null){
- result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}";
+ result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled.";
}
break;
default:
@@ -1193,12 +1193,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
var propertyValue = this.GetType().GetProperty(propertyName)?.GetValue(this);
if (propertyValue == null) {
result =
- $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}";
+ $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled.";
} else {
if (propertyValue.GetType() == typeof(string) && string.IsNullOrWhiteSpace(propertyValue as string))
{
result =
- $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}";
+ $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled.";
}
}
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
index 99eb26c63108101ffe0dedb2b332902b2a0ffe8d..711b9bce5ee50f17ffc5f82927e7ae4157edfa7b 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs
@@ -632,13 +632,13 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
case nameof(SystemConfiguration):
if (HeatPumpGroupEditingEnabled == true &&
this.GetType().GetProperty(propertyName).GetValue(this) == null) {
- result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}";
+ result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled.";
}
break;
default:
if (_parameterViewModels[propertyName].EditingEnabled == true && this.GetType().GetProperty(propertyName).GetValue(this) == null)
{
- result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}";
+ result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled.";
}
break;
}
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs
index a4284ead6662d92695071321439e4481a70bd026..3bb13847a8ed793a7b530ae7e39a991e36cf34c3 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs
@@ -154,7 +154,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
{
var dialogHelper = _multistageDependencies.DialogHelper;
if (VehicleViewModel.HasErrors) {
- var errorMessage = "Vehicle\n";
+ var errorMessage = "Vehicle:\n";
var vehicleErrorInfo = VehicleViewModel as IDataErrorInfo;
errorMessage += vehicleErrorInfo.Error.Replace(",", "\n");
@@ -163,7 +163,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
VehicleViewModel.MultistageAuxiliariesViewModel as IDataErrorInfo;
if (auxiliariesErrorInfo != null &&
!auxiliariesErrorInfo.Error.IsNullOrEmpty()) {
- errorMessage += "\n Auxiliaries \n";
+ errorMessage += "\nAuxiliaries:\n";
errorMessage += auxiliariesErrorInfo.Error.Replace(",", "\n");
}