close button

okkdev · Aug 3, 2021 · c12ec74 · c12ec74
1 parent a29a4b3
commit c12ec74
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/MeltyInstaller/MainWindow.xaml b/MeltyInstaller/MainWindow.xaml
@@ -53,8 +53,13 @@
             </Border>
 
             <ProgressBar x:Name="progressBar" Grid.Row="11" Height="20" />
-            <Button x:Name="install" Content="Install" Grid.Row="12" Height="25" Width="80" HorizontalAlignment="Right" Click="install_Click" />
 
+
+            <StackPanel Grid.Row="12" Orientation="Horizontal" HorizontalAlignment="Right">
+
+                <Button x:Name="install" Content="Install" Height="25" Width="80" Click="install_Click" Margin="0,0,10,0" />
+                <Button x:Name="close" Content="Close" Height="25" Width="80" Click="close_Click" />
+            </StackPanel>
         </Grid>
     </Grid>
 </Window>
diff --git a/MeltyInstaller/MainWindow.xaml.cs b/MeltyInstaller/MainWindow.xaml.cs
@@ -119,7 +119,9 @@ private async void Install()
 
             progressBar.Value = 100;
 
+            PrintLog("---------------------");
             PrintLog("DONE!");
+            close.Content = "Done";
         }
 
         // Modified code from https://www.tugberkugurlu.com/archive/efficiently-streaming-large-http-responses-with-httpclient
@@ -162,14 +164,14 @@ private Task UnzipFile(string fileName)
         {
             string completePath = Path.Join(path, fileName);
 
-            if (fileName.Contains(".exe"))
+            if (!fileName.Contains(".zip"))
             {
                 return Task.CompletedTask;
             }
 
             PrintLog($"Starting Unzip of: {fileName}");
 
-            ZipFile.ExtractToDirectory(completePath, path);
+            ZipFile.ExtractToDirectory(completePath, path, true);
 
             progressBar.Value += 10;
 
@@ -181,5 +183,10 @@ private Task UnzipFile(string fileName)
 
             return Task.CompletedTask;
         }
+
+        private void close_Click(object sender, RoutedEventArgs e)
+        {
+            Application.Current.MainWindow.Close();
+        }
     }
 }