|
@@ -24,7 +24,7 @@ using DialogResult = Prism.Services.Dialogs.DialogResult;
|
|
|
|
|
|
namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
{
|
|
|
- public class ConverterCSVDialogViewModel : BindableBase,IDialogAware
|
|
|
+ public class ConverterCSVDialogViewModel : BindableBase, IDialogAware
|
|
|
{
|
|
|
#region 文案
|
|
|
|
|
@@ -125,7 +125,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
|
|
|
public IDialogService dialogs;
|
|
|
|
|
|
- public string CurrentPageIndex="1";
|
|
|
+ public string CurrentPageIndex = "1";
|
|
|
|
|
|
public string PageRangeText { set; get; } = "0";
|
|
|
|
|
@@ -157,7 +157,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
|
|
|
public DelegateCommand SetCustomPageRangeCommand { get; set; }
|
|
|
|
|
|
-
|
|
|
+ public DelegateCommand<object> PreviewCancelDownCommand { get; set; }
|
|
|
|
|
|
public DelegateCommand BatchConverterCommand { get; set; }
|
|
|
|
|
@@ -172,6 +172,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
CmbPageSelectionChanged = new DelegateCommand<object>(CmbPageSelectionChangedEvent);
|
|
|
CmbPageTextChanged = new DelegateCommand<object>(CmbPageTextChangedEvent);
|
|
|
SetCustomPageRangeCommand = new DelegateCommand(SetCustomPageRange);
|
|
|
+ PreviewCancelDownCommand = new DelegateCommand<object>(PreviewCancelDown);
|
|
|
BatchConverterCommand = new DelegateCommand(BatchConverter);
|
|
|
dialogs = dialogService;
|
|
|
}
|
|
@@ -180,14 +181,14 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
|
|
|
public void SetCustomPageRange()
|
|
|
{
|
|
|
- if (PageRangeSelectIndex=="4")
|
|
|
+ if (PageRangeSelectIndex == "4")
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
List<int> PageIndexLists = new List<int>();
|
|
|
if (!CommonHelper.GetPagesInRange(ref PageIndexLists, PageRangeText, currentViewer.Document.PageCount, new char[] { ',' }, new char[] { '-' }))
|
|
|
{ //TODO
|
|
|
AlertsMessage alertsMessage = new AlertsMessage();
|
|
|
- alertsMessage.ShowDialog("", App.MainPageLoader.GetString("PageRangeWarning"),App.ServiceLoader.GetString("Text_ok"));
|
|
|
+ alertsMessage.ShowDialog("", App.MainPageLoader.GetString("PageRangeWarning"), App.ServiceLoader.GetString("Text_ok"));
|
|
|
if (alertsMessage.result == ContentResult.Ok)
|
|
|
{
|
|
|
return;
|
|
@@ -201,7 +202,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
//});
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -218,10 +219,10 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
var currentViewer = this.currentViewer;
|
|
|
string PageRange = "";
|
|
|
var PageRangeText = this.PageRangeText;
|
|
|
- if (PageRangeSelectIndex == "0" || PageRangeSelectIndex == "2" || PageRangeSelectIndex == "3"|| PageRangeSelectIndex == "4")
|
|
|
+ if (PageRangeSelectIndex == "0" || PageRangeSelectIndex == "2" || PageRangeSelectIndex == "3" || PageRangeSelectIndex == "4")
|
|
|
{
|
|
|
if (PageRangeSelectIndex == "4") { HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true); } else { HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true); }
|
|
|
-
|
|
|
+
|
|
|
char[] enumerationSeparator = new char[] { ',' };
|
|
|
char[] rangeSeparator = new char[] { '-' };
|
|
|
if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
|
|
@@ -238,19 +239,19 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
{
|
|
|
char[] enumerationSeparator = new char[] { ',' };
|
|
|
char[] rangeSeparator = new char[] { '-' };
|
|
|
- if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (currentViewer.CurrentIndex+1).ToString()
|
|
|
+ if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, (currentViewer.CurrentIndex + 1).ToString()
|
|
|
, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
|
|
|
{ //TODO
|
|
|
-
|
|
|
+
|
|
|
Trace.WriteLine("输入不对");
|
|
|
AlertsMessage alertsMessage = new AlertsMessage();
|
|
|
alertsMessage.ShowDialog("", App.MainPageLoader.GetString("PageRangeWarning"), App.ServiceLoader.GetString("Text_ok"));
|
|
|
return;
|
|
|
}
|
|
|
- this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
|
|
|
+ this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
|
|
|
}
|
|
|
// ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
|
|
|
- ConverterPreview.PageIndex.Text= ConverterPreview.PageIndexLists.Count.ToString();
|
|
|
+ ConverterPreview.PageIndex.Text = ConverterPreview.PageIndexLists.Count.ToString();
|
|
|
ConverterPreview.CurrentIndex = 0;
|
|
|
}
|
|
|
}
|
|
@@ -273,7 +274,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
|
|
|
{ //TODO
|
|
|
HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true);
|
|
|
-
|
|
|
+
|
|
|
if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
|
|
|
{ //TODO
|
|
|
ConverterPreview.PageIndexLists.Add(0);
|
|
@@ -296,7 +297,8 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private void BatchConverter() {
|
|
|
+ private void BatchConverter()
|
|
|
+ {
|
|
|
DialogParameters convertpdftoword = new DialogParameters();
|
|
|
convertpdftoword.Add(ParameterNames.BatchProcessing_Name, "0");
|
|
|
convertpdftoword.Add("ConverterTypeIndex", 4);
|
|
@@ -311,8 +313,15 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
{
|
|
|
RequestClose.Invoke(new DialogResult(ButtonResult.Cancel));
|
|
|
}
|
|
|
-
|
|
|
- private void converter()
|
|
|
+ private void PreviewCancelDown(object e)
|
|
|
+ {
|
|
|
+ var PageRangeComboBox = e as WritableComboBox;
|
|
|
+ if (PageRangeComboBox != null)
|
|
|
+ {
|
|
|
+ PageRangeComboBox.IsloseFocus= false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ private void converter()
|
|
|
{
|
|
|
if (PageRangeSelectIndex == "4")
|
|
|
{
|
|
@@ -338,7 +347,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- if (ConverterCSVModel.IsCustomFileName)
|
|
|
+ if (ConverterCSVModel.IsCustomFileName)
|
|
|
{
|
|
|
System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();
|
|
|
/*
|
|
@@ -363,7 +372,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
catch
|
|
|
{
|
|
|
AlertsMessage alertsMessage = new AlertsMessage();
|
|
|
- alertsMessage.ShowDialog("",App.MainPageLoader.GetString("FileNotExistWarning"), App.ServiceLoader.GetString("Text_ok"));
|
|
|
+ alertsMessage.ShowDialog("", App.MainPageLoader.GetString("FileNotExistWarning"), App.ServiceLoader.GetString("Text_ok"));
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -372,8 +381,9 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
- }
|
|
|
- else {
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
FolderBrowserDialog dlg = new FolderBrowserDialog();
|
|
|
if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
|
|
|
{
|
|
@@ -381,7 +391,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
}
|
|
|
else { return; }
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref ConverterCSVModel.PageRange, PageRangeText, true, CurrentPageIndex);
|
|
|
if (ConverterCSVModel.PageRange == "")
|
|
|
{
|
|
@@ -412,7 +422,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
//{
|
|
|
|
|
|
//});
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
private void radiobutton(string e)
|
|
@@ -428,7 +438,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
break;
|
|
|
case "OnlyTableRadioBtn":
|
|
|
ConverterCSVModel.Options.IsMergeCsv = true;
|
|
|
- ConverterCSVModel.IsCustomFileName =true;
|
|
|
+ ConverterCSVModel.IsCustomFileName = true;
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
@@ -456,12 +466,12 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
if (pdfViewer != null)
|
|
|
{
|
|
|
currentViewer = pdfViewer;
|
|
|
- MaxPageRange=currentViewer.Document.PageCount;
|
|
|
+ MaxPageRange = currentViewer.Document.PageCount;
|
|
|
if (currentViewer.Tag != null) { ConverterCSVModel.Pawssword = currentViewer.Tag.ToString(); }
|
|
|
ConverterCSVModel.InputPath = pdfViewer.Document.FilePath;
|
|
|
FileInfo fileinfo = new FileInfo(ConverterCSVModel.InputPath);
|
|
|
ConverterCSVModel.Options.IsMergeCsv = false;
|
|
|
- ConverterCSVModel.IsCustomFileName=false;
|
|
|
+ ConverterCSVModel.IsCustomFileName = false;
|
|
|
ConverterCSVModel.OutputPath = fileinfo.DirectoryName;
|
|
|
}
|
|
|
}
|