单选框样式优化，打印页面自适应优化。

XHWK.WKTool/App.config

@@ -4,7 +4,7 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
   <appSettings>
-    <!--0正式1测试-->
+    <!--0正式 1测试-->
     <add key="IsDebug" value="1"/>
     <!--图片压缩等级-->
     <add key="ImageCompressionLevel" value="30" />

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -27,21 +27,21 @@
             </Grid>
         </Border>
         <!--第二行 讲解名称-->
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,60,0,0" Grid.ColumnSpan="2">
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,60,0,1" Grid.ColumnSpan="2">
             <Label Content="*" FontSize="18" Padding="0,20,0,0" Foreground="#FF0000"/>
             <TextBlock Text="讲解名称" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
             <Border Background="#CDD6E0" Width="321" Height="43" CornerRadius="3">
-                <TextBox x:Name="txbExplainName" Text="微课1" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="319" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+                <TextBox x:Name="txbExplainName" Text="微课1" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="319" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
         </StackPanel>
         <!--第三行 存放路径-->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,30,0,0" Grid.ColumnSpan="2">
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,30,0,1" Grid.ColumnSpan="2">
             <Label Content="*" FontSize="18" Padding="0,20,0,0" Foreground="#FF0000"/>
             <TextBlock Text="存放路径" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
             <Border Background="#CDD6E0" Width="225" Height="43" CornerRadius="3">
-                <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
+                <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="223" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
             <!--浏览按钮-->
             <Button  Cursor="Hand" x:Name="btnBrowse" Content="浏览" FontSize="18" Width="80" Height="43" Margin="18,0,0,0" Click="BtnBrowse_Click">

XHWK.WKTool/LoginWindow.xaml

@@ -33,12 +33,12 @@
         <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,20,0,0">
             <TextBlock Text="登陆" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
-            <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
+            <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3" Margin="0,0,0,1">
                 <TextBox x:Name="txbAccountNumber" Text="" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="369" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
             </Border>
         </StackPanel>
         <!--第三行 密码-->
-        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,20,0,0">
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="20,20,0,1">
             <TextBlock Text="密码" FontSize="18" Padding="2,15,10,0"/>
             <!--输入框-->
             <Border Background="#cccbce" Width="371" Height="43" CornerRadius="3">
@@ -49,7 +49,7 @@
             <Viewbox Height="23">
                 <CheckBox   x:Name="ckSaveName" Click="CkSaveName_Click"/>
             </Viewbox>
-            <TextBlock Text="记住账号" FontSize="18" Height="30" Padding="5,3,0,0" Margin="0,9,0,1"/>
+            <TextBlock Text="记住账号" FontSize="18" Height="30" Padding="5,3,0,0" Margin="0,0,0,1"/>
         </StackPanel>
 
         <!--第五行 开始按钮-->

XHWK.WKTool/PrintWindow.xaml

@@ -30,7 +30,8 @@
             </Setter>
         </Style>
     </Window.Resources>
-    <Grid>
+    <Viewbox>
+        <Grid x:Name="GridContent" Height="600" Width="900">
         <Grid.RowDefinitions>
             <RowDefinition Height="120"/>
             <RowDefinition Height="*"/>
@@ -56,7 +57,7 @@
                                 FontSize="14"
                                 SelectedValuePath="Key"
                                 />
-                <TextBlock Text="份数：" FontSize="20" Margin="120,0,0,0" Padding="0,5,0,0"/>
+                <TextBlock Text="份数：" FontSize="20" Margin="80,0,0,0" Padding="0,5,0,0" HorizontalAlignment="Right"/>
                 <TextBlock x:Name="txbNumberOfCopies" Width="100" Text="1" FontSize="16" Padding="50,10,0,0" Background="White"/>
                 <Grid>
                     <Grid.RowDefinitions>
@@ -133,4 +134,5 @@
             </Grid>
         </Views:ZJClippingBorder>
     </Grid>
+    </Viewbox>
 </Window>

XHWK.WKTool/PrintWindow.xaml.cs

@@ -42,6 +42,14 @@ namespace XHWK.WKTool
         public PrintWindow()
         {
             InitializeComponent();
+            double proportion = 1036.0 / 1290.0;
+          double  Widths = (PrimaryScreen.ScaleWorkingAreaSize.Height) / proportion - (BorderThickness.Left + BorderThickness.Right);
+          double  Heights = PrimaryScreen.ScaleWorkingAreaSize.Height - (BorderThickness.Top + BorderThickness.Bottom);
+            Width = Widths / 1.42;
+            Height = Heights / 1.71;
+            GridContent.Width = Width+5;
+            GridContent.Height = Height;
+            this.ResizeMode = ResizeMode.NoResize;
             string defa = string.Empty;
             List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
             if (defaList.Count > 0)

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -25,6 +25,26 @@
         </Border>
     </Grid>-->
     <Window.Resources>
+        <Style x:Key="radBase" TargetType="RadioButton">
+            <Setter Property="IsChecked" Value="False"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="Foreground" Value="#555"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <DockPanel  Background="{TemplateBinding Background}" ToolTip="{TemplateBinding Content}" LastChildFill="False" Width="{TemplateBinding Width}">
+                            <Image Margin="2 0 0 0" DockPanel.Dock="Left" x:Name="_img"  Stretch="None" Source="./Images/rdo_no.png"/>
+                            <TextBlock DockPanel.Dock="Left" Margin="3 0 0 0" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Content}" />
+                        </DockPanel>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="true">
+                                <Setter TargetName="_img" Property="Source" Value="./Images/rdo_yes.png"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
         <Style x:Key="NoMouseOverButtonStyle" TargetType="{x:Type Button}">
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
@@ -378,7 +398,8 @@
             </StackPanel>
         </Grid>
         <!--设置-->
-        <Grid Grid.Row="1" x:Name="gridSetUp"  Background="#FFFFFF" Visibility="Collapsed" Width="1276">
+            <ScrollViewer x:Name="gridSetUp" Grid.Row="1" VerticalScrollBarVisibility="Auto" Visibility="Collapsed">
+        <Grid Grid.Row="1"   Background="#FFFFFF" >
             <Grid.RowDefinitions>
                 <RowDefinition Height="90"/>
                 <RowDefinition Height="70"/>
@@ -402,17 +423,17 @@
 
                 <TextBlock Grid.Row="1" Grid.Column="0" Text="视频格式" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                    <RadioButton x:Name="rbnMP4" Cursor="Hand" Content="MP4" FontSize="14" Foreground="#333333" Margin="0,2,0,0" IsChecked="True"/>
-                <RadioButton x:Name="rbnFLV" Cursor="Hand" Content="FLV" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                <RadioButton x:Name="rbnAVI" Cursor="Hand" Content="AVI" FontSize="14" Foreground="#333333" Margin="20,2,0,0" Visibility="Collapsed"/>
+                        <RadioButton x:Name="rbnMP4"  Cursor="Hand" Style="{StaticResource radBase}" Content=" MP4" FontSize="14" Foreground="#333333" VerticalAlignment="Top" IsChecked="True"/>
+                        <RadioButton x:Name="rbnFLV" Cursor="Hand" Style="{StaticResource radBase}" Content=" FLV" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
+                        <RadioButton x:Name="rbnAVI" Cursor="Hand" Style="{StaticResource radBase}" Content=" AVI" FontSize="14" Foreground="#333333" Margin="20,-26,0,0" Visibility="Collapsed"/>
             </StackPanel>
 
                 <TextBlock Grid.Row="2" Grid.Column="0" Text="摄像头位置" FontSize="16" Foreground="#333333" FontWeight="Black" HorizontalAlignment="Right"/>
                 <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
-                    <RadioButton Cursor="Hand" x:Name="rbnRight" Content="右上" FontSize="14" Foreground="#333333" Margin="0,2,0,0" IsChecked="True"/>
-                <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Content="右下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
-                <RadioButton Cursor="Hand" x:Name="rbnLeft" Content="左上" FontSize="14" Foreground="#333333" Margin="20,2,0,0" />
-                <RadioButton Cursor="Hand" x:Name="rbnLeftUnder" Content="左下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnRight" Style="{StaticResource radBase}" Content=" 右上" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="0,0,0,0" IsChecked="True"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Style="{StaticResource radBase}" Content=" 右下" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnLeft" Style="{StaticResource radBase}" Content=" 左上" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0" />
+                        <RadioButton Cursor="Hand" x:Name="rbnLeftUnder" Style="{StaticResource radBase}" Content=" 左下" FontSize="14" Foreground="#333333"  VerticalAlignment="Top" Margin="20,0,0,0"/>
             </StackPanel>
             <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0" Visibility="Collapsed">
                 <TextBlock Text="视频声音" FontSize="16" Foreground="#2D8CF0" Width="80"/>
@@ -481,7 +502,7 @@
                     <TextBlock  FontSize="14" Foreground="#333333" Text="开始/暂停：Ctrl+F5     停止：Ctrl+S     退出讲评：鼠标右键" Margin="30,30,0,0"/>
                 </StackPanel>
                 <!--第四行 开始按钮-->
-            <Button Cursor="Hand" Grid.Row="10" Grid.ColumnSpan="2" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,0,10,0" Click="BtnSave_Click">
+            <Button Cursor="Hand" Grid.Row="10" Grid.ColumnSpan="2" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,10,10,10" Click="BtnSave_Click">
                 <Button.Template>
                     <ControlTemplate TargetType="{x:Type Button}">
                         <Border
@@ -498,7 +519,8 @@
                 </Button.Template>
             </Button>
         </Grid>
-        <!--上传-->
+            </ScrollViewer>
+            <!--上传-->
         <Grid Grid.Row="1" x:Name="gridUpload" Visibility="Hidden">
             <Border Background="#EFF1F8">
                 <Grid Background="#FFFFFF" Margin="0,0,0,0">
@@ -601,7 +623,7 @@
             </Border>
         </Grid>
         <Grid Grid.Row="2" Background="#EFF1F8" Margin="0,0,0,0">
-            <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
+            <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
                 <TextBlock Text="颜色：" FontSize="14" Padding="10,5,0,0"/>
                 <Button Cursor="Hand" x:Name="btnWhite" Background="#FFFFFF" Width="20" Height="20" Click="BtnWhite_Click" Margin="0,2,0,0" Visibility="Collapsed"/>
 
@@ -638,16 +660,16 @@
                 </Button>
                     </Border>
                     <TextBlock Text="粗细：" FontSize="14" Padding="15,0,0,0" Margin="5,5,0,0"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnFine" Content="细" FontSize="14" Margin="0,7,0,0" IsChecked="True" Click="RbnFine_Click"/>
-                <RadioButton Cursor="Hand" x:Name="rbnIn" Content="中" FontSize="14" Margin="5,7,0,0" Click="RbnIn_Click"/>
-                <RadioButton Cursor="Hand" x:Name="rbnCrude" Content="粗" FontSize="14" Margin="5,7,0,0" Click="RbnCrude_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnFine" Content=" 细" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" IsChecked="True" Click="RbnFine_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnIn" Content=" 中" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnIn_Click"/>
+                    <RadioButton Cursor="Hand" x:Name="rbnCrude" Content=" 粗" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" Click="RbnCrude_Click"/>
                 <StackPanel Orientation="Horizontal">
-                    <TextBlock Text="摄像头：" FontSize="14" Padding="15,6,0,0"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnOpen" Content="开" FontSize="14" Margin="0,7,0,0" Click="RbnOpen_Click"/>
-                    <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content="关" FontSize="14" Margin="5,7,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
+                    <TextBlock Text="摄像头：" FontSize="14" Padding="20,6,0,0"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnOpen" Content=" 开" Style="{StaticResource radBase}" FontSize="14" Margin="0,4,0,0" Click="RbnOpen_Click"/>
+                        <RadioButton Cursor="Hand" x:Name="rbnTurnOff" Content=" 关" Style="{StaticResource radBase}" FontSize="14" Margin="5,4,0,0" IsChecked="True" Click="RbnTurnOff_Click"/>
                 </StackPanel>
             </StackPanel>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,10,5">
                 <TextBlock Text="智能笔状态：" FontSize="14" Padding="0,4,0,0"/>
                 <TextBlock x:Name="txbNotConnected" Text="未连接" FontSize="14" Padding="0,4,5,0"/>
             </StackPanel>

XHWK.WKTool/XHWK.WKTool.csproj

@@ -1595,5 +1595,9 @@
   <ItemGroup>
     <Resource Include="Images\rollCall_1.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\rdo_no.png" />
+    <Resource Include="Images\rdo_yes.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>