SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Address some UI concerns

Browse Source
This commit is contained in:
Matt Nadareski
2022-12-30 10:59:32 -08:00
parent c56230c3af
commit 73b2f0921f
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELIST.md
View File

@@ -32,6 +32,8 @@
- Update to Aaru v5.3.2 LTS
- Update options loader with sane defaults
- Fix AppVeyor pathing
- Skip during detection
- Address some UI concerns
### 2.4 (2022-10-26)
- Update to DIC 20211001

22
MPF/ViewModels/MainViewModel.cs
View File

@@ -430,12 +430,14 @@ namespace MPF.UI.ViewModels
{
if (App.Instance.EnableParametersCheckBox.IsChecked == true)
{
App.Instance.OutputPathTextBox.IsEnabled = false;
App.Instance.ParametersTextBox.IsEnabled = true;
}
else
{
App.Instance.ParametersTextBox.IsEnabled = false;
ProcessCustomParameters();
App.Instance.OutputPathTextBox.IsEnabled = true;
}
}
@@ -575,6 +577,9 @@ namespace MPF.UI.ViewModels
App.Instance.MediaTypeComboBox.SelectionChanged += MediaTypeComboBoxSelectionChanged;
App.Instance.DriveLetterComboBox.SelectionChanged += DriveLetterComboBoxSelectionChanged;
App.Instance.DriveSpeedComboBox.SelectionChanged += DriveSpeedComboBoxSelectionChanged;
// User Area TextChanged
App.Instance.OutputPathTextBox.TextChanged += OutputPathTextBoxTextChanged;
}
/// <summary>
@@ -785,7 +790,6 @@ namespace MPF.UI.ViewModels
// Get the directory
string directory = Path.GetDirectoryName(currentPath);
Directory.CreateDirectory(directory);
// Get the filename
string filename = Path.GetFileName(currentPath);
@@ -955,7 +959,10 @@ namespace MPF.UI.ViewModels
string directory = App.Options.DefaultOutputPath;
string filename = $"{label}{extension ?? ".bin"}";
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, label, filename);
if (directory.EndsWith(label))
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, filename);
else
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, label, filename);
}
// Set the output filename, if we changed drives
@@ -965,7 +972,10 @@ namespace MPF.UI.ViewModels
string directory = Path.GetDirectoryName(App.Instance.OutputPathTextBox.Text);
string filename = $"{label}{extension ?? ".bin"}";
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, label, filename);
if (directory.EndsWith(label))
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, filename);
else
App.Instance.OutputPathTextBox.Text = Path.Combine(directory, label, filename);
}
// Ensure the UI gets updated
@@ -1459,6 +1469,12 @@ namespace MPF.UI.ViewModels
private void OutputPathBrowseButtonClick(object sender, RoutedEventArgs e) =>
SetOutputPath();
/// <summary>
/// Handler for OutputPathTextBox TextChanged event
/// </summary>
private void OutputPathTextBoxTextChanged(object sender, TextChangedEventArgs e)
=> EnsureDiscInformation();
/// <summary>
/// Handler for StartStopButton Click event
/// </summary>