Skip to content

Commit 9b5e842

Browse files
committed
feature: add hotkey 'F5' to reload/refresh whole repository
1 parent 28554d1 commit 9b5e842

File tree

5 files changed

+31
-12
lines changed

5 files changed

+31
-12
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211
<x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Go to next page</x:String>
212212
<x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Create new page</x:String>
213213
<x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITORY</x:String>
214+
<x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Force to reload this repository</x:String>
214215
<x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Stage/Unstage selected changes</x:String>
215216
<x:String x:Key="Text.Hotkeys.Repo.ToggleSearch" xml:space="preserve">Toggle commit search</x:String>
216217
<x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">Switch to 'Changes'</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211
<x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">切换到下一个页面</x:String>
212212
<x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">新建页面</x:String>
213213
<x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">仓库页面快捷键</x:String>
214+
<x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">重新加载仓库状态</x:String>
214215
<x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">将选中的变更暂存或从暂存列表中移除</x:String>
215216
<x:String x:Key="Text.Hotkeys.Repo.ToggleSearch" xml:space="preserve">打开/关闭历史搜索</x:String>
216217
<x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">显示本地更改</x:String>

src/ViewModels/Repository.cs

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -233,17 +233,7 @@ public void Open()
233233
_inProgressContext = null;
234234
_hasUnsolvedConflicts = false;
235235

236-
Task.Run(() =>
237-
{
238-
RefreshBranches();
239-
RefreshTags();
240-
RefreshCommits();
241-
});
242-
243-
Task.Run(RefreshSubmodules);
244-
Task.Run(RefreshWorkingCopyChanges);
245-
Task.Run(RefreshStashes);
246-
Task.Run(RefreshGitFlow);
236+
RefreshAll();
247237
}
248238

249239
public void Close()
@@ -277,6 +267,21 @@ public void Close()
277267
_searchedCommits.Clear();
278268
}
279269

270+
public void RefreshAll()
271+
{
272+
Task.Run(() =>
273+
{
274+
RefreshBranches();
275+
RefreshTags();
276+
RefreshCommits();
277+
});
278+
279+
Task.Run(RefreshSubmodules);
280+
Task.Run(RefreshWorkingCopyChanges);
281+
Task.Run(RefreshStashes);
282+
Task.Run(RefreshGitFlow);
283+
}
284+
280285
public void OpenInFileManager()
281286
{
282287
Native.OS.OpenInFileManager(_fullpath);

src/Views/Hotkeys.axaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Increase}}"
8888
Margin="0,8"/>
8989

90-
<Grid RowDefinitions="20,20,20,20,20" ColumnDefinitions="80,*">
90+
<Grid RowDefinitions="20,20,20,20,20,20" ColumnDefinitions="80,*">
9191
<TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+F"/>
9292
<TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ToggleSearch}" />
9393

@@ -102,6 +102,9 @@
102102

103103
<TextBlock Grid.Row="4" Grid.Column="0" Classes="monospace bold" Text="SPACE"/>
104104
<TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.StageOrUnstageSelected}" />
105+
106+
<TextBlock Grid.Row="5" Grid.Column="0" Classes="monospace bold" Text="F5"/>
107+
<TextBlock Grid.Row="5" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Refresh}" />
105108
</Grid>
106109

107110
<TextBlock Text="{DynamicResource Text.Hotkeys.TextEditor}"

src/Views/Launcher.axaml.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,15 @@ protected override void OnKeyDown(KeyEventArgs e)
146146
e.Handled = true;
147147
return;
148148
}
149+
else if (e.Key == Key.F5)
150+
{
151+
if (vm.ActivePage.Data is ViewModels.Repository repo)
152+
{
153+
repo.RefreshAll();
154+
e.Handled = true;
155+
return;
156+
}
157+
}
149158

150159
base.OnKeyDown(e);
151160
}

0 commit comments

Comments
 (0)