From 0c18b60501504d42810c8be928a82d410e86dc2b Mon Sep 17 00:00:00 2001 From: Lacoi Date: Wed, 2 Aug 2023 16:25:31 +0200 Subject: [PATCH] asm & csm: add file size to WorldSaveRestoreWindow --- .../Globalization/en-US/en-US.xaml | 1 + .../Windows/WorldSaveRestoreWindow.xaml | 13 +++++++ .../Windows/WorldSaveRestoreWindow.xaml.cs | 11 +++++- .../Globalization/en-US/en-US.xaml | 1 + .../Windows/MainWindow.xaml | 4 ++ .../Windows/WorldSaveRestoreWindow.xaml | 13 +++++++ .../Windows/WorldSaveRestoreWindow.xaml.cs | 13 +++++-- .../Converters/FileSizeConverter.cs | 39 +++++++++++++++++++ 8 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 src/ServerManager.Common/Converters/FileSizeConverter.cs diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml index 0b9d7d4b..41f0a832 100644 --- a/src/ARKServerManager/Globalization/en-US/en-US.xaml +++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml @@ -319,6 +319,7 @@ Refresh Backup Files Error Name + Size Created Last Updated diff --git a/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml b/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml index fe28e951..7f591631 100644 --- a/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml +++ b/src/ARKServerManager/Windows/WorldSaveRestoreWindow.xaml @@ -2,6 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common" + xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common" MinWidth="700" MinHeight="480" Width="800" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" Loaded="Window_Loaded" Icon="../Art/favicon.ico" Title="{DynamicResource WorldSaveRestore_Title}"> @@ -55,6 +56,18 @@ + + + + + + + + + + + + diff --git a/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml b/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml index 4f6f9332..0abc7622 100644 --- a/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml +++ b/src/ConanServerManager/Windows/WorldSaveRestoreWindow.xaml @@ -2,6 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common" + xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common" MinWidth="700" MinHeight="480" Width="800" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" Loaded="Window_Loaded" Icon="../Art/favicon.ico" Title="{DynamicResource WorldSaveRestore_Title}"> @@ -56,6 +57,18 @@ + + + + + + + +