dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rückmeldung bearbeitet

Browse Source
This commit is contained in:
Daniel Schick 2022-10-17 09:14:03 +02:00
parent 35a8b50f68
commit 6513762adc
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ENI2/EditControls/NewDGItemDialog.xaml
View File

@ -8,13 +8,13 @@
xmlns:p="clr-namespace:ENI2.Properties" xmlns:p="clr-namespace:ENI2.Properties"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
mc:Ignorable="d" mc:Ignorable="d"
Title="{x:Static p:Resources.textNewDGItem}" Height="290" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="CanResize" Title="{x:Static p:Resources.textNewDGItem}" Height="350" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" ResizeMode="CanResize"
Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Loaded="EditWindowBase_Loaded"> Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Loaded="EditWindowBase_Loaded">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="28" /> <RowDefinition Height="28" />
<RowDefinition Height="28" /> <RowDefinition Height="28" />
<RowDefinition Height="28" /> <RowDefinition Height="90" />
<RowDefinition Height="28" /> <RowDefinition Height="28" />
<RowDefinition Height="28" /> <RowDefinition Height="28" />
<RowDefinition Height="28" /> <RowDefinition Height="28" />
@ -30,7 +30,7 @@
<ComboBox Name="comboBoxType" Grid.Column="1" Grid.Row="0" Margin="2" SelectionChanged="comboBoxType_SelectionChanged" /> <ComboBox Name="comboBoxType" Grid.Column="1" Grid.Row="0" Margin="2" SelectionChanged="comboBoxType_SelectionChanged" />
<Label Content="{x:Static p:Resources.textDescription}" Grid.Row="1" Grid.Column="0" /> <Label Content="{x:Static p:Resources.textDescription}" Grid.Row="1" Grid.Column="0" />
<xctk:WatermarkTextBox Margin="2" Watermark="{x:Static p:Resources.textSearch}" Name="textBoxSearchDescription" Grid.Row="1" Grid.Column="1" TextChanged="textBoxSearchDescription_TextChanged" /> <xctk:WatermarkTextBox Margin="2" Watermark="{x:Static p:Resources.textSearch}" Name="textBoxSearchDescription" Grid.Row="1" Grid.Column="1" TextChanged="textBoxSearchDescription_TextChanged" />
<ComboBox Name="comboBoxDescription" Grid.Column="1" Grid.Row="2" Margin="2" SelectionChanged="comboBoxDescription_SelectionChanged" /> <ListBox Name="listBoxDescription" Grid.Column="1" Grid.Row="2" Margin="2" SelectionChanged="listBoxDescription_SelectionChanged" />
<Label Content="{x:Static p:Resources.textRemarks}" Grid.Row="5" Grid.Column="0" /> <Label Content="{x:Static p:Resources.textRemarks}" Grid.Row="5" Grid.Column="0" />
<Border BorderThickness="1" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" BorderBrush="Black" Margin="2"> <Border BorderThickness="1" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" BorderBrush="Black" Margin="2">
<TextBlock Name="textBlockDescription" Margin="2" Background="LightGray" TextWrapping="Wrap"/> <TextBlock Name="textBlockDescription" Margin="2" Background="LightGray" TextWrapping="Wrap"/>

10
ENI2/EditControls/NewDGItemDialog.xaml.cs
View File

@ -34,7 +34,7 @@ namespace ENI2.EditControls
{ {
get get
{ {
return this.comboBoxDescription.SelectedItem as HAZPosTemplate; return this.listBoxDescription.SelectedItem as HAZPosTemplate;
} }
} }
@ -42,7 +42,7 @@ namespace ENI2.EditControls
{ {
// load combo boxes // load combo boxes
_data = LocalizedLookup.LoadHAZTemplates(); _data = LocalizedLookup.LoadHAZTemplates();
this.comboBoxDescription.ItemsSource = _data; this.listBoxDescription.ItemsSource = _data;
this.comboBoxType.ItemsSource = Enum.GetValues(typeof(HAZPosTemplate.SublistType)); this.comboBoxType.ItemsSource = Enum.GetValues(typeof(HAZPosTemplate.SublistType));
} }
@ -51,9 +51,9 @@ namespace ENI2.EditControls
FilterDescriptions(); FilterDescriptions();
} }
private void comboBoxDescription_SelectionChanged(object sender, SelectionChangedEventArgs e) private void listBoxDescription_SelectionChanged(object sender, SelectionChangedEventArgs e)
{ {
if (this.comboBoxDescription.SelectedItem is HAZPosTemplate selectedTemplate) if (this.listBoxDescription.SelectedItem is HAZPosTemplate selectedTemplate)
{ {
this.textBlockDescription.Text = selectedTemplate.Description; this.textBlockDescription.Text = selectedTemplate.Description;
this.textBlockRemarks.Text = selectedTemplate.Comment; this.textBlockRemarks.Text = selectedTemplate.Comment;
@ -86,7 +86,7 @@ namespace ENI2.EditControls
HAZPosTemplate.SublistType sType = (HAZPosTemplate.SublistType)this.comboBoxType.SelectedItem; HAZPosTemplate.SublistType sType = (HAZPosTemplate.SublistType)this.comboBoxType.SelectedItem;
filtered = filtered.Where(elem => elem.TemplateType == sType); filtered = filtered.Where(elem => elem.TemplateType == sType);
} }
this.comboBoxDescription.ItemsSource = filtered; this.listBoxDescription.ItemsSource = filtered;
} }
} }

BIN
misc/db.sqlite
View File

Binary file not shown.