UI Improvement

Assets.xcassets/RimeIcon.appiconset/Contents.json

@@ -1,13 +1,13 @@
 {
   "images" : [
     {
-      "filename" : "rime-16 1.png",
+      "filename" : "rime-16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "rime-32 1.png",
+      "filename" : "rime-32.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"

Assets.xcassets/Symbols/Contents.json

@@ -0,0 +1,9 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "provides-namespace" : true
+  }
+}

Assets.xcassets/Symbols/chevron.down.circle.fill.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "chevron.down.circle.fill.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/chevron.down.circle.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "chevron.down.circle.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/chevron.down.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "chevron.down.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/chevron.left.circle.fill.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "chevron.left.circle.fill.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/chevron.left.circle.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "chevron.left.circle.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/chevron.right.circle.fill.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "chevron.right.circle.fill.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/chevron.right.circle.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "chevron.right.circle.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/chevron.up.circle.fill.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "chevron.up.circle.fill.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/chevron.up.circle.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "chevron.up.circle.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/chevron.up.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "chevron.up.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/delete.backward.fill.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "delete.backward.fill.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/delete.backward.symbolset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "symbol-rendering-intent" : "template"
+  },
+  "symbols" : [
+    {
+      "filename" : "delete.backward.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

Assets.xcassets/Symbols/lock.fill.symbolset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "symbols" : [
+    {
+      "filename" : "lock.fill.svg",
+      "idiom" : "universal"
+    }
+  ]
+}

README.md

@@ -28,7 +28,7 @@
 安裝輸入法
 ---
 
-本品適用於 macOS 12.0+
+本品適用於 macOS 10.15+
 
 初次安裝，如果在部份應用程序中打不出字，請註銷並重新登錄。
 

Squirrel.xcodeproj/project.pbxproj

@@ -608,7 +608,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.17.2;
+				CURRENT_PROJECT_VERSION = 0.16.2u;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -634,7 +634,7 @@
 					"$(inherited)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DLEOPARD",
@@ -658,7 +658,7 @@
 				CODE_SIGN_ENTITLEMENTS = Squirrel.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0.17.2;
+				CURRENT_PROJECT_VERSION = 0.16.2u;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -683,7 +683,7 @@
 					"$(inherited)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DLEOPARD",
@@ -726,6 +726,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -747,7 +748,7 @@
 					/usr/local/lib,
 				);
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/lib";
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SYSTEM_HEADER_SEARCH_PATHS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Tk.framework/Headers;
@@ -781,6 +782,7 @@
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/Release";
 				DEAD_CODE_STRIPPING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -799,7 +801,7 @@
 					/usr/lib,
 				);
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/lib";
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SYSTEM_HEADER_SEARCH_PATHS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Tk.framework/Headers;

SquirrelApplicationDelegate.h

@@ -1,18 +1,26 @@
 #import <Cocoa/Cocoa.h>
 
+#import <rime_api.h>
 @class SquirrelConfig;
 @class SquirrelPanel;
+@class SquirrelOptionSwitcher;
 
 // Note: the SquirrelApplicationDelegate is instantiated automatically as an
 // outlet of NSApp's instance
-@interface SquirrelApplicationDelegate : NSObject
+@interface SquirrelApplicationDelegate : NSObject <NSApplicationDelegate>
+
+typedef NS_ENUM(NSUInteger, SquirrelNotificationPolicy) {
+  kShowNotificationsNever = 0,
+  kShowNotificationsWhenAppropriate = 1,
+  kShowNotificationsAlways = 2
+};
 
 @property(nonatomic, copy) IBOutlet NSMenu* menu;
 @property(nonatomic, strong) IBOutlet SquirrelPanel* panel;
 @property(nonatomic, strong) IBOutlet id updater;
 
-@property(nonatomic, readonly, strong) SquirrelConfig* config;
-@property(nonatomic, readonly) BOOL enableNotifications;
+@property(nonatomic, strong, readonly) SquirrelConfig* config;
+@property(nonatomic, readonly) SquirrelNotificationPolicy showNotifications;
 
 - (IBAction)deploy:(id)sender;
 - (IBAction)syncUserData:(id)sender;
@@ -22,18 +30,20 @@
 - (void)setupRime;
 - (void)startRimeWithFullCheck:(BOOL)fullCheck;
 - (void)loadSettings;
-- (void)loadSchemaSpecificSettings:(NSString*)schemaId;
+- (void)loadSchemaSpecificSettings:(NSString*)schemaId
+                   withRimeSession:(RimeSessionId)sessionId;
+- (void)loadSchemaSpecificLabels:(NSString*)schemaId;
 
 @property(nonatomic, readonly) BOOL problematicLaunchDetected;
 
-@end
+@end  // SquirrelApplicationDelegate
 
 @interface NSApplication (SquirrelApp)
 
-@property(nonatomic, readonly, strong)
+@property(nonatomic, strong, readonly)
     SquirrelApplicationDelegate* squirrelAppDelegate;
 
-@end
+@end  // NSApplication (SquirrelApp)
 
 // also used in main.m
-extern void show_message(const char* msg_text, const char* msg_id);
+extern void show_notification(const char* msg_text);