Show launcher version in the main window (#179)

* Show launcher version in the main window Now comes with coding warcrimes (in my opinion) * Better --------- Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
space-wizards · Sep 9, 2024 · 1623260 · 1623260
1 parent b967f2b
commit 1623260
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/SS14.Launcher/ViewModels/MainWindowLoginViewModel.cs b/SS14.Launcher/ViewModels/MainWindowLoginViewModel.cs
@@ -37,8 +37,6 @@ public MainWindowLoginViewModel()
         SwitchToLogin();
     }
 
-    public string Version => $"v{LauncherVersion.Version}";
-
     public void SwitchToLogin()
     {
         Screen = new LoginViewModel(this, _authApi, _loginMgr, _cfg);

diff --git a/SS14.Launcher/ViewModels/MainWindowViewModel.cs b/SS14.Launcher/ViewModels/MainWindowViewModel.cs
@@ -134,6 +134,7 @@ private void RunSelectedOnTab()
     }
 
     public ICVarEntry<bool> HasDismissedEarlyAccessWarning => Cfg.GetCVarEntry(CVars.HasDismissedEarlyAccessWarning);
+    public string Version => $"v{LauncherVersion.Version}";
 
     public async void OnWindowInitialized()
     {

diff --git a/SS14.Launcher/Views/MainWindowContent.xaml b/SS14.Launcher/Views/MainWindowContent.xaml
@@ -135,5 +135,8 @@
     <ContentControl Classes="OverlayBox" Name="DragDropOverlay" IsVisible="False">
       <TextBlock Text="{loc:Loc main-window-drag-drop-prompt}" />
     </ContentControl>
+
+    <TextBlock Text="{Binding Version}" HorizontalAlignment="Right"
+               VerticalAlignment="Bottom" Classes="SubText" Margin="6"/>
   </Panel>
 </UserControl>
diff --git a/SS14.Launcher/Views/MainWindowLogin.xaml b/SS14.Launcher/Views/MainWindowLogin.xaml
@@ -20,9 +20,6 @@
       <views:LanguageSelector DockPanel.Dock="Left" VerticalAlignment="Center" Margin="4" DataContext="{Binding LanguageSelector}" />
 
       <CheckBox DockPanel.Dock="Left" VerticalAlignment="Center" Margin="4" IsChecked="{Binding LogLauncher}" Content="{loc:Loc login-log-launcher}" />
-
-      <TextBlock Text="{Binding Version}" DockPanel.Dock="Right" VerticalAlignment="Center" Margin="4"
-                 Classes="SubText" />
     </DockPanel>
     <Panel Background="{DynamicResource ThemeStripebackEdgeBrush}" MinHeight="2" DockPanel.Dock="Bottom" />
 

diff --git a/SS14.Launcher/Views/MainWindowTabs/OptionsTabView.xaml b/SS14.Launcher/Views/MainWindowTabs/OptionsTabView.xaml
@@ -66,6 +66,5 @@
                    Margin="8" />
       </StackPanel>
     </DockPanel>
-
   </ScrollViewer>
 </UserControl>