This commit is contained in:
@@ -21,7 +21,7 @@ namespace PamhagenSysCtrl.Helpers {
|
||||
PlcPort = config["plc:port"] ?? "COM1";
|
||||
} catch (Exception exc) {
|
||||
MessageBox.Show($"Die Konfigurationsdatei konnte nicht gelesen werden:\n\n{exc.Message}", "Konfigurationsdatei lesen", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||
App.Current.Shutdown();
|
||||
Application.Current.Shutdown();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:PamhagenSysCtrl"
|
||||
mc:Ignorable="d"
|
||||
Title="Manuelle Steuerung - Anlagensteuerung Pamhagen" Height="550" Width="860">
|
||||
Title="Handbetrieb - Anlagensteuerung Pamhagen" Height="550" Width="860">
|
||||
<Grid>
|
||||
<Grid x:Name="ValvePanel" Margin="5,5,5,5">
|
||||
</Grid>
|
||||
|
||||
@@ -14,13 +14,18 @@
|
||||
|
||||
<Menu Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
|
||||
<MenuItem Header="Einstellungen">
|
||||
<MenuItem x:Name="Menu_Settings_ManualControl" Header="Manuelle Steuerung" Click="Menu_Settings_ManualControl_Click">
|
||||
<MenuItem x:Name="Menu_Settings_ManualControl" Header="Handbetrieb"
|
||||
Click="Menu_Settings_ManualControl_Click" IsCheckable="True">
|
||||
<MenuItem.Icon>
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
||||
</MenuItem.Icon>
|
||||
</MenuItem>
|
||||
<MenuItem x:Name="Menu_Settings_OverridePathClearances" Header="Pfad-Freigaben überbrücken"
|
||||
Click="Menu_Settings_OverridePathClearances_Click" IsCheckable="True"/>
|
||||
Click="Menu_Settings_OverridePathClearances_Click" IsCheckable="True">
|
||||
<MenuItem.Icon>
|
||||
<TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text=""/>
|
||||
</MenuItem.Icon>
|
||||
</MenuItem>
|
||||
<MenuItem x:Name="Menu_Settings_OverrideDryRunClearances" Header="Trockenlauf-Freigaben überbrücken"
|
||||
Click="Menu_Settings_OverrideDryRunClearances_Click" IsCheckable="True"/>
|
||||
<Separator/>
|
||||
|
||||
@@ -22,8 +22,22 @@ namespace PamhagenSysCtrl.Windows {
|
||||
}
|
||||
|
||||
private void Menu_Settings_ManualControl_Click(object sender, RoutedEventArgs evt) {
|
||||
var w = new ManualControlWindow();
|
||||
w.Show();
|
||||
if (Menu_Settings_ManualControl.IsChecked) {
|
||||
foreach (var win in Application.Current.Windows) {
|
||||
if (win is ManualControlWindow w) {
|
||||
w.Focus();
|
||||
return;
|
||||
}
|
||||
}
|
||||
var ctrl = new ManualControlWindow();
|
||||
ctrl.Show();
|
||||
} else {
|
||||
foreach (var win in Application.Current.Windows) {
|
||||
if (win is ManualControlWindow w) {
|
||||
w.Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void Menu_Settings_OverridePathClearances_Click(object sender, RoutedEventArgs evt) {
|
||||
|
||||
Reference in New Issue
Block a user