TermiT/Flycut
1
1
Fork 0
mirror of https://github.com/TermiT/Flycut.git synced 2025-11-17 14:38:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

Code clean up. Bezel size will be relative to screen resolution

Browse source
This commit is contained in:
Gennadiy Potapov 2011-08-04 01:07:02 +08:00
parent 3ef88cab38
commit f66eabc253
10 changed files with 96 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
AppController.m
View file

@ -13,60 +13,14 @@
#import "SGHotKeyCenter.h"
#import "SRRecorderCell.h"
#import "UKLoginItemRegistry.h"
#import "NSWindow+TrueCenter.h"
#define _DISPLENGTH 40
/*enum NSWindowCollectionBehavior {
NSWindowCollectionBehaviorDefault = 0,
NSWindowCollectionBehaviorCanJoinAllSpaces = 1 << 0,
NSWindowCollectionBehaviorMoveToActiveSpace = 1 << 1
} ;
*/
//typedef unsigned NSWindowCollectionBehavior;
@interface NSWindow (NSWindowCollectionBehavior)
- (void)setCollectionBehavior:(NSWindowCollectionBehavior)behavior;
@end
@implementation AppController
- (id)init
{
if ( ! [[NSUserDefaults standardUserDefaults] floatForKey:@"lastRun"] || [[NSUserDefaults standardUserDefaults] floatForKey:@"lastRun"] < 0.6 ) {
// A decent starting value for the main hotkey is control-option-V
[mainRecorder setKeyCombo:SRMakeKeyCombo(9, 1179648)];
// Something we'd really like is to transfer over info from 0.5x if we can get at it --
if ( [[NSUserDefaults standardUserDefaults] persistentDomainForName:@"Jumpcut"] ) {
// We need to pull out the relevant objects and stuff them in as proper preferences for the net.sf.Jumpcut domain
if ( [[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"Jumpcut"] objectForKey:@"displayNum"] != nil )
{
[[NSUserDefaults standardUserDefaults] setValue:[ [[NSUserDefaults standardUserDefaults] persistentDomainForName:@"Jumpcut"] objectForKey:@"displayNum"]
forKey:@"displayNum"];
}
if ( [[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"Jumpcut"] objectForKey:@"savePreference"] != nil )
{
if ( [[[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"Jumpcut"] objectForKey:@"savePreference"] isEqual:@"onChange"] )
{
[[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithInt:2]
forKey:@"savePreference"];
}
else if ( [[[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"Jumpcut"] objectForKey:@"savePreference"] isEqual:@"onExit"] )
{
[[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithInt:1]
forKey:@"savePreference"];
}
else
{
[[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithInt:0]
forKey:@"savePreference"];
} // End save preference test
} // End savePreference test
} // End if/then that deals with 0.5x preferences
} // End new-to-version check
// If we don't have preferences defined, let's set some default values:
[[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt:15],
@"displayNum",
@ -95,21 +49,7 @@
- (void)awakeFromNib
{
// Hotkey default value
if ( ! [[NSUserDefaults standardUserDefaults] floatForKey:@"lastRun"] || [[NSUserDefaults standardUserDefaults] floatForKey:@"lastRun"] < 0.6 ) {
// A decent starting value for the main hotkey is shift-command-V
[mainRecorder setKeyCombo:SRMakeKeyCombo(9, 1179648)];
NSLog(@"Setting hotkey");
if ( [[NSUserDefaults standardUserDefaults] persistentDomainForName:@"Jumpcut"] ) {
NSLog(@"Pulling old preference");
// We need to pull out the relevant objects and stuff them in as proper preferences for the net.sf.Jumpcut domain
if ( [[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"Jumpcut"] objectForKey:@"hotkeyModifiers"] != nil )
{
NSLog(@"Setting hotkey");
[mainRecorder setKeyCombo:SRMakeKeyCombo(9, [[[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"Jumpcut"] objectForKey:@"hotkeyModifiers"] intValue])];
}
}
}
// We no longer get autosave from ShortcutRecorder, so let's set the recorder by hand
if ( [[NSUserDefaults standardUserDefaults] dictionaryForKey:@"ShortcutRecorder mainHotkey"] ) {
[mainRecorder setKeyCombo:SRMakeKeyCombo([[[[NSUserDefaults standardUserDefaults] dictionaryForKey:@"ShortcutRecorder mainHotkey"] objectForKey:@"keyCode"] intValue],
@ -121,17 +61,16 @@
displaying:[[NSUserDefaults standardUserDefaults] integerForKey:@"displayNum"]
withDisplayLength:_DISPLENGTH];
// Set up the bezel window
NSSize windowSize = NSMakeSize(325.0, 325.0);
NSSize screenSize = [[NSScreen mainScreen] frame].size;
NSRect windowFrame = NSMakeRect( (screenSize.width - windowSize.width) / 2,
(screenSize.height - windowSize.height) / 3,
windowSize.width, windowSize.height );
NSSize bezelSize = NSMakeSize(screenSize.width/3, screenSize.height/3);
NSRect windowFrame = NSMakeRect( 0, 0, bezelSize.width, bezelSize.height);
bezel = [[BezelWindow alloc] initWithContentRect:windowFrame
styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered
defer:NO];
[bezel setDelegate:self];
[bezel setDelegate:self];
[bezel trueCenter];
// Create our pasteboard interface
jcPasteboard = [NSPasteboard generalPasteboard];
@ -172,10 +111,6 @@
// Stack position starts @ 0 by default
stackPosition = 0;
// Make sure we only run the 0.5x transition once
[[NSUserDefaults standardUserDefaults] setValue:[NSNumber numberWithFloat:0.6]
forKey:@"lastRun"];
[NSApp activateIgnoringOtherApps: YES];
}
@ -680,7 +615,7 @@
}
saveDict = [NSMutableDictionary dictionaryWithCapacity:3];
[saveDict setObject:@"0.6" forKey:@"version"];
[saveDict setObject:@"0.7" forKey:@"version"];
[saveDict setObject:[NSNumber numberWithInt:[[NSUserDefaults standardUserDefaults] integerForKey:@"rememberNum"]]
forKey:@"rememberNum"];
[saveDict setObject:[NSNumber numberWithInt:_DISPLENGTH]
@ -705,20 +640,16 @@
}
}
- (void)setHotKeyPreferenceForRecorder:(SRRecorderControl *)aRecorder
{
if (aRecorder == mainRecorder)
{
- (void)setHotKeyPreferenceForRecorder:(SRRecorderControl *)aRecorder {
if (aRecorder == mainRecorder) {
[[NSUserDefaults standardUserDefaults] setObject:
[NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:[NSNumber numberWithInt:[mainRecorder keyCombo].code],[NSNumber numberWithInt:[mainRecorder keyCombo].flags],nil] forKeys:[NSArray arrayWithObjects:@"keyCode",@"modifierFlags",nil]]
forKey:@"ShortcutRecorder mainHotkey"];
}
}
- (BOOL)shortcutRecorder:(SRRecorderControl *)aRecorder isKeyCode:(NSInteger)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason
{
if (aRecorder == mainRecorder)
{
- (BOOL)shortcutRecorder:(SRRecorderControl *)aRecorder isKeyCode:(NSInteger)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason {
if (aRecorder == mainRecorder) {
BOOL isTaken = NO;
/*
KeyCombo kc = [delegateDisallowRecorder keyCombo];
@ -733,21 +664,18 @@
return NO;
}
- (void)shortcutRecorder:(SRRecorderControl *)aRecorder keyComboDidChange:(KeyCombo)newKeyCombo
{
if (aRecorder == mainRecorder)
{
- (void)shortcutRecorder:(SRRecorderControl *)aRecorder keyComboDidChange:(KeyCombo)newKeyCombo {
if (aRecorder == mainRecorder) {
[self toggleMainHotKey: aRecorder];
[self setHotKeyPreferenceForRecorder: aRecorder];
}
NSLog(@"code: %lu, flags: %lu", newKeyCombo.code, newKeyCombo.flags);
}
- (void)applicationWillTerminate:(NSNotification *)notification
{
- (void)applicationWillTerminate:(NSNotification *)notification {
if ( [[NSUserDefaults standardUserDefaults] integerForKey:@"savePreference"] >= 1 ) {
NSLog(@"Saving on exit");
[self saveEngine] ;
[self saveEngine];
}
//Unregister our hot key (not required)
[[SGHotKeyCenter sharedCenter] unregisterHotKey: mainHotKey];
@ -764,8 +692,7 @@
object:nil];
}
- (void) dealloc
{
- (void) dealloc {
[bezel release];
[srTransformer release];
[super dealloc];

46
English.lproj/MainMenu.nib/designable.nib generated
View file

@ -160,13 +160,13 @@
<string key="NSFrameSize">{549, 471}</string>
<reference key="NSSuperview" ref="342852628"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="736361758"/>
<reference key="NSNextKeyView" ref="584038330"/>
<object class="NSMutableArray" key="NSTabViewItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTabViewItem" id="839086363">
<string key="NSIdentifier">net.sf.jumpcut.preferences.general.tiff</string>
<object class="NSView" key="NSView" id="584038330">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="38633814"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -185,6 +185,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 156}, {97, 18}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="369594545"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="686053849">
@ -217,6 +218,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{134, 56}, {152, 26}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="57469449"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="718571678">
@ -293,12 +295,13 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 95}, {204, 18}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="15249688"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="807105429">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Launch Jumpcut on login</string>
<string key="NSContents">Launch Flycut on login</string>
<reference key="NSSupport" ref="274724818"/>
<reference key="NSControlView" ref="110220131"/>
<int key="NSButtonFlags">1211912703</int>
@ -316,6 +319,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{13, 63}, {64, 17}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1001912577"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="624639011">
@ -349,6 +353,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{99, 62}, {33, 14}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="620054236"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="186516943">
@ -370,6 +375,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{70, 34}, {62, 14}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="224411678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="572447969">
@ -387,6 +393,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{191, 34}, {95, 14}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1003413245"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="228849917">
@ -404,6 +411,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{136, 29}, {25, 22}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="953619213"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="174124432">
@ -494,6 +502,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{281, 29}, {24, 22}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="133997452"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="698023941">
@ -561,6 +570,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{161, 27}, {19, 27}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="583370041"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="1027772156">
@ -580,7 +590,8 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{306, 27}, {19, 27}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSNextKeyView" ref="38633814"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="603252108">
<int key="NSCellFlags">917024</int>
@ -599,6 +610,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 136}, {162, 18}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="992252027"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="596370672">
@ -621,6 +633,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 116}, {162, 18}}</string>
<reference key="NSSuperview" ref="779479303"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="110220131"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="482547557">
@ -641,11 +654,13 @@
</object>
<string key="NSFrameSize">{555, 186}</string>
<reference key="NSSuperview" ref="220648752"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="38658042"/>
</object>
</object>
<string key="NSFrame">{{-3, 299}, {555, 186}}</string>
<reference key="NSSuperview" ref="584038330"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="779479303"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@ -667,6 +682,8 @@
</object>
</object>
<string key="NSFrameSize">{549, 471}</string>
<reference key="NSSuperview" ref="38633814"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="220648752"/>
</object>
<string key="NSLabel">General</string>
@ -716,7 +733,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{247, 48}, {281, 61}}</string>
<reference key="NSSuperview" ref="697987507"/>
<reference key="NSNextKeyView" ref="38633814"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="818811687">
<int key="NSCellFlags">67239424</int>
@ -994,7 +1011,7 @@
<object class="NSTabViewItem" id="781270590">
<string key="NSIdentifier">com.generalarcade.flycut.32.png</string>
<object class="NSView" key="NSView" id="736361758">
<reference key="NSNextResponder" ref="38633814"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1023,8 +1040,7 @@
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{517, 308}</string>
<reference key="NSSuperview" ref="765116797"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="38633814"/>
<reference key="NSNextKeyView" ref="121052580"/>
<object class="NSTextContainer" key="NSTextContainer" id="564979213">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@ -1162,7 +1178,6 @@ Y291cmFnZW1lbnQuA</bytes>
</object>
<string key="NSFrame">{{1, 1}, {517, 344}}</string>
<reference key="NSSuperview" ref="991469956"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1060798950"/>
<reference key="NSDocView" ref="1060798950"/>
<reference key="NSBGColor" ref="791860712"/>
@ -1199,7 +1214,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 170}}</string>
<reference key="NSSuperview" ref="991469956"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="87711434"/>
<reference key="NSTarget" ref="991469956"/>
<string key="NSAction">_doScroller:</string>
@ -1211,7 +1225,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="991469956"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="765116797"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="991469956"/>
@ -1222,8 +1235,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<string key="NSFrame">{{16, 16}, {519, 346}}</string>
<reference key="NSSuperview" ref="635309791"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="121052580"/>
<reference key="NSNextKeyView" ref="765116797"/>
<int key="NSsFlags">133122</int>
<reference key="NSVScroller" ref="121052580"/>
<reference key="NSHScroller" ref="87711434"/>
@ -1233,13 +1245,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<string key="NSFrameSize">{555, 376}</string>
<reference key="NSSuperview" ref="343046602"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="991469956"/>
</object>
</object>
<string key="NSFrame">{{-3, 109}, {555, 376}}</string>
<reference key="NSSuperview" ref="736361758"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="635309791"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@ -1261,8 +1271,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</object>
<string key="NSFrameSize">{549, 471}</string>
<reference key="NSSuperview" ref="38633814"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="343046602"/>
</object>
<string key="NSLabel">Acknowledgements</string>
@ -1270,14 +1278,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="NSTabView" ref="38633814"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="781270590"/>
<reference key="NSSelectedTabViewItem" ref="839086363"/>
<reference key="NSFont" ref="274724818"/>
<int key="NSTvFlags">6</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="736361758"/>
<reference ref="584038330"/>
</object>
</object>
</object>

BIN
English.lproj/MainMenu.nib/keyedobjects.nib generated
View file

Binary file not shown.

12
Jumpcut.xcodeproj/project.pbxproj → Flycut.xcodeproj/project.pbxproj
View file

@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
773ABFB113E9AA1A00AE3969 /* NSWindow+TrueCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 773ABFAF13E9AA1A00AE3969 /* NSWindow+TrueCenter.h */; };
773ABFB213E9AA1A00AE3969 /* NSWindow+TrueCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 773ABFB013E9AA1A00AE3969 /* NSWindow+TrueCenter.m */; };
7761C87C139BDE7F000FB3AB /* JumpcutClipping.h in Headers */ = {isa = PBXBuildFile; fileRef = 7761C878139BDE7F000FB3AB /* JumpcutClipping.h */; };
7761C87D139BDE7F000FB3AB /* JumpcutClipping.m in Sources */ = {isa = PBXBuildFile; fileRef = 7761C879139BDE7F000FB3AB /* JumpcutClipping.m */; };
7761C87E139BDE7F000FB3AB /* JumpcutStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 7761C87A139BDE7F000FB3AB /* JumpcutStore.h */; };
@ -99,6 +101,8 @@
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
32CA4F630368D1EE00C91783 /* Jumpcut_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Jumpcut_Prefix.pch; sourceTree = "<group>"; };
773ABFAF13E9AA1A00AE3969 /* NSWindow+TrueCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSWindow+TrueCenter.h"; sourceTree = "<group>"; };
773ABFB013E9AA1A00AE3969 /* NSWindow+TrueCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSWindow+TrueCenter.m"; sourceTree = "<group>"; };
7761C878139BDE7F000FB3AB /* JumpcutClipping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JumpcutClipping.h; sourceTree = "<group>"; };
7761C879139BDE7F000FB3AB /* JumpcutClipping.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JumpcutClipping.m; sourceTree = "<group>"; };
7761C87A139BDE7F000FB3AB /* JumpcutStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JumpcutStore.h; sourceTree = "<group>"; };
@ -293,6 +297,8 @@
7761C88D139BDEAF000FB3AB /* RoundRecBezierPath.m */,
7761C88E139BDEAF000FB3AB /* RoundRecTextField.h */,
7761C88F139BDEAF000FB3AB /* RoundRecTextField.m */,
773ABFAF13E9AA1A00AE3969 /* NSWindow+TrueCenter.h */,
773ABFB013E9AA1A00AE3969 /* NSWindow+TrueCenter.m */,
);
path = UI;
sourceTree = "<group>";
@ -362,6 +368,7 @@
7761C8AE139BDF12000FB3AB /* SRRecorderCell.h in Headers */,
7761C8B0139BDF12000FB3AB /* SRRecorderControl.h in Headers */,
7761C8B2139BDF12000FB3AB /* SRValidator.h in Headers */,
773ABFB113E9AA1A00AE3969 /* NSWindow+TrueCenter.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -398,7 +405,7 @@
attributes = {
LastUpgradeCheck = 0410;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Jumpcut" */;
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Flycut" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
@ -465,6 +472,7 @@
7761C8AF139BDF12000FB3AB /* SRRecorderCell.m in Sources */,
7761C8B1139BDF12000FB3AB /* SRRecorderControl.m in Sources */,
7761C8B3139BDF12000FB3AB /* SRValidator.m in Sources */,
773ABFB213E9AA1A00AE3969 /* NSWindow+TrueCenter.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -558,7 +566,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Jumpcut" */ = {
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Flycut" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C01FCF4F08A954540054247B /* Debug */,

2
Jumpcut.xcodeproj/project.xcworkspace/contents.xcworkspacedata → Flycut.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated
View file

@ -2,6 +2,6 @@
<Workspace
version = "1.0">
<FileRef
location = "self:Jumpcut.xcodeproj">
location = "self:Flycut.xcodeproj">
</FileRef>
</Workspace>

8
Jumpcut.xcodeproj/xcuserdata/termit.xcuserdatad/xcschemes/Flycut.xcscheme → Flycut.xcodeproj/xcuserdata/termit.xcuserdatad/xcschemes/Flycut.xcscheme
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
version = "1.3">
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@ -16,7 +16,7 @@
BlueprintIdentifier = "8D1107260486CEB800E47090"
BuildableName = "Flycut.app"
BlueprintName = "Flycut"
ReferencedContainer = "container:Jumpcut.xcodeproj">
ReferencedContainer = "container:Flycut.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
@ -43,7 +43,7 @@
BlueprintIdentifier = "8D1107260486CEB800E47090"
BuildableName = "Flycut.app"
BlueprintName = "Flycut"
ReferencedContainer = "container:Jumpcut.xcodeproj">
ReferencedContainer = "container:Flycut.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
@ -62,7 +62,7 @@
BlueprintIdentifier = "8D1107260486CEB800E47090"
BuildableName = "Flycut.app"
BlueprintName = "Flycut"
ReferencedContainer = "container:Jumpcut.xcodeproj">
ReferencedContainer = "container:Flycut.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>

0
Jumpcut.xcodeproj/xcuserdata/termit.xcuserdatad/xcschemes/xcschememanagement.plist → Flycut.xcodeproj/xcuserdata/termit.xcuserdatad/xcschemes/xcschememanagement.plist
View file

15
UI/BezelWindow.m
View file

@ -17,10 +17,6 @@
backing:(NSBackingStoreType)bufferingType
defer:(BOOL)flag
{
contentRect.origin.y += contentRect.size.height/4;
contentRect.size.width += contentRect.size.width/2;
contentRect.origin.x -= (contentRect.size.width/3)/2;
self = [super initWithContentRect:contentRect
styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered
@ -34,7 +30,7 @@
[self setMovableByWindowBackground:NO];
[self setBackgroundColor:[self sizedBezelBackgroundWithRadius:25.0 withAlpha:[[NSUserDefaults standardUserDefaults] floatForKey:@"bezelAlpha"]]];
float lineHeight = 16;
NSRect textFrame = NSMakeRect(12, 36, [self frame].size.width - 24, 18 * lineHeight - 12);
NSRect textFrame = NSMakeRect(12, 36, self.frame.size.width - 24, self.frame.size.height - 50);
textField = [[RoundRecTextField alloc] initWithFrame:textFrame];
[[self contentView] addSubview:textField];
[textField setEditable:NO];
@ -54,14 +50,7 @@
[charField setDrawsBackground:YES];
[charField setBordered:NO];
[charField setAlignment:NSCenterTextAlignment];
[self setInitialFirstResponder:textField];
/*icon = [NSImage imageNamed:@"net.sf.jumpcut.ghost_scissors_small.png"];
if ( [icon isValid] ) {
NSRect iconFrame = NSMakeRect( ([self frame].size.width - [icon size].width) / 2, [self frame].size.height - [icon size].height - 24, [icon size].width, [icon size].height);
iconView = [[NSImageView alloc] initWithFrame:iconFrame];
[iconView setImage:icon];
[[self contentView] addSubview:iconView];
}*/
[self setInitialFirstResponder:textField];
return self;
}
return nil;

15
UI/NSWindow+TrueCenter.h Normal file
View file

@ -0,0 +1,15 @@
//
// NSWindow+TrueCenter.h
// Jumpcut
//
// Created by Gennadii Potapov on 4/8/11.
// Copyright 2011 __MyCompanyName__. All rights reserved.
//
#import <AppKit/AppKit.h>
@interface NSWindow (TrueCenter)
- (void)trueCenter;
@end

21
UI/NSWindow+TrueCenter.m Normal file
View file

@ -0,0 +1,21 @@
//
// NSWindow+TrueCenter.m
// Jumpcut
//
// Created by Gennadii Potapov on 4/8/11.
// Copyright 2011 __MyCompanyName__. All rights reserved.
//
#import "NSWindow+TrueCenter.h"
@implementation NSWindow (TrueCenter)
- (void)trueCenter {
NSRect frame = [self frame];
NSRect screen = [[self screen] frame];
frame.origin.x = (screen.size.width - frame.size. width) / 2;
frame.origin.y = (screen.size.height - frame.size.height) / 2;
[self setFrameOrigin:frame.origin];
}
@end