|
@@ -601,7 +601,7 @@
|
601
|
601
|
</Grid>
|
602
|
602
|
<Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">
|
603
|
603
|
<StackPanel Orientation="Horizontal" Margin="0,5,0,5">
|
604
|
|
- <TextBlock Text="颜色:" FontSize="14" Padding="10,3,0,0"/>
|
|
604
|
+ <TextBlock Text="颜色: " FontSize="14" Padding="0,0,0,0" Margin="5,4,0,0"/>
|
605
|
605
|
<Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
|
606
|
606
|
<Border Background="#666666" Width="20" Height="20" Margin="5,2,0,0">
|
607
|
607
|
<Button Cursor="Hand" x:Name="btnRed" Width="20" Height="20" Background="#FF0000" Margin="1,1,1,1" HorizontalAlignment="Center" Click="BtnRed_Click" Style="{StaticResource NoMouseOverButtonStyle}">
|
|
@@ -633,13 +633,13 @@
|
633
|
633
|
<Image x:Name="imgBlue" Source=".\Images\microLessonSystem_999.png" Width="12" Visibility="Collapsed"/>
|
634
|
634
|
</Button>
|
635
|
635
|
</Border>
|
636
|
|
- <TextBlock Text="粗细:" FontSize="14" Padding="15,0,0,0" Margin="5,3,0,0"/>
|
|
636
|
+ <TextBlock Text="粗细: " FontSize="14" Padding="0,0,0,0" Margin="5,4,0,0"/>
|
637
|
637
|
<RadioButton Cursor="Hand" x:Name="rbnFine" Content=" 细" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" IsChecked="True" Click="RbnFine_Click"/>
|
638
|
638
|
<RadioButton Cursor="Hand" x:Name="rbnIn" Content=" 中" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnIn_Click"/>
|
639
|
639
|
<RadioButton Cursor="Hand" x:Name="rbnCrude" Content=" 粗" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnCrude_Click"/>
|
640
|
640
|
</StackPanel>
|
641
|
641
|
<!--页码-->
|
642
|
|
- <Grid Grid.Row="1" x:Name="gridPage" Visibility="Hidden" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center" Margin="97,0,0,0">
|
|
642
|
+ <Grid Grid.Row="1" x:Name="gridPage" Visibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1" HorizontalAlignment="Center" Margin="95,0,0,0">
|
643
|
643
|
<StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="220" HorizontalAlignment="Center" Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
|
644
|
644
|
<Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
|
645
|
645
|
x:Name="last_button"
|
|
@@ -666,7 +666,7 @@
|
666
|
666
|
</StackPanel>
|
667
|
667
|
</Button>
|
668
|
668
|
|
669
|
|
- <TextBlock Text="前往" Height="22" Margin="0,5,3,0" FontSize="15"></TextBlock>
|
|
669
|
+ <TextBlock Text="转" Height="22" Margin="0,5,3,0" FontSize="15"></TextBlock>
|
670
|
670
|
<!--<TextBox x:Name="txtJump" Text="123" Height="17" Width="25" Visibility="Visible" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0" input:InputMethod.IsInputMethodEnabled="False" PreviewTextInput="txtJump_PreviewTextInput" KeyDown="txtJump_KeyDown"/>-->
|
671
|
671
|
<!--<Button Cursor="Hand" Visibility="Visible" x:Name="BtnJumpPage" HorizontalAlignment="Left" VerticalAlignment="Center" Width="17" Height="17" Background="White" BorderBrush="#FFABADB3" Margin="24,0,0,0" Click="BtnJumpPage_Click">
|
672
|
672
|
<Button.Resources>
|
|
@@ -692,11 +692,11 @@
|
692
|
692
|
</StackPanel>
|
693
|
693
|
</Grid>
|
694
|
694
|
|
695
|
|
- <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,10,5">
|
696
|
|
- <TextBlock Text="摄像头:" FontSize="14" Padding="20,3,0,0"/>
|
|
695
|
+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,5,5">
|
|
696
|
+ <TextBlock Text="摄像头: " FontSize="14" Padding="5,4,0,0"/>
|
697
|
697
|
<RadioButton Cursor="Hand" x:Name="rbnOpen" Content=" 开" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" Click="RbnOpen_Click"/>
|
698
|
|
- <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content=" 关" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,20,0" IsChecked="True" Click="RbnTurnOff_Click"/>
|
699
|
|
- <TextBlock Text="智能笔状态:" FontSize="14" Padding="0,4,0,0"/>
|
|
698
|
+ <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content=" 关" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,10,0" IsChecked="True" Click="RbnTurnOff_Click"/>
|
|
699
|
+ <TextBlock Text="智能笔: " FontSize="14" Padding="0,4,0,0"/>
|
700
|
700
|
<TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,4,5,0"/>
|
701
|
701
|
</StackPanel>
|
702
|
702
|
</Grid>
|