Add working folder and minimized launch options
This commit is contained in:
@@ -182,6 +182,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="Title" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
<TextBlock Text="Title" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
||||||
@@ -203,27 +204,42 @@
|
|||||||
<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="Icon Path" Grid.Row="5" VerticalAlignment="Center" Margin="0,0,8,0"/>
|
||||||
|
<TextBox x:Name="IconPathBox" Grid.Row="5" Grid.Column="1" Margin="0,0,8,8"
|
||||||
TextChanged="PreviewField_Changed"/>
|
TextChanged="PreviewField_Changed"/>
|
||||||
<StackPanel Grid.Row="4" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,8">
|
<StackPanel Grid.Row="5" 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="6" 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="6" Grid.Column="1" Grid.ColumnSpan="2"
|
||||||
Margin="0,0,0,8" SelectionChanged="ItemDisplayModeBox_SelectionChanged"/>
|
Margin="0,0,0,8" SelectionChanged="ItemDisplayModeBox_SelectionChanged"/>
|
||||||
|
|
||||||
<TextBlock Text="Launch Options" Grid.Row="6" VerticalAlignment="Center" Margin="0,0,8,8"/>
|
<TextBlock Text="Launch Options" Grid.Row="7" VerticalAlignment="Top" Margin="0,2,8,8"/>
|
||||||
<CheckBox x:Name="RunAsAdminBox" Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2"
|
<StackPanel Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,0,0,8">
|
||||||
Content="Run as administrator"
|
<CheckBox x:Name="RunAsAdminBox"
|
||||||
Margin="0,0,0,8"
|
Content="Run as administrator"
|
||||||
Checked="RunAsAdminBox_Changed"
|
Margin="0,0,0,6"
|
||||||
Unchecked="RunAsAdminBox_Changed"/>
|
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="7" VerticalAlignment="Top" Margin="0,4,8,0"/>
|
<TextBlock Text="Preview" Grid.Row="8" VerticalAlignment="Top" Margin="0,4,8,0"/>
|
||||||
<Border Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="2"
|
<Border Grid.Row="8" Grid.Column="1" Grid.ColumnSpan="2"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
BorderBrush="{DynamicResource AppBorderBrush}"
|
BorderBrush="{DynamicResource AppBorderBrush}"
|
||||||
Background="{DynamicResource AppSurfaceBrush}"
|
Background="{DynamicResource AppSurfaceBrush}"
|
||||||
|
|||||||
@@ -613,10 +613,12 @@ public partial class MainWindow : Window
|
|||||||
TypeBox.SelectedItem = item.Type;
|
TypeBox.SelectedItem = item.Type;
|
||||||
TargetBox.Text = item.Target;
|
TargetBox.Text = item.Target;
|
||||||
ArgumentsBox.Text = item.Arguments ?? "";
|
ArgumentsBox.Text = item.Arguments ?? "";
|
||||||
|
WorkingFolderBox.Text = item.WorkingFolder ?? "";
|
||||||
IconPathBox.Text = item.IconPath ?? "";
|
IconPathBox.Text = item.IconPath ?? "";
|
||||||
loadedAutoIconPath = GetAutomaticIconPath(item);
|
loadedAutoIconPath = GetAutomaticIconPath(item);
|
||||||
ItemDisplayModeBox.SelectedItem = item.DisplayMode;
|
ItemDisplayModeBox.SelectedItem = item.DisplayMode;
|
||||||
RunAsAdminBox.IsChecked = item.RunAsAdmin;
|
RunAsAdminBox.IsChecked = item.RunAsAdmin;
|
||||||
|
StartMinimizedBox.IsChecked = item.StartMinimized;
|
||||||
UpdateTargetAvailability();
|
UpdateTargetAvailability();
|
||||||
isLoadingSelection = false;
|
isLoadingSelection = false;
|
||||||
UpdatePreview();
|
UpdatePreview();
|
||||||
@@ -631,10 +633,12 @@ public partial class MainWindow : Window
|
|||||||
TypeBox.SelectedIndex = -1;
|
TypeBox.SelectedIndex = -1;
|
||||||
TargetBox.Text = "";
|
TargetBox.Text = "";
|
||||||
ArgumentsBox.Text = "";
|
ArgumentsBox.Text = "";
|
||||||
|
WorkingFolderBox.Text = "";
|
||||||
IconPathBox.Text = "";
|
IconPathBox.Text = "";
|
||||||
loadedAutoIconPath = null;
|
loadedAutoIconPath = null;
|
||||||
ItemDisplayModeBox.SelectedItem = controller?.Config.DisplayMode;
|
ItemDisplayModeBox.SelectedItem = controller?.Config.DisplayMode;
|
||||||
RunAsAdminBox.IsChecked = false;
|
RunAsAdminBox.IsChecked = false;
|
||||||
|
StartMinimizedBox.IsChecked = false;
|
||||||
UpdateTargetAvailability();
|
UpdateTargetAvailability();
|
||||||
isLoadingSelection = false;
|
isLoadingSelection = false;
|
||||||
UpdatePreview();
|
UpdatePreview();
|
||||||
@@ -653,6 +657,9 @@ public partial class MainWindow : Window
|
|||||||
selectedItem.Arguments = selectedItem.Type == LauncherItemType.Menu || string.IsNullOrWhiteSpace(ArgumentsBox.Text)
|
selectedItem.Arguments = selectedItem.Type == LauncherItemType.Menu || string.IsNullOrWhiteSpace(ArgumentsBox.Text)
|
||||||
? null
|
? null
|
||||||
: ArgumentsBox.Text.Trim();
|
: ArgumentsBox.Text.Trim();
|
||||||
|
selectedItem.WorkingFolder = LauncherController.CanUseLaunchOptions(selectedItem.Type) && !string.IsNullOrWhiteSpace(WorkingFolderBox.Text)
|
||||||
|
? WorkingFolderBox.Text.Trim()
|
||||||
|
: null;
|
||||||
EnsureAutomaticIconPath();
|
EnsureAutomaticIconPath();
|
||||||
selectedItem.IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim();
|
selectedItem.IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim();
|
||||||
if (ItemDisplayModeBox.SelectedItem is LauncherDisplayMode itemMode)
|
if (ItemDisplayModeBox.SelectedItem is LauncherDisplayMode itemMode)
|
||||||
@@ -660,6 +667,7 @@ public partial class MainWindow : Window
|
|||||||
selectedItem.DisplayMode = itemMode;
|
selectedItem.DisplayMode = itemMode;
|
||||||
}
|
}
|
||||||
selectedItem.RunAsAdmin = LauncherController.CanRunAsAdmin(selectedItem.Type) && RunAsAdminBox.IsChecked == true;
|
selectedItem.RunAsAdmin = LauncherController.CanRunAsAdmin(selectedItem.Type) && RunAsAdminBox.IsChecked == true;
|
||||||
|
selectedItem.StartMinimized = LauncherController.CanUseLaunchOptions(selectedItem.Type) && StartMinimizedBox.IsChecked == true;
|
||||||
|
|
||||||
if (selectedItem.Type != LauncherItemType.Menu)
|
if (selectedItem.Type != LauncherItemType.Menu)
|
||||||
{
|
{
|
||||||
@@ -966,10 +974,12 @@ public partial class MainWindow : Window
|
|||||||
Type = item.Type,
|
Type = item.Type,
|
||||||
Target = item.Target,
|
Target = item.Target,
|
||||||
Arguments = item.Arguments,
|
Arguments = item.Arguments,
|
||||||
|
WorkingFolder = item.WorkingFolder,
|
||||||
IconPath = item.IconPath,
|
IconPath = item.IconPath,
|
||||||
IsFavorite = item.IsFavorite,
|
IsFavorite = item.IsFavorite,
|
||||||
IsDisabled = item.IsDisabled,
|
IsDisabled = item.IsDisabled,
|
||||||
RunAsAdmin = item.RunAsAdmin,
|
RunAsAdmin = item.RunAsAdmin,
|
||||||
|
StartMinimized = item.StartMinimized,
|
||||||
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()
|
||||||
};
|
};
|
||||||
@@ -1542,6 +1552,11 @@ public partial class MainWindow : Window
|
|||||||
issues.Add(new TargetValidationIssue(string.Join(" > ", itemPath), problem));
|
issues.Add(new TargetValidationIssue(string.Join(" > ", itemPath), problem));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!item.IsDisabled && TryGetWorkingFolderIssue(item, out string? workingFolderProblem) && workingFolderProblem is not null)
|
||||||
|
{
|
||||||
|
issues.Add(new TargetValidationIssue(string.Join(" > ", itemPath), workingFolderProblem));
|
||||||
|
}
|
||||||
|
|
||||||
if (item.Children.Count > 0)
|
if (item.Children.Count > 0)
|
||||||
{
|
{
|
||||||
ValidateTargets(item.Children, itemPath, issues);
|
ValidateTargets(item.Children, itemPath, issues);
|
||||||
@@ -1610,6 +1625,25 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool TryGetWorkingFolderIssue(LauncherItem item, out string? problem)
|
||||||
|
{
|
||||||
|
problem = null;
|
||||||
|
|
||||||
|
if (!LauncherController.CanUseLaunchOptions(item.Type) || string.IsNullOrWhiteSpace(item.WorkingFolder))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
string workingFolder = Environment.ExpandEnvironmentVariables(item.WorkingFolder.Trim());
|
||||||
|
if (Directory.Exists(workingFolder))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
problem = "Working folder does not exist.";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
private static bool CommandExistsOnPath(string target)
|
private static bool CommandExistsOnPath(string target)
|
||||||
{
|
{
|
||||||
if (target.IndexOfAny([Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar]) >= 0)
|
if (target.IndexOfAny([Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar]) >= 0)
|
||||||
@@ -1785,7 +1819,29 @@ public partial class MainWindow : Window
|
|||||||
ThemeService.Apply(scheme);
|
ThemeService.Apply(scheme);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RunAsAdminBox_Changed(object sender, RoutedEventArgs e)
|
private void BrowseWorkingFolder_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
using FolderBrowserDialog dialog = new()
|
||||||
|
{
|
||||||
|
Description = "Choose a working folder"
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(WorkingFolderBox.Text))
|
||||||
|
{
|
||||||
|
string currentFolder = Environment.ExpandEnvironmentVariables(WorkingFolderBox.Text.Trim());
|
||||||
|
if (Directory.Exists(currentFolder))
|
||||||
|
{
|
||||||
|
dialog.SelectedPath = currentFolder;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
|
||||||
|
{
|
||||||
|
WorkingFolderBox.Text = dialog.SelectedPath;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void LaunchOptionBox_Changed(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (isLoadingSelection)
|
if (isLoadingSelection)
|
||||||
{
|
{
|
||||||
@@ -1875,11 +1931,17 @@ public partial class MainWindow : Window
|
|||||||
Type = TypeBox.SelectedItem is LauncherItemType type ? type : LauncherItemType.App,
|
Type = TypeBox.SelectedItem is LauncherItemType type ? type : LauncherItemType.App,
|
||||||
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(),
|
||||||
|
WorkingFolder = LauncherController.CanUseLaunchOptions(TypeBox.SelectedItem is LauncherItemType itemType ? itemType : LauncherItemType.App) &&
|
||||||
|
!string.IsNullOrWhiteSpace(WorkingFolderBox.Text)
|
||||||
|
? WorkingFolderBox.Text.Trim()
|
||||||
|
: null,
|
||||||
IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim(),
|
IconPath = string.IsNullOrWhiteSpace(IconPathBox.Text) ? null : IconPathBox.Text.Trim(),
|
||||||
IsFavorite = selectedItem.IsFavorite,
|
IsFavorite = selectedItem.IsFavorite,
|
||||||
IsDisabled = selectedItem.IsDisabled,
|
IsDisabled = selectedItem.IsDisabled,
|
||||||
RunAsAdmin = LauncherController.CanRunAsAdmin(TypeBox.SelectedItem is LauncherItemType itemType ? itemType : LauncherItemType.App) &&
|
RunAsAdmin = LauncherController.CanRunAsAdmin(TypeBox.SelectedItem is LauncherItemType adminType ? adminType : LauncherItemType.App) &&
|
||||||
RunAsAdminBox.IsChecked == true,
|
RunAsAdminBox.IsChecked == true,
|
||||||
|
StartMinimized = LauncherController.CanUseLaunchOptions(TypeBox.SelectedItem is LauncherItemType launchType ? launchType : LauncherItemType.App) &&
|
||||||
|
StartMinimizedBox.IsChecked == true,
|
||||||
DisplayMode = ItemDisplayModeBox.SelectedItem is LauncherDisplayMode mode
|
DisplayMode = ItemDisplayModeBox.SelectedItem is LauncherDisplayMode mode
|
||||||
? mode
|
? mode
|
||||||
: selectedItem.DisplayMode
|
: selectedItem.DisplayMode
|
||||||
@@ -1946,20 +2008,31 @@ public partial class MainWindow : Window
|
|||||||
private void UpdateTargetAvailability()
|
private void UpdateTargetAvailability()
|
||||||
{
|
{
|
||||||
bool isMenu = TypeBox.SelectedItem is LauncherItemType.Menu;
|
bool isMenu = TypeBox.SelectedItem is LauncherItemType.Menu;
|
||||||
|
bool canUseLaunchOptions = TypeBox.SelectedItem is LauncherItemType launchType && LauncherController.CanUseLaunchOptions(launchType);
|
||||||
bool canRunAsAdmin = TypeBox.SelectedItem is LauncherItemType itemType && LauncherController.CanRunAsAdmin(itemType);
|
bool canRunAsAdmin = TypeBox.SelectedItem is LauncherItemType itemType && LauncherController.CanRunAsAdmin(itemType);
|
||||||
TargetBox.IsEnabled = !isMenu;
|
TargetBox.IsEnabled = !isMenu;
|
||||||
ArgumentsBox.IsEnabled = !isMenu;
|
ArgumentsBox.IsEnabled = !isMenu;
|
||||||
|
WorkingFolderBox.IsEnabled = canUseLaunchOptions;
|
||||||
|
WorkingFolderBrowseButton.IsEnabled = canUseLaunchOptions;
|
||||||
RunAsAdminBox.IsEnabled = canRunAsAdmin;
|
RunAsAdminBox.IsEnabled = canRunAsAdmin;
|
||||||
|
StartMinimizedBox.IsEnabled = canUseLaunchOptions;
|
||||||
if (isMenu && !isLoadingSelection)
|
if (isMenu && !isLoadingSelection)
|
||||||
{
|
{
|
||||||
TargetBox.Text = "";
|
TargetBox.Text = "";
|
||||||
ArgumentsBox.Text = "";
|
ArgumentsBox.Text = "";
|
||||||
|
WorkingFolderBox.Text = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!canRunAsAdmin && !isLoadingSelection)
|
if (!canRunAsAdmin && !isLoadingSelection)
|
||||||
{
|
{
|
||||||
RunAsAdminBox.IsChecked = false;
|
RunAsAdminBox.IsChecked = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!canUseLaunchOptions && !isLoadingSelection)
|
||||||
|
{
|
||||||
|
WorkingFolderBox.Text = "";
|
||||||
|
StartMinimizedBox.IsChecked = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
|
protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ public sealed class LauncherItem
|
|||||||
|
|
||||||
public string? Arguments { get; set; }
|
public string? Arguments { get; set; }
|
||||||
|
|
||||||
|
public string? WorkingFolder { get; set; }
|
||||||
|
|
||||||
public string? IconPath { get; set; }
|
public string? IconPath { get; set; }
|
||||||
|
|
||||||
public bool IsFavorite { get; set; }
|
public bool IsFavorite { get; set; }
|
||||||
@@ -31,6 +33,8 @@ public sealed class LauncherItem
|
|||||||
|
|
||||||
public bool RunAsAdmin { 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; } = [];
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ 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
|
||||||
- Optional run-as-administrator mode for app and file entries
|
- Optional run-as-administrator mode for app and file entries
|
||||||
|
- Optional working folder and start-minimized launch options for app and file entries
|
||||||
- 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
|
- Export and import selected items or menu sections
|
||||||
- Sort a selected menu or item level alphabetically
|
- Sort a selected menu or item level alphabetically
|
||||||
|
|||||||
@@ -180,10 +180,12 @@ public sealed class LauncherController : IDisposable
|
|||||||
Type = item.Type,
|
Type = item.Type,
|
||||||
Target = item.Target,
|
Target = item.Target,
|
||||||
Arguments = item.Arguments,
|
Arguments = item.Arguments,
|
||||||
|
WorkingFolder = item.WorkingFolder,
|
||||||
IconPath = item.IconPath,
|
IconPath = item.IconPath,
|
||||||
IsFavorite = false,
|
IsFavorite = false,
|
||||||
IsDisabled = false,
|
IsDisabled = false,
|
||||||
RunAsAdmin = item.RunAsAdmin,
|
RunAsAdmin = item.RunAsAdmin,
|
||||||
|
StartMinimized = item.StartMinimized,
|
||||||
DisplayMode = item.DisplayMode,
|
DisplayMode = item.DisplayMode,
|
||||||
Children = []
|
Children = []
|
||||||
};
|
};
|
||||||
@@ -278,6 +280,7 @@ public sealed class LauncherController : IDisposable
|
|||||||
string target = Environment.ExpandEnvironmentVariables(item.Target);
|
string target = Environment.ExpandEnvironmentVariables(item.Target);
|
||||||
bool runAsAdmin = item.RunAsAdmin && CanRunAsAdmin(item.Type);
|
bool runAsAdmin = item.RunAsAdmin && CanRunAsAdmin(item.Type);
|
||||||
string launchTarget = runAsAdmin ? ResolveExecutableTarget(target) : target;
|
string launchTarget = runAsAdmin ? ResolveExecutableTarget(target) : target;
|
||||||
|
string workingDirectory = GetWorkingDirectory(item, target);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -286,7 +289,7 @@ public sealed class LauncherController : IDisposable
|
|||||||
FileName = launchTarget,
|
FileName = launchTarget,
|
||||||
Arguments = item.Arguments ?? "",
|
Arguments = item.Arguments ?? "",
|
||||||
UseShellExecute = true,
|
UseShellExecute = true,
|
||||||
WorkingDirectory = Directory.Exists(target) ? target : ConfigService.AppFolder
|
WorkingDirectory = workingDirectory
|
||||||
};
|
};
|
||||||
|
|
||||||
if (runAsAdmin)
|
if (runAsAdmin)
|
||||||
@@ -294,6 +297,11 @@ public sealed class LauncherController : IDisposable
|
|||||||
startInfo.Verb = "runas";
|
startInfo.Verb = "runas";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (item.StartMinimized && CanUseLaunchOptions(item.Type))
|
||||||
|
{
|
||||||
|
startInfo.WindowStyle = ProcessWindowStyle.Minimized;
|
||||||
|
}
|
||||||
|
|
||||||
Process.Start(startInfo);
|
Process.Start(startInfo);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -309,6 +317,25 @@ public sealed class LauncherController : IDisposable
|
|||||||
return itemType is LauncherItemType.App or LauncherItemType.File;
|
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)
|
private static string ResolveExecutableTarget(string target)
|
||||||
{
|
{
|
||||||
if (Path.IsPathRooted(target) || Path.GetDirectoryName(target) is { Length: > 0 })
|
if (Path.IsPathRooted(target) || Path.GetDirectoryName(target) is { Length: > 0 })
|
||||||
|
|||||||
@@ -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.19</AssemblyVersion>
|
<AssemblyVersion>1.0.1.20</AssemblyVersion>
|
||||||
<FileVersion>1.0.1.19</FileVersion>
|
<FileVersion>1.0.1.20</FileVersion>
|
||||||
<InformationalVersion>1.0.1</InformationalVersion>
|
<InformationalVersion>1.0.1</InformationalVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -468,6 +468,11 @@ public partial class LauncherPopup : Window
|
|||||||
AddToolTipLine(panel, $"Arguments: {item.Arguments}");
|
AddToolTipLine(panel, $"Arguments: {item.Arguments}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(item.WorkingFolder))
|
||||||
|
{
|
||||||
|
AddToolTipLine(panel, $"Working folder: {item.WorkingFolder}");
|
||||||
|
}
|
||||||
|
|
||||||
if (item.IsFavorite)
|
if (item.IsFavorite)
|
||||||
{
|
{
|
||||||
AddToolTipLine(panel, "Pinned to top");
|
AddToolTipLine(panel, "Pinned to top");
|
||||||
@@ -478,6 +483,11 @@ public partial class LauncherPopup : Window
|
|||||||
AddToolTipLine(panel, "Runs as administrator");
|
AddToolTipLine(panel, "Runs as administrator");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (item.StartMinimized)
|
||||||
|
{
|
||||||
|
AddToolTipLine(panel, "Starts minimized");
|
||||||
|
}
|
||||||
|
|
||||||
return new System.Windows.Controls.ToolTip { Content = panel };
|
return new System.Windows.Controls.ToolTip { Content = panel };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,10 +9,12 @@
|
|||||||
"Type": "Menu",
|
"Type": "Menu",
|
||||||
"Target": "",
|
"Target": "",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
|
"WorkingFolder": null,
|
||||||
"IconPath": null,
|
"IconPath": null,
|
||||||
"IsFavorite": false,
|
"IsFavorite": false,
|
||||||
"IsDisabled": false,
|
"IsDisabled": false,
|
||||||
"RunAsAdmin": false,
|
"RunAsAdmin": false,
|
||||||
|
"StartMinimized": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@@ -20,10 +22,12 @@
|
|||||||
"Type": "Folder",
|
"Type": "Folder",
|
||||||
"Target": "%USERPROFILE%\\Documents",
|
"Target": "%USERPROFILE%\\Documents",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
|
"WorkingFolder": null,
|
||||||
"IconPath": "%USERPROFILE%\\Documents",
|
"IconPath": "%USERPROFILE%\\Documents",
|
||||||
"IsFavorite": false,
|
"IsFavorite": false,
|
||||||
"IsDisabled": false,
|
"IsDisabled": false,
|
||||||
"RunAsAdmin": false,
|
"RunAsAdmin": false,
|
||||||
|
"StartMinimized": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": []
|
"Children": []
|
||||||
},
|
},
|
||||||
@@ -32,10 +36,12 @@
|
|||||||
"Type": "Folder",
|
"Type": "Folder",
|
||||||
"Target": "%USERPROFILE%\\Downloads",
|
"Target": "%USERPROFILE%\\Downloads",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
|
"WorkingFolder": null,
|
||||||
"IconPath": "%USERPROFILE%\\Downloads",
|
"IconPath": "%USERPROFILE%\\Downloads",
|
||||||
"IsFavorite": false,
|
"IsFavorite": false,
|
||||||
"IsDisabled": false,
|
"IsDisabled": false,
|
||||||
"RunAsAdmin": false,
|
"RunAsAdmin": false,
|
||||||
|
"StartMinimized": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": []
|
"Children": []
|
||||||
}
|
}
|
||||||
@@ -46,10 +52,12 @@
|
|||||||
"Type": "Menu",
|
"Type": "Menu",
|
||||||
"Target": "",
|
"Target": "",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
|
"WorkingFolder": null,
|
||||||
"IconPath": null,
|
"IconPath": null,
|
||||||
"IsFavorite": false,
|
"IsFavorite": false,
|
||||||
"IsDisabled": false,
|
"IsDisabled": false,
|
||||||
"RunAsAdmin": false,
|
"RunAsAdmin": false,
|
||||||
|
"StartMinimized": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": [
|
"Children": [
|
||||||
{
|
{
|
||||||
@@ -57,10 +65,12 @@
|
|||||||
"Type": "App",
|
"Type": "App",
|
||||||
"Target": "notepad.exe",
|
"Target": "notepad.exe",
|
||||||
"Arguments": null,
|
"Arguments": null,
|
||||||
|
"WorkingFolder": null,
|
||||||
"IconPath": "notepad.exe",
|
"IconPath": "notepad.exe",
|
||||||
"IsFavorite": false,
|
"IsFavorite": false,
|
||||||
"IsDisabled": false,
|
"IsDisabled": false,
|
||||||
"RunAsAdmin": false,
|
"RunAsAdmin": false,
|
||||||
|
"StartMinimized": false,
|
||||||
"DisplayMode": "CompactList",
|
"DisplayMode": "CompactList",
|
||||||
"Children": []
|
"Children": []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ 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**
|
||||||
- Enable **Run as administrator** for app and file items that need elevation
|
- 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
|
||||||
- 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
|
- 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**
|
- Right-click an item and choose **Sort This Menu** or **Sort This Level**
|
||||||
|
|||||||
Reference in New Issue
Block a user