Add pinned launcher items
This commit is contained in:
@@ -84,15 +84,22 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private TreeViewItem CreateTreeItem(LauncherItem item)
|
private TreeViewItem CreateTreeItem(LauncherItem item)
|
||||||
{
|
{
|
||||||
|
var pinMenuItem = new System.Windows.Controls.MenuItem
|
||||||
|
{
|
||||||
|
Header = item.IsFavorite ? "Unpin from Top" : "Pin to Top"
|
||||||
|
};
|
||||||
|
pinMenuItem.Click += ToggleFavorite_Click;
|
||||||
|
|
||||||
var duplicateMenuItem = new System.Windows.Controls.MenuItem { Header = "Duplicate Item" };
|
var duplicateMenuItem = new System.Windows.Controls.MenuItem { Header = "Duplicate Item" };
|
||||||
duplicateMenuItem.Click += DuplicateItem_Click;
|
duplicateMenuItem.Click += DuplicateItem_Click;
|
||||||
|
|
||||||
var treeItem = new TreeViewItem
|
var treeItem = new TreeViewItem
|
||||||
{
|
{
|
||||||
Header = $"{item.Title} ({item.Type})",
|
Header = $"{(item.IsFavorite ? "[Pinned] " : "")}{item.Title} ({item.Type})",
|
||||||
Tag = item,
|
Tag = item,
|
||||||
ContextMenu = new System.Windows.Controls.ContextMenu()
|
ContextMenu = new System.Windows.Controls.ContextMenu()
|
||||||
};
|
};
|
||||||
|
treeItem.ContextMenu.Items.Add(pinMenuItem);
|
||||||
treeItem.ContextMenu.Items.Add(duplicateMenuItem);
|
treeItem.ContextMenu.Items.Add(duplicateMenuItem);
|
||||||
treeItem.PreviewMouseRightButtonDown += (_, e) =>
|
treeItem.PreviewMouseRightButtonDown += (_, e) =>
|
||||||
{
|
{
|
||||||
@@ -803,6 +810,23 @@ public partial class MainWindow : Window
|
|||||||
StatusText.Text = "Added submenu. Rename it, then Save.";
|
StatusText.Text = "Added submenu. Rename it, then Save.";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ToggleFavorite_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (controller is null || selectedItem is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ApplyCurrentItem();
|
||||||
|
selectedItem.IsFavorite = !selectedItem.IsFavorite;
|
||||||
|
LauncherItem itemToSelect = selectedItem;
|
||||||
|
selectedPath = FindItemPath(itemToSelect);
|
||||||
|
RefreshView(itemToSelect);
|
||||||
|
StatusText.Text = itemToSelect.IsFavorite
|
||||||
|
? $"Pinned {itemToSelect.Title}. Click Save to keep it."
|
||||||
|
: $"Unpinned {itemToSelect.Title}. Click Save to keep it.";
|
||||||
|
}
|
||||||
|
|
||||||
private void DuplicateItem_Click(object sender, RoutedEventArgs e)
|
private void DuplicateItem_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (controller is null || selectedItem is null)
|
if (controller is null || selectedItem is null)
|
||||||
@@ -865,6 +889,7 @@ public partial class MainWindow : Window
|
|||||||
Target = item.Target,
|
Target = item.Target,
|
||||||
Arguments = item.Arguments,
|
Arguments = item.Arguments,
|
||||||
IconPath = item.IconPath,
|
IconPath = item.IconPath,
|
||||||
|
IsFavorite = item.IsFavorite,
|
||||||
DisplayMode = item.DisplayMode,
|
DisplayMode = item.DisplayMode,
|
||||||
Children = item.Children.Select(child => DuplicateItem(child, renameRoot: false)).ToList()
|
Children = item.Children.Select(child => DuplicateItem(child, renameRoot: false)).ToList()
|
||||||
};
|
};
|
||||||
@@ -1456,6 +1481,7 @@ public partial class MainWindow : Window
|
|||||||
Target = TargetBox.Text.Trim(),
|
Target = TargetBox.Text.Trim(),
|
||||||
Arguments = string.IsNullOrWhiteSpace(ArgumentsBox.Text) ? null : ArgumentsBox.Text.Trim(),
|
Arguments = string.IsNullOrWhiteSpace(ArgumentsBox.Text) ? null : ArgumentsBox.Text.Trim(),
|
||||||
IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim(),
|
IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim(),
|
||||||
|
IsFavorite = selectedItem.IsFavorite,
|
||||||
DisplayMode = ItemDisplayModeBox.SelectedItem is LauncherDisplayMode mode
|
DisplayMode = ItemDisplayModeBox.SelectedItem is LauncherDisplayMode mode
|
||||||
? mode
|
? mode
|
||||||
: selectedItem.DisplayMode
|
: selectedItem.DisplayMode
|
||||||
|
|||||||
@@ -25,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; } = [];
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ Download the compiled Windows release from:
|
|||||||
- Nested menus, drag/drop ordering, and drag/drop item creation in Settings
|
- Nested menus, drag/drop ordering, and drag/drop item creation in Settings
|
||||||
- Right-click launcher entries to edit them in Settings
|
- Right-click launcher entries to edit them in Settings
|
||||||
- Right-click item duplication in Settings
|
- Right-click item duplication in Settings
|
||||||
|
- Right-click items in Settings to pin them to the top of their menu
|
||||||
- Per-item icon and display mode
|
- Per-item icon and display mode
|
||||||
- Automatic icon selection from app/folder targets
|
- Automatic icon selection from app/folder targets
|
||||||
- Portable `config.json`
|
- Portable `config.json`
|
||||||
|
|||||||
@@ -240,6 +240,7 @@ public static class ConfigService
|
|||||||
config.RecentItems.RemoveAll(item => item.Type == LauncherItemType.Menu || string.IsNullOrWhiteSpace(item.Target));
|
config.RecentItems.RemoveAll(item => item.Type == LauncherItemType.Menu || string.IsNullOrWhiteSpace(item.Target));
|
||||||
foreach (LauncherItem item in config.RecentItems)
|
foreach (LauncherItem item in config.RecentItems)
|
||||||
{
|
{
|
||||||
|
item.IsFavorite = false;
|
||||||
item.Children = [];
|
item.Children = [];
|
||||||
NormalizeDisplayModes(item);
|
NormalizeDisplayModes(item);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -181,6 +181,7 @@ public sealed class LauncherController : IDisposable
|
|||||||
Target = item.Target,
|
Target = item.Target,
|
||||||
Arguments = item.Arguments,
|
Arguments = item.Arguments,
|
||||||
IconPath = item.IconPath,
|
IconPath = item.IconPath,
|
||||||
|
IsFavorite = false,
|
||||||
DisplayMode = item.DisplayMode,
|
DisplayMode = item.DisplayMode,
|
||||||
Children = []
|
Children = []
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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.5</AssemblyVersion>
|
<AssemblyVersion>1.0.1.6</AssemblyVersion>
|
||||||
<FileVersion>1.0.1.5</FileVersion>
|
<FileVersion>1.0.1.6</FileVersion>
|
||||||
<InformationalVersion>1.0.1</InformationalVersion>
|
<InformationalVersion>1.0.1</InformationalVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public partial class LauncherPopup : Window
|
|||||||
}
|
}
|
||||||
|
|
||||||
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));
|
||||||
}
|
}
|
||||||
@@ -137,7 +137,7 @@ 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, allowEdit));
|
children.Children.Add(CreateItemControl(child, depth + 1, expandMenusByDefault, allowEdit));
|
||||||
}
|
}
|
||||||
@@ -231,6 +231,11 @@ public partial class LauncherPopup : Window
|
|||||||
return item.Type != LauncherItemType.Menu && !string.IsNullOrWhiteSpace(item.Target);
|
return item.Type != LauncherItemType.Menu && !string.IsNullOrWhiteSpace(item.Target);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static IEnumerable<LauncherItem> GetDisplayItems(IEnumerable<LauncherItem> items)
|
||||||
|
{
|
||||||
|
return items.OrderByDescending(item => item.IsFavorite);
|
||||||
|
}
|
||||||
|
|
||||||
private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
|
private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
|
||||||
{
|
{
|
||||||
string query = SearchBox.Text.Trim();
|
string query = SearchBox.Text.Trim();
|
||||||
@@ -273,7 +278,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))
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
"Target": "",
|
"Target": "",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
"IconPath": null,
|
"IconPath": null,
|
||||||
|
"IsFavorite": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@@ -18,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": []
|
||||||
},
|
},
|
||||||
@@ -27,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": []
|
||||||
}
|
}
|
||||||
@@ -38,6 +41,7 @@
|
|||||||
"Target": "",
|
"Target": "",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
"IconPath": null,
|
"IconPath": null,
|
||||||
|
"IsFavorite": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@@ -46,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": []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ From Settings you can:
|
|||||||
- Drag/drop items to reorder
|
- Drag/drop items to reorder
|
||||||
- Drag/drop files, folders, shortcuts, or web links into the launcher item list
|
- Drag/drop files, folders, shortcuts, or web links into the launcher item list
|
||||||
- Right-click an item and choose **Duplicate Item** to copy it
|
- Right-click an item and choose **Duplicate Item** to copy it
|
||||||
|
- Right-click an item and choose **Pin to Top** to show it first in its menu
|
||||||
- Set per-item icon sizes
|
- Set per-item icon sizes
|
||||||
- Back up and restore `config.json`
|
- Back up and restore `config.json`
|
||||||
- Enable Start with Windows
|
- Enable Start with Windows
|
||||||
|
|||||||
Reference in New Issue
Block a user