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 @@
-
+
+
@@ -262,7 +304,9 @@
-
+
@@ -323,7 +367,9 @@
-
+
diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
index 01e1385..d172de3 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
@@ -30,20 +30,28 @@ public partial class MainWindow : Window, IMainApi
InitializeComponent();
- MenuItemWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.workspace, SymbolSize.Small);
+ ButtonWorkspace.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.workspace);
MenuItemWorkspacePreferences.Icon = AppGlobals.Symbols.GetImage(AppSymbols.settings, SymbolSize.Small);
MenuItemSaveWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.save, SymbolSize.Small);
MenuItemNewWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.new_window, SymbolSize.Small);
MenuItemRecentWorkspaces.Icon = AppGlobals.Symbols.GetImage(AppSymbols.time_machine, SymbolSize.Small);
- // MenuItemUpdates.Icon = AppGlobals.Symbols.GetImage(AppSymbols.update_done, SymbolSize.Small);
+ ButtonUpdate.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.update_done);
+ ButtonTools.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.tools);
MenuItemCreateUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.add, SymbolSize.Small);
MenuItemRemoveUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.remove, SymbolSize.Small);
- MenuItemTools.Icon = AppGlobals.Symbols.GetImage(AppSymbols.tools, SymbolSize.Small);
+ ImageUpdate.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.update_done);
+ ImageMetadata.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.show_property);
+ ImageGeneral.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.normal_screen);
+ ImageSource.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.input);
+ ImageDestination.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.output);
PluginFeatureController.Instance.Features.Get(FeatureTypes.Workspace).InsertItemsTo(MenuItemNewWorkspace.Items,
customClickHandler: MenuItemNewWorkspaceItem_Click,
insertPrioSplitters: true);
- PluginFeatureController.Instance.Functions.Get(FeatureTypes.Tools).InsertItemsTo(MenuItemTools.Items,
+
+ var menuFlyoutTools = new MenuFlyout();
+ ButtonTools.Flyout = menuFlyoutTools;
+ PluginFeatureController.Instance.Functions.Get(FeatureTypes.Tools).InsertItemsTo(menuFlyoutTools.Items,
customClickHandler: MenuItemToolsItem_Click,
insertPrioSplitters: true);
}
@@ -129,31 +137,6 @@ public partial class MainWindow : Window, IMainApi
func.Execute(new MainApiParameters(this));
}
- private void MenuItemCreateUpdate_OnClick(object? sender, RoutedEventArgs e)
- {
- // ...
- }
-
- private void MenuItemRemoveUpdate_OnClick(object? sender, RoutedEventArgs e)
- {
- // ...
- }
-
- private void MenuItemEditUpdate_OnClick(object? sender, RoutedEventArgs e)
- {
- // ...
- }
-
- private void MenuItemAddAction_OnClick(object? sender, RoutedEventArgs e)
- {
- // ...
- }
-
- private void MenuItemRemoveAction_OnClick(object? sender, RoutedEventArgs e)
- {
- // ...
- }
-
private void ButtonAddAction_OnClick(object? sender, RoutedEventArgs e)
{
throw new NotImplementedException();
@@ -163,4 +146,14 @@ public partial class MainWindow : Window, IMainApi
{
throw new NotImplementedException();
}
+
+ private void MenuItemCreateUpdate_OnClick(object? sender, RoutedEventArgs e)
+ {
+ throw new NotImplementedException();
+ }
+
+ private void MenuItemRemoveUpdate_OnClick(object? sender, RoutedEventArgs e)
+ {
+ throw new NotImplementedException();
+ }
}
\ No newline at end of file
diff --git a/ModpackUpdater.Apps/AppSymbols.cs b/ModpackUpdater.Apps/AppSymbols.cs
index ebc3475..3515b43 100644
--- a/ModpackUpdater.Apps/AppSymbols.cs
+++ b/ModpackUpdater.Apps/AppSymbols.cs
@@ -36,4 +36,9 @@ public enum AppSymbols
broom,
renew,
list_view,
+ show_property,
+ normal_screen,
+ input,
+ output,
+ git,
}
diff --git a/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj b/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
index 3f85242..4073dc4 100644
--- a/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
+++ b/ModpackUpdater.Apps/ModpackUpdater.Apps.csproj
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/ModpackUpdater.Apps/Symbols/git.svg b/ModpackUpdater.Apps/Symbols/git.svg
new file mode 100644
index 0000000..ecc0e69
--- /dev/null
+++ b/ModpackUpdater.Apps/Symbols/git.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps/Symbols/input.svg b/ModpackUpdater.Apps/Symbols/input.svg
new file mode 100644
index 0000000..a884eb2
--- /dev/null
+++ b/ModpackUpdater.Apps/Symbols/input.svg
@@ -0,0 +1,38 @@
+
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps/Symbols/normal_screen.svg b/ModpackUpdater.Apps/Symbols/normal_screen.svg
new file mode 100644
index 0000000..9726def
--- /dev/null
+++ b/ModpackUpdater.Apps/Symbols/normal_screen.svg
@@ -0,0 +1,55 @@
+
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps/Symbols/output.svg b/ModpackUpdater.Apps/Symbols/output.svg
new file mode 100644
index 0000000..12ceda1
--- /dev/null
+++ b/ModpackUpdater.Apps/Symbols/output.svg
@@ -0,0 +1,38 @@
+
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps/Symbols/show_property.svg b/ModpackUpdater.Apps/Symbols/show_property.svg
new file mode 100644
index 0000000..143b55d
--- /dev/null
+++ b/ModpackUpdater.Apps/Symbols/show_property.svg
@@ -0,0 +1,41 @@
+
+
\ No newline at end of file