|
@@ -248,7 +248,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
|
|
|
PDFDataTable.Columns.Add("MaxPageRange");
|
|
|
PDFDataTable.Columns.Add("FileSize");
|
|
|
PDFDataTable.Columns.Add("FileState");
|
|
|
- Unicode = Guid.NewGuid().ToString() ;
|
|
|
+ Unicode = Guid.NewGuid().ToString();
|
|
|
BackgroundSettingsVisible = Visibility.Visible;
|
|
|
ADDPDFCommand = new DelegateCommand(addpicture);
|
|
|
ADDOpenedPDFCommand = new DelegateCommand(addOpenedPDFFiles);
|
|
@@ -260,7 +260,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
|
|
|
eventAggregator.GetEvent<SetCurrentCreateModEvent>().Subscribe(SetCurrentCreateMod, e => e.Unicode == Unicode);
|
|
|
eventAggregator.GetEvent<SetCurrentTemplateListModEvent>().Subscribe(SetCurrentTemplateListMod, e => e.Unicode == Unicode);
|
|
|
eventAggregator.GetEvent<EditBackgroundTemplateItemEvent>().Subscribe(EditBackgroundTemplateItem, e => e.Unicode == Unicode);
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
#region 逻辑函数
|
|
|
public void EnterTemplateListOrCreate(EnumTemplateListOrCreateUnicode enumTemplateListOrCreateunicode)
|
|
@@ -339,6 +339,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
|
|
|
|
|
|
private void create()
|
|
|
{
|
|
|
+ HomePageBatchProcessingDialogModel.closeDialog = true;
|
|
|
updateListview("wait");
|
|
|
fileNamesIndex = 0;
|
|
|
BackgroundGridIsEnabled = "False";
|
|
@@ -396,6 +397,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
|
|
|
fileNamesIndex++;
|
|
|
}
|
|
|
BackgroundGridIsEnabled = "True";
|
|
|
+ HomePageBatchProcessingDialogModel.closeDialog = false;
|
|
|
}
|
|
|
|
|
|
public void CreateBackground(CPDFDocument document)
|
|
@@ -559,7 +561,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
|
|
|
{
|
|
|
PDFCurrentDataTable.Rows[datatableindex]["FilePageRangeSelectIndex"] = "0";
|
|
|
}
|
|
|
- pdfdatatable.Rows.Add(f.Name, PDFCurrentDataTable.Rows[datatableindex]["FilePageRangeText"], PDFCurrentDataTable.Rows[datatableindex]["FilePageRangeSelectIndex"], isEvenPage(fileName), pagecount, file_size, PDFCurrentDataTable.Rows[datatableindex]["FileState"]);
|
|
|
+ pdfdatatable.Rows.Add(f.Name, PDFCurrentDataTable.Rows[datatableindex]["FilePageRangeText"], PDFCurrentDataTable.Rows[datatableindex]["FilePageRangeSelectIndex"], isEvenPage(fileName), pagecount, file_size, PDFCurrentDataTable.Rows[datatableindex]["FileState"]);
|
|
|
datatableindex++;
|
|
|
}
|
|
|
PDFDataTable = pdfdatatable;
|
|
@@ -571,7 +573,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
|
|
|
/// 更新Currentlistview显示
|
|
|
/// pagerangetext 自定义页面范围字符串 pagerangeselectindex combobox下拉索引(0全部页面 1奇数页 2偶数页 3自定义页面)isevenpageisenabled 偶数页状态 state 状态显示字符串
|
|
|
/// </summary>
|
|
|
- public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0",bool isevenpageisenabled=true,string state = "wait")
|
|
|
+ public void updateCurrentListview(string pagerangetext = "1", string pagerangeselectindex = "0", bool isevenpageisenabled = true, string state = "wait")
|
|
|
{
|
|
|
if (fileNames.Count >= FileNameNumber)
|
|
|
{
|
|
@@ -622,7 +624,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
|
|
|
/// </summary>
|
|
|
public bool isEvenPage(string filename)
|
|
|
{
|
|
|
- CPDFDocument document= CPDFDocument.InitWithFilePath(filename);
|
|
|
+ CPDFDocument document = CPDFDocument.InitWithFilePath(filename);
|
|
|
bool isevenpage = false;
|
|
|
if (document.PageCount > 1)
|
|
|
{
|