3.1.2

yim7 · Feb 16, 2020 · 8664206 · 8664206
1 parent fc6a5d3
commit 8664206
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 16 deletions.
diff --git a/Obsidian/MVVM/ViewModels/WAD/WadFolderViewModel.cs b/Obsidian/MVVM/ViewModels/WAD/WadFolderViewModel.cs
@@ -146,6 +146,26 @@ public WadFileViewModel Find(Func<WadFileViewModel, bool> predicate)
         {
             return GetAllFiles().FirstOrDefault(predicate);
         }
+
+        public bool AreAllItemsSelected()
+        {
+            bool areAllItemsSelected = true;
+
+            foreach(WadItemViewModel child in this.Items)
+            {
+                if(child is WadFolderViewModel childFolder && !childFolder.AreAllItemsSelected())
+                {
+                    return false;
+                }
+
+                if(!child.IsSelected)
+                {
+                    return false;
+                }
+            }
+
+            return areAllItemsSelected;
+        }
 
         public void Sort()
         {

diff --git a/Obsidian/MVVM/ViewModels/WAD/WadItemViewModel.cs b/Obsidian/MVVM/ViewModels/WAD/WadItemViewModel.cs
@@ -83,6 +83,7 @@ public bool IsSelected
 
                 this._wadViewModel.NotifySelectionChanged();
                 NotifyPropertyChanged();
+                NotifySelectionChanged();
             }
         }
         public string Tooltip
@@ -143,6 +144,29 @@ public void Remove()
             }
         }
 
+        public void NotifySelectionChanged()
+        {
+            if (this.Type == WadItemType.Folder)
+            {
+                bool are = (this as WadFolderViewModel).AreAllItemsSelected();
+                if (are)
+                {
+                    this._isSelected = true;
+                }
+                else
+                {
+                    this._isSelected = false;
+                }
+            }
+
+            if (this.Parent != null)
+            {
+                (this.Parent as WadFolderViewModel).NotifySelectionChanged();
+            }
+
+            NotifyPropertyChanged(nameof(this.IsSelected));
+        }
+
         public int CompareTo(WadItemViewModel other)
         {
             if (this.Type == WadItemType.Folder && other.Type == WadItemType.File)

diff --git a/Obsidian/MainWindow.xaml.cs b/Obsidian/MainWindow.xaml.cs
@@ -422,23 +422,13 @@ private async void SaveWad()
             using (CommonSaveFileDialog dialog = new CommonSaveFileDialog())
             {
                 dialog.InitialDirectory = Config.Get<string>("SaveWadInitialDirectory");
-                dialog.AlwaysAppendDefaultExtension = true;
-                dialog.DefaultExtension = ".client";
-                dialog.Filters.Add(new CommonFileDialogFilter("wad.client File", "*.client"));
-                dialog.Filters.Add(new CommonFileDialogFilter("wad File", "*.wad"));
+                dialog.Filters.Add(new CommonFileDialogFilter("WAD Client File", "*.wad.client"));
+                dialog.Filters.Add(new CommonFileDialogFilter("WAD Mobile File", "*.wad.mobile"));
+                dialog.Filters.Add(new CommonFileDialogFilter("WAD File", "*.wad"));
 
                 if (dialog.ShowDialog() == CommonFileDialogResult.Ok)
                 {
-                    string wadLocation = dialog.FileName;
-
-                    //We need to change the extension because the dialog is stupid 
-                    //and can't handle extensions with multiple dots
-                    if (PathIO.GetExtension(dialog.FileName) == ".client")
-                    {
-                        wadLocation = PathIO.ChangeExtension(dialog.FileName, ".wad.client");
-                    }
-
-                    await DialogHelper.ShowSaveWadOperationDialog(wadLocation, this.WAD);
+                    await DialogHelper.ShowSaveWadOperationDialog(dialog.FileName, this.WAD);
                 }
             }
         }

diff --git a/Obsidian/Microsoft.WindowsAPICodePack.Shell.dll b/Obsidian/Microsoft.WindowsAPICodePack.Shell.dll
diff --git a/Obsidian/Microsoft.WindowsAPICodePack.dll b/Obsidian/Microsoft.WindowsAPICodePack.dll
diff --git a/Obsidian/Obsidian.csproj b/Obsidian/Obsidian.csproj
@@ -8,7 +8,7 @@
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyVersion>3.1.1.0</AssemblyVersion>
-    <FileVersion>3.1.0.0</FileVersion>
+    <FileVersion>3.1.2.0</FileVersion>
     <Configurations>Debug;Release;ReleasePortable</Configurations>
   </PropertyGroup>
 
@@ -49,7 +49,6 @@
     <PackageReference Include="Octokit" Version="0.36.0" />
     <PackageReference Include="Serilog" Version="2.9.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
-    <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
     <PackageReference Include="ZstdNet" Version="1.3.3" />
   </ItemGroup>
 
@@ -62,4 +61,13 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="Microsoft.WindowsAPICodePack">
+      <HintPath>Microsoft.WindowsAPICodePack.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell">
+      <HintPath>Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
 </Project>