diff --git a/Frameworks/ShortcutRecorder.framework/Headers b/Frameworks/ShortcutRecorder.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/Frameworks/ShortcutRecorder.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/Frameworks/ShortcutRecorder.framework/Resources b/Frameworks/ShortcutRecorder.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/Frameworks/ShortcutRecorder.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/Frameworks/ShortcutRecorder.framework/ShortcutRecorder b/Frameworks/ShortcutRecorder.framework/ShortcutRecorder deleted file mode 120000 index 2be0db1..0000000 --- a/Frameworks/ShortcutRecorder.framework/ShortcutRecorder +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/ShortcutRecorder \ No newline at end of file diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRCommon.h b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRCommon.h deleted file mode 100644 index ce12ebf..0000000 --- a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRCommon.h +++ /dev/null @@ -1,185 +0,0 @@ -// -// SRCommon.h -// ShortcutRecorder -// -// Copyright 2006-2007 Contributors. All rights reserved. -// -// License: BSD -// -// Contributors: -// David Dauer -// Jesper -// Jamie Kirkpatrick - -#import -#import -#import - -#pragma mark Dummy class - -@interface SRDummyClass : NSObject {} @end - -#pragma mark - -#pragma mark Typedefs - -typedef struct _KeyCombo { - NSUInteger flags; // 0 for no flags - NSInteger code; // -1 for no code -} KeyCombo; - -#pragma mark - -#pragma mark Enums - -// Unicode values of some keyboard glyphs -enum { - KeyboardTabRightGlyph = 0x21E5, - KeyboardTabLeftGlyph = 0x21E4, - KeyboardCommandGlyph = kCommandUnicode, - KeyboardOptionGlyph = kOptionUnicode, - KeyboardShiftGlyph = kShiftUnicode, - KeyboardControlGlyph = kControlUnicode, - KeyboardReturnGlyph = 0x2305, - KeyboardReturnR2LGlyph = 0x21A9, - KeyboardDeleteLeftGlyph = 0x232B, - KeyboardDeleteRightGlyph = 0x2326, - KeyboardPadClearGlyph = 0x2327, - KeyboardLeftArrowGlyph = 0x2190, - KeyboardRightArrowGlyph = 0x2192, - KeyboardUpArrowGlyph = 0x2191, - KeyboardDownArrowGlyph = 0x2193, - KeyboardPageDownGlyph = 0x21DF, - KeyboardPageUpGlyph = 0x21DE, - KeyboardNorthwestArrowGlyph = 0x2196, - KeyboardSoutheastArrowGlyph = 0x2198, - KeyboardEscapeGlyph = 0x238B, - KeyboardHelpGlyph = 0x003F, - KeyboardUpArrowheadGlyph = 0x2303, -}; - -// Special keys -enum { - kSRKeysF1 = 122, - kSRKeysF2 = 120, - kSRKeysF3 = 99, - kSRKeysF4 = 118, - kSRKeysF5 = 96, - kSRKeysF6 = 97, - kSRKeysF7 = 98, - kSRKeysF8 = 100, - kSRKeysF9 = 101, - kSRKeysF10 = 109, - kSRKeysF11 = 103, - kSRKeysF12 = 111, - kSRKeysF13 = 105, - kSRKeysF14 = 107, - kSRKeysF15 = 113, - kSRKeysF16 = 106, - kSRKeysF17 = 64, - kSRKeysF18 = 79, - kSRKeysF19 = 80, - kSRKeysSpace = 49, - kSRKeysDeleteLeft = 51, - kSRKeysDeleteRight = 117, - kSRKeysPadClear = 71, - kSRKeysLeftArrow = 123, - kSRKeysRightArrow = 124, - kSRKeysUpArrow = 126, - kSRKeysDownArrow = 125, - kSRKeysSoutheastArrow = 119, - kSRKeysNorthwestArrow = 115, - kSRKeysEscape = 53, - kSRKeysPageDown = 121, - kSRKeysPageUp = 116, - kSRKeysReturnR2L = 36, - kSRKeysReturn = 76, - kSRKeysTabRight = 48, - kSRKeysHelp = 114 -}; - -#pragma mark - -#pragma mark Macros - -// Localization macros, for use in any bundle -#define SRLoc(key) SRLocalizedString(key, nil) -#define SRLocalizedString(key, comment) NSLocalizedStringFromTableInBundle(key, @"ShortcutRecorder", [NSBundle bundleForClass: [SRDummyClass class]], comment) - -// Image macros, for use in any bundle -//#define SRImage(name) [[[NSImage alloc] initWithContentsOfFile: [[NSBundle bundleForClass: [self class]] pathForImageResource: name]] autorelease] -#define SRResIndImage(name) [SRSharedImageProvider supportingImageWithName:name] -#define SRImage(name) SRResIndImage(name) - -//#define SRCommonWriteDebugImagery - -// Macros for glyps -#define SRInt(x) [NSNumber numberWithInteger:x] -#define SRChar(x) [NSString stringWithFormat: @"%C", x] - -// Some default values -#define ShortcutRecorderEmptyFlags 0 -#define ShortcutRecorderAllFlags ShortcutRecorderEmptyFlags | (NSCommandKeyMask | NSAlternateKeyMask | NSControlKeyMask | NSShiftKeyMask | NSFunctionKeyMask) -#define ShortcutRecorderEmptyCode -1 - -// These keys will cancel the recoding mode if not pressed with any modifier -#define ShortcutRecorderEscapeKey 53 -#define ShortcutRecorderBackspaceKey 51 -#define ShortcutRecorderDeleteKey 117 - -#pragma mark - -#pragma mark Getting a string of the key combination - -// -// ################### +- Returns string from keyCode like NSEvent's -characters -// # EXPLANATORY # | +- Returns string from keyCode like NSEvent's -charactersUsingModifiers -// # CHART # | | +- Returns fully readable and localized name of modifier (if modifier given) -// ################### | | | +- Returns glyph of modifier (if modifier given) -// SRString... X - - X -// SRReadableString... X - X - -// SRCharacter... - X - - -// -NSString * SRStringForKeyCode( NSInteger keyCode ); -NSString * SRStringForCarbonModifierFlags( NSUInteger flags ); -NSString * SRStringForCarbonModifierFlagsAndKeyCode( NSUInteger flags, NSInteger keyCode ); -NSString * SRStringForCocoaModifierFlags( NSUInteger flags ); -NSString * SRStringForCocoaModifierFlagsAndKeyCode( NSUInteger flags, NSInteger keyCode ); -NSString * SRReadableStringForCarbonModifierFlagsAndKeyCode( NSUInteger flags, NSInteger keyCode ); -NSString * SRReadableStringForCocoaModifierFlagsAndKeyCode( NSUInteger flags, NSInteger keyCode ); -NSString *SRCharacterForKeyCodeAndCarbonFlags(NSInteger keyCode, NSUInteger carbonFlags); -NSString *SRCharacterForKeyCodeAndCocoaFlags(NSInteger keyCode, NSUInteger cocoaFlags); - -#pragma mark Converting between Cocoa and Carbon modifier flags - -NSUInteger SRCarbonToCocoaFlags( NSUInteger carbonFlags ); -NSUInteger SRCocoaToCarbonFlags( NSUInteger cocoaFlags ); - -#pragma mark - -#pragma mark Animation pace function - -CGFloat SRAnimationEaseInOut(CGFloat t); - -#pragma mark - -#pragma mark Inlines - -FOUNDATION_STATIC_INLINE KeyCombo SRMakeKeyCombo(NSInteger code, NSUInteger flags) { - KeyCombo kc; - kc.code = code; - kc.flags = flags; - return kc; -} - -FOUNDATION_STATIC_INLINE BOOL SRIsSpecialKey(NSInteger keyCode) { - return (keyCode == kSRKeysF1 || keyCode == kSRKeysF2 || keyCode == kSRKeysF3 || keyCode == kSRKeysF4 || keyCode == kSRKeysF5 || keyCode == kSRKeysF6 || keyCode == kSRKeysF7 || keyCode == kSRKeysF8 || keyCode == kSRKeysF9 || keyCode == kSRKeysF10 || keyCode == kSRKeysF11 || keyCode == kSRKeysF12 || keyCode == kSRKeysF13 || keyCode == kSRKeysF14 || keyCode == kSRKeysF15 || keyCode == kSRKeysF16 || keyCode == kSRKeysSpace || keyCode == kSRKeysDeleteLeft || keyCode == kSRKeysDeleteRight || keyCode == kSRKeysPadClear || keyCode == kSRKeysLeftArrow || keyCode == kSRKeysRightArrow || keyCode == kSRKeysUpArrow || keyCode == kSRKeysDownArrow || keyCode == kSRKeysSoutheastArrow || keyCode == kSRKeysNorthwestArrow || keyCode == kSRKeysEscape || keyCode == kSRKeysPageDown || keyCode == kSRKeysPageUp || keyCode == kSRKeysReturnR2L || keyCode == kSRKeysReturn || keyCode == kSRKeysTabRight || keyCode == kSRKeysHelp); -} - -#pragma mark - -#pragma mark Additions - -@interface NSAlert( SRAdditions ) -+ (NSAlert *) alertWithNonRecoverableError:(NSError *)error; -@end - -#pragma mark - -#pragma mark Image provider - -@interface SRSharedImageProvider : NSObject -+ (NSImage *)supportingImageWithName:(NSString *)name; -@end diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRKeyCodeTransformer.h b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRKeyCodeTransformer.h deleted file mode 100644 index 6f252f3..0000000 --- a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRKeyCodeTransformer.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// SRKeyCodeTransformer.h -// ShortcutRecorder -// -// Copyright 2006-2007 Contributors. All rights reserved. -// -// License: BSD -// -// Contributors: -// David Dauer -// Jesper -// Jamie Kirkpatrick - -#import - -@interface SRKeyCodeTransformer : NSValueTransformer {} @end diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderCell.h b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderCell.h deleted file mode 100644 index 9bd3b9a..0000000 --- a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderCell.h +++ /dev/null @@ -1,139 +0,0 @@ -// -// SRRecorderCell.h -// ShortcutRecorder -// -// Copyright 2006-2007 Contributors. All rights reserved. -// -// License: BSD -// -// Contributors: -// David Dauer -// Jesper -// Jamie Kirkpatrick - -#import -#import "SRCommon.h" - -#define SRMinWidth 50 -#define SRMaxHeight 22 - -#define SRTransitionFPS 30.0f -#define SRTransitionDuration 0.35f -//#define SRTransitionDuration 2.35 -#define SRTransitionFrames (SRTransitionFPS*SRTransitionDuration) -#define SRAnimationAxisIsY YES -#define ShortcutRecorderNewStyleDrawing - -#define SRAnimationOffsetRect(X,Y) (SRAnimationAxisIsY ? NSOffsetRect(X,0.0f,-NSHeight(Y)) : NSOffsetRect(X,NSWidth(Y),0.0f)) - -@class SRRecorderControl, SRValidator; - -enum SRRecorderStyle { - SRGradientBorderStyle = 0, - SRGreyStyle = 1 -}; -typedef enum SRRecorderStyle SRRecorderStyle; - -@interface SRRecorderCell : NSActionCell -{ - NSGradient *recordingGradient; - NSString *autosaveName; - - BOOL isRecording; - BOOL mouseInsideTrackingArea; - BOOL mouseDown; - - SRRecorderStyle style; - - BOOL isAnimating; - CGFloat transitionProgress; - BOOL isAnimatingNow; - BOOL isAnimatingTowardsRecording; - BOOL comboJustChanged; - - NSTrackingRectTag removeTrackingRectTag; - NSTrackingRectTag snapbackTrackingRectTag; - - KeyCombo keyCombo; - BOOL hasKeyChars; - NSString *keyChars; - NSString *keyCharsIgnoringModifiers; - - NSUInteger allowedFlags; - NSUInteger requiredFlags; - NSUInteger recordingFlags; - - BOOL allowsKeyOnly; - BOOL escapeKeysRecord; - - NSSet *cancelCharacterSet; - - SRValidator *validator; - - IBOutlet id delegate; - BOOL globalHotKeys; - void *hotKeyModeToken; -} - -- (void)resetTrackingRects; - -#pragma mark *** Aesthetics *** - -+ (BOOL)styleSupportsAnimation:(SRRecorderStyle)style; - -- (BOOL)animates; -- (void)setAnimates:(BOOL)an; -- (SRRecorderStyle)style; -- (void)setStyle:(SRRecorderStyle)nStyle; - -#pragma mark *** Delegate *** - -- (id)delegate; -- (void)setDelegate:(id)aDelegate; - -#pragma mark *** Responder Control *** - -- (BOOL)becomeFirstResponder; -- (BOOL)resignFirstResponder; - -#pragma mark *** Key Combination Control *** - -- (BOOL)performKeyEquivalent:(NSEvent *)theEvent; -- (void)flagsChanged:(NSEvent *)theEvent; - -- (NSUInteger)allowedFlags; -- (void)setAllowedFlags:(NSUInteger)flags; - -- (NSUInteger)requiredFlags; -- (void)setRequiredFlags:(NSUInteger)flags; - -- (BOOL)allowsKeyOnly; -- (void)setAllowsKeyOnly:(BOOL)nAllowsKeyOnly; -- (void)setAllowsKeyOnly:(BOOL)nAllowsKeyOnly escapeKeysRecord:(BOOL)nEscapeKeysRecord; -- (BOOL)escapeKeysRecord; -- (void)setEscapeKeysRecord:(BOOL)nEscapeKeysRecord; - -- (BOOL)canCaptureGlobalHotKeys; -- (void)setCanCaptureGlobalHotKeys:(BOOL)inState; - -- (KeyCombo)keyCombo; -- (void)setKeyCombo:(KeyCombo)aKeyCombo; - -#pragma mark *** Autosave Control *** - -- (NSString *)autosaveName; -- (void)setAutosaveName:(NSString *)aName; - -// Returns the displayed key combination if set -- (NSString *)keyComboString; - -- (NSString *)keyChars; -- (NSString *)keyCharsIgnoringModifiers; - -@end - -// Delegate Methods -@interface NSObject (SRRecorderCellDelegate) -- (BOOL)shortcutRecorderCell:(SRRecorderCell *)aRecorderCell isKeyCode:(NSInteger)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason; -- (void)shortcutRecorderCell:(SRRecorderCell *)aRecorderCell keyComboDidChange:(KeyCombo)newCombo; -@end diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderControl.h b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderControl.h deleted file mode 100644 index 777678e..0000000 --- a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderControl.h +++ /dev/null @@ -1,79 +0,0 @@ -// -// SRRecorderControl.h -// ShortcutRecorder -// -// Copyright 2006-2007 Contributors. All rights reserved. -// -// License: BSD -// -// Contributors: -// David Dauer -// Jesper -// Jamie Kirkpatrick - -#import -#import "SRRecorderCell.h" - -@interface SRRecorderControl : NSControl -{ - IBOutlet id delegate; -} - -#pragma mark *** Aesthetics *** -- (BOOL)animates; -- (void)setAnimates:(BOOL)an; -- (SRRecorderStyle)style; -- (void)setStyle:(SRRecorderStyle)nStyle; - -#pragma mark *** Delegate *** -- (id)delegate; -- (void)setDelegate:(id)aDelegate; - -#pragma mark *** Key Combination Control *** - -- (NSUInteger)allowedFlags; -- (void)setAllowedFlags:(NSUInteger)flags; - -- (BOOL)allowsKeyOnly; -- (void)setAllowsKeyOnly:(BOOL)nAllowsKeyOnly escapeKeysRecord:(BOOL)nEscapeKeysRecord; -- (BOOL)escapeKeysRecord; - -- (BOOL)canCaptureGlobalHotKeys; -- (void)setCanCaptureGlobalHotKeys:(BOOL)inState; - -- (NSUInteger)requiredFlags; -- (void)setRequiredFlags:(NSUInteger)flags; - -- (KeyCombo)keyCombo; -- (void)setKeyCombo:(KeyCombo)aKeyCombo; - -- (NSString *)keyChars; -- (NSString *)keyCharsIgnoringModifiers; - -#pragma mark *** Autosave Control *** - -- (NSString *)autosaveName; -- (void)setAutosaveName:(NSString *)aName; - -#pragma mark - - -// Returns the displayed key combination if set -- (NSString *)keyComboString; - -#pragma mark *** Conversion Methods *** - -- (NSUInteger)cocoaToCarbonFlags:(NSUInteger)cocoaFlags; -- (NSUInteger)carbonToCocoaFlags:(NSUInteger)carbonFlags; - -#pragma mark *** Binding Methods *** - -- (NSDictionary *)objectValue; -- (void)setObjectValue:(NSDictionary *)shortcut; - -@end - -// Delegate Methods -@interface NSObject (SRRecorderDelegate) -- (BOOL)shortcutRecorder:(SRRecorderControl *)aRecorder isKeyCode:(NSInteger)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason; -- (void)shortcutRecorder:(SRRecorderControl *)aRecorder keyComboDidChange:(KeyCombo)newKeyCombo; -@end diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRValidator.h b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRValidator.h deleted file mode 100644 index 0dd8f28..0000000 --- a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRValidator.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// SRValidator.h -// ShortcutRecorder -// -// Copyright 2006-2007 Contributors. All rights reserved. -// -// License: BSD -// -// Contributors: -// David Dauer -// Jesper -// Jamie Kirkpatrick - -#import - -@interface SRValidator : NSObject { - id delegate; -} - -- (id) initWithDelegate:(id)theDelegate; - -- (BOOL) isKeyCode:(NSInteger)keyCode andFlagsTaken:(NSUInteger)flags error:(NSError **)error; -- (BOOL) isKeyCode:(NSInteger)keyCode andFlags:(NSUInteger)flags takenInMenu:(NSMenu *)menu error:(NSError **)error; - -- (id) delegate; -- (void) setDelegate: (id) theDelegate; - -@end - -#pragma mark - - -@interface NSObject( SRValidation ) -- (BOOL) shortcutValidator:(SRValidator *)validator isKeyCode:(NSInteger)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason; -@end diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/ShortcutRecorder.h b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/ShortcutRecorder.h deleted file mode 100644 index 855a288..0000000 --- a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/ShortcutRecorder.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// ShortcutRecorder.h -// ShortcutRecorder -// - 10.5 version only; master framework header -// -// Copyright 2007 Contributors. All rights reserved. -// -// License: BSD -// -// Contributors to this file: -// Jesper - -#import -#import -#import -#import -#import diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/Info.plist b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index e7f6967..0000000 --- a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - BuildMachineOSBuild - 11D50 - CFBundleDevelopmentRegion - English - CFBundleExecutable - ShortcutRecorder - CFBundleIdentifier - net.wafflesoftware.ShortcutRecorder.framework.Leopard - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 4D502 - DTPlatformVersion - GM - DTSDKBuild - 11C63 - DTSDKName - macosx10.7 - DTXcode - 0421 - DTXcodeBuild - 4D502 - - diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRRemoveShortcut.tif b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRRemoveShortcut.tif deleted file mode 100644 index 47a7b71..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRRemoveShortcut.tif and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRRemoveShortcutPressed.tif b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRRemoveShortcutPressed.tif deleted file mode 100644 index 0119610..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRRemoveShortcutPressed.tif and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRRemoveShortcutRollover.tif b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRRemoveShortcutRollover.tif deleted file mode 100644 index 3af4f0b..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRRemoveShortcutRollover.tif and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRSnapback.tiff b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRSnapback.tiff deleted file mode 100644 index 0be1e49..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/SRSnapback.tiff and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/de.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/de.lproj/ShortcutRecorder.strings deleted file mode 100644 index 8144d43..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/de.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/el.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/el.lproj/ShortcutRecorder.strings deleted file mode 100644 index e43ef1e..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/el.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/en.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/en.lproj/ShortcutRecorder.strings deleted file mode 100644 index ecc2137..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/en.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/fr.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/fr.lproj/ShortcutRecorder.strings deleted file mode 100644 index d22dfb5..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/fr.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/it.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/it.lproj/ShortcutRecorder.strings deleted file mode 100644 index b498980..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/it.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ja.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ja.lproj/ShortcutRecorder.strings deleted file mode 100644 index dffa4d5..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ja.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ko.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ko.lproj/ShortcutRecorder.strings deleted file mode 100644 index 9b43ae0..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ko.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/nb.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/nb.lproj/ShortcutRecorder.strings deleted file mode 100644 index 8ea479e..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/nb.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/nl.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/nl.lproj/ShortcutRecorder.strings deleted file mode 100644 index 260dde8..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/nl.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/pl.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/pl.lproj/ShortcutRecorder.strings deleted file mode 100644 index 2cc6df3..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/pl.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/pt-BR.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/pt-BR.lproj/ShortcutRecorder.strings deleted file mode 100644 index 2b9f14a..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/pt-BR.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ro.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ro.lproj/ShortcutRecorder.strings deleted file mode 100644 index db1db38..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ro.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/sk.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/sk.lproj/ShortcutRecorder.strings deleted file mode 100644 index 0aed73e..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/sk.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/sv.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/sv.lproj/ShortcutRecorder.strings deleted file mode 100644 index a8a2f71..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/sv.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/th.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/th.lproj/ShortcutRecorder.strings deleted file mode 100644 index ea7778b..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/th.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/zh-Hans.lproj/ShortcutRecorder.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/zh-Hans.lproj/ShortcutRecorder.strings deleted file mode 100644 index ffcb6a0..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/zh-Hans.lproj/ShortcutRecorder.strings and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/ShortcutRecorder b/Frameworks/ShortcutRecorder.framework/Versions/A/ShortcutRecorder deleted file mode 100755 index b42ddc5..0000000 Binary files a/Frameworks/ShortcutRecorder.framework/Versions/A/ShortcutRecorder and /dev/null differ diff --git a/Frameworks/ShortcutRecorder.framework/Versions/Current b/Frameworks/ShortcutRecorder.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/Frameworks/ShortcutRecorder.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/Gas Mask.xcodeproj/project.pbxproj b/Gas Mask.xcodeproj/project.pbxproj index d75ac22..b53da91 100644 --- a/Gas Mask.xcodeproj/project.pbxproj +++ b/Gas Mask.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ 351416CF28C3A7B80093A452 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 351416CE28C3A7B80093A452 /* Sparkle */; }; 3516864B11187EDE00314609 /* HostsTextController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3516864A11187EDE00314609 /* HostsTextController.m */; }; 351D904510E76F7100CA6B5E /* Help in Resources */ = {isa = PBXBuildFile; fileRef = 351D904110E76F7100CA6B5E /* Help */; }; + 351ED76528C4FEE70046CC48 /* ShortcutRecorder in Frameworks */ = {isa = PBXBuildFile; productRef = 351ED76428C4FEE70046CC48 /* ShortcutRecorder */; }; 3522BEE0153316AA00035B90 /* ExtendedNSArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 3522BEDF153316AA00035B90 /* ExtendedNSArray.m */; }; 3522BEE31533552200035B90 /* ExtendedNSPredicate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3522BEE21533552200035B90 /* ExtendedNSPredicate.m */; }; 3528ECE910E3F87E003C8CB9 /* Syncing_arrows1.png in Resources */ = {isa = PBXBuildFile; fileRef = 3528ECE310E3F87E003C8CB9 /* Syncing_arrows1.png */; }; @@ -76,8 +77,6 @@ 354E7F8110AEFBC500FC4757 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 354E7F8010AEFBC500FC4757 /* Security.framework */; }; 354E80A110AF33C100FC4757 /* applicationIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 354E80A010AF33C100FC4757 /* applicationIcon.icns */; }; 354E80B510AF383C00FC4757 /* FileUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 354E80B410AF383C00FC4757 /* FileUtil.m */; }; - 3556CE8410D6B3CF00C7301E /* ShortcutRecorder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3556CE8310D6B3CF00C7301E /* ShortcutRecorder.framework */; }; - 3556CEA110D6B44A00C7301E /* ShortcutRecorder.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3556CE8310D6B3CF00C7301E /* ShortcutRecorder.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 3556CEF910D6B70100C7301E /* UpdateDateTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3556CEF810D6B70100C7301E /* UpdateDateTransformer.m */; }; 355F5C5B12244B67006C2884 /* LocalHostsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 355F5C5A12244B67006C2884 /* LocalHostsController.m */; }; 355F5CA512244F28006C2884 /* RemoteHostsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 355F5CA412244F28006C2884 /* RemoteHostsController.m */; }; @@ -158,7 +157,6 @@ dstSubfolderSpec = 10; files = ( 354DDD0E114EBC9700DB76D7 /* CrashReportSender.framework in CopyFiles */, - 3556CEA110D6B44A00C7301E /* ShortcutRecorder.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -276,7 +274,6 @@ 354E80A010AF33C100FC4757 /* applicationIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = applicationIcon.icns; path = Resources/applicationIcon.icns; sourceTree = ""; }; 354E80B310AF383C00FC4757 /* FileUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileUtil.h; path = Source/FileUtil.h; sourceTree = ""; }; 354E80B410AF383C00FC4757 /* FileUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FileUtil.m; path = Source/FileUtil.m; sourceTree = ""; }; - 3556CE8310D6B3CF00C7301E /* ShortcutRecorder.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ShortcutRecorder.framework; path = Frameworks/ShortcutRecorder.framework; sourceTree = ""; }; 3556CEDF10D6B68C00C7301E /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = ""; }; 3556CEF710D6B70100C7301E /* UpdateDateTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdateDateTransformer.h; path = Source/UpdateDateTransformer.h; sourceTree = ""; }; 3556CEF810D6B70100C7301E /* UpdateDateTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdateDateTransformer.m; path = Source/UpdateDateTransformer.m; sourceTree = ""; }; @@ -382,11 +379,11 @@ buildActionMask = 2147483647; files = ( 351416CF28C3A7B80093A452 /* Sparkle in Frameworks */, - 3556CE8410D6B3CF00C7301E /* ShortcutRecorder.framework in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 354E7F8110AEFBC500FC4757 /* Security.framework in Frameworks */, 3545DCE410E3997200EBA66D /* SystemConfiguration.framework in Frameworks */, 35C8D5A911144F7000B4242D /* Carbon.framework in Frameworks */, + 351ED76528C4FEE70046CC48 /* ShortcutRecorder in Frameworks */, 35FBCA511223181000860FDA /* libicucore.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -415,7 +412,6 @@ 35C8D5A811144F7000B4242D /* Carbon.framework */, 3545DCE310E3997200EBA66D /* SystemConfiguration.framework */, 3556CEDF10D6B68C00C7301E /* Sparkle.framework */, - 3556CE8310D6B3CF00C7301E /* ShortcutRecorder.framework */, 354E7F8010AEFBC500FC4757 /* Security.framework */, 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, ); @@ -871,6 +867,7 @@ name = "Gas Mask"; packageProductDependencies = ( 351416CE28C3A7B80093A452 /* Sparkle */, + 351ED76428C4FEE70046CC48 /* ShortcutRecorder */, ); productInstallPath = "$(HOME)/Applications"; productName = "Gas Mask"; @@ -907,6 +904,7 @@ mainGroup = 29B97314FDCFA39411CA2CEA /* Gas Mask */; packageReferences = ( 351416CD28C3A7B80093A452 /* XCRemoteSwiftPackageReference "Sparkle" */, + 351ED76328C4FEE70046CC48 /* XCRemoteSwiftPackageReference "ShortcutRecorder" */, ); productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; @@ -1326,6 +1324,14 @@ version = 1.27.1; }; }; + 351ED76328C4FEE70046CC48 /* XCRemoteSwiftPackageReference "ShortcutRecorder" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Kentzo/ShortcutRecorder.git"; + requirement = { + kind = exactVersion; + version = 3.4.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -1334,6 +1340,11 @@ package = 351416CD28C3A7B80093A452 /* XCRemoteSwiftPackageReference "Sparkle" */; productName = Sparkle; }; + 351ED76428C4FEE70046CC48 /* ShortcutRecorder */ = { + isa = XCSwiftPackageProductDependency; + package = 351ED76328C4FEE70046CC48 /* XCRemoteSwiftPackageReference "ShortcutRecorder" */; + productName = ShortcutRecorder; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; diff --git a/Gas Mask.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Gas Mask.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a11008d..f6252ed 100644 --- a/Gas Mask.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Gas Mask.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,14 @@ { "pins" : [ + { + "identity" : "shortcutrecorder", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Kentzo/ShortcutRecorder.git", + "state" : { + "revision" : "c86ce0f9be5353ba998966121c7631602a9a36f7", + "version" : "3.4.0" + } + }, { "identity" : "sparkle", "kind" : "remoteSourceControl", diff --git a/Preferences.xib b/Preferences.xib index 295241e..a66b5b8 100644 --- a/Preferences.xib +++ b/Preferences.xib @@ -164,20 +164,6 @@ - - - - - - - - - - - - - - @@ -186,20 +172,6 @@ - - - - - - - - - - - - - - @@ -217,20 +189,6 @@ - - - - - - - - - - - - - - diff --git a/Source/PreferenceController.m b/Source/PreferenceController.m index d0b88b1..4e52054 100644 --- a/Source/PreferenceController.m +++ b/Source/PreferenceController.m @@ -19,6 +19,7 @@ ***************************************************************************/ #import +#import #import "PreferenceController.h" #import "Preferences.h" @@ -33,6 +34,11 @@ #define TOOLBAR_HOTKEYS @"TOOLBAR_HOTKEYS" #define TOOLBAR_UPDATE @"TOOLBAR_UPDATE" +NS_INLINE NSDictionary *SRShortcutWithCocoaModifierFlagsAndKeyCode(NSEventModifierFlags aModifierFlags, SRKeyCode aKeyCode) +{ + return @{SRShortcutKeyKeyCode: @(aKeyCode), SRShortcutKeyModifierFlags: @(aModifierFlags)}; +} + @interface PreferenceController (Remote) - (void)initRemote; - (int)remoteInterval; @@ -231,18 +237,24 @@ - (void)initHotkeys { id plist = [[[Preferences instance] defaults] valueForKey:ActivatePreviousFilePrefKey]; Hotkey *hotkey = [[Hotkey alloc] initWithPlistRepresentation:plist]; - [activatePreviousHotkey setKeyCombo:SRMakeKeyCombo([hotkey keyCode], [activatePreviousHotkey carbonToCocoaFlags:[hotkey modifiers]])]; + SRShortcut *shortcut = [SRShortcut + shortcutWithCode: [hotkey keyCode] + modifierFlags: [hotkey modifiers] + characters:nil + charactersIgnoringModifiers:nil]; + [activatePreviousHotkey setObjectValue:shortcut]; +// [activatePreviousHotkey setKeyCombo:SRMakeKeyCombo([hotkey keyCode], [activatePreviousHotkey carbonToCocoaFlags:[hotkey modifiers]])]; - plist = [[[Preferences instance] defaults] valueForKey:ActivateNextFilePrefKey]; + /*plist = [[[Preferences instance] defaults] valueForKey:ActivateNextFilePrefKey]; hotkey = [[Hotkey alloc] initWithPlistRepresentation:plist]; [activateNextHotkey setKeyCombo:SRMakeKeyCombo([hotkey keyCode], [activateNextHotkey carbonToCocoaFlags:[hotkey modifiers]])]; plist = [[[Preferences instance] defaults] valueForKey:UpdateAndSynchronizePrefKey]; hotkey = [[Hotkey alloc] initWithPlistRepresentation:plist]; - [updateHotkey setKeyCombo:SRMakeKeyCombo([hotkey keyCode], [activateNextHotkey carbonToCocoaFlags:[hotkey modifiers]])]; + [updateHotkey setKeyCombo:SRMakeKeyCombo([hotkey keyCode], [activateNextHotkey carbonToCocoaFlags:[hotkey modifiers]])]; */ } -- (void)shortcutRecorder:(SRRecorderControl *)aRecorder keyComboDidChange:(KeyCombo)newKeyCombo +/*- (void)shortcutRecorder:(SRRecorderControl *)aRecorder keyComboDidChange:(KeyCombo)newKeyCombo { Hotkey *hotkey = [[Hotkey alloc] initWithKeyCode:[aRecorder keyCombo].code modifiers:[aRecorder cocoaToCarbonFlags:[aRecorder keyCombo].flags]]; @@ -258,7 +270,7 @@ - (void)shortcutRecorder:(SRRecorderControl *)aRecorder keyComboDidChange:(KeyCo } [[[Preferences instance] defaults] setValue:[hotkey plistRepresentation] forKey:prefKey]; -} +}*/ -@end \ No newline at end of file +@end