Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
749a856faa | ||
|
|
32f08bc0fd | ||
|
|
362cd94138 |
@@ -40,6 +40,18 @@ public partial class MainWindow : Window
|
||||
RefreshView();
|
||||
}
|
||||
|
||||
public void SelectItemForEdit(LauncherItem item)
|
||||
{
|
||||
if (controller is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
RefreshView(item);
|
||||
Show();
|
||||
Activate();
|
||||
}
|
||||
|
||||
private void RefreshView(LauncherItem? itemToSelect = null)
|
||||
{
|
||||
if (controller is null)
|
||||
@@ -70,9 +82,24 @@ 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 duplicateMenuItem = new System.Windows.Controls.MenuItem { Header = "Duplicate Item" };
|
||||
duplicateMenuItem.Click += DuplicateItem_Click;
|
||||
|
||||
var treeItem = new TreeViewItem
|
||||
{
|
||||
Header = $"{item.Title} ({item.Type})",
|
||||
Tag = item,
|
||||
ContextMenu = new System.Windows.Controls.ContextMenu()
|
||||
};
|
||||
treeItem.ContextMenu.Items.Add(duplicateMenuItem);
|
||||
treeItem.PreviewMouseRightButtonDown += (_, e) =>
|
||||
{
|
||||
treeItem.IsSelected = true;
|
||||
e.Handled = false;
|
||||
};
|
||||
|
||||
foreach (LauncherItem child in item.Children)
|
||||
{
|
||||
treeItem.Items.Add(CreateTreeItem(child));
|
||||
@@ -776,6 +803,32 @@ public partial class MainWindow : Window
|
||||
StatusText.Text = "Added submenu. Rename it, then Save.";
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
return new LauncherItem
|
||||
@@ -798,6 +851,32 @@ 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,
|
||||
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)
|
||||
{
|
||||
if (controller is null || selectedItem is null)
|
||||
|
||||
@@ -8,6 +8,8 @@ public sealed class LauncherConfig
|
||||
|
||||
public LauncherThemeScheme ThemeScheme { get; set; } = LauncherThemeScheme.MarkHaven;
|
||||
|
||||
public List<LauncherItem> RecentItems { get; set; } = [];
|
||||
|
||||
public List<LauncherItem> Items { get; set; } = [];
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,10 @@ Download the compiled Windows release from:
|
||||
- System tray launcher
|
||||
- Global hotkey, default `Ctrl+Alt+Space`
|
||||
- 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
|
||||
- Right-click launcher entries to edit them in Settings
|
||||
- Right-click item duplication in Settings
|
||||
- Per-item icon and display mode
|
||||
- Automatic icon selection from app/folder targets
|
||||
- Portable `config.json`
|
||||
|
||||
@@ -190,10 +190,20 @@ public static class ConfigService
|
||||
throw new InvalidDataException("The selected config is missing launcher items.");
|
||||
}
|
||||
|
||||
if (config.RecentItems is null)
|
||||
{
|
||||
config.RecentItems = [];
|
||||
}
|
||||
|
||||
foreach (LauncherItem item in config.Items)
|
||||
{
|
||||
ValidateItem(item);
|
||||
}
|
||||
|
||||
foreach (LauncherItem item in config.RecentItems)
|
||||
{
|
||||
ValidateItem(item);
|
||||
}
|
||||
}
|
||||
|
||||
private static void ValidateItem(LauncherItem item)
|
||||
@@ -226,6 +236,14 @@ public static class ConfigService
|
||||
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.Children = [];
|
||||
NormalizeDisplayModes(item);
|
||||
}
|
||||
|
||||
foreach (LauncherItem item in config.Items)
|
||||
{
|
||||
NormalizeDisplayModes(item);
|
||||
|
||||
@@ -9,6 +9,8 @@ namespace TaskbarLauncher.Services;
|
||||
|
||||
public sealed class LauncherController : IDisposable
|
||||
{
|
||||
private const int MaxRecentItems = 8;
|
||||
|
||||
private readonly HotkeyService hotkeyService = new();
|
||||
private NotifyIcon? notifyIcon;
|
||||
private LauncherPopup? popup;
|
||||
@@ -41,6 +43,12 @@ public sealed class LauncherController : IDisposable
|
||||
settingsWindow.Activate();
|
||||
}
|
||||
|
||||
public void ShowSettings(LauncherItem itemToEdit)
|
||||
{
|
||||
settingsWindow ??= new MainWindow(this);
|
||||
settingsWindow.SelectItemForEdit(itemToEdit);
|
||||
}
|
||||
|
||||
public void ShowAbout()
|
||||
{
|
||||
if (aboutWindow?.IsVisible == true)
|
||||
@@ -64,7 +72,7 @@ public sealed class LauncherController : IDisposable
|
||||
return;
|
||||
}
|
||||
|
||||
popup = new LauncherPopup(Config, LaunchItem, OpenAllItems, ShowSettings);
|
||||
popup = new LauncherPopup(Config, LaunchItem, OpenAllItems, ShowSettings, ShowSettings);
|
||||
popup.Closed += (_, _) => popup = null;
|
||||
popup.ShowNearTaskbar();
|
||||
}
|
||||
@@ -130,6 +138,7 @@ public sealed class LauncherController : IDisposable
|
||||
{
|
||||
if (TryLaunchItem(item, out string? error))
|
||||
{
|
||||
RecordRecentItem(item);
|
||||
popup?.Close();
|
||||
return;
|
||||
}
|
||||
@@ -140,6 +149,43 @@ 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,
|
||||
DisplayMode = item.DisplayMode,
|
||||
Children = []
|
||||
};
|
||||
}
|
||||
|
||||
private void OpenAllItems(LauncherItem menuItem)
|
||||
{
|
||||
List<string> failures = [];
|
||||
@@ -155,6 +201,7 @@ public sealed class LauncherController : IDisposable
|
||||
if (TryLaunchItem(child, out string? error))
|
||||
{
|
||||
launchedCount++;
|
||||
RecordRecentItem(child);
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(error))
|
||||
{
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
<Authors>Ray Berezowski</Authors>
|
||||
<ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
|
||||
<Version>1.0.1</Version>
|
||||
<AssemblyVersion>1.0.1.2</AssemblyVersion>
|
||||
<FileVersion>1.0.1.2</FileVersion>
|
||||
<AssemblyVersion>1.0.1.5</AssemblyVersion>
|
||||
<FileVersion>1.0.1.5</FileVersion>
|
||||
<InformationalVersion>1.0.1</InformationalVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
@@ -19,14 +19,16 @@ public partial class LauncherPopup : Window
|
||||
private readonly Action<LauncherItem> launchItem;
|
||||
private readonly Action<LauncherItem> openAllItems;
|
||||
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();
|
||||
this.config = config;
|
||||
this.launchItem = launchItem;
|
||||
this.openAllItems = openAllItems;
|
||||
this.showSettings = showSettings;
|
||||
this.editItem = editItem;
|
||||
BuildItems();
|
||||
SizeChanged += (_, _) => QueueReposition();
|
||||
}
|
||||
@@ -91,6 +93,12 @@ public partial class LauncherPopup : Window
|
||||
{
|
||||
ItemsPanel.Children.Clear();
|
||||
visibleLaunchButtons.Clear();
|
||||
|
||||
if (config.RecentItems.Count > 0)
|
||||
{
|
||||
ItemsPanel.Children.Add(CreateRecentItemsControl());
|
||||
}
|
||||
|
||||
bool expandMenusByDefault = config.Items.Count <= 2;
|
||||
foreach (LauncherItem item in config.Items)
|
||||
{
|
||||
@@ -98,7 +106,26 @@ public partial class LauncherPopup : Window
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
@@ -112,7 +139,7 @@ public partial class LauncherPopup : Window
|
||||
StackPanel children = new();
|
||||
foreach (LauncherItem child in item.Children)
|
||||
{
|
||||
children.Children.Add(CreateItemControl(child, depth + 1, expandMenusByDefault));
|
||||
children.Children.Add(CreateItemControl(child, depth + 1, expandMenusByDefault, allowEdit));
|
||||
}
|
||||
|
||||
expander.Content = children;
|
||||
@@ -129,6 +156,11 @@ public partial class LauncherPopup : Window
|
||||
};
|
||||
|
||||
button.Click += (_, _) => launchItem(item);
|
||||
if (allowEdit)
|
||||
{
|
||||
button.ContextMenu = CreateItemContextMenu(item);
|
||||
}
|
||||
|
||||
button.KeyDown += (_, e) =>
|
||||
{
|
||||
if (e.Key == Key.Enter)
|
||||
@@ -161,6 +193,8 @@ public partial class LauncherPopup : Window
|
||||
|
||||
System.Windows.Controls.ContextMenu contextMenu = new();
|
||||
contextMenu.Items.Add(openAllMenuItem);
|
||||
contextMenu.Items.Add(new Separator());
|
||||
contextMenu.Items.Add(CreateEditMenuItem(item));
|
||||
|
||||
return new TextBlock
|
||||
{
|
||||
@@ -169,6 +203,29 @@ public partial class LauncherPopup : Window
|
||||
};
|
||||
}
|
||||
|
||||
private System.Windows.Controls.ContextMenu CreateItemContextMenu(LauncherItem item)
|
||||
{
|
||||
System.Windows.Controls.ContextMenu contextMenu = new();
|
||||
contextMenu.Items.Add(CreateEditMenuItem(item));
|
||||
return contextMenu;
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
return item.Type != LauncherItemType.Menu && !string.IsNullOrWhiteSpace(item.Target);
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
{
|
||||
"Hotkey": "Ctrl+Alt+Space",
|
||||
"DisplayMode": "CompactList",
|
||||
"ThemeScheme": "MarkHaven",
|
||||
"RecentItems": [],
|
||||
"Items": [
|
||||
{
|
||||
"Title": "Folders",
|
||||
|
||||
@@ -19,6 +19,9 @@ Install the **.NET Desktop Runtime** for **Windows x64**.
|
||||
2. Run `TaskbarLauncher.exe`.
|
||||
3. The app appears in the system tray.
|
||||
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.
|
||||
|
||||
Recently launched entries appear in the launcher popup under **Recent**.
|
||||
|
||||
## Configure
|
||||
|
||||
@@ -31,6 +34,7 @@ From Settings you can:
|
||||
- Add folders, apps, files, and websites
|
||||
- Drag/drop items to reorder
|
||||
- Drag/drop files, folders, shortcuts, or web links into the launcher item list
|
||||
- Right-click an item and choose **Duplicate Item** to copy it
|
||||
- Set per-item icon sizes
|
||||
- Back up and restore `config.json`
|
||||
- Enable Start with Windows
|
||||
|
||||
Reference in New Issue
Block a user