reorganize files;

add setting window;
add setting class;

Author: Carl Chang

App.xaml.cs

@@ -6,71 +6,35 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
-using IniParser;
-using IniParser.Model;
-using SevenZip;
-using Size = System.Drawing.Size;
+
+
 
 namespace ZipImageViewer
 {
     public partial class App : Application {
         public static MainWindow MainWin;
-        public static IniData Config;
-
         public static readonly HashSet<string> ImageExtensions =
             new HashSet<string>(new[] {
                 "jpg", "jpeg", "png", "gif", "tiff", "bmp",
                 ".jpg", ".jpeg", ".png", ".gif", ".tiff", ".bmp",
             });
-
         public static readonly HashSet<string> ZipExtensions =
             new HashSet<string>(new[] {
                 "zip", "rar", "7z",
                 ".zip", ".rar", ".7z",
             });
 
-        public static Size ThumbnailSize { get; set; } = new Size(300, 200);
 
         private void App_Startup(object sender, StartupEventArgs e) {
-            //load config
-            if (!File.Exists("config.ini")) File.WriteAllText("config.ini",
-@"
-[App Config]
-SevenZipDllPath=C:\Program Files\7-Zip\7z.dll
-ThumbnailSize=300x200
-
-;Saved passwords for zipped files. Format:
-;password=file_full_path
-;leaving file_full_path empty indicates a password to try on all files when there is no matched path.
-[Saved Passwords]
-");
-            var parser = new FileIniDataParser();
-            Config = parser.ReadFile("config.ini");
-
-            //dll path
-            var sevenZipDllPath = Config["App Config"]["SevenZipDllPath"];
-            if (string.IsNullOrEmpty(sevenZipDllPath)) {
-                MessageBox.Show("7z.dll path is missing from the configuration.", "", MessageBoxButton.OK,
-                    MessageBoxImage.Error);
-                Current.Shutdown();
-                return;
-            }
-            SevenZipBase.SetLibraryPath(sevenZipDllPath);
-
-            //thumb size
-            var thumbsize = Config["App Config"]["ThumbnailSize"]?.Split('x', '*', ',');
-            if (thumbsize?.Length == 2)
-                ThumbnailSize = new Size(int.Parse(thumbsize[0]), int.Parse(thumbsize[1]));
-
+            Setting.LoadConfigFromFile();
             //show mainwindow
             MainWin = new MainWindow();
             MainWin.Show();
         }
 
 
         private void App_Exit(object sender, ExitEventArgs e) {
-            var parser = new FileIniDataParser();
-            parser.WriteFile("config.ini", Config);
+            Setting.SaveConfigToFile();
         }
     }
 }

Converters.cs

@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
+using System.Windows.Media;
 
 namespace ZipImageViewer
 {
@@ -17,4 +18,21 @@ public object[] ConvertBack(object value, Type[] targetTypes, object parameter,
             throw new NotSupportedException();
         }
     }
+
+    public class FlagToBrushConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+            var brush = Brushes.DimGray;
+            if (value is FileFlags flags) {
+                if (flags.HasFlag(FileFlags.Directory)) brush = Brushes.Goldenrod;
+                else if (flags.HasFlag(FileFlags.Archive)) brush = Brushes.DarkRed;
+                else if (flags.HasFlag(FileFlags.Image)) brush = Brushes.Transparent;
+            }
+            return brush;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
+            throw new NotImplementedException();
+        }
+    }
 }

Helpers.cs

@@ -7,6 +7,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
+using Microsoft.WindowsAPICodePack.Dialogs;
 
 namespace ZipImageViewer
 {
@@ -152,14 +153,14 @@ private void OnLoaded(object sender, RoutedEventArgs e)
 
     [Flags]
     public enum FileFlags {
-        Unknown,
-        Image,
-        Archive,
-        Directory,
+        Unknown = 0,
+        Image = 1,
+        Archive = 2,
+        Directory = 4,
         /// <summary>
         /// Indicate to load all archive content instead of a single image
         /// </summary>
-        Archive_OpenSelf
+        Archive_OpenSelf = 8
     }
 
     public class ImageInfo
@@ -170,7 +171,9 @@ public class ImageInfo
         public string FileName { get; set; }
 
         /// <summary>
-        /// For archives, full path to the archive file. Otherwise full path to the image file.
+        /// For archives, full path to the archive file.
+        /// For directories, full path to the directory.
+        /// Otherwise full path to the image file.
         /// </summary>
         public string FilePath { get; set; }
 
@@ -193,7 +196,12 @@ public string ImageRealPath {
                     return FilePath;
                 return null;
             }
-        } 
+        }
+
+        /// <summary>
+        /// For Flags.Directory, the parent folder name of FilePath. Otherwise FileName.
+        /// </summary>
+        public string DisplayName => Flags.HasFlag(FileFlags.Directory) ? Path.GetDirectoryName(FilePath) : FileName;
 
 //        public HashSet<string> ImageSet { get; set; }
 //        public string Password { get; set; }
@@ -225,11 +233,11 @@ public LoadOptions(int decodeWidth = 0, string password = null,
     public class Helpers
     {
         /// <summary>
-        /// Get file type based on extension.
+        /// Get file type based on extension. Assumes fileName points to a file.
         /// </summary>
         /// <param name="fileName">A full or not full path of the file.</param>
         /// <returns></returns>
-        public static FileFlags GetFileType(string fileName)
+        public static FileFlags GetPathType(string fileName)
         {
             var ft = FileFlags.Unknown;
             var extension = Path.GetExtension(fileName)?.TrimStart('.').ToLowerInvariant();
@@ -240,7 +248,7 @@ public static FileFlags GetFileType(string fileName)
             return ft;
         }
 
-        public static FileFlags GetFileType(FileSystemInfo fsInfo) {
+        public static FileFlags GetPathType(FileSystemInfo fsInfo) {
             if (fsInfo.Attributes.HasFlag(FileAttributes.Directory))
                 return FileFlags.Directory;
             if (App.ZipExtensions.Contains(fsInfo.Extension))
@@ -361,5 +369,14 @@ public static Size UniformScaleDown(double oldW, double oldH, double minW, doubl
 
             return new Size(oldW, oldH);
         }
+
+        public static string OpenFolderDialog(Window owner)
+        {
+            var cofd = new CommonOpenFileDialog() {
+                IsFolderPicker = true
+            };
+
+            return cofd.ShowDialog(owner) == CommonFileDialogResult.Ok ? cofd.FileName : null;
+        }
     }
 }

MainWindow.xaml

@@ -4,8 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ZipImageViewer"
-        mc:Ignorable="d" Background="#FF1F1F1F" UseLayoutRounding="True"
-        Title="ZipImageViewer" Height="640" Width="1110" Drop="MainWin_Drop" AllowDrop="True" Loaded="MainWin_Loaded">
+        mc:Ignorable="d" Background="#FF1F1F1F" UseLayoutRounding="True" Foreground="LightGray"
+        Title="ZipImageViewer" Height="640" Width="1200" Drop="MainWin_Drop" AllowDrop="True" Loaded="MainWin_Loaded">
     <ScrollViewer>
         <ItemsControl x:Name="LB1" ItemsSource="{Binding ElementName=MainWin, Path=ImageList}">
             <ItemsControl.ItemsPanel>
@@ -19,7 +19,7 @@
                                 UseLayoutRounding="True">
                         <local:Thumbnail x:Name="TN1" Tag="False" RenderTransformOrigin="0.5 0.5" Panel.ZIndex="1"
                                          ImageInfo="{Binding}" Margin="10"
-                                         PreviewMouseLeftButtonUp="TN1_PreviewMouseLeftButtonUp">
+                                         PreviewMouseUp="TN1_PreviewMouseUp">
                             <!-- Width="{Binding Source={x:Static Application.Current}, Path=ThumbnailSize.Width}" -->
                             <!-- Height="{Binding Source={x:Static Application.Current}, Path=ThumbnailSize.Height}" -->
                             <local:Thumbnail.Effect>
@@ -44,7 +44,7 @@
                             </local:Thumbnail.Style>
                         </local:Thumbnail>
 
-                        <TextBlock Text="{Binding FileName}" FontSize="10" Foreground="Gray"
+                        <TextBlock Text="{Binding DisplayName}" FontSize="10" Foreground="Gray"
                                    HorizontalAlignment="Center" Panel.ZIndex="0"/>
                     </StackPanel>
                     <DataTemplate.Triggers>