Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1601da8155 | ||
|
|
6d9bbbab02 | ||
|
|
5421e3dde3 | ||
|
|
004a7e7c89 | ||
|
|
f2ccca2ed1 | ||
|
|
c606573900 | ||
|
|
86f667f595 |
@@ -67,6 +67,8 @@
|
||||
<Separator/>
|
||||
<MenuItem Header="Export Config" Click="ExportConfig_Click"/>
|
||||
<MenuItem Header="Import Config" Click="ImportConfig_Click"/>
|
||||
<MenuItem Header="Export Selected Item" Click="ExportSelectedItem_Click"/>
|
||||
<MenuItem Header="Import Item" Click="ImportItem_Click"/>
|
||||
<Separator/>
|
||||
<MenuItem Header="Reset to Defaults" Click="ResetConfig_Click"/>
|
||||
<MenuItem Header="Reload Config" Click="ReloadConfig_Click"/>
|
||||
@@ -132,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"/>
|
||||
@@ -210,8 +213,15 @@
|
||||
<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"
|
||||
<TextBlock Text="Launch Options" Grid.Row="6" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
||||
<CheckBox x:Name="RunAsAdminBox" Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2"
|
||||
Content="Run as administrator"
|
||||
Margin="0,0,0,8"
|
||||
Checked="RunAsAdminBox_Changed"
|
||||
Unchecked="RunAsAdminBox_Changed"/>
|
||||
|
||||
<TextBlock Text="Preview" Grid.Row="7" VerticalAlignment="Top" Margin="0,4,8,0"/>
|
||||
<Border Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="2"
|
||||
BorderThickness="1"
|
||||
BorderBrush="{DynamicResource AppBorderBrush}"
|
||||
Background="{DynamicResource AppSurfaceBrush}"
|
||||
|
||||
@@ -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;
|
||||
@@ -609,6 +616,7 @@ public partial class MainWindow : Window
|
||||
IconPathBox.Text = item.IconPath ?? "";
|
||||
loadedAutoIconPath = GetAutomaticIconPath(item);
|
||||
ItemDisplayModeBox.SelectedItem = item.DisplayMode;
|
||||
RunAsAdminBox.IsChecked = item.RunAsAdmin;
|
||||
UpdateTargetAvailability();
|
||||
isLoadingSelection = false;
|
||||
UpdatePreview();
|
||||
@@ -626,6 +634,7 @@ public partial class MainWindow : Window
|
||||
IconPathBox.Text = "";
|
||||
loadedAutoIconPath = null;
|
||||
ItemDisplayModeBox.SelectedItem = controller?.Config.DisplayMode;
|
||||
RunAsAdminBox.IsChecked = false;
|
||||
UpdateTargetAvailability();
|
||||
isLoadingSelection = false;
|
||||
UpdatePreview();
|
||||
@@ -650,6 +659,7 @@ public partial class MainWindow : Window
|
||||
{
|
||||
selectedItem.DisplayMode = itemMode;
|
||||
}
|
||||
selectedItem.RunAsAdmin = LauncherController.CanRunAsAdmin(selectedItem.Type) && RunAsAdminBox.IsChecked == true;
|
||||
|
||||
if (selectedItem.Type != LauncherItemType.Menu)
|
||||
{
|
||||
@@ -959,6 +969,7 @@ public partial class MainWindow : Window
|
||||
IconPath = item.IconPath,
|
||||
IsFavorite = item.IsFavorite,
|
||||
IsDisabled = item.IsDisabled,
|
||||
RunAsAdmin = item.RunAsAdmin,
|
||||
DisplayMode = item.DisplayMode,
|
||||
Children = item.Children.Select(child => DuplicateItem(child, renameRoot: false)).ToList()
|
||||
};
|
||||
@@ -1046,6 +1057,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))
|
||||
@@ -1260,6 +1311,114 @@ public partial class MainWindow : Window
|
||||
}
|
||||
}
|
||||
|
||||
private void ExportSelectedItem_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (selectedItem is null)
|
||||
{
|
||||
MessageBox.Show("Select an item or menu to export first.", "Taskbar Launcher");
|
||||
return;
|
||||
}
|
||||
|
||||
ApplyCurrentItem();
|
||||
string safeTitle = MakeSafeFileName(string.IsNullOrWhiteSpace(selectedItem.Title) ? "launcher-item" : selectedItem.Title);
|
||||
using SaveFileDialog dialog = new()
|
||||
{
|
||||
Title = "Export selected launcher item",
|
||||
Filter = "JSON item files|*.json|All files|*.*",
|
||||
FileName = $"{safeTitle}-{DateTime.Now:yyyyMMdd-HHmmss}.json",
|
||||
InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)
|
||||
};
|
||||
|
||||
if (dialog.ShowDialog() != System.Windows.Forms.DialogResult.OK)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
string exportPath = ConfigService.ExportItemTo(dialog.FileName, selectedItem);
|
||||
StatusText.Text = $"Exported {selectedItem.Title} to {exportPath}";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"Could not export selected item.\n\n{ex.Message}", "Taskbar Launcher");
|
||||
}
|
||||
}
|
||||
|
||||
private void ImportItem_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (controller is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
using OpenFileDialog dialog = new()
|
||||
{
|
||||
Title = "Import launcher item",
|
||||
Filter = "JSON item files|*.json|All files|*.*",
|
||||
InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)
|
||||
};
|
||||
|
||||
if (dialog.ShowDialog() != System.Windows.Forms.DialogResult.OK)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
ApplyCurrentItem();
|
||||
LauncherItem importedItem = ConfigService.ImportItemFrom(dialog.FileName);
|
||||
AddImportedItem(importedItem);
|
||||
selectedPath = FindItemPath(importedItem);
|
||||
RefreshView(importedItem);
|
||||
StatusText.Text = $"Imported {importedItem.Title}. Click Save to keep it.";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show($"Could not import item.\n\n{ex.Message}", "Taskbar Launcher");
|
||||
}
|
||||
}
|
||||
|
||||
private void AddImportedItem(LauncherItem importedItem)
|
||||
{
|
||||
if (controller is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (selectedItem is null)
|
||||
{
|
||||
controller.Config.Items.Add(importedItem);
|
||||
return;
|
||||
}
|
||||
|
||||
if (selectedItem.Type == LauncherItemType.Menu)
|
||||
{
|
||||
selectedItem.Children.Add(importedItem);
|
||||
return;
|
||||
}
|
||||
|
||||
List<LauncherItem>? siblings = FindSiblings(controller.Config.Items, selectedItem);
|
||||
if (siblings is null)
|
||||
{
|
||||
controller.Config.Items.Add(importedItem);
|
||||
return;
|
||||
}
|
||||
|
||||
int selectedIndex = siblings.IndexOf(selectedItem);
|
||||
siblings.Insert(selectedIndex + 1, importedItem);
|
||||
}
|
||||
|
||||
private static string MakeSafeFileName(string fileName)
|
||||
{
|
||||
foreach (char invalidChar in Path.GetInvalidFileNameChars())
|
||||
{
|
||||
fileName = fileName.Replace(invalidChar, '-');
|
||||
}
|
||||
|
||||
return fileName.Trim();
|
||||
}
|
||||
|
||||
private void ResetConfig_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
MessageBoxResult result = MessageBox.Show(
|
||||
@@ -1626,6 +1785,20 @@ public partial class MainWindow : Window
|
||||
ThemeService.Apply(scheme);
|
||||
}
|
||||
|
||||
private void RunAsAdminBox_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)
|
||||
@@ -1705,6 +1878,8 @@ public partial class MainWindow : Window
|
||||
IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim(),
|
||||
IsFavorite = selectedItem.IsFavorite,
|
||||
IsDisabled = selectedItem.IsDisabled,
|
||||
RunAsAdmin = LauncherController.CanRunAsAdmin(TypeBox.SelectedItem is LauncherItemType itemType ? itemType : LauncherItemType.App) &&
|
||||
RunAsAdminBox.IsChecked == true,
|
||||
DisplayMode = ItemDisplayModeBox.SelectedItem is LauncherDisplayMode mode
|
||||
? mode
|
||||
: selectedItem.DisplayMode
|
||||
@@ -1771,13 +1946,20 @@ public partial class MainWindow : Window
|
||||
private void UpdateTargetAvailability()
|
||||
{
|
||||
bool isMenu = TypeBox.SelectedItem is LauncherItemType.Menu;
|
||||
bool canRunAsAdmin = TypeBox.SelectedItem is LauncherItemType itemType && LauncherController.CanRunAsAdmin(itemType);
|
||||
TargetBox.IsEnabled = !isMenu;
|
||||
ArgumentsBox.IsEnabled = !isMenu;
|
||||
RunAsAdminBox.IsEnabled = canRunAsAdmin;
|
||||
if (isMenu && !isLoadingSelection)
|
||||
{
|
||||
TargetBox.Text = "";
|
||||
ArgumentsBox.Text = "";
|
||||
}
|
||||
|
||||
if (!canRunAsAdmin && !isLoadingSelection)
|
||||
{
|
||||
RunAsAdminBox.IsChecked = false;
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
|
||||
|
||||
@@ -29,6 +29,8 @@ public sealed class LauncherItem
|
||||
|
||||
public bool IsDisabled { get; set; }
|
||||
|
||||
public bool RunAsAdmin { get; set; }
|
||||
|
||||
public LauncherDisplayMode DisplayMode { get; set; } = LauncherDisplayMode.CompactList;
|
||||
|
||||
public List<LauncherItem> Children { get; set; } = [];
|
||||
|
||||
@@ -12,14 +12,19 @@ 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
|
||||
- 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
|
||||
|
||||
@@ -80,6 +80,49 @@ public static class ConfigService
|
||||
return destinationPath;
|
||||
}
|
||||
|
||||
public static string ExportItemTo(string destinationPath, LauncherItem item)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(destinationPath))
|
||||
{
|
||||
throw new ArgumentException("Choose a destination path for the exported item.", nameof(destinationPath));
|
||||
}
|
||||
|
||||
string? destinationFolder = Path.GetDirectoryName(destinationPath);
|
||||
if (!string.IsNullOrWhiteSpace(destinationFolder))
|
||||
{
|
||||
Directory.CreateDirectory(destinationFolder);
|
||||
}
|
||||
|
||||
NormalizeDisplayModes(item);
|
||||
string json = JsonSerializer.Serialize(item, JsonOptions);
|
||||
File.WriteAllText(destinationPath, json);
|
||||
return destinationPath;
|
||||
}
|
||||
|
||||
public static LauncherItem ImportItemFrom(string sourcePath)
|
||||
{
|
||||
if (!File.Exists(sourcePath))
|
||||
{
|
||||
throw new FileNotFoundException("The selected item file was not found.", sourcePath);
|
||||
}
|
||||
|
||||
string json = File.ReadAllText(sourcePath);
|
||||
LauncherItem item;
|
||||
try
|
||||
{
|
||||
item = JsonSerializer.Deserialize<LauncherItem>(json, JsonOptions)
|
||||
?? throw new InvalidDataException("The selected item file could not be read.");
|
||||
}
|
||||
catch (JsonException ex)
|
||||
{
|
||||
throw new InvalidDataException("The selected file is not a valid Taskbar Launcher item export.", ex);
|
||||
}
|
||||
|
||||
ValidateItem(item);
|
||||
NormalizeDisplayModes(item);
|
||||
return item;
|
||||
}
|
||||
|
||||
public static LauncherConfig ImportFrom(string sourcePath)
|
||||
{
|
||||
LauncherConfig config = ReadConfigFile(sourcePath);
|
||||
|
||||
@@ -183,6 +183,7 @@ public sealed class LauncherController : IDisposable
|
||||
IconPath = item.IconPath,
|
||||
IsFavorite = false,
|
||||
IsDisabled = false,
|
||||
RunAsAdmin = item.RunAsAdmin,
|
||||
DisplayMode = item.DisplayMode,
|
||||
Children = []
|
||||
};
|
||||
@@ -286,6 +287,11 @@ public sealed class LauncherController : IDisposable
|
||||
WorkingDirectory = Directory.Exists(target) ? target : ConfigService.AppFolder
|
||||
};
|
||||
|
||||
if (item.RunAsAdmin && CanRunAsAdmin(item.Type))
|
||||
{
|
||||
startInfo.Verb = "runas";
|
||||
}
|
||||
|
||||
Process.Start(startInfo);
|
||||
return true;
|
||||
}
|
||||
@@ -295,4 +301,9 @@ public sealed class LauncherController : IDisposable
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static bool CanRunAsAdmin(LauncherItemType itemType)
|
||||
{
|
||||
return itemType is LauncherItemType.App or LauncherItemType.File;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
<Authors>Ray Berezowski</Authors>
|
||||
<ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
|
||||
<Version>1.0.1</Version>
|
||||
<AssemblyVersion>1.0.1.11</AssemblyVersion>
|
||||
<FileVersion>1.0.1.11</FileVersion>
|
||||
<AssemblyVersion>1.0.1.18</AssemblyVersion>
|
||||
<FileVersion>1.0.1.18</FileVersion>
|
||||
<InformationalVersion>1.0.1</InformationalVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
@@ -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,163 @@ 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 (item.IsFavorite)
|
||||
{
|
||||
AddToolTipLine(panel, "Pinned to top");
|
||||
}
|
||||
|
||||
if (item.RunAsAdmin)
|
||||
{
|
||||
AddToolTipLine(panel, "Runs as administrator");
|
||||
}
|
||||
|
||||
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) ||
|
||||
parentPath.Contains(query, StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
private void SearchBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
|
||||
@@ -382,14 +535,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)
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
"IconPath": null,
|
||||
"IsFavorite": false,
|
||||
"IsDisabled": false,
|
||||
"RunAsAdmin": false,
|
||||
"DisplayMode": "CompactList",
|
||||
"Children": [
|
||||
{
|
||||
@@ -22,6 +23,7 @@
|
||||
"IconPath": "%USERPROFILE%\\Documents",
|
||||
"IsFavorite": false,
|
||||
"IsDisabled": false,
|
||||
"RunAsAdmin": false,
|
||||
"DisplayMode": "CompactList",
|
||||
"Children": []
|
||||
},
|
||||
@@ -33,6 +35,7 @@
|
||||
"IconPath": "%USERPROFILE%\\Downloads",
|
||||
"IsFavorite": false,
|
||||
"IsDisabled": false,
|
||||
"RunAsAdmin": false,
|
||||
"DisplayMode": "CompactList",
|
||||
"Children": []
|
||||
}
|
||||
@@ -46,6 +49,7 @@
|
||||
"IconPath": null,
|
||||
"IsFavorite": false,
|
||||
"IsDisabled": false,
|
||||
"RunAsAdmin": false,
|
||||
"DisplayMode": "CompactList",
|
||||
"Children": [
|
||||
{
|
||||
@@ -56,6 +60,7 @@
|
||||
"IconPath": "notepad.exe",
|
||||
"IsFavorite": false,
|
||||
"IsDisabled": false,
|
||||
"RunAsAdmin": false,
|
||||
"DisplayMode": "CompactList",
|
||||
"Children": []
|
||||
}
|
||||
|
||||
@@ -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,7 +47,10 @@ 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
|
||||
- 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
|
||||
|
||||
Reference in New Issue
Block a user