adopting objc++ & speed up with c arrays

groverlynn · Apr 25, 2024 · 22a8e57 · 22a8e57
1 parent c01f59c
commit 22a8e57
Show file tree

Hide file tree

Showing 27 changed files with 6,082 additions and 5,796 deletions.
diff --git a/Assets.xcassets/Symbols/chevron.down.symbolset/chevron.down.svg b/Assets.xcassets/Symbols/chevron.down.symbolset/chevron.down.svg
diff --git a/Assets.xcassets/Symbols/chevron.up.symbolset/chevron.up.svg b/Assets.xcassets/Symbols/chevron.up.symbolset/chevron.up.svg
diff --git a/...ymbols/chevron.up.symbolset/Contents.json → ...compress.vertical.symbolset/Contents.json b/...ymbols/chevron.up.symbolset/Contents.json → ...compress.vertical.symbolset/Contents.json
@@ -5,7 +5,7 @@
   },
   "symbols" : [
     {
-      "filename" : "chevron.up.svg",
+      "filename" : "rectangle.compress.vertical.svg",
       "idiom" : "universal"
     }
   ]

diff --git a/...s/Symbols/rectangle.compress.vertical.symbolset/rectangle.compress.vertical.svg b/...s/Symbols/rectangle.compress.vertical.symbolset/rectangle.compress.vertical.svg
diff --git a/...bols/chevron.down.symbolset/Contents.json → ...e.expand.vertical.symbolset/Contents.json b/...bols/chevron.down.symbolset/Contents.json → ...e.expand.vertical.symbolset/Contents.json
@@ -5,7 +5,7 @@
   },
   "symbols" : [
     {
-      "filename" : "chevron.down.svg",
+      "filename" : "rectangle.expand.vertical.svg",
       "idiom" : "universal"
     }
   ]

diff --git a/...ssets/Symbols/rectangle.expand.vertical.symbolset/rectangle.expand.vertical.svg b/...ssets/Symbols/rectangle.expand.vertical.symbolset/rectangle.expand.vertical.svg
diff --git a/Base.lproj/MainMenu.xib b/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="32700.99.1234" 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="22689"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -14,40 +14,42 @@
         <customObject id="-3" userLabel="Application"/>
         <customObject id="252" userLabel="SquirrelApplicationDelegate" customClass="SquirrelApplicationDelegate">
             <connections>
-                <outlet property="_menu" destination="773" id="779"/>
-                <outlet property="_panel" destination="770" id="771"/>
-                <outlet property="_updater" destination="772" id="794"/>
+                <outlet property="menu" destination="773" id="779"/>
+                <outlet property="panel" destination="770" id="771"/>
+                <outlet property="updater" destination="772" id="794"/>
             </connections>
         </customObject>
         <customObject id="770" userLabel="SquirrelPanel" customClass="SquirrelPanel"/>
         <menu id="773" userLabel="Menu">
             <items>
+                <menuItem title="Squirrel Switcher" allowsKeyEquivalentWhenHidden="YES" id="780">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="showSwitcher:" target="252" id="781"/>
+                    </connections>
+                </menuItem>
                 <menuItem title="Deploy" keyEquivalent="`" id="774">
                     <modifierMask key="keyEquivalentModifierMask" control="YES" option="YES"/>
                     <connections>
                         <action selector="deploy:" target="252" id="795"/>
                     </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…" tag="2" 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="Check for updates…" tag="1" id="776">
                     <connections>
                         <action selector="checkForUpdates:" target="772" id="796"/>
                     </connections>

diff --git a/Makefile b/Makefile
@@ -80,10 +80,10 @@ copy-opencc-data:
 deps: librime data
 
 clang-format-lint:
-	find . -name '*.m' -o -name '*.h' -maxdepth 1 | xargs clang-format -Werror --dry-run || { echo Please lint your code by '"'"make clang-format-apply"'"'.; false; }
+	find . -name '*.m' -o -name '*.mm' -o -name '*.h' -o -name '*.hh' -maxdepth 1 | xargs clang-format -Werror --dry-run || { echo Please lint your code by '"'"make clang-format-apply"'"'.; false; }
 
 clang-format-apply:
-	find . -name '*.m' -o -name '*.h' -maxdepth 1 | xargs clang-format --verbose -i
+	find . -name '*.m' -o -name '*.mm' -o -name '*.h' -o -name '*.hh' -maxdepth 1 | xargs clang-format --verbose -i
 
 ifdef ARCHS
 BUILD_SETTINGS += ARCHS="$(ARCHS)"