diff --git a/ModAssistant/Classes/OneClickInstaller.cs b/ModAssistant/Classes/OneClickInstaller.cs index a5d999d..1859923 100644 --- a/ModAssistant/Classes/OneClickInstaller.cs +++ b/ModAssistant/Classes/OneClickInstaller.cs @@ -28,6 +28,11 @@ namespace ModAssistant await Playlist(uri); break; } + if (App.OCIWindow != "No") + { + Status.StopRotation(); + API.Utils.SetMessage((string)Application.Current.FindResource("OneClick:Done")); + } if (App.OCIWindow == "Close") { await Task.Delay(3000); diff --git a/ModAssistant/Localisation/en.xaml b/ModAssistant/Localisation/en.xaml index b5ebf4d..21dc8c7 100644 --- a/ModAssistant/Localisation/en.xaml +++ b/ModAssistant/Localisation/en.xaml @@ -226,6 +226,7 @@ Max tries reached: Skipping {0} Ratelimit hit. Resuming in {0} Download failed: {0} + Done'd Theme not found, reverting to default theme... diff --git a/ModAssistant/OneClickStatus.xaml b/ModAssistant/OneClickStatus.xaml index 74d0bcd..088322d 100644 --- a/ModAssistant/OneClickStatus.xaml +++ b/ModAssistant/OneClickStatus.xaml @@ -61,6 +61,7 @@ Source="{DynamicResource loadingMiddleDrawingImage}" Stretch="Uniform" /> + + + + diff --git a/ModAssistant/OneClickStatus.xaml.cs b/ModAssistant/OneClickStatus.xaml.cs index bab2b90..8312ed5 100644 --- a/ModAssistant/OneClickStatus.xaml.cs +++ b/ModAssistant/OneClickStatus.xaml.cs @@ -26,12 +26,13 @@ namespace ModAssistant { get { - return HistoryTextBlock.Text; + return MainTextBlock.Text; } set { Dispatcher.Invoke(new Action(() => { - OneClickStatus.Instance.HistoryTextBlock.Text = string.IsNullOrEmpty(MainText) ? $"{value}" : $"{value}\n{MainText}"; + OneClickStatus.Instance.MainTextBlock.Text = value; + OneClickStatus.Instance.HistoryTextBlock.Text = string.IsNullOrEmpty(MainText) ? $"{value}" : $"{value}\n{HistoryText}"; })); } } @@ -41,6 +42,11 @@ namespace ModAssistant InitializeComponent(); Instance = App.OCIWindow != "No" ? this : null; } + + public void StopRotation() + { + Ring.Style = null; + } } [ValueConversion(typeof(double), typeof(double))]