Commit b5f91136 by 鲁志-悦动

主页和UE控制页优化

parent d2828c61
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
Height="2" Height="2"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Fill="White" Fill="#6A6868"
RenderTransformOrigin="0.5,0.5"> RenderTransformOrigin="0.5,0.5">
<Rectangle.RenderTransform> <Rectangle.RenderTransform>
<RotateTransform Angle="45" /> <RotateTransform Angle="45" />
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
Height="2" Height="2"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Fill="White" Fill="#6A6868"
RenderTransformOrigin="0.5,0.5"> RenderTransformOrigin="0.5,0.5">
<Rectangle.RenderTransform> <Rectangle.RenderTransform>
<RotateTransform Angle="-45" /> <RotateTransform Angle="-45" />
...@@ -197,4 +197,51 @@ ...@@ -197,4 +197,51 @@
</Setter> </Setter>
</Style> </Style>
<Style x:Key="BigButtonStyle" TargetType="{x:Type Button}">
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="14" />
<Setter Property="Width" Value="60" />
<Setter Property="Height" Value="30" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Background" Value="#181C25" />
<Setter Property="BorderBrush" Value="Gray" />
<Setter Property="BorderThickness" Value="1.5" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Grid>
<Border
x:Name="border"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="6"
SnapsToDevicePixels="true">
<ContentPresenter
x:Name="contentPresenter"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Focusable="False"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#378CFF" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" Value="#378CFF" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Foreground" Value="Gray" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary> </ResourceDictionary>
\ No newline at end of file
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
<Setter Property="Content" Value="Disable" /> <Setter Property="Content" Value="Disable" />
<Setter Property="Height" Value="30" /> <Setter Property="Height" Value="30" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="BorderThickness" Value="1.5" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}"> <ControlTemplate TargetType="{x:Type ToggleButton}">
...@@ -57,7 +58,7 @@ ...@@ -57,7 +58,7 @@
x:Name="border" x:Name="border"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1.5" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="6" CornerRadius="6"
SnapsToDevicePixels="true"> SnapsToDevicePixels="true">
<ContentPresenter <ContentPresenter
...@@ -129,20 +130,42 @@ ...@@ -129,20 +130,42 @@
<Setter Property="FocusVisualStyle" Value="{x:Null}" /> <Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="Foreground" Value="White" /> <Setter Property="Foreground" Value="White" />
<Setter Property="FontSize" Value="16" /> <Setter Property="FontSize" Value="16" />
<Setter Property="Background" Value="#626669" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="{x:Type ToggleButton}"> <ControlTemplate TargetType="{x:Type ToggleButton}">
<Grid x:Name="border" Background="#aa303d54"> <Grid>
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" /> <Border
<Rectangle x:Name="border"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="6"
SnapsToDevicePixels="true">
<ContentPresenter
x:Name="contentPresenter"
Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Focusable="False"
RecognizesAccessKey="True"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border>
<!--<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />-->
<!--<Rectangle
Height="1" Height="1"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Fill="#ff181f2a" /> Fill="#ff181f2a" />-->
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True"> <Trigger Property="IsChecked" Value="True">
<Setter TargetName="border" Property="Background" Value="#ff303d54" /> <Setter TargetName="border" Property="Background" Value="#378CFF" />
<Setter Property="Foreground" Value="LightGray" /> <!--<Setter Property="Foreground" Value="LightGray" />-->
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="#378CFF" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
d:DataContext="{d:DesignInstance Type=local:NDIViewModel}" d:DataContext="{d:DesignInstance Type=local:NDIViewModel}"
d:DesignHeight="800" d:DesignHeight="800"
d:DesignWidth="1000" d:DesignWidth="1000"
Background="#ff172532"
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
...@@ -78,13 +77,11 @@ ...@@ -78,13 +77,11 @@
<resource:AlgorithmTargetBoxLostFrameConverter x:Key="AlgorithmTargetBoxLostFrameConverter" /> <resource:AlgorithmTargetBoxLostFrameConverter x:Key="AlgorithmTargetBoxLostFrameConverter" />
</ResourceDictionary> </ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<behaviors:Interaction.Triggers> <behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Loaded"> <behaviors:EventTrigger EventName="Loaded">
<behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" /> <behaviors:InvokeCommandAction Command="{Binding LoadedCommand}" />
</behaviors:EventTrigger> </behaviors:EventTrigger>
</behaviors:Interaction.Triggers> </behaviors:Interaction.Triggers>
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="70" /> <RowDefinition Height="70" />
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</ResourceDictionary> </ResourceDictionary>
</Window.Resources> </Window.Resources>
<StackPanel> <StackPanel>
<DockPanel> <DockPanel Background="#16191C">
<TextBlock <TextBlock
Margin="20,0,0,0" Margin="20,0,0,0"
Style="{StaticResource TextBlockStyle}" Style="{StaticResource TextBlockStyle}"
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "905D633825395BD164CB053E511CEAA5581F7E816203BA8901F94D9D2FBC4F96" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "65C390DA595172441A927C3F477B2EAA641D9045954EE506502B10A778A4DB94"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module { ...@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 67 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 65 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox tbFocus; internal System.Windows.Controls.TextBox tbFocus;
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 345 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 372 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 364 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 416 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
......
#pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "905D633825395BD164CB053E511CEAA5581F7E816203BA8901F94D9D2FBC4F96" #pragma checksum "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "65C390DA595172441A927C3F477B2EAA641D9045954EE506502B10A778A4DB94"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module { ...@@ -50,7 +50,7 @@ namespace VIZ.FGOUT.Module {
public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { public partial class NDIMainView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
#line 67 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 65 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBox tbFocus; internal System.Windows.Controls.TextBox tbFocus;
...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module { ...@@ -58,7 +58,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 345 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 372 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam1; internal VIZ.FGOUT.Module.NDIView cam1;
...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module { ...@@ -66,7 +66,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 364 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml" #line 416 "..\..\..\..\..\NDIMainView\View\NDIMainView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.FGOUT.Module.NDIView cam2; internal VIZ.FGOUT.Module.NDIView cam2;
......
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FBDA589E5BC274CD8D0C59AE6CB29B48F536D31CDBCDD6C42DF8B325792ABFD8" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2E895A9F8852E3CD79C4C1D5D416B2F73F23312925CCE85C1000FB55EDCB434D"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module { ...@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 303 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border; internal System.Windows.Controls.Border Border;
...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module { ...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 326 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 323 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video; internal VIZ.Framework.Common.VideoControl video;
...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module { ...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 332 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 329 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1; internal System.Windows.Controls.Canvas canvas1;
...@@ -119,49 +119,49 @@ namespace VIZ.FGOUT.Module { ...@@ -119,49 +119,49 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this.Border = ((System.Windows.Controls.Border)(target)); this.Border = ((System.Windows.Controls.Border)(target));
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown); this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default #line default
#line hidden #line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp); this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default #line default
#line hidden #line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown); this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default #line default
#line hidden #line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp); this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default #line default
#line hidden #line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown); this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default #line default
#line hidden #line hidden
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp); this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default #line default
#line hidden #line hidden
#line 314 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove); this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default #line default
#line hidden #line hidden
#line 315 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown); this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default #line default
......
#pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "FBDA589E5BC274CD8D0C59AE6CB29B48F536D31CDBCDD6C42DF8B325792ABFD8" #pragma checksum "..\..\..\..\..\NDIView\View\NDIView.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "2E895A9F8852E3CD79C4C1D5D416B2F73F23312925CCE85C1000FB55EDCB434D"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
...@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module { ...@@ -60,7 +60,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 303 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Border; internal System.Windows.Controls.Border Border;
...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module { ...@@ -68,7 +68,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 326 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 323 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal VIZ.Framework.Common.VideoControl video; internal VIZ.Framework.Common.VideoControl video;
...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module { ...@@ -76,7 +76,7 @@ namespace VIZ.FGOUT.Module {
#line hidden #line hidden
#line 332 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 329 "..\..\..\..\..\NDIView\View\NDIView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Canvas canvas1; internal System.Windows.Controls.Canvas canvas1;
...@@ -119,49 +119,49 @@ namespace VIZ.FGOUT.Module { ...@@ -119,49 +119,49 @@ namespace VIZ.FGOUT.Module {
case 2: case 2:
this.Border = ((System.Windows.Controls.Border)(target)); this.Border = ((System.Windows.Controls.Border)(target));
#line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 305 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown); this.Border.KeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyDown);
#line default #line default
#line hidden #line hidden
#line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 306 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp); this.Border.KeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnKeyUp);
#line default #line default
#line hidden #line hidden
#line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 307 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown); this.Border.PreviewKeyDown += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyDown);
#line default #line default
#line hidden #line hidden
#line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 308 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp); this.Border.PreviewKeyUp += new System.Windows.Input.KeyEventHandler(this.Border_OnPreviewKeyUp);
#line default #line default
#line hidden #line hidden
#line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 309 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown); this.Border.PreviewMouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonDown);
#line default #line default
#line hidden #line hidden
#line 313 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 310 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp); this.Border.PreviewMouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Border_MouseLeftButtonUp);
#line default #line default
#line hidden #line hidden
#line 314 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 311 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove); this.Border.PreviewMouseMove += new System.Windows.Input.MouseEventHandler(this.Border_MouseMove);
#line default #line default
#line hidden #line hidden
#line 315 "..\..\..\..\..\NDIView\View\NDIView.xaml" #line 312 "..\..\..\..\..\NDIView\View\NDIView.xaml"
this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown); this.Border.PreviewMouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Border_OnPreviewMouseRightButtonDown);
#line default #line default
......
<Window x:Class="VIZ.FGOUT.MainWindow" <Window
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" x:Class="VIZ.FGOUT.MainWindow"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:module="clr-namespace:VIZ.FGOUT.Module;assembly=VIZ.FGOUT.Module" xmlns:local="clr-namespace:VIZ.FGOUT"
xmlns:local="clr-namespace:VIZ.FGOUT" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" Background="#ff172532" xmlns:module="clr-namespace:VIZ.FGOUT.Module;assembly=VIZ.FGOUT.Module"
WindowStartupLocation="CenterScreen" WindowState="Maximized" WindowStyle="None" Title="时间切片系统"
Title="时间切片系统" Height="450" Width="800"> Width="800"
Height="450"
Background="#1E222B"
WindowStartupLocation="CenterScreen"
WindowState="Maximized"
WindowStyle="None"
mc:Ignorable="d">
<Grid> <Grid>
<module:NDIMainView></module:NDIMainView> <module:NDIMainView />
</Grid> </Grid>
</Window> </Window>
This source diff could not be displayed because it is too large. You can view the blob instead.
#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "796CD0A5A3FBBCC87A696196966F35A959A5A740F937152BBF280A11279A48DA" #pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "99D962B2D3C256DD95EFA803F896C20DF27885FE2EB8C3DFC6F17515CCFC95A6"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
#pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "796CD0A5A3FBBCC87A696196966F35A959A5A740F937152BBF280A11279A48DA" #pragma checksum "..\..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "99D962B2D3C256DD95EFA803F896C20DF27885FE2EB8C3DFC6F17515CCFC95A6"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
......
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