|
@@ -8,6 +8,7 @@ using PDF_Master.Helper;
|
|
using PDF_Master.Model;
|
|
using PDF_Master.Model;
|
|
using PDF_Master.Model.Dialog.ConverterDialogs;
|
|
using PDF_Master.Model.Dialog.ConverterDialogs;
|
|
using PDF_Master.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
|
|
using PDF_Master.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
|
|
|
|
+using PDF_Master.Properties;
|
|
using Prism.Commands;
|
|
using Prism.Commands;
|
|
using Prism.Mvvm;
|
|
using Prism.Mvvm;
|
|
using Prism.Services.Dialogs;
|
|
using Prism.Services.Dialogs;
|
|
@@ -16,6 +17,7 @@ using System.Collections.Generic;
|
|
using System.Diagnostics;
|
|
using System.Diagnostics;
|
|
using System.IO;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Linq;
|
|
|
|
+using System.Windows;
|
|
using System.Windows.Controls;
|
|
using System.Windows.Controls;
|
|
using System.Windows.Forms;
|
|
using System.Windows.Forms;
|
|
using static Dropbox.Api.Files.FileCategory;
|
|
using static Dropbox.Api.Files.FileCategory;
|
|
@@ -119,6 +121,18 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
public event Action<IDialogResult> RequestClose;
|
|
public event Action<IDialogResult> RequestClose;
|
|
|
|
|
|
#region 参数和属性
|
|
#region 参数和属性
|
|
|
|
+
|
|
|
|
+ private Visibility limitationsConvertVisible = Visibility.Hidden;
|
|
|
|
+
|
|
|
|
+ public Visibility LimitationsConvertVisible
|
|
|
|
+ {
|
|
|
|
+ get { return limitationsConvertVisible; }
|
|
|
|
+ set
|
|
|
|
+ {
|
|
|
|
+ SetProperty(ref limitationsConvertVisible, value);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
public ConverterCSVDialogModel ConverterCSVModel = new ConverterCSVDialogModel();
|
|
public ConverterCSVDialogModel ConverterCSVModel = new ConverterCSVDialogModel();
|
|
|
|
|
|
public CPDFViewer currentViewer;
|
|
public CPDFViewer currentViewer;
|
|
@@ -161,7 +175,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
|
|
|
public DelegateCommand BatchConverterCommand { get; set; }
|
|
public DelegateCommand BatchConverterCommand { get; set; }
|
|
|
|
|
|
- public DelegateCommand UnlockMouseDownCommand {get; set; }
|
|
|
|
|
|
+ public DelegateCommand UnlockMouseDownCommand { get; set; }
|
|
|
|
|
|
#endregion
|
|
#endregion
|
|
|
|
|
|
@@ -312,7 +326,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- private void UnlockMouseDown()
|
|
|
|
|
|
+ private void UnlockMouseDown()
|
|
{
|
|
{
|
|
ConverterHelper.convertUnlock();
|
|
ConverterHelper.convertUnlock();
|
|
}
|
|
}
|
|
@@ -325,7 +339,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
var PageRangeComboBox = e as WritableComboBox;
|
|
var PageRangeComboBox = e as WritableComboBox;
|
|
if (PageRangeComboBox != null)
|
|
if (PageRangeComboBox != null)
|
|
{
|
|
{
|
|
- PageRangeComboBox.IsloseFocus= false;
|
|
|
|
|
|
+ PageRangeComboBox.IsloseFocus = false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
private void converter()
|
|
private void converter()
|
|
@@ -480,6 +494,10 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
|
|
ConverterCSVModel.Options.IsMergeCsv = false;
|
|
ConverterCSVModel.Options.IsMergeCsv = false;
|
|
ConverterCSVModel.IsCustomFileName = false;
|
|
ConverterCSVModel.IsCustomFileName = false;
|
|
ConverterCSVModel.OutputPath = fileinfo.DirectoryName;
|
|
ConverterCSVModel.OutputPath = fileinfo.DirectoryName;
|
|
|
|
+ if (Settings.Default.UserDate.subscribestatus != 1)
|
|
|
|
+ {
|
|
|
|
+ LimitationsConvertVisible = Visibility.Visible;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
#endregion
|
|
#endregion
|