diff --git a/ModpackUpdater.Apps.Client.Gui/App.axaml b/ModpackUpdater.Apps.Client.Gui/App.axaml
index 19fe103..08720a6 100644
--- a/ModpackUpdater.Apps.Client.Gui/App.axaml
+++ b/ModpackUpdater.Apps.Client.Gui/App.axaml
@@ -5,8 +5,7 @@
-
-
-
+
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Client.Gui/App.axaml.cs b/ModpackUpdater.Apps.Client.Gui/App.axaml.cs
index c6bc092..49080d1 100644
--- a/ModpackUpdater.Apps.Client.Gui/App.axaml.cs
+++ b/ModpackUpdater.Apps.Client.Gui/App.axaml.cs
@@ -9,6 +9,7 @@ public partial class App : Application
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
+ AppGlobals.Initialize();
}
public override void OnFrameworkInitializationCompleted()
diff --git a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml
index 9a930d0..cde81cd 100644
--- a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml
+++ b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml
@@ -1,121 +1,115 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 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:lang="clr-namespace:ModpackUpdater.Apps.Client.Gui.LangRes"
+ xmlns:pilz="https://git.pilzinsel64.de/pilz-framework/pilz"
+ xmlns:symbols="clr-namespace:Pilz.UI.Symbols;assembly=Pilz.UI"
+ mc:Ignorable="d"
+ x:Class="ModpackUpdater.Apps.Client.Gui.MainForm"
+ Width="520"
+ SizeToContent="Height"
+ WindowStartupLocation="CenterScreen"
+ CanMaximize="false"
+ Title="Minecraft Modpack Updater"
+ Icon="/Assets/app.ico">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj b/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
index cb06e76..1d0dbe6 100644
--- a/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
+++ b/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
@@ -63,7 +63,7 @@
-
+
diff --git a/ModpackUpdater.Apps.Manager/App.axaml b/ModpackUpdater.Apps.Manager/App.axaml
index 0e5758b..fb233e4 100644
--- a/ModpackUpdater.Apps.Manager/App.axaml
+++ b/ModpackUpdater.Apps.Manager/App.axaml
@@ -10,6 +10,6 @@
-
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Manager/App.axaml.cs b/ModpackUpdater.Apps.Manager/App.axaml.cs
index 3802c82..5c92bd2 100644
--- a/ModpackUpdater.Apps.Manager/App.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/App.axaml.cs
@@ -3,7 +3,6 @@ using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using ModpackUpdater.Apps.Manager.Ui;
using Pilz.Features;
-using Pilz.UI.Symbols;
namespace ModpackUpdater.Apps.Manager;
@@ -11,7 +10,6 @@ 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/Assets/Styles/StylesEnhancedDefaults.axaml b/ModpackUpdater.Apps.Manager/Assets/Styles/StylesEnhancedDefaults.axaml
deleted file mode 100644
index d998721..0000000
--- a/ModpackUpdater.Apps.Manager/Assets/Styles/StylesEnhancedDefaults.axaml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
index d292c32..e7ac983 100644
--- a/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
+++ b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
@@ -27,7 +27,7 @@
-
+
diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
index 0ebe389..395d148 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
@@ -11,431 +11,410 @@
x:Class="ModpackUpdater.Apps.Manager.Ui.MainWindow"
x:DataType="vm:MainWindowViewModel"
Title="Minecraft Modpack Manager"
- Padding="3"
WindowState="Maximized"
Loaded="Window_OnLoaded">
-
-
-
-
-
+
+ x:Name="GridMain"
+ RowDefinitions="Auto,*"
+ ColumnDefinitions="Auto,*,500"
+ RowSpacing="6"
+ ColumnSpacing="6"
+ Margin="3">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ VerticalScrollBarVisibility="Auto">
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+ Margin="3, 0, 3, 0"
+ Width="100"
+ Text="{Binding Version}"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+ Margin="3, 0, 3, 0"
+ Content="Public"
+ IsChecked="{Binding IsPublic}"/>
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
-
-
-
-
+
+
-
-
+
-
-
-
-
-
-
+
-
-
-
+
-
-
+
+
+
-
-
-
+
+
-
-
-
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps/AppGlobals.cs b/ModpackUpdater.Apps/AppGlobals.cs
index 0b82110..8c38274 100644
--- a/ModpackUpdater.Apps/AppGlobals.cs
+++ b/ModpackUpdater.Apps/AppGlobals.cs
@@ -1,4 +1,5 @@
using Pilz.UI.AvaloniaUI.Symbols;
+using Pilz.UI.Symbols;
namespace ModpackUpdater.Apps;
@@ -8,13 +9,6 @@ public static class AppGlobals
public static void Initialize()
{
- // ThemeHelper.ApplyApplicationTheme(new ThemeDefinition(ApplicationTheme.Auto, HighContrastMode.Auto), n => n.Theme switch
- // {
- // ApplicationTheme.Light => new Windows11CompactTheme(),
- // ApplicationTheme.Gray or ApplicationTheme.Dark => new Windows11CompactDarkTheme(),
- // _ => throw new NotImplementedException(),
- // });
- // RadFlyoutBase.ConfirmSvg = Symbols.GetSvgImage(AppSymbols.checkmark, Pilz.UI.Symbols.SymbolSize.Small);
- // RadFlyoutBase.CancelSvg = Symbols.GetSvgImage(AppSymbols.cancel, Pilz.UI.Symbols.SymbolSize.Small);
+ SymbolGlobals.DefaultImageSmallSize = 17;
}
}
diff --git a/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj b/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
index 4073dc4..a6c12d7 100644
--- a/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
+++ b/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
@@ -17,7 +17,7 @@
-
+