Skip to content

fix: 检查遗漏的旧app图标，换用新版TriFecta app图标并取消输入方案设置页下的注释。 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thesadbee merged 1 commit into from
Aug 31, 2026
Merged

fix: 检查遗漏的旧app图标，换用新版TriFecta app图标并取消输入方案设置页下的注释。 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions Rime.icon/Assets/logo.svg
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions Rime.icon/icon.json
View file
Open in desktop

This file was deleted.

12 changes: 4 additions & 8 deletions Squirrel.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
B397712F2BEECBED0093A49B /* Main.swift in Sources */ = {isa = PBXBuildFile; fileRef = B397712E2BEECBED0093A49B /* Main.swift */; };
B39771312BEEE4540093A49B /* InfoPlist.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B39771302BEEE4540093A49B /* InfoPlist.xcstrings */; };
B39771332BEEE4540093A49B /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B39771322BEEE4540093A49B /* Localizable.xcstrings */; };
B3EF08EA2F17125E00433A45 /* Rime.icon in Resources */ = {isa = PBXBuildFile; fileRef = B3EF08E92F17125E00433A45 /* Rime.icon */; };
B3EF08EC2F17125E00433A45 /* RimeIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = B3EF08EB2F17125E00433A45 /* RimeIcon.icns */; };
D26434552706A15100857391 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D26434542706A15100857391 /* QuartzCore.framework */; };
E93074B70A5C264700470842 /* InputMethodKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E93074B60A5C264700470842 /* InputMethodKit.framework */; };
F45E005F2B8CA81C00179B75 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F45E005E2B8CA81C00179B75 /* UserNotifications.framework */; };
Expand Down Expand Up @@ -337,7 +337,7 @@
B397712E2BEECBED0093A49B /* Main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Main.swift; path = sources/Main.swift; sourceTree = "<group>"; };
B39771302BEEE4540093A49B /* InfoPlist.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = InfoPlist.xcstrings; path = resources/InfoPlist.xcstrings; sourceTree = "<group>"; };
B39771322BEEE4540093A49B /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = Localizable.xcstrings; path = resources/Localizable.xcstrings; sourceTree = "<group>"; };
B3EF08E92F17125E00433A45 /* Rime.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = Rime.icon; sourceTree = "<group>"; };
B3EF08EB2F17125E00433A45 /* RimeIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = file.icns; name = RimeIcon.icns; path = resources/RimeIcon.icns; sourceTree = "<group>"; };
D26434542706A15100857391 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
E93074B60A5C264700470842 /* InputMethodKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InputMethodKit.framework; path = /System/Library/Frameworks/InputMethodKit.framework; sourceTree = "<absolute>"; };
F45E005E2B8CA81C00179B75 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -435,7 +435,7 @@
B32B80772BE7FAA200FCF3BC /* Squirrel.entitlements */,
B39771302BEEE4540093A49B /* InfoPlist.xcstrings */,
446C01D61F767BD400A6C23E /* Assets.xcassets */,
B3EF08E92F17125E00433A45 /* Rime.icon */,
B3EF08EB2F17125E00433A45 /* RimeIcon.icns */,
);
name = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -622,7 +622,7 @@
buildActionMask = 2147483647;
files = (
446C01D71F767BD400A6C23E /* Assets.xcassets in Resources */,
B3EF08EA2F17125E00433A45 /* Rime.icon in Resources */,
B3EF08EC2F17125E00433A45 /* RimeIcon.icns in Resources */,
B39771312BEEE4540093A49B /* InfoPlist.xcstrings in Resources */,
44986A95184B421700B3278D /* LICENSE.txt in Resources */,
B39771332BEEE4540093A49B /* Localizable.xcstrings in Resources */,
Expand Down Expand Up @@ -658,7 +658,6 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = Rime;
ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_FRAMEWORKS = AppKit;
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -715,7 +714,6 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = Rime;
ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOL_FRAMEWORKS = AppKit;
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -770,7 +768,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = RimeIcon;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand Down Expand Up @@ -829,7 +826,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_APPICON_NAME = RimeIcon;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand Down
Binary file added resources/RimeIcon.icns
View file
Open in desktop
Binary file not shown.
16 changes: 13 additions & 3 deletions settings/Sources/TriFectaSettings/Pages/AboutPage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,19 @@ struct AboutPage: View {
PageScroll(title: "关于", footer: "TriFecta：基于 Rime/Squirrel 的 macOS 中文输入法（GPL-3.0）") {
SettingCard {
VStack(spacing: 10) {
Image(systemName: "character.book.closed.fill")
.font(.system(size: 44))
.foregroundColor(theme.accent)
Group {
if let iconURL = Bundle.main.url(forResource: "AppIcon", withExtension: "icns"),
let appIcon = NSImage(contentsOf: iconURL) {
Image(nsImage: appIcon)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 64, height: 64)
} else {
Image(systemName: "character.book.closed.fill")
.font(.system(size: 44))
.foregroundColor(theme.accent)
}
}
Text("TriFecta")
.font(.system(size: 22, weight: .semibold))
.foregroundColor(theme.accent)
Expand Down
6 changes: 0 additions & 6 deletions settings/Sources/TriFectaSettings/Pages/InputPage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,6 @@ struct InputPage: View {
VStack(alignment: .leading, spacing: 1) {
Text(schemaName(id))
.font(.system(size: 13, weight: isDefault ? .semibold : .regular))
Text(id)
.font(.system(size: 10, design: .monospaced))
.foregroundColor(.secondary)
}
Spacer()
if isDefault {
Expand Down Expand Up @@ -347,9 +344,6 @@ struct AddSchemaSheet: View {
Text(schema.displayName)
.font(.system(size: 12, weight: .medium))
.foregroundColor(enabled ? .secondary : .primary)
Text(schema.id)
.font(.system(size: 9, design: .monospaced))
.foregroundColor(.secondary)
}
Spacer()
if enabled {
Expand Down
2 changes: 1 addition & 1 deletion settings/scripts/build-app.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ BIN="$(swift build -c "$CONFIG" --scratch-path "$SCRATCH" --show-bin-path)/TriFe
cp "$BIN" "$STAGE/Contents/MacOS/TriFectaSettings"
cp "Sources/TriFectaSettings/Resources/Info.plist" "$STAGE/Contents/Info.plist"

ICON_SRC="/Library/Input Methods/Squirrel.app/Contents/Resources/Rime.icns"
ICON_SRC="/Library/Input Methods/Squirrel.app/Contents/Resources/RimeIcon.icns"
if [ -f "$ICON_SRC" ]; then
cp "$ICON_SRC" "$STAGE/Contents/Resources/AppIcon.icns"
else
Expand Down
Loading