Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/Helper/CommonHelper.cs

@@ -356,9 +356,9 @@ namespace PDF_Master.Helper
             }
             else
             {
-                if (File.Exists(selectedFile)){
+                //if (File.Exists(selectedFile)){
                 Process.Start(@"explorer.exe", "/select,\"" + selectedFile + "\"");
-                }
+                //}
             }
         }
 

PDF Office/Helper/ConverterHelper.cs

@@ -41,7 +41,11 @@ namespace PDF_Master.Helper
                 result = await Task.Run(() => wordConverter.Convert(outputFolder, ref outputFileName, wordOptions, pageArray, ref error, getProgress));
                 if (result)
                 {
-                    CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    Trace.WriteLine("wdasdasda"+File.Exists(outputFileName.Replace("/", "\\")));
+                    if (!String.IsNullOrEmpty(outputFileName) && File.Exists(outputFileName.Replace("/", "\\")))
+                    {
+                        CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    }
                 }
             }
 
@@ -69,7 +73,10 @@ namespace PDF_Master.Helper
                 result = await Task.Run(() => pptConverter.Convert(outputFolder, ref outputFileName, pptOptions, pageArray, ref error, getProgress));
                 if (result)
                 {
-                    CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    if (!String.IsNullOrEmpty(outputFileName) && File.Exists(outputFileName.Replace("/", "\\")))
+                    {
+                        CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    }
                 }
             }
             catch (Exception ex)
@@ -93,11 +100,15 @@ namespace PDF_Master.Helper
                 result = await Task.Run(() => excelConverter.Convert(outputFolder, ref outputFileName, ExcelOption, pageArray, ref error, getProgress));
                 if (result)
                 {
-                    if (File.Exists(outputFileName))
+                    if (!String.IsNullOrEmpty(outputFileName) && File.Exists(outputFileName.Replace("/", "\\")))
+                    {
                         CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    }
                     else if (outputFileName == "NoTable")
-                    { AlertsMessage alertsMessage = new AlertsMessage();
-                        alertsMessage.ShowDialog(""," No Table", App.ServiceLoader.GetString("Text_ok")); }
+                    {
+                        AlertsMessage alertsMessage = new AlertsMessage();
+                        alertsMessage.ShowDialog("", " No Table", App.ServiceLoader.GetString("Text_ok"));
+                    }
                 
                 }
 
@@ -163,7 +174,10 @@ namespace PDF_Master.Helper
                     {
                         if (IsCustomFileName)
                         {
-                            CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                            if (!String.IsNullOrEmpty(outputFileName) && File.Exists(outputFileName.Replace("/", "\\")))
+                            {
+                                CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                            }
                         }
                         else
                         {
@@ -201,7 +215,10 @@ namespace PDF_Master.Helper
                 result = await Task.Run(() => txtConverter.Convert(outputFolder, ref outputFileName, txtOptions, pageArray, ref error, getProgress));
                 if (result)
                 {
-                    CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    if (!String.IsNullOrEmpty(outputFileName) && File.Exists(outputFileName.Replace("/", "\\")))
+                    {
+                        CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    }
                 }
             }
             catch (Exception ex)
@@ -363,7 +380,10 @@ namespace PDF_Master.Helper
                 result = await Task.Run(() => rtfConverter.Convert(outputFolder, ref outputFileName, rtfOptions, pageArray, ref error, getProgress));
                 if (result)
                 {
-                    CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    if (!String.IsNullOrEmpty(outputFileName) && File.Exists(outputFileName.Replace("/", "\\")))
+                    {
+                        CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    }
                 }
             }
             catch (Exception ex)
@@ -387,7 +407,10 @@ namespace PDF_Master.Helper
                 result = await Task.Run(() => htmlConverter.Convert(outputFolder, ref outputFileName, HtmlOption, pageArray, ref error, getProgress));
                 if (result)
                 {
-                    CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    if (!String.IsNullOrEmpty(outputFileName) && File.Exists(outputFileName.Replace("/", "\\")))
+                    {
+                        CommonHelper.ShowFileBrowser(outputFileName.Replace("/", "\\"));
+                    }
                 }
             }
             catch (Exception ex)

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -1081,7 +1081,7 @@ namespace PDF_Master.ViewModels.Tools
                 var annot = menu.Parameter as AnnotHandlerEventArgs;
                 if (annot != null)
                 {
-                    System.Windows.Clipboard.SetText(annot.Content);
+                    System.Windows.Clipboard.SetText(annot.MarkupContent);
                 }
             }
         }
@@ -1253,7 +1253,9 @@ namespace PDF_Master.ViewModels.Tools
                         {
                             StickyAnnotArgs annotArgs = new StickyAnnotArgs()
                             {
-                                Color = stickyAnnotArgs.Color
+                                Color = stickyAnnotArgs.Color,
+                                IconName = stickyAnnotArgs.IconName,
+                                Transparency = stickyAnnotArgs.Transparency,
                             };
 
                             PDFViewer.SetToolParam(annotArgs);