Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
compare: f6bbf3bbed
Checking mergeability… Don't worry, you can still create the pull request.
  • 9 commits
  • 7 files changed
  • 0 commit comments
  • 4 contributors
View
2  project/AppController.m
@@ -15,11 +15,13 @@
#define _DISPLENGTH 40
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
enum {
NSWindowCollectionBehaviorDefault = 0,
NSWindowCollectionBehaviorCanJoinAllSpaces = 1 << 0,
NSWindowCollectionBehaviorMoveToActiveSpace = 1 << 1
};
+#endif
typedef unsigned NSWindowCollectionBehavior;
View
14 project/Jumpcut.xcodeproj/project.pbxproj
@@ -118,7 +118,7 @@
AABE493009FF21BE00A6A239 /* PTKeyCombo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PTKeyCombo.h; path = src/PTKeyCombo.h; sourceTree = "<group>"; };
AABE493109FF21BE00A6A239 /* PTKeyCombo.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PTKeyCombo.m; path = src/PTKeyCombo.m; sourceTree = "<group>"; };
AABE496309FF227E00A6A239 /* JumpcutClipping.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JumpcutClipping.h; sourceTree = "<group>"; };
- AABE496409FF227E00A6A239 /* JumpcutClipping.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = JumpcutClipping.m; sourceTree = "<group>"; };
+ AABE496409FF227E00A6A239 /* JumpcutClipping.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JumpcutClipping.m; sourceTree = "<group>"; };
AABE496509FF227E00A6A239 /* JumpcutStore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JumpcutStore.h; sourceTree = "<group>"; };
AABE496609FF227E00A6A239 /* JumpcutStore.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = JumpcutStore.m; sourceTree = "<group>"; };
AABE497A09FF9CD000A6A239 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
@@ -414,7 +414,6 @@
isa = PBXProject;
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Jumpcut" */;
compatibilityVersion = "Xcode 2.4";
- developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
@@ -529,7 +528,6 @@
"$(SRCROOT)",
);
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
@@ -567,8 +565,7 @@
GCC_VERSION = 4.0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = macosx10.6;
};
name = Debug;
};
@@ -579,12 +576,15 @@
ppc,
i386,
);
+ DEAD_CODE_STRIPPING = YES;
+ DEPLOYMENT_POSTPROCESSING = YES;
+ GCC_FAST_MATH = YES;
GCC_OPTIMIZATION_LEVEL = s;
+ GCC_STRICT_ALIASING = YES;
GCC_VERSION = 4.0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- PREBINDING = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ SDKROOT = macosx10.6;
};
name = Release;
};
View
4 project/JumpcutClipping.m
@@ -128,12 +128,12 @@ -(void) resetDisplayString
// We're resetting the display string, so release the old one.
[clipDisplayString release];
// We want to restrict the display string to the clipping contents through the first line break.
- trimmedString = [clipContents stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+ trimmedString = [clipContents stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
[trimmedString getLineStart:&start end:&lineEnd contentsEnd:&contentsEnd forRange:startRange];
contentsRange = NSMakeRange(0, contentsEnd);
firstLineOfClipping = [trimmedString substringWithRange:contentsRange];
if ( [firstLineOfClipping length] > clipDisplayLength ) {
- newDisplayString = [[NSString stringWithString:[firstLineOfClipping substringToIndex:clipDisplayLength]] stringByAppendingString:@"..."];
+ newDisplayString = [[NSString stringWithString:[firstLineOfClipping substringToIndex:clipDisplayLength]] stringByAppendingString:@""];
} else {
newDisplayString = [NSString stringWithString:firstLineOfClipping];
}
View
2  project/LoginItem/LoginItemsAE.c
@@ -489,14 +489,12 @@ static OSStatus SendEventToSystemEventsWithParameters(
AppleEvent target;
AppleEvent event;
AppleEvent localReply;
- AEDescList results;
assert( (reply == NULL) || (reply->descriptorType == typeNull) );
target = kAENull;
event = kAENull;
localReply = kAENull;
- results = kAENull;
// Create Apple event.
View
9 project/ShortcutRecorder/SRCommon.m
@@ -172,19 +172,16 @@ unsigned int SRCocoaToCarbonFlags( unsigned int cocoaFlags )
UInt32 keyTranslateState;
UInt32 deadKeyState;
OSStatus err = noErr;
- CFLocaleRef locale = CFLocaleCopyCurrent();
CFMutableStringRef resultString;
err = KLGetCurrentKeyboardLayout( &currentLayout );
if(err != noErr) {
- CFRelease(locale);
return FailWithNaiveString;
}
err = KLGetKeyboardLayoutProperty( currentLayout, kKLKind, (const void **)&keyLayoutKind );
if(err != noErr) {
- CFRelease(locale);
return FailWithNaiveString;
}
@@ -192,14 +189,12 @@ unsigned int SRCocoaToCarbonFlags( unsigned int cocoaFlags )
PUDNSLog(@"KCHR kind key layout");
err = KLGetKeyboardLayoutProperty( currentLayout, kKLKCHRData, (const void **)&KCHRData );
if(err != noErr) {
- CFRelease(locale);
return FailWithNaiveString;
}
} else {
PUDNSLog(@"uchr kind key layout");
err = KLGetKeyboardLayoutProperty( currentLayout, kKLuchrData, (const void **)&uchrData );
if(err != noErr) {
- CFRelease(locale);
return FailWithNaiveString;
}
}
@@ -252,6 +247,8 @@ unsigned int SRCocoaToCarbonFlags( unsigned int cocoaFlags )
if(temp)
CFRelease(temp);
}
+ CFLocaleRef locale = CFLocaleCopyCurrent();
+
CFStringCapitalize(resultString, locale);
CFRelease(locale);
@@ -437,7 +434,7 @@ + (void)_drawSRSnapback:(id)anNSCustomImageRep {
[flip scaleXBy:0.9 yBy:1.0];
[flip translateXBy:0.5 yBy:-0.5];
- [bp transformUsingAffineTransform:flip];
+ [bp transformUsingAffineTransform:flip]; [flip release];
NSShadow *sh = [[NSShadow alloc] init];
[sh setShadowColor:[[NSColor blackColor] colorWithAlphaComponent:0.45]];
View
10 project/ShortcutRecorder/SRRecorderCell.m
@@ -284,7 +284,7 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
(recordingOrEmpty ? [NSColor disabledControlTextColor] : [NSColor blackColor]), NSForegroundColorAttributeName,
nil];
- NSString *displayString = [[[NSString alloc] init] autorelease];
+ NSString *displayString;
if (isRecording)
{
@@ -379,13 +379,13 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
// NSAffineTransform *transitionMovement = [[NSAffineTransform alloc] init];
NSAffineTransform *viewportMovement = [[NSAffineTransform alloc] init];
- CTGradient *currRecordingGradient = [recordingGradient gradientWithAlphaComponent:0.3];
+// CTGradient *currRecordingGradient = [recordingGradient gradientWithAlphaComponent:0.3];
// Draw gradient when in recording mode
if (isVaguelyRecording)
{
if (isAnimatingNow) {
// [transitionMovement translateXBy:(isAnimatingTowardsRecording ? -(NSWidth(cellFrame)*(1.0-xanim)) : +(NSWidth(cellFrame)*xanim)) yBy:0.0];
- currRecordingGradient = [currRecordingGradient gradientWithAlphaComponent:alphaRecording];
+// currRecordingGradient = [currRecordingGradient gradientWithAlphaComponent:alphaRecording];
if (SRAnimationAxisIsY) {
// [viewportMovement translateXBy:0.0 yBy:(isAnimatingTowardsRecording ? -(NSHeight(cellFrame)*(xanim)) : -(NSHeight(cellFrame)*(1.0-xanim)))];
[viewportMovement translateXBy:0.0 yBy:(isAnimatingTowardsRecording ? NSHeight(cellFrame)*(xanim) : NSHeight(cellFrame)*(1.0-xanim))];
@@ -413,7 +413,7 @@ - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
// if (isVaguelyRecording)
{
- roundedRect = [viewportMovement transformBezierPath:[NSBezierPath bezierPathWithSRCRoundRectInRect:SRAnimationOffsetRect(cellFrame,cellFrame) radius:NSHeight(cellFrame)/2.0]];
+ //roundedRect = [viewportMovement transformBezierPath:[NSBezierPath bezierPathWithSRCRoundRectInRect:SRAnimationOffsetRect(cellFrame,cellFrame) radius:NSHeight(cellFrame)/2.0]];
// Fill background with gradient
// [currRecordingGradient fillRect:cellFrame angle:90.0];
@@ -646,7 +646,7 @@ - (void)mouseExited:(NSEvent*)theEvent
- (BOOL)trackMouse:(NSEvent *)theEvent inRect:(NSRect)cellFrame ofView:(SRRecorderControl *)controlView untilMouseUp:(BOOL)flag
{
NSEvent *currentEvent = theEvent;
- NSPoint mouseLocation = [controlView convertPoint:[currentEvent locationInWindow] fromView:nil];
+ NSPoint mouseLocation; // = [controlView convertPoint:[currentEvent locationInWindow] fromView:nil];
NSRect trackingRect = (isRecording ? [self _snapbackRectForFrame: cellFrame] : [self _removeButtonRectForFrame: cellFrame]);
NSRect leftRect = cellFrame;
View
5 project/UKPrefsPanel_d/UKPrefsPanel.h
@@ -38,7 +38,12 @@
Classes:
-------------------------------------------------------------------------- */
+#if defined MAC_OS_X_VERSION_10_6 && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+@interface UKPrefsPanel : NSObject<NSToolbarDelegate>
+#else
@interface UKPrefsPanel : NSObject
+#endif
+
{
IBOutlet NSTabView* tabView; ///< The tabless tab-view that we're a switcher for.
NSMutableDictionary* itemsList; ///< Auto-generated from tab view's items.

No commit comments for this range

Something went wrong with that request. Please try again.