From ba6207f52db76ab47cd6534de0cf1712674ff179 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期四, 13 三月 2025 09:00:46 +0800
Subject: [PATCH] 完善国际化语言；
---
HMI.AlermInfoManage/AlarmSettingList.xaml | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/HMI.AlermInfoManage/AlarmSettingList.xaml b/HMI.AlermInfoManage/AlarmSettingList.xaml
index 8bcf7c9..75fc864 100644
--- a/HMI.AlermInfoManage/AlarmSettingList.xaml
+++ b/HMI.AlermInfoManage/AlarmSettingList.xaml
@@ -12,20 +12,10 @@
Title="{Binding SelectedValue,Mode=OneWay}"
SizeToContent="Height"
pu:WindowXModalDialog.Buttons="OK"
- pu:WindowXModalDialog.OKButtonContent="{Binding Converter={StaticResource lc},ConverterParameter='App.Close'}"
+ pu:WindowXModalDialog.OKButtonContent="{DynamicResource App.Close}"
Width="800"
Height="600"
Style="{StaticResource ModalWindow}">
- <Window.Resources>
- <ResourceDictionary>
- <ResourceDictionary.MergedDictionaries>
- <pu:StyleDictionary Includes="TabControl"/>
- <ResourceDictionary Source="/HMI.UI;component/Resources/Font/Font.xaml"/>
- <ResourceDictionary Source="/HMI.UI;component/Style/Colors.xaml"/>
- </ResourceDictionary.MergedDictionaries>
- </ResourceDictionary>
- </Window.Resources>
-
<Grid Margin="10">
<Border BorderThickness="1" BorderBrush="Gray">
<Grid>
@@ -35,7 +25,7 @@
<RowDefinition />
</Grid.RowDefinitions>
- <ListBox ItemsSource="{Binding Items}" SelectedValue="{Binding SelectedValue}" BorderThickness="0">
+ <ListBox ItemsSource="{Binding Items}" SelectedIndex="{Binding ItemIndex}" BorderThickness="0">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal"/>
@@ -97,22 +87,37 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTextColumn Width="*" Binding="{Binding DBAddress}" Header="DB鍦板潃" />
- <DataGridTextColumn Width="*" Binding="{Binding StartAddress}" Header="璧峰鍦板潃" />
- <DataGridTextColumn Width="*" Binding="{Binding Length}" Header="DB闀垮害" />
- <DataGridTemplateColumn Header="鎿嶄綔" Width="100" IsReadOnly="True" CanUserResize="False">
+ <DataGridTextColumn Width="*" Binding="{Binding DBAddress}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.DbAddress}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding StartAddress}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.StartAddress}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTextColumn Width="*" Binding="{Binding Length}">
+ <DataGridTextColumn.Header>
+ <TextBlock Text="{DynamicResource Alm.DbLength}"/>
+ </DataGridTextColumn.Header>
+ </DataGridTextColumn>
+ <DataGridTemplateColumn Width="100" IsReadOnly="True" CanUserResize="False">
+ <DataGridTemplateColumn.Header>
+ <TextBlock Text="{DynamicResource App.Opt}"/>
+ </DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<Button x:Name="editBtn" Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
- Style="{StaticResource RowLink}"
+ Style="{StaticResource EditLink}"
Margin="0,0,10,0"
Click="Button_Click"
- DataContext="{Binding }">缂栬緫</Button>
+ DataContext="{Binding }"/>
<Button x:Name="delBtn" Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGridRow},AncestorLevel=1}}"
- Style="{StaticResource DangerLinkButton}"
+ Style="{StaticResource DeleteLink}"
DataContext="{Binding }"
- Click="Button_Click">鍒犻櫎</Button>
+ Click="Button_Click"/>
</StackPanel>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
--
Gitblit v1.9.1