Merge branch 'master' into copilot/enable-metadata-editing

Author: LeftofZen

Gui/ViewModels/LocoTypes/BaseFileViewModel.cs

@@ -111,7 +111,14 @@ async Task SaveWrapper()
 		// note - this is the DAT file source, not the true source...
 		if (CurrentFile.ObjectSource is ObjectSource.LocomotionSteam or ObjectSource.LocomotionGoG)
 		{
-			var box = MessageBoxManager.GetMessageBoxStandard("Confirm Save", $"{CurrentFile.FileName} is a vanilla Locomotion file - are you sure you want to overwrite it?", ButtonEnum.YesNo);
+			var msbParams = GetDefaultParams();
+			msbParams.ContentTitle = "Confirm Save";
+			msbParams.ContentMessage = $"{CurrentFile.FileName} is a vanilla Locomotion file - are you sure you want to overwrite it?";
+			msbParams.ButtonDefinitions = ButtonEnum.YesNo;
+			msbParams.Icon = Icon.Database;
+
+			var box = MessageBoxManager.GetMessageBoxStandard(msbParams);
+
 			var result = await box.ShowAsync();
 
 			if (result == ButtonResult.Yes)
@@ -125,7 +132,14 @@ async Task SaveWrapper()
 
 	async Task DeleteWrapper()
 	{
-		var box = MessageBoxManager.GetMessageBoxStandard("Confirm Delete", $"Are you sure you would like to delete {CurrentFile.FileName}?", ButtonEnum.YesNo);
+		var msbParams = GetDefaultParams();
+		msbParams.ContentTitle = "Confirm Delete";
+		msbParams.ContentMessage = $"Are you sure you would like to delete {CurrentFile.FileName}?";
+		msbParams.ButtonDefinitions = ButtonEnum.YesNo;
+		msbParams.Icon = Icon.Stop;
+
+		var box = MessageBoxManager.GetMessageBoxStandard(msbParams);
+
 		var result = await box.ShowAsync();
 
 		if (result == ButtonResult.Yes)
@@ -134,6 +148,16 @@ async Task DeleteWrapper()
 		}
 	}
 
+	MessageBoxStandardParams GetDefaultParams()
+		=> new()
+		{
+			WindowStartupLocation = WindowStartupLocation.CenterOwner,
+			Topmost = true,
+			SizeToContent = SizeToContent.WidthAndHeight,
+			ShowInCenter = true,
+			MinHeight = 170,
+		};
+
 	public string ReloadText => CurrentFile.FileLocation == FileLocation.Local ? "Reload" : "Redownload";
 	public string SaveText => CurrentFile.FileLocation == FileLocation.Local ? "Save" : "Download";
 	public string SaveAsText => $"{SaveText} As";

Gui/ViewModels/LocoTypes/ObjectEditorViewModel.cs

@@ -136,15 +136,17 @@ void ShowValidationMessageBox<T>(IEnumerable<T> validationErrors)
 				"Validation failed",
 				errorMsg,
 				ButtonEnum.Ok,
-				Icon.Error);
+				Icon.Error,
+				windowStartupLocation: WindowStartupLocation.CenterOwner);
 		}
 		else
 		{
 			box = MessageBoxManager.GetMessageBoxStandard(
 				"Validation succeeded",
 				"✔ No issues found. Object is valid.",
 				ButtonEnum.Ok,
-				Icon.Success);
+				Icon.Success,
+				windowStartupLocation: WindowStartupLocation.CenterOwner);
 		}
 		_ = box.ShowAsync();
 	}

Gui/Views/ExtendedPropertyGrid.cs

@@ -117,8 +117,11 @@ public override bool HandlePropertyChanged(PropertyCellContext context)
 				? (uint8_t)costIndexProperty.GetValue(target)!
 				: (uint8_t)0;
 
-			var designedYearProperty = TypeDescriptor.GetProperties(target)[currencyAttr.DesignedYearPropertyName];
-			var designedYear = designedYearProperty != null
+			var designedYearProperty = currencyAttr.DesignedYearPropertyName is null
+				? null
+				: TypeDescriptor.GetProperties(target)[currencyAttr.DesignedYearPropertyName];
+
+			var designedYear = designedYearProperty is not null
 				? (uint16_t)designedYearProperty.GetValue(target)!
 				: (uint16_t)1950;
 

Gui/Views/MainWindow.axaml

@@ -278,7 +278,7 @@
 												<TextBlock Margin="4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Text="{Binding SaveAsText}"/>
 											</DockPanel>
 										</Button>
-										<Button Margin="4" Padding="2" HorizontalAlignment="Right" Classes="danger" Command="{Binding DeleteLocalFileCommand}" DockPanel.Dock="Right" HotKey="Ctrl+D" IsEnabled="{Binding IsLocalMode}" IsVisible="{Binding IsLocalMode}" ToolTip.Tip="(Ctrl+D) WARNING: this will delete your local file without asking! Only click this if you're sure you want to delete this file!">
+										<Button Margin="4" Padding="2" HorizontalAlignment="Right" Classes="danger" Command="{Binding DeleteLocalFileCommand}" DockPanel.Dock="Right" HotKey="Ctrl+D" IsEnabled="{Binding IsLocalMode}" IsVisible="{Binding IsLocalMode}" ToolTip.Tip="(Ctrl+D) WARNING: this will delete your local file! Only click this if you're sure you want to delete this file!">
 											<DockPanel>
 												<materialIcons:MaterialIcon Width="24" Height="24" Margin="2" Kind="{Binding DeleteLocalFileIcon}"/>
 												<TextBlock Margin="4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Text="{Binding DeleteLocalFileText}"/>