code_style: simplify static commands used by styles and main menu; run dotnet format

This commit is contained in:
leo 2024-09-02 20:27:12 +08:00
parent e27d2d6a3f
commit 998230edff
No known key found for this signature in database
10 changed files with 35 additions and 52 deletions

View file

@ -6,7 +6,7 @@ namespace SourceGit
{ {
public partial class App public partial class App
{ {
public class SimpleCommand : ICommand public class Command : ICommand
{ {
public event EventHandler CanExecuteChanged public event EventHandler CanExecuteChanged
{ {
@ -14,26 +14,7 @@ namespace SourceGit
remove { } remove { }
} }
public SimpleCommand(Action action) public Command(Action<object> action)
{
_action = action;
}
public bool CanExecute(object parameter) => _action != null;
public void Execute(object parameter) => _action?.Invoke();
private Action _action = null;
}
public class ParameterCommand : ICommand
{
public event EventHandler CanExecuteChanged
{
add { }
remove { }
}
public ParameterCommand(Action<object> action)
{ {
_action = action; _action = action;
} }
@ -44,22 +25,12 @@ namespace SourceGit
private Action<object> _action = null; private Action<object> _action = null;
} }
public static readonly SimpleCommand OpenPreferenceCommand = new SimpleCommand(() => OpenDialog(new Views.Preference())); public static readonly Command OpenPreferenceCommand = new Command(_ => OpenDialog(new Views.Preference()));
public static readonly SimpleCommand OpenHotkeysCommand = new SimpleCommand(() => OpenDialog(new Views.Hotkeys())); public static readonly Command OpenHotkeysCommand = new Command(_ => OpenDialog(new Views.Hotkeys()));
public static readonly SimpleCommand OpenAppDataDirCommand = new SimpleCommand(() => Native.OS.OpenInFileManager(Native.OS.DataDir)); public static readonly Command OpenAppDataDirCommand = new Command(_ => Native.OS.OpenInFileManager(Native.OS.DataDir));
public static readonly SimpleCommand OpenAboutCommand = new SimpleCommand(() => OpenDialog(new Views.About())); public static readonly Command OpenAboutCommand = new Command(_ => OpenDialog(new Views.About()));
public static readonly SimpleCommand CheckForUpdateCommand = new SimpleCommand(() => Check4Update(true)); public static readonly Command CheckForUpdateCommand = new Command(_ => Check4Update(true));
public static readonly SimpleCommand QuitCommand = new SimpleCommand(() => Quit(0)); public static readonly Command QuitCommand = new Command(_ => Quit(0));
public static readonly Command CopyTextBlockCommand = new Command(p => CopyTextBlock(p as TextBlock));
public static readonly ParameterCommand CopyTextCommand = new ParameterCommand(param =>
{
if (param is TextBlock textBlock)
{
if (textBlock.Inlines is { Count: > 0 } inlines)
CopyText(inlines.Text);
else
CopyText(textBlock.Text);
}
});
} }
} }

View file

@ -318,6 +318,17 @@ namespace SourceGit
} }
} }
private static void CopyTextBlock(TextBlock textBlock)
{
if (textBlock == null)
return;
if (textBlock.Inlines is { Count: > 0 } inlines)
CopyText(inlines.Text);
else if (!string.IsNullOrEmpty(textBlock.Text))
CopyText(textBlock.Text);
}
private static void LogException(Exception ex) private static void LogException(Exception ex)
{ {
if (ex == null) if (ex == null)

View file

@ -339,7 +339,7 @@
</MenuItem> </MenuItem>
<MenuItem Header="{DynamicResource Text.CopyAllText}" <MenuItem Header="{DynamicResource Text.CopyAllText}"
Command="{x:Static s:App.CopyTextCommand}" Command="{x:Static s:App.CopyTextBlockCommand}"
CommandParameter="{Binding $parent[SelectableTextBlock]}"> CommandParameter="{Binding $parent[SelectableTextBlock]}">
<MenuItem.Icon> <MenuItem.Icon>
<Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/> <Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/>

View file

@ -27,7 +27,8 @@ namespace SourceGit.ViewModels
public MoveRepositoryNode(RepositoryNode target) public MoveRepositoryNode(RepositoryNode target)
{ {
Target = target; Target = target;
Rows.Add(new RepositoryNode() { Rows.Add(new RepositoryNode()
{
Name = "ROOT", Name = "ROOT",
Depth = 0, Depth = 0,
Id = Guid.NewGuid().ToString() Id = Guid.NewGuid().ToString()