LITW-Refined/minecraft-modpack-updater
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui(manager): use Menus with HeaderMenuItems instead of ImageDropDownButtons

Browse Source
This commit is contained in:
Pascal
2025-12-02 15:54:45 +01:00
parent 12b5a63003
commit 16b1a655aa
2 changed files with 52 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
View File

@@ -3,7 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ModpackUpdater.Apps.Manager.Ui"
xmlns:pilz="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" xmlns:symbols="clr-namespace:Pilz.UI.Symbols;assembly=Pilz.UI"
xmlns:mainWindow="clr-namespace:ModpackUpdater.Apps.Manager.Ui.Models.MainWindow" xmlns:mainWindow="clr-namespace:ModpackUpdater.Apps.Manager.Ui.Models.MainWindow"
@@ -25,54 +24,44 @@
ColumnSpacing="6" ColumnSpacing="6"
Margin="3"> Margin="3">
<!-- StackPanel: Workspace --> <!-- Menu: Workspace -->
<StackPanel <Menu
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0">
Orientation="Horizontal">
<!-- Button: Workspace --> <Menu.Items>
<pilz:ImageButton <!-- MenuItem: Workspace -->
x:Name="ButtonWorkspace" <pilz:HeaderMenuItem
Text="{x:Static langRes:GeneralLangRes.Workspace}" x:Name="MenuItemWorkspace"
Background="Transparent"> HeaderText="{x:Static langRes:GeneralLangRes.Workspace}">
<pilz:ImageButton.Flyout> <pilz:HeaderMenuItem.Items>
<MenuFlyout> <MenuItem x:Name="MenuItemWorkspacePreferences" Header="{x:Static langRes:GeneralLangRes.WorkspacePreferences}" Click="MenuItemWorkspacePreferences_OnClick"/>
<MenuFlyout.Items> <MenuItem x:Name="MenuItemSaveWorkspace" Header="{x:Static langRes:GeneralLangRes.SaveWorkspace}" HotKey="Ctrl+S" Click="MenuItemSaveWorkspace_OnClick"/>
<MenuItem x:Name="MenuItemWorkspacePreferences" Header="{x:Static langRes:GeneralLangRes.WorkspacePreferences}" Click="MenuItemWorkspacePreferences_OnClick"/> <Separator/>
<MenuItem x:Name="MenuItemSaveWorkspace" Header="{x:Static langRes:GeneralLangRes.SaveWorkspace}" HotKey="Ctrl+S" Click="MenuItemSaveWorkspace_OnClick"/> <MenuItem x:Name="MenuItemNewWorkspace" Header="{x:Static langRes:GeneralLangRes.NewWorkspace}"/>
<Separator/> <Separator/>
<MenuItem x:Name="MenuItemNewWorkspace" Header="{x:Static langRes:GeneralLangRes.NewWorkspace}"/> <MenuItem x:Name="MenuItemRecentWorkspaces" Header="{x:Static langRes:GeneralLangRes.RecentWorkspaces}"/>
<Separator/> </pilz:HeaderMenuItem.Items>
<MenuItem x:Name="MenuItemRecentWorkspaces" Header="{x:Static langRes:GeneralLangRes.RecentWorkspaces}"/> </pilz:HeaderMenuItem>
</MenuFlyout.Items>
</MenuFlyout>
</pilz:ImageButton.Flyout>
</pilz:ImageButton>
<!-- Button: Update --> <!-- MenuItem: Update -->
<pilz:ImageButton <pilz:HeaderMenuItem
x:Name="ButtonUpdate" x:Name="MenuItemUpdate"
Text="{x:Static langRes:GeneralLangRes.Update}" HeaderText="{x:Static langRes:GeneralLangRes.Update}">
Background="Transparent">
<pilz:ImageButton.Flyout> <pilz:HeaderMenuItem.Items>
<MenuFlyout> <MenuItem x:Name="MenuItemCreateUpdate" Header="{x:Static langRes:GeneralLangRes.CreateUpdate}" Click="MenuItemCreateUpdate_OnClick"/>
<MenuFlyout.Items> <MenuItem x:Name="MenuItemRemoveUpdate" Header="{x:Static langRes:GeneralLangRes.RemoveUpdate}" Click="MenuItemRemoveUpdate_OnClick"/>
<MenuItem x:Name="MenuItemCreateUpdate" Header="{x:Static langRes:GeneralLangRes.CreateUpdate}" Click="MenuItemCreateUpdate_OnClick"/> </pilz:HeaderMenuItem.Items>
<MenuItem x:Name="MenuItemRemoveUpdate" Header="{x:Static langRes:GeneralLangRes.RemoveUpdate}" Click="MenuItemRemoveUpdate_OnClick"/> </pilz:HeaderMenuItem>
</MenuFlyout.Items>
</MenuFlyout>
</pilz:ImageButton.Flyout>
</pilz:ImageButton>
<!-- Button: Tools --> <!-- MenuItem: Workspace -->
<pilz:ImageButton <pilz:HeaderMenuItem
x:Name="ButtonTools" x:Name="MenuItemTools"
Text="{x:Static langRes:GeneralLangRes.Tools}" HeaderText="{x:Static langRes:GeneralLangRes.Tools}"/>
Background="Transparent"/> </Menu.Items>
</StackPanel> </Menu>
<!-- TreeView: Workspace --> <!-- TreeView: Workspace -->
<ScrollViewer <ScrollViewer
@@ -110,26 +99,13 @@
Orientation="Horizontal" Orientation="Horizontal"
VerticalAlignment="Center"> VerticalAlignment="Center">
<!-- Panel: Menu list --> <!-- Menu: Actions -->
<StackPanel <Menu>
Orientation="Horizontal"> <Menu.Items>
<pilz:HeaderMenuItem x:Name="MenuItemAddAction" HeaderText="{x:Static langRes:GeneralLangRes.Add}" Click="ButtonAddAction_OnClick"/>
<!-- Button: Add action --> <pilz:HeaderMenuItem x:Name="MenuItemRemoveAction" HeaderText="{x:Static langRes:GeneralLangRes.Remove}" Click="ButtonRemoveAction_OnClick"/>
<pilz:ImageButton </Menu.Items>
x:Name="ButtonAddAction" </Menu>
Text="{x:Static langRes:GeneralLangRes.Add}"
ImageSource="{x:Static local:MainWindow.ButtonImageAddAction}"
Background="Transparent"
Click="ButtonAddAction_OnClick"/>
<!-- Button: Remove action -->
<pilz:ImageButton
x:Name="ButtonRemoveAction"
Text="{x:Static langRes:GeneralLangRes.Remove}"
ImageSource="{x:Static local:MainWindow.ButtonImageRemoveAction}"
Background="Transparent"
Click="ButtonRemoveAction_OnClick"/>
</StackPanel>
<!-- TextBox: Search --> <!-- TextBox: Search -->
<TextBox <TextBox
@@ -139,8 +115,7 @@
<!-- Panel: Menu --> <!-- Panel: Menu -->
<ContentControl <ContentControl
Content="{Binding SelectedTreeNode}" Content="{Binding SelectedTreeNode}">
>
<ContentControl.DataTemplates> <ContentControl.DataTemplates>
<DataTemplate <DataTemplate

16
ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml.cs
View File

@@ -2,7 +2,6 @@ using System.Reflection;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.Media;
using DynamicData; using DynamicData;
using ModpackUpdater.Apps.Manager.Api; using ModpackUpdater.Apps.Manager.Api;
using ModpackUpdater.Apps.Manager.Api.Model; using ModpackUpdater.Apps.Manager.Api.Model;
@@ -20,9 +19,6 @@ namespace ModpackUpdater.Apps.Manager.Ui;
public partial class MainWindow : Window, IMainApi public partial class MainWindow : Window, IMainApi
{ {
public static IImage? ButtonImageAddAction => AppGlobals.Symbols.GetImageSource(AppSymbols.add);
public static IImage? ButtonImageRemoveAction => AppGlobals.Symbols.GetImageSource(AppSymbols.remove);
private WorkspaceFeature? curWs; private WorkspaceFeature? curWs;
public MainWindowViewModel Model { get; } = new(); public MainWindowViewModel Model { get; } = new();
@@ -38,15 +34,17 @@ public partial class MainWindow : Window, IMainApi
GridMain.DataContext = Model; GridMain.DataContext = Model;
ButtonWorkspace.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.workspace); MenuItemWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.workspace, SymbolSize.Small);
MenuItemWorkspacePreferences.Icon = AppGlobals.Symbols.GetImage(AppSymbols.settings, SymbolSize.Small); MenuItemWorkspacePreferences.Icon = AppGlobals.Symbols.GetImage(AppSymbols.settings, SymbolSize.Small);
MenuItemSaveWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.save, SymbolSize.Small); MenuItemSaveWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.save, SymbolSize.Small);
MenuItemNewWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.new_window, SymbolSize.Small); MenuItemNewWorkspace.Icon = AppGlobals.Symbols.GetImage(AppSymbols.new_window, SymbolSize.Small);
MenuItemRecentWorkspaces.Icon = AppGlobals.Symbols.GetImage(AppSymbols.time_machine, SymbolSize.Small); MenuItemRecentWorkspaces.Icon = AppGlobals.Symbols.GetImage(AppSymbols.time_machine, SymbolSize.Small);
ButtonUpdate.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.update_done); MenuItemUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.update_done, SymbolSize.Small);
ButtonTools.ImageSource = AppGlobals.Symbols.GetImageSource(AppSymbols.tools); MenuItemTools.Icon = AppGlobals.Symbols.GetImage(AppSymbols.tools, SymbolSize.Small);
MenuItemCreateUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.add, SymbolSize.Small); MenuItemCreateUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.add, SymbolSize.Small);
MenuItemRemoveUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.remove, SymbolSize.Small); MenuItemRemoveUpdate.Icon = AppGlobals.Symbols.GetImage(AppSymbols.remove, SymbolSize.Small);
MenuItemAddAction.HeaderIcon = AppGlobals.Symbols.GetImage(AppSymbols.add, SymbolSize.Small);
MenuItemRemoveAction.HeaderIcon = AppGlobals.Symbols.GetImage(AppSymbols.remove, SymbolSize.Small);
ImageUpdate.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.update_done); ImageUpdate.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.update_done);
ImageMetadata.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.show_property); ImageMetadata.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.show_property);
ImageGeneral.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.normal_screen); ImageGeneral.Source = AppGlobals.Symbols.GetImageSource(AppSymbols.normal_screen);
@@ -61,9 +59,7 @@ public partial class MainWindow : Window, IMainApi
customClickHandler: MenuItemActionItem_Click, customClickHandler: MenuItemActionItem_Click,
insertPrioSplitters: true); insertPrioSplitters: true);
var menuFlyoutTools = new MenuFlyout(); PluginFeatureController.Instance.Functions.Get(FeatureTypes.Tools).InsertItemsTo(MenuItemTools.Items,
ButtonTools.Flyout = menuFlyoutTools;
PluginFeatureController.Instance.Functions.Get(FeatureTypes.Tools).InsertItemsTo(menuFlyoutTools.Items,
customClickHandler: MenuItemToolsItem_Click, customClickHandler: MenuItemToolsItem_Click,
insertPrioSplitters: true); insertPrioSplitters: true);
} }