|
@@ -83,7 +83,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
T_YES = App.MainPageLoader.GetString("Convert_Yes");
|
|
|
T_No = App.MainPageLoader.GetString("Convert_No");
|
|
|
T_PageRange = App.MainPageLoader.GetString("Convert_PDFPageRange");
|
|
|
- T_Format= App.MainPageLoader.GetString("Convert_PDFToImageFormat");
|
|
|
+ T_Format = App.MainPageLoader.GetString("Convert_PDFToImageFormat");
|
|
|
}
|
|
|
|
|
|
#endregion
|
|
@@ -119,7 +119,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
|
|
|
public List<string> ImageTypeFamily { set; get; } = new List<string>();
|
|
|
|
|
|
- private int imageTypeSelectedIndex=0;
|
|
|
+ private int imageTypeSelectedIndex = 0;
|
|
|
/// <summary>
|
|
|
/// 图像类型的下拉框索引值
|
|
|
/// 如果只需要根据选中项的索引判断,则可以不用再采取command绑定命令的形式,而是可以通过一个int类型属性绑定的形式,然后在set方法里进行处理
|
|
@@ -213,7 +213,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
public DelegateCommand SetCustomPageRangeCommand { get; set; }
|
|
|
|
|
|
public DelegateCommand BatchConverterCommand { get; set; }
|
|
|
-
|
|
|
+
|
|
|
#endregion
|
|
|
|
|
|
public ConverterImgDialogViewModel(IDialogService dialogService)
|
|
@@ -232,7 +232,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
|
|
|
#region 逻辑函数
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
public void SetCustomPageRange()
|
|
|
{
|
|
@@ -416,9 +416,9 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
var currentViewer = this.currentViewer;
|
|
|
string PageRange = "";
|
|
|
var PageRangeText = this.PageRangeText;
|
|
|
- if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"])
|
|
|
+ if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"] || PageRangeSelectIndex == CheckPageSelect["4"])
|
|
|
{
|
|
|
- HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, !IsCurrentPageIndex);
|
|
|
+ if (PageRangeSelectIndex == CheckPageSelect["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))
|
|
@@ -467,9 +467,19 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
|
|
|
if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
|
|
|
{ //TODO
|
|
|
- ConverterPreview.PageIndexLists.Add(0);
|
|
|
-
|
|
|
+ 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);
|
|
|
+ Trace.WriteLine("输入不对");
|
|
|
+ MessageBoxEx.Show("输入不对");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ ConverterPreview.PageIndex.Text = ConverterPreview.PageIndexLists.Count.ToString();
|
|
|
+ ConverterPreview.CurrentIndex = 0;
|
|
|
return;
|
|
|
+
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -520,7 +530,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
ImageDPISelectedIndex = 0;
|
|
|
FileInfo fileinfo = new FileInfo(ConverterImgModel.InputPath);
|
|
|
ConverterImgModel.OutputPath = fileinfo.DirectoryName;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
#endregion
|