LucianoDev
37d099cdbd
Unlock progress UI:
- UnlockProgressDialog with dark-themed progress ring, phase indicator, elapsed
time, and cancel/close buttons (non-modal, draggable borderless window)
- UnlockProgressViewModel with event-driven progress tracking via IUnlockService
- Triggers on pump selection (manual or K-Line auto-detect), not test start
UnlockService rewrite:
- Persistent CAN senders that outlive the unlock sequence (StopSenders on pump change)
- Concurrent K-Line fast unlock: awaits session Connected, sends RAM timer shortcut
({02 88 02 03 A8 01 00}), verifies via CAN TestUnlock before skipping wait
- Fix Type 1 verification (Value == 0 means unlocked, was inverted)
K-Line fast unlock support:
- IKwpService.TryFastUnlockAsync / KwpService implementation
Additional features:
- ILocalizationService with ES/EN resource dictionaries and runtime switching
- Safety dialogs: VoltageWarning, OilPumpConfirm, RpmSafetyWarning
- SettingsDialog for app configuration
- BenchService enhancements, ConfigurationService improvements, PDF report updates
- All UI strings localized via DynamicResource
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
334 lines
21 KiB
XML
334 lines
21 KiB
XML
<Window x:Class="HC_APTBS.Views.Dialogs.SettingsDialog"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
Title="{DynamicResource Dialog.Settings.Title}"
|
|
Height="560" Width="680"
|
|
ResizeMode="NoResize"
|
|
WindowStartupLocation="CenterOwner"
|
|
FontFamily="Ebrima"
|
|
Background="#FFEDEDED">
|
|
|
|
<DockPanel Margin="8">
|
|
|
|
<!-- ── Bottom button bar ─────────────────────────────────────────── -->
|
|
<StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal"
|
|
HorizontalAlignment="Right" Margin="0,8,0,0">
|
|
<Button Content="{DynamicResource Common.Accept}" Width="80" Height="26"
|
|
Margin="0,0,8,0" Command="{Binding AcceptCommand}" IsDefault="True"/>
|
|
<Button Content="{DynamicResource Common.Cancel}" Width="80" Height="26"
|
|
Command="{Binding CancelCommand}" IsCancel="True"/>
|
|
</StackPanel>
|
|
|
|
<!-- ── Tab control ───────────────────────────────────────────────── -->
|
|
<TabControl>
|
|
|
|
<!-- ══ General ══════════════════════════════════════════════════ -->
|
|
<TabItem Header="{DynamicResource Dialog.Settings.Tab.General}">
|
|
<StackPanel Margin="16">
|
|
<TextBlock Text="{DynamicResource Dialog.Settings.Language}"
|
|
FontWeight="SemiBold" Margin="0,0,0,4"/>
|
|
<ComboBox ItemsSource="{Binding AvailableLanguages}"
|
|
SelectedItem="{Binding SelectedLanguage}"
|
|
Width="120" HorizontalAlignment="Left"/>
|
|
|
|
<TextBlock Text="{DynamicResource Dialog.Settings.DaysKeepLogs}"
|
|
FontWeight="SemiBold" Margin="0,16,0,4"/>
|
|
<TextBox Text="{Binding DaysKeepLogs, UpdateSourceTrigger=LostFocus}"
|
|
Width="80" HorizontalAlignment="Left"/>
|
|
</StackPanel>
|
|
</TabItem>
|
|
|
|
<!-- ══ Safety ═══════════════════════════════════════════════════ -->
|
|
<TabItem Header="{DynamicResource Dialog.Settings.Tab.Safety}">
|
|
<Grid Margin="16">
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="Auto"/>
|
|
<ColumnDefinition Width="120"/>
|
|
</Grid.ColumnDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
</Grid.RowDefinitions>
|
|
|
|
<TextBlock Grid.Row="0" Grid.Column="0" Text="{DynamicResource Dialog.Settings.TempMax}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding TempMax, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource Dialog.Settings.TempMin}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding TempMin, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="2" Grid.Column="0" Text="{DynamicResource Dialog.Settings.SecurityRpmLimit}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding SecurityRpmLimit, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="3" Grid.Column="0" Text="{DynamicResource Dialog.Settings.MaxPressureBar}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding MaxPressureBar, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="4" Grid.Column="0" Text="{DynamicResource Dialog.Settings.ToleranceUp}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding ToleranceUpExtension, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="5" Grid.Column="0" Text="{DynamicResource Dialog.Settings.TolerancePfp}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="5" Grid.Column="1" Text="{Binding TolerancePfpExtension, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<CheckBox Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2"
|
|
Content="{DynamicResource Dialog.Settings.IgnoreTin}"
|
|
IsChecked="{Binding DefaultIgnoreTin}" Margin="0,4,0,0"/>
|
|
</Grid>
|
|
</TabItem>
|
|
|
|
<!-- ══ PID ══════════════════════════════════════════════════════ -->
|
|
<TabItem Header="{DynamicResource Dialog.Settings.Tab.Pid}">
|
|
<Grid Margin="16">
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="Auto"/>
|
|
<ColumnDefinition Width="120"/>
|
|
</Grid.ColumnDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
</Grid.RowDefinitions>
|
|
|
|
<TextBlock Grid.Row="0" Grid.Column="0" Text="{DynamicResource Dialog.Settings.PidP}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding PidP, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource Dialog.Settings.PidI}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding PidI, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="2" Grid.Column="0" Text="{DynamicResource Dialog.Settings.PidD}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding PidD, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="3" Grid.Column="0" Text="{DynamicResource Dialog.Settings.PidLoopMs}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding PidLoopMs, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
</Grid>
|
|
</TabItem>
|
|
|
|
<!-- ══ Motor ════════════════════════════════════════════════════ -->
|
|
<TabItem Header="{DynamicResource Dialog.Settings.Tab.Motor}">
|
|
<DockPanel Margin="16">
|
|
<!-- Top: motor parameters -->
|
|
<Grid DockPanel.Dock="Top">
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="Auto"/>
|
|
<ColumnDefinition Width="120"/>
|
|
</Grid.ColumnDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
</Grid.RowDefinitions>
|
|
|
|
<TextBlock Grid.Row="0" Grid.Column="0" Text="{DynamicResource Dialog.Settings.EncoderRes}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding EncoderResolution, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource Dialog.Settings.VoltMaxRpm}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding VoltageForMaxRpm, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="2" Grid.Column="0" Text="{DynamicResource Dialog.Settings.MaxRpm}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding MaxRpm, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<CheckBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2"
|
|
Content="{DynamicResource Dialog.Settings.RightRelay}"
|
|
IsChecked="{Binding RightRelayValue}" Margin="0,4,0,0"/>
|
|
</Grid>
|
|
|
|
<!-- RPM-Voltage relation table -->
|
|
<GroupBox Margin="0,12,0,0">
|
|
<GroupBox.Header>
|
|
<TextBlock Text="{DynamicResource Dialog.Settings.Relations}" FontWeight="SemiBold"/>
|
|
</GroupBox.Header>
|
|
<DockPanel>
|
|
<StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" Margin="0,4,0,0">
|
|
<Button Content="{DynamicResource Dialog.Settings.AddRow}"
|
|
Command="{Binding AddRelationCommand}"
|
|
Width="75" Margin="0,0,8,0"/>
|
|
<Button Content="{DynamicResource Dialog.Settings.RemoveRow}"
|
|
Command="{Binding RemoveRelationCommand}"
|
|
CommandParameter="{Binding SelectedItem, ElementName=RelationsGrid}"
|
|
Width="75"/>
|
|
</StackPanel>
|
|
<DataGrid x:Name="RelationsGrid"
|
|
ItemsSource="{Binding Relations}"
|
|
AutoGenerateColumns="False"
|
|
CanUserAddRows="False"
|
|
CanUserDeleteRows="False"
|
|
SelectionMode="Single"
|
|
HeadersVisibility="Column"
|
|
GridLinesVisibility="Horizontal"
|
|
MinHeight="120">
|
|
<DataGrid.Columns>
|
|
<DataGridTemplateColumn Width="*">
|
|
<DataGridTemplateColumn.HeaderTemplate>
|
|
<DataTemplate>
|
|
<TextBlock Text="{DynamicResource Dialog.Settings.RelRpm}"/>
|
|
</DataTemplate>
|
|
</DataGridTemplateColumn.HeaderTemplate>
|
|
<DataGridTemplateColumn.CellTemplate>
|
|
<DataTemplate>
|
|
<TextBlock Text="{Binding Rpm}" VerticalAlignment="Center" Margin="4,0"/>
|
|
</DataTemplate>
|
|
</DataGridTemplateColumn.CellTemplate>
|
|
<DataGridTemplateColumn.CellEditingTemplate>
|
|
<DataTemplate>
|
|
<TextBox Text="{Binding Rpm, UpdateSourceTrigger=PropertyChanged}"/>
|
|
</DataTemplate>
|
|
</DataGridTemplateColumn.CellEditingTemplate>
|
|
</DataGridTemplateColumn>
|
|
<DataGridTemplateColumn Width="*">
|
|
<DataGridTemplateColumn.HeaderTemplate>
|
|
<DataTemplate>
|
|
<TextBlock Text="{DynamicResource Dialog.Settings.RelVoltage}"/>
|
|
</DataTemplate>
|
|
</DataGridTemplateColumn.HeaderTemplate>
|
|
<DataGridTemplateColumn.CellTemplate>
|
|
<DataTemplate>
|
|
<TextBlock Text="{Binding Voltage}" VerticalAlignment="Center" Margin="4,0"/>
|
|
</DataTemplate>
|
|
</DataGridTemplateColumn.CellTemplate>
|
|
<DataGridTemplateColumn.CellEditingTemplate>
|
|
<DataTemplate>
|
|
<TextBox Text="{Binding Voltage, UpdateSourceTrigger=PropertyChanged}"/>
|
|
</DataTemplate>
|
|
</DataGridTemplateColumn.CellEditingTemplate>
|
|
</DataGridTemplateColumn>
|
|
</DataGrid.Columns>
|
|
</DataGrid>
|
|
</DockPanel>
|
|
</GroupBox>
|
|
</DockPanel>
|
|
</TabItem>
|
|
|
|
<!-- ══ Company ══════════════════════════════════════════════════ -->
|
|
<TabItem Header="{DynamicResource Dialog.Settings.Tab.Company}">
|
|
<StackPanel Margin="16">
|
|
<TextBlock Text="{DynamicResource Dialog.Settings.CompanyName}"
|
|
FontWeight="SemiBold" Margin="0,0,0,4"/>
|
|
<TextBox Text="{Binding CompanyName, UpdateSourceTrigger=LostFocus}"/>
|
|
|
|
<TextBlock Text="{DynamicResource Dialog.Settings.CompanyInfo}"
|
|
FontWeight="SemiBold" Margin="0,12,0,4"/>
|
|
<TextBox Text="{Binding CompanyInfo, UpdateSourceTrigger=LostFocus}"
|
|
TextWrapping="Wrap" AcceptsReturn="True" Height="80"
|
|
VerticalScrollBarVisibility="Auto"/>
|
|
|
|
<TextBlock Text="{DynamicResource Dialog.Settings.ReportLogo}"
|
|
FontWeight="SemiBold" Margin="0,12,0,4"/>
|
|
<DockPanel>
|
|
<Button DockPanel.Dock="Right" Content="..." Width="30"
|
|
Margin="4,0,0,0" Command="{Binding BrowseLogoCommand}"/>
|
|
<TextBox Text="{Binding ReportLogoPath, UpdateSourceTrigger=LostFocus}"
|
|
IsReadOnly="True" Background="#F0F0F0"/>
|
|
</DockPanel>
|
|
</StackPanel>
|
|
</TabItem>
|
|
|
|
<!-- ══ K-Line ═══════════════════════════════════════════════════ -->
|
|
<TabItem Header="{DynamicResource Dialog.Settings.Tab.KLine}">
|
|
<StackPanel Margin="16">
|
|
<TextBlock Text="{DynamicResource Dialog.Settings.KLinePort}"
|
|
FontWeight="SemiBold" Margin="0,0,0,4"/>
|
|
<DockPanel>
|
|
<Button DockPanel.Dock="Right"
|
|
Content="{DynamicResource Dialog.Settings.RefreshPorts}"
|
|
Margin="8,0,0,0" Width="80"
|
|
Command="{Binding RefreshPortsCommand}"/>
|
|
<ComboBox ItemsSource="{Binding AvailablePorts}"
|
|
SelectedItem="{Binding SelectedKLinePort}"
|
|
IsEditable="True"
|
|
Text="{Binding SelectedKLinePort, UpdateSourceTrigger=LostFocus}"/>
|
|
</DockPanel>
|
|
<TextBlock Text="{DynamicResource Dialog.Settings.KLineHint}"
|
|
FontStyle="Italic" Foreground="Gray" Margin="0,8,0,0"
|
|
TextWrapping="Wrap"/>
|
|
</StackPanel>
|
|
</TabItem>
|
|
|
|
<!-- ══ Advanced ═════════════════════════════════════════════════ -->
|
|
<TabItem Header="{DynamicResource Dialog.Settings.Tab.Advanced}">
|
|
<Grid Margin="16">
|
|
<Grid.ColumnDefinitions>
|
|
<ColumnDefinition Width="Auto"/>
|
|
<ColumnDefinition Width="120"/>
|
|
</Grid.ColumnDefinitions>
|
|
<Grid.RowDefinitions>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
<RowDefinition Height="Auto"/>
|
|
</Grid.RowDefinitions>
|
|
|
|
<TextBlock Grid.Row="0" Grid.Column="0" Text="{DynamicResource Dialog.Settings.RefreshBench}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding RefreshBenchInterfaceMs, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource Dialog.Settings.RefreshReading}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding RefreshWhileReadingMs, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="2" Grid.Column="0" Text="{DynamicResource Dialog.Settings.RefreshCanBus}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding RefreshCanBusReadMs, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="3" Grid.Column="0" Text="{DynamicResource Dialog.Settings.RefreshPumpReq}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="3" Grid.Column="1" Text="{Binding RefreshPumpRequestMs, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="4" Grid.Column="0" Text="{DynamicResource Dialog.Settings.RefreshPumpParams}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="4" Grid.Column="1" Text="{Binding RefreshPumpParamsMs, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="5" Grid.Column="0" Text="{DynamicResource Dialog.Settings.BlinkInterval}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="5" Grid.Column="1" Text="{Binding BlinkIntervalMs, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
|
|
<TextBlock Grid.Row="6" Grid.Column="0" Text="{DynamicResource Dialog.Settings.FlasherInterval}"
|
|
VerticalAlignment="Center" Margin="0,0,12,6"/>
|
|
<TextBox Grid.Row="6" Grid.Column="1" Text="{Binding FlasherIntervalMs, UpdateSourceTrigger=LostFocus}"
|
|
Margin="0,0,0,6"/>
|
|
</Grid>
|
|
</TabItem>
|
|
|
|
</TabControl>
|
|
</DockPanel>
|
|
</Window>
|