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"

Squirrel.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -303,8 +303,8 @@
 				44AC95171430CF6000C888FB /* SquirrelApplicationDelegate.m */,
 				44AC95181430CF6000C888FB /* SquirrelInputController.h */,
 				44AC95191430CF6000C888FB /* SquirrelInputController.m */,
-				A47C48DE105E8CE8006D528B /* macos_keycode.m */,
 				A44571AB0DBF42C200F793F9 /* macos_keycode.h */,
+				A47C48DE105E8CE8006D528B /* macos_keycode.m */,
 				32CA4F630368D1EE00C91783 /* Squirrel_Prefix.pch */,
 				4443A8391828CC5100731305 /* input_source.m */,
 				29B97316FDCFA39411CA2CEA /* main.m */,
@@ -505,7 +505,8 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1220;
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1510;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Squirrel" */;
 			compatibilityVersion = "Xcode 10.0";
@@ -600,12 +601,13 @@
 		C01FCF4B08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				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)",
@@ -631,7 +633,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",
@@ -650,11 +652,12 @@
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				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)",
@@ -679,7 +682,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",
@@ -722,6 +725,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -743,7 +747,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;
@@ -777,6 +781,7 @@
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/Release";
 				DEAD_CODE_STRIPPING = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -795,8 +800,8 @@
 					/usr/lib,
 				);
 				LIBRARY_SEARCH_PATHS = "$(SRCROOT)/lib";
-				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				ONLY_ACTIVE_ARCH = YES;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
+				ONLY_ACTIVE_ARCH = NO;
 				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

@@ -2,6 +2,7 @@
 
 @class SquirrelConfig;
 @class SquirrelPanel;
+@class SquirrelOptionSwitcher;
 
 // Note: the SquirrelApplicationDelegate is instantiated automatically as an outlet of NSApp's instance
 @interface SquirrelApplicationDelegate : NSObject
@@ -13,17 +14,18 @@
 @property(nonatomic, readonly, strong) SquirrelConfig *config;
 @property(nonatomic, readonly) BOOL enableNotifications;
 
--(IBAction)deploy:(id)sender;
--(IBAction)syncUserData:(id)sender;
--(IBAction)configure:(id)sender;
--(IBAction)openWiki:(id)sender;
+- (IBAction)deploy:(id)sender;
+- (IBAction)syncUserData:(id)sender;
+- (IBAction)configure:(id)sender;
+- (IBAction)openWiki:(id)sender;
 
--(void)setupRime;
--(void)startRimeWithFullCheck:(BOOL)fullCheck;
--(void)loadSettings;
--(void)loadSchemaSpecificSettings:(NSString *)schemaId;
+- (void)setupRime;
+- (void)startRimeWithFullCheck:(BOOL)fullCheck;
+- (void)loadSettings;
+- (void)loadSchemaSpecificSettings:(NSString *)schemaId;
+- (void)loadSchemaSpecificLabels:(NSString *)schemaId;
 
-@property (nonatomic, readonly) BOOL problematicLaunchDetected;
+@property(nonatomic, readonly) BOOL problematicLaunchDetected;
 
 @end
 
@@ -34,4 +36,4 @@
 @end
 
 // also used in main.m
-extern void show_message(const char* msg_text, const char* msg_id);
+extern void show_message(const char *msg_text, const char *msg_id);