diff --git a/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj b/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj index 6575485..cb06e76 100644 --- a/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj +++ b/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj @@ -62,8 +62,8 @@ - - + + diff --git a/ModpackUpdater.Apps.Manager/App.axaml b/ModpackUpdater.Apps.Manager/App.axaml index e029af7..0e5758b 100644 --- a/ModpackUpdater.Apps.Manager/App.axaml +++ b/ModpackUpdater.Apps.Manager/App.axaml @@ -9,6 +9,7 @@ + \ No newline at end of file diff --git a/ModpackUpdater.Apps.Manager/App.axaml.cs b/ModpackUpdater.Apps.Manager/App.axaml.cs index 5c92bd2..3802c82 100644 --- a/ModpackUpdater.Apps.Manager/App.axaml.cs +++ b/ModpackUpdater.Apps.Manager/App.axaml.cs @@ -3,6 +3,7 @@ using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; using ModpackUpdater.Apps.Manager.Ui; using Pilz.Features; +using Pilz.UI.Symbols; namespace ModpackUpdater.Apps.Manager; @@ -10,6 +11,7 @@ public partial class App : Application { public override void Initialize() { + SymbolGlobals.DefaultImageSmallSize = 17; AvaloniaXamlLoader.Load(this); AppGlobals.Initialize(); PluginFeatureController.Instance.RegisterAllOwn(); diff --git a/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj index 51f89ae..d292c32 100644 --- a/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj +++ b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml index 3fac229..be847ae 100644 --- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml +++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml @@ -3,44 +3,32 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:modpackUpdater="clr-namespace:ModpackUpdater;assembly=ModpackUpdater" xmlns:local="clr-namespace:ModpackUpdater.Apps.Manager.Ui" - xmlns:manager="clr-namespace:ModpackUpdater.Apps.Manager" xmlns:vm="clr-namespace:ModpackUpdater.Apps.Manager.Ui.Models" - xmlns:controls="https://git.pilzinsel64.de/pilz-framework/pilz" + xmlns:pilz="https://git.pilzinsel64.de/pilz-framework/pilz" + xmlns:symbols="clr-namespace:Pilz.UI.Symbols;assembly=Pilz.UI" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="ModpackUpdater.Apps.Manager.Ui.MainWindow" x:DataType="vm:MainWindowViewModel" Title="Minecraft Modpack Manager" Padding="3" + WindowState="Maximized" Loaded="Window_OnLoaded"> + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -69,7 +97,9 @@ ItemsSource="{Binding Nodes}"> - + @@ -94,28 +124,33 @@ DataType="vm:ActionSetTreeNode"> + Orientation="Horizontal"> - + - + + + @@ -176,8 +211,10 @@ - - + + @@ -208,7 +245,9 @@ - + @@ -246,11 +285,14 @@ - + +