From 86665d3c7021e909b2c6938b3abb0d966071466c Mon Sep 17 00:00:00 2001 From: Vladimir Eremeev Date: Thu, 12 Dec 2024 12:45:37 +0300 Subject: [PATCH] Add commit SHA to menu instead of "to Here" --- src/Models/Commit.cs | 1 + src/Resources/Locales/de_DE.axaml | 8 ++++---- src/Resources/Locales/en_US.axaml | 8 ++++---- src/Resources/Locales/es_ES.axaml | 8 ++++---- src/Resources/Locales/fr_FR.axaml | 8 ++++---- src/Resources/Locales/it_IT.axaml | 8 ++++---- src/Resources/Locales/pt_BR.axaml | 8 ++++---- src/Resources/Locales/ru_RU.axaml | 8 ++++---- src/Resources/Locales/zh_CN.axaml | 8 ++++---- src/Resources/Locales/zh_TW.axaml | 8 ++++---- src/ViewModels/Histories.cs | 8 ++++---- 11 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs index 534cf5bb..3a3a8dec 100644 --- a/src/Models/Commit.cs +++ b/src/Models/Commit.cs @@ -22,6 +22,7 @@ namespace SourceGit.Models } = 0.65; public string SHA { get; set; } = string.Empty; + public string ShortSHA { get {return SHA.Substring(0, 7);} } public User Author { get; set; } = User.Invalid; public ulong AuthorTime { get; set; } = 0; public User Committer { get; set; } = User.Invalid; diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml index 2045a229..71323dff 100644 --- a/src/Resources/Locales/de_DE.axaml +++ b/src/Resources/Locales/de_DE.axaml @@ -112,14 +112,14 @@ Info kopieren SHA kopieren Benutzerdefinierte Aktion - Interactives Rebase von ${0}$ auf diesen Commit - Rebase von ${0}$ auf diesen Commit - Reset ${0}$ auf diesen Commit + Interactives Rebase von ${0}$ auf diesen ${1}$ + Rebase von ${0}$ auf diesen ${1}$ + Reset ${0}$ auf diesen ${1}$ Commit rückgängig machen Umformulieren Als Patch speichern... Squash in den Vorgänger - Squash Nachfolger Commits bis hier + Squash Nachfolger Commits bis {0} ÄNDERUNGEN Änderungen durchsuchen... DATEIEN diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml index 2eb38873..c81fce4c 100644 --- a/src/Resources/Locales/en_US.axaml +++ b/src/Resources/Locales/en_US.axaml @@ -110,16 +110,16 @@ Copy Info Copy SHA Custom Action - Interactive Rebase ${0}$ to Here + Interactive Rebase ${0}$ to ${1}$ Merge to ${0}$ Merge ... - Rebase ${0}$ to Here - Reset ${0}$ to Here + Rebase ${0}$ to ${1}$ + Reset ${0}$ to ${1}$ Revert Commit Reword Save as Patch... Squash into Parent - Squash Child Commits to Here + Squash Child Commits of {0} CHANGES Search Changes... FILES diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml index cf0f05b5..00de621e 100644 --- a/src/Resources/Locales/es_ES.axaml +++ b/src/Resources/Locales/es_ES.axaml @@ -112,16 +112,16 @@ Copiar Información Copiar SHA Acción personalizada - Rebase Interactivo ${0}$ hasta Aquí + Rebase Interactivo ${0}$ hasta ${1}$ Abrir en el Navegador Copiar Enlace - Rebase ${0}$ hasta Aquí - Reset ${0}$ hasta Aquí + Rebase ${0}$ hasta ${1}$ + Reset ${0}$ hasta ${1}$ Revertir Commit Reescribir Guardar como Patch... Squash en Parent - Squash Commits Hijos hasta Aquí + Squash Commits Hijos hasta {0} CAMBIOS Buscar Cambios... ARCHIVOS diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml index 20237bb9..51676f71 100644 --- a/src/Resources/Locales/fr_FR.axaml +++ b/src/Resources/Locales/fr_FR.axaml @@ -110,14 +110,14 @@ Copier les informations Copier le SHA Action personnalisée - Rebase interactif de ${0}$ ici - Rebaser ${0}$ ici - Réinitialiser ${0}$ ici + Rebase interactif de ${0}$ ici ${1}$ + Rebaser ${0}$ ici ${1}$ + Réinitialiser ${0}$ ici ${1}$ Annuler le commit Reformuler Enregistrer en tant que patch... Squash dans le parent - Squash les commits enfants ici + Squash les commits enfants ici {0} CHANGEMENTS Rechercher les changements... FICHIERS diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml index 18754c8e..6b7f59a4 100644 --- a/src/Resources/Locales/it_IT.axaml +++ b/src/Resources/Locales/it_IT.axaml @@ -112,14 +112,14 @@ Copia Info Copia SHA Azione Personalizzata - Rebase Interattivo ${0}$ fino a Qui - Riallinea ${0}$ fino a Qui - Ripristina ${0}$ fino a Qui + Rebase Interattivo ${0}$ fino ${1}$ + Riallinea ${0}$ fino ${1}$ + Ripristina ${0}$ fino ${1}$ Annulla Commit Modifica Salva come Patch... Unisci al Genitore - Unisci Commit Figli fino a Qui + Unisci Commit Figli fino {0} MODIFICHE Cerca Modifiche... FILE diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml index d72dd370..fa7e6acb 100644 --- a/src/Resources/Locales/pt_BR.axaml +++ b/src/Resources/Locales/pt_BR.axaml @@ -137,14 +137,14 @@ Copiar Informações Copiar SHA Ação customizada - Rebase Interativo ${0}$ até Aqui - Rebase ${0}$ até Aqui - Resetar ${0}$ até Aqui + Rebase Interativo ${0}$ até ${1}$ + Rebase ${0}$ até ${1}$ + Resetar ${0}$ até ${1}$ Reverter Commit Modificar Mensagem Salvar como Patch... Mesclar ao Commit Pai - Mesclar commits filhos para este + Mesclar commits filhos para {0} ALTERAÇÕES Buscar Alterações... ARQUIVOS diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml index 76142274..20c100b6 100644 --- a/src/Resources/Locales/ru_RU.axaml +++ b/src/Resources/Locales/ru_RU.axaml @@ -112,14 +112,14 @@ Копировать информацию Копировать SHA Пользовательское действие - Интерактивное перемещение ${0}$ сюда - Переместить ${0}$ сюда - Сбросить ${0}$ сюда + Интерактивное перемещение (rebase -i) ${0}$ на ${1}$ + Переместить ${0}$ на ${1}$ + Сбросить ${0}$ на ${1}$ Вернуть фиксацию Переформулировать Сохранить как исправление... Втиснуть в родительскую - Втиснуть дочерную фиксацию сюда + Сжать (squash) все коммиты до {0} ИЗМЕНЕНИЯ Найти изменения.... ФАЙЛЫ diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml index f711cdee..48c65e3f 100644 --- a/src/Resources/Locales/zh_CN.axaml +++ b/src/Resources/Locales/zh_CN.axaml @@ -113,16 +113,16 @@ 复制简要信息 复制提交指纹 自定义操作 - 交互式变基(rebase -i) ${0}$ 到此处 + 交互式变基(rebase -i) ${0}$ 到此处 ${1}$ 合并(merge)此提交至 ${0}$ 合并(merge)... - 变基(rebase) ${0}$ 到此处 - 重置(reset) ${0}$ 到此处 + 变基(rebase) ${0}$ 到此处 ${1}$ + 重置(reset) ${0}$ 到此处 ${1}$ 回滚此提交 编辑提交信息 另存为补丁 ... 合并此提交到上一个提交 - 合并之后的提交到此处 + 合并之后的提交到此处 {0} 变更对比 查找变更... 文件列表 diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml index 90444967..5b0e8b34 100644 --- a/src/Resources/Locales/zh_TW.axaml +++ b/src/Resources/Locales/zh_TW.axaml @@ -113,16 +113,16 @@ 複製摘要資訊 複製提交編號 自訂動作 - 互動式重定基底 (rebase -i) ${0}$ 到此處 + 互動式重定基底 (rebase -i) ${0}$ 到此處 ${1}$ 合併 (merge) 此提交到 ${0}$ 合併 (merge)... - 重定基底 (rebase) ${0}$ 到此處 - 重設 (reset) ${0}$ 到此處 + 重定基底 (rebase) ${0}$ 到此處 ${1}$ + 重設 (reset) ${0}$ 到此處 ${1}$ 復原此提交 編輯提交訊息 另存為修補檔 (patch)... 合併此提交到上一個提交 - 合併之後的提交到此處 + 合併之後的提交到此處 {0} 變更對比 搜尋變更... 檔案列表 diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs index 8f1e2662..f11bd02f 100644 --- a/src/ViewModels/Histories.cs +++ b/src/ViewModels/Histories.cs @@ -397,7 +397,7 @@ namespace SourceGit.ViewModels if (current.Head != commit.SHA) { var reset = new MenuItem(); - reset.Header = new Views.NameHighlightedTextBlock("CommitCM.Reset", current.Name); + reset.Header = new Views.NameHighlightedTextBlock("CommitCM.Reset", current.Name, commit.ShortSHA); reset.Icon = App.CreateMenuIcon("Icons.Reset"); reset.Click += (_, e) => { @@ -408,7 +408,7 @@ namespace SourceGit.ViewModels menu.Items.Add(reset); var squash = new MenuItem(); - squash.Header = App.Text("CommitCM.SquashCommitsSinceThis"); + squash.Header = App.Text("CommitCM.SquashCommitsSinceThis", commit.ShortSHA); squash.Icon = App.CreateMenuIcon("Icons.SquashIntoParent"); squash.IsVisible = commit.IsMerged; squash.Click += (_, e) => @@ -472,7 +472,7 @@ namespace SourceGit.ViewModels if (!commit.IsMerged) { var rebase = new MenuItem(); - rebase.Header = new Views.NameHighlightedTextBlock("CommitCM.Rebase", current.Name); + rebase.Header = new Views.NameHighlightedTextBlock("CommitCM.Rebase", current.Name, commit.ShortSHA); rebase.Icon = App.CreateMenuIcon("Icons.Rebase"); rebase.Click += (_, e) => { @@ -543,7 +543,7 @@ namespace SourceGit.ViewModels menu.Items.Add(revert); var interactiveRebase = new MenuItem(); - interactiveRebase.Header = new Views.NameHighlightedTextBlock("CommitCM.InteractiveRebase", current.Name); + interactiveRebase.Header = new Views.NameHighlightedTextBlock("CommitCM.InteractiveRebase", current.Name, commit.ShortSHA); interactiveRebase.Icon = App.CreateMenuIcon("Icons.InteractiveRebase"); interactiveRebase.IsVisible = current.Head != commit.SHA; interactiveRebase.Click += (_, e) =>