diff --git a/src/App.axaml.cs b/src/App.axaml.cs index 411f5cfb..b5868ca1 100644 --- a/src/App.axaml.cs +++ b/src/App.axaml.cs @@ -338,7 +338,7 @@ namespace SourceGit return null; } - public static ViewModels.Launcher GetLauncer() + public static ViewModels.Launcher GetLauncher() { return Current is App app ? app._launcher : null; } diff --git a/src/ViewModels/Blame.cs b/src/ViewModels/Blame.cs index c04842e5..d3558670 100644 --- a/src/ViewModels/Blame.cs +++ b/src/ViewModels/Blame.cs @@ -45,7 +45,7 @@ namespace SourceGit.ViewModels public void NavigateToCommit(string commitSHA) { - var launcher = App.GetLauncer(); + var launcher = App.GetLauncher(); if (launcher == null) return; diff --git a/src/ViewModels/BranchCompare.cs b/src/ViewModels/BranchCompare.cs index 4edb978c..f56cfd76 100644 --- a/src/ViewModels/BranchCompare.cs +++ b/src/ViewModels/BranchCompare.cs @@ -86,7 +86,7 @@ namespace SourceGit.ViewModels public void NavigateTo(string commitSHA) { - var launcher = App.GetLauncer(); + var launcher = App.GetLauncher(); if (launcher == null) return; diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs index 032551a2..94a74893 100644 --- a/src/ViewModels/Clone.cs +++ b/src/ViewModels/Clone.cs @@ -150,7 +150,7 @@ namespace SourceGit.ViewModels CallUIThread(() => { var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(path, null, true); - var launcher = App.GetLauncer(); + var launcher = App.GetLauncher(); var page = null as LauncherPage; foreach (var one in launcher.Pages) { diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs index fcc4a853..0d22677c 100644 --- a/src/ViewModels/Repository.cs +++ b/src/ViewModels/Repository.cs @@ -1401,7 +1401,7 @@ namespace SourceGit.ViewModels }; } - App.GetLauncer().OpenRepositoryInTab(node, null); + App.GetLauncher().OpenRepositoryInTab(node, null); } public void AddWorktree() @@ -1430,7 +1430,7 @@ namespace SourceGit.ViewModels }; } - App.GetLauncer()?.OpenRepositoryInTab(node, null); + App.GetLauncher()?.OpenRepositoryInTab(node, null); } public List GetPreferedOpenAIServices() @@ -2588,7 +2588,7 @@ namespace SourceGit.ViewModels private LauncherPage GetOwnerPage() { - var launcher = App.GetLauncer(); + var launcher = App.GetLauncher(); if (launcher == null) return null; diff --git a/src/ViewModels/RepositoryNode.cs b/src/ViewModels/RepositoryNode.cs index cd79c06e..f609879b 100644 --- a/src/ViewModels/RepositoryNode.cs +++ b/src/ViewModels/RepositoryNode.cs @@ -70,14 +70,14 @@ namespace SourceGit.ViewModels public void Edit() { - var activePage = App.GetLauncer().ActivePage; + var activePage = App.GetLauncher().ActivePage; if (activePage != null && activePage.CanCreatePopup()) activePage.Popup = new EditRepositoryNode(this); } public void AddSubFolder() { - var activePage = App.GetLauncer().ActivePage; + var activePage = App.GetLauncher().ActivePage; if (activePage != null && activePage.CanCreatePopup()) activePage.Popup = new CreateGroup(this); } @@ -98,7 +98,7 @@ namespace SourceGit.ViewModels public void Delete() { - var activePage = App.GetLauncer().ActivePage; + var activePage = App.GetLauncher().ActivePage; if (activePage != null && activePage.CanCreatePopup()) activePage.Popup = new DeleteRepositoryNode(this); } diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs index 1dad7593..39400aa3 100644 --- a/src/ViewModels/RevisionCompare.cs +++ b/src/ViewModels/RevisionCompare.cs @@ -100,7 +100,7 @@ namespace SourceGit.ViewModels public void NavigateTo(string commitSHA) { - var launcher = App.GetLauncer(); + var launcher = App.GetLauncher(); if (launcher == null) return; diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs index 95f7f010..069dcf38 100644 --- a/src/ViewModels/Welcome.cs +++ b/src/ViewModels/Welcome.cs @@ -110,7 +110,7 @@ namespace SourceGit.ViewModels var node = Preferences.Instance.FindOrAddNodeByRepositoryPath(repoRoot, parent, bMoveExistedNode); Refresh(); - var launcher = App.GetLauncer(); + var launcher = App.GetLauncher(); launcher?.OpenRepositoryInTab(node, launcher.ActivePage); } @@ -122,7 +122,7 @@ namespace SourceGit.ViewModels return; } - var activePage = App.GetLauncer().ActivePage; + var activePage = App.GetLauncher().ActivePage; if (activePage != null && activePage.CanCreatePopup()) activePage.Popup = new Init(activePage.Node.Id, path, parent, reason); } @@ -135,7 +135,7 @@ namespace SourceGit.ViewModels return; } - var activePage = App.GetLauncer().ActivePage; + var activePage = App.GetLauncher().ActivePage; if (activePage != null && activePage.CanCreatePopup()) activePage.Popup = new Clone(activePage.Node.Id); } @@ -163,7 +163,7 @@ namespace SourceGit.ViewModels return; } - var activePage = App.GetLauncer().ActivePage; + var activePage = App.GetLauncher().ActivePage; if (activePage != null && activePage.CanCreatePopup()) activePage.StartPopup(new ScanRepositories(defaultCloneDir)); } @@ -175,7 +175,7 @@ namespace SourceGit.ViewModels public void AddRootNode() { - var activePage = App.GetLauncer().ActivePage; + var activePage = App.GetLauncher().ActivePage; if (activePage != null && activePage.CanCreatePopup()) activePage.Popup = new CreateGroup(null); } @@ -197,7 +197,7 @@ namespace SourceGit.ViewModels openAll.Icon = App.CreateMenuIcon("Icons.Folder.Open"); openAll.Click += (_, e) => { - OpenAllInNode(App.GetLauncer(), node); + OpenAllInNode(App.GetLauncher(), node); e.Handled = true; }; @@ -212,7 +212,7 @@ namespace SourceGit.ViewModels open.Icon = App.CreateMenuIcon("Icons.Folder.Open"); open.Click += (_, e) => { - App.GetLauncer()?.OpenRepositoryInTab(node, null); + App.GetLauncher()?.OpenRepositoryInTab(node, null); e.Handled = true; }; @@ -267,7 +267,7 @@ namespace SourceGit.ViewModels move.Icon = App.CreateMenuIcon("Icons.MoveToAnotherGroup"); move.Click += (_, e) => { - var activePage = App.GetLauncer().ActivePage; + var activePage = App.GetLauncher().ActivePage; if (activePage != null && activePage.CanCreatePopup()) activePage.Popup = new MoveRepositoryNode(node); diff --git a/src/Views/WelcomeToolbar.axaml.cs b/src/Views/WelcomeToolbar.axaml.cs index e2a130f8..fd08e901 100644 --- a/src/Views/WelcomeToolbar.axaml.cs +++ b/src/Views/WelcomeToolbar.axaml.cs @@ -16,7 +16,7 @@ namespace SourceGit.Views private async void OpenLocalRepository(object _1, RoutedEventArgs e) { - var activePage = App.GetLauncer().ActivePage; + var activePage = App.GetLauncher().ActivePage; if (activePage == null || !activePage.CanCreatePopup()) return;