xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了界面

Browse Source
This commit is contained in:
David P.G
2025-10-03 11:10:35 +08:00
parent 3d92737df8
commit 6ff4ef1c00
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
DMS.WPF/Views/DevicesView.xaml
View File

@@ -91,7 +91,7 @@
Glyph="" /> Glyph="" />
<TextBlock FontSize="12" <TextBlock FontSize="12"
Foreground="#888888" Foreground="#888888"
Text="{Binding ConnectionStatus}" /> Text="{Binding IsRunning, Converter={StaticResource BoolToStringConverter}, ConverterParameter='已连接;未连接'}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@@ -99,15 +99,16 @@
<StackPanel Grid.Column="1" <StackPanel Grid.Column="1"
VerticalAlignment="Top" VerticalAlignment="Top"
Orientation="Horizontal"> Orientation="Horizontal">
<Border Width="16" <Border
Height="16"
Margin="0,0,10,0" Margin="0,0,10,0"
Background="{Binding IsRunning, Converter={StaticResource BoolToColorConverter}, ConverterParameter='Green;Red'}" Background="{Binding IsRunning, Converter={StaticResource BoolToColorConverter}, ConverterParameter='Green;Red'}"
CornerRadius="8"> CornerRadius="8">
<Border.ToolTip> <TextBlock
<TextBlock Margin="10 5"
Text="{Binding IsRunning, Converter={StaticResource BoolToStringConverter}, ConverterParameter='已连接;未连接'}" /> FontSize="14"
</Border.ToolTip> Foreground="White"
FontWeight="Bold"
Text="{Binding IsRunning, Converter={StaticResource BoolToStringConverter}, ConverterParameter='已连接;未连接'}" />
</Border> </Border>
<ToggleButton x:Name="ExpandToggleButton" <ToggleButton x:Name="ExpandToggleButton"
@@ -218,13 +219,17 @@
Height="26" Height="26"
Margin="8,0,0,0" Margin="8,0,0,0"
Padding="0" Padding="0"
Content="&#xE76C;"
FontFamily="Segoe MDL2 Assets"
FontSize="14"
Style="{StaticResource DefaultButtonStyle}" Style="{StaticResource DefaultButtonStyle}"
Command="{Binding DataContext.EditVariableTableCommand, RelativeSource={RelativeSource AncestorType=UserControl}}" Command="{Binding DataContext.EditVariableTableCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
CommandParameter="{Binding}" CommandParameter="{Binding}"
ToolTip="编辑变量表" /> ToolTip="编辑变量表">
<Button.Content>
<StackPanel Orientation="Horizontal">
<ui:FontIcon
Icon="{x:Static ui:SegoeFluentIcons.Edit}" />
</StackPanel>
</Button.Content>
</Button>
<Button Width="26" <Button Width="26"
Height="26" Height="26"
@@ -250,7 +255,7 @@
FontSize="13" FontSize="13"
Foreground="#AAAAAA" Foreground="#AAAAAA"
Text="暂无变量表" Text="暂无变量表"
Visibility="{Binding VariableTables.Count, Converter={StaticResource CountToVisibilityConverter}}" /> Visibility="{Binding VariableTables, Converter={StaticResource CountToVisibilityConverter}}" />
</StackPanel> </StackPanel>
</Border> </Border>
</StackPanel> </StackPanel>