diff --git a/.gitignore b/.gitignore index 7a58e2cf8..77dc6e322 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ Squirrel.xcodeproj/project.xcworkspace/ Squirrel.xcodeproj/xcuserdata/ build/ build.log +Frameworks/* bin/* lib/* data/opencc/ diff --git a/.gitmodules b/.gitmodules index 253b9170d..374aee36a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,3 +5,6 @@ [submodule "plum"] path = plum url = https://github.com/rime/plum.git +[submodule "Sparkle"] + path = Sparkle + url = https://github.com/sparkle-project/Sparkle diff --git a/Assets.xcassets/RimeIcon.appiconset/Contents.json b/Assets.xcassets/RimeIcon.appiconset/Contents.json index 9c932cf63..acfdfc399 100644 --- a/Assets.xcassets/RimeIcon.appiconset/Contents.json +++ b/Assets.xcassets/RimeIcon.appiconset/Contents.json @@ -1,13 +1,13 @@ { "images" : [ { - "filename" : "rime-small-16.png", + "filename" : "rime-16 1.png", "idiom" : "mac", "scale" : "1x", "size" : "16x16" }, { - "filename" : "rime-small-32.png", + "filename" : "rime-32 1.png", "idiom" : "mac", "scale" : "2x", "size" : "16x16" diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-1024.png b/Assets.xcassets/RimeIcon.appiconset/rime-1024.png index dd5c1034f..7d21cc7c9 100644 Binary files a/Assets.xcassets/RimeIcon.appiconset/rime-1024.png and b/Assets.xcassets/RimeIcon.appiconset/rime-1024.png differ diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-128.png b/Assets.xcassets/RimeIcon.appiconset/rime-128.png index c72553ff4..c24666c32 100644 Binary files a/Assets.xcassets/RimeIcon.appiconset/rime-128.png and b/Assets.xcassets/RimeIcon.appiconset/rime-128.png differ diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-16 1.png b/Assets.xcassets/RimeIcon.appiconset/rime-16 1.png new file mode 100644 index 000000000..119930f70 Binary files /dev/null and b/Assets.xcassets/RimeIcon.appiconset/rime-16 1.png differ diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-256.png b/Assets.xcassets/RimeIcon.appiconset/rime-256.png index a70083d6d..e12ead07c 100644 Binary files a/Assets.xcassets/RimeIcon.appiconset/rime-256.png and b/Assets.xcassets/RimeIcon.appiconset/rime-256.png differ diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-32 1.png b/Assets.xcassets/RimeIcon.appiconset/rime-32 1.png new file mode 100644 index 000000000..0c358b5ba Binary files /dev/null and b/Assets.xcassets/RimeIcon.appiconset/rime-32 1.png differ diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-32.png b/Assets.xcassets/RimeIcon.appiconset/rime-32.png index f57fc500e..0c358b5ba 100644 Binary files a/Assets.xcassets/RimeIcon.appiconset/rime-32.png and b/Assets.xcassets/RimeIcon.appiconset/rime-32.png differ diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-512.png b/Assets.xcassets/RimeIcon.appiconset/rime-512.png index 927c419d3..a0c224363 100644 Binary files a/Assets.xcassets/RimeIcon.appiconset/rime-512.png and b/Assets.xcassets/RimeIcon.appiconset/rime-512.png differ diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-64.png b/Assets.xcassets/RimeIcon.appiconset/rime-64.png index ef8c0959f..565b945da 100644 Binary files a/Assets.xcassets/RimeIcon.appiconset/rime-64.png and b/Assets.xcassets/RimeIcon.appiconset/rime-64.png differ diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-small-16.png b/Assets.xcassets/RimeIcon.appiconset/rime-small-16.png deleted file mode 100644 index 570edc61a..000000000 Binary files a/Assets.xcassets/RimeIcon.appiconset/rime-small-16.png and /dev/null differ diff --git a/Assets.xcassets/RimeIcon.appiconset/rime-small-32.png b/Assets.xcassets/RimeIcon.appiconset/rime-small-32.png deleted file mode 100644 index 1c1d3513f..000000000 Binary files a/Assets.xcassets/RimeIcon.appiconset/rime-small-32.png and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Headers b/Frameworks/Sparkle.framework/Headers deleted file mode 120000 index a177d2a6b..000000000 --- a/Frameworks/Sparkle.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/Frameworks/Sparkle.framework/Modules b/Frameworks/Sparkle.framework/Modules deleted file mode 120000 index 5736f3186..000000000 --- a/Frameworks/Sparkle.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/Frameworks/Sparkle.framework/PrivateHeaders b/Frameworks/Sparkle.framework/PrivateHeaders deleted file mode 120000 index d8e564526..000000000 --- a/Frameworks/Sparkle.framework/PrivateHeaders +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/PrivateHeaders \ No newline at end of file diff --git a/Frameworks/Sparkle.framework/Resources b/Frameworks/Sparkle.framework/Resources deleted file mode 120000 index 953ee36f3..000000000 --- a/Frameworks/Sparkle.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/Frameworks/Sparkle.framework/Sparkle b/Frameworks/Sparkle.framework/Sparkle deleted file mode 120000 index b2c52731e..000000000 --- a/Frameworks/Sparkle.framework/Sparkle +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Sparkle \ No newline at end of file diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h deleted file mode 100644 index 41cd57434..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h +++ /dev/null @@ -1,43 +0,0 @@ -// -// SPUDownloadData.h -// Sparkle -// -// Created by Mayur Pawashe on 8/10/16. -// Copyright © 2016 Sparkle Project. All rights reserved. -// - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif - -#import "SUExport.h" - -NS_ASSUME_NONNULL_BEGIN - -/*! - * A class for containing downloaded data along with some information about it. - */ -SU_EXPORT @interface SPUDownloadData : NSObject - -- (instancetype)initWithData:(NSData *)data textEncodingName:(NSString * _Nullable)textEncodingName MIMEType:(NSString * _Nullable)MIMEType; - -/*! - * The raw data that was downloaded. - */ -@property (nonatomic, readonly) NSData *data; - -/*! - * The IANA charset encoding name if available. Eg: "utf-8" - */ -@property (nonatomic, readonly, nullable, copy) NSString *textEncodingName; - -/*! - * The MIME type if available. Eg: "text/plain" - */ -@property (nonatomic, readonly, nullable, copy) NSString *MIMEType; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloader.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloader.h deleted file mode 100644 index 5eee9bd5e..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloader.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// SPUDownloader.h -// Downloader -// -// Created by Mayur Pawashe on 4/1/16. -// Copyright © 2016 Sparkle Project. All rights reserved. -// - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif -#import "SPUDownloaderProtocol.h" - -@protocol SPUDownloaderDelegate; - -// This object implements the protocol which we have defined. It provides the actual behavior for the service. It is 'exported' by the service to make it available to the process hosting the service over an NSXPCConnection. -@interface SPUDownloader : NSObject - -// Due to XPC remote object reasons, this delegate is strongly referenced -// Invoke cleanup when done with this instance -- (instancetype)initWithDelegate:(id )delegate; - -@end diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h deleted file mode 100644 index 76e7e750a..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// SPUDownloaderDelegate.h -// Sparkle -// -// Created by Mayur Pawashe on 4/1/16. -// Copyright © 2016 Sparkle Project. All rights reserved. -// - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif - -NS_ASSUME_NONNULL_BEGIN - -@class SPUDownloadData; - -@protocol SPUDownloaderDelegate - -// This is only invoked for persistent downloads -- (void)downloaderDidSetDestinationName:(NSString *)destinationName temporaryDirectory:(NSString *)temporaryDirectory; - -// Under rare cases, this may be called more than once, in which case the current progress should be reset back to 0 -// This is only invoked for persistent downloads -- (void)downloaderDidReceiveExpectedContentLength:(int64_t)expectedContentLength; - -// This is only invoked for persistent downloads -- (void)downloaderDidReceiveDataOfLength:(uint64_t)length; - -// downloadData is nil if this is a persisent download, otherwise it's non-nil if it's a temporary download -- (void)downloaderDidFinishWithTemporaryDownloadData:(SPUDownloadData * _Nullable)downloadData; - -- (void)downloaderDidFailWithError:(NSError *)error; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h deleted file mode 100644 index 36302df48..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// SPUDownloaderDeprecated.h -// Sparkle -// -// Created by Deadpikle on 12/20/17. -// Copyright © 2017 Sparkle Project. All rights reserved. -// - -#import "SPUDownloader.h" - -@interface SPUDownloaderDeprecated : SPUDownloader - -@end diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h deleted file mode 100644 index ebe477fe7..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// SPUDownloaderProtocol.h -// PersistentDownloader -// -// Created by Mayur Pawashe on 4/1/16. -// Copyright © 2016 Sparkle Project. All rights reserved. -// - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif - -NS_ASSUME_NONNULL_BEGIN - -@class SPUURLRequest; - -// The protocol that this service will vend as its API. This header file will also need to be visible to the process hosting the service. -@protocol SPUDownloaderProtocol - -- (void)startPersistentDownloadWithRequest:(SPUURLRequest *)request bundleIdentifier:(NSString *)bundleIdentifier desiredFilename:(NSString *)desiredFilename; - -- (void)startTemporaryDownloadWithRequest:(SPUURLRequest *)request; - -- (void)downloadDidFinish; - -- (void)cleanup; - -- (void)cancel; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h deleted file mode 100644 index 4bde75aac..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// SPUDownloaderSession.h -// Sparkle -// -// Created by Deadpikle on 12/20/17. -// Copyright © 2017 Sparkle Project. All rights reserved. -// - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif -#import "SPUDownloader.h" -#import "SPUDownloaderProtocol.h" - -NS_CLASS_AVAILABLE(NSURLSESSION_AVAILABLE, 7_0) -@interface SPUDownloaderSession : SPUDownloader - -@end diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h deleted file mode 100644 index 694961470..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// SPUURLRequest.h -// Sparkle -// -// Created by Mayur Pawashe on 5/19/16. -// Copyright © 2016 Sparkle Project. All rights reserved. -// - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif - -NS_ASSUME_NONNULL_BEGIN - -// A class that wraps NSURLRequest and implements NSSecureCoding -// This class exists because NSURLRequest did not support NSSecureCoding in macOS 10.8 -// I have not verified if NSURLRequest in 10.9 implements NSSecureCoding or not -@interface SPUURLRequest : NSObject - -// Creates a new URL request -// Only these properties are currently tracked: -// * URL -// * Cache policy -// * Timeout interval -// * HTTP header fields -// * networkServiceType -+ (instancetype)URLRequestWithRequest:(NSURLRequest *)request; - -@property (nonatomic, readonly) NSURLRequest *request; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h deleted file mode 100644 index 34276b7da..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// SUAppcast.h -// Sparkle -// -// Created by Andy Matuschak on 3/12/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUAPPCAST_H -#define SUAPPCAST_H - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif -#import "SUExport.h" - -NS_ASSUME_NONNULL_BEGIN - -@class SUAppcastItem; -SU_EXPORT @interface SUAppcast : NSObject - -@property (copy, nullable) NSString *userAgentString; -@property (copy, nullable) NSDictionary *httpHeaders; - -- (void)fetchAppcastFromURL:(NSURL *)url inBackground:(BOOL)bg completionBlock:(void (^)(NSError *_Nullable))err; -- (SUAppcast *)copyWithoutDeltaUpdates; - -@property (readonly, copy, nullable) NSArray *items; -@end - -NS_ASSUME_NONNULL_END - -#endif diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h deleted file mode 100644 index 1d8b1d01f..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h +++ /dev/null @@ -1,54 +0,0 @@ -// -// SUAppcastItem.h -// Sparkle -// -// Created by Andy Matuschak on 3/12/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUAPPCASTITEM_H -#define SUAPPCASTITEM_H - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif -#import "SUExport.h" -@class SUSignatures; - -SU_EXPORT @interface SUAppcastItem : NSObject -@property (copy, readonly) NSString *title; -@property (copy, readonly) NSString *dateString; -@property (copy, readonly) NSDate *date; -@property (copy, readonly) NSString *itemDescription; -@property (strong, readonly) NSURL *releaseNotesURL; -@property (strong, readonly) SUSignatures *signatures; -@property (copy, readonly) NSString *minimumSystemVersion; -@property (copy, readonly) NSString *maximumSystemVersion; -@property (strong, readonly) NSURL *fileURL; -@property (nonatomic, readonly) uint64_t contentLength; -@property (copy, readonly) NSString *versionString; -@property (copy, readonly) NSString *osString; -@property (copy, readonly) NSString *displayVersionString; -@property (copy, readonly) NSDictionary *deltaUpdates; -@property (strong, readonly) NSURL *infoURL; -@property (copy, readonly) NSNumber* phasedRolloutInterval; - -// Initializes with data from a dictionary provided by the RSS class. -- (instancetype)initWithDictionary:(NSDictionary *)dict; -- (instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString **)error; - -@property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate; -@property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate; -@property (getter=isMacOsUpdate, readonly) BOOL macOsUpdate; -@property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate; - -// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions. -@property (readonly, copy) NSDictionary *propertiesDictionary; - -- (NSURL *)infoURL; - -@end - -#endif diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h deleted file mode 100644 index 3756a3781..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// SUCodeSigningVerifier.h -// Sparkle -// -// Created by Andy Matuschak on 7/5/12. -// -// - -#ifndef SUCODESIGNINGVERIFIER_H -#define SUCODESIGNINGVERIFIER_H - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif -#import "SUExport.h" - -SU_EXPORT @interface SUCodeSigningVerifier : NSObject -+ (BOOL)codeSignatureAtBundleURL:(NSURL *)oldBundlePath matchesSignatureAtBundleURL:(NSURL *)newBundlePath error:(NSError **)error; -+ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)bundlePath error:(NSError **)error; -+ (BOOL)bundleAtURLIsCodeSigned:(NSURL *)bundlePath; -+ (NSDictionary *)codeSignatureInfoAtBundleURL:(NSURL *)bundlePath; -@end - -#endif diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUErrors.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUErrors.h deleted file mode 100644 index 4b160c4f4..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUErrors.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// SUErrors.h -// Sparkle -// -// Created by C.W. Betts on 10/13/14. -// Copyright (c) 2014 Sparkle Project. All rights reserved. -// - -#ifndef SUERRORS_H -#define SUERRORS_H - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif -#import "SUExport.h" - -/** - * Error domain used by Sparkle - */ -SU_EXPORT extern NSString *const SUSparkleErrorDomain; - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wc++98-compat" -typedef NS_ENUM(OSStatus, SUError) { - // Appcast phase errors. - SUAppcastParseError = 1000, - SUNoUpdateError = 1001, - SUAppcastError = 1002, - SURunningFromDiskImageError = 1003, - SURunningTranslocated = 1004, - - // Download phase errors. - SUTemporaryDirectoryError = 2000, - SUDownloadError = 2001, - - // Extraction phase errors. - SUUnarchivingError = 3000, - SUSignatureError = 3001, - - // Installation phase errors. - SUFileCopyFailure = 4000, - SUAuthenticationFailure = 4001, - SUMissingUpdateError = 4002, - SUMissingInstallerToolError = 4003, - SURelaunchError = 4004, - SUInstallationError = 4005, - SUDowngradeError = 4006, - SUInstallationCancelledError = 4007, - - // System phase errors - SUSystemPowerOffError = 5000 -}; -#pragma clang diagnostic pop - -#endif diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUExport.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUExport.h deleted file mode 100644 index 3e3f8a164..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUExport.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// SUExport.h -// Sparkle -// -// Created by Jake Petroules on 2014-08-23. -// Copyright (c) 2014 Sparkle Project. All rights reserved. -// - -#ifndef SUEXPORT_H -#define SUEXPORT_H - -#ifdef BUILDING_SPARKLE -#define SU_EXPORT __attribute__((visibility("default"))) -#else -#define SU_EXPORT -#endif - -#endif diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h deleted file mode 100644 index ed11921a5..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h +++ /dev/null @@ -1,52 +0,0 @@ -// -// SUStandardVersionComparator.h -// Sparkle -// -// Created by Andy Matuschak on 12/21/07. -// Copyright 2007 Andy Matuschak. All rights reserved. -// - -#ifndef SUSTANDARDVERSIONCOMPARATOR_H -#define SUSTANDARDVERSIONCOMPARATOR_H - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif -#import "SUExport.h" -#import "SUVersionComparisonProtocol.h" - -NS_ASSUME_NONNULL_BEGIN - -/*! - Sparkle's default version comparator. - - This comparator is adapted from MacPAD, by Kevin Ballard. - It's "dumb" in that it does essentially string comparison, - in components split by character type. -*/ -SU_EXPORT @interface SUStandardVersionComparator : NSObject - -/*! - Initializes a new instance of the standard version comparator. - */ -- (instancetype)init; - -/*! - Returns a singleton instance of the comparator. - - It is usually preferred to alloc/init new a comparator instead. -*/ -+ (SUStandardVersionComparator *)defaultComparator; - -/*! - Compares version strings through textual analysis. - - See the implementation for more details. -*/ -- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; -@end - -NS_ASSUME_NONNULL_END -#endif diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h deleted file mode 100644 index d05270f23..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h +++ /dev/null @@ -1,233 +0,0 @@ -// -// SUUpdater.h -// Sparkle -// -// Created by Andy Matuschak on 1/4/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUUPDATER_H -#define SUUPDATER_H - -#if __has_feature(modules) -@import Cocoa; -#else -#import -#endif -#import "SUExport.h" -#import "SUVersionComparisonProtocol.h" -#import "SUVersionDisplayProtocol.h" - -@class SUAppcastItem, SUAppcast; - -@protocol SUUpdaterDelegate; - -/*! - The main API in Sparkle for controlling the update mechanism. - - This class is used to configure the update paramters as well as manually - and automatically schedule and control checks for updates. - */ -SU_EXPORT @interface SUUpdater : NSObject - -@property (unsafe_unretained) IBOutlet id delegate; - -/*! - The shared updater for the main bundle. - - This is equivalent to passing [NSBundle mainBundle] to SUUpdater::updaterForBundle: - */ -+ (SUUpdater *)sharedUpdater; - -/*! - The shared updater for a specified bundle. - - If an updater has already been initialized for the provided bundle, that shared instance will be returned. - */ -+ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; - -/*! - Designated initializer for SUUpdater. - - If an updater has already been initialized for the provided bundle, that shared instance will be returned. - */ -- (instancetype)initForBundle:(NSBundle *)bundle; - -/*! - Explicitly checks for updates and displays a progress dialog while doing so. - - This method is meant for a main menu item. - Connect any menu item to this action in Interface Builder, - and Sparkle will check for updates and report back its findings verbosely - when it is invoked. - - This will find updates that the user has opted into skipping. - */ -- (IBAction)checkForUpdates:(id)sender; - -/*! - The menu item validation used for the -checkForUpdates: action - */ -- (BOOL)validateMenuItem:(NSMenuItem *)menuItem; - -/*! - Checks for updates, but does not display any UI unless an update is found. - - This is meant for programmatically initating a check for updates. That is, - it will display no UI unless it actually finds an update, in which case it - proceeds as usual. - - If automatic downloading of updates it turned on and allowed, however, - this will invoke that behavior, and if an update is found, it will be downloaded - in the background silently and will be prepped for installation. - - This will not find updates that the user has opted into skipping. - */ -- (void)checkForUpdatesInBackground; - -/*! - A property indicating whether or not to check for updates automatically. - - Setting this property will persist in the host bundle's user defaults. - The update schedule cycle will be reset in a short delay after the property's new value is set. - This is to allow reverting this property without kicking off a schedule change immediately - */ -@property BOOL automaticallyChecksForUpdates; - -/*! - A property indicating whether or not updates can be automatically downloaded in the background. - - Note that automatic downloading of updates can be disallowed by the developer - or by the user's system if silent updates cannot be done (eg: if they require authentication). - In this case, -automaticallyDownloadsUpdates will return NO regardless of how this property is set. - - Setting this property will persist in the host bundle's user defaults. - */ -@property BOOL automaticallyDownloadsUpdates; - -/*! - A property indicating the current automatic update check interval. - - Setting this property will persist in the host bundle's user defaults. - The update schedule cycle will be reset in a short delay after the property's new value is set. - This is to allow reverting this property without kicking off a schedule change immediately - */ -@property NSTimeInterval updateCheckInterval; - -/*! - Begins a "probing" check for updates which will not actually offer to - update to that version. - - However, the delegate methods - SUUpdaterDelegate::updater:didFindValidUpdate: and - SUUpdaterDelegate::updaterDidNotFindUpdate: will be called, - so you can use that information in your UI. - - Updates that have been skipped by the user will not be found. - */ -- (void)checkForUpdateInformation; - -/*! - The URL of the appcast used to download update information. - - Setting this property will persist in the host bundle's user defaults. - If you don't want persistence, you may want to consider instead implementing - SUUpdaterDelegate::feedURLStringForUpdater: or SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile: - - This property must be called on the main thread. - */ -@property (copy) NSURL *feedURL; - -/*! - The host bundle that is being updated. - */ -@property (readonly, strong) NSBundle *hostBundle; - -/*! - The bundle this class (SUUpdater) is loaded into. - */ -@property (strong, readonly) NSBundle *sparkleBundle; - -/*! - The user agent used when checking for updates. - - The default implementation can be overrided. - */ -@property (nonatomic, copy) NSString *userAgentString; - -/*! - The HTTP headers used when checking for updates. - - The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString) - */ -@property (copy) NSDictionary *httpHeaders; - -/*! - A property indicating whether or not the user's system profile information is sent when checking for updates. - - Setting this property will persist in the host bundle's user defaults. - */ -@property BOOL sendsSystemProfile; - -/*! - A property indicating the decryption password used for extracting updates shipped as Apple Disk Images (dmg) - */ -@property (nonatomic, copy) NSString *decryptionPassword; - -/*! - This function ignores normal update schedule, ignores user preferences, - and interrupts users with an unwanted immediate app update. - - WARNING: this function should not be used in regular apps. This function - is a user-unfriendly hack only for very special cases, like unstable - rapidly-changing beta builds that would not run correctly if they were - even one day out of date. - - Instead of this function you should set `SUAutomaticallyUpdate` to `YES`, - which will gracefully install updates when the app quits. - - For UI-less/daemon apps that aren't usually quit, instead of this function, - you can use the delegate method - SUUpdaterDelegate::updater:willInstallUpdateOnQuit:immediateInstallationInvocation: - or - SUUpdaterDelegate::updater:willInstallUpdateOnQuit:immediateInstallationBlock: - to immediately start installation when an update was found. - - A progress dialog is shown but the user will never be prompted to read the - release notes. - - This function will cause update to be downloaded twice if automatic updates are - enabled. - - You may want to respond to the userDidCancelDownload delegate method in case - the user clicks the "Cancel" button while the update is downloading. - */ -- (void)installUpdatesIfAvailable; - -/*! - Returns the date of last update check. - - \returns \c nil if no check has been performed. - */ -@property (readonly, copy) NSDate *lastUpdateCheckDate; - -/*! - Appropriately schedules or cancels the update checking timer according to - the preferences for time interval and automatic checks. - - This call does not change the date of the next check, - but only the internal NSTimer. - */ -- (void)resetUpdateCycle; - -/*! - A property indicating whether or not an update is in progress. - - Note this property is not indicative of whether or not user initiated updates can be performed. - Use SUUpdater::validateMenuItem: for that instead. - */ -@property (readonly) BOOL updateInProgress; - -@end - -#endif diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h deleted file mode 100644 index ec844d046..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h +++ /dev/null @@ -1,352 +0,0 @@ -// -// SUUpdaterDelegate.h -// Sparkle -// -// Created by Mayur Pawashe on 12/25/16. -// Copyright © 2016 Sparkle Project. All rights reserved. -// - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif - -#import "SUExport.h" - -@protocol SUVersionComparison, SUVersionDisplay; -@class SUUpdater, SUAppcast, SUAppcastItem; - -NS_ASSUME_NONNULL_BEGIN - -// ----------------------------------------------------------------------------- -// SUUpdater Notifications for events that might be interesting to more than just the delegate -// The updater will be the notification object -// ----------------------------------------------------------------------------- -SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification; -SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification; -SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification; -SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification; -#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification; -#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification; - -// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo -SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey; -// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo -SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey; - -// ----------------------------------------------------------------------------- -// SUUpdater Delegate: -// ----------------------------------------------------------------------------- - -/*! - Provides methods to control the behavior of an SUUpdater object. - */ -@protocol SUUpdaterDelegate -@optional - -/*! - Returns whether to allow Sparkle to pop up. - - For example, this may be used to prevent Sparkle from interrupting a setup assistant. - - \param updater The SUUpdater instance. - */ -- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater; - -/*! - Returns additional parameters to append to the appcast URL's query string. - - This is potentially based on whether or not Sparkle will also be sending along the system profile. - - \param updater The SUUpdater instance. - \param sendingProfile Whether the system profile will also be sent. - - \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. - */ -- (NSArray *> *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; - -/*! - Returns a custom appcast URL. - - Override this to dynamically specify the entire URL. - - An alternative may be to use SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile: - and let the server handle what kind of feed to provide. - - \param updater The SUUpdater instance. - */ -- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater; - -/*! - Returns whether Sparkle should prompt the user about automatic update checks. - - Use this to override the default behavior. - - \param updater The SUUpdater instance. - */ -- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater; - -/*! - Called after Sparkle has downloaded the appcast from the remote server. - - Implement this if you want to do some special handling with the appcast once it finishes loading. - - \param updater The SUUpdater instance. - \param appcast The appcast that was downloaded from the remote server. - */ -- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; - -/*! - Returns the item in the appcast corresponding to the update that should be installed. - - If you're using special logic or extensions in your appcast, - implement this to use your own logic for finding a valid update, if any, - in the given appcast. - - \param appcast The appcast that was downloaded from the remote server. - \param updater The SUUpdater instance. - */ -- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater; - -/*! - Called when a valid update is found by the update driver. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that is proposed to be installed. - */ -- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item; - -/*! - Called just before the scheduled update driver prompts the user to install an update. - - \param updater The SUUpdater instance. - - \return YES to allow the update prompt to be shown (the default behavior), or NO to suppress it. - */ -- (BOOL)updaterShouldShowUpdateAlertForScheduledUpdate:(SUUpdater *)updater forItem:(SUAppcastItem *)item; - -/*! - Called after the user dismisses the update alert. - - \param updater The SUUpdater instance. - \param permanently YES if the alert will not appear again for this update; NO if it may reappear. - */ -- (void)updater:(SUUpdater *)updater didDismissUpdateAlertPermanently:(BOOL)permanently forItem:(SUAppcastItem *)item; - -/*! - Called when a valid update is not found. - - \param updater The SUUpdater instance. - */ -- (void)updaterDidNotFindUpdate:(SUUpdater *)updater; - -/*! - Called when the user clicks the Skip This Version button. - - \param updater The SUUpdater instance. - */ -- (void)updater:(SUUpdater *)updater userDidSkipThisVersion:(SUAppcastItem *)item; - -/*! - Called immediately before downloading the specified update. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that is proposed to be downloaded. - \param request The mutable URL request that will be used to download the update. - */ -- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request; - -/*! - Called immediately after succesfull download of the specified update. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that has been downloaded. - */ -- (void)updater:(SUUpdater *)updater didDownloadUpdate:(SUAppcastItem *)item; - -/*! - Called after the specified update failed to download. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that failed to download. - \param error The error generated by the failed download. - */ -- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error; - -/*! - Called when the user clicks the cancel button while and update is being downloaded. - - \param updater The SUUpdater instance. - */ -- (void)userDidCancelDownload:(SUUpdater *)updater; - -/*! - Called immediately before extracting the specified downloaded update. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that is proposed to be extracted. - */ -- (void)updater:(SUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item; - -/*! - Called immediately after extracting the specified downloaded update. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that has been extracted. - */ -- (void)updater:(SUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item; - -/*! - Called immediately before installing the specified update. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that is proposed to be installed. - */ -- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item; - -/*! - Returns whether the relaunch should be delayed in order to perform other tasks. - - This is not called if the user didn't relaunch on the previous update, - in that case it will immediately restart. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that is proposed to be installed. - \param invocation The invocation that must be completed with `[invocation invoke]` before continuing with the relaunch. - - \return \c YES to delay the relaunch until \p invocation is invoked. - */ -- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation; - -/*! - Returns whether the relaunch should be delayed in order to perform other tasks. - - This is not called if the user didn't relaunch on the previous update, - in that case it will immediately restart. - - This method acts as a simpler alternative to SUUpdaterDelegate::updater:shouldPostponeRelaunchForUpdate:untilInvoking: avoiding usage of NSInvocation, which is not available in Swift environments. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that is proposed to be installed. - - \return \c YES to delay the relaunch. - */ -- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item; - -/*! - Returns whether the application should be relaunched at all. - - Some apps \b cannot be relaunched under certain circumstances. - This method can be used to explicitly prevent a relaunch. - - \param updater The SUUpdater instance. - */ -- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater; - -/*! - Called immediately before relaunching. - - \param updater The SUUpdater instance. - */ -- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; - -/*! - Called immediately after relaunching. SUUpdater delegate must be set before applicationDidFinishLaunching: to catch this event. - - \param updater The SUUpdater instance. - */ -- (void)updaterDidRelaunchApplication:(SUUpdater *)updater; - -/*! - Returns an object that compares version numbers to determine their arithmetic relation to each other. - - This method allows you to provide a custom version comparator. - If you don't implement this method or return \c nil, - the standard version comparator will be used. - - \sa SUStandardVersionComparator - - \param updater The SUUpdater instance. - */ -- (nullable id)versionComparatorForUpdater:(SUUpdater *)updater; - -/*! - Returns an object that formats version numbers for display to the user. - - If you don't implement this method or return \c nil, - the standard version formatter will be used. - - \sa SUUpdateAlert - - \param updater The SUUpdater instance. - */ -- (nullable id)versionDisplayerForUpdater:(SUUpdater *)updater; - -/*! - Returns the path which is used to relaunch the client after the update is installed. - - The default is the path of the host bundle. - - \param updater The SUUpdater instance. - */ -- (nullable NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; - -/*! - Called before an updater shows a modal alert window, - to give the host the opportunity to hide attached windows that may get in the way. - - \param updater The SUUpdater instance. - */ -- (void)updaterWillShowModalAlert:(SUUpdater *)updater; - -/*! - Called after an updater shows a modal alert window, - to give the host the opportunity to hide attached windows that may get in the way. - - \param updater The SUUpdater instance. - */ -- (void)updaterDidShowModalAlert:(SUUpdater *)updater; - -/*! - Called when an update is scheduled to be silently installed on quit. - This is after an update has been automatically downloaded in the background. - (i.e. SUUpdater::automaticallyDownloadsUpdates is YES) - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that is proposed to be installed. - \param invocation Can be used to trigger an immediate silent install and relaunch. - */ -- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation; - -/*! - Called when an update is scheduled to be silently installed on quit. - This is after an update has been automatically downloaded in the background. - (i.e. SUUpdater::automaticallyDownloadsUpdates is YES) - This method acts as a more modern alternative to SUUpdaterDelegate::updater:willInstallUpdateOnQuit:immediateInstallationInvocation: using a block instead of NSInvocation, which is not available in Swift environments. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that is proposed to be installed. - \param installationBlock Can be used to trigger an immediate silent install and relaunch. - */ -- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationBlock:(void (^)(void))installationBlock; - -/*! - Calls after an update that was scheduled to be silently installed on quit has been canceled. - - \param updater The SUUpdater instance. - \param item The appcast item corresponding to the update that was proposed to be installed. - */ -- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item; - -/*! - Called after an update is aborted due to an error. - - \param updater The SUUpdater instance. - \param error The error that caused the abort - */ -- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h deleted file mode 100644 index c654fc4d0..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// SUVersionComparisonProtocol.h -// Sparkle -// -// Created by Andy Matuschak on 12/21/07. -// Copyright 2007 Andy Matuschak. All rights reserved. -// - -#ifndef SUVERSIONCOMPARISONPROTOCOL_H -#define SUVERSIONCOMPARISONPROTOCOL_H - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif -#import "SUExport.h" - -NS_ASSUME_NONNULL_BEGIN - -/*! - Provides version comparison facilities for Sparkle. -*/ -@protocol SUVersionComparison - -/*! - An abstract method to compare two version strings. - - Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, - and NSOrderedSame if they are equivalent. -*/ -- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; // *** MAY BE CALLED ON NON-MAIN THREAD! - -@end - -NS_ASSUME_NONNULL_END -#endif diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h b/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h deleted file mode 100644 index 980efb3fe..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// SUVersionDisplayProtocol.h -// EyeTV -// -// Created by Uli Kusterer on 08.12.09. -// Copyright 2009 Elgato Systems GmbH. All rights reserved. -// - -#if __has_feature(modules) -@import Foundation; -#else -#import -#endif -#import "SUExport.h" - -/*! - Applies special display formatting to version numbers. -*/ -@protocol SUVersionDisplay - -/*! - Formats two version strings. - - Both versions are provided so that important distinguishing information - can be displayed while also leaving out unnecessary/confusing parts. -*/ -- (void)formatVersion:(NSString *_Nonnull*_Nonnull)inOutVersionA andVersion:(NSString *_Nonnull*_Nonnull)inOutVersionB; - -@end diff --git a/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h b/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h deleted file mode 100644 index 1085d419e..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h +++ /dev/null @@ -1,39 +0,0 @@ -// -// Sparkle.h -// Sparkle -// -// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07) -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SPARKLE_H -#define SPARKLE_H - -// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless -// there are name-space collisions) so we can list all of them to start with: - -#pragma clang diagnostic push -// Do not use <> style includes since 2.x has two frameworks that need to work: Sparkle and SparkleCore -#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header" - -#import "SUAppcast.h" -#import "SUAppcastItem.h" -#import "SUStandardVersionComparator.h" -#import "SUUpdater.h" -#import "SUUpdaterDelegate.h" -#import "SUVersionComparisonProtocol.h" -#import "SUVersionDisplayProtocol.h" -#import "SUErrors.h" - -#import "SPUDownloader.h" -#import "SPUDownloaderDelegate.h" -#import "SPUDownloaderDeprecated.h" -#import "SPUDownloadData.h" -#import "SPUDownloaderProtocol.h" -#import "SPUDownloaderSession.h" -#import "SPUURLRequest.h" -#import "SUCodeSigningVerifier.h" - -#pragma clang diagnostic pop - -#endif diff --git a/Frameworks/Sparkle.framework/Versions/A/Modules/module.modulemap b/Frameworks/Sparkle.framework/Versions/A/Modules/module.modulemap deleted file mode 100644 index af3fe6d05..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,6 +0,0 @@ -framework module Sparkle { - umbrella header "Sparkle.h" - - export * - module * { export * } -} diff --git a/Frameworks/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h b/Frameworks/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h deleted file mode 100644 index a52bf5a2d..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// SUUnarchiver.h -// Sparkle -// -// Created by Andy Matuschak on 3/16/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@protocol SUUnarchiverProtocol; - -@interface SUUnarchiver : NSObject - -+ (nullable id )unarchiverForPath:(NSString *)path updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist deleted file mode 100644 index 8a45abac0..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist +++ /dev/null @@ -1,56 +0,0 @@ - - - - - BuildMachineOSBuild - 20B28 - CFBundleDevelopmentRegion - English - CFBundleExecutable - Autoupdate - CFBundleIconFile - AppIcon.icns - CFBundleIdentifier - org.sparkle-project.Sparkle.Autoupdate - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.24.0 1-g489ae19e - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1.24.0 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 12C5020f - DTPlatformName - macosx - DTPlatformVersion - 11.1 - DTSDKBuild - 20C5048g - DTSDKName - macosx11.1 - DTXcode - 1230 - DTXcodeBuild - 12C5020f - LSBackgroundOnly - 1 - LSMinimumSystemVersion - 10.7 - LSUIElement - 1 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate deleted file mode 100755 index 664c194eb..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop deleted file mode 100755 index 5fcc19c7a..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo deleted file mode 100644 index bd04210fb..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns deleted file mode 100644 index 7f2a571c8..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib deleted file mode 100644 index f9c39a032..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings deleted file mode 100644 index e00af3413..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings deleted file mode 100644 index f2aea2755..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings deleted file mode 100644 index 02e077cf5..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings deleted file mode 100644 index e0957c601..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings deleted file mode 100644 index 202e70b73..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings deleted file mode 100644 index 6ef15d4a5..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings deleted file mode 100644 index 1d70063c3..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings deleted file mode 100644 index 8a083f86f..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings deleted file mode 100644 index 773f7c997..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings deleted file mode 100644 index 954abee05..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings deleted file mode 100644 index ce63fdef7..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings deleted file mode 100644 index ab8fe1a3e..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings deleted file mode 100644 index d30ef64bd..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings deleted file mode 100644 index 5f6ace28d..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings deleted file mode 100644 index 5b4be9ead..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings deleted file mode 100644 index f4685edad..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings deleted file mode 100644 index f008e1eee..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings deleted file mode 100644 index fa4cd97df..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings deleted file mode 100644 index 76f3556b8..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings deleted file mode 100644 index 4444f3384..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings deleted file mode 100644 index 2a7ce2991..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings deleted file mode 100644 index 18a287e80..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings deleted file mode 100644 index 967a44189..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings deleted file mode 100644 index 8a11ecf17..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings deleted file mode 100644 index 65aa28f2f..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings deleted file mode 100644 index caaf06030..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings deleted file mode 100644 index e7c70db71..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings deleted file mode 100644 index 058b4ba6a..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings deleted file mode 100644 index ffc576725..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings deleted file mode 100644 index 263326c98..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings deleted file mode 100644 index 71cf325f2..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings deleted file mode 100644 index b9517885b..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources b/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources deleted file mode 100644 index 845555e6d..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources +++ /dev/null @@ -1,860 +0,0 @@ - - - - - files - - Resources/AppIcon.icns - - 4McwRDEss5BzWwUMG2Xf93+ze08= - - Resources/SUStatus.nib - - ECVWRExfxyDt5uvKRD+70wc9J6s= - - Resources/ar.lproj/Sparkle.strings - - hash - - Rf4jjdgTqvfw5JO/6f9jHMURv/U= - - optional - - - Resources/ca.lproj/Sparkle.strings - - hash - - wGGx+QzPg/20zZTq7jwCTgf/Ubc= - - optional - - - Resources/cs.lproj/Sparkle.strings - - hash - - bY3rkqi/NJtXtjpK3FbV2o0gxbQ= - - optional - - - Resources/da.lproj/Sparkle.strings - - hash - - 0t7SuLDMBZVsY240PAEsVfH/1qw= - - optional - - - Resources/de.lproj/Sparkle.strings - - hash - - fsC7FJvExHE/2681tuUrjkSF2+A= - - optional - - - Resources/el.lproj/Sparkle.strings - - hash - - NbIN+TRHORCL5Gfj68VRq4KdPXo= - - optional - - - Resources/en.lproj/Sparkle.strings - - hash - - cHZov5FaqzfNhnBo0XdRuTMT4SY= - - optional - - - Resources/es.lproj/Sparkle.strings - - hash - - QPG88BN+x/l2Qk1NLLe3wRa26mQ= - - optional - - - Resources/fi.lproj/Sparkle.strings - - hash - - yd6pIoSj19HMDIUos4Td1Fch7bs= - - optional - - - Resources/fr.lproj/Sparkle.strings - - hash - - X3URilwJPVqMTGbtrYdorODwrMA= - - optional - - - Resources/he.lproj/Sparkle.strings - - hash - - U2WmlYGYmeeIlSW66R8awwmNXIE= - - optional - - - Resources/hr.lproj/Sparkle.strings - - hash - - 7LLOVs76ioMwEDV8Gah+6sV/5No= - - optional - - - Resources/hu.lproj/Sparkle.strings - - hash - - bNEmsO2LyUsMjTESH1I42V9sAOo= - - optional - - - Resources/is.lproj/Sparkle.strings - - hash - - 8fxzD9ZhrvIZVZB1+QSJaPzg80M= - - optional - - - Resources/it.lproj/Sparkle.strings - - hash - - bk1J6vpZjWeUFhBYWuWZf8TDv1A= - - optional - - - Resources/ja.lproj/Sparkle.strings - - hash - - f4EbR/GfMsKeWJ5DN/vhwg/lUoE= - - optional - - - Resources/ko.lproj/Sparkle.strings - - hash - - FRHRQPCWEk9GdJawYTuccg+E2tA= - - optional - - - Resources/nb.lproj/Sparkle.strings - - hash - - sgrDElwUxXtzdw8WaUFWyK3pG9Y= - - optional - - - Resources/nl.lproj/Sparkle.strings - - hash - - PWbC08zHFLROqivY2MAklDh6gkA= - - optional - - - Resources/pl.lproj/Sparkle.strings - - hash - - o7deBXE2Ct8/vQxouej5KkwTcUA= - - optional - - - Resources/pt_BR.lproj/Sparkle.strings - - hash - - /adUv04OXQkCFv+Oed6qktFVQ3E= - - optional - - - Resources/pt_PT.lproj/Sparkle.strings - - hash - - Mji9loJOJvuDY9hz3FhQ4H+HY5E= - - optional - - - Resources/ro.lproj/Sparkle.strings - - hash - - 9U+OTz29kXKZHY/nmvbtemMsB3g= - - optional - - - Resources/ru.lproj/Sparkle.strings - - hash - - VpSLGNvZ6sbRYsF23L8m6TG+P6E= - - optional - - - Resources/sk.lproj/Sparkle.strings - - hash - - qn/mo2EFOyw6keezS64Wo5ZGZXU= - - optional - - - Resources/sl.lproj/Sparkle.strings - - hash - - kwvdisufBenuQzrVg8tYKTX+qgg= - - optional - - - Resources/sv.lproj/Sparkle.strings - - hash - - 98/sk+A2Ew1fmKpuKZ3rq8eS1EM= - - optional - - - Resources/th.lproj/Sparkle.strings - - hash - - HQwGW1Ebf0i+Bl4synks3x2SY2M= - - optional - - - Resources/tr.lproj/Sparkle.strings - - hash - - whUQco5F2wcYdjc+cPKlk+mtx7Q= - - optional - - - Resources/uk.lproj/Sparkle.strings - - hash - - JXhpqvLkX0yDWjbWgsk2wbSObKU= - - optional - - - Resources/zh_CN.lproj/Sparkle.strings - - hash - - OnR96Z9tB0noODRSYssSs63+zGA= - - optional - - - Resources/zh_TW.lproj/Sparkle.strings - - hash - - 1FLKoM5jZ8JGBG/nmyEIA+/aalA= - - optional - - - - files2 - - MacOS/fileop - - cdhash - - XJ+GBX2nsbycOYdQ8KMcsgCsY90= - - requirement - cdhash H"398823ed847b72465c1250951cb61604021c473c" or cdhash H"5c9f86057da7b1bc9c398750f0a31cb200ac63dd" or cdhash H"2d16a10da663b63c288e2178c07a6169a615d4c5" or cdhash H"1c303c72c91b058bccb119dbc6ca74b9ffdf2c79" - - Resources/AppIcon.icns - - hash - - 4McwRDEss5BzWwUMG2Xf93+ze08= - - hash2 - - nq7j0ugQwyNbJn/7zGFwxIR0njwU3i7hAYKEyZhvUfE= - - - Resources/SUStatus.nib - - hash - - ECVWRExfxyDt5uvKRD+70wc9J6s= - - hash2 - - AtY9YmPv7cUlbFWP2vCyVdi3/M+XQn98wOlrIES2Dgk= - - - Resources/ar.lproj/Sparkle.strings - - hash - - Rf4jjdgTqvfw5JO/6f9jHMURv/U= - - hash2 - - 2cAJJ5NTxwpRgp24Ca3EuTXfaIIzsYdH3Y9cNCalZfc= - - optional - - - Resources/ca.lproj/Sparkle.strings - - hash - - wGGx+QzPg/20zZTq7jwCTgf/Ubc= - - hash2 - - om5I6jKleuRoCwjfrRRqKWQbs2l8lLj8QGKS47cxybA= - - optional - - - Resources/cs.lproj/Sparkle.strings - - hash - - bY3rkqi/NJtXtjpK3FbV2o0gxbQ= - - hash2 - - RfJgT2b3STcLu71+1iU9ZcSXbfwMWG1EE1C7Wrf3xBk= - - optional - - - Resources/da.lproj/Sparkle.strings - - hash - - 0t7SuLDMBZVsY240PAEsVfH/1qw= - - hash2 - - wu0CpGqE79+TXKIQm+q7ycPTuXhOlwRr/wD5uGHJzLM= - - optional - - - Resources/de.lproj/Sparkle.strings - - hash - - fsC7FJvExHE/2681tuUrjkSF2+A= - - hash2 - - XUpgsFH8KmcbgggpdYbJScCg0tBic9tNLdFh+8cbPyw= - - optional - - - Resources/el.lproj/Sparkle.strings - - hash - - NbIN+TRHORCL5Gfj68VRq4KdPXo= - - hash2 - - wt+2xyusmWAQuJ5kAQlRlvFb1wO4L7/rFdG+VmNjl+Y= - - optional - - - Resources/en.lproj/Sparkle.strings - - hash - - cHZov5FaqzfNhnBo0XdRuTMT4SY= - - hash2 - - 39CdfZZ1CQQz1Gd1+Ukxo2JHl0XESoc/cqWKF091WUk= - - optional - - - Resources/es.lproj/Sparkle.strings - - hash - - QPG88BN+x/l2Qk1NLLe3wRa26mQ= - - hash2 - - mtOoKdoTpGzeTNyzxkVGOMsE0Z3ZZOsmIKDfgA9aj8c= - - optional - - - Resources/fi.lproj/Sparkle.strings - - hash - - yd6pIoSj19HMDIUos4Td1Fch7bs= - - hash2 - - +AiiKWEdH3lesozLJBn3tfK6vi/VSI1/TnWVmIdVVsc= - - optional - - - Resources/fr.lproj/Sparkle.strings - - hash - - X3URilwJPVqMTGbtrYdorODwrMA= - - hash2 - - fyqJl0MhXYRILalxRHpv/JorWLOVLPtNcJioiPtlnYg= - - optional - - - Resources/he.lproj/Sparkle.strings - - hash - - U2WmlYGYmeeIlSW66R8awwmNXIE= - - hash2 - - 4gUlWkwTANV/jd7n4OZoXyT8CAcgWVk/tI3a25wmuLg= - - optional - - - Resources/hr.lproj/Sparkle.strings - - hash - - 7LLOVs76ioMwEDV8Gah+6sV/5No= - - hash2 - - TwklhrooHTXgV6Q9fbvvAB3mPIh7qDbEsNtUzo2fQuU= - - optional - - - Resources/hu.lproj/Sparkle.strings - - hash - - bNEmsO2LyUsMjTESH1I42V9sAOo= - - hash2 - - sRkp8c3Bx1qWdhhSNdOap1PbfmiTziINy1HxGea3SWU= - - optional - - - Resources/is.lproj/Sparkle.strings - - hash - - 8fxzD9ZhrvIZVZB1+QSJaPzg80M= - - hash2 - - xcV1yh/zU3U3TsRUT6vGybvIQitf+ThrogN/uOWmD8k= - - optional - - - Resources/it.lproj/Sparkle.strings - - hash - - bk1J6vpZjWeUFhBYWuWZf8TDv1A= - - hash2 - - Y+caNW+g0mt7HP4JrBxJw+uDwN3j19UYb+q5r9ch4Ow= - - optional - - - Resources/ja.lproj/Sparkle.strings - - hash - - f4EbR/GfMsKeWJ5DN/vhwg/lUoE= - - hash2 - - dSPIvpFbelHRv8liJjN3TUVPbgD1DfhVSGmE+S99quI= - - optional - - - Resources/ko.lproj/Sparkle.strings - - hash - - FRHRQPCWEk9GdJawYTuccg+E2tA= - - hash2 - - +bxn0NPgkxdHLa1MHRT+JRlYmy1jpIuaenpst5RT+RA= - - optional - - - Resources/nb.lproj/Sparkle.strings - - hash - - sgrDElwUxXtzdw8WaUFWyK3pG9Y= - - hash2 - - FG+w+OnLI7nwnNCWiMT50LU98VWj1d08ElfX4k7Ok4w= - - optional - - - Resources/nl.lproj/Sparkle.strings - - hash - - PWbC08zHFLROqivY2MAklDh6gkA= - - hash2 - - xnQkqxaO8zP1xpjY3nyjOd4Fe0gJon2Dbt456ukd/Gw= - - optional - - - Resources/pl.lproj/Sparkle.strings - - hash - - o7deBXE2Ct8/vQxouej5KkwTcUA= - - hash2 - - pDq+41jhfESgJauedrYncFY1O5EMEU3nRyl7mmyYj+s= - - optional - - - Resources/pt_BR.lproj/Sparkle.strings - - hash - - /adUv04OXQkCFv+Oed6qktFVQ3E= - - hash2 - - lY5EZJwPc/Rmfhw1gotkeEKB+ANXqZUlM2G92sZwdJc= - - optional - - - Resources/pt_PT.lproj/Sparkle.strings - - hash - - Mji9loJOJvuDY9hz3FhQ4H+HY5E= - - hash2 - - RUq6VJjn/QyydkNbpklLwfCgRF62+uHhXen2dYLBNuQ= - - optional - - - Resources/ro.lproj/Sparkle.strings - - hash - - 9U+OTz29kXKZHY/nmvbtemMsB3g= - - hash2 - - NNvDsecglQ/utR6YEqxyMj5K976YRWieCIC/PZuWCtQ= - - optional - - - Resources/ru.lproj/Sparkle.strings - - hash - - VpSLGNvZ6sbRYsF23L8m6TG+P6E= - - hash2 - - wJZ5NG+mvj4anRFPUFyvSD0kGrg+ZAqklsPfHuCxLQY= - - optional - - - Resources/sk.lproj/Sparkle.strings - - hash - - qn/mo2EFOyw6keezS64Wo5ZGZXU= - - hash2 - - e3cyzJ87ohC1ff/BzZ5O00MnwRE02U+J1KwXlSZeSSg= - - optional - - - Resources/sl.lproj/Sparkle.strings - - hash - - kwvdisufBenuQzrVg8tYKTX+qgg= - - hash2 - - t8QC+9TBONwKLQvV3fKV0umsnAS8ZDpqPikVksFPtWc= - - optional - - - Resources/sv.lproj/Sparkle.strings - - hash - - 98/sk+A2Ew1fmKpuKZ3rq8eS1EM= - - hash2 - - mJY6aeXFnSx38bF630z5lNPmPtsoYVAwadh0KC+9vfQ= - - optional - - - Resources/th.lproj/Sparkle.strings - - hash - - HQwGW1Ebf0i+Bl4synks3x2SY2M= - - hash2 - - nlP7repbMz6EqHo3sZWnK3tzx47WKSWnULdUHCYPgKk= - - optional - - - Resources/tr.lproj/Sparkle.strings - - hash - - whUQco5F2wcYdjc+cPKlk+mtx7Q= - - hash2 - - xEXUfrylPld+eFGrPyj4wTRPj7vUWOZ2f94sWydq03M= - - optional - - - Resources/uk.lproj/Sparkle.strings - - hash - - JXhpqvLkX0yDWjbWgsk2wbSObKU= - - hash2 - - u0572QZYh6sB0GQdMGMePalOf4zkxE7YQG7pp898SEg= - - optional - - - Resources/zh_CN.lproj/Sparkle.strings - - hash - - OnR96Z9tB0noODRSYssSs63+zGA= - - hash2 - - zvMbFdgVGI0ls9vIRT+sie7dj2g1UjQu7iS+pOgyBo4= - - optional - - - Resources/zh_TW.lproj/Sparkle.strings - - hash - - 1FLKoM5jZ8JGBG/nmyEIA+/aalA= - - hash2 - - Vlf/4QD7/3S0SFqxmTWWcSwtTLWISKUSvLjpgWb7lxQ= - - optional - - - - rules - - ^Resources/ - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^Resources/ - - weight - 20 - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/DarkAqua.css b/Frameworks/Sparkle.framework/Versions/A/Resources/DarkAqua.css deleted file mode 100644 index a41e0f285..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Resources/DarkAqua.css +++ /dev/null @@ -1,9 +0,0 @@ -html { - color: #FFFFFFD8; -} -:link { - color: #419CFF; -} -:link:active { - color: #FF1919; -} diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist b/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index e3bdbfab9..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,48 +0,0 @@ - - - - - BuildMachineOSBuild - 20B28 - CFBundleDevelopmentRegion - en - CFBundleExecutable - Sparkle - CFBundleIdentifier - org.sparkle-project.Sparkle - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Sparkle - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.24.0 1-g489ae19e - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1.24.0 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 12C5020f - DTPlatformName - macosx - DTPlatformVersion - 11.1 - DTSDKBuild - 20C5048g - DTSDKName - macosx11.1 - DTXcode - 1230 - DTXcodeBuild - 12C5020f - LSMinimumSystemVersion - 10.7 - - diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist b/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist deleted file mode 100644 index 1f75b248c..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist +++ /dev/null @@ -1,314 +0,0 @@ - - - - - ADP2,1 - Developer Transition Kit - iMac1,1 - iMac G3 (Rev A-D) - iMac4,1 - iMac (Core Duo) - iMac4,2 - iMac for Education (17 inch, Core Duo) - iMac5,1 - iMac (Core 2 Duo, 17 or 20 inch, SuperDrive) - iMac5,2 - iMac (Core 2 Duo, 17 inch, Combo Drive) - iMac6,1 - iMac (Core 2 Duo, 24 inch, SuperDrive) - iMac7,1 - iMac Intel Core 2 Duo (aluminum enclosure) - iMac8,1 - iMac (Core 2 Duo, 20 or 24 inch, Early 2008 ) - iMac9,1 - iMac (Core 2 Duo, 20 or 24 inch, Early or Mid 2009 ) - iMac10,1 - iMac (Core 2 Duo, 21.5 or 27 inch, Late 2009 ) - iMac11,1 - iMac (Core i5 or i7, 27 inch Late 2009) - iMac11,2 - 21.5" iMac (mid 2010) - iMac11,3 - iMac (Core i5 or i7, 27 inch Mid 2010) - iMac12,1 - iMac (Core i3 or i5 or i7, 21.5 inch Mid 2010 or Late 2011) - iMac12,2 - iMac (Core i5 or i7, 27 inch Mid 2011) - iMac13,1 - iMac (Core i3 or i5 or i7, 21.5 inch Late 2012 or Early 2013) - iMac13,2 - iMac (Core i5 or i7, 27 inch Late 2012) - iMac14,1 - iMac (Core i5, 21.5 inch Late 2013) - iMac14,2 - iMac (Core i5 or i7, 27 inch Late 2013) - iMac14,3 - iMac (Core i5 or i7, 21.5 inch Late 2013) - iMac14,4 - iMac (Core i5, 21.5 inch Mid 2014) - iMac15,1 - iMac (Retina 5K Core i5 or i7, 27 inch Late 2014 or Mid 2015) - iMac16,1 - iMac (Core i5, 21,5 inch Late 2015) - iMac16,2 - iMac (Retina 4K Core i5 or i7, 21.5 inch Late 2015) - iMac17,1 - iMac (Retina 5K Core i5 or i7, 27 inch Late 2015) - MacBook1,1 - MacBook (Core Duo) - MacBook2,1 - MacBook (Core 2 Duo) - MacBook4,1 - MacBook (Core 2 Duo Feb 2008) - MacBook5,1 - MacBook (Core 2 Duo, Late 2008, Unibody) - MacBook5,2 - MacBook (Core 2 Duo, Early 2009, White) - MacBook6,1 - MacBook (Core 2 Duo, Late 2009, Unibody) - MacBook7,1 - MacBook (Core 2 Duo, Mid 2010, White) - MacBook8,1 - MacBook (Core M, 12 inch, Early 2015) - MacBookAir1,1 - MacBook Air (Core 2 Duo, 13 inch, Early 2008) - MacBookAir2,1 - MacBook Air (Core 2 Duo, 13 inch, Mid 2009) - MacBookAir3,1 - MacBook Air (Core 2 Duo, 11 inch, Late 2010) - MacBookAir3,2 - MacBook Air (Core 2 Duo, 13 inch, Late 2010) - MacBookAir4,1 - MacBook Air (Core i5 or i7, 11 inch, Mid 2011) - MacBookAir4,2 - MacBook Air (Core i5 or i7, 13 inch, Mid 2011) - MacBookAir5,1 - MacBook Air (Core i5 or i7, 11 inch, Mid 2012) - MacBookAir5,2 - MacBook Air (Core i5 or i7, 13 inch, Mid 2012) - MacBookAir6,1 - MacBook Air (Core i5 or i7, 11 inch, Mid 2013 or Early 2014) - MacBookAir6,2 - MacBook Air (Core i5 or i7, 13 inch, Mid 2013 or Early 2014) - MacBookAir7,1 - MacBook Air (Core i5 or i7, 11 inch, Early 2015) - MacBookAir7,2 - MacBook Air (Core i5 or i7, 13 inch, Early 2015) - MacBookPro1,1 - MacBook Pro Core Duo (15-inch) - MacBookPro1,2 - MacBook Pro Core Duo (17-inch) - MacBookPro2,1 - MacBook Pro Core 2 Duo (17-inch) - MacBookPro2,2 - MacBook Pro Core 2 Duo (15-inch) - MacBookPro3,1 - MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo) - MacBookPro3,2 - MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo) - MacBookPro4,1 - MacBook Pro (Core 2 Duo Feb 2008) - MacBookPro5,1 - MacBook Pro Intel Core 2 Duo (aluminum unibody) - MacBookPro5,2 - MacBook Pro Intel Core 2 Duo (aluminum unibody) - MacBookPro5,3 - MacBook Pro Intel Core 2 Duo (aluminum unibody) - MacBookPro5,4 - MacBook Pro Intel Core 2 Duo (aluminum unibody) - MacBookPro5,5 - MacBook Pro Intel Core 2 Duo (aluminum unibody) - MacBookPro6,1 - MacBook Pro Intel Core i5, Intel Core i7 (mid 2010) - MacBookPro6,2 - MacBook Pro Intel Core i5, Intel Core i7 (mid 2010) - MacBookPro7,1 - MacBook Pro Intel Core 2 Duo (mid 2010) - MacBookPro8,1 - MacBook Pro Intel Core i5, Intel Core i7, 13" (early 2011) - MacBookPro8,2 - MacBook Pro Intel Core i7, 15" (early 2011) - MacBookPro8,3 - MacBook Pro Intel Core i7, 17" (early 2011) - MacBookPro9,1 - MacBook Pro (15-inch, Mid 2012) - MacBookPro9,2 - MacBook Pro (13-inch, Mid 2012) - MacBookPro10,1 - MacBook Pro (Retina, Mid 2012) - MacBookPro10,2 - MacBook Pro (Retina, 13-inch, Late 2012) - MacBookPro11,1 - MacBook Pro (Retina, 13-inch, Late 2013) - MacBookPro11,2 - MacBook Pro (Retina, 15-inch, Late 2013) - MacBookPro11,3 - MacBook Pro (Retina, 15-inch, Late 2013) - MacbookPro11,4 - MacBook Pro (Retina, 15-inch, Mid 2015) - MacbookPro11,5 - MacBook Pro (Retina, 15-inch, Mid 2015) - MacbookPro12,1  - MacBook Pro (Retina, 13-inch, Early 2015) - Macmini1,1 - Mac Mini (Core Solo/Duo) - Macmini2,1 - Mac mini Intel Core - Macmini3,1 - Mac mini Intel Core - Macmini4,1 - Mac mini Intel Core (Mid 2010) - Macmini5,1 - Mac mini (Core i5, Mid 2011) - Macmini5,2 - Mac mini (Core i5 or Core i7, Mid 2011) - Macmini5,3 - Mac mini (Core i7, Server, Mid 2011) - Macmini6,1 - Mac mini (Core i5, Late 2012) - Macmini6,2 - Mac mini (Core i7, Normal or Server, Late 2012) - Macmini7,1 - Mac mini (Core i5 or Core i7, Late 2014) - MacPro1,1,Quad - Mac Pro - MacPro1,1 - Mac Pro (four-core) - MacPro2,1 - Mac Pro (eight-core) - MacPro3,1 - Mac Pro (January 2008 4- or 8- core "Harpertown") - MacPro4,1 - Mac Pro (March 2009) - MacPro5,1 - Mac Pro (2010 or 2012) - MacPro6,1 - Mac Pro (Late 2013) - PowerBook1,1 - PowerBook G3 - PowerBook2,1 - iBook G3 - PowerBook2,2 - iBook G3 (FireWire) - PowerBook2,3 - iBook G3 - PowerBook2,4 - iBook G3 - PowerBook3,1 - PowerBook G3 (FireWire) - PowerBook3,2 - PowerBook G4 - PowerBook3,3 - PowerBook G4 (Gigabit Ethernet) - PowerBook3,4 - PowerBook G4 (DVI) - PowerBook3,5 - PowerBook G4 (1GHz / 867MHz) - PowerBook4,1 - iBook G3 (Dual USB, Late 2001) - PowerBook4,2 - iBook G3 (16MB VRAM) - PowerBook4,3 - iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003) - PowerBook5,1 - PowerBook G4 (17 inch) - PowerBook5,2 - PowerBook G4 (15 inch FW 800) - PowerBook5,3 - PowerBook G4 (17-inch 1.33GHz) - PowerBook5,4 - PowerBook G4 (15 inch 1.5/1.33GHz) - PowerBook5,5 - PowerBook G4 (17-inch 1.5GHz) - PowerBook5,6 - PowerBook G4 (15 inch 1.67GHz/1.5GHz) - PowerBook5,7 - PowerBook G4 (17-inch 1.67GHz) - PowerBook5,8 - PowerBook G4 (Double layer SD, 15 inch) - PowerBook5,9 - PowerBook G4 (Double layer SD, 17 inch) - PowerBook6,1 - PowerBook G4 (12 inch) - PowerBook6,2 - PowerBook G4 (12 inch, DVI) - PowerBook6,3 - iBook G4 - PowerBook6,4 - PowerBook G4 (12 inch 1.33GHz) - PowerBook6,5 - iBook G4 (Early-Late 2004) - PowerBook6,7 - iBook G4 (Mid 2005) - PowerBook6,8 - PowerBook G4 (12 inch 1.5GHz) - PowerMac1,1 - Power Macintosh G3 (Blue & White) - PowerMac1,2 - Power Macintosh G4 (PCI Graphics) - PowerMac2,1 - iMac G3 (Slot-loading CD-ROM) - PowerMac2,2 - iMac G3 (Summer 2000) - PowerMac3,1 - Power Macintosh G4 (AGP Graphics) - PowerMac3,2 - Power Macintosh G4 (AGP Graphics) - PowerMac3,3 - Power Macintosh G4 (Gigabit Ethernet) - PowerMac3,4 - Power Macintosh G4 (Digital Audio) - PowerMac3,5 - Power Macintosh G4 (Quick Silver) - PowerMac3,6 - Power Macintosh G4 (Mirrored Drive Door) - PowerMac4,1 - iMac G3 (Early/Summer 2001) - PowerMac4,2 - iMac G4 (Flat Panel) - PowerMac4,4 - eMac - PowerMac4,5 - iMac G4 (17-inch Flat Panel) - PowerMac5,1 - Power Macintosh G4 Cube - PowerMac5,2 - Power Mac G4 Cube - PowerMac6,1 - iMac G4 (USB 2.0) - PowerMac6,3 - iMac G4 (20-inch Flat Panel) - PowerMac6,4 - eMac (USB 2.0, 2005) - PowerMac7,2 - Power Macintosh G5 - PowerMac7,3 - Power Macintosh G5 - PowerMac8,1 - iMac G5 - PowerMac8,2 - iMac G5 (Ambient Light Sensor) - PowerMac9,1 - Power Macintosh G5 (Late 2005) - PowerMac10,1 - Mac Mini G4 - PowerMac10,2 - Mac Mini (Late 2005) - PowerMac11,2 - Power Macintosh G5 (Late 2005) - PowerMac12,1 - iMac G5 (iSight) - RackMac1,1 - Xserve G4 - RackMac1,2 - Xserve G4 (slot-loading, cluster node) - RackMac3,1 - Xserve G5 - Xserve1,1 - Xserve (Intel Xeon) - Xserve2,1 - Xserve (January 2008 quad-core) - Xserve3,1 - Xserve (early 2009) - - diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib deleted file mode 100644 index f9c39a032..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 65f118ac4..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib deleted file mode 100644 index 44b6741d1..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index efa0260ca..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings deleted file mode 100644 index e00af3413..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings deleted file mode 100644 index f2aea2755..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 103886fe7..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib deleted file mode 100644 index 68e44511d..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index d46524a64..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings deleted file mode 100644 index 02e077cf5..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index d22bba56d..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib deleted file mode 100644 index dc1aa3fa1..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index a567b2844..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings deleted file mode 100644 index e0957c601..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index cf6264295..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib deleted file mode 100644 index 258734439..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 029876725..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings deleted file mode 100644 index 202e70b73..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index ddcb7b3ae..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib deleted file mode 100644 index 0085ef14f..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 72d6b14c3..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings deleted file mode 100644 index 6ef15d4a5..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index c5732e8fe..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib deleted file mode 100644 index 352a9a84e..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index b92b0a3e4..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings deleted file mode 100644 index 1d70063c3..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 01694b254..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib deleted file mode 100644 index 9216cb743..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 06b80fea7..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings deleted file mode 100644 index 8a083f86f..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 86011659a..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib deleted file mode 100644 index 795d05d36..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 1bdc120d7..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings deleted file mode 100644 index 773f7c997..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 74c1e5a33..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib deleted file mode 100644 index dea32c6da..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index b8aa13909..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings deleted file mode 100644 index 954abee05..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj b/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj deleted file mode 120000 index f9834a395..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj +++ /dev/null @@ -1 +0,0 @@ -fr.lproj \ No newline at end of file diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings deleted file mode 100644 index ce63fdef7..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 12476cc00..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib deleted file mode 100644 index 60659fe7c..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 4627920ef..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings deleted file mode 100644 index ab8fe1a3e..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index dd46e650d..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib deleted file mode 100644 index b2400c732..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 00a32eb27..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings deleted file mode 100644 index d30ef64bd..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 2e2c6025b..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib deleted file mode 100644 index 43990e174..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index cb983787e..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings deleted file mode 100644 index 5f6ace28d..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index fb389d236..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib deleted file mode 100644 index 7eea1a8d8..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index a237886ee..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings deleted file mode 100644 index 5b4be9ead..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 9200a22c0..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib deleted file mode 100644 index abe1d0bf3..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index e073e797b..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings deleted file mode 100644 index f4685edad..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index b29426766..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib deleted file mode 100644 index d5e01aded..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 7edae78db..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings deleted file mode 100644 index f008e1eee..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index cbc7a9fdd..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib deleted file mode 100644 index 3a875f2bd..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index f8c9d334f..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings deleted file mode 100644 index fa4cd97df..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 96e672b3d..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib deleted file mode 100644 index ccec5f8f5..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index aee614ab2..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings deleted file mode 100644 index 76f3556b8..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index aa19d7e3f..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib deleted file mode 100644 index 4fcb4eecd..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 2575e75b1..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings deleted file mode 100644 index 4444f3384..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pt.lproj b/Frameworks/Sparkle.framework/Versions/A/Resources/pt.lproj deleted file mode 120000 index 3c1c9f6dc..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/Resources/pt.lproj +++ /dev/null @@ -1 +0,0 @@ -pt_BR.lproj \ No newline at end of file diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 0e8fdc60e..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib deleted file mode 100644 index 0a8994379..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 36b9135da..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings deleted file mode 100644 index 2a7ce2991..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 7056ce7b7..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib deleted file mode 100644 index d77700f05..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index e2011df41..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings deleted file mode 100644 index 18a287e80..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index c5907ff1d..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib deleted file mode 100644 index 9e45a85c1..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 6805b00b8..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings deleted file mode 100644 index 967a44189..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 9889fb2d3..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib deleted file mode 100644 index 4743f8f9f..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index a79b43eda..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings deleted file mode 100644 index 8a11ecf17..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 912d1dd95..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib deleted file mode 100644 index 0aa042e4d..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 3db727276..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings deleted file mode 100644 index 65aa28f2f..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 745260237..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib deleted file mode 100644 index 96b5964ad..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 3302b8ec8..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings deleted file mode 100644 index caaf06030..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index ae7ceb14e..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib deleted file mode 100644 index 07518c343..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 716ff36c3..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings deleted file mode 100644 index e7c70db71..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 0ee49a1f4..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib deleted file mode 100644 index 5241b1f23..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index c6f35136b..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings deleted file mode 100644 index 058b4ba6a..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 24605f177..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib deleted file mode 100644 index e722b695b..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 47ec4cf84..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings deleted file mode 100644 index ffc576725..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index dd540a60d..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib deleted file mode 100644 index 8ebec67dc..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 9ef614551..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings deleted file mode 100644 index 263326c98..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 1cb9d7074..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib deleted file mode 100644 index 2c066da9d..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 2bbe3816f..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings deleted file mode 100644 index 71cf325f2..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib deleted file mode 100644 index 3c2028109..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib deleted file mode 100644 index 27d22201b..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib b/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib deleted file mode 100644 index 5486b49a2..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings b/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings deleted file mode 100644 index b9517885b..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/Sparkle b/Frameworks/Sparkle.framework/Versions/A/Sparkle deleted file mode 100755 index 126899eb9..000000000 Binary files a/Frameworks/Sparkle.framework/Versions/A/Sparkle and /dev/null differ diff --git a/Frameworks/Sparkle.framework/Versions/A/_CodeSignature/CodeResources b/Frameworks/Sparkle.framework/Versions/A/_CodeSignature/CodeResources deleted file mode 100644 index 1853f2f62..000000000 --- a/Frameworks/Sparkle.framework/Versions/A/_CodeSignature/CodeResources +++ /dev/null @@ -1,3900 +0,0 @@ - - - - - files - - Resources/Autoupdate.app/Contents/Info.plist - - KWwWNYJdjhEgQdb+JKppt0+bKAw= - - Resources/Autoupdate.app/Contents/MacOS/Autoupdate - - wmoMz7rSIYpe2GRwL0iOO7x8XJM= - - Resources/Autoupdate.app/Contents/MacOS/fileop - - sLn9bRjeR7iPZnPSuCsiIUN5bzk= - - Resources/Autoupdate.app/Contents/PkgInfo - - n57qDP4tZfLD1rCS43W0B4LQjzE= - - Resources/Autoupdate.app/Contents/Resources/AppIcon.icns - - 4McwRDEss5BzWwUMG2Xf93+ze08= - - Resources/Autoupdate.app/Contents/Resources/SUStatus.nib - - ECVWRExfxyDt5uvKRD+70wc9J6s= - - Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings - - hash - - Rf4jjdgTqvfw5JO/6f9jHMURv/U= - - optional - - - Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings - - hash - - wGGx+QzPg/20zZTq7jwCTgf/Ubc= - - optional - - - Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings - - hash - - bY3rkqi/NJtXtjpK3FbV2o0gxbQ= - - optional - - - Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings - - hash - - 0t7SuLDMBZVsY240PAEsVfH/1qw= - - optional - - - Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings - - hash - - fsC7FJvExHE/2681tuUrjkSF2+A= - - optional - - - Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings - - hash - - NbIN+TRHORCL5Gfj68VRq4KdPXo= - - optional - - - Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings - - hash - - cHZov5FaqzfNhnBo0XdRuTMT4SY= - - optional - - - Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings - - hash - - QPG88BN+x/l2Qk1NLLe3wRa26mQ= - - optional - - - Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings - - hash - - yd6pIoSj19HMDIUos4Td1Fch7bs= - - optional - - - Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings - - hash - - X3URilwJPVqMTGbtrYdorODwrMA= - - optional - - - Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings - - hash - - U2WmlYGYmeeIlSW66R8awwmNXIE= - - optional - - - Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings - - hash - - 7LLOVs76ioMwEDV8Gah+6sV/5No= - - optional - - - Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings - - hash - - bNEmsO2LyUsMjTESH1I42V9sAOo= - - optional - - - Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings - - hash - - 8fxzD9ZhrvIZVZB1+QSJaPzg80M= - - optional - - - Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings - - hash - - bk1J6vpZjWeUFhBYWuWZf8TDv1A= - - optional - - - Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings - - hash - - f4EbR/GfMsKeWJ5DN/vhwg/lUoE= - - optional - - - Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings - - hash - - FRHRQPCWEk9GdJawYTuccg+E2tA= - - optional - - - Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings - - hash - - sgrDElwUxXtzdw8WaUFWyK3pG9Y= - - optional - - - Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings - - hash - - PWbC08zHFLROqivY2MAklDh6gkA= - - optional - - - Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings - - hash - - o7deBXE2Ct8/vQxouej5KkwTcUA= - - optional - - - Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings - - hash - - /adUv04OXQkCFv+Oed6qktFVQ3E= - - optional - - - Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings - - hash - - Mji9loJOJvuDY9hz3FhQ4H+HY5E= - - optional - - - Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings - - hash - - 9U+OTz29kXKZHY/nmvbtemMsB3g= - - optional - - - Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings - - hash - - VpSLGNvZ6sbRYsF23L8m6TG+P6E= - - optional - - - Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings - - hash - - qn/mo2EFOyw6keezS64Wo5ZGZXU= - - optional - - - Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings - - hash - - kwvdisufBenuQzrVg8tYKTX+qgg= - - optional - - - Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings - - hash - - 98/sk+A2Ew1fmKpuKZ3rq8eS1EM= - - optional - - - Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings - - hash - - HQwGW1Ebf0i+Bl4synks3x2SY2M= - - optional - - - Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings - - hash - - whUQco5F2wcYdjc+cPKlk+mtx7Q= - - optional - - - Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings - - hash - - JXhpqvLkX0yDWjbWgsk2wbSObKU= - - optional - - - Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings - - hash - - OnR96Z9tB0noODRSYssSs63+zGA= - - optional - - - Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings - - hash - - 1FLKoM5jZ8JGBG/nmyEIA+/aalA= - - optional - - - Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources - - gVbyGydhWFWErsmdSv38sD2CK5c= - - Resources/DarkAqua.css - - SCihC2/GG/DhF4xcXD9MYaxhawM= - - Resources/Info.plist - - 5bKlbfUn+UpXGvwWaLxm5i9hZdU= - - Resources/SUModelTranslation.plist - - iD2Ex40Usc4ZE6IAhRePqgwK/xw= - - Resources/SUStatus.nib - - ECVWRExfxyDt5uvKRD+70wc9J6s= - - Resources/ar.lproj/SUAutomaticUpdateAlert.nib - - hash - - LtkONVbhTzwCPtbjkr06qSniXCI= - - optional - - - Resources/ar.lproj/SUUpdateAlert.nib - - hash - - JeZDdP1OuZbqkm8UKYiyH00A7ss= - - optional - - - Resources/ar.lproj/SUUpdatePermissionPrompt.nib - - hash - - 2bUXVaur0g5gL09vMdkjjnG/gx8= - - optional - - - Resources/ar.lproj/Sparkle.strings - - hash - - Rf4jjdgTqvfw5JO/6f9jHMURv/U= - - optional - - - Resources/ca.lproj/Sparkle.strings - - hash - - wGGx+QzPg/20zZTq7jwCTgf/Ubc= - - optional - - - Resources/cs.lproj/SUAutomaticUpdateAlert.nib - - hash - - YpT086oHMS9O2TvSNLZh+39oy80= - - optional - - - Resources/cs.lproj/SUUpdateAlert.nib - - hash - - v2ac1JQZvkm8EHZiTUc/q4aBcU0= - - optional - - - Resources/cs.lproj/SUUpdatePermissionPrompt.nib - - hash - - i6pnEW/pEUtK6j2Ky5Sz4ePqb1c= - - optional - - - Resources/cs.lproj/Sparkle.strings - - hash - - bY3rkqi/NJtXtjpK3FbV2o0gxbQ= - - optional - - - Resources/da.lproj/SUAutomaticUpdateAlert.nib - - hash - - XCqcLv38cTpbjAE4zjN/JWeT3+U= - - optional - - - Resources/da.lproj/SUUpdateAlert.nib - - hash - - BY0imp6dA7C0GSOK81VXTJsRccM= - - optional - - - Resources/da.lproj/SUUpdatePermissionPrompt.nib - - hash - - dbG/KHSKzElkUxJa08TkzSUwdg4= - - optional - - - Resources/da.lproj/Sparkle.strings - - hash - - 0t7SuLDMBZVsY240PAEsVfH/1qw= - - optional - - - Resources/de.lproj/SUAutomaticUpdateAlert.nib - - hash - - i/BaQXOSENNulhl0b5jssezuU3Y= - - optional - - - Resources/de.lproj/SUUpdateAlert.nib - - hash - - lieYpCoCaCKAA3EL3/EsBr46vqI= - - optional - - - Resources/de.lproj/SUUpdatePermissionPrompt.nib - - hash - - RPyksdcohNoYO9AulHe18aV0SZY= - - optional - - - Resources/de.lproj/Sparkle.strings - - hash - - fsC7FJvExHE/2681tuUrjkSF2+A= - - optional - - - Resources/el.lproj/SUAutomaticUpdateAlert.nib - - hash - - s3rpfaKP5+1+vGc44qpcWy+h0t8= - - optional - - - Resources/el.lproj/SUUpdateAlert.nib - - hash - - sJcnQqAH4BsB+2rz9riB7iqePh0= - - optional - - - Resources/el.lproj/SUUpdatePermissionPrompt.nib - - hash - - WbqjimwnC4h+B7DynMFS4qPhljo= - - optional - - - Resources/el.lproj/Sparkle.strings - - hash - - NbIN+TRHORCL5Gfj68VRq4KdPXo= - - optional - - - Resources/en.lproj/SUAutomaticUpdateAlert.nib - - hash - - Y6bIF/+bAP3t5gBwPcdqxsj4co4= - - optional - - - Resources/en.lproj/SUUpdateAlert.nib - - hash - - L3hoxekBQAtpmyDXNhTX7kRXRtc= - - optional - - - Resources/en.lproj/SUUpdatePermissionPrompt.nib - - hash - - g/8UXLSUBGROl64wXKn5Wr59X/c= - - optional - - - Resources/en.lproj/Sparkle.strings - - hash - - cHZov5FaqzfNhnBo0XdRuTMT4SY= - - optional - - - Resources/es.lproj/SUAutomaticUpdateAlert.nib - - hash - - BoS6NAq1zyVcmkbrKJhcI9Zrezk= - - optional - - - Resources/es.lproj/SUUpdateAlert.nib - - hash - - UMa1QcJf8zfpVUnIZUGFfJ64wTk= - - optional - - - Resources/es.lproj/SUUpdatePermissionPrompt.nib - - hash - - rH20AzERYudrcbwIQQO107Z2zGo= - - optional - - - Resources/es.lproj/Sparkle.strings - - hash - - QPG88BN+x/l2Qk1NLLe3wRa26mQ= - - optional - - - Resources/fi.lproj/SUAutomaticUpdateAlert.nib - - hash - - 6aUnn3XSgWKnVuYVA/PVSrwora8= - - optional - - - Resources/fi.lproj/SUUpdateAlert.nib - - hash - - k8QjxmBhk5B6v1fGnFkwwX6oakg= - - optional - - - Resources/fi.lproj/SUUpdatePermissionPrompt.nib - - hash - - h7CaxzsvAjayHOo/I9uD1xZMMFo= - - optional - - - Resources/fi.lproj/Sparkle.strings - - hash - - yd6pIoSj19HMDIUos4Td1Fch7bs= - - optional - - - Resources/fr.lproj/SUAutomaticUpdateAlert.nib - - hash - - Nj5v0wIECbpjSTU74xKBngH4DeY= - - optional - - - Resources/fr.lproj/SUUpdateAlert.nib - - hash - - RPgJubd38D/WH1H6B1jSejqILE8= - - optional - - - Resources/fr.lproj/SUUpdatePermissionPrompt.nib - - hash - - I2iLdKSjbtR5z2V21+jBWWV/cqQ= - - optional - - - Resources/fr.lproj/Sparkle.strings - - hash - - X3URilwJPVqMTGbtrYdorODwrMA= - - optional - - - Resources/he.lproj/Sparkle.strings - - hash - - U2WmlYGYmeeIlSW66R8awwmNXIE= - - optional - - - Resources/hr.lproj/SUAutomaticUpdateAlert.nib - - hash - - SkgPcXJYp5dizLAgiXfyl9EsPoI= - - optional - - - Resources/hr.lproj/SUUpdateAlert.nib - - hash - - 47iMWOA+94RZGJW+QJCeM4xOUsA= - - optional - - - Resources/hr.lproj/SUUpdatePermissionPrompt.nib - - hash - - KcZQYPdSeOeuTbFYdiS4NMY+gHM= - - optional - - - Resources/hr.lproj/Sparkle.strings - - hash - - 7LLOVs76ioMwEDV8Gah+6sV/5No= - - optional - - - Resources/hu.lproj/SUAutomaticUpdateAlert.nib - - hash - - PfYCBbOThC1gBDzoxD+ijdyQ3T0= - - optional - - - Resources/hu.lproj/SUUpdateAlert.nib - - hash - - 6RlHCvHc9GNh1M7iJhvn12iFGpg= - - optional - - - Resources/hu.lproj/SUUpdatePermissionPrompt.nib - - hash - - S4W9ksaDnuIRy8L1ekCKN9+WfP0= - - optional - - - Resources/hu.lproj/Sparkle.strings - - hash - - bNEmsO2LyUsMjTESH1I42V9sAOo= - - optional - - - Resources/is.lproj/SUAutomaticUpdateAlert.nib - - hash - - 9eOJ/dQvTMu45Z1UowMPaKHYQOI= - - optional - - - Resources/is.lproj/SUUpdateAlert.nib - - hash - - F0aP96zh7QOSkAdFsBlIzBhmCIg= - - optional - - - Resources/is.lproj/SUUpdatePermissionPrompt.nib - - hash - - KeGsuRgX16ROMEZ8ymQNHPp6/qY= - - optional - - - Resources/is.lproj/Sparkle.strings - - hash - - 8fxzD9ZhrvIZVZB1+QSJaPzg80M= - - optional - - - Resources/it.lproj/SUAutomaticUpdateAlert.nib - - hash - - JXGMS3rtry8HTWEbBibxVCkBEmw= - - optional - - - Resources/it.lproj/SUUpdateAlert.nib - - hash - - W45+n9zTkxt1E3v6cZYLzXNtDlc= - - optional - - - Resources/it.lproj/SUUpdatePermissionPrompt.nib - - hash - - 6K3G2WyaGjrTeQHoweUjaKh6X3A= - - optional - - - Resources/it.lproj/Sparkle.strings - - hash - - bk1J6vpZjWeUFhBYWuWZf8TDv1A= - - optional - - - Resources/ja.lproj/SUAutomaticUpdateAlert.nib - - hash - - 9fRyIZvZMUaRTaWCda7NsPqJle0= - - optional - - - Resources/ja.lproj/SUUpdateAlert.nib - - hash - - L07PCZt4pHgRzMPxV0N6F2QK9kM= - - optional - - - Resources/ja.lproj/SUUpdatePermissionPrompt.nib - - hash - - hKgWGHf0ha9Io7qZ2ChHjSsH6/s= - - optional - - - Resources/ja.lproj/Sparkle.strings - - hash - - f4EbR/GfMsKeWJ5DN/vhwg/lUoE= - - optional - - - Resources/ko.lproj/SUAutomaticUpdateAlert.nib - - hash - - gi+8llNjjuFSKRkNAA7vN/mf1uA= - - optional - - - Resources/ko.lproj/SUUpdateAlert.nib - - hash - - UNAQQTvtG7+MN/4w4ouu9ZHXfCM= - - optional - - - Resources/ko.lproj/SUUpdatePermissionPrompt.nib - - hash - - fUirMWEByjvEZ4Ur3uhDypdTX00= - - optional - - - Resources/ko.lproj/Sparkle.strings - - hash - - FRHRQPCWEk9GdJawYTuccg+E2tA= - - optional - - - Resources/nb.lproj/SUAutomaticUpdateAlert.nib - - hash - - kJLypTD4VsCOwsXiOd6700pn0Cc= - - optional - - - Resources/nb.lproj/SUUpdateAlert.nib - - hash - - WIJIO1qR0uNQtJpVkhIarVOfgFw= - - optional - - - Resources/nb.lproj/SUUpdatePermissionPrompt.nib - - hash - - 4lQkM7OM2WfWZkvaBY8841eyT0E= - - optional - - - Resources/nb.lproj/Sparkle.strings - - hash - - sgrDElwUxXtzdw8WaUFWyK3pG9Y= - - optional - - - Resources/nl.lproj/SUAutomaticUpdateAlert.nib - - hash - - wPmqlbK7p5mjPDrezXrYK8CG3NA= - - optional - - - Resources/nl.lproj/SUUpdateAlert.nib - - hash - - 7EXAJEeeN0k32jvOHKr7Icq4644= - - optional - - - Resources/nl.lproj/SUUpdatePermissionPrompt.nib - - hash - - hzjMuMEBooqc++naXBflhhc16vM= - - optional - - - Resources/nl.lproj/Sparkle.strings - - hash - - PWbC08zHFLROqivY2MAklDh6gkA= - - optional - - - Resources/pl.lproj/SUAutomaticUpdateAlert.nib - - hash - - 4aIS8LbPLTj63EhS7xEk+qjNzD8= - - optional - - - Resources/pl.lproj/SUUpdateAlert.nib - - hash - - pLII26utl65JwmAFqLiMefDsrGs= - - optional - - - Resources/pl.lproj/SUUpdatePermissionPrompt.nib - - hash - - wIe21CUILU7RUksjexoQFfUNt6c= - - optional - - - Resources/pl.lproj/Sparkle.strings - - hash - - o7deBXE2Ct8/vQxouej5KkwTcUA= - - optional - - - Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib - - hash - - 8fQxJZw+LQiExfyPaqUbNnASsWU= - - optional - - - Resources/pt_BR.lproj/SUUpdateAlert.nib - - hash - - zW5zEa6rDpqLuTDfixuKKE93E5o= - - optional - - - Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib - - hash - - LnGHg/0zbDsX5GOE+RuItGOeM3g= - - optional - - - Resources/pt_BR.lproj/Sparkle.strings - - hash - - /adUv04OXQkCFv+Oed6qktFVQ3E= - - optional - - - Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib - - hash - - Svc6e9pHrp1wA7rxw7oKc5HB8qQ= - - optional - - - Resources/pt_PT.lproj/SUUpdateAlert.nib - - hash - - NtD144OppS+BPXNmsReGJoN2Qdo= - - optional - - - Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib - - hash - - DngrIdQPeavGfwbVI7GS1bK98C0= - - optional - - - Resources/pt_PT.lproj/Sparkle.strings - - hash - - Mji9loJOJvuDY9hz3FhQ4H+HY5E= - - optional - - - Resources/ro.lproj/SUAutomaticUpdateAlert.nib - - hash - - 7HEo1dlbwSnit0+4DsAqKDz1jR4= - - optional - - - Resources/ro.lproj/SUUpdateAlert.nib - - hash - - FPWtaRuYrVSPrfAozq/4bSQfMK4= - - optional - - - Resources/ro.lproj/SUUpdatePermissionPrompt.nib - - hash - - NPLiF7WwQt7siCG8DLWh+ZGImWI= - - optional - - - Resources/ro.lproj/Sparkle.strings - - hash - - 9U+OTz29kXKZHY/nmvbtemMsB3g= - - optional - - - Resources/ru.lproj/SUAutomaticUpdateAlert.nib - - hash - - YHane6xWVhvpJGf5HuoxCyQ/gDs= - - optional - - - Resources/ru.lproj/SUUpdateAlert.nib - - hash - - NxM+W+qAegxK4lKy0uzCclpkVjo= - - optional - - - Resources/ru.lproj/SUUpdatePermissionPrompt.nib - - hash - - P0o42QteueF9d3aaoNcz6obcimA= - - optional - - - Resources/ru.lproj/Sparkle.strings - - hash - - VpSLGNvZ6sbRYsF23L8m6TG+P6E= - - optional - - - Resources/sk.lproj/SUAutomaticUpdateAlert.nib - - hash - - 5k+e1kFtgoVo77RhyhZSXpRQGOQ= - - optional - - - Resources/sk.lproj/SUUpdateAlert.nib - - hash - - l8XR02tvN10SX2aM9CtZ7BpIcqw= - - optional - - - Resources/sk.lproj/SUUpdatePermissionPrompt.nib - - hash - - stqj1WPWzlJrXELqXKGjcxPeqvI= - - optional - - - Resources/sk.lproj/Sparkle.strings - - hash - - qn/mo2EFOyw6keezS64Wo5ZGZXU= - - optional - - - Resources/sl.lproj/SUAutomaticUpdateAlert.nib - - hash - - htsZnsf4S+omnk4Z8En8qOOjrPM= - - optional - - - Resources/sl.lproj/SUUpdateAlert.nib - - hash - - /9xrGwHXOdPKFp82w4OjF+Q0WG8= - - optional - - - Resources/sl.lproj/SUUpdatePermissionPrompt.nib - - hash - - ApIwZGSV2lqBRKNHGnwhpqmec9Q= - - optional - - - Resources/sl.lproj/Sparkle.strings - - hash - - kwvdisufBenuQzrVg8tYKTX+qgg= - - optional - - - Resources/sv.lproj/SUAutomaticUpdateAlert.nib - - hash - - K0QpkucJxh5CRA9TYJCT5+gSHZY= - - optional - - - Resources/sv.lproj/SUUpdateAlert.nib - - hash - - dOxfomMC/X9MFFdsk1MyjKv1yi8= - - optional - - - Resources/sv.lproj/SUUpdatePermissionPrompt.nib - - hash - - odTG4PkbDUjXrxuBzD+AnnKpOLo= - - optional - - - Resources/sv.lproj/Sparkle.strings - - hash - - 98/sk+A2Ew1fmKpuKZ3rq8eS1EM= - - optional - - - Resources/th.lproj/SUAutomaticUpdateAlert.nib - - hash - - /iyQcDW4+Is40OSlKcWlEe9zKdo= - - optional - - - Resources/th.lproj/SUUpdateAlert.nib - - hash - - cQCWeOMdd6mZEd9k0pl3FrZDT9g= - - optional - - - Resources/th.lproj/SUUpdatePermissionPrompt.nib - - hash - - HNNvE7bGYAElmoeYbB7JREhcs3I= - - optional - - - Resources/th.lproj/Sparkle.strings - - hash - - HQwGW1Ebf0i+Bl4synks3x2SY2M= - - optional - - - Resources/tr.lproj/SUAutomaticUpdateAlert.nib - - hash - - fjnMF3XlYLFPJSpmIFizoGwOVl8= - - optional - - - Resources/tr.lproj/SUUpdateAlert.nib - - hash - - Y9dabfD0a7F1cV9OuFnyQL5BIIc= - - optional - - - Resources/tr.lproj/SUUpdatePermissionPrompt.nib - - hash - - J3IIVJ3ytau8dSfjTtkWF9zh2nA= - - optional - - - Resources/tr.lproj/Sparkle.strings - - hash - - whUQco5F2wcYdjc+cPKlk+mtx7Q= - - optional - - - Resources/uk.lproj/SUAutomaticUpdateAlert.nib - - hash - - YRRVgJ26NZd9+ebTI3UGdpi35eo= - - optional - - - Resources/uk.lproj/SUUpdateAlert.nib - - hash - - PoeaXUHUKNIm0bkX+GNnvFHlq9w= - - optional - - - Resources/uk.lproj/SUUpdatePermissionPrompt.nib - - hash - - KTOBs3BNdg2ylIdMNsG3WLw5SsA= - - optional - - - Resources/uk.lproj/Sparkle.strings - - hash - - JXhpqvLkX0yDWjbWgsk2wbSObKU= - - optional - - - Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib - - hash - - 2pvLfCu7EiI6OkCxu3+aLyeTPcU= - - optional - - - Resources/zh_CN.lproj/SUUpdateAlert.nib - - hash - - +xvQE3bFW1QXIUggZBlZkKn0gag= - - optional - - - Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib - - hash - - 9wwEreTf4JSKHFSiRGUKE2Ffs1g= - - optional - - - Resources/zh_CN.lproj/Sparkle.strings - - hash - - OnR96Z9tB0noODRSYssSs63+zGA= - - optional - - - Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib - - hash - - KQcqbpIyw3yhI0eEyo06cNq5MlM= - - optional - - - Resources/zh_TW.lproj/SUUpdateAlert.nib - - hash - - 6/Rgln3/89vly1RFa1gBfRhITxU= - - optional - - - Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib - - hash - - K4vg/ZQjaDTe9PQehvRbUNOWIUc= - - optional - - - Resources/zh_TW.lproj/Sparkle.strings - - hash - - 1FLKoM5jZ8JGBG/nmyEIA+/aalA= - - optional - - - - files2 - - Headers/SPUDownloadData.h - - hash - - 0uirAEMDYuzqSh3dbtfncvlTpvo= - - hash2 - - DkOXqPnwmXR6QeDI4ja3DtFxDW5L3Dcjf21hEPWImoY= - - - Headers/SPUDownloader.h - - hash - - OAA6tKxz1g4V1SQZaj3RPNmNMzo= - - hash2 - - OEDz5kY4WgtWuZ8SApjyqvVDEf3iEj7Sg2uhl+3J+jk= - - - Headers/SPUDownloaderDelegate.h - - hash - - UkBvHxzNYA/YON0ImE8m/8g4vkg= - - hash2 - - 8D6RyR2aziRQIiRN3e7qxlEM9jfgkwBBTWmSjDhLqm8= - - - Headers/SPUDownloaderDeprecated.h - - hash - - l7/+P82TkgRp/YLnQtJtjMWd3/A= - - hash2 - - A7PBMhwuTH0X/JDeyLlh1Xrdc0krwjPqdBPCiePFrxQ= - - - Headers/SPUDownloaderProtocol.h - - hash - - VsD58zsMmnH4mVuK456ekiJcYFU= - - hash2 - - 02oqvyfRCQp5SMSBQNzYZaz1/0VTso0GKnOSbuDEAVo= - - - Headers/SPUDownloaderSession.h - - hash - - IeDSEpUGRwB9HcDVlqbxb6k19A8= - - hash2 - - ZFXLQz90P2h4rR2v1VqRAKzrSSlItkO5cW/0AFy7eYQ= - - - Headers/SPUURLRequest.h - - hash - - 588/W6GUNXYFVar9nygqHNYeTX8= - - hash2 - - 4EG4qYbJgM0wBJCoSPD1lbbDTLHlm85m4xNehyXyU74= - - - Headers/SUAppcast.h - - hash - - puyTMIscPdgGWGQM4TITePIKSdA= - - hash2 - - R3/VQvZCv8Ab34CC17vtBHR3dqkJXnidTR5n8aX4DD0= - - - Headers/SUAppcastItem.h - - hash - - YQvyEYAn6UWDwU8NT5ccPwhdRXE= - - hash2 - - ZB27X0FfNZ54ez8FZAFDEi6/o4BYtQnl4A9Y3tAbkUI= - - - Headers/SUCodeSigningVerifier.h - - hash - - Wj90pgADRte0DhyUmlOXWORp830= - - hash2 - - PPwqqlfaR8hxIfD2YEKdVzyDN4kBVdul55HDAELxQ7U= - - - Headers/SUErrors.h - - hash - - fXyYJmeBH5lNthmGD2GJOWkMmjg= - - hash2 - - JKSoOJCqip87NB39v1ip2Gki8x1rGVcXB7D6kTCeBTI= - - - Headers/SUExport.h - - hash - - G2w3uU/V7JzIupuOjQ2LyPVGdo4= - - hash2 - - XO8CQmbFThLbYg949NEGhg3g+iouIw3/3+BCCLtEdFE= - - - Headers/SUStandardVersionComparator.h - - hash - - 6L4GrA8i1OjMLIGc/sFvEUeSfso= - - hash2 - - 5HrjOlX+uJHOw1ma+1BtG5tlYx/75N/gVzt+BX/GOxg= - - - Headers/SUUpdater.h - - hash - - krK593R1jTMhVN/yl8nXWo1WIfg= - - hash2 - - IJc5cjKEoEbG6onu/Dy+1OXT5YJ7GV3R1U0u2FamUsY= - - - Headers/SUUpdaterDelegate.h - - hash - - MHw1NrGxR116E8+4fIwJlj7xhlU= - - hash2 - - I9h48457oU5WcQiRBj2su4zWt34+hDtHwnoeLWmZ7Ko= - - - Headers/SUVersionComparisonProtocol.h - - hash - - pin8CrEV9eYWF9sdDu0N1YixWOE= - - hash2 - - rsm3T+GsIhDgSqY8EtkBpIxYgSZCZxf4HE9a/FcTRCc= - - - Headers/SUVersionDisplayProtocol.h - - hash - - D3yVFnts0j1IacN9dSN7iZSVlZg= - - hash2 - - AQITUMp8aq1UAOrmksAKmGFpgI24u9rDSBBZrgDqdN4= - - - Headers/Sparkle.h - - hash - - wr5DylsSwG9e5D1UOhUWQxcyz/g= - - hash2 - - OWWeiknWNtWrmGQq0pZ+Hst0PnbN6WbPhGHqIhk4MOM= - - - Modules/module.modulemap - - hash - - /2jgDcgH5+EG9ojcVskajfVo4yg= - - hash2 - - 1TF+JZkzFr6n8oH4WItto+C5Vf3K12f0H9KjqD0A5QU= - - - PrivateHeaders/SUUnarchiver.h - - hash - - 7mTpmnTkJ97DZQQzK/hdl2aZmXU= - - hash2 - - SQYAanTtlyX15CJapj5tDbhBEMtgQ7ZNdmpSij0+tD4= - - - Resources/Autoupdate.app/Contents/Info.plist - - hash - - KWwWNYJdjhEgQdb+JKppt0+bKAw= - - hash2 - - bgTg13jwvWOn92uv8/O2qhxZPPCp1emg0XMNJrZW01w= - - - Resources/Autoupdate.app/Contents/MacOS/Autoupdate - - hash - - wmoMz7rSIYpe2GRwL0iOO7x8XJM= - - hash2 - - lszgZb1NwAmFrPK6PeGYdNoHHn45fGBqfTBpRUKjmok= - - - Resources/Autoupdate.app/Contents/MacOS/fileop - - hash - - sLn9bRjeR7iPZnPSuCsiIUN5bzk= - - hash2 - - UHXMv35gO5TpirbNhatLHrciNfhFl8Ix57g5+l9WSag= - - - Resources/Autoupdate.app/Contents/PkgInfo - - hash - - n57qDP4tZfLD1rCS43W0B4LQjzE= - - hash2 - - glAhkclISwTWhTdPmHmgBmBpxJuKyuegSwHTjQfo7KA= - - - Resources/Autoupdate.app/Contents/Resources/AppIcon.icns - - hash - - 4McwRDEss5BzWwUMG2Xf93+ze08= - - hash2 - - nq7j0ugQwyNbJn/7zGFwxIR0njwU3i7hAYKEyZhvUfE= - - - Resources/Autoupdate.app/Contents/Resources/SUStatus.nib - - hash - - ECVWRExfxyDt5uvKRD+70wc9J6s= - - hash2 - - AtY9YmPv7cUlbFWP2vCyVdi3/M+XQn98wOlrIES2Dgk= - - - Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings - - hash - - Rf4jjdgTqvfw5JO/6f9jHMURv/U= - - hash2 - - 2cAJJ5NTxwpRgp24Ca3EuTXfaIIzsYdH3Y9cNCalZfc= - - optional - - - Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings - - hash - - wGGx+QzPg/20zZTq7jwCTgf/Ubc= - - hash2 - - om5I6jKleuRoCwjfrRRqKWQbs2l8lLj8QGKS47cxybA= - - optional - - - Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings - - hash - - bY3rkqi/NJtXtjpK3FbV2o0gxbQ= - - hash2 - - RfJgT2b3STcLu71+1iU9ZcSXbfwMWG1EE1C7Wrf3xBk= - - optional - - - Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings - - hash - - 0t7SuLDMBZVsY240PAEsVfH/1qw= - - hash2 - - wu0CpGqE79+TXKIQm+q7ycPTuXhOlwRr/wD5uGHJzLM= - - optional - - - Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings - - hash - - fsC7FJvExHE/2681tuUrjkSF2+A= - - hash2 - - XUpgsFH8KmcbgggpdYbJScCg0tBic9tNLdFh+8cbPyw= - - optional - - - Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings - - hash - - NbIN+TRHORCL5Gfj68VRq4KdPXo= - - hash2 - - wt+2xyusmWAQuJ5kAQlRlvFb1wO4L7/rFdG+VmNjl+Y= - - optional - - - Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings - - hash - - cHZov5FaqzfNhnBo0XdRuTMT4SY= - - hash2 - - 39CdfZZ1CQQz1Gd1+Ukxo2JHl0XESoc/cqWKF091WUk= - - optional - - - Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings - - hash - - QPG88BN+x/l2Qk1NLLe3wRa26mQ= - - hash2 - - mtOoKdoTpGzeTNyzxkVGOMsE0Z3ZZOsmIKDfgA9aj8c= - - optional - - - Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings - - hash - - yd6pIoSj19HMDIUos4Td1Fch7bs= - - hash2 - - +AiiKWEdH3lesozLJBn3tfK6vi/VSI1/TnWVmIdVVsc= - - optional - - - Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings - - hash - - X3URilwJPVqMTGbtrYdorODwrMA= - - hash2 - - fyqJl0MhXYRILalxRHpv/JorWLOVLPtNcJioiPtlnYg= - - optional - - - Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings - - hash - - U2WmlYGYmeeIlSW66R8awwmNXIE= - - hash2 - - 4gUlWkwTANV/jd7n4OZoXyT8CAcgWVk/tI3a25wmuLg= - - optional - - - Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings - - hash - - 7LLOVs76ioMwEDV8Gah+6sV/5No= - - hash2 - - TwklhrooHTXgV6Q9fbvvAB3mPIh7qDbEsNtUzo2fQuU= - - optional - - - Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings - - hash - - bNEmsO2LyUsMjTESH1I42V9sAOo= - - hash2 - - sRkp8c3Bx1qWdhhSNdOap1PbfmiTziINy1HxGea3SWU= - - optional - - - Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings - - hash - - 8fxzD9ZhrvIZVZB1+QSJaPzg80M= - - hash2 - - xcV1yh/zU3U3TsRUT6vGybvIQitf+ThrogN/uOWmD8k= - - optional - - - Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings - - hash - - bk1J6vpZjWeUFhBYWuWZf8TDv1A= - - hash2 - - Y+caNW+g0mt7HP4JrBxJw+uDwN3j19UYb+q5r9ch4Ow= - - optional - - - Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings - - hash - - f4EbR/GfMsKeWJ5DN/vhwg/lUoE= - - hash2 - - dSPIvpFbelHRv8liJjN3TUVPbgD1DfhVSGmE+S99quI= - - optional - - - Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings - - hash - - FRHRQPCWEk9GdJawYTuccg+E2tA= - - hash2 - - +bxn0NPgkxdHLa1MHRT+JRlYmy1jpIuaenpst5RT+RA= - - optional - - - Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings - - hash - - sgrDElwUxXtzdw8WaUFWyK3pG9Y= - - hash2 - - FG+w+OnLI7nwnNCWiMT50LU98VWj1d08ElfX4k7Ok4w= - - optional - - - Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings - - hash - - PWbC08zHFLROqivY2MAklDh6gkA= - - hash2 - - xnQkqxaO8zP1xpjY3nyjOd4Fe0gJon2Dbt456ukd/Gw= - - optional - - - Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings - - hash - - o7deBXE2Ct8/vQxouej5KkwTcUA= - - hash2 - - pDq+41jhfESgJauedrYncFY1O5EMEU3nRyl7mmyYj+s= - - optional - - - Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings - - hash - - /adUv04OXQkCFv+Oed6qktFVQ3E= - - hash2 - - lY5EZJwPc/Rmfhw1gotkeEKB+ANXqZUlM2G92sZwdJc= - - optional - - - Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings - - hash - - Mji9loJOJvuDY9hz3FhQ4H+HY5E= - - hash2 - - RUq6VJjn/QyydkNbpklLwfCgRF62+uHhXen2dYLBNuQ= - - optional - - - Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings - - hash - - 9U+OTz29kXKZHY/nmvbtemMsB3g= - - hash2 - - NNvDsecglQ/utR6YEqxyMj5K976YRWieCIC/PZuWCtQ= - - optional - - - Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings - - hash - - VpSLGNvZ6sbRYsF23L8m6TG+P6E= - - hash2 - - wJZ5NG+mvj4anRFPUFyvSD0kGrg+ZAqklsPfHuCxLQY= - - optional - - - Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings - - hash - - qn/mo2EFOyw6keezS64Wo5ZGZXU= - - hash2 - - e3cyzJ87ohC1ff/BzZ5O00MnwRE02U+J1KwXlSZeSSg= - - optional - - - Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings - - hash - - kwvdisufBenuQzrVg8tYKTX+qgg= - - hash2 - - t8QC+9TBONwKLQvV3fKV0umsnAS8ZDpqPikVksFPtWc= - - optional - - - Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings - - hash - - 98/sk+A2Ew1fmKpuKZ3rq8eS1EM= - - hash2 - - mJY6aeXFnSx38bF630z5lNPmPtsoYVAwadh0KC+9vfQ= - - optional - - - Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings - - hash - - HQwGW1Ebf0i+Bl4synks3x2SY2M= - - hash2 - - nlP7repbMz6EqHo3sZWnK3tzx47WKSWnULdUHCYPgKk= - - optional - - - Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings - - hash - - whUQco5F2wcYdjc+cPKlk+mtx7Q= - - hash2 - - xEXUfrylPld+eFGrPyj4wTRPj7vUWOZ2f94sWydq03M= - - optional - - - Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings - - hash - - JXhpqvLkX0yDWjbWgsk2wbSObKU= - - hash2 - - u0572QZYh6sB0GQdMGMePalOf4zkxE7YQG7pp898SEg= - - optional - - - Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings - - hash - - OnR96Z9tB0noODRSYssSs63+zGA= - - hash2 - - zvMbFdgVGI0ls9vIRT+sie7dj2g1UjQu7iS+pOgyBo4= - - optional - - - Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings - - hash - - 1FLKoM5jZ8JGBG/nmyEIA+/aalA= - - hash2 - - Vlf/4QD7/3S0SFqxmTWWcSwtTLWISKUSvLjpgWb7lxQ= - - optional - - - Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources - - hash - - gVbyGydhWFWErsmdSv38sD2CK5c= - - hash2 - - xNUqUNyngfi8k/exRqWBSB5QM7uvIBXFKQndz+/Fav0= - - - Resources/DarkAqua.css - - hash - - SCihC2/GG/DhF4xcXD9MYaxhawM= - - hash2 - - 1G4+GJId47E8UijYTy9xeqA8RpLdOaGZQZ8B85ydROg= - - - Resources/Info.plist - - hash - - 5bKlbfUn+UpXGvwWaLxm5i9hZdU= - - hash2 - - 0S+PnP7Z3tIEwzreTid78L5apKkt5KGQB9SHn7H9JuY= - - - Resources/SUModelTranslation.plist - - hash - - iD2Ex40Usc4ZE6IAhRePqgwK/xw= - - hash2 - - bxnpRQhROJXTL2xuIeffR3p+hOuuji7eOoDeNqSYqTg= - - - Resources/SUStatus.nib - - hash - - ECVWRExfxyDt5uvKRD+70wc9J6s= - - hash2 - - AtY9YmPv7cUlbFWP2vCyVdi3/M+XQn98wOlrIES2Dgk= - - - Resources/ar.lproj/SUAutomaticUpdateAlert.nib - - hash - - LtkONVbhTzwCPtbjkr06qSniXCI= - - hash2 - - CL6tBm495f4yM6z7y8UHRhtooR3NLGfDUOMHspa3d6k= - - optional - - - Resources/ar.lproj/SUUpdateAlert.nib - - hash - - JeZDdP1OuZbqkm8UKYiyH00A7ss= - - hash2 - - CE1qJ1jrwUiTKTlZajb/bhplzo/rdEH6pm5cABwD/rQ= - - optional - - - Resources/ar.lproj/SUUpdatePermissionPrompt.nib - - hash - - 2bUXVaur0g5gL09vMdkjjnG/gx8= - - hash2 - - hd9zDyzNA+IOLbG1fnSYI8bz6/8/zSdgEWGIHWaR9QY= - - optional - - - Resources/ar.lproj/Sparkle.strings - - hash - - Rf4jjdgTqvfw5JO/6f9jHMURv/U= - - hash2 - - 2cAJJ5NTxwpRgp24Ca3EuTXfaIIzsYdH3Y9cNCalZfc= - - optional - - - Resources/ca.lproj/Sparkle.strings - - hash - - wGGx+QzPg/20zZTq7jwCTgf/Ubc= - - hash2 - - om5I6jKleuRoCwjfrRRqKWQbs2l8lLj8QGKS47cxybA= - - optional - - - Resources/cs.lproj/SUAutomaticUpdateAlert.nib - - hash - - YpT086oHMS9O2TvSNLZh+39oy80= - - hash2 - - YyE1WN1/ryPt2H0D9gYJv/r0SSv8VYTcxiiNeELiJIQ= - - optional - - - Resources/cs.lproj/SUUpdateAlert.nib - - hash - - v2ac1JQZvkm8EHZiTUc/q4aBcU0= - - hash2 - - LWRxgLZHNGYOe63gf0aOD8zoP03Z1s7ldxndzkWbzGw= - - optional - - - Resources/cs.lproj/SUUpdatePermissionPrompt.nib - - hash - - i6pnEW/pEUtK6j2Ky5Sz4ePqb1c= - - hash2 - - EdWfEPIFGhF3V7dnc+gNggkxMTDh21KimlCo1ZEC0ag= - - optional - - - Resources/cs.lproj/Sparkle.strings - - hash - - bY3rkqi/NJtXtjpK3FbV2o0gxbQ= - - hash2 - - RfJgT2b3STcLu71+1iU9ZcSXbfwMWG1EE1C7Wrf3xBk= - - optional - - - Resources/da.lproj/SUAutomaticUpdateAlert.nib - - hash - - XCqcLv38cTpbjAE4zjN/JWeT3+U= - - hash2 - - ivTLD912Rxy2BqIYFAQjsqh4PofwMLljqh6ncdYEdy8= - - optional - - - Resources/da.lproj/SUUpdateAlert.nib - - hash - - BY0imp6dA7C0GSOK81VXTJsRccM= - - hash2 - - BZL9bUc/f5RpZHoQGkA/XXKvykMh/LwkqI+1XW14Bxk= - - optional - - - Resources/da.lproj/SUUpdatePermissionPrompt.nib - - hash - - dbG/KHSKzElkUxJa08TkzSUwdg4= - - hash2 - - CPb7A1G9rBlQfgjTiO99mRzsCSfS47f1tcIfzdDq/f8= - - optional - - - Resources/da.lproj/Sparkle.strings - - hash - - 0t7SuLDMBZVsY240PAEsVfH/1qw= - - hash2 - - wu0CpGqE79+TXKIQm+q7ycPTuXhOlwRr/wD5uGHJzLM= - - optional - - - Resources/de.lproj/SUAutomaticUpdateAlert.nib - - hash - - i/BaQXOSENNulhl0b5jssezuU3Y= - - hash2 - - vZn/tXvSzWZPBBo0cVnIiPjRYfiMEtABs2gGlmJ3DKo= - - optional - - - Resources/de.lproj/SUUpdateAlert.nib - - hash - - lieYpCoCaCKAA3EL3/EsBr46vqI= - - hash2 - - pOQG4CEenyMCs6E53Yf2+yYR99NwtjC9ESL6Hp719iM= - - optional - - - Resources/de.lproj/SUUpdatePermissionPrompt.nib - - hash - - RPyksdcohNoYO9AulHe18aV0SZY= - - hash2 - - 7deRMHXIMZH/ik5ZD5oOaQ0ghLSq9ZDayRK0e271xlQ= - - optional - - - Resources/de.lproj/Sparkle.strings - - hash - - fsC7FJvExHE/2681tuUrjkSF2+A= - - hash2 - - XUpgsFH8KmcbgggpdYbJScCg0tBic9tNLdFh+8cbPyw= - - optional - - - Resources/el.lproj/SUAutomaticUpdateAlert.nib - - hash - - s3rpfaKP5+1+vGc44qpcWy+h0t8= - - hash2 - - 8Dy4OJ7vlhUCXCV6cjyExPoQWOtUSRnuNLpDxfel5ss= - - optional - - - Resources/el.lproj/SUUpdateAlert.nib - - hash - - sJcnQqAH4BsB+2rz9riB7iqePh0= - - hash2 - - oZ9SfHTeIGNZtJjH75VsT01y5Vo2tq2VCPVF8bDddeE= - - optional - - - Resources/el.lproj/SUUpdatePermissionPrompt.nib - - hash - - WbqjimwnC4h+B7DynMFS4qPhljo= - - hash2 - - 3y5vyIOkF/ex5pAymUtYTgRyhQN/RGoaJ5EeeGvx1Z0= - - optional - - - Resources/el.lproj/Sparkle.strings - - hash - - NbIN+TRHORCL5Gfj68VRq4KdPXo= - - hash2 - - wt+2xyusmWAQuJ5kAQlRlvFb1wO4L7/rFdG+VmNjl+Y= - - optional - - - Resources/en.lproj/SUAutomaticUpdateAlert.nib - - hash - - Y6bIF/+bAP3t5gBwPcdqxsj4co4= - - hash2 - - LK+XUVI/B5vkE00baFJQzgTVPcWQu2vfztwnjkmtAdg= - - optional - - - Resources/en.lproj/SUUpdateAlert.nib - - hash - - L3hoxekBQAtpmyDXNhTX7kRXRtc= - - hash2 - - c1eSzlRx9vqCBLiF84w+iiiGeii8RIOVaoC8Ds3gndI= - - optional - - - Resources/en.lproj/SUUpdatePermissionPrompt.nib - - hash - - g/8UXLSUBGROl64wXKn5Wr59X/c= - - hash2 - - +AnL33G+6dTHMl2qBN97TavuQbWNpQUbT/3LIIiYuvM= - - optional - - - Resources/en.lproj/Sparkle.strings - - hash - - cHZov5FaqzfNhnBo0XdRuTMT4SY= - - hash2 - - 39CdfZZ1CQQz1Gd1+Ukxo2JHl0XESoc/cqWKF091WUk= - - optional - - - Resources/es.lproj/SUAutomaticUpdateAlert.nib - - hash - - BoS6NAq1zyVcmkbrKJhcI9Zrezk= - - hash2 - - GtD3UAnIT5BoshJo4areAKSruPfavkvTIyNd0gjejDM= - - optional - - - Resources/es.lproj/SUUpdateAlert.nib - - hash - - UMa1QcJf8zfpVUnIZUGFfJ64wTk= - - hash2 - - 3KPglR1oBAj4L7IA3Y4fYKtWrk2kpbl7jPZwPCByWfo= - - optional - - - Resources/es.lproj/SUUpdatePermissionPrompt.nib - - hash - - rH20AzERYudrcbwIQQO107Z2zGo= - - hash2 - - dX7VHzaMzRDfe7o9odqlRwNCeWMNiO9BwWJyE5+rP8Y= - - optional - - - Resources/es.lproj/Sparkle.strings - - hash - - QPG88BN+x/l2Qk1NLLe3wRa26mQ= - - hash2 - - mtOoKdoTpGzeTNyzxkVGOMsE0Z3ZZOsmIKDfgA9aj8c= - - optional - - - Resources/fi.lproj/SUAutomaticUpdateAlert.nib - - hash - - 6aUnn3XSgWKnVuYVA/PVSrwora8= - - hash2 - - QVnq+Bn52L27jHSSWCd5PGIBzAeU4HwlTMuL0+M3JMI= - - optional - - - Resources/fi.lproj/SUUpdateAlert.nib - - hash - - k8QjxmBhk5B6v1fGnFkwwX6oakg= - - hash2 - - R5U4ry1iLGtnxFs4Ex8GdV7tpXKbo1HoH0rsSQKIO1M= - - optional - - - Resources/fi.lproj/SUUpdatePermissionPrompt.nib - - hash - - h7CaxzsvAjayHOo/I9uD1xZMMFo= - - hash2 - - 81DxJoTMXVekTi4E76BrVDgvxP6BmZsp70shwndyUsc= - - optional - - - Resources/fi.lproj/Sparkle.strings - - hash - - yd6pIoSj19HMDIUos4Td1Fch7bs= - - hash2 - - +AiiKWEdH3lesozLJBn3tfK6vi/VSI1/TnWVmIdVVsc= - - optional - - - Resources/fr.lproj/SUAutomaticUpdateAlert.nib - - hash - - Nj5v0wIECbpjSTU74xKBngH4DeY= - - hash2 - - iJPr/YNl1hGgBNcbjpEttX7EgNKwsu+R3oVtXyoxxV0= - - optional - - - Resources/fr.lproj/SUUpdateAlert.nib - - hash - - RPgJubd38D/WH1H6B1jSejqILE8= - - hash2 - - KtHl8n7bnlZ3Ir0ymG0RdRWNezTCdzyBh9HO0AB2TrA= - - optional - - - Resources/fr.lproj/SUUpdatePermissionPrompt.nib - - hash - - I2iLdKSjbtR5z2V21+jBWWV/cqQ= - - hash2 - - ENKVZHahuu5f9tyeaQzvs8X1vMqj4oKjd+CSoXN+G2U= - - optional - - - Resources/fr.lproj/Sparkle.strings - - hash - - X3URilwJPVqMTGbtrYdorODwrMA= - - hash2 - - fyqJl0MhXYRILalxRHpv/JorWLOVLPtNcJioiPtlnYg= - - optional - - - Resources/fr_CA.lproj - - symlink - fr.lproj - - Resources/he.lproj/Sparkle.strings - - hash - - U2WmlYGYmeeIlSW66R8awwmNXIE= - - hash2 - - 4gUlWkwTANV/jd7n4OZoXyT8CAcgWVk/tI3a25wmuLg= - - optional - - - Resources/hr.lproj/SUAutomaticUpdateAlert.nib - - hash - - SkgPcXJYp5dizLAgiXfyl9EsPoI= - - hash2 - - 2h4d04V7H95/KuIy1kBjzDQqtfxnZrRzKlxEjk3NYRo= - - optional - - - Resources/hr.lproj/SUUpdateAlert.nib - - hash - - 47iMWOA+94RZGJW+QJCeM4xOUsA= - - hash2 - - ReDJwTVXlm8iJWToPp6haL3A35LkgyNtEYfEYQ38l+A= - - optional - - - Resources/hr.lproj/SUUpdatePermissionPrompt.nib - - hash - - KcZQYPdSeOeuTbFYdiS4NMY+gHM= - - hash2 - - GDiDUxJaUabKqhCY0HBuzjqzgN7ZFWE9R/vUZiI0smE= - - optional - - - Resources/hr.lproj/Sparkle.strings - - hash - - 7LLOVs76ioMwEDV8Gah+6sV/5No= - - hash2 - - TwklhrooHTXgV6Q9fbvvAB3mPIh7qDbEsNtUzo2fQuU= - - optional - - - Resources/hu.lproj/SUAutomaticUpdateAlert.nib - - hash - - PfYCBbOThC1gBDzoxD+ijdyQ3T0= - - hash2 - - C9vH4mEYy0VzQEvjXYfCMPM4ggBQF1APABRkUOUQwPA= - - optional - - - Resources/hu.lproj/SUUpdateAlert.nib - - hash - - 6RlHCvHc9GNh1M7iJhvn12iFGpg= - - hash2 - - 8vAkRUe47lFmMm7zUZM55/XRK21KahmSbRy0Axp6gw0= - - optional - - - Resources/hu.lproj/SUUpdatePermissionPrompt.nib - - hash - - S4W9ksaDnuIRy8L1ekCKN9+WfP0= - - hash2 - - D51KDsOJx7Lhz34vgOMk214ZPXrA7y4bZbuuSRMDbnM= - - optional - - - Resources/hu.lproj/Sparkle.strings - - hash - - bNEmsO2LyUsMjTESH1I42V9sAOo= - - hash2 - - sRkp8c3Bx1qWdhhSNdOap1PbfmiTziINy1HxGea3SWU= - - optional - - - Resources/is.lproj/SUAutomaticUpdateAlert.nib - - hash - - 9eOJ/dQvTMu45Z1UowMPaKHYQOI= - - hash2 - - QpgLimdJiwdp2DVF/DMQyJ2Zg8L2ihsreE7vcI8Uqh0= - - optional - - - Resources/is.lproj/SUUpdateAlert.nib - - hash - - F0aP96zh7QOSkAdFsBlIzBhmCIg= - - hash2 - - t7A1i/lrse5T6UZtyfTdB/7HRH5vPNuOj2I+QkIjAEI= - - optional - - - Resources/is.lproj/SUUpdatePermissionPrompt.nib - - hash - - KeGsuRgX16ROMEZ8ymQNHPp6/qY= - - hash2 - - If8lcyvdX5O4+cop3EljOZMtV+jeZBSoKZJCBY+3e3A= - - optional - - - Resources/is.lproj/Sparkle.strings - - hash - - 8fxzD9ZhrvIZVZB1+QSJaPzg80M= - - hash2 - - xcV1yh/zU3U3TsRUT6vGybvIQitf+ThrogN/uOWmD8k= - - optional - - - Resources/it.lproj/SUAutomaticUpdateAlert.nib - - hash - - JXGMS3rtry8HTWEbBibxVCkBEmw= - - hash2 - - 5+DJlDvCzlPxtarex6vBp6GBNUjc//XUg1dP+YKgQvo= - - optional - - - Resources/it.lproj/SUUpdateAlert.nib - - hash - - W45+n9zTkxt1E3v6cZYLzXNtDlc= - - hash2 - - dMHKLXO9jQ/ephXEzJ8zaCiJ2TD94Xdtlfwqn0liUVo= - - optional - - - Resources/it.lproj/SUUpdatePermissionPrompt.nib - - hash - - 6K3G2WyaGjrTeQHoweUjaKh6X3A= - - hash2 - - XLe8J/L7G0xGBtgU9RWWm7QXrwq95DwQWDpVAeKiz0I= - - optional - - - Resources/it.lproj/Sparkle.strings - - hash - - bk1J6vpZjWeUFhBYWuWZf8TDv1A= - - hash2 - - Y+caNW+g0mt7HP4JrBxJw+uDwN3j19UYb+q5r9ch4Ow= - - optional - - - Resources/ja.lproj/SUAutomaticUpdateAlert.nib - - hash - - 9fRyIZvZMUaRTaWCda7NsPqJle0= - - hash2 - - 17Hm2P7maddnurefS4zzxjw/i66hgAqMfPCnw5etp8c= - - optional - - - Resources/ja.lproj/SUUpdateAlert.nib - - hash - - L07PCZt4pHgRzMPxV0N6F2QK9kM= - - hash2 - - qzSS0s4cMsrK7155WvW8tp+ToVcFs5pmCwrBC9Lr/ec= - - optional - - - Resources/ja.lproj/SUUpdatePermissionPrompt.nib - - hash - - hKgWGHf0ha9Io7qZ2ChHjSsH6/s= - - hash2 - - JJ+lvbbytQjyaVr7QO9kZ2F+1tm26vRBySDIQu4Mcg8= - - optional - - - Resources/ja.lproj/Sparkle.strings - - hash - - f4EbR/GfMsKeWJ5DN/vhwg/lUoE= - - hash2 - - dSPIvpFbelHRv8liJjN3TUVPbgD1DfhVSGmE+S99quI= - - optional - - - Resources/ko.lproj/SUAutomaticUpdateAlert.nib - - hash - - gi+8llNjjuFSKRkNAA7vN/mf1uA= - - hash2 - - xhSLkCd/oWSClxzjFJOGmPOAS3u0od2to6thPF+1hi8= - - optional - - - Resources/ko.lproj/SUUpdateAlert.nib - - hash - - UNAQQTvtG7+MN/4w4ouu9ZHXfCM= - - hash2 - - rU7gnpi3PsnD0n0noPJN7LKUwxXFHCjixcW7WHa1q2Y= - - optional - - - Resources/ko.lproj/SUUpdatePermissionPrompt.nib - - hash - - fUirMWEByjvEZ4Ur3uhDypdTX00= - - hash2 - - sl25e8Utl+etgyKlDz26TCKdpYV9Ov0UuIf6MQHq05o= - - optional - - - Resources/ko.lproj/Sparkle.strings - - hash - - FRHRQPCWEk9GdJawYTuccg+E2tA= - - hash2 - - +bxn0NPgkxdHLa1MHRT+JRlYmy1jpIuaenpst5RT+RA= - - optional - - - Resources/nb.lproj/SUAutomaticUpdateAlert.nib - - hash - - kJLypTD4VsCOwsXiOd6700pn0Cc= - - hash2 - - k7N16zCtXUz9SCO2rA2PSAb+B9zsqeF9kPAlIPeRQq0= - - optional - - - Resources/nb.lproj/SUUpdateAlert.nib - - hash - - WIJIO1qR0uNQtJpVkhIarVOfgFw= - - hash2 - - 8g/ElSO4yIXKBPWT/sbST8vdzCsbEVIeHZSxJbCzJ4M= - - optional - - - Resources/nb.lproj/SUUpdatePermissionPrompt.nib - - hash - - 4lQkM7OM2WfWZkvaBY8841eyT0E= - - hash2 - - QtnNxA2VJD7KdQfHWg59EMi5v7J5L71p7yR3PleFD50= - - optional - - - Resources/nb.lproj/Sparkle.strings - - hash - - sgrDElwUxXtzdw8WaUFWyK3pG9Y= - - hash2 - - FG+w+OnLI7nwnNCWiMT50LU98VWj1d08ElfX4k7Ok4w= - - optional - - - Resources/nl.lproj/SUAutomaticUpdateAlert.nib - - hash - - wPmqlbK7p5mjPDrezXrYK8CG3NA= - - hash2 - - zV9zmt6+b1fbS8Nzwh35PAkW5vdYcJ64kjUjQyde+Mo= - - optional - - - Resources/nl.lproj/SUUpdateAlert.nib - - hash - - 7EXAJEeeN0k32jvOHKr7Icq4644= - - hash2 - - 3I8r+QxaqIEqBcdZogXU5VuDg87Ls1S5Ss1nhmfM8Po= - - optional - - - Resources/nl.lproj/SUUpdatePermissionPrompt.nib - - hash - - hzjMuMEBooqc++naXBflhhc16vM= - - hash2 - - +b1IimJ65Nqv25/b377zZMtCfLFvfNRnoqkA5BVf/HQ= - - optional - - - Resources/nl.lproj/Sparkle.strings - - hash - - PWbC08zHFLROqivY2MAklDh6gkA= - - hash2 - - xnQkqxaO8zP1xpjY3nyjOd4Fe0gJon2Dbt456ukd/Gw= - - optional - - - Resources/pl.lproj/SUAutomaticUpdateAlert.nib - - hash - - 4aIS8LbPLTj63EhS7xEk+qjNzD8= - - hash2 - - PvUb+gVq9mfBJ4c4Rp3cyMOr6Fw7EqVwOSYCXdskwUA= - - optional - - - Resources/pl.lproj/SUUpdateAlert.nib - - hash - - pLII26utl65JwmAFqLiMefDsrGs= - - hash2 - - KNo3HyQuwczwWYBLgpAwz1nk4Lo/IuCN4SZpFhn8diY= - - optional - - - Resources/pl.lproj/SUUpdatePermissionPrompt.nib - - hash - - wIe21CUILU7RUksjexoQFfUNt6c= - - hash2 - - j9wbkXk9pjZU0oi6k9M2CWvM+AoNdAouR4pBikigplw= - - optional - - - Resources/pl.lproj/Sparkle.strings - - hash - - o7deBXE2Ct8/vQxouej5KkwTcUA= - - hash2 - - pDq+41jhfESgJauedrYncFY1O5EMEU3nRyl7mmyYj+s= - - optional - - - Resources/pt.lproj - - symlink - pt_BR.lproj - - Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib - - hash - - 8fQxJZw+LQiExfyPaqUbNnASsWU= - - hash2 - - 7Xu6H76LF/BEqK9o0LJHpt54NV3JbY/TPoinZv9GfSQ= - - optional - - - Resources/pt_BR.lproj/SUUpdateAlert.nib - - hash - - zW5zEa6rDpqLuTDfixuKKE93E5o= - - hash2 - - fbgvSsPkysitkmLfP26OmYpP/r+044gpfMHqQoQp9Ns= - - optional - - - Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib - - hash - - LnGHg/0zbDsX5GOE+RuItGOeM3g= - - hash2 - - po6G27I+x6t4LrP0snclOJG6cAG8Atm7AtOKw5Cnv7o= - - optional - - - Resources/pt_BR.lproj/Sparkle.strings - - hash - - /adUv04OXQkCFv+Oed6qktFVQ3E= - - hash2 - - lY5EZJwPc/Rmfhw1gotkeEKB+ANXqZUlM2G92sZwdJc= - - optional - - - Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib - - hash - - Svc6e9pHrp1wA7rxw7oKc5HB8qQ= - - hash2 - - L4KDh1UJEm3ta+qgzCe3s3RI7xXrAY8y5h5eqneS3Uo= - - optional - - - Resources/pt_PT.lproj/SUUpdateAlert.nib - - hash - - NtD144OppS+BPXNmsReGJoN2Qdo= - - hash2 - - NOQ75dz/Mq7PLhwssExcWXdtTFQzx8m/lLpLBDCaZCI= - - optional - - - Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib - - hash - - DngrIdQPeavGfwbVI7GS1bK98C0= - - hash2 - - 2HpG3aXDkQ0/a8zlZK8m5uxKJDlomNUyxvb07aXbRp4= - - optional - - - Resources/pt_PT.lproj/Sparkle.strings - - hash - - Mji9loJOJvuDY9hz3FhQ4H+HY5E= - - hash2 - - RUq6VJjn/QyydkNbpklLwfCgRF62+uHhXen2dYLBNuQ= - - optional - - - Resources/ro.lproj/SUAutomaticUpdateAlert.nib - - hash - - 7HEo1dlbwSnit0+4DsAqKDz1jR4= - - hash2 - - KUqcmkrRCh+XjXh9F7fudt94MreG4bKqDh1PLat/FpI= - - optional - - - Resources/ro.lproj/SUUpdateAlert.nib - - hash - - FPWtaRuYrVSPrfAozq/4bSQfMK4= - - hash2 - - 2mIpfTwoRvVuhY/Aa3Bqw5VsjpV93xFNcBMQG83Q8DU= - - optional - - - Resources/ro.lproj/SUUpdatePermissionPrompt.nib - - hash - - NPLiF7WwQt7siCG8DLWh+ZGImWI= - - hash2 - - 3y6PRBSQUrxkSKoKqEFZHnQsUfwARyIbhNB+G8h6vCM= - - optional - - - Resources/ro.lproj/Sparkle.strings - - hash - - 9U+OTz29kXKZHY/nmvbtemMsB3g= - - hash2 - - NNvDsecglQ/utR6YEqxyMj5K976YRWieCIC/PZuWCtQ= - - optional - - - Resources/ru.lproj/SUAutomaticUpdateAlert.nib - - hash - - YHane6xWVhvpJGf5HuoxCyQ/gDs= - - hash2 - - qwuyYXCO4H5IuXiRhZR3ucGl5S1CtG2e7kxxCkM8vtA= - - optional - - - Resources/ru.lproj/SUUpdateAlert.nib - - hash - - NxM+W+qAegxK4lKy0uzCclpkVjo= - - hash2 - - Kvykt9h+o+SUuINROlMCXornVL/uEH2Uz5Kd0bNSm6k= - - optional - - - Resources/ru.lproj/SUUpdatePermissionPrompt.nib - - hash - - P0o42QteueF9d3aaoNcz6obcimA= - - hash2 - - vAV0lcBRi3i8mLnOGxAZKMlzMoV1dKkHtntkRWq8cl0= - - optional - - - Resources/ru.lproj/Sparkle.strings - - hash - - VpSLGNvZ6sbRYsF23L8m6TG+P6E= - - hash2 - - wJZ5NG+mvj4anRFPUFyvSD0kGrg+ZAqklsPfHuCxLQY= - - optional - - - Resources/sk.lproj/SUAutomaticUpdateAlert.nib - - hash - - 5k+e1kFtgoVo77RhyhZSXpRQGOQ= - - hash2 - - qZSxDMjtIXyNwOZYeUz2g9w6NFmKFStqy5UbKU9N3BA= - - optional - - - Resources/sk.lproj/SUUpdateAlert.nib - - hash - - l8XR02tvN10SX2aM9CtZ7BpIcqw= - - hash2 - - fD0W6cMr/MZ0C0qrsMD3jEbXdK+eq8L7tl87ZPDspmY= - - optional - - - Resources/sk.lproj/SUUpdatePermissionPrompt.nib - - hash - - stqj1WPWzlJrXELqXKGjcxPeqvI= - - hash2 - - vZ2+3fnyHP5H7mAHBcs6vMW7zRWMAdUrYEImvCvX9Jo= - - optional - - - Resources/sk.lproj/Sparkle.strings - - hash - - qn/mo2EFOyw6keezS64Wo5ZGZXU= - - hash2 - - e3cyzJ87ohC1ff/BzZ5O00MnwRE02U+J1KwXlSZeSSg= - - optional - - - Resources/sl.lproj/SUAutomaticUpdateAlert.nib - - hash - - htsZnsf4S+omnk4Z8En8qOOjrPM= - - hash2 - - 9kzvdHcdVqdxsioITBt+Am06twXcJpKMreMKHDDj4RY= - - optional - - - Resources/sl.lproj/SUUpdateAlert.nib - - hash - - /9xrGwHXOdPKFp82w4OjF+Q0WG8= - - hash2 - - r48ahwyC8EFi+44X/EtUfWvh8QCu9klpjqwwwzQHiXE= - - optional - - - Resources/sl.lproj/SUUpdatePermissionPrompt.nib - - hash - - ApIwZGSV2lqBRKNHGnwhpqmec9Q= - - hash2 - - Me9gqc96/bwV4oypq11RLh7TIcFaMug+ZahAJbaIoJc= - - optional - - - Resources/sl.lproj/Sparkle.strings - - hash - - kwvdisufBenuQzrVg8tYKTX+qgg= - - hash2 - - t8QC+9TBONwKLQvV3fKV0umsnAS8ZDpqPikVksFPtWc= - - optional - - - Resources/sv.lproj/SUAutomaticUpdateAlert.nib - - hash - - K0QpkucJxh5CRA9TYJCT5+gSHZY= - - hash2 - - 2GEt92QWRuf/s8NnoWD/HidalRNoLUoeJoC7UM3Y2Ng= - - optional - - - Resources/sv.lproj/SUUpdateAlert.nib - - hash - - dOxfomMC/X9MFFdsk1MyjKv1yi8= - - hash2 - - wIPOqj0JUePKauMIl6sT8YUjoxw1q36g+rrQvwkxfw4= - - optional - - - Resources/sv.lproj/SUUpdatePermissionPrompt.nib - - hash - - odTG4PkbDUjXrxuBzD+AnnKpOLo= - - hash2 - - DtpAT3NKA19p+MDugG6j9RILg2unD6vPWJC+uoL0pEI= - - optional - - - Resources/sv.lproj/Sparkle.strings - - hash - - 98/sk+A2Ew1fmKpuKZ3rq8eS1EM= - - hash2 - - mJY6aeXFnSx38bF630z5lNPmPtsoYVAwadh0KC+9vfQ= - - optional - - - Resources/th.lproj/SUAutomaticUpdateAlert.nib - - hash - - /iyQcDW4+Is40OSlKcWlEe9zKdo= - - hash2 - - gFeu5nmtM/aL1yTSsW9TPh9ZdN8r/lX5jhns53LlcfA= - - optional - - - Resources/th.lproj/SUUpdateAlert.nib - - hash - - cQCWeOMdd6mZEd9k0pl3FrZDT9g= - - hash2 - - vmbxfC0cI7IAAQRNDQ43V6vocH93TiejQmBr23NDAlQ= - - optional - - - Resources/th.lproj/SUUpdatePermissionPrompt.nib - - hash - - HNNvE7bGYAElmoeYbB7JREhcs3I= - - hash2 - - /zWPufbtGluhIyEvJFseifKQgvYqQvq7457HQxtnUyo= - - optional - - - Resources/th.lproj/Sparkle.strings - - hash - - HQwGW1Ebf0i+Bl4synks3x2SY2M= - - hash2 - - nlP7repbMz6EqHo3sZWnK3tzx47WKSWnULdUHCYPgKk= - - optional - - - Resources/tr.lproj/SUAutomaticUpdateAlert.nib - - hash - - fjnMF3XlYLFPJSpmIFizoGwOVl8= - - hash2 - - 3T/cO/cEIAM8QBGVg53bYvcYseEMPOhn0C+yReVVJEU= - - optional - - - Resources/tr.lproj/SUUpdateAlert.nib - - hash - - Y9dabfD0a7F1cV9OuFnyQL5BIIc= - - hash2 - - qwss8xg3cxWWQXqCLxXd6z1ygf6MHYjMDKtVGzTpF0M= - - optional - - - Resources/tr.lproj/SUUpdatePermissionPrompt.nib - - hash - - J3IIVJ3ytau8dSfjTtkWF9zh2nA= - - hash2 - - WyAEArMYGvG0SCp5KciPapfVxAQBnaICw19bEmpvZGA= - - optional - - - Resources/tr.lproj/Sparkle.strings - - hash - - whUQco5F2wcYdjc+cPKlk+mtx7Q= - - hash2 - - xEXUfrylPld+eFGrPyj4wTRPj7vUWOZ2f94sWydq03M= - - optional - - - Resources/uk.lproj/SUAutomaticUpdateAlert.nib - - hash - - YRRVgJ26NZd9+ebTI3UGdpi35eo= - - hash2 - - /lUZP3n163WFPUjg+ohhY7pnbmtrxuc164ew0tFmDd4= - - optional - - - Resources/uk.lproj/SUUpdateAlert.nib - - hash - - PoeaXUHUKNIm0bkX+GNnvFHlq9w= - - hash2 - - Pmyouw5QFzbN7VYg1RXFNm3IB4jOmZagTi9k8g2CyQE= - - optional - - - Resources/uk.lproj/SUUpdatePermissionPrompt.nib - - hash - - KTOBs3BNdg2ylIdMNsG3WLw5SsA= - - hash2 - - rWhCViQiI/EprwUb+/vwBLyeqJo4ehG9K9rc9Gh/Ils= - - optional - - - Resources/uk.lproj/Sparkle.strings - - hash - - JXhpqvLkX0yDWjbWgsk2wbSObKU= - - hash2 - - u0572QZYh6sB0GQdMGMePalOf4zkxE7YQG7pp898SEg= - - optional - - - Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib - - hash - - 2pvLfCu7EiI6OkCxu3+aLyeTPcU= - - hash2 - - tu9oMdBCiHiyRSJMEmm5x3oGY3aCnmwXPsRf1hjj7fY= - - optional - - - Resources/zh_CN.lproj/SUUpdateAlert.nib - - hash - - +xvQE3bFW1QXIUggZBlZkKn0gag= - - hash2 - - b6nNjM4vCBrXBbjH5GtbkPjZjJyMeSSBXO/tCRn+LFY= - - optional - - - Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib - - hash - - 9wwEreTf4JSKHFSiRGUKE2Ffs1g= - - hash2 - - Ie8hCqTFOwfwP/10iRUcwHWqeLqthgUYgB27mwd+7us= - - optional - - - Resources/zh_CN.lproj/Sparkle.strings - - hash - - OnR96Z9tB0noODRSYssSs63+zGA= - - hash2 - - zvMbFdgVGI0ls9vIRT+sie7dj2g1UjQu7iS+pOgyBo4= - - optional - - - Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib - - hash - - KQcqbpIyw3yhI0eEyo06cNq5MlM= - - hash2 - - POFOdG9uGjcVXkx39sW2Rwl2FJ2zs6A007yF1UpDskE= - - optional - - - Resources/zh_TW.lproj/SUUpdateAlert.nib - - hash - - 6/Rgln3/89vly1RFa1gBfRhITxU= - - hash2 - - AFd6Yy2xbmYtz1+r9u+r9qNka3oTzho3/n3DCwxWKoE= - - optional - - - Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib - - hash - - K4vg/ZQjaDTe9PQehvRbUNOWIUc= - - hash2 - - rpkcehO73xm6acIRoN/58VJhQEdvxwKbattoChh2Ycw= - - optional - - - Resources/zh_TW.lproj/Sparkle.strings - - hash - - 1FLKoM5jZ8JGBG/nmyEIA+/aalA= - - hash2 - - Vlf/4QD7/3S0SFqxmTWWcSwtTLWISKUSvLjpgWb7lxQ= - - optional - - - - rules - - ^Resources/ - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^Resources/ - - weight - 20 - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/Frameworks/Sparkle.framework/Versions/Current b/Frameworks/Sparkle.framework/Versions/Current deleted file mode 120000 index 8c7e5a667..000000000 --- a/Frameworks/Sparkle.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/INSTALL.md b/INSTALL.md index 4cd5ff648..48b60c427 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -39,6 +39,8 @@ Optionally, checkout Rime plugins (a list of GitHub repo slugs): bash librime/install-plugins.sh rime/librime-sample # ... ``` +Popular plugins include [librime-lua](https://github.com/hchunhui/librime-lua) and [librime-octagram](https://github.com/lotem/librime-octagram) + ### Shortcut: get the latest librime release You have the option to skip the following two sections - building Boost and @@ -61,7 +63,7 @@ export BUILD_UNIVERSAL=1 make -C librime xcode/deps/boost -export BOOST_ROOT="$(pwd)/librime/deps/src/boost_1_75_0" +export BOOST_ROOT="$(pwd)/librime/deps/boost_1_78_0" ``` Let's set `BUILD_UNIVERSAL` to tell `make` that we are building Boost as @@ -90,39 +92,56 @@ https://github.com/rime/librime/blob/master/README-mac.md#install-boost-c-librar port install boost -no_static ``` -### Build dependencies - -Again, set `BUILD_UNIVERSAL` to tell `make` that we are building librime as -universal macOS binaries. Skip this if building only for the native architecture. - -Build librime, dependent third-party libraries and data files: +### Build Squirrel -``` sh -export BUILD_UNIVERSAL=1 +* Make sure you have updated all the dependencies. If you cloned squirrel with the command in this guide, you've already done it. But if not, this command will update submodules. -make deps +``` +git submodule update --init --recursive ``` -### Build Squirrel - -With all dependencies ready, build `Squirrel.app`: +* With all dependencies ready, build `Squirrel.app`: ``` sh make ``` -To build only for the native architecture, pass variable `ARCHS` to `make`: +To build only for the native architecture, and/or specify the lowest supported macOS version, pass variable `ARCHS`/`MACOSX_DEPLOYMENT_TARGET` to `make`: ``` sh -# for Mac computers with Apple Silicon -make ARCHS='arm64' +# for Universal macOS App, targetting Ventura +make ARCHS='arm64 x86_64' MACOSX_DEPLOYMENT_TARGET='13.0' -# for Intel-based Mac -make ARCHS='x86_64' +# for ARM macOS App, targetting Ventura +make ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0' ``` ## Install it on your Mac +## Make Package + +Just add `package` after `make` + +``` +make package ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0' +``` + +Define or echo `DEV_ID` to automatically handle code signing and [notarization](https://developer.apple.com/documentation/security/notarizing_macos_software_before_distribution) (Apple Developer ID needed) + +To make this work, you need a `Developer ID Installer: (your name/org)` and set your name/org as `DEV_ID` env variable. + +To make notarization work, you also need to save your credential under the same name as above. + +``` +xcrun notarytool store-credentials 'your name/org' +``` + +You **don't** need to define `DEV_ID` if you don't intend to distribute the package. + +## Directly Install + +**You might need to precede with sudo, and without a logout, the App might not work properly. Direct install is not very recommended.** + Once built, you can install and try it live on your Mac computer: ``` sh diff --git a/Makefile b/Makefile index 65db3fcb9..98783ab2a 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,8 @@ PLUM_DATA = bin/rime-install \ OPENCC_DATA = data/opencc/TSCharacters.ocd2 \ data/opencc/TSPhrases.ocd2 \ data/opencc/t2s.json -DEPS_CHECK = $(RIME_LIBRARY) $(PLUM_DATA) $(OPENCC_DATA) +SPARKLE_FRAMEWORK = Frameworks/Sparkle.framework +DEPS_CHECK = $(RIME_LIBRARY) $(PLUM_DATA) $(OPENCC_DATA) $(SPARKLE_FRAMEWORK) OPENCC_DATA_OUTPUT = librime/share/opencc/*.* PLUM_DATA_OUTPUT = plum/output/*.* @@ -99,10 +100,38 @@ debug: $(DEPS_CHECK) bash package/add_data_files xcodebuild -project Squirrel.xcodeproj -configuration Debug $(BUILD_SETTINGS) build +.PHONY: sparkle copy-sparkle-framework + +$(SPARKLE_FRAMEWORK): + git submodule update --init --recursive Sparkle + $(MAKE) sparkle + +sparkle: + xcodebuild -project Sparkle/Sparkle.xcodeproj -configuration Release $(BUILD_SETTINGS) build + $(MAKE) copy-sparkle-framework + +copy-sparkle-framework: + mkdir -p Frameworks + cp -RP Sparkle/build/Release/Sparkle.framework Frameworks/ + +clean-sparkle: + rm -rf Frameworks/* > /dev/null 2>&1 || true + rm -rf Sparkle/build > /dev/null 2>&1 || true + .PHONY: package archive sign-archive package: release +ifdef DEV_ID + package/sign.bash $(DEV_ID) +endif bash package/make_package +ifdef DEV_ID + productsign --sign "Developer ID Installer: $(DEV_ID)" package/Squirrel.pkg package/Squirrel-signed.pkg + rm package/Squirrel.pkg + mv package/Squirrel-signed.pkg package/Squirrel.pkg + xcrun notarytool submit package/Squirrel.pkg --keychain-profile "$(DEV_ID)" --wait + xcrun stapler staple package/Squirrel.pkg +endif archive: package bash package/make_archive @@ -142,3 +171,4 @@ clean: clean-deps: $(MAKE) -C plum clean $(MAKE) -C librime xcode/clean + $(MAKE) clean-sparkle diff --git a/README.md b/README.md index 2995ae9d0..6b5c8ec03 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ 新詩醉墨時一揮 別後寄我無辭遠 - 　　——歐陽修 + 　　　——歐陽修 今由　[中州韻輸入法引擎／Rime Input Method Engine](https://rime.im) 及其他開源技術強力驅動 @@ -28,7 +28,7 @@ 安裝輸入法 --- -本品適用於 macOS 10.9+ +本品適用於 macOS 12.0+ 初次安裝，如果在部份應用程序中打不出字，請註銷並重新登錄。 diff --git a/Sparkle b/Sparkle new file mode 160000 index 000000000..8fb9c83ad --- /dev/null +++ b/Sparkle @@ -0,0 +1 @@ +Subproject commit 8fb9c83adf6f74364ee57bf314ceee2fa77d0ac2 diff --git a/Squirrel.xcodeproj/project.pbxproj b/Squirrel.xcodeproj/project.pbxproj index fff865026..6898ec0ae 100644 --- a/Squirrel.xcodeproj/project.pbxproj +++ b/Squirrel.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ 44CD7D9F1828D981006E9222 /* rime.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 44CD7D9E1828D981006E9222 /* rime.pdf */; }; 44E21A9016A653E700C2B08F /* rime_deployer in CopyFiles */ = {isa = PBXBuildFile; fileRef = 44E21A8E16A653E700C2B08F /* rime_deployer */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 44E21A9116A653E700C2B08F /* rime_dict_manager in CopyFiles */ = {isa = PBXBuildFile; fileRef = 44E21A8F16A653E700C2B08F /* rime_dict_manager */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - 44E98EC314AE1AC900847AD6 /* utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 44E98EC214AE1AC900847AD6 /* utf8.cpp */; }; 44F7708F152B3334005CF491 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 44F7708E152B3334005CF491 /* dsa_pub.pem */; }; 44F84AD714E94C490005D70B /* SquirrelPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 44F84AD614E94C490005D70B /* SquirrelPanel.m */; }; 77AA68142588916F00A592E2 /* hk2s.json in Copy opencc Files */ = {isa = PBXBuildFile; fileRef = 77AA67E22588916300A592E2 /* hk2s.json */; }; @@ -227,11 +226,6 @@ 44DA191B152B8CBC00FB8EF0 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/MainMenu.xib"; sourceTree = ""; }; 44E21A8E16A653E700C2B08F /* rime_deployer */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = rime_deployer; path = bin/rime_deployer; sourceTree = ""; }; 44E21A8F16A653E700C2B08F /* rime_dict_manager */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = rime_dict_manager; path = bin/rime_dict_manager; sourceTree = ""; }; - 44E98EA514AE16DD00847AD6 /* checked.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = checked.h; sourceTree = ""; }; - 44E98EA614AE16DD00847AD6 /* core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = core.h; sourceTree = ""; }; - 44E98EA714AE16DD00847AD6 /* unchecked.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unchecked.h; sourceTree = ""; }; - 44E98EC114AE1AC900847AD6 /* utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf8.h; sourceTree = ""; }; - 44E98EC214AE1AC900847AD6 /* utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8.cpp; sourceTree = ""; }; 44F1EB381431F8270015FD04 /* Squirrel.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Squirrel.app; sourceTree = BUILT_PRODUCTS_DIR; }; 44F7708E152B3334005CF491 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = ""; }; 44F84AD514E94C490005D70B /* SquirrelPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SquirrelPanel.h; sourceTree = ""; }; @@ -305,7 +299,6 @@ 080E96DDFE201D6D7F000001 /* Sources */ = { isa = PBXGroup; children = ( - 44E98EA414AE16DD00847AD6 /* utf8 */, 44AC95161430CF6000C888FB /* SquirrelApplicationDelegate.h */, 44AC95171430CF6000C888FB /* SquirrelApplicationDelegate.m */, 44AC95181430CF6000C888FB /* SquirrelInputController.h */, @@ -315,8 +308,6 @@ 32CA4F630368D1EE00C91783 /* Squirrel_Prefix.pch */, 4443A8391828CC5100731305 /* input_source.m */, 29B97316FDCFA39411CA2CEA /* main.m */, - 44E98EC114AE1AC900847AD6 /* utf8.h */, - 44E98EC214AE1AC900847AD6 /* utf8.cpp */, 44F84AD514E94C490005D70B /* SquirrelPanel.h */, 44F84AD614E94C490005D70B /* SquirrelPanel.m */, 7BDB21211C6EF1BE0025E351 /* SquirrelConfig.h */, @@ -451,16 +442,6 @@ name = SharedSupport; sourceTree = ""; }; - 44E98EA414AE16DD00847AD6 /* utf8 */ = { - isa = PBXGroup; - children = ( - 44E98EA514AE16DD00847AD6 /* checked.h */, - 44E98EA614AE16DD00847AD6 /* core.h */, - 44E98EA714AE16DD00847AD6 /* unchecked.h */, - ); - path = utf8; - sourceTree = ""; - }; 7B5488A71D2DAC9D0056A1BE /* plum */ = { isa = PBXGroup; children = ( @@ -575,7 +556,6 @@ A47C48DF105E8CE8006D528B /* macos_keycode.m in Sources */, 44AC951A1430CF6000C888FB /* SquirrelApplicationDelegate.m in Sources */, 44AC951B1430CF6000C888FB /* SquirrelInputController.m in Sources */, - 44E98EC314AE1AC900847AD6 /* utf8.cpp in Sources */, 4443A83A1828CC5100731305 /* input_source.m in Sources */, 44F84AD714E94C490005D70B /* SquirrelPanel.m in Sources */, ); @@ -625,7 +605,8 @@ CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.16.2; + CURRENT_PROJECT_VERSION = 0.17.2; + DEAD_CODE_STRIPPING = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -639,6 +620,8 @@ GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "Squirrel Input Method"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; INSTALL_PATH = "\"/Library/Input Methods\""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -648,7 +631,7 @@ "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 12.0; OTHER_CODE_SIGN_FLAGS = "--deep"; OTHER_CPLUSPLUSFLAGS = ( "-DLEOPARD", @@ -671,7 +654,8 @@ CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "-"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 0.16.2; + CURRENT_PROJECT_VERSION = 0.17.2; + DEAD_CODE_STRIPPING = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -684,6 +668,8 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; INFOPLIST_FILE = Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "Squirrel Input Method"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities"; INSTALL_PATH = "\"/Library/Input Methods\""; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -693,7 +679,7 @@ "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", ); - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 12.0; OTHER_CODE_SIGN_FLAGS = "--deep"; OTHER_CPLUSPLUSFLAGS = ( "-DLEOPARD", @@ -729,9 +715,11 @@ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + DEAD_CODE_STRIPPING = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -748,14 +736,17 @@ HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(SRCROOT)/librime/src\""; HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/librime/include\""; LD_RUNPATH_SEARCH_PATHS = ( - "@loader_path/../Frameworks\n\n@loader_path/../Library/OpenSource\n\n@loader_path/../Library/Frameworks", + "@loader_path/../Frameworks", + "@loader_path/../Library/OpenSource", + "@loader_path/../Library/Frameworks", /usr/lib, /usr/local/lib, ); LIBRARY_SEARCH_PATHS = "$(SRCROOT)/lib"; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 12.0; 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; }; name = Debug; }; @@ -779,10 +770,12 @@ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/Release"; + DEAD_CODE_STRIPPING = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -802,9 +795,10 @@ /usr/lib, ); LIBRARY_SEARCH_PATHS = "$(SRCROOT)/lib"; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 12.0; 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; }; name = Release; }; diff --git a/SquirrelApplicationDelegate.m b/SquirrelApplicationDelegate.m index 2e1dc7698..db1479ab6 100644 --- a/SquirrelApplicationDelegate.m +++ b/SquirrelApplicationDelegate.m @@ -24,7 +24,7 @@ -(IBAction)syncUserData:(id)sender -(IBAction)configure:(id)sender { - [[NSWorkspace sharedWorkspace] openFile:(@"~/Library/Rime").stringByStandardizingPath]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[@"file://" stringByAppendingString:(@"~/Library/Rime").stringByStandardizingPath]]]; } -(IBAction)openWiki:(id)sender @@ -47,11 +47,12 @@ void show_message(const char* msg_text, const char* msg_id) { } } -static void show_status_message(const char* msg_text, const char* msg_id) { +static void show_status_message(const char *msg_text_long, const char *msg_text_short, const char* msg_id) { SquirrelPanel* panel = NSApp.squirrelAppDelegate.panel; if (panel) { - NSString *message = @(msg_text); - [panel updateStatus: message]; + NSString *msgLong = msg_text_long ? @(msg_text_long) : nil; + NSString *msgShort = msg_text_short ? @(msg_text_short) : nil; + [panel updateStatusLong: msgLong statusShort: msgShort]; } } @@ -79,7 +80,7 @@ void notification_handler(void* context_object, RimeSessionId session_id, const char* schema_name = strchr(message_value, '/'); if (schema_name) { ++schema_name; - show_status_message(schema_name, message_type); + show_status_message(schema_name, schema_name, message_type); } return; } @@ -87,9 +88,12 @@ void notification_handler(void* context_object, RimeSessionId session_id, if (!strcmp(message_type, "option")) { Bool state = message_value[0] != '!'; const char* option_name = message_value + !state; - const char *state_label = rime_get_api()->get_state_label(session_id, option_name, state); - if (state_label) { - show_status_message(state_label, message_type); + struct rime_string_slice_t state_label_long = rime_get_api()->get_state_label_abbreviated(session_id, option_name, state, NO); + struct rime_string_slice_t state_label_short = rime_get_api()->get_state_label_abbreviated(session_id, option_name, state, YES); + + if (state_label_long.str || state_label_short.str) { + const char *short_message = state_label_short.length < strlen(state_label_short.str) ? NULL : state_label_short.str; + show_status_message(state_label_long.str, short_message, message_type); } } } @@ -181,13 +185,13 @@ -(BOOL)problematicLaunchDetected options:NSDataReadingUncached error:nil]; if (archive) { - NSDate* previousLaunch = [NSKeyedUnarchiver unarchiveObjectWithData:archive]; + NSDate* previousLaunch = [NSKeyedUnarchiver unarchivedObjectOfClass:NSDate.class fromData:archive error:NULL]; if (previousLaunch && previousLaunch.timeIntervalSinceNow >= -2) { detected = YES; } } NSDate* now = [NSDate date]; - NSData* record = [NSKeyedArchiver archivedDataWithRootObject:now]; + NSData* record = [NSKeyedArchiver archivedDataWithRootObject:now requiringSecureCoding:NO error:NULL]; [record writeToFile:logfile atomically:NO]; return detected; } diff --git a/SquirrelInputController.h b/SquirrelInputController.h index a857f893b..5e718b325 100644 --- a/SquirrelInputController.h +++ b/SquirrelInputController.h @@ -2,5 +2,6 @@ #import @interface SquirrelInputController : IMKInputController - +- (BOOL)selectCandidate:(NSInteger)index; +- (BOOL)pageUp:(BOOL)up; @end diff --git a/SquirrelInputController.m b/SquirrelInputController.m index fbbf2286a..02f0ef8a4 100644 --- a/SquirrelInputController.m +++ b/SquirrelInputController.m @@ -4,7 +4,6 @@ #import "SquirrelConfig.h" #import "SquirrelPanel.h" #import "macos_keycode.h" -#import "utf8.h" #import #import @@ -155,9 +154,6 @@ - (BOOL)handleEvent:(NSEvent*)event client:(id)sender [self rimeUpdate]; } } break; - case NSEventTypeLeftMouseDown: { - [self commitComposition:_currentClient]; - } break; default: break; } @@ -222,6 +218,27 @@ -(BOOL)processKey:(int)rime_keycode modifiers:(int)rime_modifiers return handled; } +- (BOOL)selectCandidate:(NSInteger)index { + BOOL success = rime_get_api()->select_candidate_on_current_page(_session, (int) index); + if (success) { + [self rimeUpdate]; + } + return success; +} + +- (BOOL)pageUp:(BOOL)up { + BOOL handled = NO; + if (up) { + handled = rime_get_api()->change_page(_session, True); + } else { + handled = rime_get_api()->change_page(_session, False); + } + if (handled) { + [self rimeUpdate]; + } + return handled; +} + -(void)onChordTimer:(NSTimer *)timer { // chord release triggered by timer @@ -285,7 +302,7 @@ -(void)clearChord -(NSUInteger)recognizedEvents:(id)sender { //NSLog(@"recognizedEvents:"); - return NSEventMaskKeyDown | NSEventMaskFlagsChanged | NSEventMaskLeftMouseDown; + return NSEventMaskKeyDown | NSEventMaskFlagsChanged; } -(void)activateServer:(id)sender @@ -449,13 +466,15 @@ -(void)showPanelWithPreedit:(NSString*)preedit [_currentClient attributesForCharacterIndex:0 lineHeightRectangle:&inputPos]; SquirrelPanel* panel = NSApp.squirrelAppDelegate.panel; panel.position = inputPos; + panel.inputController = self; [panel showPreedit:preedit selRange:selRange caretPos:caretPos candidates:candidates comments:comments labels:labels - highlighted:index]; + highlighted:index + update:YES]; } @end // SquirrelController @@ -512,6 +531,13 @@ -(void)rimeConsumeCommittedText } } +NSString *substr(const char *str, int length) { + char substring[length+1]; + strncpy(substring, str, length); + substring[length] = '\0'; + return [NSString stringWithCString:substring encoding:NSUTF8StringEncoding]; +} + -(void)rimeUpdate { //NSLog(@"rimeUpdate"); @@ -527,7 +553,8 @@ -(void)rimeUpdate _inlinePreedit = (NSApp.squirrelAppDelegate.panel.inlinePreedit && !rime_get_api()->get_option(_session, "no_inline")) || rime_get_api()->get_option(_session, "inline"); - _inlineCandidate = NSApp.squirrelAppDelegate.panel.inlineCandidate; + _inlineCandidate = (NSApp.squirrelAppDelegate.panel.inlineCandidate && + !rime_get_api()->get_option(_session, "no_inline")); // if not inline, embed soft cursor in preedit string rime_get_api()->set_option(_session, "soft_cursor", !_inlinePreedit); } @@ -540,9 +567,9 @@ -(void)rimeUpdate const char *preedit = ctx.composition.preedit; NSString *preeditText = preedit ? @(preedit) : @""; - NSUInteger start = utf8len(preedit, ctx.composition.sel_start); - NSUInteger end = utf8len(preedit, ctx.composition.sel_end); - NSUInteger caretPos = utf8len(preedit, ctx.composition.cursor_pos); + NSUInteger start = substr(preedit, ctx.composition.sel_start).length; + NSUInteger end = substr(preedit, ctx.composition.sel_end).length; + NSUInteger caretPos = substr(preedit, ctx.composition.cursor_pos).length; NSRange selRange = NSMakeRange(start, end - start); if (_inlineCandidate) { const char *candidatePreview = ctx.commit_text_preview; diff --git a/SquirrelPanel.h b/SquirrelPanel.h index f3b1b73f7..159b2a8ad 100644 --- a/SquirrelPanel.h +++ b/SquirrelPanel.h @@ -1,8 +1,9 @@ #import +#import "SquirrelInputController.h" @class SquirrelConfig; -@interface SquirrelPanel : NSWindow +@interface SquirrelPanel : NSPanel // Linear candidate list, as opposed to stacked candidate list. @property(nonatomic, readonly) BOOL linear; @@ -15,6 +16,8 @@ // position of input caret on screen. @property(nonatomic, assign) NSRect position; +// position of input caret on screen. +@property(nonatomic, assign) SquirrelInputController *inputController; -(void)showPreedit:(NSString*)preedit selRange:(NSRange)selRange @@ -22,11 +25,12 @@ candidates:(NSArray*)candidates comments:(NSArray*)comments labels:(NSArray*)labels - highlighted:(NSUInteger)index; + highlighted:(NSUInteger)index + update:(BOOL)update; -(void)hide; --(void)updateStatus:(NSString*)message; +-(void)updateStatusLong:(NSString*)messageLong statusShort:(NSString*)messageShort; -(void)loadConfig:(SquirrelConfig*)config forDarkMode:(BOOL)isDark; diff --git a/SquirrelPanel.m b/SquirrelPanel.m index f61b0b5ce..892471dd4 100644 --- a/SquirrelPanel.m +++ b/SquirrelPanel.m @@ -3,76 +3,35 @@ #import "SquirrelConfig.h" #import -@implementation NSBezierPath (BezierPathQuartzUtilities) -// This method works only in OS X v10.2 and later. -- (CGPathRef)quartzPath { - NSInteger i, numElements; - // Need to begin a path here. - CGPathRef immutablePath = NULL; - - // Then draw the path elements. - numElements = [self elementCount]; - if (numElements > 0) { - CGMutablePathRef path = CGPathCreateMutable(); - NSPoint points[3]; - BOOL didClosePath = YES; - for (i = 0; i < numElements; i++) { - switch ([self elementAtIndex:i associatedPoints:points]) { - case NSMoveToBezierPathElement: - CGPathMoveToPoint(path, NULL, points[0].x, points[0].y); - break; - case NSLineToBezierPathElement: - CGPathAddLineToPoint(path, NULL, points[0].x, points[0].y); - didClosePath = NO; - break; - case NSCurveToBezierPathElement: - CGPathAddCurveToPoint(path, NULL, points[0].x, points[0].y, - points[1].x, points[1].y, - points[2].x, points[2].y); - didClosePath = NO; - break; - case NSClosePathBezierPathElement: - CGPathCloseSubpath(path); - didClosePath = YES; - break; - } - } - - // Be sure the path is closed or Quartz may not do valid hit detection. - if (!didClosePath) { - CGPathCloseSubpath(path); - } - immutablePath = CGPathCreateCopy(path); - CGPathRelease(path); - } - return immutablePath; -} -@end - static const CGFloat kOffsetHeight = 5; static const CGFloat kDefaultFontSize = 24; static const CGFloat kBlendedBackgroundColorFraction = 1.0 / 5; static const NSTimeInterval kShowStatusDuration = 1.2; -static NSString *const kDefaultCandidateFormat = @"%c. %@"; +static NSString *const kDefaultCandidateFormat = @"%c.\u00A0%@"; @interface SquirrelTheme : NSObject @property(nonatomic, assign) BOOL native; +@property(nonatomic, assign) BOOL memorizeSize; @property(nonatomic, strong, readonly) NSColor *backgroundColor; -@property(nonatomic, strong, readonly) NSColor *highlightedStripColor; +@property(nonatomic, strong, readonly) NSColor *highlightedBackColor; +@property(nonatomic, strong, readonly) NSColor *candidateBackColor; @property(nonatomic, strong, readonly) NSColor *highlightedPreeditColor; @property(nonatomic, strong, readonly) NSColor *preeditBackgroundColor; @property(nonatomic, strong, readonly) NSColor *borderColor; @property(nonatomic, readonly) CGFloat cornerRadius; @property(nonatomic, readonly) CGFloat hilitedCornerRadius; +@property(nonatomic, readonly) CGFloat surroundingExtraExpansion; +@property(nonatomic, readonly) CGFloat shadowSize; @property(nonatomic, readonly) NSSize edgeInset; @property(nonatomic, readonly) CGFloat borderWidth; @property(nonatomic, readonly) CGFloat linespace; @property(nonatomic, readonly) CGFloat preeditLinespace; @property(nonatomic, readonly) CGFloat alpha; @property(nonatomic, readonly) BOOL translucency; +@property(nonatomic, readonly) BOOL mutualExclusive; @property(nonatomic, readonly) BOOL linear; @property(nonatomic, readonly) BOOL vertical; @property(nonatomic, readonly) BOOL inlinePreedit; @@ -90,36 +49,42 @@ @interface SquirrelTheme : NSObject @property(nonatomic, strong, readonly) NSParagraphStyle *preeditParagraphStyle; @property(nonatomic, strong, readonly) NSString *prefixLabelFormat, *suffixLabelFormat; +@property(nonatomic, strong, readonly) NSString *statusMessageType; - (void)setCandidateFormat:(NSString *)candidateFormat; +- (void)setStatusMessageType:(NSString *)statusMessageType; - (void)setBackgroundColor:(NSColor *)backgroundColor - highlightedStripColor:(NSColor *)highlightedStripColor + highlightedBackColor:(NSColor *)highlightedBackColor + candidateBackColor:(NSColor *)candidateBackColor highlightedPreeditColor:(NSColor *)highlightedPreeditColor preeditBackgroundColor:(NSColor *)preeditBackgroundColor borderColor:(NSColor *)borderColor; - (void)setCornerRadius:(CGFloat)cornerRadius hilitedCornerRadius:(CGFloat)hilitedCornerRadius + srdExtraExpansion:(CGFloat)surroundingExtraExpansion + shadowSize:(CGFloat)shadowSize edgeInset:(NSSize)edgeInset borderWidth:(CGFloat)borderWidth linespace:(CGFloat)linespace preeditLinespace:(CGFloat)preeditLinespace alpha:(CGFloat)alpha translucency:(BOOL)translucency + mutualExclusive:(BOOL)mutualExclusive linear:(BOOL)linear vertical:(BOOL)vertical inlinePreedit:(BOOL)inlinePreedit inlineCandidate:(BOOL)inlineCandidate; -- (void) setAttrs:(NSMutableDictionary *)attrs - labelAttrs:(NSMutableDictionary *)labelAttrs - highlightedAttrs:(NSMutableDictionary *)highlightedAttrs - labelHighlightedAttrs:(NSMutableDictionary *)labelHighlightedAttrs - commentAttrs:(NSMutableDictionary *)commentAttrs -commentHighlightedAttrs:(NSMutableDictionary *)commentHighlightedAttrs - preeditAttrs:(NSMutableDictionary *)preeditAttrs -preeditHighlightedAttrs:(NSMutableDictionary *)preeditHighlightedAttrs; +- (void) setAttrs:(NSMutableDictionary *)attrs + highlightedAttrs:(NSMutableDictionary *)highlightedAttrs + labelAttrs:(NSMutableDictionary *)labelAttrs + labelHighlightedAttrs:(NSMutableDictionary *)labelHighlightedAttrs + commentAttrs:(NSMutableDictionary *)commentAttrs + commentHighlightedAttrs:(NSMutableDictionary *)commentHighlightedAttrs + preeditAttrs:(NSMutableDictionary *)preeditAttrs + preeditHighlightedAttrs:(NSMutableDictionary *)preeditHighlightedAttrs; - (void) setParagraphStyle:(NSParagraphStyle *)paragraphStyle preeditParagraphStyle:(NSParagraphStyle *)preeditParagraphStyle; @@ -154,13 +119,23 @@ - (void)setCandidateFormat:(NSString *)candidateFormat { } } +- (void)setStatusMessageType:(NSString *)type { + if ([type isEqualToString: @"long"] || [type isEqualToString: @"short"] || [type isEqualToString: @"mix"]) { + _statusMessageType = type; + } else { + _statusMessageType = @"mix"; + } +} + - (void)setBackgroundColor:(NSColor *)backgroundColor - highlightedStripColor:(NSColor *)highlightedStripColor + highlightedBackColor:(NSColor *)highlightedBackColor + candidateBackColor:(NSColor *)candidateBackColor highlightedPreeditColor:(NSColor *)highlightedPreeditColor preeditBackgroundColor:(NSColor *)preeditBackgroundColor borderColor:(NSColor *)borderColor { _backgroundColor = backgroundColor; - _highlightedStripColor = highlightedStripColor; + _highlightedBackColor = highlightedBackColor; + _candidateBackColor = candidateBackColor; _highlightedPreeditColor = highlightedPreeditColor; _preeditBackgroundColor = preeditBackgroundColor; _borderColor = borderColor; @@ -168,23 +143,29 @@ - (void)setBackgroundColor:(NSColor *)backgroundColor - (void)setCornerRadius:(double)cornerRadius hilitedCornerRadius:(double)hilitedCornerRadius + srdExtraExpansion:(double)surroundingExtraExpansion + shadowSize:(double)shadowSize edgeInset:(NSSize)edgeInset borderWidth:(double)borderWidth linespace:(double)linespace preeditLinespace:(double)preeditLinespace - alpha:(CGFloat)alpha + alpha:(double)alpha translucency:(BOOL)translucency + mutualExclusive:(BOOL)mutualExclusive linear:(BOOL)linear vertical:(BOOL)vertical inlinePreedit:(BOOL)inlinePreedit inlineCandidate:(BOOL)inlineCandidate { _cornerRadius = cornerRadius; _hilitedCornerRadius = hilitedCornerRadius; + _surroundingExtraExpansion = surroundingExtraExpansion; + _shadowSize = shadowSize; _edgeInset = edgeInset; _borderWidth = borderWidth; _linespace = linespace; _alpha = alpha; _translucency = translucency; + _mutualExclusive = mutualExclusive; _preeditLinespace = preeditLinespace; _linear = linear; _vertical = vertical; @@ -192,17 +173,17 @@ - (void)setCornerRadius:(double)cornerRadius _inlineCandidate = inlineCandidate; } -- (void) setAttrs:(NSMutableDictionary *)attrs - labelAttrs:(NSMutableDictionary *)labelAttrs - highlightedAttrs:(NSMutableDictionary *)highlightedAttrs - labelHighlightedAttrs:(NSMutableDictionary *)labelHighlightedAttrs - commentAttrs:(NSMutableDictionary *)commentAttrs -commentHighlightedAttrs:(NSMutableDictionary *)commentHighlightedAttrs - preeditAttrs:(NSMutableDictionary *)preeditAttrs -preeditHighlightedAttrs:(NSMutableDictionary *)preeditHighlightedAttrs { +- (void) setAttrs:(NSMutableDictionary *)attrs + highlightedAttrs:(NSMutableDictionary *)highlightedAttrs + labelAttrs:(NSMutableDictionary *)labelAttrs + labelHighlightedAttrs:(NSMutableDictionary *)labelHighlightedAttrs + commentAttrs:(NSMutableDictionary *)commentAttrs + commentHighlightedAttrs:(NSMutableDictionary *)commentHighlightedAttrs + preeditAttrs:(NSMutableDictionary *)preeditAttrs + preeditHighlightedAttrs:(NSMutableDictionary *)preeditHighlightedAttrs { _attrs = attrs; - _labelAttrs = labelAttrs; _highlightedAttrs = highlightedAttrs; + _labelAttrs = labelAttrs; _labelHighlightedAttrs = labelHighlightedAttrs; _commentAttrs = commentAttrs; _commentHighlightedAttrs = commentHighlightedAttrs; @@ -220,22 +201,23 @@ - (void) setParagraphStyle:(NSParagraphStyle *)paragraphStyle @interface SquirrelView : NSView -@property(nonatomic, readonly) NSTextStorage *text; -@property(nonatomic, readonly) NSRange highlightedRange; +@property(nonatomic, readonly) NSTextView *textView; +@property(nonatomic, readonly) NSArray *candidateRanges; +@property(nonatomic, readonly) NSInteger hilightedIndex; @property(nonatomic, readonly) NSRange preeditRange; @property(nonatomic, readonly) NSRange highlightedPreeditRange; @property(nonatomic, readonly) NSRect contentRect; @property(nonatomic, readonly) BOOL isDark; @property(nonatomic, strong, readonly) SquirrelTheme *currentTheme; +@property(nonatomic, readonly) NSTextLayoutManager *layoutManager; @property(nonatomic, assign) CGFloat seperatorWidth; @property(nonatomic, readonly) CAShapeLayer *shape; -- (BOOL)isFlipped; -- (void)setText:(NSAttributedString *)text; -- (void)drawViewWith:(NSRange)hilightedRange - preeditRange:(NSRange)preeditRange - highlightedPreeditRange:(NSRange)highlightedPreeditRange; -- (NSRect)contentRectForRange:(NSRange)range; +- (void) drawViewWith:(NSArray *)candidateRanges + hilightedIndex:(NSInteger)hilightedIndex + preeditRange:(NSRange)preeditRange + highlightedPreeditRange:(NSRange)highlightedPreeditRange; +- (NSRect)contentRectForRange:(NSTextRange *)range; @end @implementation SquirrelView @@ -249,10 +231,8 @@ - (BOOL)isFlipped { } - (BOOL)isDark { - if (@available(macOS 10.14, *)) { - if ([NSApp.effectiveAppearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]] == NSAppearanceNameDarkAqua) { - return YES; - } + if ([NSApp.effectiveAppearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]] == NSAppearanceNameDarkAqua) { + return YES; } return NO; } @@ -265,51 +245,81 @@ - (SquirrelTheme *)currentTheme { return [self selectTheme:self.isDark]; } +- (NSTextLayoutManager *)layoutManager { + return _textView.textLayoutManager; +} + - (instancetype)initWithFrame:(NSRect)frameRect { self = [super initWithFrame:frameRect]; if (self) { self.wantsLayer = YES; self.layer.masksToBounds = YES; } - // Use textStorage to store text and manage all text layout and draws - NSTextContainer *textContainer = [[NSTextContainer alloc] initWithSize:NSZeroSize]; - textContainer.lineFragmentPadding = 0.0; - NSLayoutManager *layoutManager = [[NSLayoutManager alloc] init]; - [layoutManager addTextContainer:textContainer]; - _text = [[NSTextStorage alloc] init]; - [_text addLayoutManager:layoutManager]; - layoutManager.backgroundLayoutEnabled = YES; + _textView = [[NSTextView alloc] initWithFrame:frameRect]; + _textView.drawsBackground = NO; + _textView.editable = NO; + _textView.selectable = NO; + self.layoutManager.textContainer.lineFragmentPadding = 0.0; _defaultTheme = [[SquirrelTheme alloc] init]; + _darkTheme = [[SquirrelTheme alloc] init]; _shape = [[CAShapeLayer alloc] init]; - if (@available(macOS 10.14, *)) { - _darkTheme = [[SquirrelTheme alloc] init]; - } return self; } +- (NSTextRange *)convertRange:(NSRange)range { + if (range.location == NSNotFound) { + return nil; + } else { + id startLocation = [self.layoutManager locationFromLocation:[self.layoutManager documentRange].location withOffset:range.location]; + id endLocation = [self.layoutManager locationFromLocation:startLocation withOffset:range.length]; + return [[NSTextRange alloc] initWithLocation:startLocation endLocation:endLocation]; + } +} + // Get the rectangle containing entire contents, expensive to calculate - (NSRect)contentRect { - NSRange glyphRange = [_text.layoutManagers[0] glyphRangeForTextContainer:_text.layoutManagers[0].textContainers[0]]; - NSRect rect = [_text.layoutManagers[0] boundingRectForGlyphRange:glyphRange inTextContainer:_text.layoutManagers[0].textContainers[0]]; - return rect; + NSMutableArray *ranges = [_candidateRanges mutableCopy]; + if (_preeditRange.length > 0) { + [ranges addObject:[NSValue valueWithRange:_preeditRange]]; + } + CGFloat x0 = CGFLOAT_MAX; + CGFloat x1 = CGFLOAT_MIN; + CGFloat y0 = CGFLOAT_MAX; + CGFloat y1 = CGFLOAT_MIN; + for (NSUInteger i = 0; i < ranges.count; i += 1) { + NSRange range = [ranges[i] rangeValue]; + NSRect rect = [self contentRectForRange:[self convertRange: range]]; + x0 = MIN(NSMinX(rect), x0); + x1 = MAX(NSMaxX(rect), x1); + y0 = MIN(NSMinY(rect), y0); + y1 = MAX(NSMaxY(rect), y1); + } + return NSMakeRect(x0, y0, x1-x0, y1-y0); } // Get the rectangle containing the range of text, will first convert to glyph range, expensive to calculate -- (NSRect)contentRectForRange:(NSRange)range { - NSRange glyphRange = [_text.layoutManagers[0] glyphRangeForCharacterRange:range actualCharacterRange:NULL]; - NSRect rect = [_text.layoutManagers[0] boundingRectForGlyphRange:glyphRange inTextContainer:_text.layoutManagers[0].textContainers[0]]; - return rect; -} - -- (void)setText:(NSAttributedString *)text { - [_text setAttributedString:[text copy]]; +- (NSRect)contentRectForRange:(NSTextRange *)range { + __block CGFloat x0 = CGFLOAT_MAX; + __block CGFloat x1 = CGFLOAT_MIN; + __block CGFloat y0 = CGFLOAT_MAX; + __block CGFloat y1 = CGFLOAT_MIN; + [self.layoutManager enumerateTextSegmentsInRange:range type:NSTextLayoutManagerSegmentTypeStandard options:NSTextLayoutManagerSegmentOptionsRangeNotRequired usingBlock:^(NSTextRange *_, CGRect rect, CGFloat baseline, NSTextContainer *tectContainer) { + x0 = MIN(NSMinX(rect), x0); + x1 = MAX(NSMaxX(rect), x1); + y0 = MIN(NSMinY(rect), y0); + y1 = MAX(NSMaxY(rect), y1); + return YES; + }]; + return NSMakeRect(x0, y0, x1-x0, y1-y0); } // Will triger - (void)drawRect:(NSRect)dirtyRect -- (void)drawViewWith:(NSRange)hilightedRange - preeditRange:(NSRange)preeditRange - highlightedPreeditRange:(NSRange)highlightedPreeditRange { - _highlightedRange = hilightedRange; +- (void) drawViewWith:(NSArray *)candidateRanges + hilightedIndex:(NSInteger)hilightedIndex + preeditRange:(NSRange)preeditRange + highlightedPreeditRange:(NSRange)highlightedPreeditRange { + _candidateRanges = candidateRanges; + _hilightedIndex = hilightedIndex; _preeditRange = preeditRange; _highlightedPreeditRange = highlightedPreeditRange; self.needsDisplay = YES; @@ -321,14 +331,15 @@ - (void)drawViewWith:(NSRange)hilightedRange return 1; } else if (number <= -2) { return -1; - }else { + } else { return number / 2; } } // Bezier cubic curve, which has continuous roundness -NSBezierPath *drawSmoothLines(NSArray *vertex, CGFloat alpha, CGFloat beta) { - NSBezierPath *path = [NSBezierPath bezierPath]; +CGMutablePathRef drawSmoothLines(NSArray *vertex, NSSet * __nullable straightCorner, CGFloat alpha, CGFloat beta) { + beta = MAX(0.00001, beta); + CGMutablePathRef path = CGPathCreateMutable(); if (vertex.count < 1) return path; NSPoint previousPoint = [vertex[vertex.count-1] pointValue]; @@ -338,40 +349,39 @@ - (void)drawViewWith:(NSRange)hilightedRange NSPoint control2; NSPoint target = previousPoint; NSPoint diff = NSMakePoint(point.x - previousPoint.x, point.y - previousPoint.y); - if (ABS(diff.x) >= ABS(diff.y)) { + if (!straightCorner || ![straightCorner containsObject:[NSNumber numberWithUnsignedInteger:vertex.count - 1]]) { target.x += sign(diff.x/beta)*beta; - } else { target.y += sign(diff.y/beta)*beta; } - [path moveToPoint:target]; + CGPathMoveToPoint(path, NULL, target.x, target.y); for (NSUInteger i = 0; i < vertex.count; i += 1) { previousPoint = [vertex[(vertex.count+i-1)%vertex.count] pointValue]; point = [vertex[i] pointValue]; nextPoint = [vertex[(i+1)%vertex.count] pointValue]; target = point; - control1 = point; - diff = NSMakePoint(point.x - previousPoint.x, point.y - previousPoint.y); - if (ABS(diff.x) >= ABS(diff.y)) { + if (straightCorner && [straightCorner containsObject:[NSNumber numberWithUnsignedInteger:i]]) { + CGPathAddLineToPoint(path, NULL, target.x, target.y); + } else { + control1 = point; + diff = NSMakePoint(point.x - previousPoint.x, point.y - previousPoint.y); target.x -= sign(diff.x/beta)*beta; control1.x -= sign(diff.x/beta)*alpha; - } else { target.y -= sign(diff.y/beta)*beta; control1.y -= sign(diff.y/beta)*alpha; - } - [path lineToPoint:target]; - target = point; - control2 = point; - diff = NSMakePoint(nextPoint.x - point.x, nextPoint.y - point.y); - if (ABS(diff.x) > ABS(diff.y)) { + + CGPathAddLineToPoint(path, NULL, target.x, target.y); + target = point; + control2 = point; + diff = NSMakePoint(nextPoint.x - point.x, nextPoint.y - point.y); control2.x += sign(diff.x/beta)*alpha; target.x += sign(diff.x/beta)*beta; - } else { control2.y += sign(diff.y/beta)*alpha; target.y += sign(diff.y/beta)*beta; + + CGPathAddCurveToPoint(path, NULL, control1.x, control1.y, control2.x, control2.y, target.x, target.y); } - [path curveToPoint:target controlPoint1:control1 controlPoint2:control2]; } - [path closePath]; + CGPathCloseSubpath(path); return path; } @@ -384,80 +394,82 @@ - (void)drawViewWith:(NSRange)hilightedRange ]; } -void xyTranslation(NSMutableArray *shape, NSPoint direction) { - for (NSUInteger i = 0; i < shape.count; i += 1) { - NSPoint point = [shape[i] pointValue]; - point.x += direction.x; - point.y += direction.y; - [shape replaceObjectAtIndex:i withObject:@(point)]; - } -} - BOOL nearEmptyRect(NSRect rect) { return rect.size.height * rect.size.width < 1; } // Calculate 3 boxes containing the text in range. leadingRect and trailingRect are incomplete line rectangle // bodyRect is complete lines in the middle -- (void)multilineRectForRange:(NSRange)charRange leadingRect:(NSRect *)leadingRect bodyRect:(NSRect *)bodyRect trailingRect:(NSRect *)trailingRect { - NSLayoutManager *layoutManager = _text.layoutManagers[0]; - NSTextContainer *textContainer = layoutManager.textContainers[0]; - NSRange glyphRange = [layoutManager glyphRangeForCharacterRange:charRange actualCharacterRange:NULL]; - NSRect boundingRect = [layoutManager boundingRectForGlyphRange:glyphRange inTextContainer:textContainer]; - NSRange fullRangeInBoundingRect = [layoutManager glyphRangeForBoundingRect:boundingRect inTextContainer:textContainer]; +- (void)multilineRectForRange:(NSTextRange *)range leadingRect:(NSRect *)leadingRect bodyRect:(NSRect *)bodyRect trailingRect:(NSRect *)trailingRect extraSurounding:(CGFloat)extraSurounding bounds:(NSRect)bounds { + NSSize edgeInset = self.currentTheme.edgeInset; + NSMutableArray *lineRects = [[NSMutableArray alloc] init]; + [self.layoutManager enumerateTextSegmentsInRange:range type:NSTextLayoutManagerSegmentTypeStandard options:NSTextLayoutManagerSegmentOptionsRangeNotRequired usingBlock:^(NSTextRange *_, CGRect rect, CGFloat baseline, NSTextContainer *tectContainer) { + if (!nearEmptyRect(rect)) { + NSRect newRect = rect; + newRect.origin.x += edgeInset.width; + newRect.origin.y += edgeInset.height; + newRect.size.height += self.currentTheme.linespace; + newRect.origin.y -= self.currentTheme.linespace / 2; + [lineRects addObject:[NSValue valueWithRect:newRect]]; + } + return YES; + }]; + *leadingRect = NSZeroRect; - *bodyRect = boundingRect; + *bodyRect = NSZeroRect; *trailingRect = NSZeroRect; - if (boundingRect.origin.x <= 1 && fullRangeInBoundingRect.location < glyphRange.location) { - *leadingRect = [layoutManager boundingRectForGlyphRange:NSMakeRange(fullRangeInBoundingRect.location, glyphRange.location-fullRangeInBoundingRect.location) inTextContainer:textContainer]; - if (!nearEmptyRect(*leadingRect)) { - bodyRect->size.height -= leadingRect->size.height; - bodyRect->origin.y += leadingRect->size.height; - } - double rightEdge = NSMaxX(*leadingRect); - leadingRect->origin.x = rightEdge; - leadingRect->size.width = bodyRect->origin.x + bodyRect->size.width - rightEdge; - } - if (fullRangeInBoundingRect.location+fullRangeInBoundingRect.length > glyphRange.location+glyphRange.length) { - *trailingRect = [layoutManager boundingRectForGlyphRange: - NSMakeRange(glyphRange.location+glyphRange.length, fullRangeInBoundingRect.location+fullRangeInBoundingRect.length-glyphRange.location-glyphRange.length) - inTextContainer:textContainer]; - if (!nearEmptyRect(*trailingRect)) { - bodyRect->size.height -= trailingRect->size.height; - } - double leftEdge = NSMinX(*trailingRect); - trailingRect->origin.x = bodyRect->origin.x; - trailingRect->size.width = leftEdge - bodyRect->origin.x; - } else if (fullRangeInBoundingRect.location+fullRangeInBoundingRect.length == glyphRange.location+glyphRange.length) { - *trailingRect = [layoutManager lineFragmentUsedRectForGlyphAtIndex:glyphRange.location+glyphRange.length-1 effectiveRange:NULL]; - if (NSMaxX(*trailingRect) >= NSMaxX(boundingRect) - 1) { - *trailingRect = NSZeroRect; - } else if (!nearEmptyRect(*trailingRect)) { - bodyRect->size.height -= trailingRect->size.height; - } - } - NSRect lastLineRect = nearEmptyRect(*trailingRect) ? *bodyRect : *trailingRect; - lastLineRect.size.width = textContainer.containerSize.width - lastLineRect.origin.x; - NSRange lastLineRange = [layoutManager glyphRangeForBoundingRect:lastLineRect inTextContainer:textContainer]; - NSGlyphProperty glyphProperty = [layoutManager propertyForGlyphAtIndex:lastLineRange.location+lastLineRange.length-1]; - while (lastLineRange.length>0 && (glyphProperty == NSGlyphPropertyElastic || glyphProperty == NSGlyphPropertyControlCharacter)) { - lastLineRange.length -= 1; - glyphProperty = [layoutManager propertyForGlyphAtIndex:lastLineRange.location+lastLineRange.length-1]; - } - if (lastLineRange.location+lastLineRange.length == glyphRange.location+glyphRange.length) { - if (!nearEmptyRect(*trailingRect)) { - *trailingRect = lastLineRect; + + if (lineRects.count == 1) { + *bodyRect = [lineRects[0] rectValue]; + } else if (lineRects.count == 2) { + *leadingRect = [lineRects[0] rectValue]; + *trailingRect = [lineRects[1] rectValue]; + } else if (lineRects.count > 2) { + *leadingRect = [lineRects[0] rectValue]; + *trailingRect = [lineRects[lineRects.count-1] rectValue]; + CGFloat x0 = CGFLOAT_MAX; + CGFloat x1 = CGFLOAT_MIN; + CGFloat y0 = CGFLOAT_MAX; + CGFloat y1 = CGFLOAT_MIN; + for (NSUInteger i = 1; i < lineRects.count-1; i += 1) { + NSRect rect = [lineRects[i] rectValue]; + x0 = MIN(NSMinX(rect), x0); + x1 = MAX(NSMaxX(rect), x1); + y0 = MIN(NSMinY(rect), y0); + y1 = MAX(NSMaxY(rect), y1); + } + y0 = MIN(NSMaxY(*leadingRect), y0); + y1 = MAX(NSMinY(*trailingRect), y1); + *bodyRect = NSMakeRect(x0, y0, x1-x0, y1-y0); + } + + if (extraSurounding > 0) { + if (nearEmptyRect(*leadingRect) && nearEmptyRect(*trailingRect)) { + expandHighlightWidth(bodyRect, extraSurounding); } else { - *bodyRect = lastLineRect; + if (!(nearEmptyRect(*leadingRect))) { + expandHighlightWidth(leadingRect, extraSurounding); + } + if (!(nearEmptyRect(*trailingRect))) { + expandHighlightWidth(trailingRect, extraSurounding); + } + } + } + + if (!nearEmptyRect(*leadingRect) && !nearEmptyRect(*trailingRect)) { + leadingRect->size.width = NSMaxX(bounds) - leadingRect->origin.x; + trailingRect->size.width = NSMaxX(*trailingRect) - NSMinX(bounds); + trailingRect->origin.x = NSMinX(bounds); + if (!nearEmptyRect(*bodyRect)) { + bodyRect->size.width = bounds.size.width; + bodyRect->origin.x = bounds.origin.x; + } else { + CGFloat diff = NSMinY(*trailingRect) - NSMaxY(*leadingRect); + leadingRect->size.height += diff / 2; + trailingRect->size.height += diff / 2; + trailingRect->origin.y -= diff / 2; } } - NSSize edgeInset = self.currentTheme.edgeInset; - leadingRect->origin.x += edgeInset.width; - leadingRect->origin.y += edgeInset.height; - bodyRect->origin.x += edgeInset.width; - bodyRect->origin.y += edgeInset.height; - trailingRect->origin.x += edgeInset.width; - trailingRect->origin.y += edgeInset.height; } // Based on the 3 boxes from multilineRectForRange, calculate the vertex of the polygon containing the text in range @@ -471,20 +483,20 @@ - (void)multilineRectForRange:(NSRange)charRange leadingRect:(NSRect *)leadingRe } else if (nearEmptyRect(trailingRect) && !nearEmptyRect(bodyRect)) { NSArray * leadingVertex = rectVertex(leadingRect); NSArray * bodyVertex = rectVertex(bodyRect); - return @[bodyVertex[0], leadingVertex[1], leadingVertex[0], leadingVertex[3], bodyVertex[2], bodyVertex[1]]; + return @[bodyVertex[0], bodyVertex[1], bodyVertex[2], leadingVertex[3], leadingVertex[0], leadingVertex[1]]; } else if (nearEmptyRect(leadingRect) && !nearEmptyRect(bodyRect)) { NSArray * trailingVertex = rectVertex(trailingRect); NSArray * bodyVertex = rectVertex(bodyRect); - return @[bodyVertex[0], bodyVertex[3], bodyVertex[2], trailingVertex[3], trailingVertex[2], trailingVertex[1]]; + return @[trailingVertex[1], trailingVertex[2], trailingVertex[3], bodyVertex[2], bodyVertex[3], bodyVertex[0]]; } else if (!nearEmptyRect(leadingRect) && !nearEmptyRect(trailingRect) && nearEmptyRect(bodyRect) && NSMaxX(leadingRect)>NSMinX(trailingRect)) { NSArray * leadingVertex = rectVertex(leadingRect); NSArray * trailingVertex = rectVertex(trailingRect); - return @[trailingVertex[0], leadingVertex[1], leadingVertex[0], leadingVertex[3], leadingVertex[2], trailingVertex[3], trailingVertex[2], trailingVertex[1]]; + return @[trailingVertex[0], trailingVertex[1], trailingVertex[2], trailingVertex[3], leadingVertex[2], leadingVertex[3], leadingVertex[0], leadingVertex[1]]; } else if (!nearEmptyRect(leadingRect) && !nearEmptyRect(trailingRect) && !nearEmptyRect(bodyRect)) { NSArray * leadingVertex = rectVertex(leadingRect); NSArray * bodyVertex = rectVertex(bodyRect); NSArray * trailingVertex = rectVertex(trailingRect); - return @[bodyVertex[0], leadingVertex[1], leadingVertex[0], leadingVertex[3], bodyVertex[2], trailingVertex[3], trailingVertex[2], trailingVertex[1]]; + return @[trailingVertex[1], trailingVertex[2], trailingVertex[3], bodyVertex[2], leadingVertex[3], leadingVertex[0], leadingVertex[1], bodyVertex[0]]; } else { return @[]; } @@ -508,239 +520,379 @@ void expand(NSMutableArray *vertex, NSRect innerBorder, NSRect outerB } } +CGPoint direction(CGPoint diff) { + if (diff.y == 0 && diff.x > 0) { + return NSMakePoint(0, 1); + } else if (diff.y == 0 && diff.x < 0) { + return NSMakePoint(0, -1); + } else if (diff.x == 0 && diff.y > 0) { + return NSMakePoint(-1, 0); + } else if (diff.x == 0 && diff.y < 0) { + return NSMakePoint(1, 0); + } else { + return NSMakePoint(0, 0); + } +} + +CAShapeLayer *shapeFromPath(CGPathRef path) { + CAShapeLayer *layer = [CAShapeLayer layer]; + layer.path = path; + layer.fillRule = kCAFillRuleEvenOdd; + return layer; +} + +// Assumes clockwise iteration +void enlarge(NSMutableArray *vertex, CGFloat by) { + if (by != 0) { + NSPoint previousPoint; + NSPoint point; + NSPoint nextPoint; + NSArray *original = [[NSArray alloc] initWithArray:vertex]; + NSPoint newPoint; + NSPoint displacement; + for (NSUInteger i = 0; i < original.count; i += 1){ + previousPoint = [original[(original.count+i-1)%original.count] pointValue]; + point = [original[i] pointValue]; + nextPoint = [original[(i+1)%original.count] pointValue]; + newPoint = point; + displacement = direction(NSMakePoint(point.x - previousPoint.x, point.y - previousPoint.y)); + newPoint.x += by * displacement.x; + newPoint.y += by * displacement.y; + displacement = direction(NSMakePoint(nextPoint.x - point.x, nextPoint.y - point.y)); + newPoint.x += by * displacement.x; + newPoint.y += by * displacement.y; + [vertex replaceObjectAtIndex:i withObject:@(newPoint)]; + } + } +} + // Add gap between horizontal candidates -- (void)addGapBetweenHorizontalCandidates:(NSRect *)rect { - if (_highlightedRange.location+_highlightedRange.length == _text.length) { - if (!nearEmptyRect(*rect)) { - rect->size.width += _seperatorWidth / 2; - rect->origin.x -= _seperatorWidth / 2; +void expandHighlightWidth(NSRect *rect, CGFloat extraSurrounding) { + if (!nearEmptyRect(*rect)) { + rect->size.width += extraSurrounding; + rect->origin.x -= extraSurrounding / 2; + } +} + +void removeCorner(NSMutableArray *highlightedPoints, NSMutableSet *rightCorners, NSRect containingRect) { + if (highlightedPoints && rightCorners) { + NSSet *originalRightCorners = [[NSSet alloc] initWithSet:rightCorners]; + for (NSNumber *cornerIndex in originalRightCorners) { + NSUInteger index = cornerIndex.unsignedIntegerValue; + NSPoint corner = [highlightedPoints[index] pointValue]; + CGFloat dist = MIN(NSMaxY(containingRect) - corner.y, corner.y - NSMinY(containingRect)); + if (dist < 1e-2) { + [rightCorners removeObject:cornerIndex]; + } } - } else if (_highlightedRange.location - ((_preeditRange.location == NSNotFound ? 0 : _preeditRange.location)+_preeditRange.length) <= 1) { - if (!nearEmptyRect(*rect)) { - rect->size.width += _seperatorWidth / 2; + } +} + +- (void) linearMultilineForRect:(NSRect)bodyRect leadingRect:(NSRect)leadingRect trailingRect:(NSRect)trailingRect points1:(NSMutableArray **)highlightedPoints points2:(NSMutableArray **)highlightedPoints2 rightCorners:(NSMutableSet **)rightCorners rightCorners2:(NSMutableSet **)rightCorners2 { + // Handles the special case where containing boxes are separated + if (nearEmptyRect(bodyRect) && !nearEmptyRect(leadingRect) && !nearEmptyRect(trailingRect) && NSMaxX(trailingRect) < NSMinX(leadingRect)) { + *highlightedPoints = [rectVertex(leadingRect) mutableCopy]; + *highlightedPoints2 = [rectVertex(trailingRect) mutableCopy]; + *rightCorners = [[NSMutableSet alloc] initWithObjects:@(2), @(3), nil]; + *rightCorners2 = [[NSMutableSet alloc] initWithObjects:@(0), @(1), nil]; + } else { + *highlightedPoints = [multilineRectVertex(leadingRect, bodyRect, trailingRect) mutableCopy]; + } +} + +- (CGPathRef)drawHighlightedWith:(SquirrelTheme *)theme highlightedRange:(NSRange)highlightedRange backgroundRect:(NSRect)backgroundRect preeditRect:(NSRect)preeditRect containingRect:(NSRect)containingRect extraExpansion:(CGFloat)extraExpansion { + NSRect currentContainingRect = containingRect; + currentContainingRect.size.width += extraExpansion * 2; + currentContainingRect.size.height += extraExpansion * 2; + currentContainingRect.origin.x -= extraExpansion; + currentContainingRect.origin.y -= extraExpansion; + + CGFloat halfLinespace = theme.linespace / 2; + NSRect innerBox = backgroundRect; + innerBox.size.width -= (theme.edgeInset.width + 1) * 2 - 2 * extraExpansion; + innerBox.origin.x += theme.edgeInset.width + 1 - extraExpansion; + innerBox.size.height += 2 * extraExpansion; + innerBox.origin.y -= extraExpansion; + if (_preeditRange.length == 0) { + innerBox.origin.y += theme.edgeInset.height + 1; + innerBox.size.height -= (theme.edgeInset.height + 1) * 2; + } else { + innerBox.origin.y += preeditRect.size.height + theme.preeditLinespace / 2 + theme.hilitedCornerRadius / 2 + 1; + innerBox.size.height -= theme.edgeInset.height + preeditRect.size.height + theme.preeditLinespace / 2 + theme.hilitedCornerRadius / 2 + 2; + } + innerBox.size.height -= theme.linespace; + innerBox.origin.y += halfLinespace; + NSRect outerBox = backgroundRect; + outerBox.size.height -= preeditRect.size.height + MAX(0, theme.hilitedCornerRadius + theme.borderWidth) - 2 * extraExpansion; + outerBox.size.width -= MAX(0, theme.hilitedCornerRadius + theme.borderWidth) - 2 * extraExpansion; + outerBox.origin.x += MAX(0, theme.hilitedCornerRadius + theme.borderWidth) / 2 - extraExpansion; + outerBox.origin.y += preeditRect.size.height + MAX(0, theme.hilitedCornerRadius + theme.borderWidth) / 2 - extraExpansion; + + double effectiveRadius = MAX(0, theme.hilitedCornerRadius + 2 * extraExpansion / theme.hilitedCornerRadius * MAX(0, theme.cornerRadius - theme.hilitedCornerRadius)); + CGMutablePathRef path = CGPathCreateMutable(); + + if (theme.linear){ + NSRect leadingRect; + NSRect bodyRect; + NSRect trailingRect; + [self multilineRectForRange:[self convertRange:highlightedRange] leadingRect:&leadingRect bodyRect:&bodyRect trailingRect:&trailingRect extraSurounding:_seperatorWidth bounds:outerBox]; + + NSMutableArray *highlightedPoints; + NSMutableArray *highlightedPoints2; + NSMutableSet *rightCorners; + NSMutableSet *rightCorners2; + [self linearMultilineForRect:bodyRect leadingRect:leadingRect trailingRect:trailingRect points1:&highlightedPoints points2:&highlightedPoints2 rightCorners:&rightCorners rightCorners2:&rightCorners2]; + + // Expand the boxes to reach proper border + enlarge(highlightedPoints, extraExpansion); + expand(highlightedPoints, innerBox, outerBox); + removeCorner(highlightedPoints, rightCorners, currentContainingRect); + + path = drawSmoothLines(highlightedPoints, rightCorners, 0.3*effectiveRadius, 1.4*effectiveRadius); + if (highlightedPoints2.count > 0) { + enlarge(highlightedPoints2, extraExpansion); + expand(highlightedPoints2, innerBox, outerBox); + removeCorner(highlightedPoints2, rightCorners2, currentContainingRect); + CGPathRef path2 = drawSmoothLines(highlightedPoints2, rightCorners2, 0.3*effectiveRadius, 1.4*effectiveRadius); + CGPathAddPath(path, NULL, path2); } } else { - if (!nearEmptyRect(*rect)) { - rect->size.width += _seperatorWidth; - rect->origin.x -= _seperatorWidth / 2; + NSRect highlightedRect = [self contentRectForRange:[self convertRange:highlightedRange]]; + if (!nearEmptyRect(highlightedRect)) { + highlightedRect.size.width = backgroundRect.size.width; + highlightedRect.size.height += theme.linespace; + highlightedRect.origin = NSMakePoint(backgroundRect.origin.x, highlightedRect.origin.y + theme.edgeInset.height - halfLinespace); + if (NSMaxRange(highlightedRange) == _textView.string.length) { + highlightedRect.size.height += theme.edgeInset.height - halfLinespace; + } + if (highlightedRange.location - ((_preeditRange.location == NSNotFound ? 0 : _preeditRange.location)+_preeditRange.length) <= 1) { + if (_preeditRange.length == 0) { + highlightedRect.size.height += theme.edgeInset.height - halfLinespace; + highlightedRect.origin.y -= theme.edgeInset.height - halfLinespace; + } else { + highlightedRect.size.height += theme.hilitedCornerRadius / 2; + highlightedRect.origin.y -= theme.hilitedCornerRadius / 2; + } + } + NSMutableArray *highlightedPoints = [rectVertex(highlightedRect) mutableCopy]; + enlarge(highlightedPoints, extraExpansion); + expand(highlightedPoints, innerBox, outerBox); + path = drawSmoothLines(highlightedPoints, nil, 0.3*effectiveRadius, 1.4*effectiveRadius); } } + return path; +} + +- (NSRect)carveInset:(NSRect)rect theme:(SquirrelTheme *)theme { + NSRect newRect = rect; + newRect.size.height -= (theme.hilitedCornerRadius + theme.borderWidth) * 2; + newRect.size.width -= (theme.hilitedCornerRadius + theme.borderWidth) * 2; + newRect.origin.x += theme.hilitedCornerRadius + theme.borderWidth; + newRect.origin.y += theme.hilitedCornerRadius + theme.borderWidth; + return newRect; } // All draws happen here - (void)drawRect:(NSRect)dirtyRect { - NSBezierPath *backgroundPath; - NSBezierPath *borderPath; - NSBezierPath *highlightedPath; - NSBezierPath *highlightedPath2; - NSBezierPath *highlightedPreeditPath; - NSBezierPath *highlightedPreeditPath2; - NSBezierPath *preeditPath; + CGPathRef backgroundPath = CGPathCreateMutable(); + CGPathRef highlightedPath = CGPathCreateMutable(); + CGMutablePathRef candidatePaths = CGPathCreateMutable(); + CGMutablePathRef highlightedPreeditPath = CGPathCreateMutable(); + CGPathRef preeditPath = CGPathCreateMutable(); SquirrelTheme * theme = self.currentTheme; - NSRect textField = dirtyRect; - textField.origin.y += theme.edgeInset.height; - textField.origin.x += theme.edgeInset.width; + NSPoint textFieldOrigin = dirtyRect.origin; + textFieldOrigin.y += theme.edgeInset.height; + textFieldOrigin.x += theme.edgeInset.width; // Draw preedit Rect NSRect backgroundRect = dirtyRect; + NSRect containingRect = dirtyRect; // Draw preedit Rect NSRect preeditRect = NSZeroRect; if (_preeditRange.length > 0) { - preeditRect = [self contentRectForRange:_preeditRange]; - preeditRect.size.width = textField.size.width; - preeditRect.size.height += theme.edgeInset.height + theme.preeditLinespace / 2 + theme.hilitedCornerRadius / 2; - preeditRect.origin = NSMakePoint(textField.origin.x - theme.edgeInset.width, textField.origin.y - theme.edgeInset.height); - if (_highlightedRange.length == 0) { - preeditRect.size.height += theme.edgeInset.height - theme.preeditLinespace / 2 - theme.hilitedCornerRadius / 2; - } - if (theme.preeditBackgroundColor != nil) { - preeditPath = drawSmoothLines(rectVertex(preeditRect), 0, 0); + preeditRect = [self contentRectForRange:[self convertRange:_preeditRange]]; + if (!nearEmptyRect(preeditRect)) { + preeditRect.size.width = backgroundRect.size.width; + preeditRect.size.height += theme.edgeInset.height + theme.preeditLinespace / 2 + theme.hilitedCornerRadius / 2; + preeditRect.origin = backgroundRect.origin; + if (_candidateRanges.count == 0) { + preeditRect.size.height += theme.edgeInset.height - theme.preeditLinespace / 2 - theme.hilitedCornerRadius / 2; + } + containingRect.size.height -= preeditRect.size.height; + containingRect.origin.y += preeditRect.size.height; + if (theme.preeditBackgroundColor != nil) { + preeditPath = drawSmoothLines(rectVertex(preeditRect), nil, 0, 0); + } } } + containingRect = [self carveInset:containingRect theme:theme]; // Draw highlighted Rect - if (_highlightedRange.length > 0 && theme.highlightedStripColor != nil) { - NSRect innerBox = backgroundRect; - innerBox.size.width -= (theme.edgeInset.width + 1) * 2; - innerBox.origin.x += theme.edgeInset.width + 1; - if (_preeditRange.length == 0) { - innerBox.origin.y += theme.edgeInset.height + 1; - innerBox.size.height -= (theme.edgeInset.height + 1) * 2; - } else { - innerBox.origin.y += preeditRect.size.height + theme.preeditLinespace / 2 + theme.hilitedCornerRadius / 2 + 1; - innerBox.size.height -= theme.edgeInset.height + preeditRect.size.height + theme.preeditLinespace / 2 + theme.hilitedCornerRadius / 2 + 2; - } - NSRect outerBox = backgroundRect; - outerBox.size.height -= theme.hilitedCornerRadius + preeditRect.size.height; - outerBox.size.width -= theme.hilitedCornerRadius; - outerBox.origin.x += theme.hilitedCornerRadius / 2; - outerBox.origin.y += theme.hilitedCornerRadius / 2 + preeditRect.size.height; - - CGFloat halfLinespace = theme.linespace / 2; - if (theme.linear){ - NSRect leadingRect; - NSRect bodyRect; - NSRect trailingRect; - [self multilineRectForRange:_highlightedRange leadingRect:&leadingRect bodyRect:&bodyRect trailingRect:&trailingRect]; - - [self addGapBetweenHorizontalCandidates:&leadingRect]; - [self addGapBetweenHorizontalCandidates:&bodyRect]; - [self addGapBetweenHorizontalCandidates:&trailingRect]; - - NSMutableArray *highlightedPoints; - NSMutableArray *highlightedPoints2; - // Handles the special case where containing boxes are separated - if (nearEmptyRect(bodyRect) && !nearEmptyRect(leadingRect) && !nearEmptyRect(trailingRect) && NSMaxX(trailingRect) < NSMinX(leadingRect)) { - highlightedPoints = [rectVertex(leadingRect) mutableCopy]; - highlightedPoints2 = [rectVertex(trailingRect) mutableCopy]; - } else { - highlightedPoints = [multilineRectVertex(leadingRect, bodyRect, trailingRect) mutableCopy]; - } - - xyTranslation(highlightedPoints, NSMakePoint(0, -halfLinespace)); - xyTranslation(highlightedPoints2, NSMakePoint(0, -halfLinespace)); - innerBox.size.height -= halfLinespace; - // Expand the boxes to reach proper border - expand(highlightedPoints, innerBox, outerBox); - expand(highlightedPoints2, innerBox, outerBox); - highlightedPath = drawSmoothLines(highlightedPoints, 0.3*theme.hilitedCornerRadius, 1.4*theme.hilitedCornerRadius); - if (highlightedPoints2.count > 0) { - highlightedPath2 = drawSmoothLines(highlightedPoints2, 0.3*theme.hilitedCornerRadius, 1.4*theme.hilitedCornerRadius); + for (NSUInteger i = 0; i < _candidateRanges.count; i += 1) { + NSRange candidateRange = [_candidateRanges[i] rangeValue]; + if (i == _hilightedIndex) { + // Draw highlighted Rect + if (candidateRange.length > 0 && theme.highlightedBackColor != nil) { + highlightedPath = [self drawHighlightedWith:theme highlightedRange:candidateRange backgroundRect:backgroundRect preeditRect:preeditRect containingRect:containingRect extraExpansion:0]; } } else { - NSRect highlightedRect = [self contentRectForRange:_highlightedRange]; - highlightedRect.size.width = textField.size.width; - highlightedRect.size.height += theme.linespace; - highlightedRect.origin = NSMakePoint(textField.origin.x - theme.edgeInset.width, - highlightedRect.origin.y + theme.edgeInset.height - halfLinespace); - if (_highlightedRange.location+_highlightedRange.length == _text.length) { - highlightedRect.size.height += theme.edgeInset.height - halfLinespace; + // Draw other highlighted Rect + if (candidateRange.length > 0 && theme.candidateBackColor != nil) { + CGPathRef candidatePath = [self drawHighlightedWith:theme highlightedRange:candidateRange backgroundRect:backgroundRect preeditRect:preeditRect containingRect:containingRect extraExpansion:theme.surroundingExtraExpansion]; + CGPathAddPath(candidatePaths, NULL, candidatePath); } - if (_highlightedRange.location - ((_preeditRange.location == NSNotFound ? 0 : _preeditRange.location)+_preeditRange.length) <= 1) { - if (_preeditRange.length == 0) { - highlightedRect.size.height += theme.edgeInset.height - halfLinespace; - highlightedRect.origin.y -= theme.edgeInset.height - halfLinespace; - } else { - highlightedRect.size.height += theme.hilitedCornerRadius / 2; - highlightedRect.origin.y -= theme.hilitedCornerRadius / 2; - } - } - NSMutableArray *highlightedPoints = [rectVertex(highlightedRect) mutableCopy]; - expand(highlightedPoints, innerBox, outerBox); - highlightedPath = drawSmoothLines(highlightedPoints, theme.hilitedCornerRadius*0.3, theme.hilitedCornerRadius*1.4); } } // Draw highlighted part of preedit text if (_highlightedPreeditRange.length > 0 && theme.highlightedPreeditColor != nil) { - NSRect leadingRect; - NSRect bodyRect; - NSRect trailingRect; - [self multilineRectForRange:_highlightedPreeditRange leadingRect:&leadingRect bodyRect:&bodyRect trailingRect:&trailingRect]; - NSRect innerBox = preeditRect; innerBox.size.width -= (theme.edgeInset.width + 1) * 2; innerBox.origin.x += theme.edgeInset.width + 1; innerBox.origin.y += theme.edgeInset.height + 1; - if (_highlightedRange.length == 0) { + if (_candidateRanges.count == 0) { innerBox.size.height -= (theme.edgeInset.height + 1) * 2; } else { - innerBox.size.height -= theme.edgeInset.height + theme.preeditLinespace + theme.hilitedCornerRadius / 2 + 2; + innerBox.size.height -= theme.edgeInset.height + theme.preeditLinespace / 2 + theme.hilitedCornerRadius / 2 + 2; } NSRect outerBox = preeditRect; - outerBox.size.height -= theme.hilitedCornerRadius; - outerBox.size.width -= theme.hilitedCornerRadius; - outerBox.origin.x += theme.hilitedCornerRadius / 2; - outerBox.origin.y += theme.hilitedCornerRadius / 2; - + outerBox.size.height -= MAX(0, theme.hilitedCornerRadius + theme.borderWidth); + outerBox.size.width -= MAX(0, theme.hilitedCornerRadius + theme.borderWidth); + outerBox.origin.x += MAX(0, theme.hilitedCornerRadius + theme.borderWidth) / 2; + outerBox.origin.y += MAX(0, theme.hilitedCornerRadius + theme.borderWidth) / 2; + + NSRect leadingRect; + NSRect bodyRect; + NSRect trailingRect; + [self multilineRectForRange:[self convertRange:_highlightedPreeditRange] leadingRect:&leadingRect bodyRect:&bodyRect trailingRect:&trailingRect extraSurounding:0 bounds:outerBox]; + NSMutableArray *highlightedPreeditPoints; NSMutableArray *highlightedPreeditPoints2; - // Handles the special case where containing boxes are separated - if (nearEmptyRect(bodyRect) && !nearEmptyRect(leadingRect) && !nearEmptyRect(trailingRect) && NSMaxX(trailingRect) < NSMinX(leadingRect)) { - highlightedPreeditPoints = [rectVertex(leadingRect) mutableCopy]; - highlightedPreeditPoints2 = [rectVertex(trailingRect) mutableCopy]; - } else { - highlightedPreeditPoints = [multilineRectVertex(leadingRect, bodyRect, trailingRect) mutableCopy]; - } - // Expand the boxes to reach proper border + NSMutableSet *rightCorners; + NSMutableSet *rightCorners2; + [self linearMultilineForRect:bodyRect leadingRect:leadingRect trailingRect:trailingRect points1:&highlightedPreeditPoints points2:&highlightedPreeditPoints2 rightCorners:&rightCorners rightCorners2:&rightCorners2]; + + containingRect = [self carveInset:preeditRect theme:theme]; expand(highlightedPreeditPoints, innerBox, outerBox); - expand(highlightedPreeditPoints2, innerBox, outerBox); - highlightedPreeditPath = drawSmoothLines(highlightedPreeditPoints, 0.3*theme.hilitedCornerRadius, 1.4*theme.hilitedCornerRadius); + removeCorner(highlightedPreeditPoints, rightCorners, containingRect); + highlightedPreeditPath = drawSmoothLines(highlightedPreeditPoints, rightCorners, 0.3*theme.hilitedCornerRadius, 1.4*theme.hilitedCornerRadius); if (highlightedPreeditPoints2.count > 0) { - highlightedPreeditPath2 = drawSmoothLines(highlightedPreeditPoints2, 0.3*theme.hilitedCornerRadius, 1.4*theme.hilitedCornerRadius); + expand(highlightedPreeditPoints2, innerBox, outerBox); + removeCorner(highlightedPreeditPoints2, rightCorners2, containingRect); + CGPathRef highlightedPreeditPath2 = drawSmoothLines(highlightedPreeditPoints2, rightCorners2, 0.3*theme.hilitedCornerRadius, 1.4*theme.hilitedCornerRadius); + CGPathAddPath(highlightedPreeditPath, NULL, highlightedPreeditPath2); } } [NSBezierPath setDefaultLineWidth:0]; - backgroundPath = drawSmoothLines(rectVertex(backgroundRect), theme.cornerRadius*0.3, theme.cornerRadius*1.4); - _shape.path = backgroundPath.quartzPath; - // Nothing should extend beyond backgroundPath - borderPath = [backgroundPath copy]; - [borderPath addClip]; - borderPath.lineWidth = theme.borderWidth; - -// This block of code enables independent transparencies in highlighted colour and background colour. -// Disabled because of the flaw: edges or rounded corners of the heighlighted area are rendered with undesirable shadows. -#if 0 - // Calculate intersections. - if (![highlightedPath isEmpty]) { - [backgroundPath appendBezierPath:[highlightedPath copy]]; - if (![highlightedPath2 isEmpty]) { - [backgroundPath appendBezierPath:[highlightedPath2 copy]]; - } - } - - if (![preeditPath isEmpty]) { - [backgroundPath appendBezierPath:[preeditPath copy]]; - } - - if (![highlightedPreeditPath isEmpty]) { - if (preeditPath != nil) { - [preeditPath appendBezierPath:[highlightedPreeditPath copy]]; - } else { - [backgroundPath appendBezierPath:[highlightedPreeditPath copy]]; - } - if (![highlightedPreeditPath2 isEmpty]) { - if (preeditPath != nil) { - [preeditPath appendBezierPath:[highlightedPreeditPath2 copy]]; - } else { - [backgroundPath appendBezierPath:[highlightedPreeditPath2 copy]]; + backgroundPath = drawSmoothLines(rectVertex(backgroundRect), nil, theme.cornerRadius*0.3, theme.cornerRadius*1.4); + _shape.path = CGPathCreateMutableCopy(backgroundPath); + + [self.layer setSublayers: NULL]; + CGMutablePathRef backPath = CGPathCreateMutableCopy(backgroundPath); + if (!CGPathIsEmpty(preeditPath)) { + CGPathAddPath(backPath, NULL, preeditPath); + } + if (theme.mutualExclusive) { + if (!CGPathIsEmpty(highlightedPath)) { + CGPathAddPath(backPath, NULL, highlightedPath); + } + if (!CGPathIsEmpty(candidatePaths)) { + CGPathAddPath(backPath, NULL, candidatePaths); + } + } + CAShapeLayer *panelLayer = shapeFromPath(backPath); + panelLayer.fillColor = theme.backgroundColor.CGColor; + CAShapeLayer *panelLayerMask = shapeFromPath(backgroundPath); + panelLayer.mask = panelLayerMask; + [self.layer addSublayer: panelLayer]; + + if (theme.preeditBackgroundColor && !CGPathIsEmpty(preeditPath)) { + CAShapeLayer *layer = shapeFromPath(preeditPath); + layer.fillColor = theme.preeditBackgroundColor.CGColor; + CGMutablePathRef maskPath = CGPathCreateMutableCopy(backgroundPath); + if (theme.mutualExclusive && !CGPathIsEmpty(highlightedPreeditPath)) { + CGPathAddPath(maskPath, NULL, highlightedPreeditPath); + } + CAShapeLayer *mask = shapeFromPath(maskPath); + layer.mask = mask; + [panelLayer addSublayer: layer]; + } + if (theme.borderWidth > 0 && theme.borderColor) { + CAShapeLayer *borderLayer = shapeFromPath(backgroundPath); + borderLayer.lineWidth = theme.borderWidth * 2; + borderLayer.strokeColor = theme.borderColor.CGColor; + borderLayer.fillColor = NULL; + [panelLayer addSublayer: borderLayer]; + } + if (theme.highlightedPreeditColor && !CGPathIsEmpty(highlightedPreeditPath)) { + CAShapeLayer *layer = shapeFromPath(highlightedPreeditPath); + layer.fillColor = theme.highlightedPreeditColor.CGColor; + [panelLayer addSublayer: layer]; + } + if (theme.candidateBackColor && !CGPathIsEmpty(candidatePaths)) { + CAShapeLayer *layer = shapeFromPath(candidatePaths); + layer.fillColor = theme.candidateBackColor.CGColor; + [panelLayer addSublayer: layer]; + } + if (theme.highlightedBackColor && !CGPathIsEmpty(highlightedPath)) { + CAShapeLayer *layer = shapeFromPath(highlightedPath); + layer.fillColor = theme.highlightedBackColor.CGColor; + if (theme.shadowSize > 0) { + CAShapeLayer *shadowLayer = [CAShapeLayer layer]; + shadowLayer.shadowColor = NSColor.blackColor.CGColor; + shadowLayer.shadowOffset = NSMakeSize(theme.shadowSize/2, (theme.vertical ? -1 : 1) * theme.shadowSize/2); + shadowLayer.shadowPath = highlightedPath; + shadowLayer.shadowRadius = theme.shadowSize; + shadowLayer.shadowOpacity = 0.2; + CGMutablePathRef maskPath = CGPathCreateMutableCopy(backgroundPath); + CGPathAddPath(maskPath, NULL, highlightedPath); + if (!CGPathIsEmpty(preeditPath)) { + CGPathAddPath(maskPath, NULL, preeditPath); } + CAShapeLayer *shadowLayerMask = shapeFromPath(maskPath); + shadowLayer.mask = shadowLayerMask; + layer.strokeColor = [NSColor.blackColor colorWithAlphaComponent:0.15].CGColor; + layer.lineWidth = 0.5; + [layer addSublayer: shadowLayer]; } + [panelLayer addSublayer: layer]; } - [backgroundPath setWindingRule:NSEvenOddWindingRule]; - [preeditPath setWindingRule:NSEvenOddWindingRule]; -#endif + [_textView setTextContainerInset:NSMakeSize(textFieldOrigin.x, textFieldOrigin.y)]; +} - [theme.backgroundColor setFill]; - [backgroundPath fill]; - if (theme.preeditBackgroundColor && ![preeditPath isEmpty]) { - [theme.preeditBackgroundColor setFill]; - [preeditPath fill]; - } - if (theme.highlightedStripColor && ![highlightedPath isEmpty]) { - [theme.highlightedStripColor setFill]; - [highlightedPath fill]; - if (![highlightedPath2 isEmpty]) { - [highlightedPath2 fill]; - } - } - if (theme.highlightedPreeditColor && ![highlightedPreeditPath isEmpty]) { - [theme.highlightedPreeditColor setFill]; - [highlightedPreeditPath fill]; - if (![highlightedPreeditPath2 isEmpty]) { - [highlightedPreeditPath2 fill]; +- (BOOL)clickAtPoint:(NSPoint)_point index:(NSInteger *)_index { + if (CGPathContainsPoint(_shape.path, nil, _point, NO)) { + NSPoint point = NSMakePoint(_point.x - self.textView.textContainerInset.width, + _point.y - self.textView.textContainerInset.height); + NSTextLayoutFragment *fragment = [self.layoutManager textLayoutFragmentForPosition:point]; + if (fragment) { + point = NSMakePoint(point.x - NSMinX(fragment.layoutFragmentFrame), + point.y - NSMinY(fragment.layoutFragmentFrame)); + NSInteger index = [self.layoutManager offsetFromLocation: self.layoutManager.documentRange.location toLocation: fragment.rangeInElement.location]; + for (NSUInteger i = 0; i < fragment.textLineFragments.count; i += 1) { + NSTextLineFragment *lineFragment = fragment.textLineFragments[i]; + if (CGRectContainsPoint(lineFragment.typographicBounds, point)) { + point = NSMakePoint(point.x - NSMinX(lineFragment.typographicBounds), + point.y - NSMinY(lineFragment.typographicBounds)); + index += [lineFragment characterIndexForPoint:point]; + for (NSUInteger i = 0; i < _candidateRanges.count; i += 1) { + NSRange range = [_candidateRanges[i] rangeValue]; + if (index >= range.location && index < NSMaxRange(range)) { + *_index = i; + break; + } + } + break; + } + } } + return YES; + } else { + return NO; } - - if (theme.borderColor && (theme.borderWidth > 0)) { - [theme.borderColor setStroke]; - [borderPath stroke]; - } - NSRange glyphRange = [_text.layoutManagers[0] glyphRangeForTextContainer:_text.layoutManagers[0].textContainers[0]]; - [_text.layoutManagers[0] drawGlyphsForGlyphRange:glyphRange atPoint:textField.origin]; } @end @@ -749,12 +901,22 @@ @implementation SquirrelPanel { SquirrelView *_view; NSVisualEffectView *_back; - NSRange _preeditRange; NSRect _screenRect; CGFloat _maxHeight; NSString *_statusMessage; NSTimer *_statusTimer; + + NSString *_preedit; + NSRange _selRange; + NSUInteger _caretPos; + NSArray *_candidates; + NSArray *_comments; + NSArray *_labels; + NSUInteger _index; + NSUInteger _cursorIndex; + NSPoint _scrollDirection; + NSDate *_scrollTime; } - (BOOL)linear { @@ -773,67 +935,28 @@ - (BOOL)inlineCandidate { return _view.currentTheme.inlineCandidate; } -CGFloat minimumHeight(NSDictionary *attribute) { - const NSAttributedString *spaceChar = [[NSAttributedString alloc] initWithString:@" " attributes:attribute]; - const CGFloat minimumHeight = [spaceChar boundingRectWithSize:NSZeroSize options:0].size.height; - return minimumHeight; -} - -// Use this method to convert charcters to upright position -// Based on the width of the chacter, relative font size matters -void convertToVerticalGlyph(NSMutableAttributedString *originalText, NSRange stringRange) { - NSDictionary *attribute = [originalText attributesAtIndex:stringRange.location effectiveRange:NULL]; - double baseOffset = [attribute[NSBaselineOffsetAttributeName] doubleValue]; - // Use the width of the character to determin if they should be upright in vertical writing mode. - // Adjust font base line for better alignment. - const NSAttributedString *cjkChar = [[NSAttributedString alloc] initWithString:@"字" attributes:attribute]; - const NSRect cjkRect = [cjkChar boundingRectWithSize:NSZeroSize options:0]; - const NSAttributedString *hangulChar = [[NSAttributedString alloc] initWithString:@"글" attributes:attribute]; - const NSSize hangulSize = [hangulChar boundingRectWithSize:NSZeroSize options:0].size; - stringRange = [originalText.string rangeOfComposedCharacterSequencesForRange:stringRange]; - NSUInteger i = stringRange.location; - while (i < stringRange.location+stringRange.length) { - NSRange range = [originalText.string rangeOfComposedCharacterSequenceAtIndex:i]; - i = range.location + range.length; - NSRect charRect = [[originalText attributedSubstringFromRange:range] boundingRectWithSize:NSZeroSize options:0]; - // Also adjust the baseline so upright and lying charcters are properly aligned - if ((charRect.size.width >= cjkRect.size.width) || (charRect.size.width >= hangulSize.width)) { - [originalText addAttribute:NSVerticalGlyphFormAttributeName value:@(1) range:range]; - NSRect uprightCharRect = [[originalText attributedSubstringFromRange:range] boundingRectWithSize:NSZeroSize options:0]; - CGFloat widthDiff = charRect.size.width-cjkChar.size.width; - CGFloat offset = (cjkRect.size.height - uprightCharRect.size.height)/2 + (cjkRect.origin.y-uprightCharRect.origin.y) - (widthDiff>0 ? widthDiff/3 : widthDiff/2) +baseOffset; - [originalText addAttribute:NSBaselineOffsetAttributeName value:@(offset) range:range]; - } else { - [originalText addAttribute:NSBaselineOffsetAttributeName value:@(baseOffset) range:range]; - } - } -} - -void fixDefaultFont(NSMutableAttributedString *text) { - [text fixFontAttributeInRange:NSMakeRange(0, text.length)]; - NSRange currentFontRange = NSMakeRange(NSNotFound, 0); - long i = 0; - while (i < text.length) { - NSFont *charFont = [text attribute:NSFontAttributeName atIndex:i effectiveRange:¤tFontRange]; - if ([charFont.fontName isEqualToString:@"AppleColorEmoji"]) { - NSFont *defaultFont = [NSFont systemFontOfSize:charFont.pointSize]; - [text addAttribute:NSFontAttributeName value:defaultFont range:currentFontRange]; - } - i = currentFontRange.location + currentFontRange.length; - } +NSAttributedString *insert(NSString *separator, NSAttributedString *betweenText) { + NSRange range = [betweenText.string rangeOfComposedCharacterSequenceAtIndex:0]; + NSAttributedString *attributedSeperator = [[NSAttributedString alloc] initWithString:separator attributes:[betweenText attributesAtIndex:0 effectiveRange:nil]]; + NSUInteger i = NSMaxRange(range); + NSMutableAttributedString *workingString = [[betweenText attributedSubstringFromRange:range] mutableCopy]; + while (i < betweenText.length) { + range = [betweenText.string rangeOfComposedCharacterSequenceAtIndex:i]; + [workingString appendAttributedString:attributedSeperator]; + [workingString appendAttributedString:[betweenText attributedSubstringFromRange:range]]; + i = NSMaxRange(range); + } + return workingString; } + (NSColor *)secondaryTextColor { - if(@available(macOS 10.10, *)) { - return [NSColor secondaryLabelColor]; - } else { - return [NSColor disabledControlTextColor]; - } + return [NSColor secondaryLabelColor]; } - (void)initializeUIStyleForDarkMode:(BOOL)isDark { SquirrelTheme *theme = [_view selectTheme:isDark]; theme.native = YES; + theme.memorizeSize = YES; theme.candidateFormat = kDefaultCandidateFormat; NSColor *secondaryTextColor = [[self class] secondaryTextColor]; @@ -867,8 +990,8 @@ - (void)initializeUIStyleForDarkMode:(BOOL)isDark { NSParagraphStyle *preeditParagraphStyle = [NSParagraphStyle defaultParagraphStyle]; [theme setAttrs:attrs - labelAttrs:labelAttrs highlightedAttrs:highlightedAttrs + labelAttrs:labelAttrs labelHighlightedAttrs:labelHighlightedAttrs commentAttrs:commentAttrs commentHighlightedAttrs:commentHighlightedAttrs @@ -879,10 +1002,7 @@ - (void)initializeUIStyleForDarkMode:(BOOL)isDark { } - (instancetype)init { - self = [super initWithContentRect:_position - styleMask:NSWindowStyleMaskBorderless - backing:NSBackingStoreBuffered - defer:YES]; + self = [super initWithContentRect:_position styleMask:NSWindowStyleMaskNonactivatingPanel backing:NSBackingStoreBuffered defer:YES]; if (self) { self.alphaValue = 1.0; // _window.level = NSScreenSaverWindowLevel + 1; @@ -893,27 +1013,121 @@ - (instancetype)init { self.backgroundColor = [NSColor clearColor]; NSView *contentView = [[NSView alloc] init]; _view = [[SquirrelView alloc] initWithFrame:self.contentView.frame]; - if (@available(macOS 10.14, *)) { - _back = [[NSVisualEffectView alloc] init]; - _back.blendingMode = NSVisualEffectBlendingModeBehindWindow; - _back.material = NSVisualEffectMaterialHUDWindow; - _back.state = NSVisualEffectStateActive; - _back.wantsLayer = YES; - _back.layer.mask = _view.shape; - [contentView addSubview:_back]; - } + _back = [[NSVisualEffectView alloc] init]; + _back.blendingMode = NSVisualEffectBlendingModeBehindWindow; + _back.material = NSVisualEffectMaterialHUDWindow; + _back.state = NSVisualEffectStateActive; + _back.wantsLayer = YES; + _back.layer.mask = _view.shape; + [contentView addSubview:_back]; [contentView addSubview:_view]; - + [contentView addSubview:_view.textView]; + self.contentView = contentView; [self initializeUIStyleForDarkMode:NO]; - if (@available(macOS 10.14, *)) { - [self initializeUIStyleForDarkMode:YES]; - } + [self initializeUIStyleForDarkMode:YES]; _maxHeight = 0; } return self; } +- (NSPoint)mousePosition { + NSPoint point = NSEvent.mouseLocation; + point = [self convertPointFromScreen:point]; + return [_view convertPoint:point fromView:nil]; +} + +- (void)sendEvent:(NSEvent *)event { + switch (event.type) { + case NSEventTypeLeftMouseDown: { + NSPoint point = [self mousePosition]; + NSInteger index = -1; + if ([_view clickAtPoint: point index:&index]) { + if (index >= 0 && index < _candidates.count) { + _index = index; + } + } + } break; + case NSEventTypeLeftMouseUp: { + NSPoint point = [self mousePosition]; + NSInteger index = -1; + if ([_view clickAtPoint: point index:&index]) { + if (index >= 0 && index < _candidates.count && index == _index) { + [_inputController selectCandidate:index]; + } + } + } break; + case NSEventTypeMouseEntered: { + self.acceptsMouseMovedEvents = YES; + } break; + case NSEventTypeMouseExited: { + self.acceptsMouseMovedEvents = NO; + if (_cursorIndex != _index) { + [self showPreedit:_preedit selRange:_selRange caretPos:_caretPos candidates:_candidates comments:_comments labels:_labels + highlighted:_index update:NO]; + } + } break; + case NSEventTypeMouseMoved: { + NSPoint point = [self mousePosition]; + NSInteger index = -1; + if ([_view clickAtPoint: point index:&index]) { + if (index >= 0 && index < _candidates.count && _cursorIndex != index) { + [self showPreedit:_preedit selRange:_selRange caretPos:_caretPos candidates:_candidates comments:_comments labels:_labels + highlighted:index update:NO]; + } + } + } break; + case NSEventTypeScrollWheel: { + if (event.phase == NSEventPhaseBegan) { + _scrollDirection = NSMakePoint(0, 0); + } else if (event.phase == NSEventPhaseEnded || (event.phase == NSEventPhaseNone && event.momentumPhase != NSEventPhaseNone)) { + if (_scrollDirection.x > 10 && ABS(_scrollDirection.x) > ABS(_scrollDirection.y)) { + if (_view.currentTheme.vertical) { + [self.inputController pageUp:NO]; + } else { + [self.inputController pageUp:YES]; + } + } else if (_scrollDirection.x < -10 && ABS(_scrollDirection.x) > ABS(_scrollDirection.y)) { + if (_view.currentTheme.vertical) { + [self.inputController pageUp:YES]; + } else { + [self.inputController pageUp:NO]; + } + } else if (_scrollDirection.y > 10 && ABS(_scrollDirection.x) < ABS(_scrollDirection.y)) { + [self.inputController pageUp:YES]; + } else if (_scrollDirection.y < -10 && ABS(_scrollDirection.x) < ABS(_scrollDirection.y)) { + [self.inputController pageUp:NO]; + } + _scrollDirection = NSMakePoint(0, 0); + } else if (event.phase == NSEventPhaseNone && event.momentumPhase == NSEventPhaseNone) { + if (_scrollTime && [_scrollTime timeIntervalSinceNow] > 1.0) { + _scrollDirection = NSMakePoint(0, 0); + } + _scrollTime = [NSDate now]; + if ((_scrollDirection.y >= 0 && event.scrollingDeltaY > 0) || (_scrollDirection.y <= 0 && event.scrollingDeltaY < 0)) { + _scrollDirection.y += event.scrollingDeltaY; + } else { + _scrollDirection = NSMakePoint(0, 0); + } + if (ABS(_scrollDirection.y) > 10) { + if (_scrollDirection.y > 10) { + [self.inputController pageUp:YES]; + } else if (_scrollDirection.y < -10) { + [self.inputController pageUp:NO]; + } + _scrollDirection = NSMakePoint(0, 0); + } + } else { + _scrollDirection.x += event.scrollingDeltaX; + _scrollDirection.y += event.scrollingDeltaY; + } + } + default: + break; + } + [super sendEvent:event]; +} + - (void)getCurrentScreen { // get current screen _screenRect = [NSScreen mainScreen].frame; @@ -929,41 +1143,40 @@ - (void)getCurrentScreen { } } +- (CGFloat)getMaxTextWidth:(SquirrelTheme *)theme { + NSFont *currentFont = theme.attrs[NSFontAttributeName]; + CGFloat fontScale = currentFont.pointSize / 12; + CGFloat textWidthRatio = MIN(1.0, 1.0 / (theme.vertical ? 4 : 3) + fontScale / 12); + return theme.vertical + ? NSHeight(_screenRect) * textWidthRatio - theme.edgeInset.height * 2 + : NSWidth(_screenRect) * textWidthRatio - theme.edgeInset.width * 2; +} + // Get the window size, the windows will be the dirtyRect in SquirrelView.drawRect - (void)show { [self getCurrentScreen]; SquirrelTheme *theme = _view.currentTheme; - if (@available(macOS 10.14, *)) { - NSAppearance *requestedAppearance = theme.native ? nil : [NSAppearance appearanceNamed:NSAppearanceNameAqua]; - if (self.appearance != requestedAppearance) { - self.appearance = requestedAppearance; - } + NSAppearance *requestedAppearance = theme.native ? nil : [NSAppearance appearanceNamed:NSAppearanceNameAqua]; + if (self.appearance != requestedAppearance) { + self.appearance = requestedAppearance; } //Break line if the text is too long, based on screen size. - CGFloat textWidth = _view.text.size.width; - NSFont *currentFont = theme.attrs[NSFontAttributeName]; - CGFloat fontScale = currentFont.pointSize / 12; - CGFloat textWidthRatio = MIN(1.0, 1.0 / (theme.vertical ? 4 : 3) + fontScale / 12); - CGFloat maxTextWidth = theme.vertical - ? NSHeight(_screenRect) * textWidthRatio - theme.edgeInset.height * 2 - : NSWidth(_screenRect) * textWidthRatio - theme.edgeInset.width * 2; - if (textWidth > maxTextWidth) { - textWidth = maxTextWidth; - } - _view.text.layoutManagers[0].textContainers[0].containerSize = NSMakeSize(textWidth, 0); + CGFloat textWidth = [self getMaxTextWidth:theme]; + CGFloat maxTextHeight = theme.vertical ? _screenRect.size.width - theme.edgeInset.width * 2 : _screenRect.size.height - theme.edgeInset.height * 2; + _view.textView.textContainer.containerSize = NSMakeSize(textWidth, maxTextHeight); NSRect windowRect; // in vertical mode, the width and height are interchanged NSRect contentRect = _view.contentRect; - if ((theme.vertical && NSMidY(_position) / NSHeight(_screenRect) < 0.5) || - (!theme.vertical && NSMinX(_position)+MAX(contentRect.size.width, _maxHeight)+theme.edgeInset.width*2 > NSMaxX(_screenRect))) { + if (theme.memorizeSize && ((theme.vertical && NSMidY(_position) / NSHeight(_screenRect) < 0.5) || + (!theme.vertical && NSMinX(_position)+MAX(contentRect.size.width, _maxHeight)+theme.edgeInset.width*2 > NSMaxX(_screenRect)))) { if (contentRect.size.width >= _maxHeight) { _maxHeight = contentRect.size.width; } else { contentRect.size.width = _maxHeight; - _view.text.layoutManagers[0].textContainers[0].containerSize = NSMakeSize(_maxHeight, 0); + _view.textView.textContainer.containerSize = NSMakeSize(_maxHeight, maxTextHeight); } } @@ -978,8 +1191,8 @@ - (void)show { } // Make the first candidate fixed at the left of cursor windowRect.origin.x = NSMinX(_position) - windowRect.size.width - kOffsetHeight; - if (_preeditRange.length > 0) { - NSSize preeditSize = [_view contentRectForRange:_preeditRange].size; + if (_view.preeditRange.length > 0) { + NSSize preeditSize = [_view contentRectForRange:[_view convertRange:_view.preeditRange]].size; windowRect.origin.x += preeditSize.height + theme.edgeInset.width; } } else { @@ -1011,22 +1224,25 @@ - (void)show { [self setFrame:windowRect display:YES]; // rotate the view, the core in vertical mode! if (theme.vertical) { - self.contentView.boundsRotation = -90.0; + self.contentView.boundsRotation = -90; + _view.textView.boundsRotation = 0; [self.contentView setBoundsOrigin:NSMakePoint(0, windowRect.size.width)]; + [_view.textView setBoundsOrigin:NSMakePoint(0, 0)]; } else { self.contentView.boundsRotation = 0; + _view.textView.boundsRotation = 0; [self.contentView setBoundsOrigin:NSMakePoint(0, 0)]; + [_view.textView setBoundsOrigin:NSMakePoint(0, 0)]; } BOOL translucency = theme.translucency; [_view setFrame:self.contentView.bounds]; - if (@available(macOS 10.14, *)) { - if (translucency) { - [_back setFrame:self.contentView.bounds]; - _back.appearance = NSApp.effectiveAppearance; - [_back setHidden:NO]; - } else { - [_back setHidden:YES]; - } + [_view.textView setFrame:self.contentView.bounds]; + if (translucency) { + [_back setFrame:self.contentView.bounds]; + _back.appearance = NSApp.effectiveAppearance; + [_back setHidden:NO]; + } else { + [_back setHidden:YES]; } self.alphaValue = theme.alpha; [self invalidateShadow]; @@ -1050,7 +1266,20 @@ - (void)showPreedit:(NSString *)preedit candidates:(NSArray *)candidates comments:(NSArray *)comments labels:(NSArray *)labels - highlighted:(NSUInteger)index { + highlighted:(NSUInteger)index + update:(BOOL)update { + + if (update) { + _preedit = preedit; + _selRange = selRange; + _caretPos = caretPos; + _candidates = candidates; + _comments = comments; + _labels = labels; + _index = index; + } + _cursorIndex = index; + NSUInteger numCandidates = candidates.count; if (numCandidates || (preedit && preedit.length)) { _statusMessage = nil; @@ -1069,10 +1298,12 @@ - (void)showPreedit:(NSString *)preedit } SquirrelTheme *theme = _view.currentTheme; + [self getCurrentScreen]; + CGFloat maxTextWidth = [self getMaxTextWidth:theme]; NSMutableAttributedString *text = [[NSMutableAttributedString alloc] init]; NSUInteger candidateStartPos = 0; - _preeditRange = NSMakeRange(NSNotFound, 0); + NSRange preeditRange = NSMakeRange(NSNotFound, 0); NSRange highlightedPreeditRange = NSMakeRange(NSNotFound, 0); // preedit if (preedit) { @@ -1080,37 +1311,31 @@ - (void)showPreedit:(NSString *)preedit if (selRange.location > 0) { [line appendAttributedString: [[NSAttributedString alloc] - initWithString:[preedit substringToIndex:selRange.location].precomposedStringWithCanonicalMapping + initWithString:[preedit substringToIndex:selRange.location] attributes:theme.preeditAttrs]]; } if (selRange.length > 0) { NSUInteger highlightedPreeditStart = line.length; [line appendAttributedString: [[NSAttributedString alloc] - initWithString:[preedit substringWithRange:selRange].precomposedStringWithCanonicalMapping + initWithString:[preedit substringWithRange:selRange] attributes:theme.preeditHighlightedAttrs]]; highlightedPreeditRange = NSMakeRange(highlightedPreeditStart, line.length - highlightedPreeditStart); } - if (selRange.location + selRange.length < preedit.length) { + if (NSMaxRange(selRange) < preedit.length) { [line appendAttributedString: [[NSAttributedString alloc] - initWithString:[preedit substringFromIndex:selRange.location + - selRange.length].precomposedStringWithCanonicalMapping + initWithString:[preedit substringFromIndex:NSMaxRange(selRange)] attributes:theme.preeditAttrs]]; } [text appendAttributedString:line]; - NSMutableParagraphStyle *paragraphStylePreedit = [theme.preeditParagraphStyle mutableCopy]; - if (theme.vertical) { - convertToVerticalGlyph(text, NSMakeRange(0, line.length)); - paragraphStylePreedit.minimumLineHeight = minimumHeight(theme.preeditAttrs); - } [text addAttribute:NSParagraphStyleAttributeName - value:paragraphStylePreedit + value:theme.preeditParagraphStyle range:NSMakeRange(0, text.length)]; - _preeditRange = NSMakeRange(0, text.length); + preeditRange = NSMakeRange(0, text.length); if (numCandidates) { [text appendAttributedString:[[NSAttributedString alloc] initWithString:@"\n" @@ -1119,24 +1344,32 @@ - (void)showPreedit:(NSString *)preedit candidateStartPos = text.length; } - NSRange highlightedRange = NSMakeRange(NSNotFound, 0); + NSMutableArray *candidateRanges = [[NSMutableArray alloc] init]; // candidates NSUInteger i; for (i = 0; i < candidates.count; ++i) { NSMutableAttributedString *line = [[NSMutableAttributedString alloc] init]; - NSDictionary *attrs = (i == index) ? theme.highlightedAttrs : theme.attrs; - NSDictionary *labelAttrs = - (i == index) ? theme.labelHighlightedAttrs : theme.labelAttrs; - NSDictionary *commentAttrs = - (i == index) ? theme.commentHighlightedAttrs : theme.commentAttrs; + NSDictionary *attrs; + NSDictionary *labelAttrs; + NSDictionary *commentAttrs; + if (i == index) { + attrs = theme.highlightedAttrs; + labelAttrs = theme.labelHighlightedAttrs; + commentAttrs = theme.commentHighlightedAttrs; + } else { + attrs = theme.attrs; + labelAttrs = theme.labelAttrs; + commentAttrs = theme.commentAttrs; + } + CGFloat labelWidth = 0.0; if (theme.prefixLabelFormat != nil) { NSString *labelString; if (labels.count > 1 && i < labels.count) { NSString *labelFormat = [theme.prefixLabelFormat stringByReplacingOccurrencesOfString:@"%c" withString:@"%@"]; - labelString = [NSString stringWithFormat:labelFormat, labels[i]].precomposedStringWithCanonicalMapping; + labelString = [NSString stringWithFormat:labelFormat, labels[i]]; } else if (labels.count == 1 && i < [labels[0] length]) { // custom: A. B. C... char labelCharacter = [labels[0] characterAtIndex:i]; @@ -1152,31 +1385,37 @@ - (void)showPreedit:(NSString *)preedit initWithString:labelString attributes:labelAttrs]]; // get the label size for indent - if (theme.vertical) { - convertToVerticalGlyph(line, NSMakeRange(0, line.length)); - } if (!theme.linear) { - labelWidth = [line boundingRectWithSize:NSZeroSize options:NSStringDrawingUsesLineFragmentOrigin].size.width; + NSMutableAttributedString *str = [line mutableCopy]; + if (theme.vertical) { + [str addAttribute:NSVerticalGlyphFormAttributeName value:@(1) range:NSMakeRange(0, str.length)]; + } + labelWidth = [str boundingRectWithSize:NSZeroSize options:NSStringDrawingUsesLineFragmentOrigin].size.width; } } NSUInteger candidateStart = line.length; NSString *candidate = candidates[i]; - [line appendAttributedString:[[NSAttributedString alloc] - initWithString:candidate.precomposedStringWithCanonicalMapping - attributes:attrs]]; + NSAttributedString *candidateAttributedString = [[NSAttributedString alloc] + initWithString:candidate + attributes:attrs]; + CGFloat candidateWidth = [candidateAttributedString boundingRectWithSize:NSZeroSize options:NSStringDrawingUsesLineFragmentOrigin].size.width; + if (candidateWidth <= maxTextWidth * 0.2) { + // Unicode Word Joiner + candidateAttributedString = insert(@"\u2060", candidateAttributedString); + } + + [line appendAttributedString:candidateAttributedString]; + // Use left-to-right marks to prevent right-to-left text from changing the // layout of non-candidate text. [line addAttribute:NSWritingDirectionAttributeName value:@[@0] range:NSMakeRange(candidateStart, line.length-candidateStart)]; - if (theme.vertical) { - convertToVerticalGlyph(line, NSMakeRange(candidateStart, line.length-candidateStart)); - } if (theme.suffixLabelFormat != nil) { NSString *labelString; if (labels.count > 1 && i < labels.count) { NSString *labelFormat = [theme.suffixLabelFormat stringByReplacingOccurrencesOfString:@"%c" withString:@"%@"]; - labelString = [NSString stringWithFormat:labelFormat, labels[i]].precomposedStringWithCanonicalMapping; + labelString = [NSString stringWithFormat:labelFormat, labels[i]]; } else if (labels.count == 1 && i < [labels[0] length]) { // custom: A. B. C... char labelCharacter = [labels[0] characterAtIndex:i]; @@ -1186,83 +1425,112 @@ - (void)showPreedit:(NSString *)preedit NSString *labelFormat = [theme.suffixLabelFormat stringByReplacingOccurrencesOfString:@"%c" withString:@"%lu"]; labelString = [NSString stringWithFormat:labelFormat, i+1]; } - NSUInteger suffixLabelStart = line.length; [line appendAttributedString: [[NSAttributedString alloc] initWithString:labelString attributes:labelAttrs]]; - if (theme.vertical) { - convertToVerticalGlyph(line, NSMakeRange(suffixLabelStart, line.length-suffixLabelStart)); - } } if (i < comments.count && [comments[i] length] != 0) { - NSUInteger commentStart = line.length; - [line appendAttributedString:[[NSAttributedString alloc] - initWithString:@" " - attributes:commentAttrs]]; + CGFloat candidateAndLabelWidth = [line boundingRectWithSize:NSZeroSize options:NSStringDrawingUsesLineFragmentOrigin].size.width; NSString *comment = comments[i]; + NSAttributedString *commentAttributedString = [[NSAttributedString alloc] + initWithString:comment + attributes:commentAttrs]; + CGFloat commentWidth = [commentAttributedString boundingRectWithSize:NSZeroSize options:NSStringDrawingUsesLineFragmentOrigin].size.width; + if (commentWidth <= maxTextWidth * 0.2) { + // Unicode Word Joiner + commentAttributedString = insert(@"\u2060", commentAttributedString); + } + + NSString *commentSeparator; + if (candidateAndLabelWidth + commentWidth <= maxTextWidth * 0.3) { + // Non-Breaking White Space + commentSeparator = @"\u00A0"; + } else { + commentSeparator = @" "; + } [line appendAttributedString:[[NSAttributedString alloc] - initWithString:comment.precomposedStringWithCanonicalMapping + initWithString:commentSeparator attributes:commentAttrs]]; - if (theme.vertical) { - convertToVerticalGlyph(line, NSMakeRange(commentStart, line.length-commentStart)); - } + [line appendAttributedString:commentAttributedString]; } NSAttributedString *separator = [[NSMutableAttributedString alloc] initWithString:(theme.linear ? @" " : @"\n") attributes:attrs]; - _view.seperatorWidth = [separator boundingRectWithSize:NSZeroSize options:0].size.width; + + NSMutableAttributedString *str = [separator mutableCopy]; + if (theme.vertical) { + [str addAttribute:NSVerticalGlyphFormAttributeName value:@(1) range:NSMakeRange(0, str.length)]; + } + _view.seperatorWidth = [str boundingRectWithSize:NSZeroSize options:0].size.width; - NSMutableParagraphStyle *paragraphStyleCandidate; + NSMutableParagraphStyle *paragraphStyleCandidate = [theme.paragraphStyle mutableCopy]; if (i == 0) { - NSMutableParagraphStyle *firstParagraphStyle = [theme.paragraphStyle mutableCopy]; - firstParagraphStyle.paragraphSpacingBefore = theme.preeditLinespace / 2 + theme.hilitedCornerRadius / 2; - paragraphStyleCandidate = firstParagraphStyle; + paragraphStyleCandidate.paragraphSpacingBefore = theme.preeditLinespace / 2 + theme.hilitedCornerRadius / 2; } else { - paragraphStyleCandidate = [theme.paragraphStyle mutableCopy]; [text appendAttributedString:separator]; } if (theme.linear) { paragraphStyleCandidate.lineSpacing = theme.linespace; } - if (theme.vertical) { - paragraphStyleCandidate.minimumLineHeight = minimumHeight(attrs); - } paragraphStyleCandidate.headIndent = labelWidth; [line addAttribute:NSParagraphStyleAttributeName value:paragraphStyleCandidate range:NSMakeRange(0, line.length)]; - if (i == index) { - highlightedRange = NSMakeRange(text.length, line.length); - } + NSRange candidateRange = NSMakeRange(text.length, line.length); + [candidateRanges addObject: [NSValue valueWithRange:candidateRange]]; [text appendAttributedString:line]; } - // Fix font rendering - fixDefaultFont(text); - // text done! - [_view setText:text]; - [_view drawViewWith:highlightedRange preeditRange:_preeditRange highlightedPreeditRange:highlightedPreeditRange]; + [_view.textView.textContentStorage setAttributedString:text]; + if (theme.vertical) { + _view.textView.layoutOrientation = NSTextLayoutOrientationVertical; + } else { + _view.textView.layoutOrientation = NSTextLayoutOrientationHorizontal; + } + [_view drawViewWith:candidateRanges hilightedIndex:index preeditRange:preeditRange highlightedPreeditRange:highlightedPreeditRange]; [self show]; } -- (void)updateStatus:(NSString *)message { - _statusMessage = message; +- (void)updateStatusLong:(NSString *)messageLong statusShort:(NSString *)messageShort { + SquirrelTheme *theme = _view.currentTheme; + if ([theme.statusMessageType isEqualToString:@"mix"]) { + if (messageShort) { + _statusMessage = messageShort; + } else { + _statusMessage = messageLong; + } + } else if ([theme.statusMessageType isEqualToString:@"long"]) { + _statusMessage = messageLong; + } else if ([theme.statusMessageType isEqualToString:@"short"]) { + if (messageShort) { + _statusMessage = messageShort; + } else if (messageLong) { + _statusMessage = [messageLong substringWithRange:[messageLong rangeOfComposedCharacterSequenceAtIndex:0]]; + } + } } - (void)showStatus:(NSString *)message { SquirrelTheme *theme = _view.currentTheme; - NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:message attributes:theme.commentAttrs]; + NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:message attributes:theme.attrs]; + [text addAttribute:NSParagraphStyleAttributeName + value:theme.paragraphStyle + range:NSMakeRange(0, text.length)]; + + [_view.textView.textContentStorage setAttributedString:text]; if (theme.vertical) { - convertToVerticalGlyph(text, NSMakeRange(0, text.length)); + _view.textView.layoutOrientation = NSTextLayoutOrientationVertical; + } else { + _view.textView.layoutOrientation = NSTextLayoutOrientationHorizontal; } - [_view setText:text]; NSRange emptyRange = NSMakeRange(NSNotFound, 0); - [_view drawViewWith:emptyRange preeditRange:emptyRange highlightedPreeditRange:emptyRange]; + NSArray *candidateRanges = @[[NSValue valueWithRange: NSMakeRange(0, text.length)]]; + [_view drawViewWith:candidateRanges hilightedIndex:-1 preeditRange:emptyRange highlightedPreeditRange:emptyRange]; [self show]; if (_statusTimer) { @@ -1361,22 +1629,31 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo BOOL inlinePreedit = [config getBool:@"style/inline_preedit"]; BOOL inlineCandidate = [config getBool:@"style/inline_candidate"]; BOOL translucency = [config getBool:@"style/translucency"]; + BOOL mutualExclusive = [config getBool:@"style/mutual_exclusive"]; + NSNumber *memorizeSizeConfig = [config getOptionalBool:@"style/memorize_size"]; + if (memorizeSizeConfig) { + theme.memorizeSize = memorizeSizeConfig.boolValue; + } + + NSString *statusMessageType = [config getString:@"style/status_message_type"]; NSString *candidateFormat = [config getString:@"style/candidate_format"]; - NSString *fontName = [config getString:@"style/font_face"]; - NSInteger fontSize = [config getDouble:@"style/font_point"]; + CGFloat fontSize = [config getDouble:@"style/font_point"]; NSString *labelFontName = [config getString:@"style/label_font_face"]; - NSInteger labelFontSize = [config getDouble:@"style/label_font_point"]; + CGFloat labelFontSize = [config getDouble:@"style/label_font_point"]; NSString *commentFontName = [config getString:@"style/comment_font_face"]; - NSInteger commentFontSize = [config getDouble:@"style/comment_font_point"]; - CGFloat alpha = fmin(fmax([config getDouble:@"style/alpha"], 0.0), 1.0); + CGFloat commentFontSize = [config getDouble:@"style/comment_font_point"]; + NSNumber *alphaValue = [config getOptionalDouble:@"style/alpha"]; + CGFloat alpha = alphaValue ? fmin(fmax(alphaValue.doubleValue, 0.0), 1.0) : 1.0; CGFloat cornerRadius = [config getDouble:@"style/corner_radius"]; CGFloat hilitedCornerRadius = [config getDouble:@"style/hilited_corner_radius"]; + CGFloat surroundingExtraExpansion = [config getDouble:@"style/surrounding_extra_expansion"]; CGFloat borderHeight = [config getDouble:@"style/border_height"]; CGFloat borderWidth = [config getDouble:@"style/border_width"]; CGFloat lineSpacing = [config getDouble:@"style/line_spacing"]; CGFloat spacing = [config getDouble:@"style/spacing"]; CGFloat baseOffset = [config getDouble:@"style/base_offset"]; + CGFloat shadowSize = fmax(0,[config getDouble:@"style/shadow_size"]); NSColor *backgroundColor; NSColor *borderColor; @@ -1389,6 +1666,7 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo NSColor *candidateTextColor; NSColor *highlightedCandidateTextColor; NSColor *highlightedCandidateBackColor; + NSColor *candidateBackColor; NSColor *commentTextColor; NSColor *highlightedCommentTextColor; @@ -1402,9 +1680,7 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo BOOL isNative = !colorScheme || [colorScheme isEqualToString:@"native"]; if (!isNative) { NSString *prefix = [@"preset_color_schemes/" stringByAppendingString:colorScheme]; - if (@available(macOS 10.12, *)) { - config.colorSpace = [config getString:[prefix stringByAppendingString:@"/color_space"]]; - } + config.colorSpace = [config getString:[prefix stringByAppendingString:@"/color_space"]]; backgroundColor = [config getColor:[prefix stringByAppendingString:@"/back_color"]]; borderColor = [config getColor:[prefix stringByAppendingString:@"/border_color"]]; preeditBackgroundColor = [config getColor:[prefix stringByAppendingString:@"/preedit_back_color"]]; @@ -1423,6 +1699,16 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo // if not otherwise specified, candidate text is also rendered in this color. candidateTextColor = textColor; } + candidateLabelColor = + [config getColor:[prefix stringByAppendingString:@"/label_color"]]; + highlightedCandidateLabelColor = + [config getColor:[prefix stringByAppendingString:@"/label_hilited_color"]]; + if (!highlightedCandidateLabelColor) { + // for backward compatibility, 'label_hilited_color' and 'hilited_candidate_label_color' + // are both valid + highlightedCandidateLabelColor = + [config getColor:[prefix stringByAppendingString:@"/hilited_candidate_label_color"]]; + } highlightedCandidateTextColor = [config getColor:[prefix stringByAppendingString:@"/hilited_candidate_text_color"]]; if (highlightedCandidateTextColor == nil) { @@ -1433,6 +1719,8 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo if (highlightedCandidateBackColor == nil) { highlightedCandidateBackColor = highlightedBackColor; } + candidateBackColor = + [config getColor:[prefix stringByAppendingString:@"/candidate_back_color"]]; commentTextColor = [config getColor:[prefix stringByAppendingString:@"/comment_text_color"]]; highlightedCommentTextColor = @@ -1459,6 +1747,11 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo if (translucencyOverridden) { translucency = translucencyOverridden.boolValue; } + NSNumber *mutualExclusiveOverridden = + [config getOptionalBool:[prefix stringByAppendingString:@"/mutual_exclusive"]]; + if (mutualExclusiveOverridden) { + mutualExclusive = mutualExclusiveOverridden.boolValue; + } NSString *candidateFormatOverridden = [config getString:[prefix stringByAppendingString:@"/candidate_format"]]; if (candidateFormatOverridden) { @@ -1495,22 +1788,6 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo if (commentFontSizeOverridden) { commentFontSize = commentFontSizeOverridden.integerValue; } - NSColor *candidateLabelColorOverridden = - [config getColor:[prefix stringByAppendingString:@"/label_color"]]; - if (candidateLabelColorOverridden) { - candidateLabelColor = candidateLabelColorOverridden; - } - NSColor *highlightedCandidateLabelColorOverridden = - [config getColor:[prefix stringByAppendingString:@"/label_hilited_color"]]; - if (!highlightedCandidateLabelColorOverridden) { - // for backward compatibility, 'label_hilited_color' and 'hilited_candidate_label_color' - // are both valid - highlightedCandidateLabelColorOverridden = - [config getColor:[prefix stringByAppendingString:@"/hilited_candidate_label_color"]]; - } - if (highlightedCandidateLabelColorOverridden) { - highlightedCandidateLabelColor = highlightedCandidateLabelColorOverridden; - } NSNumber *alphaOverridden = [config getOptionalDouble:[prefix stringByAppendingString:@"/alpha"]]; if (alphaOverridden) { @@ -1526,6 +1803,11 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo if (hilitedCornerRadiusOverridden) { hilitedCornerRadius = hilitedCornerRadiusOverridden.doubleValue; } + NSNumber *surroundingExtraExpansionOverridden = + [config getOptionalDouble:[prefix stringByAppendingString:@"/surrounding_extra_expansion"]]; + if (surroundingExtraExpansionOverridden) { + surroundingExtraExpansion = surroundingExtraExpansionOverridden.doubleValue; + } NSNumber *borderHeightOverridden = [config getOptionalDouble:[prefix stringByAppendingString:@"/border_height"]]; if (borderHeightOverridden) { @@ -1551,6 +1833,11 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo if (baseOffsetOverridden) { baseOffset = baseOffsetOverridden.doubleValue; } + NSNumber *shadowSizeOverridden = + [config getOptionalDouble:[prefix stringByAppendingString:@"/shadow_size"]]; + if (shadowSizeOverridden) { + shadowSize = shadowSizeOverridden.doubleValue; + } } if (fontSize == 0) { // default size @@ -1662,17 +1949,19 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo highlightedTextColor = highlightedTextColor ? highlightedTextColor : [NSColor controlTextColor]; attrs[NSForegroundColorAttributeName] = candidateTextColor; - labelAttrs[NSForegroundColorAttributeName] = candidateLabelColor; highlightedAttrs[NSForegroundColorAttributeName] = highlightedCandidateTextColor; + labelAttrs[NSForegroundColorAttributeName] = candidateLabelColor; labelHighlightedAttrs[NSForegroundColorAttributeName] = highlightedCandidateLabelColor; commentAttrs[NSForegroundColorAttributeName] = commentTextColor; commentHighlightedAttrs[NSForegroundColorAttributeName] = highlightedCommentTextColor; preeditAttrs[NSForegroundColorAttributeName] = textColor; preeditHighlightedAttrs[NSForegroundColorAttributeName] = highlightedTextColor; + [theme setStatusMessageType:statusMessageType]; + [theme setAttrs:attrs - labelAttrs:labelAttrs highlightedAttrs:highlightedAttrs + labelAttrs:labelAttrs labelHighlightedAttrs:labelHighlightedAttrs commentAttrs:commentAttrs commentHighlightedAttrs:commentHighlightedAttrs @@ -1683,26 +1972,30 @@ +(void)updateTheme:(SquirrelTheme *)theme withConfig:(SquirrelConfig *)config fo preeditParagraphStyle:preeditParagraphStyle]; [theme setBackgroundColor:backgroundColor - highlightedStripColor:highlightedCandidateBackColor + highlightedBackColor:highlightedCandidateBackColor + candidateBackColor:candidateBackColor highlightedPreeditColor:highlightedBackColor preeditBackgroundColor:preeditBackgroundColor borderColor:borderColor]; NSSize edgeInset; if (vertical) { - edgeInset = NSMakeSize(MAX(borderHeight, cornerRadius), MAX(borderWidth, cornerRadius)); + edgeInset = NSMakeSize(borderHeight + cornerRadius, borderWidth + cornerRadius); } else { - edgeInset = NSMakeSize(MAX(borderWidth, cornerRadius), MAX(borderHeight, cornerRadius)); + edgeInset = NSMakeSize(borderWidth + cornerRadius, borderHeight + cornerRadius); } [theme setCornerRadius:cornerRadius hilitedCornerRadius:hilitedCornerRadius + srdExtraExpansion:surroundingExtraExpansion + shadowSize:shadowSize edgeInset:edgeInset borderWidth:MIN(borderHeight, borderWidth) linespace:lineSpacing preeditLinespace:spacing - alpha:(alpha == 0 ? 1.0 : alpha) + alpha:alpha translucency:translucency + mutualExclusive:mutualExclusive linear:linear vertical:vertical inlinePreedit:inlinePreedit diff --git a/input_source.m b/input_source.m index 35b1abf2f..9118fe62f 100644 --- a/input_source.m +++ b/input_source.m @@ -10,7 +10,7 @@ #define HANS_INPUT_MODE (1 << 0) #define HANT_INPUT_MODE (1 << 1) -void RegisterInputSource() { +void RegisterInputSource(void) { CFURLRef installedLocationURL = CFURLCreateFromFileSystemRepresentation( NULL, kInstallLocation, strlen((const char *)kInstallLocation), NO); if (installedLocationURL) { @@ -28,10 +28,10 @@ void ActivateInputSource(int enabled_modes) { NSString *sourceID = (__bridge NSString *)(TISGetInputSourceProperty( inputSource, kTISPropertyInputSourceID)); //NSLog(@"Examining input source: %@", sourceID); - if ([sourceID isEqualToString:kHansInputModeID] && - ((enabled_modes & HANS_INPUT_MODE) != 0) || - [sourceID isEqualToString:kHantInputModeID] && - ((enabled_modes & HANT_INPUT_MODE) != 0)) { + if (([sourceID isEqualToString:kHansInputModeID] && + ((enabled_modes & HANS_INPUT_MODE) != 0)) || + ([sourceID isEqualToString:kHantInputModeID] && + ((enabled_modes & HANT_INPUT_MODE) != 0))) { TISEnableInputSource(inputSource); NSLog(@"Enabled input source: %@", sourceID); CFBooleanRef isSelectable = (CFBooleanRef)TISGetInputSourceProperty( @@ -45,7 +45,7 @@ void ActivateInputSource(int enabled_modes) { CFRelease(sourceList); } -void DeactivateInputSource() { +void DeactivateInputSource(void) { CFArrayRef sourceList = TISCreateInputSourceList(NULL, true); for (CFIndex i = CFArrayGetCount(sourceList); i > 0; --i) { TISInputSourceRef inputSource = (TISInputSourceRef)(CFArrayGetValueAtIndex( @@ -66,7 +66,7 @@ void DeactivateInputSource() { CFRelease(sourceList); } -int GetEnabledInputModes() { +int GetEnabledInputModes(void) { int input_modes = 0; CFArrayRef sourceList = TISCreateInputSourceList(NULL, true); for (CFIndex i = 0; i < CFArrayGetCount(sourceList); ++i) { diff --git a/librime b/librime index 477c010ef..8911db66b 160000 --- a/librime +++ b/librime @@ -1 +1 @@ -Subproject commit 477c010efd9f6887aee7d0412f39ba4a326a6bc3 +Subproject commit 8911db66b0e5d43c2c3e47ffec06bfd10201daae diff --git a/main.m b/main.m index f4f95d6f7..2a1a556f3 100644 --- a/main.m +++ b/main.m @@ -5,9 +5,9 @@ #import #import -void RegisterInputSource(); -int GetEnabledInputModes(); -void DeactivateInputSource(); +void RegisterInputSource(void); +int GetEnabledInputModes(void); +void DeactivateInputSource(void); void ActivateInputSource(int input_modes); #define DEFAULT_INPUT_MODE 1 @@ -63,17 +63,18 @@ int main(int argc, char *argv[]) { @autoreleasepool { // find the bundle identifier and then initialize the input method server + NSBundle *main = [NSBundle mainBundle]; IMKServer *server __unused = [[IMKServer alloc] initWithName:(NSString *)kConnectionName - bundleIdentifier:[NSBundle mainBundle].bundleIdentifier]; + bundleIdentifier:main.bundleIdentifier]; // load the bundle explicitly because in this case the input method is a // background only application - [NSBundle loadNibNamed:@"MainMenu" owner:[NSApplication sharedApplication]]; + [main loadNibNamed:@"MainMenu" owner:[NSApplication sharedApplication] topLevelObjects:NULL]; // opencc will be configured with relative dictionary paths [[NSFileManager defaultManager] - changeCurrentDirectoryPath:[NSBundle mainBundle].sharedSupportPath]; + changeCurrentDirectoryPath:main.sharedSupportPath]; if (NSApp.squirrelAppDelegate.problematicLaunchDetected) { NSLog(@"Problematic launch detected!"); diff --git a/package/sign.bash b/package/sign.bash new file mode 100755 index 000000000..70b79ccc2 --- /dev/null +++ b/package/sign.bash @@ -0,0 +1,15 @@ +appDir="build/Release/Squirrel.app" + +allFiles=$(find "$appDir" -print) +for file in $allFiles; do + if ! [[ -d "$file" ]]; then + if [[ -x "$file" ]]; then + echo "$file" + codesign --force --options runtime --timestamp --sign "Developer ID Application: $1" "$file"; + fi; + fi; +done; + +codesign --force --options runtime --timestamp --sign "Developer ID Application: $1" "$appDir"; + +spctl -a -vv "$appDir"; diff --git a/rime.pdf b/rime.pdf index 5319f4744..48c079546 100644 Binary files a/rime.pdf and b/rime.pdf differ diff --git a/utf8.cpp b/utf8.cpp deleted file mode 100644 index 24c6590b1..000000000 --- a/utf8.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "utf8.h" -#include "utf8/unchecked.h" - - -unsigned long utf8len(const char *text, unsigned octet_len) { - return utf8::unchecked::distance(text, text + octet_len); -} diff --git a/utf8.h b/utf8.h deleted file mode 100644 index c56ee813d..000000000 --- a/utf8.h +++ /dev/null @@ -1,7 +0,0 @@ -#if defined(__cplusplus) -#define UTF8_API extern "C" -#else -#define UTF8_API -#endif - -UTF8_API unsigned long utf8len(const char *text, unsigned octet_len); diff --git a/utf8/checked.h b/utf8/checked.h deleted file mode 100644 index b6a5f9d84..000000000 --- a/utf8/checked.h +++ /dev/null @@ -1,327 +0,0 @@ -// Copyright 2006 Nemanja Trifunovic - -/* -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -*/ - - -#ifndef UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 -#define UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 - -#include "core.h" -#include - -namespace utf8 -{ - // Base for the exceptions that may be thrown from the library - class exception : public std::exception { - }; - - // Exceptions that may be thrown from the library functions. - class invalid_code_point : public exception { - uint32_t cp; - public: - invalid_code_point(uint32_t cp) : cp(cp) {} - virtual const char* what() const throw() { return "Invalid code point"; } - uint32_t code_point() const {return cp;} - }; - - class invalid_utf8 : public exception { - uint8_t u8; - public: - invalid_utf8 (uint8_t u) : u8(u) {} - virtual const char* what() const throw() { return "Invalid UTF-8"; } - uint8_t utf8_octet() const {return u8;} - }; - - class invalid_utf16 : public exception { - uint16_t u16; - public: - invalid_utf16 (uint16_t u) : u16(u) {} - virtual const char* what() const throw() { return "Invalid UTF-16"; } - uint16_t utf16_word() const {return u16;} - }; - - class not_enough_room : public exception { - public: - virtual const char* what() const throw() { return "Not enough space"; } - }; - - /// The library API - functions intended to be called by the users - - template - output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement) - { - while (start != end) { - octet_iterator sequence_start = start; - internal::utf_error err_code = internal::validate_next(start, end); - switch (err_code) { - case internal::UTF8_OK : - for (octet_iterator it = sequence_start; it != start; ++it) - *out++ = *it; - break; - case internal::NOT_ENOUGH_ROOM: - throw not_enough_room(); - case internal::INVALID_LEAD: - append (replacement, out); - ++start; - break; - case internal::INCOMPLETE_SEQUENCE: - case internal::OVERLONG_SEQUENCE: - case internal::INVALID_CODE_POINT: - append (replacement, out); - ++start; - // just one replacement mark for the sequence - while (internal::is_trail(*start) && start != end) - ++start; - break; - } - } - return out; - } - - template - inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out) - { - static const uint32_t replacement_marker = internal::mask16(0xfffd); - return replace_invalid(start, end, out, replacement_marker); - } - - template - octet_iterator append(uint32_t cp, octet_iterator result) - { - if (!internal::is_code_point_valid(cp)) - throw invalid_code_point(cp); - - if (cp < 0x80) // one octet - *(result++) = static_cast(cp); - else if (cp < 0x800) { // two octets - *(result++) = static_cast((cp >> 6) | 0xc0); - *(result++) = static_cast((cp & 0x3f) | 0x80); - } - else if (cp < 0x10000) { // three octets - *(result++) = static_cast((cp >> 12) | 0xe0); - *(result++) = static_cast(((cp >> 6) & 0x3f) | 0x80); - *(result++) = static_cast((cp & 0x3f) | 0x80); - } - else { // four octets - *(result++) = static_cast((cp >> 18) | 0xf0); - *(result++) = static_cast(((cp >> 12) & 0x3f) | 0x80); - *(result++) = static_cast(((cp >> 6) & 0x3f) | 0x80); - *(result++) = static_cast((cp & 0x3f) | 0x80); - } - return result; - } - - template - uint32_t next(octet_iterator& it, octet_iterator end) - { - uint32_t cp = 0; - internal::utf_error err_code = internal::validate_next(it, end, &cp); - switch (err_code) { - case internal::UTF8_OK : - break; - case internal::NOT_ENOUGH_ROOM : - throw not_enough_room(); - case internal::INVALID_LEAD : - case internal::INCOMPLETE_SEQUENCE : - case internal::OVERLONG_SEQUENCE : - throw invalid_utf8(*it); - case internal::INVALID_CODE_POINT : - throw invalid_code_point(cp); - } - return cp; - } - - template - uint32_t peek_next(octet_iterator it, octet_iterator end) - { - return next(it, end); - } - - template - uint32_t prior(octet_iterator& it, octet_iterator start) - { - // can't do much if it == start - if (it == start) - throw not_enough_room(); - - octet_iterator end = it; - // Go back until we hit either a lead octet or start - while (internal::is_trail(*(--it))) - if (it == start) - throw invalid_utf8(*it); // error - no lead byte in the sequence - return peek_next(it, end); - } - - /// Deprecated in versions that include "prior" - template - uint32_t previous(octet_iterator& it, octet_iterator pass_start) - { - octet_iterator end = it; - while (internal::is_trail(*(--it))) - if (it == pass_start) - throw invalid_utf8(*it); // error - no lead byte in the sequence - octet_iterator temp = it; - return next(temp, end); - } - - template - void advance (octet_iterator& it, distance_type n, octet_iterator end) - { - for (distance_type i = 0; i < n; ++i) - next(it, end); - } - - template - typename std::iterator_traits::difference_type - distance (octet_iterator first, octet_iterator last) - { - typename std::iterator_traits::difference_type dist; - for (dist = 0; first < last; ++dist) - next(first, last); - return dist; - } - - template - octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result) - { - while (start != end) { - uint32_t cp = internal::mask16(*start++); - // Take care of surrogate pairs first - if (internal::is_lead_surrogate(cp)) { - if (start != end) { - uint32_t trail_surrogate = internal::mask16(*start++); - if (internal::is_trail_surrogate(trail_surrogate)) - cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET; - else - throw invalid_utf16(static_cast(trail_surrogate)); - } - else - throw invalid_utf16(static_cast(cp)); - - } - // Lone trail surrogate - else if (internal::is_trail_surrogate(cp)) - throw invalid_utf16(static_cast(cp)); - - result = append(cp, result); - } - return result; - } - - template - u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result) - { - while (start != end) { - uint32_t cp = next(start, end); - if (cp > 0xffff) { //make a surrogate pair - *result++ = static_cast((cp >> 10) + internal::LEAD_OFFSET); - *result++ = static_cast((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN); - } - else - *result++ = static_cast(cp); - } - return result; - } - - template - octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result) - { - while (start != end) - result = append(*(start++), result); - - return result; - } - - template - u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result) - { - while (start != end) - (*result++) = next(start, end); - - return result; - } - - // The iterator class - template - class iterator : public std::iterator { - octet_iterator it; - octet_iterator range_start; - octet_iterator range_end; - public: - iterator () {}; - explicit iterator (const octet_iterator& octet_it, - const octet_iterator& range_start, - const octet_iterator& range_end) : - it(octet_it), range_start(range_start), range_end(range_end) - { - if (it < range_start || it > range_end) - throw std::out_of_range("Invalid utf-8 iterator position"); - } - // the default "big three" are OK - octet_iterator base () const { return it; } - uint32_t operator * () const - { - octet_iterator temp = it; - return next(temp, range_end); - } - bool operator == (const iterator& rhs) const - { - if (range_start != rhs.range_start || range_end != rhs.range_end) - throw std::logic_error("Comparing utf-8 iterators defined with different ranges"); - return (it == rhs.it); - } - bool operator != (const iterator& rhs) const - { - return !(operator == (rhs)); - } - iterator& operator ++ () - { - next(it, range_end); - return *this; - } - iterator operator ++ (int) - { - iterator temp = *this; - next(it, range_end); - return temp; - } - iterator& operator -- () - { - prior(it, range_start); - return *this; - } - iterator operator -- (int) - { - iterator temp = *this; - prior(it, range_start); - return temp; - } - }; // class iterator - -} // namespace utf8 - -#endif //header guard - - diff --git a/utf8/core.h b/utf8/core.h deleted file mode 100644 index 268cf7cd4..000000000 --- a/utf8/core.h +++ /dev/null @@ -1,358 +0,0 @@ -// Copyright 2006 Nemanja Trifunovic - -/* -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -*/ - - -#ifndef UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 -#define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 - -#include - -namespace utf8 -{ - // The typedefs for 8-bit, 16-bit and 32-bit unsigned integers - // You may need to change them to match your system. - // These typedefs have the same names as ones from cstdint, or boost/cstdint - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef unsigned int uint32_t; - -// Helper code - not intended to be directly called by the library users. May be changed at any time -namespace internal -{ - // Unicode constants - // Leading (high) surrogates: 0xd800 - 0xdbff - // Trailing (low) surrogates: 0xdc00 - 0xdfff - const uint16_t LEAD_SURROGATE_MIN = 0xd800u; - const uint16_t LEAD_SURROGATE_MAX = 0xdbffu; - const uint16_t TRAIL_SURROGATE_MIN = 0xdc00u; - const uint16_t TRAIL_SURROGATE_MAX = 0xdfffu; - const uint16_t LEAD_OFFSET = LEAD_SURROGATE_MIN - (0x10000 >> 10); - const uint32_t SURROGATE_OFFSET = 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN; - - // Maximum valid value for a Unicode code point - const uint32_t CODE_POINT_MAX = 0x0010ffffu; - - template - inline uint8_t mask8(octet_type oc) - { - return static_cast(0xff & oc); - } - template - inline uint16_t mask16(u16_type oc) - { - return static_cast(0xffff & oc); - } - template - inline bool is_trail(octet_type oc) - { - return ((mask8(oc) >> 6) == 0x2); - } - - template - inline bool is_lead_surrogate(u16 cp) - { - return (cp >= LEAD_SURROGATE_MIN && cp <= LEAD_SURROGATE_MAX); - } - - template - inline bool is_trail_surrogate(u16 cp) - { - return (cp >= TRAIL_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX); - } - - template - inline bool is_surrogate(u16 cp) - { - return (cp >= LEAD_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX); - } - - template - inline bool is_code_point_valid(u32 cp) - { - return (cp <= CODE_POINT_MAX && !is_surrogate(cp)); - } - - template - inline typename std::iterator_traits::difference_type - sequence_length(octet_iterator lead_it) - { - uint8_t lead = mask8(*lead_it); - if (lead < 0x80) - return 1; - else if ((lead >> 5) == 0x6) - return 2; - else if ((lead >> 4) == 0xe) - return 3; - else if ((lead >> 3) == 0x1e) - return 4; - else - return 0; - } - - template - inline bool is_overlong_sequence(uint32_t cp, octet_difference_type length) - { - if (cp < 0x80) { - if (length != 1) - return true; - } - else if (cp < 0x800) { - if (length != 2) - return true; - } - else if (cp < 0x10000) { - if (length != 3) - return true; - } - - return false; - } - - enum utf_error {UTF8_OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT}; - - /// get_sequence_x functions decode utf-8 sequences of the length x - - template - utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t* code_point) - { - if (it != end) { - if (code_point) - *code_point = mask8(*it); - return UTF8_OK; - } - return NOT_ENOUGH_ROOM; - } - - template - utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t* code_point) - { - utf_error ret_code = NOT_ENOUGH_ROOM; - - if (it != end) { - uint32_t cp = mask8(*it); - if (++it != end) { - if (is_trail(*it)) { - cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f); - - if (code_point) - *code_point = cp; - ret_code = UTF8_OK; - } - else - ret_code = INCOMPLETE_SEQUENCE; - } - else - ret_code = NOT_ENOUGH_ROOM; - } - - return ret_code; - } - - template - utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t* code_point) - { - utf_error ret_code = NOT_ENOUGH_ROOM; - - if (it != end) { - uint32_t cp = mask8(*it); - if (++it != end) { - if (is_trail(*it)) { - cp = ((cp << 12) & 0xffff) + ((mask8(*it) << 6) & 0xfff); - if (++it != end) { - if (is_trail(*it)) { - cp += (*it) & 0x3f; - - if (code_point) - *code_point = cp; - ret_code = UTF8_OK; - } - else - ret_code = INCOMPLETE_SEQUENCE; - } - else - ret_code = NOT_ENOUGH_ROOM; - } - else - ret_code = INCOMPLETE_SEQUENCE; - } - else - ret_code = NOT_ENOUGH_ROOM; - } - - return ret_code; - } - - template - utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t* code_point) - { - utf_error ret_code = NOT_ENOUGH_ROOM; - - if (it != end) { - uint32_t cp = mask8(*it); - if (++it != end) { - if (is_trail(*it)) { - cp = ((cp << 18) & 0x1fffff) + ((mask8(*it) << 12) & 0x3ffff); - if (++it != end) { - if (is_trail(*it)) { - cp += (mask8(*it) << 6) & 0xfff; - if (++it != end) { - if (is_trail(*it)) { - cp += (*it) & 0x3f; - - if (code_point) - *code_point = cp; - ret_code = UTF8_OK; - } - else - ret_code = INCOMPLETE_SEQUENCE; - } - else - ret_code = NOT_ENOUGH_ROOM; - } - else - ret_code = INCOMPLETE_SEQUENCE; - } - else - ret_code = NOT_ENOUGH_ROOM; - } - else - ret_code = INCOMPLETE_SEQUENCE; - } - else - ret_code = NOT_ENOUGH_ROOM; - } - - return ret_code; - } - - template - utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t* code_point) - { - // Save the original value of it so we can go back in case of failure - // Of course, it does not make much sense with i.e. stream iterators - octet_iterator original_it = it; - - uint32_t cp = 0; - // Determine the sequence length based on the lead octet - typedef typename std::iterator_traits::difference_type octet_difference_type; - octet_difference_type length = sequence_length(it); - if (length == 0) - return INVALID_LEAD; - - // Now that we have a valid sequence length, get trail octets and calculate the code point - utf_error err = UTF8_OK; - switch (length) { - case 1: - err = get_sequence_1(it, end, &cp); - break; - case 2: - err = get_sequence_2(it, end, &cp); - break; - case 3: - err = get_sequence_3(it, end, &cp); - break; - case 4: - err = get_sequence_4(it, end, &cp); - break; - } - - if (err == UTF8_OK) { - // Decoding succeeded. Now, security checks... - if (is_code_point_valid(cp)) { - if (!is_overlong_sequence(cp, length)){ - // Passed! Return here. - if (code_point) - *code_point = cp; - ++it; - return UTF8_OK; - } - else - err = OVERLONG_SEQUENCE; - } - else - err = INVALID_CODE_POINT; - } - - // Failure branch - restore the original value of the iterator - it = original_it; - return err; - } - - template - inline utf_error validate_next(octet_iterator& it, octet_iterator end) { - return validate_next(it, end, 0); - } - -} // namespace internal - - /// The library API - functions intended to be called by the users - - // Byte order mark - const uint8_t bom[] = {0xef, 0xbb, 0xbf}; - - template - octet_iterator find_invalid(octet_iterator start, octet_iterator end) - { - octet_iterator result = start; - while (result != end) { - internal::utf_error err_code = internal::validate_next(result, end); - if (err_code != internal::UTF8_OK) - return result; - } - return result; - } - - template - inline bool is_valid(octet_iterator start, octet_iterator end) - { - return (find_invalid(start, end) == end); - } - - template - inline bool starts_with_bom (octet_iterator it, octet_iterator end) - { - return ( - ((it != end) && (internal::mask8(*it++)) == bom[0]) && - ((it != end) && (internal::mask8(*it++)) == bom[1]) && - ((it != end) && (internal::mask8(*it)) == bom[2]) - ); - } - - //Deprecated in release 2.3 - template - inline bool is_bom (octet_iterator it) - { - return ( - (internal::mask8(*it++)) == bom[0] && - (internal::mask8(*it++)) == bom[1] && - (internal::mask8(*it)) == bom[2] - ); - } -} // namespace utf8 - -#endif // header guard - - diff --git a/utf8/unchecked.h b/utf8/unchecked.h deleted file mode 100644 index 2f3eb4d1d..000000000 --- a/utf8/unchecked.h +++ /dev/null @@ -1,228 +0,0 @@ -// Copyright 2006 Nemanja Trifunovic - -/* -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -*/ - - -#ifndef UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 -#define UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 - -#include "core.h" - -namespace utf8 -{ - namespace unchecked - { - template - octet_iterator append(uint32_t cp, octet_iterator result) - { - if (cp < 0x80) // one octet - *(result++) = static_cast(cp); - else if (cp < 0x800) { // two octets - *(result++) = static_cast((cp >> 6) | 0xc0); - *(result++) = static_cast((cp & 0x3f) | 0x80); - } - else if (cp < 0x10000) { // three octets - *(result++) = static_cast((cp >> 12) | 0xe0); - *(result++) = static_cast(((cp >> 6) & 0x3f) | 0x80); - *(result++) = static_cast((cp & 0x3f) | 0x80); - } - else { // four octets - *(result++) = static_cast((cp >> 18) | 0xf0); - *(result++) = static_cast(((cp >> 12) & 0x3f)| 0x80); - *(result++) = static_cast(((cp >> 6) & 0x3f) | 0x80); - *(result++) = static_cast((cp & 0x3f) | 0x80); - } - return result; - } - - template - uint32_t next(octet_iterator& it) - { - uint32_t cp = internal::mask8(*it); - typename std::iterator_traits::difference_type length = utf8::internal::sequence_length(it); - switch (length) { - case 1: - break; - case 2: - it++; - cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f); - break; - case 3: - ++it; - cp = ((cp << 12) & 0xffff) + ((internal::mask8(*it) << 6) & 0xfff); - ++it; - cp += (*it) & 0x3f; - break; - case 4: - ++it; - cp = ((cp << 18) & 0x1fffff) + ((internal::mask8(*it) << 12) & 0x3ffff); - ++it; - cp += (internal::mask8(*it) << 6) & 0xfff; - ++it; - cp += (*it) & 0x3f; - break; - } - ++it; - return cp; - } - - template - uint32_t peek_next(octet_iterator it) - { - return next(it); - } - - template - uint32_t prior(octet_iterator& it) - { - while (internal::is_trail(*(--it))) ; - octet_iterator temp = it; - return next(temp); - } - - // Deprecated in versions that include prior, but only for the sake of consistency (see utf8::previous) - template - inline uint32_t previous(octet_iterator& it) - { - return prior(it); - } - - template - void advance (octet_iterator& it, distance_type n) - { - for (distance_type i = 0; i < n; ++i) - next(it); - } - - template - typename std::iterator_traits::difference_type - distance (octet_iterator first, octet_iterator last) - { - typename std::iterator_traits::difference_type dist; - for (dist = 0; first < last; ++dist) - next(first); - return dist; - } - - template - octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result) - { - while (start != end) { - uint32_t cp = internal::mask16(*start++); - // Take care of surrogate pairs first - if (internal::is_lead_surrogate(cp)) { - uint32_t trail_surrogate = internal::mask16(*start++); - cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET; - } - result = append(cp, result); - } - return result; - } - - template - u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result) - { - while (start < end) { - uint32_t cp = next(start); - if (cp > 0xffff) { //make a surrogate pair - *result++ = static_cast((cp >> 10) + internal::LEAD_OFFSET); - *result++ = static_cast((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN); - } - else - *result++ = static_cast(cp); - } - return result; - } - - template - octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result) - { - while (start != end) - result = append(*(start++), result); - - return result; - } - - template - u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result) - { - while (start < end) - (*result++) = next(start); - - return result; - } - - // The iterator class - template - class iterator : public std::iterator { - octet_iterator it; - public: - iterator () {}; - explicit iterator (const octet_iterator& octet_it): it(octet_it) {} - // the default "big three" are OK - octet_iterator base () const { return it; } - uint32_t operator * () const - { - octet_iterator temp = it; - return next(temp); - } - bool operator == (const iterator& rhs) const - { - return (it == rhs.it); - } - bool operator != (const iterator& rhs) const - { - return !(operator == (rhs)); - } - iterator& operator ++ () - { - std::advance(it, internal::sequence_length(it)); - return *this; - } - iterator operator ++ (int) - { - iterator temp = *this; - std::advance(it, internal::sequence_length(it)); - return temp; - } - iterator& operator -- () - { - prior(it); - return *this; - } - iterator operator -- (int) - { - iterator temp = *this; - prior(it); - return temp; - } - }; // class iterator - - } // namespace utf8::unchecked -} // namespace utf8 - - -#endif // header guard -