Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fe86573e10 | ||
|
|
9f1b012d15 | ||
|
|
749a856faa | ||
|
|
32f08bc0fd | ||
|
|
362cd94138 |
@@ -40,6 +40,18 @@ public partial class MainWindow : Window
|
|||||||
RefreshView();
|
RefreshView();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SelectItemForEdit(LauncherItem item)
|
||||||
|
{
|
||||||
|
if (controller is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
RefreshView(item);
|
||||||
|
Show();
|
||||||
|
Activate();
|
||||||
|
}
|
||||||
|
|
||||||
private void RefreshView(LauncherItem? itemToSelect = null)
|
private void RefreshView(LauncherItem? itemToSelect = null)
|
||||||
{
|
{
|
||||||
if (controller is null)
|
if (controller is null)
|
||||||
@@ -70,9 +82,31 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static TreeViewItem CreateTreeItem(LauncherItem item)
|
private TreeViewItem CreateTreeItem(LauncherItem item)
|
||||||
{
|
{
|
||||||
var treeItem = new TreeViewItem { Header = $"{item.Title} ({item.Type})", Tag = 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" };
|
||||||
|
duplicateMenuItem.Click += DuplicateItem_Click;
|
||||||
|
|
||||||
|
var treeItem = new TreeViewItem
|
||||||
|
{
|
||||||
|
Header = $"{(item.IsFavorite ? "[Pinned] " : "")}{item.Title} ({item.Type})",
|
||||||
|
Tag = item,
|
||||||
|
ContextMenu = new System.Windows.Controls.ContextMenu()
|
||||||
|
};
|
||||||
|
treeItem.ContextMenu.Items.Add(pinMenuItem);
|
||||||
|
treeItem.ContextMenu.Items.Add(duplicateMenuItem);
|
||||||
|
treeItem.PreviewMouseRightButtonDown += (_, e) =>
|
||||||
|
{
|
||||||
|
treeItem.IsSelected = true;
|
||||||
|
e.Handled = false;
|
||||||
|
};
|
||||||
|
|
||||||
foreach (LauncherItem child in item.Children)
|
foreach (LauncherItem child in item.Children)
|
||||||
{
|
{
|
||||||
treeItem.Items.Add(CreateTreeItem(child));
|
treeItem.Items.Add(CreateTreeItem(child));
|
||||||
@@ -776,6 +810,49 @@ 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)
|
||||||
|
{
|
||||||
|
if (controller is null || selectedItem is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ApplyCurrentItem();
|
||||||
|
string originalTitle = selectedItem.Title;
|
||||||
|
LauncherItem duplicate = DuplicateItem(selectedItem);
|
||||||
|
List<LauncherItem>? siblings = FindSiblings(controller.Config.Items, selectedItem);
|
||||||
|
if (siblings is null)
|
||||||
|
{
|
||||||
|
controller.Config.Items.Add(duplicate);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int selectedIndex = siblings.IndexOf(selectedItem);
|
||||||
|
siblings.Insert(selectedIndex + 1, duplicate);
|
||||||
|
}
|
||||||
|
|
||||||
|
selectedPath = FindItemPath(duplicate);
|
||||||
|
RefreshView(duplicate);
|
||||||
|
StatusText.Text = $"Duplicated {originalTitle}. Click Save to keep it.";
|
||||||
|
}
|
||||||
|
|
||||||
private static LauncherItem CreateNewItem(LauncherDisplayMode displayMode)
|
private static LauncherItem CreateNewItem(LauncherDisplayMode displayMode)
|
||||||
{
|
{
|
||||||
return new LauncherItem
|
return new LauncherItem
|
||||||
@@ -798,6 +875,33 @@ public partial class MainWindow : Window
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static LauncherItem DuplicateItem(LauncherItem item)
|
||||||
|
{
|
||||||
|
return DuplicateItem(item, renameRoot: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static LauncherItem DuplicateItem(LauncherItem item, bool renameRoot)
|
||||||
|
{
|
||||||
|
return new LauncherItem
|
||||||
|
{
|
||||||
|
Title = renameRoot ? GetDuplicateTitle(item.Title) : item.Title,
|
||||||
|
Type = item.Type,
|
||||||
|
Target = item.Target,
|
||||||
|
Arguments = item.Arguments,
|
||||||
|
IconPath = item.IconPath,
|
||||||
|
IsFavorite = item.IsFavorite,
|
||||||
|
DisplayMode = item.DisplayMode,
|
||||||
|
Children = item.Children.Select(child => DuplicateItem(child, renameRoot: false)).ToList()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetDuplicateTitle(string title)
|
||||||
|
{
|
||||||
|
return string.IsNullOrWhiteSpace(title)
|
||||||
|
? "Copy"
|
||||||
|
: $"{title} Copy";
|
||||||
|
}
|
||||||
|
|
||||||
private void Delete_Click(object sender, RoutedEventArgs e)
|
private void Delete_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (controller is null || selectedItem is null)
|
if (controller is null || selectedItem is null)
|
||||||
@@ -1377,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
|
||||||
|
|||||||
@@ -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; } = [];
|
||||||
|
|||||||
@@ -13,7 +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 pin or unpin them from the top
|
||||||
|
- 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`
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -41,6 +43,12 @@ public sealed class LauncherController : IDisposable
|
|||||||
settingsWindow.Activate();
|
settingsWindow.Activate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ShowSettings(LauncherItem itemToEdit)
|
||||||
|
{
|
||||||
|
settingsWindow ??= new MainWindow(this);
|
||||||
|
settingsWindow.SelectItemForEdit(itemToEdit);
|
||||||
|
}
|
||||||
|
|
||||||
public void ShowAbout()
|
public void ShowAbout()
|
||||||
{
|
{
|
||||||
if (aboutWindow?.IsVisible == true)
|
if (aboutWindow?.IsVisible == true)
|
||||||
@@ -64,7 +72,7 @@ public sealed class LauncherController : IDisposable
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
popup = new LauncherPopup(Config, LaunchItem, OpenAllItems, ShowSettings);
|
popup = new LauncherPopup(Config, LaunchItem, OpenAllItems, ShowSettings, ShowSettings);
|
||||||
popup.Closed += (_, _) => popup = null;
|
popup.Closed += (_, _) => popup = null;
|
||||||
popup.ShowNearTaskbar();
|
popup.ShowNearTaskbar();
|
||||||
}
|
}
|
||||||
@@ -130,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;
|
||||||
}
|
}
|
||||||
@@ -140,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 = [];
|
||||||
@@ -155,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))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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.2</AssemblyVersion>
|
<AssemblyVersion>1.0.1.7</AssemblyVersion>
|
||||||
<FileVersion>1.0.1.2</FileVersion>
|
<FileVersion>1.0.1.7</FileVersion>
|
||||||
<InformationalVersion>1.0.1</InformationalVersion>
|
<InformationalVersion>1.0.1</InformationalVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -19,14 +19,16 @@ public partial class LauncherPopup : Window
|
|||||||
private readonly Action<LauncherItem> launchItem;
|
private readonly Action<LauncherItem> launchItem;
|
||||||
private readonly Action<LauncherItem> openAllItems;
|
private readonly Action<LauncherItem> openAllItems;
|
||||||
private readonly Action showSettings;
|
private readonly Action showSettings;
|
||||||
|
private readonly Action<LauncherItem> editItem;
|
||||||
|
|
||||||
public LauncherPopup(LauncherConfig config, Action<LauncherItem> launchItem, Action<LauncherItem> openAllItems, Action showSettings)
|
public LauncherPopup(LauncherConfig config, Action<LauncherItem> launchItem, Action<LauncherItem> openAllItems, Action showSettings, Action<LauncherItem> editItem)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
this.config = config;
|
this.config = config;
|
||||||
this.launchItem = launchItem;
|
this.launchItem = launchItem;
|
||||||
this.openAllItems = openAllItems;
|
this.openAllItems = openAllItems;
|
||||||
this.showSettings = showSettings;
|
this.showSettings = showSettings;
|
||||||
|
this.editItem = editItem;
|
||||||
BuildItems();
|
BuildItems();
|
||||||
SizeChanged += (_, _) => QueueReposition();
|
SizeChanged += (_, _) => QueueReposition();
|
||||||
}
|
}
|
||||||
@@ -91,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)
|
||||||
{
|
{
|
||||||
@@ -110,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;
|
||||||
@@ -129,6 +156,11 @@ public partial class LauncherPopup : Window
|
|||||||
};
|
};
|
||||||
|
|
||||||
button.Click += (_, _) => launchItem(item);
|
button.Click += (_, _) => launchItem(item);
|
||||||
|
if (allowEdit)
|
||||||
|
{
|
||||||
|
button.ContextMenu = CreateItemContextMenu(item);
|
||||||
|
}
|
||||||
|
|
||||||
button.KeyDown += (_, e) =>
|
button.KeyDown += (_, e) =>
|
||||||
{
|
{
|
||||||
if (e.Key == Key.Enter)
|
if (e.Key == Key.Enter)
|
||||||
@@ -161,6 +193,9 @@ 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(CreatePinMenuItem(item));
|
||||||
|
contextMenu.Items.Add(CreateEditMenuItem(item));
|
||||||
|
|
||||||
return new TextBlock
|
return new TextBlock
|
||||||
{
|
{
|
||||||
@@ -169,11 +204,58 @@ public partial class LauncherPopup : Window
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private System.Windows.Controls.ContextMenu CreateItemContextMenu(LauncherItem item)
|
||||||
|
{
|
||||||
|
System.Windows.Controls.ContextMenu contextMenu = new();
|
||||||
|
contextMenu.Items.Add(CreatePinMenuItem(item));
|
||||||
|
contextMenu.Items.Add(CreateEditMenuItem(item));
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
System.Windows.Controls.MenuItem editMenuItem = new()
|
||||||
|
{
|
||||||
|
Header = "Edit in Settings"
|
||||||
|
};
|
||||||
|
editMenuItem.Click += (_, e) =>
|
||||||
|
{
|
||||||
|
editItem(item);
|
||||||
|
Close();
|
||||||
|
e.Handled = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
return editMenuItem;
|
||||||
|
}
|
||||||
|
|
||||||
private static bool IsLaunchable(LauncherItem item)
|
private static bool IsLaunchable(LauncherItem item)
|
||||||
{
|
{
|
||||||
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();
|
||||||
@@ -216,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))
|
||||||
|
|||||||
@@ -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": []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ Install the **.NET Desktop Runtime** for **Windows x64**.
|
|||||||
2. Run `TaskbarLauncher.exe`.
|
2. Run `TaskbarLauncher.exe`.
|
||||||
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.
|
||||||
|
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
|
||||||
|
|
||||||
@@ -31,6 +35,8 @@ From Settings you can:
|
|||||||
- Add folders, apps, files, and websites
|
- Add folders, apps, files, and websites
|
||||||
- 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 **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
|
||||||
|
|||||||
Reference in New Issue
Block a user