Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0baf87d979 | ||
|
|
57b2c4b0cc | ||
|
|
c5fd18e6d3 | ||
|
|
1601da8155 | ||
|
|
6d9bbbab02 | ||
|
|
5421e3dde3 | ||
|
|
004a7e7c89 | ||
|
|
f2ccca2ed1 | ||
|
|
c606573900 | ||
|
|
86f667f595 | ||
|
|
8ec53ff9d6 | ||
|
|
691cb405fd | ||
|
|
992ac9a7b5 | ||
|
|
31c62bb89a | ||
|
|
fe86573e10 | ||
|
|
9f1b012d15 | ||
|
|
749a856faa | ||
|
|
32f08bc0fd | ||
|
|
362cd94138 | ||
|
|
5aacdbb22c |
@@ -60,11 +60,15 @@
|
|||||||
Margin="0,0,8,0">
|
Margin="0,0,8,0">
|
||||||
<Button.ContextMenu>
|
<Button.ContextMenu>
|
||||||
<ContextMenu>
|
<ContextMenu>
|
||||||
|
<MenuItem Header="Validate Targets" Click="ValidateTargets_Click"/>
|
||||||
|
<Separator/>
|
||||||
<MenuItem Header="Backup Config" Click="BackupConfig_Click"/>
|
<MenuItem Header="Backup Config" Click="BackupConfig_Click"/>
|
||||||
<MenuItem Header="Restore from Backup" Click="RestoreConfig_Click"/>
|
<MenuItem Header="Restore from Backup" Click="RestoreConfig_Click"/>
|
||||||
<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"/>
|
||||||
@@ -111,8 +115,8 @@
|
|||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="16"/>
|
<RowDefinition Height="16"/>
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<Border Background="{DynamicResource AppPanelBrush}"
|
<Border Background="{DynamicResource AppPanelBrush}"
|
||||||
@@ -130,6 +134,7 @@
|
|||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Text="Hotkey" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
<TextBlock Text="Hotkey" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
||||||
@@ -154,8 +159,10 @@
|
|||||||
|
|
||||||
<Separator Grid.Row="1" VerticalAlignment="Center"/>
|
<Separator Grid.Row="1" VerticalAlignment="Center"/>
|
||||||
|
|
||||||
<Border Grid.Row="2"
|
<ScrollViewer Grid.Row="2"
|
||||||
Background="{DynamicResource AppPanelBrush}"
|
VerticalScrollBarVisibility="Auto"
|
||||||
|
HorizontalScrollBarVisibility="Disabled">
|
||||||
|
<Border Background="{DynamicResource AppPanelBrush}"
|
||||||
BorderBrush="{DynamicResource AppBorderBrush}"
|
BorderBrush="{DynamicResource AppBorderBrush}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="12"
|
CornerRadius="12"
|
||||||
@@ -175,6 +182,8 @@
|
|||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Text="Title" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
<TextBlock Text="Title" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
||||||
@@ -196,20 +205,54 @@
|
|||||||
<TextBlock Text="Arguments" Grid.Row="3" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
<TextBlock Text="Arguments" Grid.Row="3" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
||||||
<TextBox x:Name="ArgumentsBox" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"/>
|
<TextBox x:Name="ArgumentsBox" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8"/>
|
||||||
|
|
||||||
<TextBlock Text="Icon Path" Grid.Row="4" VerticalAlignment="Center" Margin="0,0,8,0"/>
|
<TextBlock Text="Working Folder" Grid.Row="4" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
||||||
<TextBox x:Name="IconPathBox" Grid.Row="4" Grid.Column="1" Margin="0,0,8,8"
|
<TextBox x:Name="WorkingFolderBox" Grid.Row="4" Grid.Column="1" Margin="0,0,8,8"/>
|
||||||
|
<Button x:Name="WorkingFolderBrowseButton"
|
||||||
|
Grid.Row="4" Grid.Column="2"
|
||||||
|
Content="Folder"
|
||||||
|
Click="BrowseWorkingFolder_Click"
|
||||||
|
Padding="8,4"
|
||||||
|
Margin="0,0,0,8"/>
|
||||||
|
|
||||||
|
<TextBlock Text="Notes" Grid.Row="5" VerticalAlignment="Top" Margin="0,4,8,8"/>
|
||||||
|
<TextBox x:Name="NotesBox"
|
||||||
|
Grid.Row="5"
|
||||||
|
Grid.Column="1"
|
||||||
|
Grid.ColumnSpan="2"
|
||||||
|
Margin="0,0,0,8"
|
||||||
|
AcceptsReturn="True"
|
||||||
|
MinHeight="54"
|
||||||
|
TextWrapping="Wrap"
|
||||||
|
VerticalScrollBarVisibility="Auto"
|
||||||
TextChanged="PreviewField_Changed"/>
|
TextChanged="PreviewField_Changed"/>
|
||||||
<StackPanel Grid.Row="4" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
|
|
||||||
|
<TextBlock Text="Icon Path" Grid.Row="6" VerticalAlignment="Center" Margin="0,0,8,0"/>
|
||||||
|
<TextBox x:Name="IconPathBox" Grid.Row="6" Grid.Column="1" Margin="0,0,8,8"
|
||||||
|
TextChanged="PreviewField_Changed"/>
|
||||||
|
<StackPanel Grid.Row="6" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
|
||||||
<Button Content="Icon" Click="BrowseIcon_Click" Padding="8,4" Margin="0,0,6,0"/>
|
<Button Content="Icon" Click="BrowseIcon_Click" Padding="8,4" Margin="0,0,6,0"/>
|
||||||
<Button Content="Reset" Click="ResetIcon_Click" Padding="8,4"/>
|
<Button Content="Reset" Click="ResetIcon_Click" Padding="8,4"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<TextBlock Text="Selected Item Display" Grid.Row="5" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
<TextBlock Text="Selected Item Display" Grid.Row="7" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
||||||
<ComboBox x:Name="ItemDisplayModeBox" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2"
|
<ComboBox x:Name="ItemDisplayModeBox" Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="2"
|
||||||
Margin="0,0,0,8" SelectionChanged="ItemDisplayModeBox_SelectionChanged"/>
|
Margin="0,0,0,8" SelectionChanged="ItemDisplayModeBox_SelectionChanged"/>
|
||||||
|
|
||||||
<TextBlock Text="Preview" Grid.Row="6" VerticalAlignment="Top" Margin="0,4,8,0"/>
|
<TextBlock Text="Launch Options" Grid.Row="8" VerticalAlignment="Top" Margin="0,2,8,8"/>
|
||||||
<Border Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2"
|
<StackPanel Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8">
|
||||||
|
<CheckBox x:Name="RunAsAdminBox"
|
||||||
|
Content="Run as administrator"
|
||||||
|
Margin="0,0,0,6"
|
||||||
|
Checked="LaunchOptionBox_Changed"
|
||||||
|
Unchecked="LaunchOptionBox_Changed"/>
|
||||||
|
<CheckBox x:Name="StartMinimizedBox"
|
||||||
|
Content="Start minimized"
|
||||||
|
Checked="LaunchOptionBox_Changed"
|
||||||
|
Unchecked="LaunchOptionBox_Changed"/>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<TextBlock Text="Preview" Grid.Row="9" VerticalAlignment="Top" Margin="0,4,8,0"/>
|
||||||
|
<Border Grid.Row="9" Grid.Column="1" Grid.ColumnSpan="2"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
BorderBrush="{DynamicResource AppBorderBrush}"
|
BorderBrush="{DynamicResource AppBorderBrush}"
|
||||||
Background="{DynamicResource AppSurfaceBrush}"
|
Background="{DynamicResource AppSurfaceBrush}"
|
||||||
@@ -224,6 +267,7 @@
|
|||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
</ScrollViewer>
|
||||||
|
|
||||||
<TextBlock x:Name="StatusText" Grid.Row="3" Margin="4,14,4,0"
|
<TextBlock x:Name="StatusText" Grid.Row="3" Margin="4,14,4,0"
|
||||||
Foreground="{DynamicResource AppMutedTextBrush}"
|
Foreground="{DynamicResource AppMutedTextBrush}"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -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; } = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -21,8 +23,20 @@ public sealed class LauncherItem
|
|||||||
|
|
||||||
public string? Arguments { get; set; }
|
public string? Arguments { get; set; }
|
||||||
|
|
||||||
|
public string? WorkingFolder { get; set; }
|
||||||
|
|
||||||
|
public string? Notes { get; set; }
|
||||||
|
|
||||||
public string? IconPath { get; set; }
|
public string? IconPath { get; set; }
|
||||||
|
|
||||||
|
public bool IsFavorite { get; set; }
|
||||||
|
|
||||||
|
public bool IsDisabled { get; set; }
|
||||||
|
|
||||||
|
public bool RunAsAdmin { get; set; }
|
||||||
|
|
||||||
|
public bool StartMinimized { 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; } = [];
|
||||||
|
|||||||
19
README.md
19
README.md
@@ -12,8 +12,23 @@ 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
|
||||||
- Nested menus and drag/drop ordering in Settings
|
- 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
|
||||||
|
- Optional working folder and start-minimized launch options for app and file entries
|
||||||
|
- Per-item notes, visible in launcher tooltips and searchable from the popup
|
||||||
|
- 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
|
- 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`
|
||||||
|
|||||||
@@ -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);
|
||||||
@@ -190,10 +233,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 +279,16 @@ public static class ConfigService
|
|||||||
config.ThemeScheme = LauncherThemeScheme.MarkHaven;
|
config.ThemeScheme = LauncherThemeScheme.MarkHaven;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
config.RecentItems ??= [];
|
||||||
|
config.RecentItems.RemoveAll(item => item.Type == LauncherItemType.Menu || item.IsDisabled || string.IsNullOrWhiteSpace(item.Target));
|
||||||
|
foreach (LauncherItem item in config.RecentItems)
|
||||||
|
{
|
||||||
|
item.IsFavorite = false;
|
||||||
|
item.IsDisabled = 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, OpenContainingFolderFromPopup);
|
||||||
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,49 @@ public sealed class LauncherController : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void RecordRecentItem(LauncherItem item)
|
||||||
|
{
|
||||||
|
if (item.Type == LauncherItemType.Menu || item.IsDisabled || 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,
|
||||||
|
WorkingFolder = item.WorkingFolder,
|
||||||
|
Notes = item.Notes,
|
||||||
|
IconPath = item.IconPath,
|
||||||
|
IsFavorite = false,
|
||||||
|
IsDisabled = false,
|
||||||
|
RunAsAdmin = item.RunAsAdmin,
|
||||||
|
StartMinimized = item.StartMinimized,
|
||||||
|
DisplayMode = item.DisplayMode,
|
||||||
|
Children = []
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
private void OpenAllItems(LauncherItem menuItem)
|
private void OpenAllItems(LauncherItem menuItem)
|
||||||
{
|
{
|
||||||
List<string> failures = [];
|
List<string> failures = [];
|
||||||
@@ -147,7 +199,7 @@ public sealed class LauncherController : IDisposable
|
|||||||
|
|
||||||
foreach (LauncherItem child in menuItem.Children)
|
foreach (LauncherItem child in menuItem.Children)
|
||||||
{
|
{
|
||||||
if (child.Type == LauncherItemType.Menu || string.IsNullOrWhiteSpace(child.Target))
|
if (child.Type == LauncherItemType.Menu || child.IsDisabled || string.IsNullOrWhiteSpace(child.Target))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -155,6 +207,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))
|
||||||
{
|
{
|
||||||
@@ -172,7 +225,15 @@ public sealed class LauncherController : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool TryLaunchItem(LauncherItem item, out string? error)
|
private void OpenContainingFolderFromPopup(LauncherItem item)
|
||||||
|
{
|
||||||
|
if (!OpenContainingFolder(item, out string? error) && !string.IsNullOrWhiteSpace(error))
|
||||||
|
{
|
||||||
|
System.Windows.MessageBox.Show(error, "Taskbar Launcher");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool OpenContainingFolder(LauncherItem item, out string? error)
|
||||||
{
|
{
|
||||||
error = null;
|
error = null;
|
||||||
|
|
||||||
@@ -182,17 +243,66 @@ public sealed class LauncherController : IDisposable
|
|||||||
}
|
}
|
||||||
|
|
||||||
string target = Environment.ExpandEnvironmentVariables(item.Target);
|
string target = Environment.ExpandEnvironmentVariables(item.Target);
|
||||||
|
string? folderPath = Directory.Exists(target)
|
||||||
|
? target
|
||||||
|
: Path.GetDirectoryName(target);
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(folderPath) || !Directory.Exists(folderPath))
|
||||||
|
{
|
||||||
|
error = $"{item.Title}: Containing folder was not found.";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Process.Start(new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = folderPath,
|
||||||
|
UseShellExecute = true
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
error = $"{item.Title}: {ex.Message}";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool TryLaunchItem(LauncherItem item, out string? error)
|
||||||
|
{
|
||||||
|
error = null;
|
||||||
|
|
||||||
|
if (item.Type == LauncherItemType.Menu || item.IsDisabled || string.IsNullOrWhiteSpace(item.Target))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
string target = Environment.ExpandEnvironmentVariables(item.Target);
|
||||||
|
bool runAsAdmin = item.RunAsAdmin && CanRunAsAdmin(item.Type);
|
||||||
|
string launchTarget = runAsAdmin ? ResolveExecutableTarget(target) : target;
|
||||||
|
string workingDirectory = GetWorkingDirectory(item, target);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ProcessStartInfo startInfo = new()
|
ProcessStartInfo startInfo = new()
|
||||||
{
|
{
|
||||||
FileName = target,
|
FileName = launchTarget,
|
||||||
Arguments = item.Arguments ?? "",
|
Arguments = item.Arguments ?? "",
|
||||||
UseShellExecute = true,
|
UseShellExecute = true,
|
||||||
WorkingDirectory = Directory.Exists(target) ? target : ConfigService.AppFolder
|
WorkingDirectory = workingDirectory
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (runAsAdmin)
|
||||||
|
{
|
||||||
|
startInfo.Verb = "runas";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (item.StartMinimized && CanUseLaunchOptions(item.Type))
|
||||||
|
{
|
||||||
|
startInfo.WindowStyle = ProcessWindowStyle.Minimized;
|
||||||
|
}
|
||||||
|
|
||||||
Process.Start(startInfo);
|
Process.Start(startInfo);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -202,4 +312,56 @@ public sealed class LauncherController : IDisposable
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static bool CanRunAsAdmin(LauncherItemType itemType)
|
||||||
|
{
|
||||||
|
return itemType is LauncherItemType.App or LauncherItemType.File;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool CanUseLaunchOptions(LauncherItemType itemType)
|
||||||
|
{
|
||||||
|
return itemType is LauncherItemType.App or LauncherItemType.File;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetWorkingDirectory(LauncherItem item, string target)
|
||||||
|
{
|
||||||
|
if (CanUseLaunchOptions(item.Type) && !string.IsNullOrWhiteSpace(item.WorkingFolder))
|
||||||
|
{
|
||||||
|
string configuredFolder = Environment.ExpandEnvironmentVariables(item.WorkingFolder.Trim());
|
||||||
|
if (Directory.Exists(configuredFolder))
|
||||||
|
{
|
||||||
|
return configuredFolder;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Directory.Exists(target) ? target : ConfigService.AppFolder;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string ResolveExecutableTarget(string target)
|
||||||
|
{
|
||||||
|
if (Path.IsPathRooted(target) || Path.GetDirectoryName(target) is { Length: > 0 })
|
||||||
|
{
|
||||||
|
return target;
|
||||||
|
}
|
||||||
|
|
||||||
|
string[] searchFolders =
|
||||||
|
[
|
||||||
|
Environment.CurrentDirectory,
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.Windows),
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.System),
|
||||||
|
.. (Environment.GetEnvironmentVariable("PATH") ?? "")
|
||||||
|
.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
|
||||||
|
];
|
||||||
|
|
||||||
|
foreach (string folder in searchFolders.Where(Directory.Exists).Distinct(StringComparer.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
string candidate = Path.Combine(folder, target);
|
||||||
|
if (File.Exists(candidate))
|
||||||
|
{
|
||||||
|
return candidate;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return target;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.1</AssemblyVersion>
|
<AssemblyVersion>1.0.1.21</AssemblyVersion>
|
||||||
<FileVersion>1.0.1.1</FileVersion>
|
<FileVersion>1.0.1.21</FileVersion>
|
||||||
<InformationalVersion>1.0.1</InformationalVersion>
|
<InformationalVersion>1.0.1</InformationalVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -14,19 +14,25 @@ public partial class LauncherPopup : Window
|
|||||||
private const double HeaderAndChromeHeight = 118;
|
private const double HeaderAndChromeHeight = 118;
|
||||||
private bool isRepositionQueued;
|
private bool isRepositionQueued;
|
||||||
private readonly List<System.Windows.Controls.Button> visibleLaunchButtons = [];
|
private readonly List<System.Windows.Controls.Button> visibleLaunchButtons = [];
|
||||||
|
private readonly List<System.Windows.Controls.Control> visibleNavigationControls = [];
|
||||||
|
|
||||||
private readonly LauncherConfig config;
|
private readonly LauncherConfig config;
|
||||||
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;
|
||||||
|
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)
|
public LauncherPopup(LauncherConfig config, Action<LauncherItem> launchItem, Action<LauncherItem> openAllItems, Action showSettings, Action<LauncherItem> editItem, Action<LauncherItem> openContainingFolder)
|
||||||
{
|
{
|
||||||
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;
|
||||||
|
this.openContainingFolder = openContainingFolder;
|
||||||
BuildItems();
|
BuildItems();
|
||||||
SizeChanged += (_, _) => QueueReposition();
|
SizeChanged += (_, _) => QueueReposition();
|
||||||
}
|
}
|
||||||
@@ -91,14 +97,46 @@ public partial class LauncherPopup : Window
|
|||||||
{
|
{
|
||||||
ItemsPanel.Children.Clear();
|
ItemsPanel.Children.Clear();
|
||||||
visibleLaunchButtons.Clear();
|
visibleLaunchButtons.Clear();
|
||||||
|
visibleNavigationControls.Clear();
|
||||||
|
|
||||||
|
if (config.RecentItems.Any(item => !item.IsDisabled))
|
||||||
|
{
|
||||||
|
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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RebuildNavigationLists();
|
||||||
}
|
}
|
||||||
|
|
||||||
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),
|
||||||
|
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))
|
||||||
|
{
|
||||||
|
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)
|
||||||
{
|
{
|
||||||
@@ -106,13 +144,19 @@ public partial class LauncherPopup : Window
|
|||||||
{
|
{
|
||||||
Header = CreateMenuHeader(item),
|
Header = CreateMenuHeader(item),
|
||||||
IsExpanded = expandMenusByDefault,
|
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();
|
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;
|
||||||
@@ -125,24 +169,17 @@ public partial class LauncherPopup : Window
|
|||||||
Margin = new Thickness(depth * 12, 2, 0, 2),
|
Margin = new Thickness(depth * 12, 2, 0, 2),
|
||||||
MinHeight = DisplayModeMetrics.GetRowHeight(GetEffectiveDisplayMode(item)),
|
MinHeight = DisplayModeMetrics.GetRowHeight(GetEffectiveDisplayMode(item)),
|
||||||
HorizontalContentAlignment = System.Windows.HorizontalAlignment.Left,
|
HorizontalContentAlignment = System.Windows.HorizontalAlignment.Left,
|
||||||
Tag = item
|
Tag = item,
|
||||||
|
ToolTip = CreateItemToolTip(item)
|
||||||
};
|
};
|
||||||
|
|
||||||
button.Click += (_, _) => launchItem(item);
|
button.Click += (_, _) => launchItem(item);
|
||||||
button.KeyDown += (_, e) =>
|
if (allowEdit)
|
||||||
{
|
{
|
||||||
if (e.Key == Key.Enter)
|
button.ContextMenu = CreateItemContextMenu(item);
|
||||||
{
|
|
||||||
launchItem(item);
|
|
||||||
e.Handled = true;
|
|
||||||
}
|
}
|
||||||
else if (e.Key == Key.Escape)
|
|
||||||
{
|
button.KeyDown += LaunchButton_KeyDown;
|
||||||
Close();
|
|
||||||
e.Handled = true;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
visibleLaunchButtons.Add(button);
|
|
||||||
return button;
|
return button;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,17 +198,132 @@ 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(CreateDisableMenuItem(item));
|
||||||
|
contextMenu.Items.Add(CreateEditMenuItem(item));
|
||||||
|
|
||||||
return new TextBlock
|
return new TextBlock
|
||||||
{
|
{
|
||||||
Text = item.Title,
|
Text = item.Title,
|
||||||
ContextMenu = contextMenu
|
ContextMenu = contextMenu,
|
||||||
|
ToolTip = CreateItemToolTip(item)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private System.Windows.Controls.ContextMenu CreateItemContextMenu(LauncherItem item)
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
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 CreateDisableMenuItem(LauncherItem item)
|
||||||
|
{
|
||||||
|
System.Windows.Controls.MenuItem disableMenuItem = new()
|
||||||
|
{
|
||||||
|
Header = item.IsDisabled ? "Enable Item" : "Disable Item"
|
||||||
|
};
|
||||||
|
disableMenuItem.Click += (_, e) =>
|
||||||
|
{
|
||||||
|
item.IsDisabled = !item.IsDisabled;
|
||||||
|
ConfigService.Save(config);
|
||||||
|
BuildItems();
|
||||||
|
QueueReposition();
|
||||||
|
e.Handled = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
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()
|
||||||
|
{
|
||||||
|
Header = "Open Containing Folder",
|
||||||
|
IsEnabled = CanOpenContainingFolder(item)
|
||||||
|
};
|
||||||
|
openFolderMenuItem.Click += (_, e) =>
|
||||||
|
{
|
||||||
|
openContainingFolder(item);
|
||||||
|
e.Handled = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
return openFolderMenuItem;
|
||||||
|
}
|
||||||
|
|
||||||
|
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 && !item.IsDisabled && !string.IsNullOrWhiteSpace(item.Target);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool CanOpenContainingFolder(LauncherItem item)
|
||||||
|
{
|
||||||
|
return item.Type is LauncherItemType.App or LauncherItemType.File && !string.IsNullOrWhiteSpace(item.Target);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IEnumerable<LauncherItem> GetDisplayItems(IEnumerable<LauncherItem> items)
|
||||||
|
{
|
||||||
|
return items
|
||||||
|
.Where(item => !item.IsDisabled)
|
||||||
|
.OrderByDescending(item => item.IsFavorite);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
|
private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
|
||||||
@@ -194,8 +346,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)
|
||||||
{
|
{
|
||||||
@@ -208,34 +360,179 @@ 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));
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
{
|
{
|
||||||
foreach (LauncherItem item in items)
|
StackPanel panel = new();
|
||||||
|
panel.Children.Add((UIElement)CreateButtonContent(match.Item));
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(match.ParentPath))
|
||||||
{
|
{
|
||||||
bool isLaunchable = item.Type != LauncherItemType.Menu;
|
panel.Children.Add(new TextBlock
|
||||||
if (isLaunchable && Matches(item, query))
|
|
||||||
{
|
{
|
||||||
matches.Add(item);
|
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 (!string.IsNullOrWhiteSpace(item.WorkingFolder))
|
||||||
|
{
|
||||||
|
AddToolTipLine(panel, $"Working folder: {item.WorkingFolder}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(item.Notes))
|
||||||
|
{
|
||||||
|
AddToolTipLine(panel, $"Notes: {item.Notes}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (item.IsFavorite)
|
||||||
|
{
|
||||||
|
AddToolTipLine(panel, "Pinned to top");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (item.RunAsAdmin)
|
||||||
|
{
|
||||||
|
AddToolTipLine(panel, "Runs as administrator");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (item.StartMinimized)
|
||||||
|
{
|
||||||
|
AddToolTipLine(panel, "Starts minimized");
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
string parentPath = string.Join(" > ", parentNames);
|
||||||
|
if (isLaunchable && Matches(item, query, parentPath))
|
||||||
|
{
|
||||||
|
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) ||
|
||||||
|
(item.Notes?.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)
|
||||||
@@ -254,14 +551,142 @@ public partial class LauncherPopup : Window
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.Key == Key.Down && visibleLaunchButtons.FirstOrDefault() is System.Windows.Controls.Button firstButton)
|
if (e.Key == Key.Down)
|
||||||
{
|
{
|
||||||
Keyboard.ClearFocus();
|
FocusNavigationControl(0);
|
||||||
firstButton.Focus();
|
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;
|
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)
|
protected override void OnKeyDown(System.Windows.Input.KeyEventArgs e)
|
||||||
{
|
{
|
||||||
if (e.Key == Key.Escape)
|
if (e.Key == Key.Escape)
|
||||||
|
|||||||
@@ -1,13 +1,21 @@
|
|||||||
{
|
{
|
||||||
"Hotkey": "Ctrl+Alt+Space",
|
"Hotkey": "Ctrl+Alt+Space",
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
|
"ThemeScheme": "MarkHaven",
|
||||||
|
"RecentItems": [],
|
||||||
"Items": [
|
"Items": [
|
||||||
{
|
{
|
||||||
"Title": "Folders",
|
"Title": "Folders",
|
||||||
"Type": "Menu",
|
"Type": "Menu",
|
||||||
"Target": "",
|
"Target": "",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
|
"WorkingFolder": null,
|
||||||
|
"Notes": null,
|
||||||
"IconPath": null,
|
"IconPath": null,
|
||||||
|
"IsFavorite": false,
|
||||||
|
"IsDisabled": false,
|
||||||
|
"RunAsAdmin": false,
|
||||||
|
"StartMinimized": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@@ -15,7 +23,13 @@
|
|||||||
"Type": "Folder",
|
"Type": "Folder",
|
||||||
"Target": "%USERPROFILE%\\Documents",
|
"Target": "%USERPROFILE%\\Documents",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
|
"WorkingFolder": null,
|
||||||
|
"Notes": null,
|
||||||
"IconPath": "%USERPROFILE%\\Documents",
|
"IconPath": "%USERPROFILE%\\Documents",
|
||||||
|
"IsFavorite": false,
|
||||||
|
"IsDisabled": false,
|
||||||
|
"RunAsAdmin": false,
|
||||||
|
"StartMinimized": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": []
|
"Children": []
|
||||||
},
|
},
|
||||||
@@ -24,7 +38,13 @@
|
|||||||
"Type": "Folder",
|
"Type": "Folder",
|
||||||
"Target": "%USERPROFILE%\\Downloads",
|
"Target": "%USERPROFILE%\\Downloads",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
|
"WorkingFolder": null,
|
||||||
|
"Notes": null,
|
||||||
"IconPath": "%USERPROFILE%\\Downloads",
|
"IconPath": "%USERPROFILE%\\Downloads",
|
||||||
|
"IsFavorite": false,
|
||||||
|
"IsDisabled": false,
|
||||||
|
"RunAsAdmin": false,
|
||||||
|
"StartMinimized": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": []
|
"Children": []
|
||||||
}
|
}
|
||||||
@@ -35,7 +55,13 @@
|
|||||||
"Type": "Menu",
|
"Type": "Menu",
|
||||||
"Target": "",
|
"Target": "",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
|
"WorkingFolder": null,
|
||||||
|
"Notes": null,
|
||||||
"IconPath": null,
|
"IconPath": null,
|
||||||
|
"IsFavorite": false,
|
||||||
|
"IsDisabled": false,
|
||||||
|
"RunAsAdmin": false,
|
||||||
|
"StartMinimized": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@@ -43,7 +69,13 @@
|
|||||||
"Type": "App",
|
"Type": "App",
|
||||||
"Target": "notepad.exe",
|
"Target": "notepad.exe",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
|
"WorkingFolder": null,
|
||||||
|
"Notes": "Simple starter app entry.",
|
||||||
"IconPath": "notepad.exe",
|
"IconPath": "notepad.exe",
|
||||||
|
"IsFavorite": false,
|
||||||
|
"IsDisabled": false,
|
||||||
|
"RunAsAdmin": false,
|
||||||
|
"StartMinimized": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": []
|
"Children": []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,18 @@ 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**.
|
||||||
|
7. Right-click a launcher entry and choose **Disable Item** to hide it until it is enabled again from Settings.
|
||||||
|
8. Right-click an app or file entry and choose **Open Containing Folder**.
|
||||||
|
|
||||||
|
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
|
## Configure
|
||||||
|
|
||||||
@@ -30,6 +42,17 @@ From Settings you can:
|
|||||||
- Add submenus
|
- Add submenus
|
||||||
- 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
|
||||||
|
- 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
|
||||||
|
- 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
|
||||||
|
- Set a working folder or start apps minimized for app and file items
|
||||||
|
- Add notes to items for reminders, context, or search keywords
|
||||||
|
- 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
|
||||||
|
|||||||
Reference in New Issue
Block a user