diff --git a/Daybreak/Daybreak.csproj b/Daybreak/Daybreak.csproj index 3815478f..eed763c6 100644 --- a/Daybreak/Daybreak.csproj +++ b/Daybreak/Daybreak.csproj @@ -13,7 +13,7 @@ preview Daybreak.ico true - 0.9.8.150 + 0.9.8.151 true cfb2a489-db80-448d-a969-80270f314c46 True diff --git a/Daybreak/Services/Charts/LiveChartInitializer.cs b/Daybreak/Services/Charts/LiveChartInitializer.cs index 37db54bb..1f68b97b 100644 --- a/Daybreak/Services/Charts/LiveChartInitializer.cs +++ b/Daybreak/Services/Charts/LiveChartInitializer.cs @@ -23,11 +23,11 @@ public void OnStartup() .AddLightTheme() .HasMap((metric, index) => { - return new Coordinate(Convert.ToDouble(metric.Measurement), metric.Timestamp.Ticks); + return new Coordinate(metric.Timestamp.Ticks, Convert.ToDouble(metric.Measurement)); }) .HasMap((quote, point) => { - return new Coordinate(((double)quote.Price) / 20d, quote.Timestamp?.Ticks ?? 0); + return new Coordinate(quote.Timestamp?.Ticks ?? 0, ((double)quote.Price) / 20d); })); } } diff --git a/Daybreak/Services/Guildwars/GuildwarsCopyService.cs b/Daybreak/Services/Guildwars/GuildwarsCopyService.cs index 928963ce..0d1777f0 100644 --- a/Daybreak/Services/Guildwars/GuildwarsCopyService.cs +++ b/Daybreak/Services/Guildwars/GuildwarsCopyService.cs @@ -18,7 +18,6 @@ public sealed class GuildwarsCopyService : IGuildwarsCopyService private static readonly string[] FilesToCopy = { - "d3d9.dll", "Gw.dat", "Gw.exe", "GwLoginClient.dll" @@ -117,7 +116,7 @@ private static bool TryGetDestinationPath(out string path) UseDescriptionForTitle = true }; - var result = folderPicker.ShowDialog(new Win32Window(Launcher.Instance.MainWindow)); + var result = folderPicker.ShowDialog(); if (result is DialogResult.Abort or DialogResult.Cancel or DialogResult.No) { return false; diff --git a/Daybreak/Views/Copy/GuildwarsCopyView.xaml b/Daybreak/Views/Copy/GuildwarsCopyView.xaml index 0b03609b..9b42cf0e 100644 --- a/Daybreak/Views/Copy/GuildwarsCopyView.xaml +++ b/Daybreak/Views/Copy/GuildwarsCopyView.xaml @@ -26,6 +26,7 @@ FontSize="16" Margin="10" Width="50" Height="25" Clicked="HighlightButton_Clicked" Foreground="{StaticResource MahApps.Brushes.ThemeForeground}" HighlightColor="{StaticResource MahApps.Brushes.Accent}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderBrush="{StaticResource MahApps.Brushes.ThemeForeground}" + Visibility="{Binding ElementName=_this, Path=ContinueButtonEnabled, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}" BorderThickness="1" ToolTip="Continue"/> diff --git a/Daybreak/Views/GuildwarsDownloadView.xaml.cs b/Daybreak/Views/GuildwarsDownloadView.xaml.cs index 75fa29a7..b4676e08 100644 --- a/Daybreak/Views/GuildwarsDownloadView.xaml.cs +++ b/Daybreak/Views/GuildwarsDownloadView.xaml.cs @@ -67,7 +67,7 @@ private async void DownloadView_Loaded(object sender, RoutedEventArgs e) UseDescriptionForTitle = true }; - var result = folderPicker.ShowDialog(new Win32Window(Launcher.Instance.MainWindow)); + var result = folderPicker.ShowDialog(); if (result is DialogResult.Abort or DialogResult.Cancel or DialogResult.No) { this.installationStatus.CurrentStep = DownloadStatus.DownloadCancelled;