8000 feature: supports to use `Ctrl+D/⌘+D` to open in external diff/merge … · sourcegit-scm/sourcegit@bc5c467 · GitHub
[go: up one dir, main page]
Skip to content

Commit bc5c467

Browse files
love-lingerlove-linger
committed
feature: supports to use Ctrl+D/⌘+D to open in external diff/merge tool (#1312)
1 parent d336342 commit bc5c467

File tree

5 files changed

+18
-2
lines changed

5 files changed

+18
-2
lines changed

‎src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@
406406
<x:String x:Key="Text.Hotkeys.TextEditor.CloseSearch" xml:space="preserve">Close search panel</x:String>
407407
<x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">Find next match</x:String>
408408
<x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">Find previous match</x:String>
409+
<x:String x:Key="Text.Hotkeys.TextEditor.OpenExternalMergeTool" xml:space="preserve">Open with external diff/merge tool</x:String>
4 10000 09410
<x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">Open search panel</x:String>
410411
<x:String x:Key="Text.Hunk.Discard" xml:space="preserve">Discard</x:String>
411412
<x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Stage</x:String>

‎src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@
410410
<x:String x:Key="Text.Hotkeys.TextEditor.CloseSearch" xml:space="preserve">关闭搜索</x:String>
411411
<x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">定位到下一个匹配搜索的位置</x:String>
412412
<x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">定位到上一个匹配搜索的位置</x:String>
413+
<x:String x:Key="Text.Hotkeys.TextEditor.OpenExternalMergeTool" xml:space="preserve">使用外部比对工具查看</x:String>
413414
<x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">打开搜索</x:String>
414415
<x:String x:Key="Text.Hunk.Discard" xml:space="preserve">丢弃</x:String>
415416
<x:String x:Key="Text.Hunk.Stage" xml:space="preserve">暂存</x:String>

‎src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@
410410
<x:String x:Key="Text.Hotkeys.TextEditor.CloseSearch" xml:space="preserve">關閉搜尋面板</x:String>
411411
<x:String x:Key="Text.Hotkeys.TextEditor.GotoNextMatch" xml:space="preserve">前往下一個搜尋相符的位置</x:String>
412412
<x:String x:Key="Text.Hotkeys.TextEditor.GotoPrevMatch" xml:space="preserve">前往上一個搜尋相符的位置</x:String>
413+
<x:String x:Key="Text.Hotkeys.TextEditor.OpenExternalMergeTool" xml:space="preserve">使用外部比對工具檢視</x:String>
413414
<x:String x:Key="Text.Hotkeys.TextEditor.Search" xml:space="preserve">開啟搜尋面板</x:String>
414415
<x:String x:Key="Text.Hunk.Discard" xml:space="preserve">捨棄</x:String>
415416
<x:String x:Key="Text.Hunk.Stage" xml:space="preserve">暫存</x:String>

‎src/Views/DiffView.axaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,17 @@
175175
<Path Width="12" Height="12" Data="{StaticResource Icons.Layout}" Margin="0,2,0,0"/>
176176
</ToggleButton>
177177

178-
<Button Classes="icon_button" Width="28" Command="{Binding OpenExternalMergeTool}" ToolTip.Tip="{DynamicResource Text.Diff.UseMerger}">
178+
<Button Classes="icon_button"
179+
Width="28"
180+
Command="{Binding OpenExternalMergeTool}"
181+
HotKey="{OnPlatform Ctrl+D, macOS=⌘+D}">
182+
<ToolTip.Tip>
183+
<TextBlock>
184+
<Run Text="{DynamicResource Text.Diff.UseMerger}"/>
185+
<Run Text=" "/>
186+
<Run Text="{OnPlatform Ctrl+D, macOS=⌘+D}" Foreground="{DynamicResource Brush.FG2}"/>
187+
</TextBlock>
188+
</ToolTip.Tip>
179189
<Path Width="12" Height="12" Stretch="Uniform" Data="{StaticResource Icons.OpenWith}"/>
180190
</Button>
181191
</StackPanel>

‎src/Views/Hotkeys.axaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Increase}}"
131131
Margin="0,8"/>
132132

133-
<Grid RowDefinitions="20,20,20,20" ColumnDefinitions="150,*">
133+
<Grid RowDefinitions="20,20,20,20,20" ColumnDefinitions="150,*">
134134
<TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
135135
<TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.Search}" />
136136

@@ -142,6 +142,9 @@
142142

143143
<TextBlock Grid.Row="3" Grid.Column="0" Classes="primary bold" Text="ESC"/>
144144
<TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.CloseSearch}" />
145+
146+
<TextBlock Grid.Row="4" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+D, macOS=⌘+D}"/>
147+
<TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.OpenExternalMergeTool}" />
145148
</Grid>
146149
</StackPanel>
147150
</Border>

0 commit comments

Comments
 (0)
0