From 15b892774f882fd33f16e0e2b45a9eb87761ce91 Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sun, 14 Sep 2025 15:18:19 +0200
Subject: [PATCH 01/11] WIP 2
---
Directory.Packages.props | 1 +
SS14.Launcher/App.xaml | 3 +-
SS14.Launcher/App.xaml.cs | 2 +-
SS14.Launcher/Localization/LocExtension.cs | 5 +
SS14.Launcher/SS14.Launcher.csproj | 1 +
SS14.Launcher/Theme/ThemeServerList.axaml | 131 +++++++----------
.../MainWindowTabs/ServerEntryViewModel.cs | 4 +
SS14.Launcher/Views/MainWindow.xaml | 2 +-
SS14.Launcher/Views/MainWindowContent.xaml | 2 +-
.../Views/MainWindowTabs/HomePageView.xaml | 9 +-
.../Views/MainWindowTabs/ServerEntryView.xaml | 136 +++++++-----------
.../Views/MainWindowTabs/ServerList.xaml | 67 +++++++++
.../Views/MainWindowTabs/ServerList.xaml.cs | 72 ++++++----
SS14.Launcher/Views/RowSideAlignedPanel.cs | 9 +-
14 files changed, 238 insertions(+), 206 deletions(-)
create mode 100644 SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 80adcd584..9b0286a42 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -20,6 +20,7 @@
+
diff --git a/SS14.Launcher/App.xaml b/SS14.Launcher/App.xaml
index 07ee32fde..fd15fe1f8 100644
--- a/SS14.Launcher/App.xaml
+++ b/SS14.Launcher/App.xaml
@@ -23,10 +23,11 @@
-
+
+
diff --git a/SS14.Launcher/App.xaml.cs b/SS14.Launcher/App.xaml.cs
index c8fdd5065..fc70d3b6c 100644
--- a/SS14.Launcher/App.xaml.cs
+++ b/SS14.Launcher/App.xaml.cs
@@ -48,7 +48,7 @@ public App(OverrideAssetsManager overrideAssets)
public override void Initialize()
{
- this.EnableHotReload();
+ //this.EnableHotReload();
AvaloniaXamlLoader.Load(this);
LoadBaseAssets();
diff --git a/SS14.Launcher/Localization/LocExtension.cs b/SS14.Launcher/Localization/LocExtension.cs
index 4b3e80567..82e0149af 100644
--- a/SS14.Launcher/Localization/LocExtension.cs
+++ b/SS14.Launcher/Localization/LocExtension.cs
@@ -14,6 +14,11 @@ public LocExtension(string key)
public object ProvideValue(IServiceProvider services)
{
+ if (Key == "server-entry-connect")
+ {
+ return "Connect!";
+ }
+
var locMgr = Locator.Current.GetService()!;
return locMgr.GetString(Key);
}
diff --git a/SS14.Launcher/SS14.Launcher.csproj b/SS14.Launcher/SS14.Launcher.csproj
index 009ee3a00..f3f783d5f 100644
--- a/SS14.Launcher/SS14.Launcher.csproj
+++ b/SS14.Launcher/SS14.Launcher.csproj
@@ -51,6 +51,7 @@
+
diff --git a/SS14.Launcher/Theme/ThemeServerList.axaml b/SS14.Launcher/Theme/ThemeServerList.axaml
index 6298c42ec..04abb56d2 100644
--- a/SS14.Launcher/Theme/ThemeServerList.axaml
+++ b/SS14.Launcher/Theme/ThemeServerList.axaml
@@ -2,23 +2,60 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:loc="clr-namespace:SS14.Launcher.Localization"
xmlns:views="using:SS14.Launcher.Views"
- xmlns:mwt="using:SS14.Launcher.Views.MainWindowTabs">
-
+ xmlns:mwt="using:SS14.Launcher.Views.MainWindowTabs"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:models="clr-namespace:SS14.Launcher.Models"
+ xmlns:vm="clr-namespace:SS14.Launcher.ViewModels.MainWindowTabs"
+ xmlns:controls="clr-namespace:SS14.Launcher.Controls"
+ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
diff --git a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
index 2d6975713..8d9e18921 100644
--- a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
+++ b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
@@ -27,6 +27,8 @@ public ServerEntryViewModel(MainWindowViewModel windowVm, ServerStatusData cache
_windowVm = windowVm;
_cacheData = cacheData;
_serverSource = serverSource;
+
+ _cacheData.PropertyChanged += OnCacheDataOnPropertyChanged;
}
public ServerEntryViewModel(
@@ -38,6 +40,8 @@ public ServerEntryViewModel(
: this(windowVm, cacheData, serverSource, cfg)
{
Favorite = favorite;
+
+ _cacheData.PropertyChanged += OnCacheDataOnPropertyChanged;
}
public ServerEntryViewModel(
diff --git a/SS14.Launcher/Views/MainWindow.xaml b/SS14.Launcher/Views/MainWindow.xaml
index da4ebe952..9c09ab757 100644
--- a/SS14.Launcher/Views/MainWindow.xaml
+++ b/SS14.Launcher/Views/MainWindow.xaml
@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:views="clr-namespace:SS14.Launcher.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- MinWidth="800" MinHeight="500"
+ MinWidth="1" MinHeight="500"
Width="650" Height="400"
x:Class="SS14.Launcher.Views.MainWindow"
Icon="{DynamicResource WindowIcon}"
diff --git a/SS14.Launcher/Views/MainWindowContent.xaml b/SS14.Launcher/Views/MainWindowContent.xaml
index b14b5e3a4..2e718e996 100644
--- a/SS14.Launcher/Views/MainWindowContent.xaml
+++ b/SS14.Launcher/Views/MainWindowContent.xaml
@@ -53,7 +53,7 @@
+ SelectedIndex="{Binding SelectedIndex,Mode=TwoWay}">
diff --git a/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml b/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
index 7a1f56785..573ff775d 100644
--- a/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
@@ -14,7 +14,7 @@
-
+
@@ -36,10 +36,13 @@
-
+
-
+
+
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerEntryView.xaml b/SS14.Launcher/Views/MainWindowTabs/ServerEntryView.xaml
index bf3aec63a..704dae9ab 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerEntryView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerEntryView.xaml
@@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mainWindowTabs="clr-namespace:SS14.Launcher.ViewModels.MainWindowTabs"
xmlns:models="clr-namespace:SS14.Launcher.Models"
- xmlns:controls="clr-namespace:SS14.Launcher.Controls"
xmlns:views="clr-namespace:SS14.Launcher.Views"
xmlns:loc="clr-namespace:SS14.Launcher.Localization"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@@ -13,95 +12,60 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
new file mode 100644
index 000000000..9c752383d
--- /dev/null
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs
index fd611416e..d8bf2a147 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs
@@ -1,16 +1,48 @@
using System;
+using System.Collections;
using Avalonia;
-using Avalonia.Controls.Primitives;
-using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
using Avalonia.Controls;
-using Avalonia.Metadata;
-using Serilog;
+using Avalonia.Controls.Presenters;
+using Avalonia.LogicalTree;
using SS14.Launcher.ViewModels.MainWindowTabs;
namespace SS14.Launcher.Views.MainWindowTabs;
-public sealed partial class ServerList : TemplatedControl
+public sealed partial class ServerList : UserControl
{
+ public ServerList()
+ {
+ InitializeComponent();
+
+ MyDataGrid.PointerReleased += (sender, args) =>
+ {
+ if (sender is not DataGrid)
+ {
+ Console.WriteLine(sender);
+ MyDataGrid.SelectedItem = null;
+ }
+ else
+ {
+ Console.WriteLine(sender);
+ }
+ };
+
+ MyDataGrid.SelectionChanged += (_, args) =>
+ {
+ foreach (ServerEntryViewModel rem in args.RemovedItems)
+ {
+ rem.IsExpanded = false;
+ }
+
+ foreach (ServerEntryViewModel add in args.AddedItems)
+ {
+ add.IsExpanded = true;
+ }
+ };
+ }
+
public static readonly DirectProperty ShowHeaderProperty =
AvaloniaProperty.RegisterDirect(
nameof(ShowHeader),
@@ -60,32 +92,12 @@ public bool SpinnerVisible
set => SetAndRaise(SpinnerVisibleProperty, ref _spinnerVisible, value);
}
- public static readonly DirectProperty> ListProperty =
- AvaloniaProperty.RegisterDirect>(
- nameof(List),
- o => o.List,
- (o, v) => o.List = v
- );
-
- private IReadOnlyCollection _serverList = Array.Empty();
-
- public IReadOnlyCollection List
- {
- get => _serverList;
- set => SetAndRaise(ListProperty, ref _serverList, value);
- }
-
- public static readonly StyledProperty ContentProperty =
- ContentControl.ContentProperty.AddOwner();
+ public static readonly StyledProperty ListProperty =
+ AvaloniaProperty.Register(nameof(List));
- ///
- /// If an optional content block is provided it will be
- /// shown at the bottom of the server list.
- ///
- [Content]
- public object? Content
+ public IEnumerable List
{
- get => GetValue(ContentProperty);
- set => SetValue(ContentProperty, value);
+ get => MyDataGrid.ItemsSource;
+ set => MyDataGrid.ItemsSource = value;
}
}
diff --git a/SS14.Launcher/Views/RowSideAlignedPanel.cs b/SS14.Launcher/Views/RowSideAlignedPanel.cs
index ba1c12dd4..8626f3e6c 100644
--- a/SS14.Launcher/Views/RowSideAlignedPanel.cs
+++ b/SS14.Launcher/Views/RowSideAlignedPanel.cs
@@ -48,16 +48,17 @@ protected override Size ArrangeOverride(Size finalSize)
// They both fit on one row, easy.
left.Arrange(new Rect(0, 0, leftSize.Width, finalSize.Height));
right.Arrange(new Rect(finalSize.Width - rightSize.Width, 0, rightSize.Width, finalSize.Height));
-
- return finalSize;
}
else
{
// They don't fit on the same row, make two rows.
left.Arrange(new Rect(0, 0, leftSize.Width, leftSize.Height));
- right.Arrange(new Rect(finalSize.Width - rightSize.Width, leftSize.Height, rightSize.Width, finalSize.Height - leftSize.Height));
- return finalSize;
+ var rect = new Rect(finalSize.Width - rightSize.Width, leftSize.Height, rightSize.Width,
+ Math.Max(finalSize.Height - leftSize.Height, 0));
+ right.Arrange(rect);
}
+
+ return finalSize;
}
}
From 0d410084af8eb4747f5ca38deb7d6d9ccb62eb62 Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sun, 14 Sep 2025 22:13:29 +0200
Subject: [PATCH 02/11] WIP 3
---
SS14.Launcher/App.xaml | 1 -
SS14.Launcher/Assets/Locale/de/text.ftl | 2 +-
SS14.Launcher/Assets/Locale/el/text.ftl | 8 +-
SS14.Launcher/Assets/Locale/en-US/text.ftl | 7 +-
SS14.Launcher/Assets/Locale/es/text.ftl | 2 +-
SS14.Launcher/Assets/Locale/et/text.ftl | 2 +-
SS14.Launcher/Assets/Locale/fi/text.ftl | 2 +-
SS14.Launcher/Assets/Locale/fr/text.ftl | 2 +-
SS14.Launcher/Assets/Locale/ja/text.ftl | 2 +-
SS14.Launcher/Assets/Locale/nb_NO/text.ftl | 2 +-
SS14.Launcher/Assets/Locale/nl/text.ftl | 8 +-
SS14.Launcher/Assets/Locale/pl/text.ftl | 8 +-
SS14.Launcher/Assets/Locale/pt_BR/text.ftl | 2 +-
SS14.Launcher/Assets/Locale/ru/text.ftl | 8 +-
SS14.Launcher/Assets/Locale/sv/text.ftl | 2 +-
SS14.Launcher/Assets/Locale/tr/text.ftl | 8 +-
SS14.Launcher/Assets/Locale/uk/text.ftl | 8 +-
SS14.Launcher/Assets/Locale/zh_Hans/text.ftl | 8 +-
SS14.Launcher/Controls/TimerTextCell.xaml.cs | 94 -------------------
SS14.Launcher/SS14.Launcher.csproj | 2 +-
SS14.Launcher/Theme/ThemeServerList.axaml | 27 +-----
SS14.Launcher/Theme/ThemeTimerTextCell.xaml | 13 ---
.../MainWindowTabs/ServerEntryViewModel.cs | 33 ++++++-
.../Views/MainWindowTabs/ServerList.xaml | 41 ++++----
.../Views/MainWindowTabs/ServerList.xaml.cs | 24 +----
25 files changed, 75 insertions(+), 241 deletions(-)
delete mode 100644 SS14.Launcher/Controls/TimerTextCell.xaml.cs
delete mode 100644 SS14.Launcher/Theme/ThemeTimerTextCell.xaml
diff --git a/SS14.Launcher/App.xaml b/SS14.Launcher/App.xaml
index fd15fe1f8..591f4cc3b 100644
--- a/SS14.Launcher/App.xaml
+++ b/SS14.Launcher/App.xaml
@@ -26,7 +26,6 @@
-
diff --git a/SS14.Launcher/Assets/Locale/de/text.ftl b/SS14.Launcher/Assets/Locale/de/text.ftl
index 36ca6b867..18672d13b 100644
--- a/SS14.Launcher/Assets/Locale/de/text.ftl
+++ b/SS14.Launcher/Assets/Locale/de/text.ftl
@@ -417,7 +417,7 @@ tab-development-enable-engine-override = Engine-Override aktivieren
# Strings for the "home" tab
tab-home-title = Home
# Strings for the "home" tab
-tab-home-favorite-servers = Favoriten:
+tab-home-favorite-servers = Favoriten
# Strings for the "home" tab
tab-home-add-favorite = Favorit hinzufügen…
# Strings for the "home" tab
diff --git a/SS14.Launcher/Assets/Locale/el/text.ftl b/SS14.Launcher/Assets/Locale/el/text.ftl
index db2351312..b90a9b4e7 100644
--- a/SS14.Launcher/Assets/Locale/el/text.ftl
+++ b/SS14.Launcher/Assets/Locale/el/text.ftl
@@ -45,7 +45,7 @@ login-errors-button-ok = Οκ
# Strings for the "login expired" view on login
login-expired-button-forgot-password = Ξέχασες τον κωδικό σου;
# Strings for the "home" tab
-tab-home-favorite-servers = Αγαπημένοι διακομιστές:
+tab-home-favorite-servers = Αγαπημένοι διακομιστές
# Localization for the "add favorite server" dialog window
# 'Example' name shown as a watermark in the name input box
add-favorite-window-example-name = Διαστημικός Σταθμός Χονκ
@@ -542,8 +542,4 @@ connecting-privacy-policy-decline = Δεν αποδέχομαι (αποσύνδ
tab-servers-table-round-time = Χρόνος
server-entry-status-lobby = Λόμπι
connecting-status-update-error-unknown = Άγνωστο
-server-entry-round-time =
- { $hours ->
- [0] { $mins }M
- *[1] { $hours }H { $mins }M
- }
+server-entry-round-time = { $hours }h { $mins }m
diff --git a/SS14.Launcher/Assets/Locale/en-US/text.ftl b/SS14.Launcher/Assets/Locale/en-US/text.ftl
index 14cc943a4..5eabc0be2 100644
--- a/SS14.Launcher/Assets/Locale/en-US/text.ftl
+++ b/SS14.Launcher/Assets/Locale/en-US/text.ftl
@@ -283,10 +283,7 @@ server-entry-player-count =
[0] ∞
*[1] { $max }
}
-server-entry-round-time = { $hours ->
- [0] { $mins }M
-*[1] { $hours }H { $mins }M
-}
+server-entry-round-time = { $hours }h { $mins }m
server-entry-fetching = Fetching…
server-entry-description-offline = Unable to contact server
server-entry-description-fetching = Fetching server status…
@@ -309,7 +306,7 @@ tab-development-enable-engine-override-desc = Override path to load engine zips
## Strings for the "home" tab
tab-home-title = Home
-tab-home-favorite-servers = Favorite Servers:
+tab-home-favorite-servers = Favorite Servers
tab-home-add-favorite = Add Favorite…
tab-home-refresh = Refresh
tab-home-direct-connect = Direct Connect To Server…
diff --git a/SS14.Launcher/Assets/Locale/es/text.ftl b/SS14.Launcher/Assets/Locale/es/text.ftl
index b7f2c4404..b16c7d824 100644
--- a/SS14.Launcher/Assets/Locale/es/text.ftl
+++ b/SS14.Launcher/Assets/Locale/es/text.ftl
@@ -454,7 +454,7 @@ tab-development-enable-engine-override-desc = Sobrescribir ruta para cargar zips
# Strings for the "home" tab
tab-home-title = Inicio
# Strings for the "home" tab
-tab-home-favorite-servers = Servidores Favoritos:
+tab-home-favorite-servers = Servidores Favoritos
# Strings for the "home" tab
tab-home-add-favorite = Añadir favorito…
# Strings for the "home" tab
diff --git a/SS14.Launcher/Assets/Locale/et/text.ftl b/SS14.Launcher/Assets/Locale/et/text.ftl
index c2b20a376..603fa93a5 100644
--- a/SS14.Launcher/Assets/Locale/et/text.ftl
+++ b/SS14.Launcher/Assets/Locale/et/text.ftl
@@ -388,7 +388,7 @@ tab-development-enable-engine-override = Luba engine override
# Strings for the "home" tab
tab-home-title = Avaleht
# Strings for the "home" tab
-tab-home-favorite-servers = Lemmikserverid:
+tab-home-favorite-servers = Lemmikserverid
# Strings for the "home" tab
tab-home-add-favorite = Lisa Lemmik…
# Strings for the "home" tab
diff --git a/SS14.Launcher/Assets/Locale/fi/text.ftl b/SS14.Launcher/Assets/Locale/fi/text.ftl
index 4522ec112..363cf1f07 100644
--- a/SS14.Launcher/Assets/Locale/fi/text.ftl
+++ b/SS14.Launcher/Assets/Locale/fi/text.ftl
@@ -326,7 +326,7 @@ server-entry-fetching = Noudetaan…
# Strings for the "home" tab
tab-home-title = Koti
# Strings for the "home" tab
-tab-home-favorite-servers = Suosikkipalvelimet:
+tab-home-favorite-servers = Suosikkipalvelimet
# Strings for the "home" tab
tab-home-add-favorite = Lisää suosikki…
# Strings for the "home" tab
diff --git a/SS14.Launcher/Assets/Locale/fr/text.ftl b/SS14.Launcher/Assets/Locale/fr/text.ftl
index 9599ac99b..c81200615 100644
--- a/SS14.Launcher/Assets/Locale/fr/text.ftl
+++ b/SS14.Launcher/Assets/Locale/fr/text.ftl
@@ -380,7 +380,7 @@ tab-options-account-settings = Paramètres du compte
# Strings for the "options" tab
tab-options-account-settings-desc = Vous pouvez gérer les paramètres de votre compte, tels que la modification de votre adresse mail ou de votre mot de passe, via notre site internet.
# Strings for the "home" tab
-tab-home-favorite-servers = Serveurs Favoris:
+tab-home-favorite-servers = Serveurs Favoris
# Strings for the "options" tab
tab-options-log-launcher-desc = Active l'historique d'activité du launcher. Utile pour les développeurs. (nécessite de redémarrer le launcher)
# Strings for the "news" tab
diff --git a/SS14.Launcher/Assets/Locale/ja/text.ftl b/SS14.Launcher/Assets/Locale/ja/text.ftl
index 285e66b7a..3a4d398a1 100644
--- a/SS14.Launcher/Assets/Locale/ja/text.ftl
+++ b/SS14.Launcher/Assets/Locale/ja/text.ftl
@@ -202,7 +202,7 @@ tab-development-title-override = { "[" }DEV (オーバーライドが有効だ!)
tab-development-disable-signing = エンジンシグネチャーチェックを無効にする
tab-development-enable-engine-override = エンジン・オーバーライドを有効にする
tab-development-enable-engine-override-desc = エンジン zip をロードするためのパスをオーバーライドします (release/ in RobustToolbox)
-tab-home-favorite-servers = 愛用のサーバー：
+tab-home-favorite-servers = 愛用のサーバー
tab-home-add-favorite = 愛用に追加…
tab-home-direct-connect = サーバーへの直接接続…
tab-home-go-to-servers-tab = サーバータブに移動
diff --git a/SS14.Launcher/Assets/Locale/nb_NO/text.ftl b/SS14.Launcher/Assets/Locale/nb_NO/text.ftl
index 314522f48..5c21cda76 100644
--- a/SS14.Launcher/Assets/Locale/nb_NO/text.ftl
+++ b/SS14.Launcher/Assets/Locale/nb_NO/text.ftl
@@ -188,7 +188,7 @@ tab-development-disable-signing = Deaktiver motorsignatursjekker
tab-development-disable-signing-desc = { "[" }DEV ONLY] Deaktiver verdifisering av motorsignatursjekker. IKKE AKTIVER MED MINDRE DU VET EKSAKT HVA DU GJØR.
tab-development-enable-engine-override = Aktiver motoroverstyring
tab-home-title = Hjem
-tab-home-favorite-servers = Favorittservere:
+tab-home-favorite-servers = Favorittservere
tab-home-add-favorite = Legg til Favoritter…
tab-home-direct-connect = Koble direkte til Server…
tab-home-run-content-bundle = Kjør innholdspakke/gjenspilling
diff --git a/SS14.Launcher/Assets/Locale/nl/text.ftl b/SS14.Launcher/Assets/Locale/nl/text.ftl
index 7d27c132c..711857d33 100644
--- a/SS14.Launcher/Assets/Locale/nl/text.ftl
+++ b/SS14.Launcher/Assets/Locale/nl/text.ftl
@@ -464,7 +464,7 @@ tab-home-favorites-guide = Markeer servers als favoriet om ze hier snel te berei
# Strings for the "news" tab
tab-news-title = Nieuws
# Strings for the "home" tab
-tab-home-favorite-servers = Favoriete servers:
+tab-home-favorite-servers = Favoriete servers
# Strings for the "home" tab
tab-home-add-favorite = Voeg favoriet toe…
# Strings for the "home" tab
@@ -540,10 +540,6 @@ connecting-privacy-policy-view = Bekijk privacybeleid
connecting-privacy-policy-accept = Accepteer (doorgaan)
connecting-privacy-policy-decline = Weigeren (verbreken)
tab-servers-table-round-time = Tijd
-server-entry-round-time =
- { $hours ->
- [0] { $mins }M
- *[1] { $hours }U { $mins }M
- }
+server-entry-round-time = { $hours }u { $mins }m
server-entry-status-lobby = Lobby
connecting-status-update-error-unknown = Onbekend
diff --git a/SS14.Launcher/Assets/Locale/pl/text.ftl b/SS14.Launcher/Assets/Locale/pl/text.ftl
index ce0589b8d..897a8a892 100644
--- a/SS14.Launcher/Assets/Locale/pl/text.ftl
+++ b/SS14.Launcher/Assets/Locale/pl/text.ftl
@@ -369,7 +369,7 @@ server-entry-description-fetching = Pobieranie statusu serwera…
# Short region names for server tag filters (shown in filter check box)
region-short-europe-west = Europa Zachodnia
# Strings for the "home" tab
-tab-home-favorite-servers = Ulubione serwery:
+tab-home-favorite-servers = Ulubione serwery
# Strings for the "home" tab
tab-home-title = Strona główna
# Strings for the "Development" tab
@@ -539,11 +539,7 @@ connecting-status-update-error-unknown = Nieznany
server-entry-status-lobby = Menu
connecting-privacy-policy-text = Ten serwer wymaga zaakceptowania swojej polityki prywatności przed połączeniem.
tab-servers-table-round-time = Czas
-server-entry-round-time =
- { $hours ->
- [0] { $mins }M
- *[1] { $hours }G { $mins }M
- }
+server-entry-round-time = { $hours }g { $mins }m
connecting-privacy-policy-text-version-changed = Ten serwer zaktualizował swoją politykę prywatności od twojej ostatniej rozgrywki. Musisz zaakceptować nową wersję przed połączeniem.
connecting-privacy-policy-view = Pokaż politykę prywatności
connecting-privacy-policy-accept = Zaakceptuj (kontynuuj)
diff --git a/SS14.Launcher/Assets/Locale/pt_BR/text.ftl b/SS14.Launcher/Assets/Locale/pt_BR/text.ftl
index 582090dca..c10699b41 100644
--- a/SS14.Launcher/Assets/Locale/pt_BR/text.ftl
+++ b/SS14.Launcher/Assets/Locale/pt_BR/text.ftl
@@ -455,7 +455,7 @@ server-entry-player-count =
# Strings for the "home" tab
tab-home-title = Página Inicial
# Strings for the "home" tab
-tab-home-favorite-servers = Servidores Favoritos:
+tab-home-favorite-servers = Servidores Favoritos
# Strings for the "home" tab
tab-home-add-favorite = Adicionar Favorito…
# Strings for the "home" tab
diff --git a/SS14.Launcher/Assets/Locale/ru/text.ftl b/SS14.Launcher/Assets/Locale/ru/text.ftl
index bcde946d0..31b18d532 100644
--- a/SS14.Launcher/Assets/Locale/ru/text.ftl
+++ b/SS14.Launcher/Assets/Locale/ru/text.ftl
@@ -399,7 +399,7 @@ tab-development-title = { "[" }DEV]
# Strings for the "home" tab
tab-home-title = Главная
# Strings for the "home" tab
-tab-home-favorite-servers = Избранные серверы:
+tab-home-favorite-servers = Избранные серверы
# Strings for the "home" tab
tab-home-add-favorite = Добавить в избранное…
# Strings for the "home" tab
@@ -536,11 +536,7 @@ connecting-privacy-policy-text = Этот сервер требует чтобы
connecting-privacy-policy-view = Посмотреть политику конфиденциальности
connecting-privacy-policy-accept = Принять (продолжить)
connecting-privacy-policy-decline = Отклонить (отключиться)
-server-entry-round-time =
- { $hours ->
- [0] { $mins }м
- *[1] { $hours }ч { $mins }м
- }
+server-entry-round-time = { $hours }ч { $mins }м
tab-servers-table-round-time = Время
connecting-status-update-error-unknown = Неизвестно
server-entry-status-lobby = Лобби
diff --git a/SS14.Launcher/Assets/Locale/sv/text.ftl b/SS14.Launcher/Assets/Locale/sv/text.ftl
index 1cb59155d..51a70917d 100644
--- a/SS14.Launcher/Assets/Locale/sv/text.ftl
+++ b/SS14.Launcher/Assets/Locale/sv/text.ftl
@@ -437,7 +437,7 @@ tab-development-title-override = { "[" }DEV (override aktiv!!!)]
# These aren't shown to users so they're not very important
tab-development-enable-engine-override = Aktivera spelmotor-override
# Strings for the "home" tab
-tab-home-favorite-servers = Favoritservrar:
+tab-home-favorite-servers = Favoritservrar
# Strings for the "home" tab
tab-home-add-favorite = Lägg till favorit…
# Strings for the "home" tab
diff --git a/SS14.Launcher/Assets/Locale/tr/text.ftl b/SS14.Launcher/Assets/Locale/tr/text.ftl
index d993f250f..f303f2492 100644
--- a/SS14.Launcher/Assets/Locale/tr/text.ftl
+++ b/SS14.Launcher/Assets/Locale/tr/text.ftl
@@ -296,7 +296,7 @@ tab-development-title = { "[" }DEV]
# Strings for the "home" tab
tab-home-title = Ev
# Strings for the "home" tab
-tab-home-favorite-servers = Favori sunucular:
+tab-home-favorite-servers = Favori sunucular
# Strings for the "home" tab
tab-home-refresh = Yenile
# Strings for the "home" tab
@@ -537,9 +537,5 @@ connecting-privacy-policy-text-version-changed = Bu sunucu son oynadığınızda
connecting-privacy-policy-accept = Kabul et (devam et)
connecting-privacy-policy-decline = Reddet (bağlantıyı kes)
tab-servers-table-round-time = Zaman
-server-entry-round-time =
- { $hours ->
- [0] { $mins }M
- *[1] { $hours }H { $mins }M
- }
+server-entry-round-time = { $hours }h { $mins }m
server-entry-status-lobby = Lobi
diff --git a/SS14.Launcher/Assets/Locale/uk/text.ftl b/SS14.Launcher/Assets/Locale/uk/text.ftl
index 0dcd23311..f3825d54a 100644
--- a/SS14.Launcher/Assets/Locale/uk/text.ftl
+++ b/SS14.Launcher/Assets/Locale/uk/text.ftl
@@ -447,7 +447,7 @@ tab-development-title = { "[" }DEV]
# Strings for the "home" tab
tab-home-title = Головна
# Strings for the "home" tab
-tab-home-favorite-servers = Обрані сервери:
+tab-home-favorite-servers = Обрані сервери
# Strings for the "home" tab
tab-home-add-favorite = Додати в обрані…
# Strings for the "home" tab
@@ -536,11 +536,7 @@ connecting-privacy-policy-text-version-changed = Цей сервер онови
connecting-privacy-policy-view = Переглянути політику конфіденційності
connecting-privacy-policy-accept = Прийняти (продовжити)
connecting-privacy-policy-decline = Відхилити (відключитися)
-server-entry-round-time =
- { $hours ->
- [0] { $mins }хв
- *[1] { $hours }г { $mins }хв
- }
+server-entry-round-time = { $hours }г { $mins }хв
tab-servers-table-round-time = Час
server-entry-status-lobby = Лоббі
connecting-status-update-error-unknown = Невідомо
diff --git a/SS14.Launcher/Assets/Locale/zh_Hans/text.ftl b/SS14.Launcher/Assets/Locale/zh_Hans/text.ftl
index 259880480..e346bbc7b 100644
--- a/SS14.Launcher/Assets/Locale/zh_Hans/text.ftl
+++ b/SS14.Launcher/Assets/Locale/zh_Hans/text.ftl
@@ -378,7 +378,7 @@ tab-development-enable-engine-override = 启用引擎覆盖
# Strings for the "home" tab
tab-home-title = 首页
# Strings for the "home" tab
-tab-home-favorite-servers = 收藏服务器：
+tab-home-favorite-servers = 收藏服务器
# Strings for the "home" tab
tab-home-add-favorite = 添加到收藏…
# Strings for the "home" tab
@@ -539,11 +539,7 @@ connecting-privacy-policy-view = 查看隐私条款
connecting-privacy-policy-accept = 同意（继续）
connecting-privacy-policy-decline = 拒绝（断开连接）
login-login-show-password = 显示密码
-server-entry-round-time =
- { $hours ->
- [0] { $mins }分
- *[1] { $hours }时 { $mins }分
- }
+server-entry-round-time = { $hours }时 { $mins }分
connecting-status-update-error-unknown = 未知
tab-servers-table-round-time = 时间
server-entry-status-lobby = 大厅
diff --git a/SS14.Launcher/Controls/TimerTextCell.xaml.cs b/SS14.Launcher/Controls/TimerTextCell.xaml.cs
deleted file mode 100644
index a514bc23e..000000000
--- a/SS14.Launcher/Controls/TimerTextCell.xaml.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using Avalonia;
-using Avalonia.Controls.Primitives;
-using Avalonia.Threading;
-using SS14.Launcher.Localization;
-
-namespace SS14.Launcher.Controls;
-
-public class TimerTextCell : TemplatedControl
-{
- private readonly LocalizationManager _loc = LocalizationManager.Instance;
-
- public static readonly DirectProperty ValueProperty =
- AvaloniaProperty.RegisterDirect(
- nameof(Value),
- o => o.Value,
- (o, v) => o.Value = v
- );
-
- public static readonly DirectProperty TextProperty =
- AvaloniaProperty.RegisterDirect(
- nameof(Text),
- o => o.Text,
- (o, v) => o.Text = v
- );
-
- private DateTime? _value;
- private bool _attached;
-
- public DateTime? Value
- {
- get => _value;
- set => SetAndRaise(ValueProperty, ref _value, value);
- }
-
- private string _text = "";
-
- public string Text
- {
- get => _text;
- set => SetAndRaise(TextProperty, ref _text, value);
- }
-
- private IDisposable? _timer;
-
- protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
- {
- base.OnPropertyChanged(change);
-
- if (change.Property == ValueProperty)
- {
- UpdateText();
- }
- }
-
- protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
- {
- _attached = true;
- StartTimer();
- }
-
- protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
- {
- _attached = false;
- _timer?.Dispose();
- }
-
- // Trigger an update when the visible timer will roll over to the next minute
- private void StartTimer()
- {
- _timer?.Dispose();
-
- // Only start a new timer if we have a DateTime
- // and we’re on the visual tree.
- if (_attached && Value is { } dt)
- {
- var ts = DateTime.UtcNow.Subtract(dt);
- _timer = DispatcherTimer.RunOnce(UpdateText, TimeSpan.FromSeconds((ts.Seconds >= 0 ? ts.Seconds : 60)));
- }
- }
-
- private void UpdateText()
- {
- this.Text = Value is { } dt ? GetTimeStringSince(dt) : "";
- StartTimer();
- }
-
- private string GetTimeStringSince(DateTime dateTime)
- {
- var ts = DateTime.UtcNow.Subtract(dateTime);
- return _loc.GetString("server-entry-round-time", ("hours", ts.Hours),
- ("mins", ts.Minutes.ToString().PadLeft(2, '0')));
- }
-}
diff --git a/SS14.Launcher/SS14.Launcher.csproj b/SS14.Launcher/SS14.Launcher.csproj
index f3f783d5f..850fe8021 100644
--- a/SS14.Launcher/SS14.Launcher.csproj
+++ b/SS14.Launcher/SS14.Launcher.csproj
@@ -53,7 +53,7 @@
-
+
diff --git a/SS14.Launcher/Theme/ThemeServerList.axaml b/SS14.Launcher/Theme/ThemeServerList.axaml
index 04abb56d2..2e9962d78 100644
--- a/SS14.Launcher/Theme/ThemeServerList.axaml
+++ b/SS14.Launcher/Theme/ThemeServerList.axaml
@@ -1,26 +1,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SS14.Launcher/Theme/ThemeTimerTextCell.xaml b/SS14.Launcher/Theme/ThemeTimerTextCell.xaml
deleted file mode 100644
index a1462e4b0..000000000
--- a/SS14.Launcher/Theme/ThemeTimerTextCell.xaml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
diff --git a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
index 8d9e18921..974f1e129 100644
--- a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
+++ b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
@@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
+using Avalonia.Threading;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.Toolkit.Mvvm.Messaging;
using SS14.Launcher.Localization;
@@ -20,6 +21,8 @@ public sealed class ServerEntryViewModel : ObservableRecipient, IRecipient OnPropertyChanged(nameof(RoundStatusString));
}
public ServerEntryViewModel(
@@ -108,15 +114,32 @@ public string ServerStatusString
// Give a ratio for servers with a defined player count, or just a current number for those without.
public string PlayerCountString =>
_loc.GetString("server-entry-player-count",
- ("players", _cacheData.PlayerCount), ("max", _cacheData.SoftMaxPlayerCount));
+ ("players", _cacheData.PlayerCount.ToString().PadLeft(3)),
+ ("max", _cacheData.SoftMaxPlayerCount.ToString().PadRight(3)));
public DateTime? RoundStartTime => _cacheData.RoundStartTime;
- public string RoundStatusString =>
- _cacheData.RoundStatus == GameRoundStatus.InLobby
- ? _loc.GetString("server-entry-status-lobby")
- : "";
+ public string RoundStatusString
+ {
+ get
+ {
+ switch (_cacheData.RoundStatus)
+ {
+ case GameRoundStatus.InLobby:
+ return _loc.GetString("server-entry-status-lobby");
+ case GameRoundStatus.InRound when RoundStartTime is { } start:
+ {
+ var ts = DateTime.UtcNow.Subtract(start);
+ return _loc.GetString("server-entry-round-time", ("hours", ts.Hours),
+ ("mins", ts.Minutes.ToString().PadLeft(2, '0')));
+ }
+ case GameRoundStatus.Unknown:
+ default:
+ return "";
+ }
+ }
+ }
public string Description
{
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
index 9c752383d..42ee57568 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
@@ -4,12 +4,12 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:SS14.Launcher.ViewModels.MainWindowTabs"
xmlns:views="clr-namespace:SS14.Launcher.Views.MainWindowTabs"
+ xmlns:loc="clr-namespace:SS14.Launcher.Localization"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SS14.Launcher.Views.MainWindowTabs.ServerList">
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+ Header="Players"
+ Width="80">
+
+
+
+
+
+
+
-
-
-
-
-
-
+
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs
index d8bf2a147..66df64a15 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs
@@ -1,11 +1,6 @@
-using System;
using System.Collections;
using Avalonia;
-using System.Collections.ObjectModel;
-using System.Linq;
using Avalonia.Controls;
-using Avalonia.Controls.Presenters;
-using Avalonia.LogicalTree;
using SS14.Launcher.ViewModels.MainWindowTabs;
namespace SS14.Launcher.Views.MainWindowTabs;
@@ -16,20 +11,7 @@ public ServerList()
{
InitializeComponent();
- MyDataGrid.PointerReleased += (sender, args) =>
- {
- if (sender is not DataGrid)
- {
- Console.WriteLine(sender);
- MyDataGrid.SelectedItem = null;
- }
- else
- {
- Console.WriteLine(sender);
- }
- };
-
- MyDataGrid.SelectionChanged += (_, args) =>
+ ServerGrid.SelectionChanged += (_, args) =>
{
foreach (ServerEntryViewModel rem in args.RemovedItems)
{
@@ -97,7 +79,7 @@ public bool SpinnerVisible
public IEnumerable List
{
- get => MyDataGrid.ItemsSource;
- set => MyDataGrid.ItemsSource = value;
+ get => ServerGrid.ItemsSource;
+ set => ServerGrid.ItemsSource = value;
}
}
From 9f6f83bdec725e70bac31d6b639d7dec8d48f043 Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sun, 14 Sep 2025 22:26:52 +0200
Subject: [PATCH 03/11] Cleanup
---
SS14.Launcher/App.xaml.cs | 2 +-
SS14.Launcher/Localization/LocExtension.cs | 5 -----
.../MainWindowTabs/ServerEntryViewModel.cs | 12 +++---------
SS14.Launcher/Views/MainWindow.xaml | 2 +-
SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml | 2 +-
SS14.Launcher/Views/RowSideAlignedPanel.cs | 11 ++++++-----
6 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/SS14.Launcher/App.xaml.cs b/SS14.Launcher/App.xaml.cs
index fc70d3b6c..c8fdd5065 100644
--- a/SS14.Launcher/App.xaml.cs
+++ b/SS14.Launcher/App.xaml.cs
@@ -48,7 +48,7 @@ public App(OverrideAssetsManager overrideAssets)
public override void Initialize()
{
- //this.EnableHotReload();
+ this.EnableHotReload();
AvaloniaXamlLoader.Load(this);
LoadBaseAssets();
diff --git a/SS14.Launcher/Localization/LocExtension.cs b/SS14.Launcher/Localization/LocExtension.cs
index 82e0149af..4b3e80567 100644
--- a/SS14.Launcher/Localization/LocExtension.cs
+++ b/SS14.Launcher/Localization/LocExtension.cs
@@ -14,11 +14,6 @@ public LocExtension(string key)
public object ProvideValue(IServiceProvider services)
{
- if (Key == "server-entry-connect")
- {
- return "Connect!";
- }
-
var locMgr = Locator.Current.GetService()!;
return locMgr.GetString(Key);
}
diff --git a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
index 974f1e129..5a3801080 100644
--- a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
+++ b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
@@ -21,7 +21,7 @@ public sealed class ServerEntryViewModel : ObservableRecipient, IRecipient OnPropertyChanged(nameof(RoundStatusString));
+ _refreshRoundStartTimer.Start();
+ _refreshRoundStartTimer.Tick += (_, _) => OnPropertyChanged(nameof(RoundStatusString));
}
public ServerEntryViewModel(
@@ -60,11 +60,6 @@ public ServerEntryViewModel(
FallbackName = ssdfb.FallbackName ?? "";
}
- public void Tick()
- {
- OnPropertyChanged(nameof(RoundStartTime));
- }
-
public void ConnectPressed()
{
ConnectingViewModel.StartConnect(_windowVm, Address);
@@ -134,7 +129,6 @@ public string RoundStatusString
return _loc.GetString("server-entry-round-time", ("hours", ts.Hours),
("mins", ts.Minutes.ToString().PadLeft(2, '0')));
}
- case GameRoundStatus.Unknown:
default:
return "";
}
diff --git a/SS14.Launcher/Views/MainWindow.xaml b/SS14.Launcher/Views/MainWindow.xaml
index 9c09ab757..da4ebe952 100644
--- a/SS14.Launcher/Views/MainWindow.xaml
+++ b/SS14.Launcher/Views/MainWindow.xaml
@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:views="clr-namespace:SS14.Launcher.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- MinWidth="1" MinHeight="500"
+ MinWidth="800" MinHeight="500"
Width="650" Height="400"
x:Class="SS14.Launcher.Views.MainWindow"
Icon="{DynamicResource WindowIcon}"
diff --git a/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml b/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
index 573ff775d..b474e43f5 100644
--- a/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
@@ -14,7 +14,7 @@
-
+
diff --git a/SS14.Launcher/Views/RowSideAlignedPanel.cs b/SS14.Launcher/Views/RowSideAlignedPanel.cs
index 8626f3e6c..fdde39952 100644
--- a/SS14.Launcher/Views/RowSideAlignedPanel.cs
+++ b/SS14.Launcher/Views/RowSideAlignedPanel.cs
@@ -48,17 +48,18 @@ protected override Size ArrangeOverride(Size finalSize)
// They both fit on one row, easy.
left.Arrange(new Rect(0, 0, leftSize.Width, finalSize.Height));
right.Arrange(new Rect(finalSize.Width - rightSize.Width, 0, rightSize.Width, finalSize.Height));
+
+ return finalSize;
}
else
{
// They don't fit on the same row, make two rows.
left.Arrange(new Rect(0, 0, leftSize.Width, leftSize.Height));
- var rect = new Rect(finalSize.Width - rightSize.Width, leftSize.Height, rightSize.Width,
- Math.Max(finalSize.Height - leftSize.Height, 0));
- right.Arrange(rect);
- }
+ right.Arrange(new Rect(finalSize.Width - rightSize.Width, leftSize.Height, rightSize.Width,
+ Math.Max(finalSize.Height - leftSize.Height, 0)));
- return finalSize;
+ return finalSize;
+ }
}
}
From 88545fcdc9987de88d9c6e9a9c1c49ea4e936d8a Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sun, 14 Sep 2025 22:30:14 +0200
Subject: [PATCH 04/11] a
---
SS14.Launcher/SS14.Launcher.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SS14.Launcher/SS14.Launcher.csproj b/SS14.Launcher/SS14.Launcher.csproj
index 850fe8021..f3f783d5f 100644
--- a/SS14.Launcher/SS14.Launcher.csproj
+++ b/SS14.Launcher/SS14.Launcher.csproj
@@ -53,7 +53,7 @@
-
+
From ab8807ba600da7b10ca1e4725c14aff60bc57376 Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sun, 14 Sep 2025 22:31:50 +0200
Subject: [PATCH 05/11] aaaa
---
SS14.Launcher/SS14.Launcher.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SS14.Launcher/SS14.Launcher.csproj b/SS14.Launcher/SS14.Launcher.csproj
index f3f783d5f..525835619 100644
--- a/SS14.Launcher/SS14.Launcher.csproj
+++ b/SS14.Launcher/SS14.Launcher.csproj
@@ -51,7 +51,7 @@
-
+
From eb101cb473b639895643ba6e62c55db5c4bc915c Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sun, 14 Sep 2025 22:45:55 +0200
Subject: [PATCH 06/11] Fix regression
---
SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
index 5a3801080..101a94bca 100644
--- a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
+++ b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
@@ -259,6 +259,7 @@ private void OnCacheDataOnPropertyChanged(object? _, PropertyChangedEventArgs ar
case nameof(IServerStatusData.RoundStartTime):
OnPropertyChanged(nameof(RoundStartTime));
+ OnPropertyChanged(nameof(RoundStatusString));
break;
case nameof(IServerStatusData.RoundStatus):
From ecb0583afd1de43f32e9e636a74344d000a47726 Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sun, 14 Sep 2025 22:50:00 +0200
Subject: [PATCH 07/11] We don't want search throttling anymore, the lag is
fixed
---
.../MainWindowTabs/ServerListTabViewModel.cs | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/SS14.Launcher/ViewModels/MainWindowTabs/ServerListTabViewModel.cs b/SS14.Launcher/ViewModels/MainWindowTabs/ServerListTabViewModel.cs
index bd50c08a1..96ce36718 100644
--- a/SS14.Launcher/ViewModels/MainWindowTabs/ServerListTabViewModel.cs
+++ b/SS14.Launcher/ViewModels/MainWindowTabs/ServerListTabViewModel.cs
@@ -27,11 +27,13 @@ public class ServerListTabViewModel : MainWindowTabViewModel
public string? SearchString
{
get => _searchString;
- set => this.RaiseAndSetIfChanged(ref _searchString, value);
+ set
+ {
+ this.RaiseAndSetIfChanged(ref _searchString, value);
+ UpdateSearchedList();
+ }
}
- private const int throttleMs = 200;
-
public bool SpinnerVisible => _serverListCache.Status < RefreshListStatus.Updated;
public string ListText
@@ -88,11 +90,6 @@ public ServerListTabViewModel(MainWindowViewModel windowVm)
};
_loc.LanguageSwitched += () => Filters.UpdatePresentFilters(_serverListCache.AllServers);
-
- this.WhenAnyValue(x => x.SearchString)
- .Throttle(TimeSpan.FromMilliseconds(throttleMs), RxApp.MainThreadScheduler)
- .ObserveOn(RxApp.MainThreadScheduler)
- .Subscribe(_ => UpdateSearchedList());
}
private void FiltersOnFiltersUpdated()
From 81275a41a1f0fd690975f3d66dbc525247750132 Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sun, 14 Sep 2025 22:52:31 +0200
Subject: [PATCH 08/11] Fix scrollbar
---
SS14.Launcher/Views/MainWindowTabs/ServerList.xaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
index 42ee57568..4baa9dd73 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
@@ -12,6 +12,8 @@
ItemsSource="{Binding List, RelativeSource={RelativeSource AncestorType=UserControl}}"
IsReadOnly="True"
RowDetailsVisibilityMode="VisibleWhenSelected"
+ HeadersVisibility="All"
+ HorizontalScrollBarVisibility="Disabled"
CanUserReorderColumns="True"
SelectionMode="Single"
RowHeight="30"
From db99bbc437b6c548089a671a36fad460582fe924 Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sat, 11 Oct 2025 19:39:54 +0200
Subject: [PATCH 09/11] Fix "Go to servers" button and use resource colors
---
SS14.Launcher/App.xaml | 2 +-
SS14.Launcher/Theme/Theme.xaml | 2 +-
SS14.Launcher/Theme/ThemeResources.xaml | 11 ++++++++---
SS14.Launcher/Theme/ThemeServerList.axaml | 17 +++++++++--------
.../Views/MainWindowTabs/HomePageView.xaml | 8 +++++---
5 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/SS14.Launcher/App.xaml b/SS14.Launcher/App.xaml
index 591f4cc3b..5fa52b9a1 100644
--- a/SS14.Launcher/App.xaml
+++ b/SS14.Launcher/App.xaml
@@ -9,8 +9,8 @@
-
+
diff --git a/SS14.Launcher/Theme/Theme.xaml b/SS14.Launcher/Theme/Theme.xaml
index 485a86579..b5836244d 100644
--- a/SS14.Launcher/Theme/Theme.xaml
+++ b/SS14.Launcher/Theme/Theme.xaml
@@ -39,7 +39,7 @@
diff --git a/SS14.Launcher/Theme/ThemeResources.xaml b/SS14.Launcher/Theme/ThemeResources.xaml
index d3a85b842..5d1ff1c4f 100644
--- a/SS14.Launcher/Theme/ThemeResources.xaml
+++ b/SS14.Launcher/Theme/ThemeResources.xaml
@@ -6,6 +6,9 @@
#202025
#EEEEEE
+ #1E1E22
+ #262626
+
#666
#464966
@@ -22,6 +25,8 @@
#AA575B7F
#00575B7F
+ #2E2E35
+
@@ -42,9 +47,9 @@
-
-
-
+
+
+
diff --git a/SS14.Launcher/Theme/ThemeServerList.axaml b/SS14.Launcher/Theme/ThemeServerList.axaml
index 2e9962d78..b70d042bf 100644
--- a/SS14.Launcher/Theme/ThemeServerList.axaml
+++ b/SS14.Launcher/Theme/ThemeServerList.axaml
@@ -5,20 +5,21 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450">
diff --git a/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml b/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
index cba5d5324..300a07288 100644
--- a/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
@@ -37,14 +37,16 @@
-
-
+
-
+
Date: Sat, 11 Oct 2025 20:23:06 +0200
Subject: [PATCH 10/11] Add grid lines, fix localization, fix some
margins/padding
---
SS14.Launcher/Theme/ThemeResources.xaml | 2 ++
SS14.Launcher/Theme/ThemeServerList.axaml | 7 +++-
.../Views/MainWindowTabs/ServerList.xaml | 35 +++++++++++--------
3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/SS14.Launcher/Theme/ThemeResources.xaml b/SS14.Launcher/Theme/ThemeResources.xaml
index 5d1ff1c4f..12aca0a9a 100644
--- a/SS14.Launcher/Theme/ThemeResources.xaml
+++ b/SS14.Launcher/Theme/ThemeResources.xaml
@@ -11,6 +11,7 @@
#666
+ #2E2E35
#464966
#3E6C45
@@ -32,6 +33,7 @@
+
diff --git a/SS14.Launcher/Theme/ThemeServerList.axaml b/SS14.Launcher/Theme/ThemeServerList.axaml
index b70d042bf..4871150c4 100644
--- a/SS14.Launcher/Theme/ThemeServerList.axaml
+++ b/SS14.Launcher/Theme/ThemeServerList.axaml
@@ -8,6 +8,10 @@
+
+
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
index 4baa9dd73..cd06bb6a8 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml
@@ -17,37 +17,44 @@
CanUserReorderColumns="True"
SelectionMode="Single"
RowHeight="30"
- ColumnWidth="200">
+ GridLinesVisibility="Vertical"
+ VerticalGridLinesBrush="{DynamicResource ThemeServerSeparatorColor}">
-
+ Header="{loc:Loc tab-servers-table-name}"
+ Width="*">
+
+
+
+
+
+
+
+ HorizontalAlignment="Right"
+ Padding="6 0" />
+ Header="{loc:Loc tab-servers-table-players}">
+ HorizontalAlignment="Center"
+ Padding="6 0" />
-
+
-
From 2c760dc20c35e5fac2e0dbd507d3cf1d76af0e78 Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Sun, 12 Oct 2025 04:21:48 +0200
Subject: [PATCH 11/11] =?UTF-8?q?Implement=20column=20sorting=20?=
=?UTF-8?q?=F0=9F=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Models/ServerStatus/IServerStatusData.cs | 2 -
.../ServerStatus/ServerStatusCache.Data.cs | 6 ---
.../Models/ServerStatus/ServerStatusCache.cs | 14 ++----
.../Models/ServerStatus/ServerStatusCode.cs | 31 ++++++++++--
SS14.Launcher/Theme/ThemeServerList.axaml | 1 +
.../MainWindowTabs/ServerEntryViewModel.cs | 50 ++++++++++---------
.../Views/MainWindowTabs/HomePageView.xaml | 2 +-
.../Views/MainWindowTabs/ServerList.xaml | 28 +++++------
.../Views/MainWindowTabs/ServerList.xaml.cs | 50 +++++++++++++++++--
.../MainWindowTabs/ServerListTabView.xaml | 2 +-
10 files changed, 120 insertions(+), 66 deletions(-)
diff --git a/SS14.Launcher/Models/ServerStatus/IServerStatusData.cs b/SS14.Launcher/Models/ServerStatus/IServerStatusData.cs
index 5c68ae7d8..cf6482b89 100644
--- a/SS14.Launcher/Models/ServerStatus/IServerStatusData.cs
+++ b/SS14.Launcher/Models/ServerStatus/IServerStatusData.cs
@@ -27,7 +27,5 @@ public interface IServerStatusData : INotifyPropertyChanged
int SoftMaxPlayerCount { get; set; }
- DateTime? RoundStartTime { get; set; }
-
GameRoundStatus RoundStatus { get; set; }
}
diff --git a/SS14.Launcher/Models/ServerStatus/ServerStatusCache.Data.cs b/SS14.Launcher/Models/ServerStatus/ServerStatusCache.Data.cs
index d229f3050..b4b491d33 100644
--- a/SS14.Launcher/Models/ServerStatus/ServerStatusCache.Data.cs
+++ b/SS14.Launcher/Models/ServerStatus/ServerStatusCache.Data.cs
@@ -79,12 +79,6 @@ public int SoftMaxPlayerCount
set => SetProperty(ref _softMaxPlayerCount, value);
}
- public DateTime? RoundStartTime
- {
- get => _roundStartTime;
- set => SetProperty(ref _roundStartTime, value);
- }
-
public GameRoundStatus RoundStatus
{
get => _roundStatus;
diff --git a/SS14.Launcher/Models/ServerStatus/ServerStatusCache.cs b/SS14.Launcher/Models/ServerStatus/ServerStatusCache.cs
index 89e2d4a36..678d409fd 100644
--- a/SS14.Launcher/Models/ServerStatus/ServerStatusCache.cs
+++ b/SS14.Launcher/Models/ServerStatus/ServerStatusCache.cs
@@ -128,23 +128,19 @@ public static void ApplyStatus(ServerStatusData data, ServerApi.ServerStatus sta
switch (status.RunLevel)
{
- case ServerApi.GameRunLevel.InRound:
- data.RoundStatus = GameRoundStatus.InRound;
+ case ServerApi.GameRunLevel.InRound when status.RoundStartTime is { } start:
+ var roundStartTime = DateTime.Parse(start, null, System.Globalization.DateTimeStyles.RoundtripKind);
+ data.RoundStatus = new InRound(roundStartTime);
break;
case ServerApi.GameRunLevel.PostRound:
case ServerApi.GameRunLevel.PreRoundLobby:
- data.RoundStatus = GameRoundStatus.InLobby;
+ data.RoundStatus = new InLobby();
break;
default:
- data.RoundStatus = GameRoundStatus.Unknown;
+ data.RoundStatus = new Unknown();
break;
}
- if (status.RoundStartTime != null)
- {
- data.RoundStartTime = DateTime.Parse(status.RoundStartTime, null, System.Globalization.DateTimeStyles.RoundtripKind);
- }
-
var baseTags = status.Tags ?? Array.Empty();
var inferredTags = ServerTagInfer.InferTags(status);
diff --git a/SS14.Launcher/Models/ServerStatus/ServerStatusCode.cs b/SS14.Launcher/Models/ServerStatus/ServerStatusCode.cs
index 02ace1844..2df78027b 100644
--- a/SS14.Launcher/Models/ServerStatus/ServerStatusCode.cs
+++ b/SS14.Launcher/Models/ServerStatus/ServerStatusCode.cs
@@ -1,3 +1,5 @@
+using System;
+
namespace SS14.Launcher.Models.ServerStatus;
public enum ServerStatusCode
@@ -15,9 +17,30 @@ public enum ServerStatusInfoCode
Fetched
}
-public enum GameRoundStatus
+public abstract record GameRoundStatus : IComparable
+{
+ public int CompareTo(GameRoundStatus? other)
+ => (this, other) switch
+ {
+ (InRound a, InRound b) => a.TimeElapsed.CompareTo(b.TimeElapsed),
+ ({ } a, { } b) => Ordering(a).CompareTo(Ordering(b)),
+ _ => 1,
+ };
+
+ private static int Ordering(GameRoundStatus status)
+ => status switch
+ {
+ Unknown => 0,
+ InLobby => 1,
+ InRound => 2,
+ _ => throw new ArgumentOutOfRangeException(nameof(status), status, "You should add an ordering value"),
+ };
+}
+
+public record Unknown : GameRoundStatus;
+public record InLobby : GameRoundStatus;
+
+public record InRound(DateTime RoundStartTime) : GameRoundStatus
{
- Unknown,
- InLobby,
- InRound,
+ public TimeSpan TimeElapsed => DateTime.UtcNow.Subtract(RoundStartTime);
}
diff --git a/SS14.Launcher/Theme/ThemeServerList.axaml b/SS14.Launcher/Theme/ThemeServerList.axaml
index 4871150c4..0f1443c93 100644
--- a/SS14.Launcher/Theme/ThemeServerList.axaml
+++ b/SS14.Launcher/Theme/ThemeServerList.axaml
@@ -50,6 +50,7 @@
+
diff --git a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
index a934ed0bb..156ad31af 100644
--- a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
+++ b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
@@ -1,4 +1,6 @@
using System;
+using System.Collections;
+using System.Collections.Generic;
using System.ComponentModel;
using Avalonia.Threading;
using Microsoft.Toolkit.Mvvm.ComponentModel;
@@ -23,6 +25,20 @@ public sealed class ServerEntryViewModel : ObservableRecipient, IRecipient
+ /// Maps a sorting key to a comparer to use for column sorting.
+ ///
+ public static readonly Dictionary ComparerMapping = new()
+ {
+ { NameSortKey, StringComparer.InvariantCultureIgnoreCase },
+ { TimeSortKey, Comparer.Default },
+ { PlayersSortKey, Comparer.Default },
+ };
+
public ServerEntryViewModel(MainWindowViewModel windowVm, ServerStatusData cacheData, IServerSource serverSource,
DataManager cfg)
{
@@ -106,34 +122,25 @@ public string ServerStatusString
}
}
+ public int PlayerCount => _cacheData.PlayerCount;
+
// Give a ratio for servers with a defined player count, or just a current number for those without.
public string PlayerCountString =>
_loc.GetString("server-entry-player-count",
- ("players", _cacheData.PlayerCount.ToString().PadLeft(3)),
+ ("players", PlayerCount.ToString().PadLeft(3)),
("max", _cacheData.SoftMaxPlayerCount.ToString().PadRight(3)));
- public DateTime? RoundStartTime => _cacheData.RoundStartTime;
+ public GameRoundStatus RoundStatus => _cacheData.RoundStatus;
public string RoundStatusString
- {
- get
+ => _cacheData.RoundStatus switch
{
- switch (_cacheData.RoundStatus)
- {
- case GameRoundStatus.InLobby:
- return _loc.GetString("server-entry-status-lobby");
- case GameRoundStatus.InRound when RoundStartTime is { } start:
- {
- var ts = DateTime.UtcNow.Subtract(start);
- return _loc.GetString("server-entry-round-time", ("hours", Math.Floor(ts.TotalHours)),
- ("mins", ts.Minutes.ToString().PadLeft(2, '0')));
- }
- default:
- return "";
- }
- }
- }
+ InLobby => _loc.GetString("server-entry-status-lobby"),
+ InRound r => _loc.GetString("server-entry-round-time", ("hours", Math.Floor(r.TimeElapsed.TotalHours)),
+ ("mins", r.TimeElapsed.Minutes.ToString().PadLeft(2, '0'))),
+ _ => "",
+ };
public string Description
{
@@ -258,11 +265,6 @@ private void OnCacheDataOnPropertyChanged(object? _, PropertyChangedEventArgs ar
OnPropertyChanged(nameof(PlayerCountString));
break;
- case nameof(IServerStatusData.RoundStartTime):
- OnPropertyChanged(nameof(RoundStartTime));
- OnPropertyChanged(nameof(RoundStatusString));
- break;
-
case nameof(IServerStatusData.RoundStatus):
OnPropertyChanged(nameof(RoundStatusString));
break;
diff --git a/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml b/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
index 300a07288..370bac62b 100644
--- a/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
@@ -46,7 +46,7 @@
HorizontalAlignment="Center"
Margin="0 4"
Command="{Binding MainWindowViewModel.SelectTabServers}" />
-
+
-
+
-
+
-
+
+ HorizontalAlignment="Right" />
-
+
+ HorizontalAlignment="Center" />
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs
index 66df64a15..22fbdb8a9 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerList.xaml.cs
@@ -1,7 +1,11 @@
using System.Collections;
+using System.ComponentModel;
+using System.Linq;
using Avalonia;
+using Avalonia.Collections;
using Avalonia.Controls;
using SS14.Launcher.ViewModels.MainWindowTabs;
+using static System.ComponentModel.ListSortDirection;
namespace SS14.Launcher.Views.MainWindowTabs;
@@ -23,6 +27,38 @@ public ServerList()
add.IsExpanded = true;
}
};
+
+ ServerGrid.Sorting += (_, args) =>
+ {
+ args.Handled = true; // Stop Avalonia from messing with our custom behavior
+
+ if (ServerGrid.ItemsSource is not DataGridCollectionView view)
+ return;
+
+ var currentSort = view.SortDescriptions.FirstOrDefault();
+ view.SortDescriptions.Clear(); // Start fresh
+
+ // This key/path corresponds to what the user wants to sort
+ var clickedKey = args.Column.SortMemberPath;
+
+ ListSortDirection? direction = currentSort switch
+ {
+ // No column is sorted: set clicked column to ascending
+ null => Ascending,
+ // Clicked column does not match currently sorted column: set clicked column to ascending
+ { PropertyPath: { } currentKey } when currentKey != clickedKey => Ascending,
+ // Cycle through ascending -> descending -> no sort -> ascending
+ { Direction: Ascending } => Descending,
+ { Direction: Descending } => null,
+ _ => Ascending,
+ };
+
+ if (direction is not { } d)
+ return; // Do not set any sorting
+
+ var comparer = ServerEntryViewModel.ComparerMapping[clickedKey];
+ view.SortDescriptions.Add(DataGridSortDescription.FromPath(clickedKey, d, comparer));
+ };
}
public static readonly DirectProperty ShowHeaderProperty =
@@ -74,12 +110,18 @@ public bool SpinnerVisible
set => SetAndRaise(SpinnerVisibleProperty, ref _spinnerVisible, value);
}
- public static readonly StyledProperty ListProperty =
- AvaloniaProperty.Register(nameof(List));
+ public static readonly DirectProperty EntriesProperty =
+ AvaloniaProperty.RegisterDirect(nameof(Entries),
+ l => l.Entries,
+ (l, e) => l.Entries = e);
- public IEnumerable List
+ public IEnumerable Entries
{
get => ServerGrid.ItemsSource;
- set => ServerGrid.ItemsSource = value;
+ set
+ {
+ ServerGrid.ItemsSource = new DataGridCollectionView(value);
+ ServerGrid.SelectedItem = null;
+ }
}
}
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerListTabView.xaml b/SS14.Launcher/Views/MainWindowTabs/ServerListTabView.xaml
index f507fcd00..f8bd4bcc9 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerListTabView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerListTabView.xaml
@@ -42,7 +42,7 @@
-