|
@@ -472,7 +472,7 @@ namespace XHWK.WKTool
|
472
|
472
|
gridSetUp.Visibility = Visibility.Visible;
|
473
|
473
|
gridUpload.Visibility = Visibility.Collapsed;
|
474
|
474
|
txbStoragePath.Content = APP.WKData.WkPath;
|
475
|
|
-
|
|
475
|
+ GridMyVideo.Visibility = Visibility.Collapsed;
|
476
|
476
|
#region 读取用户配置
|
477
|
477
|
//接口地址
|
478
|
478
|
if (!File.Exists(APP.dataPath + "interfaceAddress.txt")) //若为空
|
|
@@ -985,7 +985,7 @@ namespace XHWK.WKTool
|
985
|
985
|
ofd = new System.Windows.Forms.OpenFileDialog
|
986
|
986
|
{
|
987
|
987
|
//Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
|
988
|
|
- Filter = "文档|*.docx;*.doc;*.ppt;*.pptx;*.pdf",
|
|
988
|
+ Filter = "文档|*.docx;*.doc;*.ppt;*.pptx",
|
989
|
989
|
InitialDirectory = desktopPath,
|
990
|
990
|
Multiselect = false,
|
991
|
991
|
AddExtension = true,
|
|
@@ -3280,6 +3280,9 @@ namespace XHWK.WKTool
|
3280
|
3280
|
PageNum = APP.pageData.currpage
|
3281
|
3281
|
};
|
3282
|
3282
|
APP.PageDrawList.Add(model_DrawData);
|
|
3283
|
+ ImgPrint.Visibility = Visibility.Visible;//可打印
|
|
3284
|
+ ImgPrintTwo.Visibility = Visibility.Collapsed;
|
|
3285
|
+ btnPrint.IsEnabled = true;
|
3283
|
3286
|
//APP.SaveDraw();
|
3284
|
3287
|
if (btnImport.IsEnabled == true)
|
3285
|
3288
|
{
|
|
@@ -3299,7 +3302,11 @@ namespace XHWK.WKTool
|
3299
|
3302
|
try
|
3300
|
3303
|
{
|
3301
|
3304
|
//3种情况 1.文档图片 2.截图图片 3.没有图片
|
3302
|
|
-
|
|
3305
|
+ if(APP.PageDrawList.Count==0)
|
|
3306
|
+ {
|
|
3307
|
+ MessageWindow.Show("没有可打印的页,您可以新增、截图或导入来增加页!");
|
|
3308
|
+ return;
|
|
3309
|
+ }
|
3303
|
3310
|
|
3304
|
3311
|
|
3305
|
3312
|
iTextSharp.text.Document document = new iTextSharp.text.Document(iTextSharp.text.PageSize.A4, 25, 25, 25, 25);
|
|
@@ -4672,6 +4679,7 @@ namespace XHWK.WKTool
|
4672
|
4679
|
GridMain.Visibility = Visibility.Visible;
|
4673
|
4680
|
gridSetUp.Visibility = Visibility.Collapsed;
|
4674
|
4681
|
gridUpload.Visibility = Visibility.Collapsed;
|
|
4682
|
+ GridMyVideo.Visibility = Visibility.Collapsed;
|
4675
|
4683
|
if (APP.pageData.pagenum > 0)
|
4676
|
4684
|
{
|
4677
|
4685
|
gridPage.Visibility = Visibility.Visible;
|