From 953780f38e4714be43268f6bfe669d76fbda9a87 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Thu, 16 Oct 2014 13:01:17 +0000 Subject: [PATCH] Improve the looks a bit on Yosemite. The app must now be compiled with the 10.10 SDK. --- Transmission.xcodeproj/project.pbxproj | 14 +- macosx/FilterBarView.m | 78 +- macosx/NSApplicationAdditions.h | 1 + macosx/NSApplicationAdditions.m | 7 +- macosx/StatusBarView.m | 105 +- macosx/en.lproj/GlobalOptionsPopover.xib | 3027 +++++++++++++++++----- 6 files changed, 2489 insertions(+), 743 deletions(-) diff --git a/Transmission.xcodeproj/project.pbxproj b/Transmission.xcodeproj/project.pbxproj index 8324074fb..25368ca58 100644 --- a/Transmission.xcodeproj/project.pbxproj +++ b/Transmission.xcodeproj/project.pbxproj @@ -3321,7 +3321,7 @@ LIBRARY_SEARCH_PATHS = "third-party/curl/lib"; MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx10.8; + SDKROOT = macosx10.10; STRIP_INSTALLED_PRODUCT = NO; }; name = Debug; @@ -3438,7 +3438,7 @@ LIBRARY_SEARCH_PATHS = "third-party/curl/lib"; MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = "-DNDEBUG"; - SDKROOT = macosx10.8; + SDKROOT = macosx10.10; }; name = Release; }; @@ -3496,7 +3496,7 @@ INFOPLIST_PREPROCESS = YES; LIBRARY_SEARCH_PATHS = "third-party/curl/lib"; MACOSX_DEPLOYMENT_TARGET = 10.6; - SDKROOT = macosx10.8; + SDKROOT = macosx10.10; STRIP_INSTALLED_PRODUCT = NO; }; name = "Release - Debug"; @@ -3595,9 +3595,7 @@ A2E384CF130DFB1D001F501B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - POSIX, - ); + GCC_PREPROCESSOR_DEFINITIONS = POSIX; PRODUCT_NAME = utp; }; name = Debug; @@ -3605,9 +3603,7 @@ A2E384D0130DFB1D001F501B /* Release - Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ( - POSIX, - ); + GCC_PREPROCESSOR_DEFINITIONS = POSIX; PRODUCT_NAME = utp; }; name = "Release - Debug"; diff --git a/macosx/FilterBarView.m b/macosx/FilterBarView.m index e77774c5d..77a872dd6 100644 --- a/macosx/FilterBarView.m +++ b/macosx/FilterBarView.m @@ -23,6 +23,7 @@ *****************************************************************************/ #import "FilterBarView.h" +#import "NSApplicationAdditions.h" @implementation FilterBarView @@ -30,9 +31,11 @@ { if ((self = [super initWithFrame: rect])) { - NSColor * lightColor = [NSColor colorWithCalibratedRed: 235.0/255.0 green: 235.0/255.0 blue: 235.0/255.0 alpha: 1.0]; - NSColor * darkColor = [NSColor colorWithCalibratedRed: 205.0/255.0 green: 205.0/255.0 blue: 205.0/255.0 alpha: 1.0]; - fGradient = [[NSGradient alloc] initWithStartingColor: lightColor endingColor: darkColor]; + if (![NSApp isOnYosemiteOrBetter]) { + NSColor * lightColor = [NSColor colorWithCalibratedRed: 235.0/255.0 green: 235.0/255.0 blue: 235.0/255.0 alpha: 1.0]; + NSColor * darkColor = [NSColor colorWithCalibratedRed: 205.0/255.0 green: 205.0/255.0 blue: 205.0/255.0 alpha: 1.0]; + fGradient = [[NSGradient alloc] initWithStartingColor: lightColor endingColor: darkColor]; + } } return self; } @@ -55,38 +58,51 @@ - (void) drawRect: (NSRect) rect { - NSInteger count = 0; - NSRect gridRects[2]; - NSColor * colorRects[2]; - - NSRect lineBorderRect = NSMakeRect(NSMinX(rect), NSHeight([self bounds]) - 1.0, NSWidth(rect), 1.0); - if (NSIntersectsRect(lineBorderRect, rect)) - { - gridRects[count] = lineBorderRect; - colorRects[count] = [NSColor whiteColor]; - ++count; + if ([NSApp isOnYosemiteOrBetter]) { + [[NSColor windowBackgroundColor] setFill]; + NSRectFill(rect); - rect.size.height -= 1.0; + const NSRect lineBorderRect = NSMakeRect(NSMinX(rect), 0.0, NSWidth(rect), 1.0); + if (NSIntersectsRect(lineBorderRect, rect)) + { + [[NSColor lightGrayColor] setFill]; + NSRectFill(lineBorderRect); + } } - - lineBorderRect.origin.y = 0.0; - if (NSIntersectsRect(lineBorderRect, rect)) - { - gridRects[count] = lineBorderRect; - colorRects[count] = [NSColor colorWithCalibratedWhite: 0.65 alpha: 1.0]; - ++count; + else { + NSInteger count = 0; + NSRect gridRects[2]; + NSColor * colorRects[2]; - rect.origin.y += 1.0; - rect.size.height -= 1.0; - } - - if (!NSIsEmptyRect(rect)) - { - const NSRect gradientRect = NSMakeRect(NSMinX(rect), 1.0, NSWidth(rect), NSHeight([self bounds]) - 1.0 - 1.0); //proper gradient requires the full height of the bar - [fGradient drawInRect: gradientRect angle: 270.0]; + NSRect lineBorderRect = NSMakeRect(NSMinX(rect), NSHeight([self bounds]) - 1.0, NSWidth(rect), 1.0); + if (NSIntersectsRect(lineBorderRect, rect)) + { + gridRects[count] = lineBorderRect; + colorRects[count] = [NSColor whiteColor]; + ++count; + + rect.size.height -= 1.0; + } + + lineBorderRect.origin.y = 0.0; + if (NSIntersectsRect(lineBorderRect, rect)) + { + gridRects[count] = lineBorderRect; + colorRects[count] = [NSColor colorWithCalibratedWhite: 0.65 alpha: 1.0]; + ++count; + + rect.origin.y += 1.0; + rect.size.height -= 1.0; + } + + if (!NSIsEmptyRect(rect)) + { + const NSRect gradientRect = NSMakeRect(NSMinX(rect), 1.0, NSWidth(rect), NSHeight([self bounds]) - 1.0 - 1.0); //proper gradient requires the full height of the bar + [fGradient drawInRect: gradientRect angle: 270.0]; + } + + NSRectFillListWithColors(gridRects, colorRects, count); } - - NSRectFillListWithColors(gridRects, colorRects, count); } @end diff --git a/macosx/NSApplicationAdditions.h b/macosx/NSApplicationAdditions.h index 5c1f874a9..7ff60947a 100644 --- a/macosx/NSApplicationAdditions.h +++ b/macosx/NSApplicationAdditions.h @@ -32,5 +32,6 @@ - (BOOL) isOnLionOrBetter; - (BOOL) isOnMountainLionOrBetter; +- (BOOL) isOnYosemiteOrBetter; @end diff --git a/macosx/NSApplicationAdditions.m b/macosx/NSApplicationAdditions.m index 63b79ad87..2c9b25b50 100644 --- a/macosx/NSApplicationAdditions.m +++ b/macosx/NSApplicationAdditions.m @@ -33,7 +33,12 @@ - (BOOL) isOnMountainLionOrBetter { - return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_7; + return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_7; +} + +- (BOOL) isOnYosemiteOrBetter +{ + return floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_9; } @end diff --git a/macosx/StatusBarView.m b/macosx/StatusBarView.m index 4342f70ff..447f7e28d 100644 --- a/macosx/StatusBarView.m +++ b/macosx/StatusBarView.m @@ -42,7 +42,7 @@ NSColor * darkColor = [NSColor colorWithCalibratedRed: 155.0/255.0 green: 155.0/255.0 blue: 155.0/255.0 alpha: 1.0]; fGradient = [[NSGradient alloc] initWithStartingColor: lightColor endingColor: darkColor]; - if([NSApp isOnLionOrBetter]) + if([NSApp isOnLionOrBetter] && ![NSApp isOnYosemiteOrBetter]) { CIFilter * randomFilter = [CIFilter filterWithName: @"CIRandomGenerator"]; [randomFilter setDefaults]; @@ -85,65 +85,78 @@ - (void) drawRect: (NSRect) rect { - const BOOL active = [[self window] isMainWindow]; - - NSInteger count = 0; - NSRect gridRects[active ? 2 : 3]; - NSColor * colorRects[active ? 2 : 3]; - - //bottom line - NSRect lineBorderRect = NSMakeRect(NSMinX(rect), 0.0, NSWidth(rect), 1.0); - NSRect intersectLineBorderRect = NSIntersectionRect(lineBorderRect, rect); - if (!NSIsEmptyRect(intersectLineBorderRect)) - { - gridRects[count] = intersectLineBorderRect; - colorRects[count] = active ? [NSColor colorWithCalibratedWhite: 0.25 alpha: 1.0] - : [NSColor colorWithCalibratedWhite: 0.5 alpha: 1.0]; - ++count; + if ([NSApp isOnYosemiteOrBetter]) { + [[NSColor windowBackgroundColor] setFill]; + NSRectFill(rect); - rect.origin.y += intersectLineBorderRect.size.height; - rect.size.height -= intersectLineBorderRect.size.height; + const NSRect lineBorderRect = NSMakeRect(NSMinX(rect), 0.0, NSWidth(rect), 1.0); + if (NSIntersectsRect(lineBorderRect, rect)) + { + [[NSColor lightGrayColor] setFill]; + NSRectFill(lineBorderRect); + } } - - - //top line - if (active) - { - lineBorderRect.origin.y = NSHeight([self bounds]) - 1.0; - intersectLineBorderRect = NSIntersectionRect(lineBorderRect, rect); + else { + const BOOL active = [[self window] isMainWindow]; + + NSInteger count = 0; + NSRect gridRects[active ? 2 : 3]; + NSColor * colorRects[active ? 2 : 3]; + + //bottom line + NSRect lineBorderRect = NSMakeRect(NSMinX(rect), 0.0, NSWidth(rect), 1.0); + NSRect intersectLineBorderRect = NSIntersectionRect(lineBorderRect, rect); if (!NSIsEmptyRect(intersectLineBorderRect)) { gridRects[count] = intersectLineBorderRect; - colorRects[count] = [NSColor colorWithCalibratedWhite: 0.75 alpha: 1.0]; + colorRects[count] = active ? [NSColor colorWithCalibratedWhite: 0.25 alpha: 1.0] + : [NSColor colorWithCalibratedWhite: 0.5 alpha: 1.0]; ++count; + rect.origin.y += intersectLineBorderRect.size.height; rect.size.height -= intersectLineBorderRect.size.height; } - } - - if (!NSIsEmptyRect(rect)) - { + + + //top line if (active) { - const NSRect gradientRect = NSMakeRect(NSMinX(rect), 1.0, NSWidth(rect), NSHeight([self bounds]) - 1.0 - 1.0); //proper gradient requires the full height of the bar - [fGradient drawInRect: gradientRect angle: 270.0]; + lineBorderRect.origin.y = NSHeight([self bounds]) - 1.0; + intersectLineBorderRect = NSIntersectionRect(lineBorderRect, rect); + if (!NSIsEmptyRect(intersectLineBorderRect)) + { + gridRects[count] = intersectLineBorderRect; + colorRects[count] = [NSColor colorWithCalibratedWhite: 0.75 alpha: 1.0]; + ++count; + + rect.size.height -= intersectLineBorderRect.size.height; + } } - else + + if (!NSIsEmptyRect(rect)) { - gridRects[count] = rect; - colorRects[count] = [NSColor colorWithCalibratedWhite: 0.85 alpha: 1.0]; - ++count; + if (active) + { + const NSRect gradientRect = NSMakeRect(NSMinX(rect), 1.0, NSWidth(rect), NSHeight([self bounds]) - 1.0 - 1.0); //proper gradient requires the full height of the bar + [fGradient drawInRect: gradientRect angle: 270.0]; + } + else + { + gridRects[count] = rect; + colorRects[count] = [NSColor colorWithCalibratedWhite: 0.85 alpha: 1.0]; + ++count; + } + } + + NSRectFillListWithColors(gridRects, colorRects, count); + + if (fNoiseImage) { + NSAssert([NSApp isOnLionOrBetter], @"we have a noise image, but we're on 10.6"); //https://trac.transmissionbt.com/ticket/5053 + [fNoiseImage drawInRect: rect + fromRect: [self convertRectToBacking: rect] + operation: NSCompositeSourceOver + fraction: 0.12]; } - } - - NSRectFillListWithColors(gridRects, colorRects, count); - - if (fNoiseImage) { - NSAssert([NSApp isOnLionOrBetter], @"we have a noise image, but we're on 10.6"); //https://trac.transmissionbt.com/ticket/5053 - [fNoiseImage drawInRect: rect - fromRect: [self convertRectToBacking: rect] - operation: NSCompositeSourceOver - fraction: 0.12]; } } diff --git a/macosx/en.lproj/GlobalOptionsPopover.xib b/macosx/en.lproj/GlobalOptionsPopover.xib index a51b327df..aa38c27ad 100644 --- a/macosx/en.lproj/GlobalOptionsPopover.xib +++ b/macosx/en.lproj/GlobalOptionsPopover.xib @@ -2,24 +2,24 @@ 1070 - 11D50 - 2177 - 1138.32 - 568.00 + 14A299l + 6206.8 + 1326.11 + 743.00 com.apple.InterfaceBuilder.CocoaPlugin - 2177 + 6206.8 - NSTextField - NSCustomObject - NSNumberFormatter - NSCustomView - NSButtonCell IBNSLayoutConstraint NSButton - NSUserDefaultsController + NSButtonCell + NSCustomObject + NSCustomView + NSNumberFormatter + NSTextField NSTextFieldCell + NSUserDefaultsController com.apple.InterfaceBuilder.CocoaPlugin @@ -45,24 +45,24 @@ 268 - {{9, 11}, {190, 18}} + {{9, 15}, {189, 18}} _NS:239 YES - -2080244224 + -2080374784 131072 Stop seeding when inactive for: - LucidaGrande + YES 11 3100 _NS:239 - 1211912703 + 1211912448 2 NSImage @@ -76,24 +76,25 @@ 200 25 + NO 268 - {{9, 33}, {136, 18}} + {{9, 37}, {136, 18}} - + _NS:239 YES - -2080244224 + -2080374784 131072 Stop seeding at ratio: _NS:239 - 1211912703 + 1211912448 2 @@ -102,24 +103,25 @@ 200 25 + NO 268 - {{9, 140}, {106, 18}} + {{9, 148}, {104, 18}} _NS:239 YES - -2080244224 + -2080374784 131072 Remaining time _NS:239 - 1211912703 + 1211912448 2 @@ -128,24 +130,25 @@ 200 25 + NO 268 - {{9, 140}, {142, 18}} + {{9, 148}, {143, 18}} _NS:239 YES - -2080244224 + -2080374784 131072 Status of selected files _NS:239 - 1211912703 + 1211912448 2 @@ -154,17 +157,18 @@ 200 25 + NO 268 - {{205, 10}, {45, 20}} + {{204, 14}, {45, 20}} YES - -1804468671 + -1804599231 272761856 @@ -226,17 +230,19 @@ + NO + 1 268 - {{151, 32}, {45, 20}} + {{151, 36}, {45, 20}} YES - -1804468671 + -1804599231 272761856 @@ -282,21 +288,23 @@ + NO + 1 268 - {{9, 51}, {88, 17}} + {{10, 56}, {88, 17}} - + YES - 67239424 + 67108864 272629760 Seeding Limits - LucidaGrande-Bold + YES 11 3357 @@ -317,17 +325,19 @@ + NO + 1 268 - {{9, 120}, {117, 14}} + {{10, 129}, {114, 14}} YES - 67239424 + 67108864 272629760 Transfer Bandwidth @@ -335,17 +345,19 @@ + NO + 1 268 - {{125, 76}, {45, 20}} + {{124, 81}, {45, 20}} YES - -1804468671 + -1804599231 272761856 @@ -386,17 +398,19 @@ + NO + 1 268 - {{175, 101}, {29, 14}} + {{175, 106}, {30, 14}} YES - 67239424 + 67108864 272629760 KB/s @@ -404,17 +418,19 @@ + NO + 1 268 - {{175, 79}, {29, 14}} + {{175, 84}, {30, 14}} - + YES - 67239424 + 67108864 272629760 KB/s @@ -422,17 +438,19 @@ + NO + 1 268 - {{125, 98}, {45, 20}} + {{124, 103}, {45, 20}} YES - -1804468671 + -1804599231 272761856 @@ -473,17 +491,19 @@ + NO + 1 268 - {{255, 13}, {47, 14}} + {{255, 17}, {46, 14}} YES - 67239424 + 67108864 272629760 minutes @@ -491,22 +511,24 @@ + NO + 1 268 - {{10, 77}, {93, 18}} + {{10, 82}, {93, 18}} YES - -2080244224 + -2080374784 131072 Limit Upload: - 1211912703 + 1211912448 2 @@ -515,22 +537,23 @@ 200 25 + NO 268 - {{10, 99}, {109, 18}} + {{10, 104}, {108, 19}} YES - -2080244224 + -2080374784 131072 Limit Download: - 1211912703 + 1211912448 2 @@ -539,9 +562,10 @@ 200 25 + NO - {311, 161} + {311, 168} @@ -555,7 +579,7 @@ - + fDownloadLimitField @@ -986,18 +1010,33 @@ File's Owner + + + + + -1 First Responder + + + + + -3 Application + + + + + 2 @@ -1018,37 +1057,23 @@ - - - 3 - 0 - - 3 - 1 - - 5 - - 1000 - 3 - 9 - 3 - - - - - 3 + + + 5 0 - - 4 + + 6 1 - + 1 + 8 1000 - 9 - 40 - 3 + 6 + 24 + 3 + NO @@ -1057,94 +1082,142 @@ 6 1 - + 1 + 12 1000 + 9 40 3 + NO + + + + 4 + 0 + + 4 + 1 + 1 + + 14 + + 1000 + 3 + 9 + 3 + NO - - + + 10 0 - + 10 1 - + 1 + 0.0 1000 + 6 24 2 - + NO - - - 11 + + + 5 0 - - 11 + + 6 1 - - 0.0 + 1 + + 8 1000 + 6 24 - 2 - + 3 + NO - - + + 3 0 - + 4 1 - + 1 + 8 1000 + 6 24 3 + NO + + + + 10 + 0 + + 10 + 1 + 1 + + 0.0 + + 1000 + 6 + 24 + 2 + NO - - - 6 - 1 - - 6 + + + 11 + 0 + + 11 1 - - 12 + 1 + + 0.0 1000 - 9 - 40 - 3 + 6 + 24 + 2 + NO - - - 6 - 1 - + + + 5 + 0 + 6 1 - - 12 + 1 + + 8 1000 - 9 - 40 - 3 + 6 + 24 + 3 + NO @@ -1153,270 +1226,322 @@ 6 1 - + 1 + 12 1000 + 9 40 3 - + NO - + - 6 - 1 - - 6 + 4 + 0 + + 4 1 - - 12 + 1 + + 36 1000 - 9 - 40 + + 3 + 9 3 + NO + + + + 5 + 0 + + 6 + 1 + 1 + + 8 + + 1000 + 6 + 24 + 3 + NO - + 6 1 - + 6 1 - + 1 + 12 1000 + 9 40 3 - + NO - - - 5 + + + 10 0 - - 5 + + 10 1 - + 1 + 0.0 1000 + 6 24 2 - + NO - - - 3 + + + 11 0 - - 3 + + 11 1 - + 1 + 0.0 1000 + 6 24 2 - + NO - - - 4 + + + 5 0 - - 4 + + 6 1 - - 32 + 1 + + 8 1000 - 3 - 9 - 3 + 6 + 24 + 3 + NO - - + + 5 0 - + 5 1 - + 1 + 0.0 1000 + 6 24 2 + NO + + + + 6 + 1 + + 6 + 1 + 1 + + 12 + + 1000 + 9 + 40 + 3 + NO - - + + 5 1 - + 6 1 - + 1 + 8 1000 + 9 40 3 - + NO - - - 3 + + + 6 0 - - 3 + + 6 1 - - 43 + 1 + + 0.0 1000 - 3 - 9 - 3 + 6 + 24 + 2 + NO - - - 5 + + + 11 0 - - 5 + + 11 1 - - 13 + 1 + + 0.0 1000 - 3 - 9 - 3 + 6 + 24 + 2 + NO - - - 4 + + + 3 0 - - 4 + + 3 1 - - 10 + 1 + + 45 1000 + 3 9 3 - + NO - - - 5 + + + 10 0 - - 5 + + 10 1 - + 1 + 0.0 1000 + 6 24 2 - + NO - - + + 5 0 - - 5 + + 6 1 - - 0.0 + 1 + + 8 1000 + 6 24 - 2 - - - - - 8 - 0 - - 0 - 1 - - 17 - - 1000 - 3 - 9 - 1 - + 3 + NO - - + + 5 0 - + 5 1 - + 1 + 0.0 1000 + 6 24 2 - + NO - - + + 5 - 0 - - 5 + 1 + + 6 1 - - 12 + 1 + + 8 1000 - 3 - 9 - 3 + 9 + 40 + 3 + NO - - - 11 + + + 5 0 - - 11 + + 5 1 - + 1 + 0.0 1000 - 6 - 24 - 2 + 9 + 40 + 2 + NO @@ -1425,354 +1550,359 @@ 5 1 - + 1 + 0.0 1000 + 6 24 2 - + NO - - - 5 + + + 4 0 - - 6 + + 4 1 - - 8 + 1 + + 56 1000 - 6 - 24 - 3 + 3 + 9 + 3 + NO - - - 10 + + + 3 0 - - 10 + + 3 1 - + 1 + 0.0 1000 + 6 24 2 - + NO - - - 7 + + + 5 0 - - 0 + + 5 1 - - 45 + 1 + + 13 1000 + 3 9 - 1 - + 3 + NO - - - 8 + + + 5 0 - - 0 + + 5 1 - - 20 + 1 + + 0.0 1000 - 3 - 9 - 1 + 6 + 24 + 2 + NO - - + + 5 0 - + 5 1 - + 1 + 0.0 1000 + 6 24 2 - + NO - - - 8 + + + 5 0 - - 0 + + 5 1 - - 20 + 1 + + 0.0 1000 - 3 - 9 - 1 + 6 + 24 + 2 + NO - - - 5 + + + 3 0 - - 6 + + 4 1 - + 1 + 8 1000 + 6 24 3 - + NO - - - 7 + + + 5 0 - - 0 + + 5 1 - - 45 + 1 + + 12 1000 + 3 9 - 1 - - - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - 6 - 24 3 - + NO - - - 5 + + + 6 1 - + 6 1 - - 8 + 1 + + 12 1000 + 9 40 3 - + NO - - - 5 + + + 3 0 - - 6 + + 3 1 - - 8 + 1 + + 5 1000 - 6 - 24 - 3 - - - - 8 - 0 - - 0 - 1 - - 20 - - 1000 3 9 - 1 - + 3 + NO - - - 10 + + + 11 0 - - 10 + + 11 1 - + 1 + 0.0 1000 + 6 24 2 - - - - - 8 - 0 - - 0 - 1 - - 20 - - 1000 - 3 - 9 - 1 - + NO - - + + 5 0 - + 5 1 - + 1 + 0.0 1000 - 6 - 24 - 2 - - - - - 7 - 0 - - 0 - 1 - - 45 - - 1000 - 3 - 9 - 1 - - - - 5 - 0 - - 6 - 1 - - 8 - - 1000 - 6 - 24 - 3 - - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 6 24 2 - - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - 6 - 24 - 3 - + NO - - - 5 - 0 - + + + 6 + 1 + 6 1 - - 8 - - 1000 - 6 - 24 - 3 - - - - - 11 - 0 - - 11 - 1 - - 0.0 + 1 + + 12 1000 - 6 - 24 - 2 + 9 + 40 + 3 + NO Options + + + + + + + + + + 1 + {0, 0} + + + + + + + + 2 + {311, 168} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 7 @@ -1781,6 +1911,48 @@ + + + + + + + + 1 + {10, 104} + + + + + + + + 2 + {108, 19} + + + + + + + + + + + + + + + + + + + + + + + + 8 @@ -1789,38 +1961,286 @@ + + + + + + + + 1 + {10, 82} + + + + + + + + 2 + {93, 18} + + + + + + + + + + + + + + + + + + + + + + + + 10 + + + 8 + 0 + + 0 + 1 + 1 + + 20 + + 1000 + + 3 + 9 + 1 + NO + + + + + + + + + 1 + {151, 36} + + + + + + + + 2 + {45, 20} + + + + + + + + + + + + + + + + + + + + + + + + ibTurnedOnButPossiblyUninstalledConstraints + + + + + 17 + + + 7 + 0 + + 0 + 1 + 1 + + 45 + + 1000 + + 3 + 9 + 1 + NO + + + + 8 + 0 + + 0 + 1 + 1 + + 20 + + 1000 + + 3 + 9 + 1 + NO + - - - 18 - - - - - + + + + + + + + 1 + {124, 103} + + + + + + + + 2 + {45, 20} + + + + + + + + + + + + + + + + + + + + + + + + ibTurnedOnButPossiblyUninstalledConstraints + + + + + + 19 + + + 8 + 0 + + 0 + 1 + 1 + + 20 + + 1000 + + 3 + 9 + 1 + NO + + + + + + + + + 1 + {124, 81} + + + + + + + + 2 + {45, 20} + + + + + + + + + + + + + + + + + + + + + + + + ibTurnedOnButPossiblyUninstalledConstraints + + + + + 20 @@ -1829,24 +2249,141 @@ + + + + + + + + 1 + {10, 129} + + + + + + + + 2 + {114, 14} + + + + + + + + + + + + + + + + + + + + + + + + 21 + + + 8 + 0 + + 0 + 1 + 1 + + 17 + + 1000 + + 3 + 9 + 1 + NO + + + + + + + + + 1 + {10, 56} + + + + + + + + 2 + {88, 17} + + + + + + + + + + + + + + + + + + + + + + + + ibTurnedOnButPossiblyUninstalledConstraints + + + + + 22 + + + + + 23 + + + + + 24 @@ -1855,16 +2392,21 @@ + + + + + 25 - - - 26 - - + + + + + 27 @@ -1873,11 +2415,21 @@ + + + + + 28 + + + + + 36 @@ -1886,29 +2438,133 @@ + + + + + 37 + + + + + 43 + + + + + 44 + + + + + 81 + + + 8 + 0 + + 0 + 1 + 1 + + 20 + + 1000 + + 3 + 9 + 1 + NO + + + + 7 + 0 + + 0 + 1 + 1 + + 45 + + 1000 + + 3 + 9 + 1 + NO + + + + + + + + + 1 + {204, 14} + + + + + + + + 2 + {45, 20} + + + + + + + + + + + + + + + + + + + + + + + + ibTurnedOnButPossiblyUninstalledConstraints + + + + + + 82 @@ -1917,11 +2573,21 @@ + + + + + 83 + + + + + 97 @@ -1930,11 +2596,58 @@ + + + + + + + + 1 + {255, 17} + + + + + + + + 2 + {46, 14} + + + + + + + + + + + + + + + + + + + + + + + + 98 + + + + + 113 @@ -1943,11 +2656,58 @@ + + + + + + + + 1 + {9, 148} + + + + + + + + 2 + {143, 18} + + + + + + + + + + + + + + + + + + + + + + + + 114 + + + + + 115 @@ -1956,11 +2716,58 @@ + + + + + + + + 1 + {9, 37} + + + + + + + + 2 + {136, 18} + + + + + + + + + + + + + + + + + + + + + + + + 116 + + + + + 117 @@ -1969,16 +2776,68 @@ + + + + + + + + 1 + {9, 15} + + + + + + + + 2 + {189, 18} + + + + + + + + + + + + + + + + + + + + + + + + 118 + + + + + 119 + + + + + 129 @@ -1987,11 +2846,58 @@ + + + + + + + + 1 + {9, 148} + + + + + + + + 2 + {104, 18} + + + + + + + + + + + + + + + + + + + + + + + + 130 + + + + + 179 @@ -2000,246 +2906,982 @@ + + + + + + + + 1 + {175, 106} + + + + + + + + 2 + {30, 14} + + + + + + + + + + + + + + + + + + + + + + + + 180 - - - 204 - - - - - 248 - - + + + + + 261 + + + + constant + + + + + + + + + 270 + + + + constant + + + + + + + + + 272 - - - 273 - - + + + + constant + + + + + + + + + 278 + + + + constant + + + + + + + + + 279 - - - 280 - - + + + + constant + + + + + + + + + 281 + + + + constant + + + + + + + + + 282 + + + + constant + + + + + + + + + - 286 - + 298 + + + + + + constant + + + + + + + + + + + + 315 + + + + + constant + + + + + + + + + - 288 - + 321 + + + + + constant + + + + + + + + + - 297 - + 322 + + + + + constant + + + + + + + + + - 298 - + 323 + + + + + constant + + + + + + + + + - 299 - + 328 + + + + + constant + + + + + + + + + - 300 - + 330 + + + + + constant + + + + + + + + + - 305 - + 331 + + + + + constant + + + + + + + + + - 310 - + 339 + + + + + constant + + + + + + + + + - 313 - + 343 + + + + + constant + + + + + + + + + - 315 - + 18 + + + + + + + + + + + + + 1 + {175, 84} + + + + + + + + 2 + {30, 14} + + + + + + + + + + + + + + + + + + + + + + + + + + + 280 + + + + + + constant + + + + + + + + + + + + 286 + + + + + + constant + + + + + + + + + + + + 26 + + + + + + + + + + 305 + + + + + + constant + + + + + + + + + + + + 204 + + + + + + constant + + + + + + + + + + + + 273 + + + + + constant + + + + + + + + + - 316 - + 320 + + + + + constant + + + + + + + + + - 318 - + 332 + + + + + constant + + + + + + + + + - 319 - + 299 + + + + + constant + + + + + + + + + - 320 - + 342 + + + + + constant + + + + + + + + + - 321 - + 337 + + + + + constant + + + + + + + + + - 322 - + 326 + + + + + constant + + + + + + + + + - 323 - + 313 + + + + + constant + + + + + + + + + - 324 - - + 426 + + + + + + constant + + + + + + + + + - 325 - + 428 + + + + + constant + + + + + + + + + - 326 - + 429 + + + + + constant + + + + + + + + + - 327 - - + 432 + + + + + + constant + + + + + + + + + - 328 - - + 434 + + + + + + constant + + + + + + + + + - 329 - - + 436 + + + + + + constant + + + + + + + + + - 330 - - + 441 + + + + + + constant + + + + + + + + + - 331 - - + 444 + + + + + + constant + + + + + + + + + - 332 - + 456 + + + + + constant + + + + + + + + + - 334 - + 457 + + + + + constant + + + + + + + + + - 335 - + 459 + + + + + constant + + + + + + + + + - 336 - - + 482 + + + + + + constant + + + + + + + + + - 337 - + 480 + + + + + constant + + + + + + + + + - 338 - + 479 + + + + + constant + + + + + + + + + - 339 - + 489 + + + + + constant + + + + + + + + + - 340 - + 495 + + + + + constant + + + + + + + + + - 341 - + 514 + + + + + constant + + + + + + + + + - 342 - + 515 + + + + + constant + + + + + + + + + - 343 - + 516 + + + + + constant + + + + + + + + + @@ -2247,6 +3889,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin @@ -2259,79 +3904,88 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin ColorTextField + com.apple.InterfaceBuilder.CocoaPlugin ColorTextField + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin + + + - - - + + - - - - + + - - - - - - - - + + - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + {498.5, 592} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2348,50 +4002,58 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2407,7 +4069,7 @@ - 343 + 516 @@ -2416,7 +4078,7 @@ NSTextField IBProjectSource - ./Classes/ColorTextField.h + ../macosx/ColorTextField.h @@ -2497,28 +4159,81 @@ IBProjectSource - ./Classes/GlobalOptionsPopoverViewController.h + ../macosx/GlobalOptionsPopoverViewController.h - NSLayoutConstraint - NSObject + GlobalOptionsPopoverViewController + + id + id + id + id + id + id + id + id + id + + + + setDownSpeedLimit: + id + + + setDownSpeedSetting: + id + + + setIdleStopLimit: + id + + + setIdleStopSetting: + id + + + setRatioStopLimit: + id + + + setRatioStopSetting: + id + + + setUpSpeedLimit: + id + + + setUpSpeedSetting: + id + + + updatedDisplayString: + id + + IBProjectSource - ./Classes/NSLayoutConstraint.h + ../macosx/GlobalOptionsPopoverViewController.m 0 IBCocoaFramework + NO com.apple.InterfaceBuilder.CocoaPlugin.macosx com.apple.InterfaceBuilder.CocoaPlugin.macosx - + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + YES 3 -- 2.40.0