Add launcher item notes

MainWindow.xaml

@@ -115,8 +115,8 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="16"/>
-                        <RowDefinition Height="Auto"/>
                         <RowDefinition Height="*"/>
+                        <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
 
                     <Border Background="{DynamicResource AppPanelBrush}"
@@ -134,6 +134,7 @@
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
                             <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="Auto"/>
                         </Grid.RowDefinitions>
 
                         <TextBlock Text="Hotkey" VerticalAlignment="Center" Margin="0,0,8,8"/>
@@ -158,76 +159,115 @@
 
                     <Separator Grid.Row="1" VerticalAlignment="Center"/>
 
-                    <Border Grid.Row="2"
-                            Background="{DynamicResource AppPanelBrush}"
-                            BorderBrush="{DynamicResource AppBorderBrush}"
-                            BorderThickness="1"
-                            CornerRadius="12"
-                            Padding="12">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="110"/>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-
-                        <TextBlock Text="Title" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                        <TextBox x:Name="TitleBox" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"
-                                 TextChanged="PreviewField_Changed"/>
-
-                        <TextBlock Text="Type" Grid.Row="1" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                        <ComboBox x:Name="TypeBox" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"
-                                  SelectionChanged="TypeBox_SelectionChanged"/>
-
-                        <TextBlock Text="Target" Grid.Row="2" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                        <TextBox x:Name="TargetBox" Grid.Row="2" Grid.Column="1" Margin="0,0,8,8"
-                                 TextChanged="PreviewField_Changed"/>
-                        <StackPanel Grid.Row="2" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
-                            <Button Content="File" Click="BrowseFile_Click" Margin="0,0,6,0" Padding="8,4"/>
-                            <Button Content="Folder" Click="BrowseFolder_Click" Padding="8,4"/>
-                        </StackPanel>
-
-                        <TextBlock Text="Arguments" Grid.Row="3" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                        <TextBox x:Name="ArgumentsBox" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"/>
-
-                        <TextBlock Text="Icon Path" Grid.Row="4" VerticalAlignment="Center" Margin="0,0,8,0"/>
-                        <TextBox x:Name="IconPathBox" Grid.Row="4" Grid.Column="1" Margin="0,0,8,8"
-                                 TextChanged="PreviewField_Changed"/>
-                        <StackPanel Grid.Row="4" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
-                            <Button Content="Icon" Click="BrowseIcon_Click" Padding="8,4" Margin="0,0,6,0"/>
-                            <Button Content="Reset" Click="ResetIcon_Click" Padding="8,4"/>
-                        </StackPanel>
-
-                        <TextBlock Text="Selected Item Display" Grid.Row="5" VerticalAlignment="Center" Margin="0,0,8,8"/>
-                        <ComboBox x:Name="ItemDisplayModeBox" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2"
-                                  Margin="0,0,0,8" SelectionChanged="ItemDisplayModeBox_SelectionChanged"/>
-
-                        <TextBlock Text="Preview" Grid.Row="6" VerticalAlignment="Top" Margin="0,4,8,0"/>
-                        <Border Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2"
-                                BorderThickness="1"
+                    <ScrollViewer Grid.Row="2"
+                                  VerticalScrollBarVisibility="Auto"
+                                  HorizontalScrollBarVisibility="Disabled">
+                        <Border Background="{DynamicResource AppPanelBrush}"
                                 BorderBrush="{DynamicResource AppBorderBrush}"
-                                Background="{DynamicResource AppSurfaceBrush}"
+                                BorderThickness="1"
                                 CornerRadius="12"
-                                Padding="10" MinHeight="76">
-                            <StackPanel>
-                                <ContentControl x:Name="PreviewHost"/>
-                                <TextBlock x:Name="PreviewNote" Margin="0,8,0,0"
-                                           Foreground="{DynamicResource AppMutedTextBrush}"
-                                           TextWrapping="Wrap"/>
+                                Padding="12">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="110"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <TextBlock Text="Title" VerticalAlignment="Center" Margin="0,0,8,8"/>
+                            <TextBox x:Name="TitleBox" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"
+                                     TextChanged="PreviewField_Changed"/>
+
+                            <TextBlock Text="Type" Grid.Row="1" VerticalAlignment="Center" Margin="0,0,8,8"/>
+                            <ComboBox x:Name="TypeBox" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"
+                                      SelectionChanged="TypeBox_SelectionChanged"/>
+
+                            <TextBlock Text="Target" Grid.Row="2" VerticalAlignment="Center" Margin="0,0,8,8"/>
+                            <TextBox x:Name="TargetBox" Grid.Row="2" Grid.Column="1" Margin="0,0,8,8"
+                                     TextChanged="PreviewField_Changed"/>
+                            <StackPanel Grid.Row="2" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
+                                <Button Content="File" Click="BrowseFile_Click" Margin="0,0,6,0" Padding="8,4"/>
+                                <Button Content="Folder" Click="BrowseFolder_Click" Padding="8,4"/>
                             </StackPanel>
+
+                            <TextBlock Text="Arguments" Grid.Row="3" VerticalAlignment="Center" Margin="0,0,8,8"/>
+                            <TextBox x:Name="ArgumentsBox" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"/>
+
+                            <TextBlock Text="Working Folder" Grid.Row="4" VerticalAlignment="Center" Margin="0,0,8,8"/>
+                            <TextBox x:Name="WorkingFolderBox" Grid.Row="4" Grid.Column="1" Margin="0,0,8,8"/>
+                            <Button x:Name="WorkingFolderBrowseButton"
+                                    Grid.Row="4" Grid.Column="2"
+                                    Content="Folder"
+                                    Click="BrowseWorkingFolder_Click"
+                                    Padding="8,4"
+                                    Margin="0,0,0,8"/>
+
+                            <TextBlock Text="Notes" Grid.Row="5" VerticalAlignment="Top" Margin="0,4,8,8"/>
+                            <TextBox x:Name="NotesBox"
+                                     Grid.Row="5"
+                                     Grid.Column="1"
+                                     Grid.ColumnSpan="2"
+                                     Margin="0,0,0,8"
+                                     AcceptsReturn="True"
+                                     MinHeight="54"
+                                     TextWrapping="Wrap"
+                                     VerticalScrollBarVisibility="Auto"
+                                     TextChanged="PreviewField_Changed"/>
+
+                            <TextBlock Text="Icon Path" Grid.Row="6" VerticalAlignment="Center" Margin="0,0,8,0"/>
+                            <TextBox x:Name="IconPathBox" Grid.Row="6" Grid.Column="1" Margin="0,0,8,8"
+                                     TextChanged="PreviewField_Changed"/>
+                            <StackPanel Grid.Row="6" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
+                                <Button Content="Icon" Click="BrowseIcon_Click" Padding="8,4" Margin="0,0,6,0"/>
+                                <Button Content="Reset" Click="ResetIcon_Click" Padding="8,4"/>
+                            </StackPanel>
+
+                            <TextBlock Text="Selected Item Display" Grid.Row="7" VerticalAlignment="Center" Margin="0,0,8,8"/>
+                            <ComboBox x:Name="ItemDisplayModeBox" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="2"
+                                      Margin="0,0,0,8" SelectionChanged="ItemDisplayModeBox_SelectionChanged"/>
+
+                            <TextBlock Text="Launch Options" Grid.Row="8" VerticalAlignment="Top" Margin="0,2,8,8"/>
+                            <StackPanel Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8">
+                                <CheckBox x:Name="RunAsAdminBox"
+                                          Content="Run as administrator"
+                                          Margin="0,0,0,6"
+                                          Checked="LaunchOptionBox_Changed"
+                                          Unchecked="LaunchOptionBox_Changed"/>
+                                <CheckBox x:Name="StartMinimizedBox"
+                                          Content="Start minimized"
+                                          Checked="LaunchOptionBox_Changed"
+                                          Unchecked="LaunchOptionBox_Changed"/>
+                            </StackPanel>
+
+                            <TextBlock Text="Preview" Grid.Row="9" VerticalAlignment="Top" Margin="0,4,8,0"/>
+                            <Border Grid.Row="9" Grid.Column="1" Grid.ColumnSpan="2"
+                                    BorderThickness="1"
+                                    BorderBrush="{DynamicResource AppBorderBrush}"
+                                    Background="{DynamicResource AppSurfaceBrush}"
+                                    CornerRadius="12"
+                                    Padding="10" MinHeight="76">
+                                <StackPanel>
+                                    <ContentControl x:Name="PreviewHost"/>
+                                    <TextBlock x:Name="PreviewNote" Margin="0,8,0,0"
+                                               Foreground="{DynamicResource AppMutedTextBrush}"
+                                               TextWrapping="Wrap"/>
+                                </StackPanel>
+                            </Border>
+                        </Grid>
                         </Border>
-                    </Grid>
-                    </Border>
+                    </ScrollViewer>
 
                     <TextBlock x:Name="StatusText" Grid.Row="3" Margin="4,14,4,0"
                                Foreground="{DynamicResource AppMutedTextBrush}"

MainWindow.xaml.cs

@@ -107,6 +107,12 @@ public partial class MainWindow : Window
         var duplicateMenuItem = new System.Windows.Controls.MenuItem { Header = "Duplicate Item" };
         duplicateMenuItem.Click += DuplicateItem_Click;
 
+        var sortMenuItem = new System.Windows.Controls.MenuItem
+        {
+            Header = item.Type == LauncherItemType.Menu ? "Sort This Menu" : "Sort This Level"
+        };
+        sortMenuItem.Click += SortSelected_Click;
+
         var treeItem = new TreeViewItem
         {
             Header = $"{GetTreeStatusPrefix(item)}{item.Title} ({item.Type})",
@@ -117,6 +123,7 @@ public partial class MainWindow : Window
         treeItem.ContextMenu.Items.Add(disableMenuItem);
         treeItem.ContextMenu.Items.Add(openContainingFolderMenuItem);
         treeItem.ContextMenu.Items.Add(duplicateMenuItem);
+        treeItem.ContextMenu.Items.Add(sortMenuItem);
         treeItem.PreviewMouseRightButtonDown += (_, e) =>
         {
             treeItem.IsSelected = true;
@@ -606,9 +613,13 @@ public partial class MainWindow : Window
         TypeBox.SelectedItem = item.Type;
         TargetBox.Text = item.Target;
         ArgumentsBox.Text = item.Arguments ?? "";
+        WorkingFolderBox.Text = item.WorkingFolder ?? "";
+        NotesBox.Text = item.Notes ?? "";
         IconPathBox.Text = item.IconPath ?? "";
         loadedAutoIconPath = GetAutomaticIconPath(item);
         ItemDisplayModeBox.SelectedItem = item.DisplayMode;
+        RunAsAdminBox.IsChecked = item.RunAsAdmin;
+        StartMinimizedBox.IsChecked = item.StartMinimized;
         UpdateTargetAvailability();
         isLoadingSelection = false;
         UpdatePreview();
@@ -623,9 +634,13 @@ public partial class MainWindow : Window
         TypeBox.SelectedIndex = -1;
         TargetBox.Text = "";
         ArgumentsBox.Text = "";
+        WorkingFolderBox.Text = "";
+        NotesBox.Text = "";
         IconPathBox.Text = "";
         loadedAutoIconPath = null;
         ItemDisplayModeBox.SelectedItem = controller?.Config.DisplayMode;
+        RunAsAdminBox.IsChecked = false;
+        StartMinimizedBox.IsChecked = false;
         UpdateTargetAvailability();
         isLoadingSelection = false;
         UpdatePreview();
@@ -644,12 +659,18 @@ public partial class MainWindow : Window
         selectedItem.Arguments = selectedItem.Type == LauncherItemType.Menu || string.IsNullOrWhiteSpace(ArgumentsBox.Text)
             ? null
             : ArgumentsBox.Text.Trim();
+        selectedItem.WorkingFolder = LauncherController.CanUseLaunchOptions(selectedItem.Type) && !string.IsNullOrWhiteSpace(WorkingFolderBox.Text)
+            ? WorkingFolderBox.Text.Trim()
+            : null;
+        selectedItem.Notes = string.IsNullOrWhiteSpace(NotesBox.Text) ? null : NotesBox.Text.Trim();
         EnsureAutomaticIconPath();
         selectedItem.IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim();
         if (ItemDisplayModeBox.SelectedItem is LauncherDisplayMode itemMode)
         {
             selectedItem.DisplayMode = itemMode;
         }
+        selectedItem.RunAsAdmin = LauncherController.CanRunAsAdmin(selectedItem.Type) && RunAsAdminBox.IsChecked == true;
+        selectedItem.StartMinimized = LauncherController.CanUseLaunchOptions(selectedItem.Type) && StartMinimizedBox.IsChecked == true;
 
         if (selectedItem.Type != LauncherItemType.Menu)
         {
@@ -956,9 +977,13 @@ public partial class MainWindow : Window
             Type = item.Type,
             Target = item.Target,
             Arguments = item.Arguments,
+            WorkingFolder = item.WorkingFolder,
+            Notes = item.Notes,
             IconPath = item.IconPath,
             IsFavorite = item.IsFavorite,
             IsDisabled = item.IsDisabled,
+            RunAsAdmin = item.RunAsAdmin,
+            StartMinimized = item.StartMinimized,
             DisplayMode = item.DisplayMode,
             Children = item.Children.Select(child => DuplicateItem(child, renameRoot: false)).ToList()
         };
@@ -1046,6 +1071,46 @@ public partial class MainWindow : Window
         RefreshView(selectedItem);
     }
 
+    private void SortSelected_Click(object sender, RoutedEventArgs e)
+    {
+        if (controller is null || selectedItem is null)
+        {
+            return;
+        }
+
+        ApplyCurrentItem();
+        LauncherItem itemToSelect = selectedItem;
+        if (selectedItem.Type == LauncherItemType.Menu)
+        {
+            SortItems(selectedItem.Children);
+            RefreshView(itemToSelect);
+            StatusText.Text = $"Sorted {itemToSelect.Title}. Click Save to keep it.";
+            return;
+        }
+
+        List<LauncherItem>? siblings = FindSiblings(controller.Config.Items, selectedItem);
+        if (siblings is null)
+        {
+            return;
+        }
+
+        SortItems(siblings);
+        RefreshView(itemToSelect);
+        StatusText.Text = $"Sorted this level. Click Save to keep it.";
+    }
+
+    private static void SortItems(List<LauncherItem> items)
+    {
+        List<LauncherItem> sortedItems = items
+            .OrderByDescending(item => item.IsFavorite)
+            .ThenBy(item => item.Title, StringComparer.CurrentCultureIgnoreCase)
+            .ThenBy(item => item.Type)
+            .ToList();
+
+        items.Clear();
+        items.AddRange(sortedItems);
+    }
+
     private static bool RemoveItem(List<LauncherItem> items, LauncherItem item)
     {
         if (items.Remove(item))
@@ -1491,6 +1556,11 @@ public partial class MainWindow : Window
                 issues.Add(new TargetValidationIssue(string.Join(" > ", itemPath), problem));
             }
 
+            if (!item.IsDisabled && TryGetWorkingFolderIssue(item, out string? workingFolderProblem) && workingFolderProblem is not null)
+            {
+                issues.Add(new TargetValidationIssue(string.Join(" > ", itemPath), workingFolderProblem));
+            }
+
             if (item.Children.Count > 0)
             {
                 ValidateTargets(item.Children, itemPath, issues);
@@ -1559,6 +1629,25 @@ public partial class MainWindow : Window
         }
     }
 
+    private static bool TryGetWorkingFolderIssue(LauncherItem item, out string? problem)
+    {
+        problem = null;
+
+        if (!LauncherController.CanUseLaunchOptions(item.Type) || string.IsNullOrWhiteSpace(item.WorkingFolder))
+        {
+            return false;
+        }
+
+        string workingFolder = Environment.ExpandEnvironmentVariables(item.WorkingFolder.Trim());
+        if (Directory.Exists(workingFolder))
+        {
+            return false;
+        }
+
+        problem = "Working folder does not exist.";
+        return true;
+    }
+
     private static bool CommandExistsOnPath(string target)
     {
         if (target.IndexOfAny([Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar]) >= 0)
@@ -1734,6 +1823,42 @@ public partial class MainWindow : Window
         ThemeService.Apply(scheme);
     }
 
+    private void BrowseWorkingFolder_Click(object sender, RoutedEventArgs e)
+    {
+        using FolderBrowserDialog dialog = new()
+        {
+            Description = "Choose a working folder"
+        };
+
+        if (!string.IsNullOrWhiteSpace(WorkingFolderBox.Text))
+        {
+            string currentFolder = Environment.ExpandEnvironmentVariables(WorkingFolderBox.Text.Trim());
+            if (Directory.Exists(currentFolder))
+            {
+                dialog.SelectedPath = currentFolder;
+            }
+        }
+
+        if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+        {
+            WorkingFolderBox.Text = dialog.SelectedPath;
+        }
+    }
+
+    private void LaunchOptionBox_Changed(object sender, RoutedEventArgs e)
+    {
+        if (isLoadingSelection)
+        {
+            return;
+        }
+
+        UpdatePreview();
+        if (selectedItem is not null)
+        {
+            StatusText.Text = "Click Save to keep the selected item launch options.";
+        }
+    }
+
     private void EnsureAutomaticIconPath()
     {
         if (TypeBox.SelectedItem is LauncherItemType.Menu)
@@ -1810,9 +1935,18 @@ public partial class MainWindow : Window
             Type = TypeBox.SelectedItem is LauncherItemType type ? type : LauncherItemType.App,
             Target = TargetBox.Text.Trim(),
             Arguments = string.IsNullOrWhiteSpace(ArgumentsBox.Text) ? null : ArgumentsBox.Text.Trim(),
+            WorkingFolder = LauncherController.CanUseLaunchOptions(TypeBox.SelectedItem is LauncherItemType itemType ? itemType : LauncherItemType.App) &&
+                !string.IsNullOrWhiteSpace(WorkingFolderBox.Text)
+                    ? WorkingFolderBox.Text.Trim()
+                    : null,
+            Notes = string.IsNullOrWhiteSpace(NotesBox.Text) ? null : NotesBox.Text.Trim(),
             IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim(),
             IsFavorite = selectedItem.IsFavorite,
             IsDisabled = selectedItem.IsDisabled,
+            RunAsAdmin = LauncherController.CanRunAsAdmin(TypeBox.SelectedItem is LauncherItemType adminType ? adminType : LauncherItemType.App) &&
+                RunAsAdminBox.IsChecked == true,
+            StartMinimized = LauncherController.CanUseLaunchOptions(TypeBox.SelectedItem is LauncherItemType launchType ? launchType : LauncherItemType.App) &&
+                StartMinimizedBox.IsChecked == true,
             DisplayMode = ItemDisplayModeBox.SelectedItem is LauncherDisplayMode mode
                 ? mode
                 : selectedItem.DisplayMode
@@ -1879,12 +2013,30 @@ public partial class MainWindow : Window
     private void UpdateTargetAvailability()
     {
         bool isMenu = TypeBox.SelectedItem is LauncherItemType.Menu;
+        bool canUseLaunchOptions = TypeBox.SelectedItem is LauncherItemType launchType && LauncherController.CanUseLaunchOptions(launchType);
+        bool canRunAsAdmin = TypeBox.SelectedItem is LauncherItemType itemType && LauncherController.CanRunAsAdmin(itemType);
         TargetBox.IsEnabled = !isMenu;
         ArgumentsBox.IsEnabled = !isMenu;
+        WorkingFolderBox.IsEnabled = canUseLaunchOptions;
+        WorkingFolderBrowseButton.IsEnabled = canUseLaunchOptions;
+        RunAsAdminBox.IsEnabled = canRunAsAdmin;
+        StartMinimizedBox.IsEnabled = canUseLaunchOptions;
         if (isMenu && !isLoadingSelection)
         {
             TargetBox.Text = "";
             ArgumentsBox.Text = "";
+            WorkingFolderBox.Text = "";
+        }
+
+        if (!canRunAsAdmin && !isLoadingSelection)
+        {
+            RunAsAdminBox.IsChecked = false;
+        }
+
+        if (!canUseLaunchOptions && !isLoadingSelection)
+        {
+            WorkingFolderBox.Text = "";
+            StartMinimizedBox.IsChecked = false;
         }
     }
 

Models/LauncherConfig.cs

@@ -23,12 +23,20 @@ public sealed class LauncherItem
 
     public string? Arguments { get; set; }
 
+    public string? WorkingFolder { get; set; }
+
+    public string? Notes { get; set; }
+
     public string? IconPath { get; set; }
 
     public bool IsFavorite { get; set; }
 
     public bool IsDisabled { get; set; }
 
+    public bool RunAsAdmin { get; set; }
+
+    public bool StartMinimized { get; set; }
+
     public LauncherDisplayMode DisplayMode { get; set; } = LauncherDisplayMode.CompactList;
 
     public List<LauncherItem> Children { get; set; } = [];

README.md

@@ -12,15 +12,21 @@ Download the compiled Windows release from:
 
 - System tray launcher
 - Global hotkey, default `Ctrl+Alt+Space`
-- Search/filter in the launcher popup
+- Search/filter in the launcher popup with parent menu context
+- Keyboard navigation in the launcher popup
+- Tooltips for launcher items, menu paths, targets, and arguments
 - Recent items section for quickly relaunching entries
 - Nested menus, drag/drop ordering, and drag/drop item creation in Settings
 - Right-click launcher entries to edit them in Settings
 - Right-click launcher entries to pin or unpin them from the top
 - Right-click launcher entries or Settings items to temporarily disable them
 - Right-click app/file entries to open their containing folder
+- Optional run-as-administrator mode for app and file entries
+- Optional working folder and start-minimized launch options for app and file entries
+- Per-item notes, visible in launcher tooltips and searchable from the popup
 - Validate missing app, file, and folder targets from Settings
 - Export and import selected items or menu sections
+- Sort a selected menu or item level alphabetically
 - Right-click item duplication in Settings
 - Right-click items in Settings to pin them to the top of their menu
 - Per-item icon and display mode

Services/LauncherController.cs

@@ -180,9 +180,13 @@ public sealed class LauncherController : IDisposable
             Type = item.Type,
             Target = item.Target,
             Arguments = item.Arguments,
+            WorkingFolder = item.WorkingFolder,
+            Notes = item.Notes,
             IconPath = item.IconPath,
             IsFavorite = false,
             IsDisabled = false,
+            RunAsAdmin = item.RunAsAdmin,
+            StartMinimized = item.StartMinimized,
             DisplayMode = item.DisplayMode,
             Children = []
         };
@@ -275,17 +279,30 @@ public sealed class LauncherController : IDisposable
         }
 
         string target = Environment.ExpandEnvironmentVariables(item.Target);
+        bool runAsAdmin = item.RunAsAdmin && CanRunAsAdmin(item.Type);
+        string launchTarget = runAsAdmin ? ResolveExecutableTarget(target) : target;
+        string workingDirectory = GetWorkingDirectory(item, target);
 
         try
         {
             ProcessStartInfo startInfo = new()
             {
-                FileName = target,
+                FileName = launchTarget,
                 Arguments = item.Arguments ?? "",
                 UseShellExecute = true,
-                WorkingDirectory = Directory.Exists(target) ? target : ConfigService.AppFolder
+                WorkingDirectory = workingDirectory
             };
 
+            if (runAsAdmin)
+            {
+                startInfo.Verb = "runas";
+            }
+
+            if (item.StartMinimized && CanUseLaunchOptions(item.Type))
+            {
+                startInfo.WindowStyle = ProcessWindowStyle.Minimized;
+            }
+
             Process.Start(startInfo);
             return true;
         }
@@ -295,4 +312,56 @@ public sealed class LauncherController : IDisposable
             return false;
         }
     }
+
+    public static bool CanRunAsAdmin(LauncherItemType itemType)
+    {
+        return itemType is LauncherItemType.App or LauncherItemType.File;
+    }
+
+    public static bool CanUseLaunchOptions(LauncherItemType itemType)
+    {
+        return itemType is LauncherItemType.App or LauncherItemType.File;
+    }
+
+    private static string GetWorkingDirectory(LauncherItem item, string target)
+    {
+        if (CanUseLaunchOptions(item.Type) && !string.IsNullOrWhiteSpace(item.WorkingFolder))
+        {
+            string configuredFolder = Environment.ExpandEnvironmentVariables(item.WorkingFolder.Trim());
+            if (Directory.Exists(configuredFolder))
+            {
+                return configuredFolder;
+            }
+        }
+
+        return Directory.Exists(target) ? target : ConfigService.AppFolder;
+    }
+
+    private static string ResolveExecutableTarget(string target)
+    {
+        if (Path.IsPathRooted(target) || Path.GetDirectoryName(target) is { Length: > 0 })
+        {
+            return target;
+        }
+
+        string[] searchFolders =
+        [
+            Environment.CurrentDirectory,
+            Environment.GetFolderPath(Environment.SpecialFolder.Windows),
+            Environment.GetFolderPath(Environment.SpecialFolder.System),
+            .. (Environment.GetEnvironmentVariable("PATH") ?? "")
+                .Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
+        ];
+
+        foreach (string folder in searchFolders.Where(Directory.Exists).Distinct(StringComparer.OrdinalIgnoreCase))
+        {
+            string candidate = Path.Combine(folder, target);
+            if (File.Exists(candidate))
+            {
+                return candidate;
+            }
+        }
+
+        return target;
+    }
 }

TaskbarLauncher.csproj

@@ -12,8 +12,8 @@
     <Authors>Ray Berezowski</Authors>
     <ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
     <Version>1.0.1</Version>
-    <AssemblyVersion>1.0.1.12</AssemblyVersion>
-    <FileVersion>1.0.1.12</FileVersion>
+    <AssemblyVersion>1.0.1.21</AssemblyVersion>
+    <FileVersion>1.0.1.21</FileVersion>
     <InformationalVersion>1.0.1</InformationalVersion>
   </PropertyGroup>
 

Views/LauncherPopup.xaml.cs

@@ -14,6 +14,7 @@ public partial class LauncherPopup : Window
     private const double HeaderAndChromeHeight = 118;
     private bool isRepositionQueued;
     private readonly List<System.Windows.Controls.Button> visibleLaunchButtons = [];
+    private readonly List<System.Windows.Controls.Control> visibleNavigationControls = [];
 
     private readonly LauncherConfig config;
     private readonly Action<LauncherItem> launchItem;
@@ -21,6 +22,7 @@ public partial class LauncherPopup : Window
     private readonly Action showSettings;
     private readonly Action<LauncherItem> editItem;
     private readonly Action<LauncherItem> openContainingFolder;
+    private sealed record SearchMatch(LauncherItem Item, string ParentPath);
 
     public LauncherPopup(LauncherConfig config, Action<LauncherItem> launchItem, Action<LauncherItem> openAllItems, Action showSettings, Action<LauncherItem> editItem, Action<LauncherItem> openContainingFolder)
     {
@@ -95,6 +97,7 @@ public partial class LauncherPopup : Window
     {
         ItemsPanel.Children.Clear();
         visibleLaunchButtons.Clear();
+        visibleNavigationControls.Clear();
 
         if (config.RecentItems.Any(item => !item.IsDisabled))
         {
@@ -106,6 +109,8 @@ public partial class LauncherPopup : Window
         {
             ItemsPanel.Children.Add(CreateItemControl(item, 0, expandMenusByDefault));
         }
+
+        RebuildNavigationLists();
     }
 
     private Expander CreateRecentItemsControl()
@@ -114,8 +119,12 @@ public partial class LauncherPopup : Window
         {
             Header = new TextBlock { Text = "Recent" },
             IsExpanded = true,
-            Margin = new Thickness(0, 4, 0, 8)
+            Margin = new Thickness(0, 4, 0, 8),
+            Focusable = true
         };
+        expander.KeyDown += NavigationControl_KeyDown;
+        expander.Expanded += (_, _) => RebuildNavigationAndReposition();
+        expander.Collapsed += (_, _) => RebuildNavigationAndReposition();
 
         StackPanel recentItems = new();
         foreach (LauncherItem item in config.RecentItems.Where(item => !item.IsDisabled))
@@ -135,8 +144,14 @@ public partial class LauncherPopup : Window
             {
                 Header = CreateMenuHeader(item),
                 IsExpanded = expandMenusByDefault,
-                Margin = new Thickness(depth * 12, 4, 0, 4)
+                Margin = new Thickness(depth * 12, 4, 0, 4),
+                Focusable = true,
+                Tag = item,
+                ToolTip = CreateItemToolTip(item)
             };
+            expander.KeyDown += NavigationControl_KeyDown;
+            expander.Expanded += (_, _) => RebuildNavigationAndReposition();
+            expander.Collapsed += (_, _) => RebuildNavigationAndReposition();
 
             StackPanel children = new();
             foreach (LauncherItem child in GetDisplayItems(item.Children))
@@ -154,7 +169,8 @@ public partial class LauncherPopup : Window
             Margin = new Thickness(depth * 12, 2, 0, 2),
             MinHeight = DisplayModeMetrics.GetRowHeight(GetEffectiveDisplayMode(item)),
             HorizontalContentAlignment = System.Windows.HorizontalAlignment.Left,
-            Tag = item
+            Tag = item,
+            ToolTip = CreateItemToolTip(item)
         };
 
         button.Click += (_, _) => launchItem(item);
@@ -163,20 +179,7 @@ public partial class LauncherPopup : Window
             button.ContextMenu = CreateItemContextMenu(item);
         }
 
-        button.KeyDown += (_, e) =>
-        {
-            if (e.Key == Key.Enter)
-            {
-                launchItem(item);
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Escape)
-            {
-                Close();
-                e.Handled = true;
-            }
-        };
-        visibleLaunchButtons.Add(button);
+        button.KeyDown += LaunchButton_KeyDown;
         return button;
     }
 
@@ -203,7 +206,8 @@ public partial class LauncherPopup : Window
         return new TextBlock
         {
             Text = item.Title,
-            ContextMenu = contextMenu
+            ContextMenu = contextMenu,
+            ToolTip = CreateItemToolTip(item)
         };
     }
 
@@ -212,6 +216,7 @@ public partial class LauncherPopup : Window
         System.Windows.Controls.ContextMenu contextMenu = new();
         contextMenu.Items.Add(CreatePinMenuItem(item));
         contextMenu.Items.Add(CreateDisableMenuItem(item));
+        contextMenu.Items.Add(CreateRunAsAdminMenuItem(item));
         contextMenu.Items.Add(CreateOpenContainingFolderMenuItem(item));
         contextMenu.Items.Add(CreateEditMenuItem(item));
         return contextMenu;
@@ -253,6 +258,25 @@ public partial class LauncherPopup : Window
         return disableMenuItem;
     }
 
+    private System.Windows.Controls.MenuItem CreateRunAsAdminMenuItem(LauncherItem item)
+    {
+        System.Windows.Controls.MenuItem runAsAdminMenuItem = new()
+        {
+            Header = item.RunAsAdmin ? "Run as Admin: On" : "Run as Admin: Off",
+            IsEnabled = LauncherController.CanRunAsAdmin(item.Type)
+        };
+        runAsAdminMenuItem.Click += (_, e) =>
+        {
+            item.RunAsAdmin = !item.RunAsAdmin;
+            ConfigService.Save(config);
+            BuildItems();
+            QueueReposition();
+            e.Handled = true;
+        };
+
+        return runAsAdminMenuItem;
+    }
+
     private System.Windows.Controls.MenuItem CreateOpenContainingFolderMenuItem(LauncherItem item)
     {
         System.Windows.Controls.MenuItem openFolderMenuItem = new()
@@ -322,8 +346,8 @@ public partial class LauncherPopup : Window
         ItemsPanel.Children.Clear();
         visibleLaunchButtons.Clear();
 
-        List<LauncherItem> matches = [];
-        CollectMatches(config.Items, query, matches);
+        List<SearchMatch> matches = [];
+        CollectMatches(config.Items, query, [], matches);
 
         if (matches.Count == 0)
         {
@@ -336,34 +360,179 @@ public partial class LauncherPopup : Window
             return;
         }
 
-        foreach (LauncherItem item in matches)
+        foreach (SearchMatch match in matches)
         {
-            ItemsPanel.Children.Add(CreateItemControl(item, 0, expandMenusByDefault: false));
+            ItemsPanel.Children.Add(CreateSearchResultControl(match));
+        }
+
+        RebuildNavigationLists();
+    }
+
+    private FrameworkElement CreateSearchResultControl(SearchMatch match)
+    {
+        System.Windows.Controls.Button button = new()
+        {
+            Content = CreateSearchResultContent(match),
+            Margin = new Thickness(0, 2, 0, 2),
+            MinHeight = Math.Max(DisplayModeMetrics.GetRowHeight(GetEffectiveDisplayMode(match.Item)), 48),
+            HorizontalContentAlignment = System.Windows.HorizontalAlignment.Left,
+            Tag = match.Item,
+            ContextMenu = CreateItemContextMenu(match.Item),
+            ToolTip = CreateItemToolTip(match.Item, match.ParentPath)
+        };
+
+        button.Click += (_, _) => launchItem(match.Item);
+        button.KeyDown += LaunchButton_KeyDown;
+
+        return button;
+    }
+
+    private void RebuildNavigationAndReposition()
+    {
+        RebuildNavigationLists();
+        QueueReposition();
+    }
+
+    private void RebuildNavigationLists()
+    {
+        visibleLaunchButtons.Clear();
+        visibleNavigationControls.Clear();
+        AddVisibleNavigationControls(ItemsPanel.Children);
+    }
+
+    private void AddVisibleNavigationControls(UIElementCollection elements)
+    {
+        foreach (UIElement element in elements)
+        {
+            switch (element)
+            {
+                case Expander expander:
+                    visibleNavigationControls.Add(expander);
+                    if (expander.IsExpanded && expander.Content is System.Windows.Controls.Panel panel)
+                    {
+                        AddVisibleNavigationControls(panel.Children);
+                    }
+
+                    break;
+
+                case System.Windows.Controls.Button button:
+                    visibleNavigationControls.Add(button);
+                    if (button.Tag is LauncherItem)
+                    {
+                        visibleLaunchButtons.Add(button);
+                    }
+
+                    break;
+            }
         }
     }
 
-    private static void CollectMatches(IEnumerable<LauncherItem> items, string query, List<LauncherItem> matches)
+    private object CreateSearchResultContent(SearchMatch match)
+    {
+        StackPanel panel = new();
+        panel.Children.Add((UIElement)CreateButtonContent(match.Item));
+
+        if (!string.IsNullOrWhiteSpace(match.ParentPath))
+        {
+            panel.Children.Add(new TextBlock
+            {
+                Text = match.ParentPath,
+                FontSize = 11,
+                Foreground = (System.Windows.Media.Brush)System.Windows.Application.Current.Resources["AppMutedTextBrush"],
+                Margin = new Thickness(0, 3, 0, 0),
+                TextTrimming = TextTrimming.CharacterEllipsis
+            });
+        }
+
+        return panel;
+    }
+
+    private static System.Windows.Controls.ToolTip CreateItemToolTip(LauncherItem item, string? parentPath = null)
+    {
+        StackPanel panel = new() { MaxWidth = 520 };
+        AddToolTipLine(panel, item.Title, bold: true);
+        AddToolTipLine(panel, $"Type: {item.Type}");
+
+        if (!string.IsNullOrWhiteSpace(parentPath))
+        {
+            AddToolTipLine(panel, $"Menu: {parentPath}");
+        }
+
+        if (!string.IsNullOrWhiteSpace(item.Target))
+        {
+            AddToolTipLine(panel, $"Target: {item.Target}");
+        }
+
+        if (!string.IsNullOrWhiteSpace(item.Arguments))
+        {
+            AddToolTipLine(panel, $"Arguments: {item.Arguments}");
+        }
+
+        if (!string.IsNullOrWhiteSpace(item.WorkingFolder))
+        {
+            AddToolTipLine(panel, $"Working folder: {item.WorkingFolder}");
+        }
+
+        if (!string.IsNullOrWhiteSpace(item.Notes))
+        {
+            AddToolTipLine(panel, $"Notes: {item.Notes}");
+        }
+
+        if (item.IsFavorite)
+        {
+            AddToolTipLine(panel, "Pinned to top");
+        }
+
+        if (item.RunAsAdmin)
+        {
+            AddToolTipLine(panel, "Runs as administrator");
+        }
+
+        if (item.StartMinimized)
+        {
+            AddToolTipLine(panel, "Starts minimized");
+        }
+
+        return new System.Windows.Controls.ToolTip { Content = panel };
+    }
+
+    private static void AddToolTipLine(StackPanel panel, string text, bool bold = false)
+    {
+        panel.Children.Add(new TextBlock
+        {
+            Text = text,
+            FontWeight = bold ? FontWeights.SemiBold : FontWeights.Normal,
+            TextWrapping = TextWrapping.Wrap,
+            Margin = panel.Children.Count == 0 ? new Thickness(0) : new Thickness(0, 3, 0, 0)
+        });
+    }
+
+    private static void CollectMatches(IEnumerable<LauncherItem> items, string query, List<string> parentNames, List<SearchMatch> matches)
     {
         foreach (LauncherItem item in GetDisplayItems(items))
         {
             bool isLaunchable = item.Type != LauncherItemType.Menu && !item.IsDisabled;
-            if (isLaunchable && Matches(item, query))
+            string parentPath = string.Join(" > ", parentNames);
+            if (isLaunchable && Matches(item, query, parentPath))
             {
-                matches.Add(item);
+                matches.Add(new SearchMatch(item, parentPath));
             }
 
             if (item.Children.Count > 0)
             {
-                CollectMatches(item.Children, query, matches);
+                string menuName = string.IsNullOrWhiteSpace(item.Title) ? "Untitled" : item.Title;
+                CollectMatches(item.Children, query, [.. parentNames, menuName], matches);
             }
         }
     }
 
-    private static bool Matches(LauncherItem item, string query)
+    private static bool Matches(LauncherItem item, string query, string parentPath)
     {
         return item.Title.Contains(query, StringComparison.OrdinalIgnoreCase) ||
             item.Target.Contains(query, StringComparison.OrdinalIgnoreCase) ||
-            (item.Arguments?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false);
+            (item.Arguments?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false) ||
+            (item.Notes?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false) ||
+            parentPath.Contains(query, StringComparison.OrdinalIgnoreCase);
     }
 
     private void SearchBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
@@ -382,14 +551,142 @@ public partial class LauncherPopup : Window
             return;
         }
 
-        if (e.Key == Key.Down && visibleLaunchButtons.FirstOrDefault() is System.Windows.Controls.Button firstButton)
+        if (e.Key == Key.Down)
         {
-            Keyboard.ClearFocus();
-            firstButton.Focus();
+            FocusNavigationControl(0);
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Up)
+        {
+            FocusNavigationControl(visibleNavigationControls.Count - 1);
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Home)
+        {
+            SearchBox.CaretIndex = 0;
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.End)
+        {
+            SearchBox.CaretIndex = SearchBox.Text.Length;
             e.Handled = true;
         }
     }
 
+    private void LaunchButton_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+    {
+        if (sender is not System.Windows.Controls.Button button)
+        {
+            return;
+        }
+
+        if (e.Key == Key.Enter && button.Tag is LauncherItem item)
+        {
+            launchItem(item);
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Escape)
+        {
+            Close();
+            e.Handled = true;
+            return;
+        }
+
+        HandleNavigationControlKey(button, e);
+    }
+
+    private void NavigationControl_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+    {
+        if (sender is not System.Windows.Controls.Control control)
+        {
+            return;
+        }
+
+        if (e.Key == Key.Enter && control is Expander expander)
+        {
+            expander.IsExpanded = !expander.IsExpanded;
+            QueueReposition();
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Escape)
+        {
+            Close();
+            e.Handled = true;
+            return;
+        }
+
+        HandleNavigationControlKey(control, e);
+    }
+
+    private void HandleNavigationControlKey(System.Windows.Controls.Control control, System.Windows.Input.KeyEventArgs e)
+    {
+        int index = visibleNavigationControls.IndexOf(control);
+        if (index < 0)
+        {
+            return;
+        }
+
+        if (e.Key == Key.Down)
+        {
+            FocusNavigationControl(index + 1);
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Up)
+        {
+            if (index == 0)
+            {
+                SearchBox.Focus();
+                SearchBox.CaretIndex = SearchBox.Text.Length;
+            }
+            else
+            {
+                FocusNavigationControl(index - 1);
+            }
+
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.Home)
+        {
+            FocusNavigationControl(0);
+            e.Handled = true;
+            return;
+        }
+
+        if (e.Key == Key.End)
+        {
+            FocusNavigationControl(visibleNavigationControls.Count - 1);
+            e.Handled = true;
+        }
+    }
+
+    private void FocusNavigationControl(int index)
+    {
+        if (visibleNavigationControls.Count == 0)
+        {
+            return;
+        }
+
+        int clampedIndex = Math.Clamp(index, 0, visibleNavigationControls.Count - 1);
+        System.Windows.Controls.Control control = visibleNavigationControls[clampedIndex];
+        Keyboard.ClearFocus();
+        control.Focus();
+        control.BringIntoView();
+    }
+
     protected override void OnKeyDown(System.Windows.Input.KeyEventArgs e)
     {
         if (e.Key == Key.Escape)

config.example.json

@@ -9,9 +9,13 @@
       "Type": "Menu",
       "Target": "",
       "Arguments": null,
+      "WorkingFolder": null,
+      "Notes": null,
       "IconPath": null,
       "IsFavorite": false,
       "IsDisabled": false,
+      "RunAsAdmin": false,
+      "StartMinimized": false,
       "DisplayMode": "CompactList",
       "Children": [
         {
@@ -19,9 +23,13 @@
           "Type": "Folder",
           "Target": "%USERPROFILE%\\Documents",
           "Arguments": null,
+          "WorkingFolder": null,
+          "Notes": null,
           "IconPath": "%USERPROFILE%\\Documents",
           "IsFavorite": false,
           "IsDisabled": false,
+          "RunAsAdmin": false,
+          "StartMinimized": false,
           "DisplayMode": "CompactList",
           "Children": []
         },
@@ -30,9 +38,13 @@
           "Type": "Folder",
           "Target": "%USERPROFILE%\\Downloads",
           "Arguments": null,
+          "WorkingFolder": null,
+          "Notes": null,
           "IconPath": "%USERPROFILE%\\Downloads",
           "IsFavorite": false,
           "IsDisabled": false,
+          "RunAsAdmin": false,
+          "StartMinimized": false,
           "DisplayMode": "CompactList",
           "Children": []
         }
@@ -43,9 +55,13 @@
       "Type": "Menu",
       "Target": "",
       "Arguments": null,
+      "WorkingFolder": null,
+      "Notes": null,
       "IconPath": null,
       "IsFavorite": false,
       "IsDisabled": false,
+      "RunAsAdmin": false,
+      "StartMinimized": false,
       "DisplayMode": "CompactList",
       "Children": [
         {
@@ -53,9 +69,13 @@
           "Type": "App",
           "Target": "notepad.exe",
           "Arguments": null,
+          "WorkingFolder": null,
+          "Notes": "Simple starter app entry.",
           "IconPath": "notepad.exe",
           "IsFavorite": false,
           "IsDisabled": false,
+          "RunAsAdmin": false,
+          "StartMinimized": false,
           "DisplayMode": "CompactList",
           "Children": []
         }

docs/INSTALL.md

@@ -26,6 +26,12 @@ Install the **.NET Desktop Runtime** for **Windows x64**.
 
 Recently launched entries appear in the launcher popup under **Recent**.
 
+Search results include the parent menu path when an item is inside a menu.
+
+Use arrow keys, Home, End, Enter, and Escape to navigate the launcher popup from the keyboard.
+
+Hover over launcher items to see details such as type, menu path, target, and arguments.
+
 ## Configure
 
 Open the tray menu and choose **Settings**.
@@ -41,8 +47,12 @@ From Settings you can:
 - Right-click an item and choose **Pin to Top** to show it first in its menu
 - Right-click an item and choose **Disable Item** or **Enable Item** to hide or restore it
 - Right-click an app or file item and choose **Open Containing Folder**
+- Enable **Run as administrator** for app and file items that need elevation
+- Set a working folder or start apps minimized for app and file items
+- Add notes to items for reminders, context, or search keywords
 - Use **Config... > Validate Targets** to check for missing app, file, and folder targets
 - Use **Config... > Export Selected Item** or **Import Item** to share one item or menu section
+- Right-click an item and choose **Sort This Menu** or **Sort This Level**
 - Set per-item icon sizes
 - Back up and restore `config.json`
 - Enable Start with Windows