Commit 865b0aa4 by liulongfei

样式调整

parent df9b169d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
Title="咪咕播控系统" Height="450" Width="800"> Title="摩羯座播控系统" Height="450" Width="800">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"></RowDefinition> <RowDefinition Height="40"></RowDefinition>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<!-- 系统名称 --> <!-- 系统名称 -->
<TextBlock Text="系统名称:" VerticalAlignment="Center" HorizontalAlignment="Right" <TextBlock Text="系统名称:" VerticalAlignment="Center" HorizontalAlignment="Right"
Grid.Row="0" Grid.Column="0" Margin="0,0,10,0"></TextBlock> Grid.Row="0" Grid.Column="0" Margin="0,0,10,0"></TextBlock>
<TextBlock Text="咪咕播控系统" VerticalAlignment="Center" HorizontalAlignment="Left" <TextBlock Text="摩羯座播控系统" VerticalAlignment="Center" HorizontalAlignment="Left"
Grid.Row="0" Grid.Column="1"></TextBlock> Grid.Row="0" Grid.Column="1"></TextBlock>
<!-- 系统版本 --> <!-- 系统版本 -->
<TextBlock Text="系统版本:" VerticalAlignment="Center" HorizontalAlignment="Right" <TextBlock Text="系统版本:" VerticalAlignment="Center" HorizontalAlignment="Right"
......
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
<!-- 清理 --> <!-- 清理 -->
<fcommon:IconButton Icon="/VIZ.Package.Module.Resource;component/Icons/icon_clear_32x32.png" <fcommon:IconButton Icon="/VIZ.Package.Module.Resource;component/Icons/icon_clear_32x32.png"
Style="{StaticResource IconButton_Menu_Mask}" Style="{StaticResource IconButton_Menu_Mask}"
ToolTip="清理内存" Margin="5,0,0,0" ToolTip="清理内存" Margin="10,0,0,0"
IconWidth="24" IconHeight="24" Width="24" Height="24" IconWidth="24" IconHeight="24" Width="24" Height="24"
Command="{Binding TakeClearCommand}"></fcommon:IconButton> Command="{Binding TakeClearCommand}"></fcommon:IconButton>
<!-- 初始化 --> <!-- 初始化 -->
<fcommon:IconButton Icon="/VIZ.Package.Module.Resource;component/Icons/icon_init_32x32.png" <fcommon:IconButton Icon="/VIZ.Package.Module.Resource;component/Icons/icon_init_32x32.png"
Style="{StaticResource IconButton_Menu_Mask}" Style="{StaticResource IconButton_Menu_Mask}"
ToolTip="初始化" Margin="5,0,0,0" ToolTip="初始化" Margin="10,0,0,0"
IconWidth="24" IconHeight="24" Width="24" Height="24" IconWidth="24" IconHeight="24" Width="24" Height="24"
Command="{Binding TakeInitAllCommand}"></fcommon:IconButton> Command="{Binding TakeInitAllCommand}"></fcommon:IconButton>
</StackPanel> </StackPanel>
......
...@@ -59,28 +59,34 @@ ...@@ -59,28 +59,34 @@
Command="{Binding Path=RestartPreviewCommand}"></fcommon:IconButton> Command="{Binding Path=RestartPreviewCommand}"></fcommon:IconButton>
<CheckBox Content="TA" Style="{StaticResource CheckBox_Preview_TA}" Margin="5,0,0,0" <CheckBox Content="TA" Style="{StaticResource CheckBox_Preview_TA}" Margin="5,0,0,0"
ToolTip="Title Safe"
IsChecked="{Binding Path=IsShowTS,Mode=TwoWay}"> IsChecked="{Binding Path=IsShowTS,Mode=TwoWay}">
</CheckBox> </CheckBox>
<CheckBox Content="SA" Style="{StaticResource CheckBox_Preview_SA}" Margin="5,0,0,0" <CheckBox Content="SA" Style="{StaticResource CheckBox_Preview_SA}" Margin="5,0,0,0"
ToolTip="Safe Area"
IsChecked="{Binding Path=IsShowSA,Mode=TwoWay}"> IsChecked="{Binding Path=IsShowSA,Mode=TwoWay}">
</CheckBox> </CheckBox>
<CheckBox Content="BB" Style="{StaticResource CheckBox_Preview_BB}" Margin="5,0,0,0" <CheckBox Content="BB" Style="{StaticResource CheckBox_Preview_BB}" Margin="5,0,0,0"
ToolTip="Binding Box"
IsChecked="{Binding Path=IsShowBB,Mode=TwoWay}"> IsChecked="{Binding Path=IsShowBB,Mode=TwoWay}">
</CheckBox> </CheckBox>
<RadioButton Content="RGB" Style="{StaticResource RadioButton_Preview_RGB}" <RadioButton Content="RGB" Style="{StaticResource RadioButton_Preview_RGB}"
ToolTip="RGB"
Margin="5,0,0,0" IsChecked="True"> Margin="5,0,0,0" IsChecked="True">
<dxmvvm:Interaction.Behaviors> <dxmvvm:Interaction.Behaviors>
<dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowRGBCommand}"></dxmvvm:EventToCommand> <dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowRGBCommand}"></dxmvvm:EventToCommand>
</dxmvvm:Interaction.Behaviors> </dxmvvm:Interaction.Behaviors>
</RadioButton> </RadioButton>
<RadioButton Content="Key" Style="{StaticResource RadioButton_Preview_Key}" <RadioButton Content="Key" Style="{StaticResource RadioButton_Preview_Key}"
ToolTip="Key"
Margin="5,0,0,0"> Margin="5,0,0,0">
<dxmvvm:Interaction.Behaviors> <dxmvvm:Interaction.Behaviors>
<dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowKeyCommand}"></dxmvvm:EventToCommand> <dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowKeyCommand}"></dxmvvm:EventToCommand>
</dxmvvm:Interaction.Behaviors> </dxmvvm:Interaction.Behaviors>
</RadioButton> </RadioButton>
<RadioButton Content="KeyedPreveiew" Style="{StaticResource RadioButton_Preview_KeydPreview}" <RadioButton Content="KeyedPreview" Style="{StaticResource RadioButton_Preview_KeydPreview}"
ToolTip="Keyed Preview"
Margin="5,0,0,0"> Margin="5,0,0,0">
<dxmvvm:Interaction.Behaviors> <dxmvvm:Interaction.Behaviors>
<dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowKeyPreviewCommand}"></dxmvvm:EventToCommand> <dxmvvm:EventToCommand EventName="Checked" Command="{Binding Path=ShowKeyPreviewCommand}"></dxmvvm:EventToCommand>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment