Skip to content

Commit

Permalink
adopting objc++ & speed up with c arrays
Browse files Browse the repository at this point in the history
  • Loading branch information
groverlynn committed Apr 25, 2024
1 parent 27d9b02 commit d138f90
Show file tree
Hide file tree
Showing 32 changed files with 5,846 additions and 5,420 deletions.
160 changes: 0 additions & 160 deletions Assets.xcassets/Symbols/chevron.down.symbolset/chevron.down.svg

This file was deleted.

160 changes: 0 additions & 160 deletions Assets.xcassets/Symbols/chevron.up.symbolset/chevron.up.svg

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"symbols" : [
{
"filename" : "chevron.up.svg",
"filename" : "rectangle.compress.vertical.svg",
"idiom" : "universal"
}
]
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"symbols" : [
{
"filename" : "chevron.down.svg",
"filename" : "rectangle.expand.vertical.svg",
"idiom" : "universal"
}
]
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 1 addition & 25 deletions Assets.xcassets/rime.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,8 @@
{
"images" : [
{
"filename" : "rime.svg",
"filename" : "rime.pdf",
"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" : {
Expand Down
4 changes: 0 additions & 4 deletions Assets.xcassets/rime.imageset/rime.fill.svg

This file was deleted.

Binary file added Assets.xcassets/rime.imageset/rime.pdf
Binary file not shown.
4 changes: 0 additions & 4 deletions Assets.xcassets/rime.imageset/rime.stroke.svg

This file was deleted.

4 changes: 0 additions & 4 deletions Assets.xcassets/rime.imageset/rime.svg

This file was deleted.

11 changes: 8 additions & 3 deletions Base.lproj/MainMenu.xib
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<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="22505"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
Expand All @@ -22,6 +22,12 @@
<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>
Expand Down Expand Up @@ -49,7 +55,6 @@
</connections>
</menuItem>
</items>
<point key="canvasLocation" x="102.5" y="-74.5"/>
</menu>
<customObject id="772" userLabel="Updater" customClass="SUUpdater"/>
</objects>
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
Loading

0 comments on commit d138f90

Please sign in to comment.