some small fixes and improvements

okkdev · Aug 4, 2021 · 203197b · 203197b
1 parent 1aa5408
commit 203197b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/MeltyInstaller/MainWindow.xaml b/MeltyInstaller/MainWindow.xaml
@@ -48,7 +48,7 @@
 
             <Border BorderThickness="0.5" BorderBrush="Black" Padding="2,2,2,2" Grid.Row="7" Grid.RowSpan="4">
                 <ScrollViewer x:Name="scrollLog" VerticalScrollBarVisibility="Auto">
-                    <TextBlock x:Name="installLog" />
+                    <TextBox x:Name="installLog" Background="Transparent" BorderThickness="0" IsReadOnly="True" TextWrapping="Wrap" />
                 </ScrollViewer>
             </Border>
 

diff --git a/MeltyInstaller/MainWindow.xaml.cs b/MeltyInstaller/MainWindow.xaml.cs
@@ -82,14 +82,18 @@ public void PrintLog(string log)
 
         private async void Install()
         {
+            installPath.IsEnabled = false;
+            selectPath.IsEnabled = false;
             install.IsEnabled = false;
             installCCCaster.IsEnabled = false;
             installConcerto.IsEnabled = false;
 
-            PrintLog("Creating Directory...");
-            Directory.CreateDirectory(path);
-
-            progressBar.Value += 5;
+            if (!Directory.Exists(path))
+            {
+                PrintLog("Creating Directory...");
+                Directory.CreateDirectory(path);
+                progressBar.Value += 5;
+            }
 
             client = new HttpClient();
 
@@ -172,13 +176,13 @@ private async Task DownloadFile(string urlAddress, string fileName)
                                     if (totalReads % 512 == 0)
                                     {
                                         PrintLog($"{fileName} download progress: {totalRead / 1048576}mb of {totalSize / 1048576}mb");
+                                        progressBar.Value += 0.3;
                                     }
                                 }
                             }
                             while (isMoreToRead);
                         }
 
-                        progressBar.Value += 20;
                         PrintLog($"Finished Download of: {fileName}");
                     }
                     else
@@ -215,6 +219,10 @@ private Task UnzipFile(string fileName)
 
         private void close_Click(object sender, RoutedEventArgs e)
         {
+            if (close.Content.ToString() == "Done")
+            {
+                System.Diagnostics.Process.Start("explorer.exe", path);
+            }
             Application.Current.MainWindow.Close();
         }
     }