3 Commits

Author SHA1 Message Date
Ray Berezowski
fe86573e10 Add popup pin toggle 2026-08-26 21:01:05 -04:00
Ray Berezowski
9f1b012d15 Add pinned launcher items 2026-08-26 20:41:20 -04:00
Ray Berezowski
749a856faa Add recent launcher items 2026-08-26 19:58:03 -04:00
9 changed files with 168 additions and 9 deletions

View File

@@ -84,15 +84,22 @@ public partial class MainWindow : Window
private TreeViewItem CreateTreeItem(LauncherItem item) private TreeViewItem CreateTreeItem(LauncherItem item)
{ {
var pinMenuItem = new System.Windows.Controls.MenuItem
{
Header = item.IsFavorite ? "Unpin from Top" : "Pin to Top"
};
pinMenuItem.Click += ToggleFavorite_Click;
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 treeItem = new TreeViewItem var treeItem = new TreeViewItem
{ {
Header = $"{item.Title} ({item.Type})", Header = $"{(item.IsFavorite ? "[Pinned] " : "")}{item.Title} ({item.Type})",
Tag = item, Tag = item,
ContextMenu = new System.Windows.Controls.ContextMenu() ContextMenu = new System.Windows.Controls.ContextMenu()
}; };
treeItem.ContextMenu.Items.Add(pinMenuItem);
treeItem.ContextMenu.Items.Add(duplicateMenuItem); treeItem.ContextMenu.Items.Add(duplicateMenuItem);
treeItem.PreviewMouseRightButtonDown += (_, e) => treeItem.PreviewMouseRightButtonDown += (_, e) =>
{ {
@@ -803,6 +810,23 @@ public partial class MainWindow : Window
StatusText.Text = "Added submenu. Rename it, then Save."; StatusText.Text = "Added submenu. Rename it, then Save.";
} }
private void ToggleFavorite_Click(object sender, RoutedEventArgs e)
{
if (controller is null || selectedItem is null)
{
return;
}
ApplyCurrentItem();
selectedItem.IsFavorite = !selectedItem.IsFavorite;
LauncherItem itemToSelect = selectedItem;
selectedPath = FindItemPath(itemToSelect);
RefreshView(itemToSelect);
StatusText.Text = itemToSelect.IsFavorite
? $"Pinned {itemToSelect.Title}. Click Save to keep it."
: $"Unpinned {itemToSelect.Title}. Click Save to keep it.";
}
private void DuplicateItem_Click(object sender, RoutedEventArgs e) private void DuplicateItem_Click(object sender, RoutedEventArgs e)
{ {
if (controller is null || selectedItem is null) if (controller is null || selectedItem is null)
@@ -865,6 +889,7 @@ public partial class MainWindow : Window
Target = item.Target, Target = item.Target,
Arguments = item.Arguments, Arguments = item.Arguments,
IconPath = item.IconPath, IconPath = item.IconPath,
IsFavorite = item.IsFavorite,
DisplayMode = item.DisplayMode, DisplayMode = item.DisplayMode,
Children = item.Children.Select(child => DuplicateItem(child, renameRoot: false)).ToList() Children = item.Children.Select(child => DuplicateItem(child, renameRoot: false)).ToList()
}; };
@@ -1456,6 +1481,7 @@ public partial class MainWindow : Window
Target = TargetBox.Text.Trim(), Target = TargetBox.Text.Trim(),
Arguments = string.IsNullOrWhiteSpace(ArgumentsBox.Text) ? null : ArgumentsBox.Text.Trim(), Arguments = string.IsNullOrWhiteSpace(ArgumentsBox.Text) ? null : ArgumentsBox.Text.Trim(),
IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim(), IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim(),
IsFavorite = selectedItem.IsFavorite,
DisplayMode = ItemDisplayModeBox.SelectedItem is LauncherDisplayMode mode DisplayMode = ItemDisplayModeBox.SelectedItem is LauncherDisplayMode mode
? mode ? mode
: selectedItem.DisplayMode : selectedItem.DisplayMode

View File

@@ -8,6 +8,8 @@ public sealed class LauncherConfig
public LauncherThemeScheme ThemeScheme { get; set; } = LauncherThemeScheme.MarkHaven; public LauncherThemeScheme ThemeScheme { get; set; } = LauncherThemeScheme.MarkHaven;
public List<LauncherItem> RecentItems { get; set; } = [];
public List<LauncherItem> Items { get; set; } = []; public List<LauncherItem> Items { get; set; } = [];
} }
@@ -23,6 +25,8 @@ public sealed class LauncherItem
public string? IconPath { get; set; } public string? IconPath { get; set; }
public bool IsFavorite { get; set; }
public LauncherDisplayMode DisplayMode { get; set; } = LauncherDisplayMode.CompactList; public LauncherDisplayMode DisplayMode { get; set; } = LauncherDisplayMode.CompactList;
public List<LauncherItem> Children { get; set; } = []; public List<LauncherItem> Children { get; set; } = [];

View File

@@ -13,9 +13,12 @@ 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
- 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
- Right-click launcher entries to pin or unpin them from the top
- 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
- Per-item icon and display mode - Per-item icon and display mode
- Automatic icon selection from app/folder targets - Automatic icon selection from app/folder targets
- Portable `config.json` - Portable `config.json`

View File

@@ -190,10 +190,20 @@ public static class ConfigService
throw new InvalidDataException("The selected config is missing launcher items."); throw new InvalidDataException("The selected config is missing launcher items.");
} }
if (config.RecentItems is null)
{
config.RecentItems = [];
}
foreach (LauncherItem item in config.Items) foreach (LauncherItem item in config.Items)
{ {
ValidateItem(item); ValidateItem(item);
} }
foreach (LauncherItem item in config.RecentItems)
{
ValidateItem(item);
}
} }
private static void ValidateItem(LauncherItem item) private static void ValidateItem(LauncherItem item)
@@ -226,6 +236,15 @@ public static class ConfigService
config.ThemeScheme = LauncherThemeScheme.MarkHaven; config.ThemeScheme = LauncherThemeScheme.MarkHaven;
} }
config.RecentItems ??= [];
config.RecentItems.RemoveAll(item => item.Type == LauncherItemType.Menu || string.IsNullOrWhiteSpace(item.Target));
foreach (LauncherItem item in config.RecentItems)
{
item.IsFavorite = false;
item.Children = [];
NormalizeDisplayModes(item);
}
foreach (LauncherItem item in config.Items) foreach (LauncherItem item in config.Items)
{ {
NormalizeDisplayModes(item); NormalizeDisplayModes(item);

View File

@@ -9,6 +9,8 @@ namespace TaskbarLauncher.Services;
public sealed class LauncherController : IDisposable public sealed class LauncherController : IDisposable
{ {
private const int MaxRecentItems = 8;
private readonly HotkeyService hotkeyService = new(); private readonly HotkeyService hotkeyService = new();
private NotifyIcon? notifyIcon; private NotifyIcon? notifyIcon;
private LauncherPopup? popup; private LauncherPopup? popup;
@@ -136,6 +138,7 @@ public sealed class LauncherController : IDisposable
{ {
if (TryLaunchItem(item, out string? error)) if (TryLaunchItem(item, out string? error))
{ {
RecordRecentItem(item);
popup?.Close(); popup?.Close();
return; return;
} }
@@ -146,6 +149,44 @@ public sealed class LauncherController : IDisposable
} }
} }
private void RecordRecentItem(LauncherItem item)
{
if (item.Type == LauncherItemType.Menu || string.IsNullOrWhiteSpace(item.Target))
{
return;
}
Config.RecentItems.RemoveAll(recent => IsSameRecentItem(recent, item));
Config.RecentItems.Insert(0, CreateRecentItem(item));
if (Config.RecentItems.Count > MaxRecentItems)
{
Config.RecentItems.RemoveRange(MaxRecentItems, Config.RecentItems.Count - MaxRecentItems);
}
ConfigService.Save(Config);
}
private static bool IsSameRecentItem(LauncherItem recent, LauncherItem item)
{
return string.Equals(recent.Target, item.Target, StringComparison.OrdinalIgnoreCase) &&
string.Equals(recent.Arguments ?? "", item.Arguments ?? "", StringComparison.OrdinalIgnoreCase);
}
private static LauncherItem CreateRecentItem(LauncherItem item)
{
return new LauncherItem
{
Title = item.Title,
Type = item.Type,
Target = item.Target,
Arguments = item.Arguments,
IconPath = item.IconPath,
IsFavorite = false,
DisplayMode = item.DisplayMode,
Children = []
};
}
private void OpenAllItems(LauncherItem menuItem) private void OpenAllItems(LauncherItem menuItem)
{ {
List<string> failures = []; List<string> failures = [];
@@ -161,6 +202,7 @@ public sealed class LauncherController : IDisposable
if (TryLaunchItem(child, out string? error)) if (TryLaunchItem(child, out string? error))
{ {
launchedCount++; launchedCount++;
RecordRecentItem(child);
} }
else if (!string.IsNullOrWhiteSpace(error)) else if (!string.IsNullOrWhiteSpace(error))
{ {

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.4</AssemblyVersion> <AssemblyVersion>1.0.1.7</AssemblyVersion>
<FileVersion>1.0.1.4</FileVersion> <FileVersion>1.0.1.7</FileVersion>
<InformationalVersion>1.0.1</InformationalVersion> <InformationalVersion>1.0.1</InformationalVersion>
</PropertyGroup> </PropertyGroup>

View File

@@ -93,14 +93,39 @@ public partial class LauncherPopup : Window
{ {
ItemsPanel.Children.Clear(); ItemsPanel.Children.Clear();
visibleLaunchButtons.Clear(); visibleLaunchButtons.Clear();
if (config.RecentItems.Count > 0)
{
ItemsPanel.Children.Add(CreateRecentItemsControl());
}
bool expandMenusByDefault = config.Items.Count <= 2; bool expandMenusByDefault = config.Items.Count <= 2;
foreach (LauncherItem item in config.Items) foreach (LauncherItem item in GetDisplayItems(config.Items))
{ {
ItemsPanel.Children.Add(CreateItemControl(item, 0, expandMenusByDefault)); ItemsPanel.Children.Add(CreateItemControl(item, 0, expandMenusByDefault));
} }
} }
private FrameworkElement CreateItemControl(LauncherItem item, int depth, bool expandMenusByDefault) private Expander CreateRecentItemsControl()
{
Expander expander = new()
{
Header = new TextBlock { Text = "Recent" },
IsExpanded = true,
Margin = new Thickness(0, 4, 0, 8)
};
StackPanel recentItems = new();
foreach (LauncherItem item in config.RecentItems)
{
recentItems.Children.Add(CreateItemControl(item, 1, expandMenusByDefault: false, allowEdit: false));
}
expander.Content = recentItems;
return expander;
}
private FrameworkElement CreateItemControl(LauncherItem item, int depth, bool expandMenusByDefault, bool allowEdit = true)
{ {
if (item.Type == LauncherItemType.Menu) if (item.Type == LauncherItemType.Menu)
{ {
@@ -112,9 +137,9 @@ public partial class LauncherPopup : Window
}; };
StackPanel children = new(); StackPanel children = new();
foreach (LauncherItem child in item.Children) foreach (LauncherItem child in GetDisplayItems(item.Children))
{ {
children.Children.Add(CreateItemControl(child, depth + 1, expandMenusByDefault)); children.Children.Add(CreateItemControl(child, depth + 1, expandMenusByDefault, allowEdit));
} }
expander.Content = children; expander.Content = children;
@@ -131,7 +156,11 @@ public partial class LauncherPopup : Window
}; };
button.Click += (_, _) => launchItem(item); button.Click += (_, _) => launchItem(item);
button.ContextMenu = CreateItemContextMenu(item); if (allowEdit)
{
button.ContextMenu = CreateItemContextMenu(item);
}
button.KeyDown += (_, e) => button.KeyDown += (_, e) =>
{ {
if (e.Key == Key.Enter) if (e.Key == Key.Enter)
@@ -165,6 +194,7 @@ public partial class LauncherPopup : Window
System.Windows.Controls.ContextMenu contextMenu = new(); System.Windows.Controls.ContextMenu contextMenu = new();
contextMenu.Items.Add(openAllMenuItem); contextMenu.Items.Add(openAllMenuItem);
contextMenu.Items.Add(new Separator()); contextMenu.Items.Add(new Separator());
contextMenu.Items.Add(CreatePinMenuItem(item));
contextMenu.Items.Add(CreateEditMenuItem(item)); contextMenu.Items.Add(CreateEditMenuItem(item));
return new TextBlock return new TextBlock
@@ -177,10 +207,29 @@ public partial class LauncherPopup : Window
private System.Windows.Controls.ContextMenu CreateItemContextMenu(LauncherItem item) private System.Windows.Controls.ContextMenu CreateItemContextMenu(LauncherItem item)
{ {
System.Windows.Controls.ContextMenu contextMenu = new(); System.Windows.Controls.ContextMenu contextMenu = new();
contextMenu.Items.Add(CreatePinMenuItem(item));
contextMenu.Items.Add(CreateEditMenuItem(item)); contextMenu.Items.Add(CreateEditMenuItem(item));
return contextMenu; return contextMenu;
} }
private System.Windows.Controls.MenuItem CreatePinMenuItem(LauncherItem item)
{
System.Windows.Controls.MenuItem pinMenuItem = new()
{
Header = item.IsFavorite ? "Unpin from Top" : "Pin to Top"
};
pinMenuItem.Click += (_, e) =>
{
item.IsFavorite = !item.IsFavorite;
ConfigService.Save(config);
BuildItems();
QueueReposition();
e.Handled = true;
};
return pinMenuItem;
}
private System.Windows.Controls.MenuItem CreateEditMenuItem(LauncherItem item) private System.Windows.Controls.MenuItem CreateEditMenuItem(LauncherItem item)
{ {
System.Windows.Controls.MenuItem editMenuItem = new() System.Windows.Controls.MenuItem editMenuItem = new()
@@ -202,6 +251,11 @@ public partial class LauncherPopup : Window
return item.Type != LauncherItemType.Menu && !string.IsNullOrWhiteSpace(item.Target); return item.Type != LauncherItemType.Menu && !string.IsNullOrWhiteSpace(item.Target);
} }
private static IEnumerable<LauncherItem> GetDisplayItems(IEnumerable<LauncherItem> items)
{
return items.OrderByDescending(item => item.IsFavorite);
}
private void SearchBox_TextChanged(object sender, TextChangedEventArgs e) private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
{ {
string query = SearchBox.Text.Trim(); string query = SearchBox.Text.Trim();
@@ -244,7 +298,7 @@ public partial class LauncherPopup : Window
private static void CollectMatches(IEnumerable<LauncherItem> items, string query, List<LauncherItem> matches) private static void CollectMatches(IEnumerable<LauncherItem> items, string query, List<LauncherItem> matches)
{ {
foreach (LauncherItem item in items) foreach (LauncherItem item in GetDisplayItems(items))
{ {
bool isLaunchable = item.Type != LauncherItemType.Menu; bool isLaunchable = item.Type != LauncherItemType.Menu;
if (isLaunchable && Matches(item, query)) if (isLaunchable && Matches(item, query))

View File

@@ -1,6 +1,8 @@
{ {
"Hotkey": "Ctrl+Alt+Space", "Hotkey": "Ctrl+Alt+Space",
"DisplayMode": "CompactList", "DisplayMode": "CompactList",
"ThemeScheme": "MarkHaven",
"RecentItems": [],
"Items": [ "Items": [
{ {
"Title": "Folders", "Title": "Folders",
@@ -8,6 +10,7 @@
"Target": "", "Target": "",
"Arguments": null, "Arguments": null,
"IconPath": null, "IconPath": null,
"IsFavorite": false,
"DisplayMode": "CompactList", "DisplayMode": "CompactList",
"Children": [ "Children": [
{ {
@@ -16,6 +19,7 @@
"Target": "%USERPROFILE%\\Documents", "Target": "%USERPROFILE%\\Documents",
"Arguments": null, "Arguments": null,
"IconPath": "%USERPROFILE%\\Documents", "IconPath": "%USERPROFILE%\\Documents",
"IsFavorite": false,
"DisplayMode": "CompactList", "DisplayMode": "CompactList",
"Children": [] "Children": []
}, },
@@ -25,6 +29,7 @@
"Target": "%USERPROFILE%\\Downloads", "Target": "%USERPROFILE%\\Downloads",
"Arguments": null, "Arguments": null,
"IconPath": "%USERPROFILE%\\Downloads", "IconPath": "%USERPROFILE%\\Downloads",
"IsFavorite": false,
"DisplayMode": "CompactList", "DisplayMode": "CompactList",
"Children": [] "Children": []
} }
@@ -36,6 +41,7 @@
"Target": "", "Target": "",
"Arguments": null, "Arguments": null,
"IconPath": null, "IconPath": null,
"IsFavorite": false,
"DisplayMode": "CompactList", "DisplayMode": "CompactList",
"Children": [ "Children": [
{ {
@@ -44,6 +50,7 @@
"Target": "notepad.exe", "Target": "notepad.exe",
"Arguments": null, "Arguments": null,
"IconPath": "notepad.exe", "IconPath": "notepad.exe",
"IsFavorite": false,
"DisplayMode": "CompactList", "DisplayMode": "CompactList",
"Children": [] "Children": []
} }

View File

@@ -20,6 +20,9 @@ Install the **.NET Desktop Runtime** for **Windows x64**.
3. The app appears in the system tray. 3. The app appears in the system tray.
4. Press `Ctrl+Alt+Space` to open the launcher. 4. Press `Ctrl+Alt+Space` to open the launcher.
5. Right-click a launcher entry and choose **Edit in Settings** to jump to that item. 5. Right-click a launcher entry and choose **Edit in Settings** to jump to that item.
6. Right-click a launcher entry and choose **Pin to Top** or **Unpin from Top**.
Recently launched entries appear in the launcher popup under **Recent**.
## Configure ## Configure
@@ -33,6 +36,7 @@ From Settings you can:
- Drag/drop items to reorder - Drag/drop items to reorder
- Drag/drop files, folders, shortcuts, or web links into the launcher item list - Drag/drop files, folders, shortcuts, or web links into the launcher item list
- Right-click an item and choose **Duplicate Item** to copy it - Right-click an item and choose **Duplicate Item** to copy it
- Right-click an item and choose **Pin to Top** to show it first in its menu
- 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