Small fixes (#488)

Fix copy folder picker Fix metrics Closes #487 Closes #474
gwdevhub · Nov 19, 2023 · 0ba0e64 · 0ba0e64
1 parent e1dfd1f
commit 0ba0e64
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Daybreak/Daybreak.csproj b/Daybreak/Daybreak.csproj
@@ -13,7 +13,7 @@
     <LangVersion>preview</LangVersion>
     <ApplicationIcon>Daybreak.ico</ApplicationIcon>
     <IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
-    <Version>0.9.8.150</Version>
+    <Version>0.9.8.151</Version>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>

diff --git a/Daybreak/Services/Charts/LiveChartInitializer.cs b/Daybreak/Services/Charts/LiveChartInitializer.cs
@@ -23,11 +23,11 @@ public void OnStartup()
                 .AddLightTheme()
                 .HasMap<Metric>((metric, index) =>
                 {
-                    return new Coordinate(Convert.ToDouble(metric.Measurement), metric.Timestamp.Ticks);
+                    return new Coordinate(metric.Timestamp.Ticks, Convert.ToDouble(metric.Measurement));
                 })
                 .HasMap<TraderQuote>((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
@@ -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
@@ -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"/>
         </StackPanel>

diff --git 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;