Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c606573900 | ||
|
|
86f667f595 |
@@ -67,6 +67,8 @@
|
|||||||
<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"/>
|
||||||
|
|||||||
@@ -107,6 +107,12 @@ public partial class MainWindow : Window
|
|||||||
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 sortMenuItem = new System.Windows.Controls.MenuItem
|
||||||
|
{
|
||||||
|
Header = item.Type == LauncherItemType.Menu ? "Sort This Menu" : "Sort This Level"
|
||||||
|
};
|
||||||
|
sortMenuItem.Click += SortSelected_Click;
|
||||||
|
|
||||||
var treeItem = new TreeViewItem
|
var treeItem = new TreeViewItem
|
||||||
{
|
{
|
||||||
Header = $"{GetTreeStatusPrefix(item)}{item.Title} ({item.Type})",
|
Header = $"{GetTreeStatusPrefix(item)}{item.Title} ({item.Type})",
|
||||||
@@ -117,6 +123,7 @@ public partial class MainWindow : Window
|
|||||||
treeItem.ContextMenu.Items.Add(disableMenuItem);
|
treeItem.ContextMenu.Items.Add(disableMenuItem);
|
||||||
treeItem.ContextMenu.Items.Add(openContainingFolderMenuItem);
|
treeItem.ContextMenu.Items.Add(openContainingFolderMenuItem);
|
||||||
treeItem.ContextMenu.Items.Add(duplicateMenuItem);
|
treeItem.ContextMenu.Items.Add(duplicateMenuItem);
|
||||||
|
treeItem.ContextMenu.Items.Add(sortMenuItem);
|
||||||
treeItem.PreviewMouseRightButtonDown += (_, e) =>
|
treeItem.PreviewMouseRightButtonDown += (_, e) =>
|
||||||
{
|
{
|
||||||
treeItem.IsSelected = true;
|
treeItem.IsSelected = true;
|
||||||
@@ -1046,6 +1053,46 @@ public partial class MainWindow : Window
|
|||||||
RefreshView(selectedItem);
|
RefreshView(selectedItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SortSelected_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (controller is null || selectedItem is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ApplyCurrentItem();
|
||||||
|
LauncherItem itemToSelect = selectedItem;
|
||||||
|
if (selectedItem.Type == LauncherItemType.Menu)
|
||||||
|
{
|
||||||
|
SortItems(selectedItem.Children);
|
||||||
|
RefreshView(itemToSelect);
|
||||||
|
StatusText.Text = $"Sorted {itemToSelect.Title}. Click Save to keep it.";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<LauncherItem>? siblings = FindSiblings(controller.Config.Items, selectedItem);
|
||||||
|
if (siblings is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
SortItems(siblings);
|
||||||
|
RefreshView(itemToSelect);
|
||||||
|
StatusText.Text = $"Sorted this level. Click Save to keep it.";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void SortItems(List<LauncherItem> items)
|
||||||
|
{
|
||||||
|
List<LauncherItem> sortedItems = items
|
||||||
|
.OrderByDescending(item => item.IsFavorite)
|
||||||
|
.ThenBy(item => item.Title, StringComparer.CurrentCultureIgnoreCase)
|
||||||
|
.ThenBy(item => item.Type)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
items.Clear();
|
||||||
|
items.AddRange(sortedItems);
|
||||||
|
}
|
||||||
|
|
||||||
private static bool RemoveItem(List<LauncherItem> items, LauncherItem item)
|
private static bool RemoveItem(List<LauncherItem> items, LauncherItem item)
|
||||||
{
|
{
|
||||||
if (items.Remove(item))
|
if (items.Remove(item))
|
||||||
@@ -1260,6 +1307,114 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ExportSelectedItem_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (selectedItem is null)
|
||||||
|
{
|
||||||
|
MessageBox.Show("Select an item or menu to export first.", "Taskbar Launcher");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ApplyCurrentItem();
|
||||||
|
string safeTitle = MakeSafeFileName(string.IsNullOrWhiteSpace(selectedItem.Title) ? "launcher-item" : selectedItem.Title);
|
||||||
|
using SaveFileDialog dialog = new()
|
||||||
|
{
|
||||||
|
Title = "Export selected launcher item",
|
||||||
|
Filter = "JSON item files|*.json|All files|*.*",
|
||||||
|
FileName = $"{safeTitle}-{DateTime.Now:yyyyMMdd-HHmmss}.json",
|
||||||
|
InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)
|
||||||
|
};
|
||||||
|
|
||||||
|
if (dialog.ShowDialog() != System.Windows.Forms.DialogResult.OK)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string exportPath = ConfigService.ExportItemTo(dialog.FileName, selectedItem);
|
||||||
|
StatusText.Text = $"Exported {selectedItem.Title} to {exportPath}";
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show($"Could not export selected item.\n\n{ex.Message}", "Taskbar Launcher");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ImportItem_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (controller is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
using OpenFileDialog dialog = new()
|
||||||
|
{
|
||||||
|
Title = "Import launcher item",
|
||||||
|
Filter = "JSON item files|*.json|All files|*.*",
|
||||||
|
InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)
|
||||||
|
};
|
||||||
|
|
||||||
|
if (dialog.ShowDialog() != System.Windows.Forms.DialogResult.OK)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
ApplyCurrentItem();
|
||||||
|
LauncherItem importedItem = ConfigService.ImportItemFrom(dialog.FileName);
|
||||||
|
AddImportedItem(importedItem);
|
||||||
|
selectedPath = FindItemPath(importedItem);
|
||||||
|
RefreshView(importedItem);
|
||||||
|
StatusText.Text = $"Imported {importedItem.Title}. Click Save to keep it.";
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show($"Could not import item.\n\n{ex.Message}", "Taskbar Launcher");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void AddImportedItem(LauncherItem importedItem)
|
||||||
|
{
|
||||||
|
if (controller is null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selectedItem is null)
|
||||||
|
{
|
||||||
|
controller.Config.Items.Add(importedItem);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selectedItem.Type == LauncherItemType.Menu)
|
||||||
|
{
|
||||||
|
selectedItem.Children.Add(importedItem);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<LauncherItem>? siblings = FindSiblings(controller.Config.Items, selectedItem);
|
||||||
|
if (siblings is null)
|
||||||
|
{
|
||||||
|
controller.Config.Items.Add(importedItem);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int selectedIndex = siblings.IndexOf(selectedItem);
|
||||||
|
siblings.Insert(selectedIndex + 1, importedItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string MakeSafeFileName(string fileName)
|
||||||
|
{
|
||||||
|
foreach (char invalidChar in Path.GetInvalidFileNameChars())
|
||||||
|
{
|
||||||
|
fileName = fileName.Replace(invalidChar, '-');
|
||||||
|
}
|
||||||
|
|
||||||
|
return fileName.Trim();
|
||||||
|
}
|
||||||
|
|
||||||
private void ResetConfig_Click(object sender, RoutedEventArgs e)
|
private void ResetConfig_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
MessageBoxResult result = MessageBox.Show(
|
MessageBoxResult result = MessageBox.Show(
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ Download the compiled Windows release from:
|
|||||||
- Right-click launcher entries or Settings items to temporarily disable them
|
- Right-click launcher entries or Settings items to temporarily disable them
|
||||||
- Right-click app/file entries to open their containing folder
|
- Right-click app/file entries to open their containing folder
|
||||||
- Validate missing app, file, and folder targets from Settings
|
- 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 item duplication in Settings
|
||||||
- Right-click items in Settings to pin them to the top of their menu
|
- 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
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -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.11</AssemblyVersion>
|
<AssemblyVersion>1.0.1.13</AssemblyVersion>
|
||||||
<FileVersion>1.0.1.11</FileVersion>
|
<FileVersion>1.0.1.13</FileVersion>
|
||||||
<InformationalVersion>1.0.1</InformationalVersion>
|
<InformationalVersion>1.0.1</InformationalVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,8 @@ From Settings you can:
|
|||||||
- Right-click an item and choose **Disable Item** or **Enable Item** to hide or restore it
|
- 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**
|
- Right-click an app or file item and choose **Open Containing Folder**
|
||||||
- Use **Config... > Validate Targets** to check for missing app, file, and folder targets
|
- 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