aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2010-11-16 21:19:22 +0000
committerrowanbeentje <rowan@beent.je>2010-11-16 21:19:22 +0000
commita8f62043badbb88849f783b53772bbbc35513379 (patch)
tree395898de97be10262efd32eca9590fc71472c539
parent1ef653b918ddd53d6e54d4e1923b217f8b555080 (diff)
downloadsequelpro-a8f62043badbb88849f783b53772bbbc35513379.tar.gz
sequelpro-a8f62043badbb88849f783b53772bbbc35513379.tar.bz2
sequelpro-a8f62043badbb88849f783b53772bbbc35513379.zip
- Add the NewBSD-licensed ShortcutRecorder.framework to the project, for initial use in the bundle editor (not implemented yet). Includes the .ibplugin within the framework.
- Update localisable strings
l---------Frameworks/ShortcutRecorder.framework/Headers1
l---------Frameworks/ShortcutRecorder.framework/Resources1
l---------Frameworks/ShortcutRecorder.framework/ShortcutRecorder1
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRCommon.h185
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRKeyCodeTransformer.h16
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderCell.h137
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderControl.h79
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRValidator.h34
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SR_LeopardView.h15
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Headers/ShortcutRecorder.h17
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Resources/Info.plist20
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Info.plist26
-rwxr-xr-xFrameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/MacOS/ShortcutRecorderbin0 -> 79768 bytes
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/InfoPlist.stringsbin0 -> 270 bytes
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/SR_LeopardInspector.nibbin0 -> 10173 bytes
-rw-r--r--Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/SR_LeopardLibrary.nibbin0 -> 4904 bytes
-rwxr-xr-xFrameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/SRRecorderControl.classdescription9
-rwxr-xr-xFrameworks/ShortcutRecorder.framework/Versions/A/ShortcutRecorderbin0 -> 333640 bytes
l---------Frameworks/ShortcutRecorder.framework/Versions/Current1
-rw-r--r--Resources/English.lproj/BundleEditor.stringsbin0 -> 654 bytes
-rw-r--r--Resources/English.lproj/DBView.stringsbin99710 -> 99890 bytes
-rw-r--r--Resources/English.lproj/Localizable.stringsbin185348 -> 185970 bytes
-rw-r--r--Resources/English.lproj/MainMenu.stringsbin42638 -> 42990 bytes
-rwxr-xr-xScripts/build.sh3
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj6
25 files changed, 550 insertions, 1 deletions
diff --git a/Frameworks/ShortcutRecorder.framework/Headers b/Frameworks/ShortcutRecorder.framework/Headers
new file mode 120000
index 00000000..a177d2a6
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Headers
@@ -0,0 +1 @@
+Versions/Current/Headers \ No newline at end of file
diff --git a/Frameworks/ShortcutRecorder.framework/Resources b/Frameworks/ShortcutRecorder.framework/Resources
new file mode 120000
index 00000000..953ee36f
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Resources
@@ -0,0 +1 @@
+Versions/Current/Resources \ No newline at end of file
diff --git a/Frameworks/ShortcutRecorder.framework/ShortcutRecorder b/Frameworks/ShortcutRecorder.framework/ShortcutRecorder
new file mode 120000
index 00000000..2be0db14
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/ShortcutRecorder
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..ce12ebf4
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRCommon.h
@@ -0,0 +1,185 @@
+//
+// SRCommon.h
+// ShortcutRecorder
+//
+// Copyright 2006-2007 Contributors. All rights reserved.
+//
+// License: BSD
+//
+// Contributors:
+// David Dauer
+// Jesper
+// Jamie Kirkpatrick
+
+#import <Cocoa/Cocoa.h>
+#import <Carbon/Carbon.h>
+#import <CoreServices/CoreServices.h>
+
+#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
new file mode 100644
index 00000000..6f252f37
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRKeyCodeTransformer.h
@@ -0,0 +1,16 @@
+//
+// SRKeyCodeTransformer.h
+// ShortcutRecorder
+//
+// Copyright 2006-2007 Contributors. All rights reserved.
+//
+// License: BSD
+//
+// Contributors:
+// David Dauer
+// Jesper
+// Jamie Kirkpatrick
+
+#import <Cocoa/Cocoa.h>
+
+@interface SRKeyCodeTransformer : NSValueTransformer {} @end
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderCell.h b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderCell.h
new file mode 100644
index 00000000..31b38546
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderCell.h
@@ -0,0 +1,137 @@
+//
+// SRRecorderCell.h
+// ShortcutRecorder
+//
+// Copyright 2006-2007 Contributors. All rights reserved.
+//
+// License: BSD
+//
+// Contributors:
+// David Dauer
+// Jesper
+// Jamie Kirkpatrick
+
+#import <Cocoa/Cocoa.h>
+#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 <NSCoding>
+{
+ 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 escapeKeysRecord:(BOOL)nEscapeKeysRecord;
+- (BOOL)escapeKeysRecord;
+
+- (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
new file mode 100644
index 00000000..777678e4
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRRecorderControl.h
@@ -0,0 +1,79 @@
+//
+// SRRecorderControl.h
+// ShortcutRecorder
+//
+// Copyright 2006-2007 Contributors. All rights reserved.
+//
+// License: BSD
+//
+// Contributors:
+// David Dauer
+// Jesper
+// Jamie Kirkpatrick
+
+#import <Cocoa/Cocoa.h>
+#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
new file mode 100644
index 00000000..0dd8f283
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SRValidator.h
@@ -0,0 +1,34 @@
+//
+// SRValidator.h
+// ShortcutRecorder
+//
+// Copyright 2006-2007 Contributors. All rights reserved.
+//
+// License: BSD
+//
+// Contributors:
+// David Dauer
+// Jesper
+// Jamie Kirkpatrick
+
+#import <Cocoa/Cocoa.h>
+
+@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/SR_LeopardView.h b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SR_LeopardView.h
new file mode 100644
index 00000000..26b78f3e
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/SR_LeopardView.h
@@ -0,0 +1,15 @@
+//
+// SR_LeopardView.h
+// SR Leopard
+//
+// Created by Jesper on 2007-10-19.
+// Copyright 2007 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface SR_LeopardView : NSView {
+
+}
+
+@end \ No newline at end of file
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/ShortcutRecorder.h b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/ShortcutRecorder.h
new file mode 100644
index 00000000..855a2882
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Headers/ShortcutRecorder.h
@@ -0,0 +1,17 @@
+//
+// ShortcutRecorder.h
+// ShortcutRecorder
+// - 10.5 version only; master framework header
+//
+// Copyright 2007 Contributors. All rights reserved.
+//
+// License: BSD
+//
+// Contributors to this file:
+// Jesper
+
+#import <ShortcutRecorder/SRCommon.h>
+#import <ShortcutRecorder/SRKeyCodeTransformer.h>
+#import <ShortcutRecorder/SRValidator.h>
+#import <ShortcutRecorder/SRRecorderCell.h>
+#import <ShortcutRecorder/SRRecorderControl.h>
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/Info.plist b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/Info.plist
new file mode 100644
index 00000000..40a7e46b
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>ShortcutRecorder</string>
+ <key>CFBundleIdentifier</key>
+ <string>net.wafflesoftware.ShortcutRecorder.framework.Leopard</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+</dict>
+</plist>
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Info.plist b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Info.plist
new file mode 100644
index 00000000..1d522dba
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>ShortcutRecorder</string>
+ <key>CFBundleIdentifier</key>
+ <string>net.wafflesoftware.ShortcutRecorder.IB.Leopard</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>ShortcutRecorder</string>
+ <key>CFBundlePackageType</key>
+ <string>BNDL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>NSPrincipalClass</key>
+ <string>SR_Leopard</string>
+</dict>
+</plist>
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/MacOS/ShortcutRecorder b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/MacOS/ShortcutRecorder
new file mode 100755
index 00000000..37d0e82d
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/MacOS/ShortcutRecorder
Binary files differ
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/InfoPlist.strings b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/InfoPlist.strings
new file mode 100644
index 00000000..1c1fbc35
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/InfoPlist.strings
Binary files differ
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/SR_LeopardInspector.nib b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/SR_LeopardInspector.nib
new file mode 100644
index 00000000..0c5de0d6
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/SR_LeopardInspector.nib
Binary files differ
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/SR_LeopardLibrary.nib b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/SR_LeopardLibrary.nib
new file mode 100644
index 00000000..9683a72f
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/English.lproj/SR_LeopardLibrary.nib
Binary files differ
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/SRRecorderControl.classdescription b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/SRRecorderControl.classdescription
new file mode 100755
index 00000000..46527ac4
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin/Contents/Resources/SRRecorderControl.classdescription
@@ -0,0 +1,9 @@
+{
+ Actions = {
+ };
+ Outlets = {
+ delegate = id;
+ };
+ ClassName = SRRecorderControl;
+ SuperClass = NSControl;
+}
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/A/ShortcutRecorder b/Frameworks/ShortcutRecorder.framework/Versions/A/ShortcutRecorder
new file mode 100755
index 00000000..78a8149b
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/A/ShortcutRecorder
Binary files differ
diff --git a/Frameworks/ShortcutRecorder.framework/Versions/Current b/Frameworks/ShortcutRecorder.framework/Versions/Current
new file mode 120000
index 00000000..8c7e5a66
--- /dev/null
+++ b/Frameworks/ShortcutRecorder.framework/Versions/Current
@@ -0,0 +1 @@
+A \ No newline at end of file
diff --git a/Resources/English.lproj/BundleEditor.strings b/Resources/English.lproj/BundleEditor.strings
new file mode 100644
index 00000000..ad392fc9
--- /dev/null
+++ b/Resources/English.lproj/BundleEditor.strings
Binary files differ
diff --git a/Resources/English.lproj/DBView.strings b/Resources/English.lproj/DBView.strings
index 440d66bb..5debfc9d 100644
--- a/Resources/English.lproj/DBView.strings
+++ b/Resources/English.lproj/DBView.strings
Binary files differ
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index fe8b7d27..d1ccbaaf 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
Binary files differ
diff --git a/Resources/English.lproj/MainMenu.strings b/Resources/English.lproj/MainMenu.strings
index e2be88de..2f6542fc 100644
--- a/Resources/English.lproj/MainMenu.strings
+++ b/Resources/English.lproj/MainMenu.strings
Binary files differ
diff --git a/Scripts/build.sh b/Scripts/build.sh
index 2e48dacc..82c788de 100755
--- a/Scripts/build.sh
+++ b/Scripts/build.sh
@@ -24,8 +24,9 @@ echo 'Updating build version...'
# Add the build/bundle version
"${SRCROOT}/Scripts/build-version.pl"
-# Remove the .ibplugin from within BWToolkit
+# Remove the .ibplugin from within frameworks
rm -rf "${BUILD_PRODUCT}/Contents/Frameworks/BWToolkitFramework.framework/Versions/A/Resources/BWToolkit.ibplugin"
+rm -rf "${BUILD_PRODUCT}/Contents/Frameworks/ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin"
# Perform localisation updates for 'Release' or 'Distribution' builds
if [[ "$CONFIGURATION" == 'Release' || "$CONFIGURATION" == 'Distribution' ]]
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 7b3685c3..99c91a8b 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -312,6 +312,8 @@
58D2E22F101222870063EF1D /* link-arrow-highlighted-clicked.png in Resources */ = {isa = PBXBuildFile; fileRef = 58D2E22C101222870063EF1D /* link-arrow-highlighted-clicked.png */; };
58D2E230101222870063EF1D /* link-arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 58D2E22D101222870063EF1D /* link-arrow.png */; };
58DA8863103E15B5000B98DF /* SPLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 58DA8862103E15B5000B98DF /* SPLogger.m */; };
+ 58DC0D5F1293293400B76DA5 /* ShortcutRecorder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58DC0D5E1293293400B76DA5 /* ShortcutRecorder.framework */; };
+ 58DC0D7C12932AB200B76DA5 /* ShortcutRecorder.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 58DC0D5E1293293400B76DA5 /* ShortcutRecorder.framework */; };
58E205FC1234FE4F00A97059 /* KeyTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 58E205FB1234FE4F00A97059 /* KeyTemplate.pdf */; };
58FEF16D0F23D66600518E8E /* SPSQLParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 58FEF16C0F23D66600518E8E /* SPSQLParser.m */; };
58FEF57E0F3B4E9700518E8E /* SPTableData.m in Sources */ = {isa = PBXBuildFile; fileRef = 58FEF57D0F3B4E9700518E8E /* SPTableData.m */; };
@@ -508,6 +510,7 @@
B52ECE1410DDAD01009DC3E8 /* BWToolkitFramework.framework in Copy Frameworks */,
586EBD5D11418D9400B3DE45 /* FeedbackReporter.framework in Copy Frameworks */,
58C6C71F11FBB18000A3F5E9 /* UniversalDetector.framework in Copy Frameworks */,
+ 58DC0D7C12932AB200B76DA5 /* ShortcutRecorder.framework in Copy Frameworks */,
);
name = "Copy Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -1018,6 +1021,7 @@
58D2E22D101222870063EF1D /* link-arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "link-arrow.png"; sourceTree = "<group>"; };
58DA8861103E15B5000B98DF /* SPLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPLogger.h; sourceTree = "<group>"; };
58DA8862103E15B5000B98DF /* SPLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPLogger.m; sourceTree = "<group>"; };
+ 58DC0D5E1293293400B76DA5 /* ShortcutRecorder.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ShortcutRecorder.framework; path = Frameworks/ShortcutRecorder.framework; sourceTree = "<group>"; };
58E205FB1234FE4F00A97059 /* KeyTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = KeyTemplate.pdf; sourceTree = "<group>"; };
58FEF16B0F23D66600518E8E /* SPSQLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPSQLParser.h; sourceTree = "<group>"; };
58FEF16C0F23D66600518E8E /* SPSQLParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPSQLParser.m; sourceTree = "<group>"; };
@@ -1230,6 +1234,7 @@
586EBD2411418D7C00B3DE45 /* FeedbackReporter.framework in Frameworks */,
179ECECA11F265FC009C6A40 /* libbz2.dylib in Frameworks */,
58C6C71611FBB17200A3F5E9 /* UniversalDetector.framework in Frameworks */,
+ 58DC0D5F1293293400B76DA5 /* ShortcutRecorder.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1257,6 +1262,7 @@
17B7B591101602AE00F057DE /* libssl.dylib */,
17B7B58F1016028F00F057DE /* libcrypto.dylib */,
583CE52C11725642008F148E /* libz.dylib */,
+ 58DC0D5E1293293400B76DA5 /* ShortcutRecorder.framework */,
);
name = "Linked Frameworks";
sourceTree = "<group>";