diff --git a/src/Resources/Icons.xaml b/src/Resources/Icons.xaml
index 8e318db3..6775fe02 100644
--- a/src/Resources/Icons.xaml
+++ b/src/Resources/Icons.xaml
@@ -28,9 +28,6 @@
M1017 598c0-25-25-50-50-50c-30 0-50 25-50 50c0 35-10 136-55 186c-25 25-55 35-95 35c-70 0-121-191-161-326c-50-196-100-377-231-377c-186 0-271 286-326 472c-10 40-20 75-30 95c-10 25 5 55 30 65c25 10 55-5 65-30c10-25 20-60 35-105c35-136 116-397 226-397c55 0 105 181 141 301c55 196 110 402 256 402c65 0 121-20 161-65c90-95 85-251 85-256z
- M512 768c-38 0-74-9-107-23C493 704 555 615 555 512c0-103-61-192-149-233C438 265 474 256 512 256a256 256 0 01256 256a256 256 0 01-256 256m341-397V171h-200L512 29 371 171H171v200L29 512 171 653V853h200L512 995 653 853H853v-200L995 512 853 371z
- M853 653l141-141-141-141 0-200-200 0-141-141-141 141-200 0 0 200-141 141 141 141 0 200 200 0 141 141 141-141 200 0 0-200zM512 768c-141 0-256-115-256-256s115-256 256-256s256 115 256 256s-115 256-256 256z
-
M509 546l271-271 91 91-348 349-1-1-13 13-363-361 91-91z
M256 224l0 115L512 544l256-205 0-115-256 205L256 224zM512 685l-256-205L256 595 512 800 768 595l0-115L512 685z
M170 831l343-342L855 831l105-105-448-448L64 726 170 831z
diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml
index ecf5683e..5b5e0661 100644
--- a/src/Resources/Locales/en_US.xaml
+++ b/src/Resources/Locales/en_US.xaml
@@ -15,7 +15,6 @@
FILTER
Optional.
SELECT FOLDER
- CHANGE THEME
URL :
Git Repository URL
@@ -366,6 +365,7 @@
Content Font
Avatar Server
Check for update
+ Use dark theme
Fetch remotes automatically (need restart)
Restore windows
Enable crash report (maybe include related path)
diff --git a/src/Resources/Locales/zh_CN.xaml b/src/Resources/Locales/zh_CN.xaml
index 173b3a92..66224eac 100644
--- a/src/Resources/Locales/zh_CN.xaml
+++ b/src/Resources/Locales/zh_CN.xaml
@@ -14,7 +14,6 @@
过滤
选填
选择文件夹
- 切换主题
仓库地址 :
远程仓库地址
@@ -365,6 +364,7 @@
文本字体
头像服务
启用检测更新
+ 启用暗色主题
启用定时自动拉取远程更新(重启生效)
启动时恢复上次打开的仓库
开启崩溃上报(可能涉及上报相关路径)
diff --git a/src/Views/Launcher.xaml b/src/Views/Launcher.xaml
index c29c2f84..1fab17a8 100644
--- a/src/Views/Launcher.xaml
+++ b/src/Views/Launcher.xaml
@@ -42,7 +42,6 @@
-
diff --git a/src/Views/Launcher.xaml.cs b/src/Views/Launcher.xaml.cs
index 1b4a787a..3395036f 100644
--- a/src/Views/Launcher.xaml.cs
+++ b/src/Views/Launcher.xaml.cs
@@ -78,10 +78,6 @@ namespace SourceGit.Views {
#endregion
#region RIGHT_COMMANDS
- private void ChangeTheme(object sender, RoutedEventArgs e) {
- Models.Theme.Change();
- }
-
private void OpenPreference(object sender, RoutedEventArgs e) {
var dialog = new Preference() { Owner = this };
dialog.ShowDialog();
diff --git a/src/Views/Preference.xaml b/src/Views/Preference.xaml
index 2d757b48..b67d933b 100644
--- a/src/Views/Preference.xaml
+++ b/src/Views/Preference.xaml
@@ -66,6 +66,7 @@
+
@@ -172,45 +173,52 @@
Content="{DynamicResource Text.Preference.CheckUpdate}"
IsChecked="{Binding Source={x:Static models:Preference.Instance}, Path=General.CheckForUpdate, Mode=TwoWay}"/>
-
+
+
+
+
-
+
@@ -233,22 +241,22 @@
-
+
@@ -271,12 +279,12 @@
-
+
diff --git a/src/Views/Preference.xaml.cs b/src/Views/Preference.xaml.cs
index 3c9e2431..252e5846 100644
--- a/src/Views/Preference.xaml.cs
+++ b/src/Views/Preference.xaml.cs
@@ -52,7 +52,10 @@ namespace SourceGit.Views {
#region EVENTS
private void LocaleChanged(object sender, SelectionChangedEventArgs e) {
Models.Locale.Change();
- e.Handled = true;
+ }
+
+ private void ChangeTheme(object sender, RoutedEventArgs e) {
+ Models.Theme.Change();
}
private void SelectGitPath(object sender, RoutedEventArgs e) {