Skip to content

Commit 276d000

Browse files
love-lingerlove-linger
committed
refactor: change Copy File Name to Copy Full Path for selected file or change (#1132)
Signed-off-by: leo <[email protected]>
1 parent b26c8a6 commit 276d000

15 files changed

+54
-51
lines changed

‎src/Native/OS.cs

+9
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,15 @@ public static void OpenWithDefaultEditor(string file)
162162
_backend.OpenWithDefaultEditor(file);
163163
}
164164

165+
public static string GetAbsPath(string root, string sub)
166+
{
167+
var fullpath = Path.Combine(root, sub);
168+
if (OperatingSystem.IsWindows())
169+
return fullpath.Replace('/', '\\');
170+
171+
return fullpath;
172+
}
173+
165174
private static void UpdateGitVersion()
166175
{
167176
if (string.IsNullOrEmpty(_gitExecutable) || !File.Exists(_gitExecutable))

‎src/Resources/Locales/de_DE.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@
186186
<x:String x:Key="Text.Copy" xml:space="preserve">Kopieren</x:String>
187187
<x:String x:Key="Text.CopyAllText" xml:space="preserve">Kopiere gesamten Text</x:String>
188188
<x:String x:Key="Text.CopyPath" xml:space="preserve">Pfad kopieren</x:String>
189-
<x:String x:Key="Text.CopyFileName" xml:space="preserve">Dateinamen kopieren</x:String>
190189
<x:String x:Key="Text.CreateBranch" xml:space="preserve">Branch erstellen...</x:String>
191190
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basierend auf:</x:String>
192191
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Erstellten Branch auschecken</x:String>

‎src/Resources/Locales/en_US.axaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
<x:String x:Key="Text.Copy" xml:space="preserve">Copy</x:String>
187187
<x:String x:Key="Text.CopyAllText" xml:space="preserve">Copy All Text</x:String>
188188
<x:String x:Key="Text.CopyPath" xml:space="preserve">Copy Path</x:String>
189-
<x:String x:Key="Text.CopyFileName" xml:space="preserve">Copy File Name</x:String>
189+
<x:String x:Key="Text.CopyFullPath" xml:space="preserve">Copy Full Path</x:String>
190190
<x:String x:Key="Text.CreateBranch" xml:space="preserve">Create Branch...</x:String>
191191
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Based On:</x:String>
192192
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Check out the created branch</x:String>

‎src/Resources/Locales/es_ES.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@
189189
<x:String x:Key="Text.Copy" xml:space="preserve">Copiar</x:String>
190190
<x:String x:Key="Text.CopyAllText" xml:space="preserve">Copiar Todo el Texto</x:String>
191191
<x:String x:Key="Text.CopyPath" xml:space="preserve">Copiar Ruta</x:String>
192-
<x:String x:Key="Text.CopyFileName" xml:space="preserve">Copiar Nombre del Archivo</x:String>
193192
<x:String x:Key="Text.CreateBranch" xml:space="preserve">Crear Rama...</x:String>
194193
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basado En:</x:String>
195194
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout de la rama creada</x:String>

‎src/Resources/Locales/fr_FR.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@
178178
<x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Type de Changement :</x:String>
179179
<x:String x:Key="Text.Copy" xml:space="preserve">Copier</x:String>
180180
<x:String x:Key="Text.CopyAllText" xml:space="preserve">Copier tout le texte</x:String>
181-
<x:String x:Key="Text.CopyFileName" xml:space="preserve">Copier le nom de fichier</x:String>
182181
<x:String x:Key="Text.CopyPath" xml:space="preserve">Copier le chemin</x:String>
183182
<x:String x:Key="Text.CreateBranch" xml:space="preserve">Créer une branche...</x:String>
184183
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basé sur :</x:String>

‎src/Resources/Locales/it_IT.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@
189189
<x:String x:Key="Text.Copy" xml:space="preserve">Copia</x:String>
190190
<x:String x:Key="Text.CopyAllText" xml:space="preserve">Copia Tutto il Testo</x:String>
191191
<x:String x:Key="Text.CopyPath" xml:space="preserve">Copia Percorso</x:String>
192-
<x:String x:Key="Text.CopyFileName" xml:space="preserve">Copia Nome File</x:String>
193192
<x:String x:Key="Text.CreateBranch" xml:space="preserve">Crea Branch...</x:String>
194193
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Basato Su:</x:String>
195194
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checkout del Branch Creato</x:String>

‎src/Resources/Locales/pt_BR.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@
196196
<x:String x:Key="Text.Copy" xml:space="preserve">Copiar</x:String>
197197
<x:String x:Key="Text.CopyAllText" xml:space="preserve">Copiar todo o texto</x:String>
198198
<x:String x:Key="Text.CopyPath" xml:space="preserve">Copiar Caminho</x:String>
199-
<x:String x:Key="Text.CopyFileName" xml:space="preserve">Copiar Nome do Arquivo</x:String>
200199
<x:String x:Key="Text.CreateBranch" xml:space="preserve">Criar Branch...</x:String>
201200
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Baseado Em:</x:String>
202201
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Checar o branch criado</x:String>

‎src/Resources/Locales/ru_RU.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
<x:String x:Key="Text.Copy" xml:space="preserve">Копировать</x:String>
191191
<x:String x:Key="Text.CopyAllText" xml:space="preserve">Копировать весь текст</x:String>
192192
<x:String x:Key="Text.CopyPath" xml:space="preserve">Копировать путь</x:String>
193-
<x:String x:Key="Text.CopyFileName" xml:space="preserve">Копировать имя файла</x:String>
194193
<x:String x:Key="Text.CreateBranch" xml:space="preserve">Создать ветку...</x:String>
195194
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">Основан на:</x:String>
196195
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">Проверить созданную ветку</x:String>

‎src/Resources/Locales/zh_CN.axaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
<x:String x:Key="Text.Copy" xml:space="preserve">复制</x:String>
190190
<x:String x:Key="Text.CopyAllText" xml:space="preserve">复制全部文本</x:String>
191191
<x:String x:Key="Text.CopyPath" xml:space="preserve">复制路径</x:String>
192-
<x:String x:Key="Text.CopyFileName" xml:space="preserve">复制文件名</x:String>
192+
<x:String x:Key="Text.CopyFullPath" xml:space="preserve">复制完整路径</x:String>
193193
<x:String x:Key="Text.CreateBranch" xml:space="preserve">新建分支 ...</x:String>
194194
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">新分支基于 ：</x:String>
195195
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">完成后切换到新分支</x:String>

‎src/Resources/Locales/zh_TW.axaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
<x:String x:Key="Text.Copy" xml:space="preserve">複製</x:String>
190190
<x:String x:Key="Text.CopyAllText" xml:space="preserve">複製全部內容</x:String>
191191
<x:String x:Key="Text.CopyPath" xml:space="preserve">複製路徑</x:String>
192-
<x:String x:Key="Text.CopyFileName" xml:space="preserve">複製檔案名稱</x:String>
192+
<x:String x:Key="Text.CopyFullPath" xml:space="preserve">複製完整路徑</x:String>
193193
<x:String x:Key="Text.CreateBranch" xml:space="preserve">新增分支...</x:String>
194194
<x:String x:Key="Text.CreateBranch.BasedOn" xml:space="preserve">新分支基於:</x:String>
195195
<x:String x:Key="Text.CreateBranch.Checkout" xml:space="preserve">完成後切換到新分支</x:String>

‎src/ViewModels/BranchCompare.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,15 @@ public ContextMenu CreateChangeContextMenu()
163163
};
164164
menu.Items.Add(copyPath);
165165

166-
var copyFileName = new MenuItem();
167-
copyFileName.Header = App.Text("CopyFileName");
168-
copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
169-
copyFileName.Click += (_, e) =>
166+
var copyFullPath = new MenuItem();
167+
copyFullPath.Header = App.Text("CopyFullPath");
168+
copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
169+
copyFullPath.Click += (_, e) =>
170170
{
171-
App.CopyText(Path.GetFileName(change.Path));
171+
App.CopyText(Native.OS.GetAbsPath(_repo, change.Path));
172172
e.Handled = true;
173173
};
174-
menu.Items.Add(copyFileName);
174+
menu.Items.Add(copyFullPath);
175175

176176
return menu;
177177
}

‎src/ViewModels/CommitDetail.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -425,17 +425,17 @@ public ContextMenu CreateChangeContextMenu(Models.Change change)
425425
ev.Handled = true;
426426
};
427427

428-
var copyFileName = new MenuItem();
429-
copyFileName.Header = App.Text("CopyFileName");
430-
copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
431-
copyFileName.Click += (_, e) =>
428+
var copyFullPath = new MenuItem();
429+
copyFullPath.Header = App.Text("CopyFullPath");
430+
copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
431+
copyFullPath.Click += (_, e) =>
432432
{
433-
App.CopyText(Path.GetFileName(change.Path));
433+
App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path));
434434
e.Handled = true;
435435
};
436436

437437
menu.Items.Add(copyPath);
438-
menu.Items.Add(copyFileName);
438+
menu.Items.Add(copyFullPath);
439439
return menu;
440440
}
441441

@@ -562,17 +562,17 @@ public ContextMenu CreateRevisionFileContextMenu(Models.Object file)
562562
ev.Handled = true;
563563
};
564564

565-
var copyFileName = new MenuItem();
566-
copyFileName.Header = App.Text("CopyFileName");
567-
copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
568-
copyFileName.Click += (_, e) =>
565+
var copyFullPath = new MenuItem();
566+
copyFullPath.Header = App.Text("CopyFullPath");
567+
copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
568+
copyFullPath.Click += (_, e) =>
569569
{
570-
App.CopyText(Path.GetFileName(file.Path));
570+
App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, file.Path));
571571
e.Handled = true;
572572
};
573573

574574
menu.Items.Add(copyPath);
575-
menu.Items.Add(copyFileName);
575+
menu.Items.Add(copyFullPath);
576576
return menu;
577577
}
578578

‎src/ViewModels/RevisionCompare.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,15 @@ public ContextMenu CreateChangeContextMenu()
183183
};
184184
menu.Items.Add(copyPath);
185185

186-
var copyFileName = new MenuItem();
187-
copyFileName.Header = App.Text("CopyFileName");
188-
copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
189-
copyFileName.Click += (_, e) =>
186+
var copyFullPath = new MenuItem();
187+
copyFullPath.Header = App.Text("CopyFullPath");
188+
copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
189+
copyFullPath.Click += (_, e) =>
190190
{
191-
App.CopyText(Path.GetFileName(change.Path));
191+
App.CopyText(Native.OS.GetAbsPath(_repo, change.Path));
192192
e.Handled = true;
193193
};
194-
menu.Items.Add(copyFileName);
194+
menu.Items.Add(copyFullPath);
195195

196196
return menu;
197197
}

‎src/ViewModels/StashesPage.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,12 @@ public ContextMenu MakeContextMenuForChange(Models.Change change)
251251
ev.Handled = true;
252252
};
253253

254-
var copyFileName = new MenuItem();
255-
copyFileName.Header = App.Text("CopyFileName");
256-
copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
257-
copyFileName.Click += (_, e) =>
254+
var copyFullPath = new MenuItem();
255+
copyFullPath.Header = App.Text("CopyFullPath");
256+
copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
257+
copyFullPath.Click += (_, e) =>
258258
{
259-
App.CopyText(Path.GetFileName(change.Path));
259+
App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path));
260260
e.Handled = true;
261261
};
262262

@@ -267,7 +267,7 @@ public ContextMenu MakeContextMenuForChange(Models.Change change)
267267
menu.Items.Add(resetToThisRevision);
268268
menu.Items.Add(new MenuItem { Header = "-" });
269269
menu.Items.Add(copyPath);
270-
menu.Items.Add(copyFileName);
270+
menu.Items.Add(copyFullPath);
271271

272272
return menu;
273273
}

‎src/ViewModels/WorkingCopy.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -903,15 +903,15 @@ public ContextMenu CreateContextMenuForUnstagedChanges()
903903
};
904904
menu.Items.Add(copy);
905905

906-
var copyFileName = new MenuItem();
907-
copyFileName.Header = App.Text("CopyFileName");
908-
copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
909-
copyFileName.Click += (_, e) =>
906+
var copyFullPath = new MenuItem();
907+
copyFullPath.Header = App.Text("CopyFullPath");
908+
copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
909+
copyFullPath.Click += (_, e) =>
910910
{
911-
App.CopyText(Path.GetFileName(change.Path));
911+
App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path));
912912
e.Handled = true;
913913
};
914-
menu.Items.Add(copyFileName);
914+
menu.Items.Add(copyFullPath);
915915
}
916916
else
917917
{
@@ -1270,17 +1270,17 @@ public ContextMenu CreateContextMenuForStagedChanges()
12701270
e.Handled = true;
12711271
};
12721272

1273-
var copyFileName = new MenuItem();
1274-
copyFileName.Header = App.Text("CopyFileName");
1275-
copyFileName.Icon = App.CreateMenuIcon("Icons.Copy");
1276-
copyFileName.Click += (_, e) =>
1273+
var copyFullPath = new MenuItem();
1274+
copyFullPath.Header = App.Text("CopyFullPath");
1275+
copyFullPath.Icon = App.CreateMenuIcon("Icons.Copy");
1276+
copyFullPath.Click += (_, e) =>
12771277
{
1278-
App.CopyText(Path.GetFileName(change.Path));
1278+
App.CopyText(Native.OS.GetAbsPath(_repo.FullPath, change.Path));
12791279
e.Handled = true;
12801280
};
12811281

12821282
menu.Items.Add(copyPath);
1283-
menu.Items.Add(copyFileName);
1283+
menu.Items.Add(copyFullPath);
12841284
}
12851285
else
12861286
{

0 commit comments

Comments
 (0)