dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-23 05:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: several typos in source code (#895)

Browse source
This commit is contained in:
wl2776 2025-01-12 18:11:28 -08:00 • committed by GitHub
parent 91883c9f11
commit 6e5626f267
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
67 changed files with 737 additions and 737 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ViewModels/BranchCompare.cs
View file

@ -129,8 +129,8 @@ namespace SourceGit.ViewModels
diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
diffWithMerger.Click += (_, ev) =>
{
var toolType = Preference.Instance.ExternalMergeToolType;
var toolPath = Preference.Instance.ExternalMergeToolPath;
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
var opt = new Models.DiffOption(_based.Head, _to.Head, change);
Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, toolType, toolPath, opt));

4
src/ViewModels/Clone.cs
View file

@ -129,7 +129,7 @@ namespace SourceGit.ViewModels
CallUIThread(() =>
{
var node = Preference.Instance.FindOrAddNodeByRepositoryPath(path, null, true);
var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(path, null, true);
var launcher = App.GetLauncer();
var page = null as LauncherPage;
foreach (var one in launcher.Pages)
@ -153,7 +153,7 @@ namespace SourceGit.ViewModels
private string _remote = string.Empty;
private bool _useSSH = false;
private string _sshKey = string.Empty;
private string _parentFolder = Preference.Instance.GitDefaultCloneDir;
private string _parentFolder = Preferences.Instance.GitDefaultCloneDir;
private string _local = string.Empty;
private string _extraArgs = string.Empty;
}

8
src/ViewModels/CommitDetail.cs
View file

@ -344,8 +344,8 @@ namespace SourceGit.ViewModels
diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
diffWithMerger.Click += (_, ev) =>
{
var toolType = Preference.Instance.ExternalMergeToolType;
var toolPath = Preference.Instance.ExternalMergeToolPath;
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
var opt = new Models.DiffOption(_commit, change);
Task.Run(() => Commands.MergeTool.OpenForDiff(_repo.FullPath, toolType, toolPath, opt));
@ -646,11 +646,11 @@ namespace SourceGit.ViewModels
_cancelToken = new Commands.Command.CancelToken();
if (Preference.Instance.ShowChildren)
if (Preferences.Instance.ShowChildren)
{
Task.Run(() =>
{
var max = Preference.Instance.MaxHistoryCommits;
var max = Preferences.Instance.MaxHistoryCommits;
var cmdChildren = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA, max) { Cancel = _cancelToken };
var children = cmdChildren.Result();
if (!cmdChildren.Cancel.Requested)

6
src/ViewModels/ConfigureWorkspace.cs
View file

@ -31,13 +31,13 @@ namespace SourceGit.ViewModels
public ConfigureWorkspace()
{
Workspaces = new AvaloniaList<Workspace>();
Workspaces.AddRange(Preference.Instance.Workspaces);
Workspaces.AddRange(Preferences.Instance.Workspaces);
}
public void Add()
{
var workspace = new Workspace() { Name = $"Unnamed {DateTime.Now:yyyy-MM-dd HH:mm:ss}" };
Preference.Instance.Workspaces.Add(workspace);
Preferences.Instance.Workspaces.Add(workspace);
Workspaces.Add(workspace);
Selected = workspace;
}
@ -47,7 +47,7 @@ namespace SourceGit.ViewModels
if (_selected == null || _selected.IsActive)
return;
Preference.Instance.Workspaces.Remove(_selected);
Preferences.Instance.Workspaces.Remove(_selected);
Workspaces.Remove(_selected);
}

2
src/ViewModels/CreateGroup.cs
View file

@ -21,7 +21,7 @@ namespace SourceGit.ViewModels
public override Task<bool> Sure()
{
Preference.Instance.AddNode(new RepositoryNode()
Preferences.Instance.AddNode(new RepositoryNode()
{
Id = Guid.NewGuid().ToString(),
Name = _name,

2
src/ViewModels/DeleteRepositoryNode.cs
View file

@ -18,7 +18,7 @@ namespace SourceGit.ViewModels
public override Task<bool> Sure()
{
Preference.Instance.RemoveNode(_node, true);
Preferences.Instance.RemoveNode(_node, true);
Welcome.Instance.Refresh();
return null;
}

8
src/ViewModels/DiffContext.cs
View file

@ -75,7 +75,7 @@ namespace SourceGit.ViewModels
public void ToggleFullTextDiff()
{
Preference.Instance.UseFullTextDiff = !Preference.Instance.UseFullTextDiff;
Preferences.Instance.UseFullTextDiff = !Preferences.Instance.UseFullTextDiff;
LoadDiffContent();
}
@ -93,8 +93,8 @@ namespace SourceGit.ViewModels
public void OpenExternalMergeTool()
{
var toolType = Preference.Instance.ExternalMergeToolType;
var toolPath = Preference.Instance.ExternalMergeToolPath;
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, toolType, toolPath, _option));
}
@ -112,7 +112,7 @@ namespace SourceGit.ViewModels
// NOTE: Here we override the UnifiedLines value (if UseFullTextDiff is on).
// There is no way to tell a git-diff to use "ALL lines of context",
// so instead we set a very high number for the "lines of context" parameter.
var numLines = Preference.Instance.UseFullTextDiff ? 999999999 : _unifiedLines;
var numLines = Preferences.Instance.UseFullTextDiff ? 999999999 : _unifiedLines;
var latest = new Commands.Diff(_repo, _option, numLines, _ignoreWhitespace).Result();
var info = new Info(_option, numLines, _ignoreWhitespace, latest);
if (_info != null && info.IsSame(_info))

2
src/ViewModels/EditRepositoryNode.cs
View file

@ -49,7 +49,7 @@ namespace SourceGit.ViewModels
if (needSort)
{
Preference.Instance.SortByRenamedNode(_node);
Preferences.Instance.SortByRenamedNode(_node);
Welcome.Instance.Refresh();
}

2
src/ViewModels/Init.cs
View file

@ -38,7 +38,7 @@ namespace SourceGit.ViewModels
CallUIThread(() =>
{
Preference.Instance.FindOrAddNodeByRepositoryPath(_targetPath, _parentNode, true);
Preferences.Instance.FindOrAddNodeByRepositoryPath(_targetPath, _parentNode, true);
Welcome.Instance.Refresh();
});

8
src/ViewModels/Launcher.cs
View file

@ -51,7 +51,7 @@ namespace SourceGit.ViewModels
Pages = new AvaloniaList<LauncherPage>();
AddNewTab();
var pref = Preference.Instance;
var pref = Preferences.Instance;
if (string.IsNullOrEmpty(startupRepo))
{
ActiveWorkspace = pref.GetActiveWorkspace();
@ -117,7 +117,7 @@ namespace SourceGit.ViewModels
public void Quit(double width, double height)
{
var pref = Preference.Instance;
var pref = Preferences.Instance;
pref.Layout.LauncherWidth = width;
pref.Layout.LauncherHeight = height;
pref.Save();
@ -355,7 +355,7 @@ namespace SourceGit.ViewModels
public ContextMenu CreateContextForWorkspace()
{
var pref = Preference.Instance;
var pref = Preferences.Instance;
var menu = new ContextMenu();
for (var i = 0; i < pref.Workspaces.Count; i++)
@ -481,7 +481,7 @@ namespace SourceGit.ViewModels
_ignoreIndexChange = true;
var pref = Preference.Instance;
var pref = Preferences.Instance;
foreach (var w in pref.Workspaces)
w.IsActive = false;

6
src/ViewModels/MoveRepositoryNode.cs
View file

@ -33,7 +33,7 @@ namespace SourceGit.ViewModels
Depth = 0,
Id = Guid.NewGuid().ToString()
});
MakeRows(Preference.Instance.RepositoryNodes, 1);
MakeRows(Preferences.Instance.RepositoryNodes, 1);
View = new Views.MoveRepositoryNode() { DataContext = this };
}
@ -42,8 +42,8 @@ namespace SourceGit.ViewModels
{
if (_selected != null)
{
var node = Preference.Instance.FindNode(_selected.Id);
Preference.Instance.MoveNode(Target, node, true);
var node = Preferences.Instance.FindNode(_selected.Id);
Preferences.Instance.MoveNode(Target, node, true);
Welcome.Instance.Refresh();
}

16
src/ViewModels/Preference.cs → src/ViewModels/Preferences.cs
View file

@ -9,10 +9,10 @@ using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.ViewModels
{
public class Preference : ObservableObject
public class Preferences : ObservableObject
{
[JsonIgnore]
public static Preference Instance
public static Preferences Instance
{
get
{
@ -479,23 +479,23 @@ namespace SourceGit.ViewModels
return;
var file = Path.Combine(Native.OS.DataDir, "preference.json");
var data = JsonSerializer.Serialize(this, JsonCodeGen.Default.Preference);
var data = JsonSerializer.Serialize(this, JsonCodeGen.Default.Preferences);
File.WriteAllText(file, data);
}
private static Preference Load()
private static Preferences Load()
{
var path = Path.Combine(Native.OS.DataDir, "preference.json");
if (!File.Exists(path))
return new Preference();
return new Preferences();
try
{
return JsonSerializer.Deserialize(File.ReadAllText(path), JsonCodeGen.Default.Preference);
return JsonSerializer.Deserialize(File.ReadAllText(path), JsonCodeGen.Default.Preferences);
}
catch
{
return new Preference();
return new Preferences();
}
}
@ -637,7 +637,7 @@ namespace SourceGit.ViewModels
return builder.ToString();
}
private static Preference _instance = null;
private static Preferences _instance = null;
private static bool _isLoading = false;
private string _locale = "en_US";

6
src/ViewModels/Repository.cs
View file

@ -949,7 +949,7 @@ namespace SourceGit.ViewModels
Dispatcher.UIThread.Invoke(() => _histories.IsLoading = true);
var builder = new StringBuilder();
builder.Append($"-{Preference.Instance.MaxHistoryCommits} ");
builder.Append($"-{Preferences.Instance.MaxHistoryCommits} ");
if (_settings.EnableTopoOrderInHistories)
builder.Append("--topo-order ");
@ -1118,7 +1118,7 @@ namespace SourceGit.ViewModels
var root = Path.GetFullPath(Path.Combine(_fullpath, submodule));
var normalizedPath = root.Replace("\\", "/");
var node = Preference.Instance.FindNode(normalizedPath);
var node = Preferences.Instance.FindNode(normalizedPath);
if (node == null)
{
node = new RepositoryNode()
@ -1147,7 +1147,7 @@ namespace SourceGit.ViewModels
public void OpenWorktree(Models.Worktree worktree)
{
var node = Preference.Instance.FindNode(worktree.FullPath);
var node = Preferences.Instance.FindNode(worktree.FullPath);
if (node == null)
{
node = new RepositoryNode()

2
src/ViewModels/RepositoryConfigure.cs
View file

@ -146,7 +146,7 @@ namespace SourceGit.ViewModels
Remotes.Add(remote.Name);
AvailableOpenAIServices = new List<string>() { "---" };
foreach (var service in Preference.Instance.OpenAIServices)
foreach (var service in Preferences.Instance.OpenAIServices)
AvailableOpenAIServices.Add(service.Name);
if (AvailableOpenAIServices.IndexOf(PreferedOpenAIService) == -1)

4
src/ViewModels/RevisionCompare.cs
View file

@ -150,8 +150,8 @@ namespace SourceGit.ViewModels
diffWithMerger.Click += (_, ev) =>
{
var opt = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), change);
var toolType = Preference.Instance.ExternalMergeToolType;
var toolPath = Preference.Instance.ExternalMergeToolPath;
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
Task.Run(() => Commands.MergeTool.OpenForDiff(_repo, toolType, toolPath, opt));
ev.Handled = true;

10
src/ViewModels/ScanRepositories.cs
View file

@ -18,7 +18,7 @@ namespace SourceGit.ViewModels
public ScanRepositories(string rootDir)
{
GetManagedRepositories(Preference.Instance.RepositoryNodes, _managed);
GetManagedRepositories(Preferences.Instance.RepositoryNodes, _managed);
RootDir = rootDir;
View = new Views.ScanRepositories() { DataContext = this };
@ -50,17 +50,17 @@ namespace SourceGit.ViewModels
var parent = new DirectoryInfo(f).Parent!.FullName.Replace("\\", "/");
if (parent.Equals(normalizedRoot, StringComparison.Ordinal))
{
Preference.Instance.FindOrAddNodeByRepositoryPath(f, null, false);
Preferences.Instance.FindOrAddNodeByRepositoryPath(f, null, false);
}
else if (parent.StartsWith(normalizedRoot, StringComparison.Ordinal))
{
var relative = parent.Substring(normalizedRoot.Length).TrimStart('/');
var group = FindOrCreateGroupRecursive(Preference.Instance.RepositoryNodes, relative);
Preference.Instance.FindOrAddNodeByRepositoryPath(f, group, false);
var group = FindOrCreateGroupRecursive(Preferences.Instance.RepositoryNodes, relative);
Preferences.Instance.FindOrAddNodeByRepositoryPath(f, group, false);
}
}
Preference.Instance.AutoRemoveInvalidNode();
Preferences.Instance.AutoRemoveInvalidNode();
Welcome.Instance.Refresh();
});

4
src/ViewModels/StashesPage.cs
View file

@ -161,8 +161,8 @@ namespace SourceGit.ViewModels
diffWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
diffWithMerger.Click += (_, ev) =>
{
var toolType = Preference.Instance.ExternalMergeToolType;
var toolPath = Preference.Instance.ExternalMergeToolPath;
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
var opt = new Models.DiffOption($"{_selectedStash.SHA}^", _selectedStash.SHA, change);
Task.Run(() => Commands.MergeTool.OpenForDiff(_repo.FullPath, toolType, toolPath, opt));

8
src/ViewModels/Statistics.cs
View file

@ -33,12 +33,12 @@ namespace SourceGit.ViewModels
public uint SampleColor
{
get => Preference.Instance.StatisticsSampleColor;
get => Preferences.Instance.StatisticsSampleColor;
set
{
if (value != Preference.Instance.StatisticsSampleColor)
if (value != Preferences.Instance.StatisticsSampleColor)
{
Preference.Instance.StatisticsSampleColor = value;
Preferences.Instance.StatisticsSampleColor = value;
OnPropertyChanged(nameof(SampleBrush));
_selectedReport?.ChangeColor(value);
}
@ -54,7 +54,7 @@ namespace SourceGit.ViewModels
{
Task.Run(() =>
{
var result = new Commands.Statistics(repo, Preference.Instance.MaxHistoryCommits).Result();
var result = new Commands.Statistics(repo, Preferences.Instance.MaxHistoryCommits).Result();
Dispatcher.UIThread.Invoke(() =>
{
_data = result;

16
src/ViewModels/Welcome.cs
View file

@ -38,17 +38,17 @@ namespace SourceGit.ViewModels
{
if (string.IsNullOrWhiteSpace(_searchFilter))
{
foreach (var node in Preference.Instance.RepositoryNodes)
foreach (var node in Preferences.Instance.RepositoryNodes)
ResetVisibility(node);
}
else
{
foreach (var node in Preference.Instance.RepositoryNodes)
foreach (var node in Preferences.Instance.RepositoryNodes)
SetVisibilityBySearch(node);
}
var rows = new List<RepositoryNode>();
MakeTreeRows(rows, Preference.Instance.RepositoryNodes);
MakeTreeRows(rows, Preferences.Instance.RepositoryNodes);
Rows.Clear();
Rows.AddRange(rows);
}
@ -85,7 +85,7 @@ namespace SourceGit.ViewModels
public void InitRepository(string path, RepositoryNode parent, string reason)
{
if (!Preference.Instance.IsGitConfigured())
if (!Preferences.Instance.IsGitConfigured())
{
App.RaiseException(string.Empty, App.Text("NotConfigured"));
return;
@ -98,7 +98,7 @@ namespace SourceGit.ViewModels
public void Clone()
{
if (!Preference.Instance.IsGitConfigured())
if (!Preferences.Instance.IsGitConfigured())
{
App.RaiseException(string.Empty, App.Text("NotConfigured"));
return;
@ -111,7 +111,7 @@ namespace SourceGit.ViewModels
public void OpenTerminal()
{
if (!Preference.Instance.IsGitConfigured())
if (!Preferences.Instance.IsGitConfigured())
App.RaiseException(string.Empty, App.Text("NotConfigured"));
else
Native.OS.OpenTerminal(null);
@ -119,7 +119,7 @@ namespace SourceGit.ViewModels
public void ScanDefaultCloneDir()
{
var defaultCloneDir = Preference.Instance.GitDefaultCloneDir;
var defaultCloneDir = Preferences.Instance.GitDefaultCloneDir;
if (string.IsNullOrEmpty(defaultCloneDir))
{
App.RaiseException(string.Empty, "The default clone directory hasn't been configured!");
@ -151,7 +151,7 @@ namespace SourceGit.ViewModels
public void MoveNode(RepositoryNode from, RepositoryNode to)
{
Preference.Instance.MoveNode(from, to, true);
Preferences.Instance.MoveNode(from, to, true);
Refresh();
}

6
src/ViewModels/WorkingCopy.cs
View file

@ -465,8 +465,8 @@ namespace SourceGit.ViewModels
public async void UseExternalMergeTool(Models.Change change)
{
var toolType = Preference.Instance.ExternalMergeToolType;
var toolPath = Preference.Instance.ExternalMergeToolPath;
var toolType = Preferences.Instance.ExternalMergeToolType;
var toolPath = Preferences.Instance.ExternalMergeToolPath;
_repo.SetWatcherEnabled(false);
await Task.Run(() => Commands.MergeTool.OpenForMerge(_repo.FullPath, toolType, toolPath, change.Path));
@ -1601,7 +1601,7 @@ namespace SourceGit.ViewModels
private IList<Models.OpenAIService> GetPreferedOpenAIServices()
{
var services = Preference.Instance.OpenAIServices;
var services = Preferences.Instance.OpenAIServices;
if (services == null || services.Count == 0)
return [];