Skip to content

V
VIZ.H2V
Commit 4bc519dd by liulongfei
Options

预览

parent 1bdf3fb8
Showing with 12 additions and 22 deletions
VIZ.H2V.Module/NDIMainView/View/NDIMainView.xaml
...@@ -78,24 +78,14 @@ ...@@ -78,24 +78,14 @@
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<local:NDIView x:Name="cam2" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}" Grid.Row="0" Grid.Column="1" Margin="15,10,10,10"></local:NDIView> <local:NDIView x:Name="cam2" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_2}" Grid.Row="0" Grid.Column="1" Margin="15,10,10,10"></local:NDIView>
<local:NDIView x:Name="cam3" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}" Grid.Row="1" Grid.Column="0" Margin="10,10,15,10"></local:NDIView>
<!-- ***************************************************************************************** --> <!-- ***************************************************************************************** -->
<local:NDIView x:Name="cam4" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_4}" Grid.Row="1" Grid.Column="1" Margin="15,10,10,10"></local:NDIView> <!--<local:NDIView x:Name="cam3" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_3}" Grid.Row="1" Grid.Column="0" Margin="10,10,15,10"></local:NDIView>
<local:NDIView x:Name="cam4" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_4}" Grid.Row="1" Grid.Column="1" Margin="15,10,10,10"></local:NDIView>-->
<!-- ***************************************************************************************** --> <!-- ***************************************************************************************** -->
<!-- CAM_4 窗口暂时隐藏，改为放置3个预览窗口 --> <local:NDIPreviewView x:Name="prevew1" NDIKey="{x:Static Member=domain:NDIViewKeys.Preview_1}"
<!--<Grid Grid.Row="1" Grid.Column="1" Margin="20,80,0,0"> Grid.Row="1" Grid.Column="0" Margin="130,90,55,10"></local:NDIPreviewView>
<Grid.ColumnDefinitions> <local:NDIPreviewView x:Name="prevew2" NDIKey="{x:Static Member=domain:NDIViewKeys.Preview_2}"
<ColumnDefinition Width="*"></ColumnDefinition> Grid.Row="1" Grid.Column="1" Margin="135,90,50,10"></local:NDIPreviewView>
<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<local:NDIPreviewView x:Name="prevew1" NDIKey="{x:Static Member=domain:NDIViewKeys.Preview_1}"
Grid.Column="0" Margin="0,0,10,0"></local:NDIPreviewView>
<local:NDIPreviewView x:Name="prevew2" NDIKey="{x:Static Member=domain:NDIViewKeys.Preview_2}"
Grid.Column="1" Margin="5,0,5,0"></local:NDIPreviewView>
<local:NDIPreviewView x:Name="prevew3" NDIKey="{x:Static Member=domain:NDIViewKeys.Preview_3}"
Grid.Column="2" Margin="10,0,0,0"></local:NDIPreviewView>
</Grid>-->
<!-- ***************************************************************************************** --> <!-- ***************************************************************************************** -->
<!-- CAM_1 会作为单一窗口时的主窗口 --> <!-- CAM_1 会作为单一窗口时的主窗口 -->
<local:NDIView x:Name="cam1" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}" Grid.Row="0" Grid.Column="0" Margin="10,10,15,10"></local:NDIView> <local:NDIView x:Name="cam1" NDIKey="{x:Static Member=domain:NDIViewKeys.CAM_1}" Grid.Row="0" Grid.Column="0" Margin="10,10,15,10"></local:NDIView>
......
VIZ.H2V.Module/SystemSetting/View/PreviewSettingPanelView.xaml
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</ComboBox> </ComboBox>
</Grid> </Grid>
<!-- Preview 3 --> <!-- Preview 3 -->
<Grid Grid.Row="3"> <!--<Grid Grid.Row="3">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="120"></ColumnDefinition> <ColumnDefinition Width="120"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition> <ColumnDefinition Width="*"></ColumnDefinition>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
ItemsSource="{Binding Path=Preview_3.NDIStreamInfosView,Mode=OneWay}" ItemsSource="{Binding Path=Preview_3.NDIStreamInfosView,Mode=OneWay}"
SelectedValue="{Binding Path=Preview_3.SelectedNDIStreamInfo,Mode=TwoWay}"> SelectedValue="{Binding Path=Preview_3.SelectedNDIStreamInfo,Mode=TwoWay}">
</ComboBox> </ComboBox>
</Grid> </Grid>-->
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>
VIZ.H2V.Module/SystemSetting/View/SystemSettingView.xaml
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
x:Name="rbHotkey" Style="{StaticResource RadioButton_Setting}"></RadioButton> x:Name="rbHotkey" Style="{StaticResource RadioButton_Setting}"></RadioButton>
<RadioButton Content="Tally" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center" <RadioButton Content="Tally" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center"
x:Name="rbTally" Style="{StaticResource RadioButton_Setting}"></RadioButton> x:Name="rbTally" Style="{StaticResource RadioButton_Setting}"></RadioButton>
<!--<RadioButton Content="预览" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center" <RadioButton Content="预览" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center"
x:Name="rbPreview" Style="{StaticResource RadioButton_Setting}"></RadioButton>--> x:Name="rbPreview" Style="{StaticResource RadioButton_Setting}"></RadioButton>
<RadioButton Content="关于" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center" <RadioButton Content="关于" Height="50" Foreground="White" FontSize="22" VerticalContentAlignment="Center"
x:Name="rbAbout" Style="{StaticResource RadioButton_Setting}"></RadioButton> x:Name="rbAbout" Style="{StaticResource RadioButton_Setting}"></RadioButton>
</StackPanel> </StackPanel>
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
IsSelected="{Binding ElementName=rbHotkey,Path=IsChecked,Mode=OneWay}"></fcommon:NavigationItemControl> IsSelected="{Binding ElementName=rbHotkey,Path=IsChecked,Mode=OneWay}"></fcommon:NavigationItemControl>
<fcommon:NavigationItemControl ViewType="{x:Type local:TallySettingPanelView}" <fcommon:NavigationItemControl ViewType="{x:Type local:TallySettingPanelView}"
IsSelected="{Binding ElementName=rbTally,Path=IsChecked,Mode=OneWay}"></fcommon:NavigationItemControl> IsSelected="{Binding ElementName=rbTally,Path=IsChecked,Mode=OneWay}"></fcommon:NavigationItemControl>
<!--<fcommon:NavigationItemControl ViewType="{x:Type local:PreviewSettingPanelView}" <fcommon:NavigationItemControl ViewType="{x:Type local:PreviewSettingPanelView}"
IsSelected="{Binding ElementName=rbPreview,Path=IsChecked,Mode=OneWay}"></fcommon:NavigationItemControl>--> IsSelected="{Binding ElementName=rbPreview,Path=IsChecked,Mode=OneWay}"></fcommon:NavigationItemControl>
<fcommon:NavigationItemControl ViewType="{x:Type local:AboutPanelView}" <fcommon:NavigationItemControl ViewType="{x:Type local:AboutPanelView}"
IsSelected="{Binding ElementName=rbAbout,Path=IsChecked,Mode=OneWay}"></fcommon:NavigationItemControl> IsSelected="{Binding ElementName=rbAbout,Path=IsChecked,Mode=OneWay}"></fcommon:NavigationItemControl>
</fcommon:NavigationControl> </fcommon:NavigationControl>
......
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