Skip to content

Commit 13d5c5f

Browse files
love-lingerlove-linger
committed
feature: add a configuration in Preferences window to open LOCAL CHANGES pages by default (#1750)
Signed-off-by: leo <[email protected]>
1 parent 20117a3 commit 13d5c5f

File tree

9 files changed

+42
-19
lines changed

9 files changed

+42
-19
lines changed

‎src/Resources/Locales/de_DE.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,6 @@
541541
<x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">DARSTELLUNG</x:String>
542542
<x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Standardschriftart</x:String>
543543
<x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Editor Tab Breite</x:String>
544-
<x:String x:Key="Text.Preferences.Appearance.EnableCompactFolders" xml:space="preserve">Aktiviere kompakte Ordner im Änderungsbaum</x:String>
545544
<x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Schriftgröße</x:String>
546545
<x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Standard</x:String>
547546
<x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Texteditor</x:String>
@@ -558,6 +557,7 @@
558557
<x:String x:Key="Text.Preferences.General" xml:space="preserve">ALLGEMEIN</x:String>
559558
<x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Beim Starten nach Updates suchen</x:String>
560559
<x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">Datumsformat</x:String>
560+
<x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">Aktiviere kompakte Ordner im Änderungsbaum</x:String>
561561
<x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Sprache</x:String>
562562
<x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commit-Historie</x:String>
563563
<x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Zeige Autor Zeitpunkt anstatt Commit Zeitpunkt</x:String>

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,6 @@
536536
<x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APPEARANCE</x:String>
537537
<x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Default Font</x:String>
538538
<x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Editor Tab Width</x:String>
539-
<x:String x:Key="Text.Preferences.Appearance.EnableCompactFolders" xml:space="preserve">Enable compact folders in changes tree</x:String>
540539
<x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Font Size</x:String>
541540
<x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Default</x:String>
542541
<x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>
@@ -553,9 +552,11 @@
553552
<x:String x:Key="Text.Preferences.General" xml:space="preserve">GENERAL</x:String>
554553
<x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Check for updates on startup</x:String>
555554
<x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">Date Format</x:String>
555+
<x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">Enable compact folders in changes tree</x:String>
556556
<x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Language</x:String>
557557
<x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">History Commits</x:String>
558558
<x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Show author time instead of commit time in graph</x:String>
559+
<x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">Show `LOCAL CHANGES` page by default</x:String>
559560
<x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">Show children in the commit details</x:String>
560561
<x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Show tags in commit graph</x:String>
561562
<x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Subject Guide Length</x:String>

‎src/Resources/Locales/es_ES.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,6 @@
540540
<x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">APARIENCIA</x:String>
541541
<x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Fuente por defecto</x:String>
542542
<x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Ancho de la Pestaña del Editor</x:String>
543-
<x:String x:Key="Text.Preferences.Appearance.EnableCompactFolders" xml:space="preserve">Habilitar carpetas compactas en el árbol de cambios</x:String>
544543
<x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Tamaño de fuente</x:String>
545544
<x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">Por defecto</x:String>
546545
<x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Editor</x:String>
@@ -557,6 +556,7 @@
557556
<x:String x:Key="Text.Preferences.General" xml:space="preserve">GENERAL</x:String>
558557
<x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Buscar actualizaciones al iniciar</x:String>
559558
<x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">Formato de Fecha</x:String>
559+
<x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">Habilitar carpetas compactas en el árbol de cambios</x:String>
560560
<x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Idioma</x:String>
561561
<x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commits en el historial</x:String>
562562
<x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Mostrar hora del autor en lugar de la hora del commit en el gráfico</x:String>

‎src/Resources/Locales/ru_RU.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,6 @@
529529
<x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">ВИД</x:String>
530530
<x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">Шрифт по умолчанию</x:String>
531531
<x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">Редактировать ширину вкладки</x:String>
532-
<x:String x:Key="Text.Preferences.Appearance.EnableCompactFolders" xml:space="preserve">Включить компактные каталоги в дереве изменений</x:String>
533532
<x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">Размер шрифта</x:String>
534533
<x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">По умолчанию</x:String>
535534
<x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">Редактор</x:String>
@@ -546,6 +545,7 @@
546545
<x:String x:Key="Text.Preferences.General" xml:space="preserve">ОСНОВНЫЕ</x:String>
547546
<x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">Проверить обновления при старте</x:String>
548547
<x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">Формат даты</x:String>
548+
<x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">Включить компактные каталоги в дереве изменений</x:String>
549549
<x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">Язык</x:String>
550550
<x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Максимальная длина истории</x:String>
551551
<x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">Показывать время автора вместо времени ревизии на графике</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,6 @@
540540
<x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">外观配置</x:String>
541541
<x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">缺省字体</x:String>
542542
<x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">编辑器制表符宽度</x:String>
543-
<x:String x:Key="Text.Preferences.Appearance.EnableCompactFolders" xml:space="preserve">在变更列表树中启用紧凑文件夹模式</x:String>
544543
<x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">字体大小</x:String>
545544
<x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">默认</x:String>
546545
<x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">代码编辑器</x:String>
@@ -557,9 +556,11 @@
557556
<x:String x:Key="Text.Preferences.General" xml:space="preserve">通用配置</x:String>
558557
<x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">启动时检测软件更新</x:String>
559558
<x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">日期时间格式</x:String>
559+
<x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">在变更列表树中启用紧凑文件夹模式</x:String>
560560
<x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">显示语言</x:String>
561561
<x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">最大历史提交数</x:String>
562562
<x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">在提交路线图中显示修改时间而非提交时间</x:String>
563+
<x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">默认显示【本地更改】页</x:String>
563564
<x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">在提交详情页中显示子提交列表</x:String>
564565
<x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">在提交路线图中显示标签</x:String>
565566
<x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">SUBJECT字数检测</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,6 @@
540540
<x:String x:Key="Text.Preferences.Appearance" xml:space="preserve">外觀設定</x:String>
541541
<x:String x:Key="Text.Preferences.Appearance.DefaultFont" xml:space="preserve">預設字型</x:String>
542542
<x:String x:Key="Text.Preferences.Appearance.EditorTabWidth" xml:space="preserve">編輯器 Tab 寬度</x:String>
543-
<x:String x:Key="Text.Preferences.Appearance.EnableCompactFolders" xml:space="preserve">在變更樹中啟用精簡文件夾顯示模式</x:String>
544543
<x:String x:Key="Text.Preferences.Appearance.FontSize" xml:space="preserve">字型大小</x:String>
545544
<x:String x:Key="Text.Preferences.Appearance.FontSize.Default" xml:space="preserve">預設</x:String>
546545
<x:String x:Key="Text.Preferences.Appearance.FontSize.Editor" xml:space="preserve">程式碼</x:String>
@@ -557,9 +556,11 @@
557556
<x:String x:Key="Text.Preferences.General" xml:space="preserve">一般設定</x:String>
558557
<x:String x:Key="Text.Preferences.General.Check4UpdatesOnStartup" xml:space="preserve">啟動時檢查軟體更新</x:String>
559558
<x:String x:Key="Text.Preferences.General.DateFormat" xml:space="preserve">日期時間格式</x:String>
559+
<x:String x:Key="Text.Preferences.General.EnableCompactFolders" xml:space="preserve">在變更樹中啟用精簡文件夾顯示模式</x:String>
560560
<x:String x:Key="Text.Preferences.General.Locale" xml:space="preserve">顯示語言</x:String>
561561
<x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">最大歷史提交數</x:String>
562562
<x:String x:Key="Text.Preferences.General.ShowAuthorTime" xml:space="preserve">在提交路線圖中顯示修改時間而非提交時間</x:String>
563+
<x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">預設顯示「本機變更」頁面</x:String>
563564
<x:String x:Key="Text.Preferences.General.ShowChildren" xml:space="preserve">在提交詳細資訊中顯示後續提交</x:String>
564565
<x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">在路線圖中顯示標籤</x:String>
565566
<x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">提交標題字數偵測</x:String>

‎src/ViewModels/Preferences.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@ public LayoutInfo Layout
119119
set => SetProperty(ref _layout, value);
120120
}
121121

122+
public bool ShowLocalChangesByDefault
123+
{
124+
get;
125+
set;
126+
} = false;
127+
122128
public int MaxHistoryCommits
123129
{
124130
get => _maxHistoryCommits;

‎src/ViewModels/Repository.cs‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,17 @@ public void Open()
549549
_histories = new Histories(this);
550550
_workingCopy = new WorkingCopy(this) { CommitMessage = _settings.LastCommitMessage };
551551
_stashesPage = new StashesPage(this);
552-
_selectedView = _histories;
553-
_selectedViewIndex = 0;
552+
553+
if (Preferences.Instance.ShowLocalChangesByDefault)
554+
{
555+
_selectedView = _workingCopy;
556+
_selectedViewIndex = 1;
557+
}
558+
else
559+
{
560+
_selectedView = _histories;
561+
_selectedViewIndex = 0;
562+
}
554563

555564
_lastFetchTime = DateTime.Now;
556565
_autoFetchTimer = new Timer(FetchInBackground, null, 5000, 5000);

‎src/Views/Preferences.axaml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<TabItem.Header>
4747
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.General}"/>
4848
</TabItem.Header>
49-
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto,Auto" ColumnDefinitions="Auto,*">
49+
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
5050
<TextBlock Grid.Row="0" Grid.Column="0"
5151
Text="{DynamicResource Text.Preferences.General.Locale}"
5252
HorizontalAlignment="Right"
@@ -133,26 +133,36 @@
133133
</Grid>
134134

135135
<CheckBox Grid.Row="5" Grid.Column="1"
136+
Height="32"
137+
Content="{DynamicResource Text.Preferences.General.ShowChangesPageByDefault}"
138+
IsChecked="{Binding ShowLocalChangesByDefault, Mode=TwoWay}"/>
139+
140+
<CheckBox Grid.Row="6" Grid.Column="1"
136141
Height="32"
137142
Content="{DynamicResource Text.Preferences.General.ShowAuthorTime}"
138143
IsChecked="{Binding ShowAuthorTimeInGraph, Mode=TwoWay}"/>
139144

140-
<CheckBox Grid.Row="6" Grid.Column="1"
145+
<CheckBox Grid.Row="7" Grid.Column="1"
141146
Height="32"
142147
Content="{DynamicResource Text.Preferences.General.ShowTagsInGraph}"
143148
IsChecked="{Binding ShowTagsInGraph, Mode=TwoWay}"/>
144149

145-
<CheckBox Grid.Row="7" Grid.Column="1"
150+
<CheckBox Grid.Row="8" Grid.Column="1"
146151
Height="32"
147152
Content="{DynamicResource Text.Preferences.General.ShowChildren}"
148153
IsChecked="{Binding ShowChildren, Mode=TwoWay}"/>
149154

150-
<CheckBox Grid.Row="8" Grid.Column="1"
155+
<CheckBox Grid.Row="9" Grid.Column="1"
156+
Height="32"
157+
Content="{DynamicResource Text.Preferences.General.EnableCompactFolders}"
158+
IsChecked="{Binding EnableCompactFoldersInChangesTree, Mode=TwoWay}"/>
159+
160+
<CheckBox Grid.Row="10" Grid.Column="1"
151161
Height="32"
152162
Content="{DynamicResource Text.Preferences.General.UpdateBlockNavigationOnScroll}"
153163
IsChecked="{Binding UpdateBlockNavigationOnScroll, Mode=TwoWay}"/>
154164

155-
<CheckBox Grid.Row="9" Grid.Column="1"
165+
<CheckBox Grid.Row="11" Grid.Column="1"
156166
Height="32"
157167
Content="{DynamicResource Text.Preferences.General.Check4UpdatesOnStartup}"
158168
IsVisible="{x:Static s:App.IsCheckForUpdateCommandVisible}"
@@ -164,7 +174,7 @@
164174
<TabItem.Header>
165175
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Appearance}"/>
166176
</TabItem.Header>
167-
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
177+
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
168178
<TextBlock Grid.Row="0" Grid.Column="0"
169179
Text="{DynamicResource Text.Preferences.Appearance.Theme}"
170180
HorizontalAlignment="Right"
@@ -271,11 +281,6 @@
271281
IsChecked="{Binding UseFixedTabWidth, Mode=TwoWay}"/>
272282

273283
<CheckBox Grid.Row="8" Grid.Column="1"
274-
Height="32"
275-
Content="{DynamicResource Text.Preferences.Appearance.EnableCompactFolders}"
276-
IsChecked="{Binding EnableCompactFoldersInChangesTree, Mode=TwoWay}"/>
277-
278-
<CheckBox Grid.Row="9" Grid.Column="1"
279284
Height="32"
280285
Content="{DynamicResource Text.Preferences.Appearance.UseNativeWindowFrame}"
281286
IsChecked="{Binding UseSystemWindowFrame, Mode=OneTime}"

0 commit comments

Comments
 (0)