Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32f08bc0fd | ||
|
|
362cd94138 | ||
|
|
5aacdbb22c |
@@ -3,6 +3,7 @@ using System.Windows.Controls;
|
||||
using System.Windows.Forms;
|
||||
using System.Windows.Media;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using System.Windows.Input;
|
||||
using TaskbarLauncher.Models;
|
||||
using TaskbarLauncher.Services;
|
||||
@@ -39,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)
|
||||
@@ -69,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));
|
||||
@@ -156,15 +184,42 @@ public partial class MainWindow : Window
|
||||
|
||||
private void ItemsTree_DragOver(object sender, System.Windows.DragEventArgs e)
|
||||
{
|
||||
e.Effects = CanDrop(e) ? System.Windows.DragDropEffects.Move : System.Windows.DragDropEffects.None;
|
||||
if (CanMoveDroppedItem(e))
|
||||
{
|
||||
e.Effects = System.Windows.DragDropEffects.Move;
|
||||
}
|
||||
else if (CanAddExternalDroppedItems(e.Data))
|
||||
{
|
||||
e.Effects = System.Windows.DragDropEffects.Copy;
|
||||
}
|
||||
else
|
||||
{
|
||||
e.Effects = System.Windows.DragDropEffects.None;
|
||||
}
|
||||
|
||||
e.Handled = true;
|
||||
}
|
||||
|
||||
private void ItemsTree_Drop(object sender, System.Windows.DragEventArgs e)
|
||||
{
|
||||
if (controller is null ||
|
||||
!e.Data.GetDataPresent(typeof(LauncherItem)) ||
|
||||
e.Data.GetData(typeof(LauncherItem)) is not LauncherItem draggedItem)
|
||||
if (controller is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (e.Data.GetDataPresent(typeof(LauncherItem)) &&
|
||||
e.Data.GetData(typeof(LauncherItem)) is LauncherItem draggedItem)
|
||||
{
|
||||
MoveDroppedItem(e, draggedItem);
|
||||
return;
|
||||
}
|
||||
|
||||
AddExternalDroppedItems(e);
|
||||
}
|
||||
|
||||
private void MoveDroppedItem(System.Windows.DragEventArgs e, LauncherItem draggedItem)
|
||||
{
|
||||
if (controller is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -213,7 +268,59 @@ public partial class MainWindow : Window
|
||||
e.Handled = true;
|
||||
}
|
||||
|
||||
private bool CanDrop(System.Windows.DragEventArgs e)
|
||||
private void AddExternalDroppedItems(System.Windows.DragEventArgs e)
|
||||
{
|
||||
if (controller is null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
List<LauncherItem> droppedItems = CreateItemsFromDropData(e.Data, controller.Config.DisplayMode);
|
||||
if (droppedItems.Count == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
ApplyCurrentItem();
|
||||
|
||||
TreeViewItem? targetTreeItem = FindAncestor<TreeViewItem>(e.OriginalSource as DependencyObject);
|
||||
LauncherItem? targetItem = targetTreeItem?.Tag as LauncherItem;
|
||||
if (targetItem is null)
|
||||
{
|
||||
controller.Config.Items.AddRange(droppedItems);
|
||||
}
|
||||
else if (targetItem.Type == LauncherItemType.Menu)
|
||||
{
|
||||
targetItem.Children.AddRange(droppedItems);
|
||||
if (targetTreeItem is not null)
|
||||
{
|
||||
targetTreeItem.IsExpanded = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
List<LauncherItem>? targetSiblings = FindSiblings(controller.Config.Items, targetItem);
|
||||
if (targetSiblings is null)
|
||||
{
|
||||
controller.Config.Items.AddRange(droppedItems);
|
||||
}
|
||||
else
|
||||
{
|
||||
int targetIndex = targetSiblings.IndexOf(targetItem);
|
||||
targetSiblings.InsertRange(targetIndex + 1, droppedItems);
|
||||
}
|
||||
}
|
||||
|
||||
LauncherItem itemToSelect = droppedItems[0];
|
||||
selectedPath = FindItemPath(itemToSelect);
|
||||
RefreshView(itemToSelect);
|
||||
StatusText.Text = droppedItems.Count == 1
|
||||
? $"Added {itemToSelect.Title}. Click Save to keep it."
|
||||
: $"Added {droppedItems.Count} items. Click Save to keep them.";
|
||||
e.Handled = true;
|
||||
}
|
||||
|
||||
private bool CanMoveDroppedItem(System.Windows.DragEventArgs e)
|
||||
{
|
||||
if (!e.Data.GetDataPresent(typeof(LauncherItem)) ||
|
||||
e.Data.GetData(typeof(LauncherItem)) is not LauncherItem draggedItem)
|
||||
@@ -226,6 +333,204 @@ public partial class MainWindow : Window
|
||||
return targetItem is null || (!ReferenceEquals(draggedItem, targetItem) && !ContainsItem(draggedItem, targetItem));
|
||||
}
|
||||
|
||||
private static bool CanAddExternalDroppedItems(System.Windows.IDataObject data)
|
||||
{
|
||||
return data.GetDataPresent(System.Windows.DataFormats.FileDrop) ||
|
||||
data.GetDataPresent(System.Windows.DataFormats.UnicodeText) ||
|
||||
data.GetDataPresent(System.Windows.DataFormats.Text) ||
|
||||
data.GetDataPresent("UniformResourceLocatorW") ||
|
||||
data.GetDataPresent("UniformResourceLocator");
|
||||
}
|
||||
|
||||
private static List<LauncherItem> CreateItemsFromDropData(System.Windows.IDataObject data, LauncherDisplayMode displayMode)
|
||||
{
|
||||
List<LauncherItem> items = [];
|
||||
|
||||
if (data.GetDataPresent(System.Windows.DataFormats.FileDrop) &&
|
||||
data.GetData(System.Windows.DataFormats.FileDrop) is string[] paths)
|
||||
{
|
||||
foreach (string path in paths)
|
||||
{
|
||||
LauncherItem? item = CreateItemFromPath(path, displayMode);
|
||||
if (item is not null)
|
||||
{
|
||||
items.Add(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (items.Count > 0)
|
||||
{
|
||||
return items;
|
||||
}
|
||||
|
||||
string? droppedText = GetDroppedText(data);
|
||||
if (!string.IsNullOrWhiteSpace(droppedText))
|
||||
{
|
||||
foreach (string line in droppedText.Split(["\r\n", "\n"], StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
|
||||
{
|
||||
LauncherItem? item = CreateItemFromText(line, displayMode);
|
||||
if (item is not null)
|
||||
{
|
||||
items.Add(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return items;
|
||||
}
|
||||
|
||||
private static string? GetDroppedText(System.Windows.IDataObject data)
|
||||
{
|
||||
if (data.GetDataPresent(System.Windows.DataFormats.UnicodeText))
|
||||
{
|
||||
return data.GetData(System.Windows.DataFormats.UnicodeText) as string;
|
||||
}
|
||||
|
||||
if (data.GetDataPresent(System.Windows.DataFormats.Text))
|
||||
{
|
||||
return data.GetData(System.Windows.DataFormats.Text) as string;
|
||||
}
|
||||
|
||||
return GetDroppedUrlFormatText(data, "UniformResourceLocatorW", Encoding.Unicode) ??
|
||||
GetDroppedUrlFormatText(data, "UniformResourceLocator", Encoding.UTF8);
|
||||
}
|
||||
|
||||
private static string? GetDroppedUrlFormatText(System.Windows.IDataObject data, string format, Encoding encoding)
|
||||
{
|
||||
if (!data.GetDataPresent(format))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
object? rawData = data.GetData(format);
|
||||
return rawData switch
|
||||
{
|
||||
string text => text,
|
||||
byte[] bytes => DecodeDroppedUrlBytes(bytes, encoding),
|
||||
MemoryStream stream => DecodeDroppedUrlBytes(stream.ToArray(), encoding),
|
||||
_ => null
|
||||
};
|
||||
}
|
||||
|
||||
private static string DecodeDroppedUrlBytes(byte[] bytes, Encoding encoding)
|
||||
{
|
||||
return encoding.GetString(bytes).TrimEnd('\0', '\r', '\n', ' ');
|
||||
}
|
||||
|
||||
private static LauncherItem? CreateItemFromText(string text, LauncherDisplayMode displayMode)
|
||||
{
|
||||
string target = text.Trim();
|
||||
if (!Uri.TryCreate(target, UriKind.Absolute, out Uri? uri) ||
|
||||
(uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return new LauncherItem
|
||||
{
|
||||
Title = GetWebsiteTitle(uri),
|
||||
Type = LauncherItemType.Website,
|
||||
Target = uri.ToString(),
|
||||
IconPath = uri.ToString(),
|
||||
DisplayMode = displayMode
|
||||
};
|
||||
}
|
||||
|
||||
private static LauncherItem CreateWebsiteItem(Uri uri, string title, LauncherDisplayMode displayMode)
|
||||
{
|
||||
return new LauncherItem
|
||||
{
|
||||
Title = title,
|
||||
Type = LauncherItemType.Website,
|
||||
Target = uri.ToString(),
|
||||
IconPath = uri.ToString(),
|
||||
DisplayMode = displayMode
|
||||
};
|
||||
}
|
||||
|
||||
private static LauncherItem? CreateItemFromPath(string path, LauncherDisplayMode displayMode)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(path))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
string fullPath = path.Trim();
|
||||
if (Directory.Exists(fullPath))
|
||||
{
|
||||
return new LauncherItem
|
||||
{
|
||||
Title = new DirectoryInfo(fullPath).Name,
|
||||
Type = LauncherItemType.Folder,
|
||||
Target = fullPath,
|
||||
IconPath = fullPath,
|
||||
DisplayMode = displayMode
|
||||
};
|
||||
}
|
||||
|
||||
if (!File.Exists(fullPath))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
if (Path.GetExtension(fullPath).Equals(".url", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return CreateItemFromInternetShortcut(fullPath, displayMode);
|
||||
}
|
||||
|
||||
LauncherItemType type = IsApplicationPath(fullPath) ? LauncherItemType.App : LauncherItemType.File;
|
||||
return new LauncherItem
|
||||
{
|
||||
Title = Path.GetFileNameWithoutExtension(fullPath),
|
||||
Type = type,
|
||||
Target = fullPath,
|
||||
IconPath = fullPath,
|
||||
DisplayMode = displayMode
|
||||
};
|
||||
}
|
||||
|
||||
private static LauncherItem? CreateItemFromInternetShortcut(string path, LauncherDisplayMode displayMode)
|
||||
{
|
||||
foreach (string line in File.ReadLines(path))
|
||||
{
|
||||
if (!line.StartsWith("URL=", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
string target = line["URL=".Length..].Trim();
|
||||
if (Uri.TryCreate(target, UriKind.Absolute, out Uri? uri) &&
|
||||
(uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps))
|
||||
{
|
||||
return CreateWebsiteItem(uri, Path.GetFileNameWithoutExtension(path), displayMode);
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static bool IsApplicationPath(string path)
|
||||
{
|
||||
string extension = Path.GetExtension(path);
|
||||
return extension.Equals(".exe", StringComparison.OrdinalIgnoreCase) ||
|
||||
extension.Equals(".lnk", StringComparison.OrdinalIgnoreCase) ||
|
||||
extension.Equals(".bat", StringComparison.OrdinalIgnoreCase) ||
|
||||
extension.Equals(".cmd", StringComparison.OrdinalIgnoreCase) ||
|
||||
extension.Equals(".ps1", StringComparison.OrdinalIgnoreCase);
|
||||
}
|
||||
|
||||
private static string GetWebsiteTitle(Uri uri)
|
||||
{
|
||||
string host = uri.Host;
|
||||
if (host.StartsWith("www.", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
host = host[4..];
|
||||
}
|
||||
|
||||
return string.IsNullOrWhiteSpace(host) ? uri.ToString() : host;
|
||||
}
|
||||
|
||||
private static bool ContainsItem(LauncherItem parent, LauncherItem possibleChild)
|
||||
{
|
||||
foreach (LauncherItem child in parent.Children)
|
||||
@@ -498,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
|
||||
@@ -520,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)
|
||||
|
||||
@@ -13,7 +13,9 @@ Download the compiled Windows release from:
|
||||
- System tray launcher
|
||||
- Global hotkey, default `Ctrl+Alt+Space`
|
||||
- Search/filter in the launcher popup
|
||||
- Nested menus and drag/drop ordering 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 item duplication in Settings
|
||||
- Per-item icon and display mode
|
||||
- Automatic icon selection from app/folder targets
|
||||
- Portable `config.json`
|
||||
|
||||
@@ -41,6 +41,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 +70,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();
|
||||
}
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
<Authors>Ray Berezowski</Authors>
|
||||
<ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
|
||||
<Version>1.0.1</Version>
|
||||
<AssemblyVersion>1.0.1.1</AssemblyVersion>
|
||||
<FileVersion>1.0.1.1</FileVersion>
|
||||
<AssemblyVersion>1.0.1.4</AssemblyVersion>
|
||||
<FileVersion>1.0.1.4</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();
|
||||
}
|
||||
@@ -129,6 +131,7 @@ public partial class LauncherPopup : Window
|
||||
};
|
||||
|
||||
button.Click += (_, _) => launchItem(item);
|
||||
button.ContextMenu = CreateItemContextMenu(item);
|
||||
button.KeyDown += (_, e) =>
|
||||
{
|
||||
if (e.Key == Key.Enter)
|
||||
@@ -161,6 +164,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 +174,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);
|
||||
|
||||
@@ -19,6 +19,7 @@ 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.
|
||||
|
||||
## Configure
|
||||
|
||||
@@ -30,6 +31,8 @@ From Settings you can:
|
||||
- Add submenus
|
||||
- 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