增加ppt img类型之前

XHWK.WKTool/App.config

@@ -33,8 +33,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="18" />
-    <add key="VersionName" value="1.1.7" />
+    <add key="VersionCode" value="19" />
+    <add key="VersionName" value="1.1.8" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.7.0")]
-[assembly: AssemblyFileVersion("1.1.7.0")]
+[assembly: AssemblyVersion("1.1.8.0")]
+[assembly: AssemblyFileVersion("1.1.8.0")]

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -330,7 +330,8 @@
                                 </Grid>
                             </Border>
                         </Grid>
-                        <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top"/>
+                        <Image x:Name="imgDocumentation" Visibility="Visible" VerticalAlignment="Top" Stretch="Fill"/>
+                        <Image x:Name="imgPPT" Visibility="Collapsed" VerticalAlignment="Top"/>
                         <!--导入图片-->
                         <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
                         <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -3336,7 +3336,7 @@ namespace XHWK.WKTool
                 }
 
 
-                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
+                iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 0, 0, 0, 0);
                 //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
                 ////设置纸张横向
                 //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
@@ -3389,13 +3389,13 @@ namespace XHWK.WKTool
 
 
 
-                    if (image.Height > iTextSharp.text.PageSize.A4.Height - 25)
+                    if (image.Height > iTextSharp.text.PageSize.A4.Height)
                     {
-                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width - 25, iTextSharp.text.PageSize.A4.Height - 25);
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
                     }
-                    else if (image.Width > iTextSharp.text.PageSize.A4.Width - 25)
+                    else if (image.Width > iTextSharp.text.PageSize.A4.Width)
                     {
-                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width - 25, iTextSharp.text.PageSize.A4.Height - 25);
+                        image.ScaleToFit(iTextSharp.text.PageSize.A4.Width, iTextSharp.text.PageSize.A4.Height);
                     }
                     image.Alignment = iTextSharp.text.Image.ALIGN_MIDDLE;
                     document.NewPage();