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

PDF Office/CustomControl/WritableComboBox.xaml

@@ -28,6 +28,9 @@
             x:Name="writableTextBox"
             Grid.Column="0"
             MinHeight="{Binding ElementName=writableComboBox, Path=MinHeight}"
+            BorderBrush="{x:Null}"
+            BorderThickness="0"
+            Margin="2"
             HorizontalAlignment="Left"
             VerticalContentAlignment="Center"
             Panel.ZIndex="1"

PDF Office/CustomControl/WritableComboBox.xaml.cs

@@ -252,7 +252,7 @@ namespace PDF_Office.CustomControl
             if (this.writableComboBox.SelectedIndex == this.writableComboBox.Items.Count - 1)
             {
                 if (this.writableComboBox.ActualWidth == 0) { this.writableTextBox.Width = 210; this.writableTextBox.Visibility = Visibility.Visible; return; }
-                this.writableTextBox.Width = this.writableComboBox.ActualWidth - 18;
+                this.writableTextBox.Width = this.writableComboBox.ActualWidth - 28;
                 Trace.WriteLine(this.writableComboBox.ActualWidth);
                 this.writableTextBox.Visibility = Visibility.Visible;
 

PDF Office/Styles/WindowsStyle.xaml

@@ -136,9 +136,10 @@
     </Style>
 
 
-    <Style x:Key="stlWindowEx" TargetType="{x:Type Window}">
-        <Setter Property="Height" Value="554"/>
-        <Setter Property="Width" Value="892"/>
+    <Style x:Key="stlWindowEx" 
+        BasedOn="{StaticResource DialogWindowStyle}"
+        TargetType="{x:Type Window}">
+        <Setter Property="ResizeMode" Value="CanResize" />
     </Style>
 
 </ResourceDictionary>

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterCSVDialogViewModel.cs

@@ -123,7 +123,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                     }
                    this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterExcelDialogViewModel.cs

@@ -235,7 +235,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterHTMLDialogViewModel.cs

@@ -208,7 +208,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterImgDialogViewModel.cs

@@ -294,7 +294,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterPPTDialogViewModel.cs

@@ -205,7 +205,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterRTFDialogViewModel.cs

@@ -205,7 +205,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterTextDialogViewModel.cs

@@ -205,7 +205,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterWordDialogViewModel.cs

@@ -207,7 +207,7 @@ namespace PDF_Office.ViewModels.Dialog.ConverterDialogs
                     }
                     this.CurrentPageIndex = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 }
-                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Count).ToString();
+                ConverterPreview.PageIndex.Text = (ConverterPreview.PageIndexLists.Last<int>() + 1).ToString();
                 ConverterPreview.CurrentIndex = 0;
             }
         }

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePagePictureToPDFDialogViewModel.cs

@@ -491,6 +491,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
             {
                 string file_all = fileName;
                 FileInfo f = new FileInfo(file_all);
+                if (!f.Exists) { continue; }
                 string file_size = (((float)f.Length)/1024).ToString()+" K";
                 imagesdatatable.Rows.Add(f.Name, file_size, ImagesCurrentDataTable.Rows[datatableindex]["FileState"]);
                 datatableindex++;
@@ -608,6 +609,8 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs
                 topdfdoc.InsertPage(index, width, height, tempFileName);
             }
         }
+
+        public void CloseDialoge() { RequestClose?.Invoke(new DialogResult(ButtonResult.OK));}
         #endregion
 
         #region 构架行为

PDF Office/Views/Dialog/HomePageToolsDialogs/HomePagePictureToPDFDialog.xaml.cs

@@ -1,4 +1,5 @@
 using ComPDFKitViewer;
+using ComPDFKitViewer.PdfViewer;
 using DryIoc;
 using ImTools;
 using PDF_Office.Helper;
@@ -27,6 +28,8 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs
     {
         private IDropTargetHelper dropHelper;
         private HomePagePictureToPDFDialogViewModel viewModel;
+        private WindowState WindowState;
+
         public HomePagePictureToPDFDialog()
         {
             InitializeComponent();
@@ -49,7 +52,7 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs
                 a = (System.Data.DataRowView)item;
                 viewModel.fileNamesView.Add(lists.IndexOf(a));
             }
-            
+
 
         }
 
@@ -82,7 +85,8 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs
                 case "SelectFileNameRadioButton":
                     {
                         viewModel.pictureToPDFModel.Mode = HomePagePictureToPDFDialogModel.ToPDFFileMode.SelectFileName;
-                        if (!File.Exists(viewModel.SelectFileName)) {
+                        if (!File.Exists(viewModel.SelectFileName))
+                        {
                             viewModel.ImageToPDFBtnIsEnable = "False";
                         }
                     }
@@ -113,7 +117,7 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs
                 {
                     dropFile = ((System.Array)e.Data.GetData(System.Windows.DataFormats.FileDrop)).GetValue(i).ToString(); ;
                     //MessageBox.Show(dropFile);
-                    if (dropFile.ToLower().EndsWith("png")|| dropFile.ToLower().EndsWith("jpg")|| dropFile.ToLower().EndsWith("bmp")|| dropFile.ToLower().EndsWith("gif")|| dropFile.ToLower().EndsWith("tiff")|| dropFile.ToLower().EndsWith("jpeg"))
+                    if (dropFile.ToLower().EndsWith("png") || dropFile.ToLower().EndsWith("jpg") || dropFile.ToLower().EndsWith("bmp") || dropFile.ToLower().EndsWith("gif") || dropFile.ToLower().EndsWith("tiff") || dropFile.ToLower().EndsWith("jpeg"))
                     { viewModel.addPicture(dropFile); }
                 }
             }
@@ -121,11 +125,15 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs
         private void MainPage_DragEnter(object sender, DragEventArgs e)
         {
             BtnBlank.IsEnabled = false;
+            string dropFile = "Drop";
+            //dropFile = ((System.Array)e.Data.GetData(System.Windows.DataFormats.FileDrop)).GetValue(i).ToString(); ;
             //页面编辑和缩略图
+
             if ((e.OriginalSource as Image) != null)
                 return;
             try
             {
+
                 if (dropHelper == null)
                 {
                     dropHelper = Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid("4657278A-411B-11D2-839A-00C04FD918D0"))) as IDropTargetHelper;
@@ -181,5 +189,32 @@ namespace PDF_Office.Views.Dialog.HomePageToolsDialogs
                 viewModel.removepdffile(viewModel.ImagesDataTable.Rows.IndexOf(ls.Row));
             }
         }
+
+        private void BtnMiniSize_Click(object sender, RoutedEventArgs e)
+        {
+            System.Windows.SystemCommands.MinimizeWindow(Window.GetWindow(this));
+        }
+
+        private void BtnClose_Click(object sender, RoutedEventArgs e)
+        {
+
+
+            Window.GetWindow(this).Close();
+
+        }
+
+        private void BtnReStore_Click(object sender, RoutedEventArgs e)
+        {
+            if (Window.GetWindow(this).WindowState == WindowState.Maximized)
+            {
+                ico_max.Visibility = Visibility.Collapsed;
+                System.Windows.SystemCommands.RestoreWindow(Window.GetWindow(this));
+            }
+            else
+            {
+                ico_max.Visibility = Visibility.Visible;
+                System.Windows.SystemCommands.MaximizeWindow(Window.GetWindow(this));
+            }
+        }
     }
 }