From a4869174c478f220e10f6837db24301a109355e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A3=8A?= <liulei901112@163.com>
Date: Sat, 11 Sep 2021 15:32:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=B1=BB=E5=9E=8B=E5=92=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TextLocator/App.xaml.cs          | 14 ++++++--------
 TextLocator/Enums/FileType.cs    | 17 ++++++-----------
 TextLocator/MainWindow.xaml      | 22 +++++++++++++++++-----
 TextLocator/MainWindow.xaml.cs   | 28 +++++++++++++++-------------
 TextLocator/Util/FileTypeUtil.cs | 22 +---------------------
 TextLocator/Util/FileUtil.cs     | 12 ++++++------
 6 files changed, 51 insertions(+), 64 deletions(-)

diff --git a/TextLocator/App.xaml.cs b/TextLocator/App.xaml.cs
index 229acfd..345fbf2 100644
--- a/TextLocator/App.xaml.cs
+++ b/TextLocator/App.xaml.cs
@@ -25,23 +25,21 @@ namespace TextLocator
             try
             {
                 // Word服务
-                FileInfoServiceFactory.Register(FileType.Word类型, new WordFileService());
+                FileInfoServiceFactory.Register(FileType.Word文档, new WordFileService());
                 // Excel服务
-                FileInfoServiceFactory.Register(FileType.Excel类型, new ExcelFileService());
+                FileInfoServiceFactory.Register(FileType.Excel表格, new ExcelFileService());
                 // PowerPoint服务
-                FileInfoServiceFactory.Register(FileType.PowerPoint类型, new PowerPointFileService());
+                FileInfoServiceFactory.Register(FileType.PPT演示文稿, new PowerPointFileService());
                 // PDF服务
-                FileInfoServiceFactory.Register(FileType.PDF类型, new PdfFileService());
+                FileInfoServiceFactory.Register(FileType.PDF文档, new PdfFileService());
                 // HTML或XML服务
-                FileInfoServiceFactory.Register(FileType.HTML和XML类型, new XmlFileService());
+                FileInfoServiceFactory.Register(FileType.HTML和XML, new XmlFileService());
                 // 常用图片服务
                 FileInfoServiceFactory.Register(FileType.常用图片, new NoTextFileService());
                 // 程序员服务
                 FileInfoServiceFactory.Register(FileType.代码文件, new DevelopFileService());
                 // 纯文本服务
-                FileInfoServiceFactory.Register(FileType.纯文本, new TxtFileService());
-                // 其他类型服务
-                FileInfoServiceFactory.Register(FileType.其他类型, new NoTextFileService());
+                FileInfoServiceFactory.Register(FileType.文本文件, new TxtFileService());
             }
             catch (Exception ex)
             {
diff --git a/TextLocator/Enums/FileType.cs b/TextLocator/Enums/FileType.cs
index 73ed1eb..fa7bf2d 100644
--- a/TextLocator/Enums/FileType.cs
+++ b/TextLocator/Enums/FileType.cs
@@ -11,27 +11,27 @@ namespace TextLocator.Enums
         /// Word
         /// </summary>
         [Description("doc,docx")]
-        Word类型,
+        Word文档,
         /// <summary>
         /// Excel
         /// </summary>
         [Description("xls,xlsx")]
-        Excel类型,
+        Excel表格,
         /// <summary>
         /// PowerPoint
         /// </summary>
         [Description("ppt,pptx")]
-        PowerPoint类型,
+        PPT演示文稿,
         /// <summary>
         /// PDF
         /// </summary>
         [Description("pdf")]
-        PDF类型,
+        PDF文档,
         /// <summary>
         /// XML和html
         /// </summary>
         [Description("html,xml")]
-        HTML和XML类型,
+        HTML和XML,
         /// <summary>
         /// 常用图片
         /// </summary>
@@ -46,11 +46,6 @@ namespace TextLocator.Enums
         /// 纯文本
         /// </summary>
         [Description("txt")]
-        纯文本,
-        /// <summary>
-        /// 其他类型
-        /// </summary>
-        [Description()]
-        其他类型
+        文本文件
     }
 }
diff --git a/TextLocator/MainWindow.xaml b/TextLocator/MainWindow.xaml
index 044f8bb..54a11eb 100644
--- a/TextLocator/MainWindow.xaml
+++ b/TextLocator/MainWindow.xaml
@@ -71,15 +71,27 @@
                                 <GridSplitter Margin="30,0,30,0" Grid.Column="1" Width="1" HorizontalAlignment="Stretch" Background="Gray" />
                                 <!-- 扩展信息 -->
                                 <StackPanel>
-                                    <!-- 扩展名 -->
+                                    <!-- 文件类型 -->
                                     <Grid>
                                         <TextBlock Text="文件类型：" HorizontalAlignment="Left"/>
-                                        <TextBox x:Name="FileTypeNames" Text="doc,docm,docx,ppt,pptm,xls,xlsm,xlsx,htm,html,pdf,txt,java,css,cs" IsReadOnly="true" Width="700" Height="20" Margin="65,0,0,0" HorizontalAlignment="Left"/>
+                                        <Border Width="700" Height="25" Margin="65,0,0,0" HorizontalAlignment="Left" BorderBrush="Gray" BorderThickness="1">
+                                            <StackPanel x:Name="FileTypeNames" Orientation="Horizontal">
+                                                <Button Content="Word类型" Height="25"/>
+                                                <Button Content="Excel类型" Height="25" Margin="5,0,0,0"/>
+                                                <Button Content="PowerPoint类型" Height="25" Margin="5,0,0,0"/>
+                                                <Button Content="PDF类型" Height="25" Margin="5,0,0,0"/>
+                                                <Button Content="HTML和XML类型" Height="25" Margin="5,0,0,0"/>
+                                                <Button Content="常用图片" Height="25" Margin="5,0,0,0"/>
+                                                <Button Content="代码文件" Height="25" Margin="5,0,0,0"/>
+                                                <Button Content="文本类型" Height="25" Margin="5,0,0,0"/>
+                                            </StackPanel>
+                                        </Border>                                        
+                                        <!-- <TextBox x:Name="FileTypeNames" Text="doc,docm,docx,ppt,pptm,xls,xlsm,xlsx,htm,html,pdf,txt,java,css,cs" IsReadOnly="true" Width="700" Height="20" Margin="65,0,0,0" HorizontalAlignment="Left"/> -->
                                     </Grid>
-                                    <!-- 文件夹 -->
-                                    <Grid Margin="0,20,0,0" >
+                                    <!-- 搜索区域 -->
+                                    <Grid Margin="0,10,0,0" >
                                         <TextBlock Text="搜索区域：" HorizontalAlignment="Left"/>
-                                        <TextBox x:Name="FolderPaths" Text="D:\UserData\" IsReadOnly="true" Width="700" Height="20" Margin="65,0,0,0" HorizontalAlignment="Left" MouseDoubleClick="FolderPaths_MouseDoubleClick"/>
+                                        <TextBox x:Name="FolderPaths" Text="C:\Users\{User}\Document" IsReadOnly="true" Width="700" Height="25" Margin="65,0,0,0" HorizontalAlignment="Left" MouseDoubleClick="FolderPaths_MouseDoubleClick"/>
                                     </Grid>
                                 </StackPanel>
                             </StackPanel>
diff --git a/TextLocator/MainWindow.xaml.cs b/TextLocator/MainWindow.xaml.cs
index b56e94e..97143fc 100644
--- a/TextLocator/MainWindow.xaml.cs
+++ b/TextLocator/MainWindow.xaml.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -70,25 +71,26 @@ namespace TextLocator
             // 文件类型筛选下拉框数据初始化
             this.FileTypeFilter.Items.Clear();
             this.FileTypeFilter.Items.Add("全部");
-
-            // 文件类型名字
-            string fileTypeNames = "";
+            this.FileTypeNames.Children.Clear();
 
             // 获取文件类型枚举，遍历并加入下拉列表
-            foreach (string fileTypeName in FileTypeUtil.GetFileTypeNames())
+            foreach (FileType fileType in Enum.GetValues(typeof(FileType)))
             {
-                this.FileTypeFilter.Items.Add(fileTypeName);
-                fileTypeNames += fileTypeName + ",";
+                this.FileTypeFilter.Items.Add(fileType.ToString());
+
+                // 标签
+                Button ft = new Button()
+                {
+                    Content = fileType.ToString(),
+                    Height = 25,
+                    Margin = new Thickness(this.FileTypeNames.Children.Count == 0 ? 0 : 2, 0, 0, 0),
+                    ToolTip = fileType.GetDescription(),
+                    Background = Brushes.Gray
+                };
+                this.FileTypeNames.Children.Add(ft);
             }
             // 默认选中全部
             this.FileTypeFilter.SelectedIndex = 0;
-
-
-            // 初始化文件后缀
-            // 去掉最后的逗号
-            fileTypeNames = fileTypeNames.Substring(0, fileTypeNames.Length - 1);
-            this.FileTypeNames.Text = fileTypeNames;
-            this.FileTypeNames.ToolTip = FileTypeUtil.GetFileTypeExts();
         }
 
         /// <summary>
diff --git a/TextLocator/Util/FileTypeUtil.cs b/TextLocator/Util/FileTypeUtil.cs
index 3a065f1..03e2c9b 100644
--- a/TextLocator/Util/FileTypeUtil.cs
+++ b/TextLocator/Util/FileTypeUtil.cs
@@ -22,7 +22,7 @@ namespace TextLocator.Util
         public static FileType GetFileType(string filePath)
         {
             // 默认为其他类型文件
-            FileType fileType = FileType.其他类型;
+            FileType fileType = FileType.文本文件;
             
             // 判断文件路径
             if (string.IsNullOrEmpty(filePath))
@@ -54,26 +54,6 @@ namespace TextLocator.Util
             return fileType;
         }
 
-        /// <summary>
-        /// 获取文件类型列表（Word类型,Excel类型...）
-        /// </summary>
-        /// <returns></returns>
-        public static List<string> GetFileTypeNames()
-        {
-            List<string> fileTypes = new List<string>();
-            // 遍历文件类型，根据后缀查找文件类型
-            foreach (FileType ft in Enum.GetValues(typeof(FileType)))
-            {
-                // 获取描述
-                string fileTypeName = ft.ToString();
-                if (!fileTypeName.Equals("其他类型"))
-                {
-                    fileTypes.Add(fileTypeName);
-                }
-            }
-            return fileTypes;
-        }
-
         /// <summary>
         /// 文件类型后缀列表（ext1,ext2...）
         /// </summary>
diff --git a/TextLocator/Util/FileUtil.cs b/TextLocator/Util/FileUtil.cs
index 03003aa..b419d33 100644
--- a/TextLocator/Util/FileUtil.cs
+++ b/TextLocator/Util/FileUtil.cs
@@ -29,19 +29,19 @@ namespace TextLocator.Util
             Bitmap bitmap = null;
             switch (fileType)
             {
-                case FileType.Word类型:
+                case FileType.Word文档:
                     bitmap = Properties.Resources.word;
                     break;
-                case FileType.Excel类型:
+                case FileType.Excel表格:
                     bitmap = Properties.Resources.excel;
                     break;
-                case FileType.PowerPoint类型:
+                case FileType.PPT演示文稿:
                     bitmap = Properties.Resources.ppt;
                     break;
-                case FileType.PDF类型:
+                case FileType.PDF文档:
                     bitmap = Properties.Resources.pdf;
                     break;
-                case FileType.HTML和XML类型:
+                case FileType.HTML和XML:
                     bitmap = Properties.Resources.html;
                     break;
                 case FileType.常用图片:
@@ -50,7 +50,7 @@ namespace TextLocator.Util
                 case FileType.代码文件:
                     bitmap = Properties.Resources.code;
                     break;
-                case FileType.纯文本:
+                case FileType.文本文件:
                     bitmap = Properties.Resources.txt;
                     break;
                 default:
-- 
Gitee