UI Improvements (macOS deployment target = 10.15+, up to 14.4)

.gitignore

@@ -10,6 +10,7 @@ lib/*
 data/opencc/
 data/plum/
 download/
+Frameworks/
 package/Squirrel.pkg
 package/sign/*.pem
 package/test-*

.gitmodules

@@ -1,10 +1,13 @@
 [submodule "librime"]
 	path = librime
-	url = https://github.com/rime/librime.git
+	url = https://github.com/groverlynn/librime.git
+	branch = test
 	ignore = dirty
 [submodule "plum"]
 	path = plum
-	url = https://github.com/rime/plum.git
+	url = https://github.com/groverlynn/plum.git
+	branch = test
 [submodule "Sparkle"]
 	path = Sparkle
 	url = https://github.com/sparkle-project/Sparkle
+	branch = 2.x

Assets.xcassets/Contents.json

@@ -2,5 +2,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "compression-type" : "automatic"
   }
 }

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"
+    }
+  ]
+}

Assets.xcassets/rime.imageset/Contents.json

@@ -0,0 +1,41 @@
+{
+  "images" : [
+    {
+      "filename" : "rime.svg",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "contrast",
+          "value" : "high"
+        }
+      ],
+      "filename" : "rime.svg",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "rime.fill.svg",
+      "idiom" : "mac"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "contrast",
+          "value" : "high"
+        }
+      ],
+      "filename" : "rime.stroke.svg",
+      "idiom" : "mac"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "compression-type" : "automatic",
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Base.lproj/MainMenu.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -11,7 +11,7 @@
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customObject id="252" userLabel="SquirrelApplicationDelegate" customClass="SquirrelApplicationDelegate">
             <connections>
                 <outlet property="_menu" destination="773" id="779"/>
@@ -29,30 +29,32 @@
                     </connections>
                 </menuItem>
                 <menuItem title="Sync user data" id="804">
-                    <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
                         <action selector="syncUserData:" target="252" id="806"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Settings..." id="802">
-                    <modifierMask key="keyEquivalentModifierMask"/>
+                <menuItem title="Settings…" id="802">
                     <connections>
                         <action selector="configure:" target="252" id="803"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Rime Wiki..." tag="2" id="797">
-                    <modifierMask key="keyEquivalentModifierMask"/>
+                <menuItem title="Rime Wiki…" id="797">
                     <connections>
                         <action selector="openWiki:" target="252" id="798"/>
                     </connections>
                 </menuItem>
-                <menuItem title="Check for updates..." tag="1" id="776">
-                    <modifierMask key="keyEquivalentModifierMask"/>
+                <menuItem title="Error and warning logs" id="809">
+                    <connections>
+                        <action selector="openLogFolder:" target="252" id="811"/>
+                    </connections>
+                </menuItem>
+                <menuItem title="Check for updates…" id="776">
                     <connections>
                         <action selector="checkForUpdates:" target="772" id="796"/>
                     </connections>
                 </menuItem>
             </items>
+            <point key="canvasLocation" x="102.5" y="-74.5"/>
         </menu>
         <customObject id="772" userLabel="Updater" customClass="SUUpdater"/>
     </objects>