Cleanup.

Author: LittlePox

OKEGui/OKEGui/Gui/WizardWindow.xaml

@@ -19,7 +19,7 @@
                              CanSelectNextPage="False"
                              AllowDrop="True"
                              Drop="SelectProjectFile_Drop"
-                             PreviewDragEnter="SelectProjectFile_PreviewDragEnter">
+                             PreviewDrop="SelectProjectFile_PreviewDrop">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"></ColumnDefinition>
@@ -74,7 +74,7 @@
                     </StackPanel>
 
                     <ListBox Name="InputList" Grid.Column="1" Grid.Row="0" ItemsSource="{Binding Path=InputFile}" SelectionMode="Extended"
-                             AllowDrop="True" PreviewDragEnter="InputList_PreviewDragEnter" Drop="InputList_Drop" KeyDown="InputList_KeyDown">
+                             AllowDrop="True" PreviewDragEnter="InputList_PreviewDrop" Drop="InputList_Drop" KeyDown="InputList_KeyDown">
                     </ListBox>
 
                     <Grid Grid.Column="1" Grid.Row="1" Margin="2">

OKEGui/OKEGui/Gui/WizardWindow.xaml.cs

@@ -108,36 +108,22 @@ private bool LoadJsonProfile(string filePath)
         //拖拽输入
         private void SelectProjectFile_Drop(object sender, System.Windows.DragEventArgs e)
         {
-            string FileName = ((string[])e.Data.GetData(System.Windows.DataFormats.FileDrop))[0];
-            //临时修复json输入过滤器
-            if (Path.GetExtension(FileName).ToLower() != ".json")
-            {
-                return;
-            }
+            string fileName = (e.Data.GetData(System.Windows.DataFormats.FileDrop) as string[])[0];
 
-            wizardInfo.ProjectFile = FileName;
-            if (LoadJsonProfile(wizardInfo.ProjectFile))
-            {
-                SelectProjectFile.CanSelectNextPage = true;
-            }
-            else
-            {
-                SelectProjectFile.CanSelectNextPage = false;
-            }
-            return;
+            wizardInfo.ProjectFile = fileName;
+            SelectProjectFile.CanSelectNextPage = LoadJsonProfile(wizardInfo.ProjectFile);
         }
 
 
-        private void SelectProjectFile_PreviewDragEnter(object sender, System.Windows.DragEventArgs e)
+        private void SelectProjectFile_PreviewDrop(object sender, System.Windows.DragEventArgs e)
         {
-            if (e.Data.GetDataPresent(System.Windows.DataFormats.FileDrop) &&
-                Path.GetExtension(((string[])e.Data.GetData(System.Windows.DataFormats.FileDrop))[0]).ToLower()==".json")
-                //理论上只允许json文件拖拽输入，但是不知道为什么文件过滤并没有生效
+            string fileDrop = System.Windows.DataFormats.FileDrop;
+            if (e.Data.GetDataPresent(fileDrop) &&
+                Path.GetExtension((e.Data.GetData(fileDrop) as string[])[0]).ToLower() != ".json")
             {
                 e.Effects = System.Windows.DragDropEffects.Copy;
                 e.Handled = true;
             }
-            return;
         }
 
 
@@ -152,15 +138,7 @@ private void OpenProjectBtn_Click(object sender, RoutedEventArgs e)
             }
 
             wizardInfo.ProjectFile = ofd.FileName;
-            if (LoadJsonProfile(wizardInfo.ProjectFile))
-            {
-                SelectProjectFile.CanSelectNextPage = true;
-            }
-            else
-            {
-                // 配置文件无效
-                SelectProjectFile.CanSelectNextPage = false;
-            }
+            SelectProjectFile.CanSelectNextPage = LoadJsonProfile(wizardInfo.ProjectFile);
         }
 
         private void OpenInputFile_Click(object sender, RoutedEventArgs e)
@@ -246,38 +224,29 @@ private void WizardFinish(object sender, RoutedEventArgs e)
         private void DeleteInput_Click(object sender, RoutedEventArgs e)
         {
             DeleteInputVideoFiles();
-
-            return;
         }
 
-        private void InputList_PreviewDragEnter(object sender, System.Windows.DragEventArgs e)
+        private void InputList_PreviewDrop(object sender, System.Windows.DragEventArgs e)
         {
-            if (e.Data.GetDataPresent(System.Windows.DataFormats.FileDrop))
-            {
-                e.Effects = System.Windows.DragDropEffects.Copy;
-                e.Handled = true;
-            }
-            return;
+            // nothing
         }
 
         private void InputList_Drop(object sender, System.Windows.DragEventArgs e)
         {
-            string[] InputPaths = (string[])e.Data.GetData(System.Windows.DataFormats.FileDrop);
-            string[] AllowExts = { ".mkv", ".m2ts", ".mp4" };
+            string[] inputPaths = e.Data.GetData(System.Windows.DataFormats.FileDrop) as string[];
+            string[] allowedExts = { ".mkv", ".m2ts", ".mp4" };
 
-            var InputFileList = from InputPath in InputPaths
-                                from AllowExt in AllowExts
-                                where (Path.GetExtension(InputPath)) == AllowExt
-                                select InputPath;
+            string[] inputFileList = inputPaths.Where(i => allowedExts.Contains(Path.GetExtension(i))).ToArray();
 
-            foreach(var InputFile in InputFileList)
+            foreach(string inputFile in inputFileList)
             {
-                if (!wizardInfo.InputFile.Contains(InputFile))
-                    wizardInfo.InputFile.Add(InputFile);
+                if (!wizardInfo.InputFile.Contains(inputFile))
+                {
+                    wizardInfo.InputFile.Add(inputFile);
+                }
             }
 
             SelectInputFile.CanFinish = wizardInfo.InputFile.Count > 0;
-            return;
         }
 
         private void InputList_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
@@ -286,8 +255,6 @@ private void InputList_KeyDown(object sender, System.Windows.Input.KeyEventArgs
             {
                 DeleteInputVideoFiles();
             }
-            
-            return;
         }
 
         private void DeleteInputVideoFiles()

OKEGui/OKEGui/Properties/AssemblyInfo.cs

@@ -47,4 +47,4 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.6.*")]
+[assembly: AssemblyVersion("4.7.*")]