From a146f8ea8d908f15759e17a1765c16dd2163a2de Mon Sep 17 00:00:00 2001
From: Qijia Liu <liumeo@pku.edu.cn>
Date: Tue, 4 Jun 2024 03:32:03 -0400
Subject: [PATCH] reset current page, single group and item (#142)

---
 assets/zh-Hans.lproj/Localizable.strings | Bin 16806 -> 17466 bytes
 src/config/navigationsplit.swift         |  22 ++++++++++++----------
 src/config/optionviews.swift             |  16 ++++++++++++++++
 src/config/ui.swift                      |  10 +++++++++-
 4 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/assets/zh-Hans.lproj/Localizable.strings b/assets/zh-Hans.lproj/Localizable.strings
index 04a874fab6178d3f518321cea2dfc5817fbca07e..57202ca6e5aaec4c0b79dffebd9b935b9b6deda5 100644
GIT binary patch
delta 412
zcmZ41%($zAaYKZDeKJESLlF?BGUPFoFeoq-FeEah19^Htb_hd0kOavU12IT85r~T!
zGJ$H-8FGMP3P5%Vkj`b$2Z|H{)t3TI&;jep1d3#UbtMDUW-=r*WCO+XfqEgjih*>F
zJJ84^paD5R3zdKZwm_`JaCTx|eQ>;QQ0WXNgT_t}FEsc~(S`KN8Tt%I>UjRY5B?mi
zH+5&h@4&J^_Kdn}CWDC&A~yTzvoS_tv$F)lA0<GSWdePofaGdq2f&Pf>Ibr1C;dnr
b*ov4Spe|BvfQ1k~^DBWK1$n{GAVLrT7w&0n

delta 18
acmdnh!MLoMaYKau<R*h(o1Ynl2m%02+6WW?

diff --git a/src/config/navigationsplit.swift b/src/config/navigationsplit.swift
index e4786b3..5f80440 100644
--- a/src/config/navigationsplit.swift
+++ b/src/config/navigationsplit.swift
@@ -35,17 +35,19 @@ struct ListConfigView: View {
           buildView(config: config).padding([.leading, .trailing])
         }
       }.padding([.top], 1)
+      footer(
+        reset: {
+          // Reset only current page.
+          viewModel.selectedConfig?.resetToDefault()
+        },
+        apply: {
+          // Save all pages.
+          Fcitx.setConfig("fcitx://\(path)", viewModel.config?.encodeValue())
+        },
+        close: {
+          FcitxInputController.controllers[key]?.window?.performClose(_: nil)
+        })
     }
-    footer(
-      reset: {
-        viewModel.config?.resetToDefault()
-      },
-      apply: {
-        Fcitx.setConfig("fcitx://\(path)", viewModel.config?.encodeValue())
-      },
-      close: {
-        FcitxInputController.controllers[key]?.window?.performClose(_: nil)
-      })
   }
 }
 
diff --git a/src/config/optionviews.swift b/src/config/optionviews.swift
index 47b51a5..3e79e4b 100644
--- a/src/config/optionviews.swift
+++ b/src/config/optionviews.swift
@@ -497,6 +497,14 @@ struct GroupOptionView: OptionView {
             subLabel
               .font(.title3)
               .gridCellColumns(2)
+              .help(NSLocalizedString("Right click to reset this group.", comment: ""))
+              .contextMenu {
+                Button {
+                  child.resetToDefault()
+                } label: {
+                  Text("Reset to default")
+                }
+              }
           }
           GridRow {
             GroupBox {
@@ -509,6 +517,14 @@ struct GroupOptionView: OptionView {
           GridRow {
             subLabel
               .frame(minWidth: 100, maxWidth: 300, alignment: .trailing)
+              .help(NSLocalizedString("Right click to reset this item.", comment: ""))
+              .contextMenu {
+                Button {
+                  child.resetToDefault()
+                } label: {
+                  Text("Reset to default")
+                }
+              }
             AnyView(subView)
           }
         }
diff --git a/src/config/ui.swift b/src/config/ui.swift
index e05c05d..f3e1d33 100644
--- a/src/config/ui.swift
+++ b/src/config/ui.swift
@@ -26,7 +26,15 @@ func footer(reset: @escaping () -> Void, apply: @escaping () -> Void, close: @es
     Button {
       reset()
     } label: {
-      Text("Reset to default")
+      Text("Reset to default").tooltip(
+        NSLocalizedString(
+          "Reset current page. To reset a single item/group, right click on its label.", comment: ""
+        ))
+    }
+    Button {
+      close()
+    } label: {
+      Text("Cancel")
     }
     Spacer()
     Button {