3 Commits

Author SHA1 Message Date
Ray Berezowski
f2ccca2ed1 Improve launcher search results 2026-08-26 21:45:57 -04:00
Ray Berezowski
c606573900 Add menu sort action 2026-08-26 21:41:45 -04:00
Ray Berezowski
86f667f595 Add selected item import export 2026-08-26 21:38:57 -04:00
7 changed files with 274 additions and 13 deletions

View File

@@ -67,6 +67,8 @@
<Separator/> <Separator/>
<MenuItem Header="Export Config" Click="ExportConfig_Click"/> <MenuItem Header="Export Config" Click="ExportConfig_Click"/>
<MenuItem Header="Import Config" Click="ImportConfig_Click"/> <MenuItem Header="Import Config" Click="ImportConfig_Click"/>
<MenuItem Header="Export Selected Item" Click="ExportSelectedItem_Click"/>
<MenuItem Header="Import Item" Click="ImportItem_Click"/>
<Separator/> <Separator/>
<MenuItem Header="Reset to Defaults" Click="ResetConfig_Click"/> <MenuItem Header="Reset to Defaults" Click="ResetConfig_Click"/>
<MenuItem Header="Reload Config" Click="ReloadConfig_Click"/> <MenuItem Header="Reload Config" Click="ReloadConfig_Click"/>

View File

@@ -107,6 +107,12 @@ public partial class MainWindow : Window
var duplicateMenuItem = new System.Windows.Controls.MenuItem { Header = "Duplicate Item" }; var duplicateMenuItem = new System.Windows.Controls.MenuItem { Header = "Duplicate Item" };
duplicateMenuItem.Click += DuplicateItem_Click; 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 var treeItem = new TreeViewItem
{ {
Header = $"{GetTreeStatusPrefix(item)}{item.Title} ({item.Type})", 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(disableMenuItem);
treeItem.ContextMenu.Items.Add(openContainingFolderMenuItem); treeItem.ContextMenu.Items.Add(openContainingFolderMenuItem);
treeItem.ContextMenu.Items.Add(duplicateMenuItem); treeItem.ContextMenu.Items.Add(duplicateMenuItem);
treeItem.ContextMenu.Items.Add(sortMenuItem);
treeItem.PreviewMouseRightButtonDown += (_, e) => treeItem.PreviewMouseRightButtonDown += (_, e) =>
{ {
treeItem.IsSelected = true; treeItem.IsSelected = true;
@@ -1046,6 +1053,46 @@ public partial class MainWindow : Window
RefreshView(selectedItem); 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) private static bool RemoveItem(List<LauncherItem> items, LauncherItem item)
{ {
if (items.Remove(item)) if (items.Remove(item))
@@ -1260,6 +1307,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) private void ResetConfig_Click(object sender, RoutedEventArgs e)
{ {
MessageBoxResult result = MessageBox.Show( MessageBoxResult result = MessageBox.Show(

View File

@@ -12,7 +12,7 @@ Download the compiled Windows release from:
- System tray launcher - System tray launcher
- Global hotkey, default `Ctrl+Alt+Space` - Global hotkey, default `Ctrl+Alt+Space`
- Search/filter in the launcher popup - Search/filter in the launcher popup with parent menu context
- Recent items section for quickly relaunching entries - Recent items section for quickly relaunching entries
- Nested menus, drag/drop ordering, and drag/drop item creation in Settings - 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 edit them in Settings
@@ -20,6 +20,8 @@ Download the compiled Windows release from:
- Right-click launcher entries or Settings items to temporarily disable them - Right-click launcher entries or Settings items to temporarily disable them
- Right-click app/file entries to open their containing folder - Right-click app/file entries to open their containing folder
- Validate missing app, file, and folder targets from Settings - 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 item duplication in Settings
- Right-click items in Settings to pin them to the top of their menu - Right-click items in Settings to pin them to the top of their menu
- Per-item icon and display mode - Per-item icon and display mode

View File

@@ -80,6 +80,49 @@ public static class ConfigService
return destinationPath; 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) public static LauncherConfig ImportFrom(string sourcePath)
{ {
LauncherConfig config = ReadConfigFile(sourcePath); LauncherConfig config = ReadConfigFile(sourcePath);

View File

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

View File

@@ -21,6 +21,7 @@ public partial class LauncherPopup : Window
private readonly Action showSettings; private readonly Action showSettings;
private readonly Action<LauncherItem> editItem; private readonly Action<LauncherItem> editItem;
private readonly Action<LauncherItem> openContainingFolder; 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) public LauncherPopup(LauncherConfig config, Action<LauncherItem> launchItem, Action<LauncherItem> openAllItems, Action showSettings, Action<LauncherItem> editItem, Action<LauncherItem> openContainingFolder)
{ {
@@ -322,8 +323,8 @@ public partial class LauncherPopup : Window
ItemsPanel.Children.Clear(); ItemsPanel.Children.Clear();
visibleLaunchButtons.Clear(); visibleLaunchButtons.Clear();
List<LauncherItem> matches = []; List<SearchMatch> matches = [];
CollectMatches(config.Items, query, matches); CollectMatches(config.Items, query, [], matches);
if (matches.Count == 0) if (matches.Count == 0)
{ {
@@ -336,34 +337,88 @@ public partial class LauncherPopup : Window
return; return;
} }
foreach (LauncherItem item in matches) foreach (SearchMatch match in matches)
{ {
ItemsPanel.Children.Add(CreateItemControl(item, 0, expandMenusByDefault: false)); ItemsPanel.Children.Add(CreateSearchResultControl(match));
} }
} }
private static void CollectMatches(IEnumerable<LauncherItem> items, string query, List<LauncherItem> matches) 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)
};
button.Click += (_, _) => launchItem(match.Item);
button.KeyDown += (_, e) =>
{
if (e.Key == Key.Enter)
{
launchItem(match.Item);
e.Handled = true;
}
else if (e.Key == Key.Escape)
{
Close();
e.Handled = true;
}
};
visibleLaunchButtons.Add(button);
return button;
}
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 void CollectMatches(IEnumerable<LauncherItem> items, string query, List<string> parentNames, List<SearchMatch> matches)
{ {
foreach (LauncherItem item in GetDisplayItems(items)) foreach (LauncherItem item in GetDisplayItems(items))
{ {
bool isLaunchable = item.Type != LauncherItemType.Menu && !item.IsDisabled; 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) 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) || return item.Title.Contains(query, StringComparison.OrdinalIgnoreCase) ||
item.Target.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) private void SearchBox_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)

View File

@@ -26,6 +26,8 @@ Install the **.NET Desktop Runtime** for **Windows x64**.
Recently launched entries appear in the launcher popup under **Recent**. Recently launched entries appear in the launcher popup under **Recent**.
Search results include the parent menu path when an item is inside a menu.
## Configure ## Configure
Open the tray menu and choose **Settings**. Open the tray menu and choose **Settings**.
@@ -42,6 +44,8 @@ From Settings you can:
- Right-click an item and choose **Disable Item** or **Enable Item** to hide or restore it - 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** - Right-click an app or file item and choose **Open Containing Folder**
- Use **Config... > Validate Targets** to check for missing app, file, and folder targets - 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 - Set per-item icon sizes
- Back up and restore `config.json` - Back up and restore `config.json`
- Enable Start with Windows - Enable Start with Windows