From f54a3317f69d3d926aeeaf4ad018a2b3bb70f888 Mon Sep 17 00:00:00 2001 From: GRMrGecko Date: Tue, 12 Jan 2010 14:05:09 +0000 Subject: [PATCH] Fixed some possible leaks, and added isAfterTiger, ... to MGMSystemInfo --- .gitignore | 3 + Classes/Framework/MGMBugWindow.h | 1 + Classes/Framework/MGMBugWindow.m | 4 +- Classes/Framework/MGMContactWindow.h | 1 + Classes/Framework/MGMContactWindow.m | 4 +- Classes/Framework/MGMFeedback.m | 4 +- Classes/Framework/MGMReportWindow.h | 2 +- Classes/Framework/MGMReportWindow.m | 8 +- Classes/Framework/MGMReporter.m | 15 +- Classes/Framework/MGMSender.m | 15 +- Classes/Framework/MGMSystemInfo.h | 7 + Classes/Framework/MGMSystemInfo.m | 60 ++++- GeckoReporter.xcodeproj/grmrgecko.pbxuser | 209 ++++-------------- .../grmrgecko.perspectivev3 | 152 ++++--------- 14 files changed, 178 insertions(+), 307 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2d0b15e --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build +*.zip +GeckoReporter \ No newline at end of file diff --git a/Classes/Framework/MGMBugWindow.h b/Classes/Framework/MGMBugWindow.h index 672cb05..4208ebb 100644 --- a/Classes/Framework/MGMBugWindow.h +++ b/Classes/Framework/MGMBugWindow.h @@ -19,6 +19,7 @@ IBOutlet NSButton *cancelButton; MGMSender *mailSender; } ++ (id)sharedBugWindow; - (void)setButtonsEnabled:(BOOL)flag; - (void)close; - (IBAction)send:(id)sender; diff --git a/Classes/Framework/MGMBugWindow.m b/Classes/Framework/MGMBugWindow.m index b9c509c..0c30aa0 100644 --- a/Classes/Framework/MGMBugWindow.m +++ b/Classes/Framework/MGMBugWindow.m @@ -13,7 +13,7 @@ #import "MGMLog.h" @implementation MGMBugWindow -+ (id)new { ++ (id)sharedBugWindow { return [[self alloc] init]; } - (id)init { @@ -56,7 +56,7 @@ - (IBAction)send:(id)sender { [[NSUserDefaults standardUserDefaults] setObject:[userEmailField stringValue] forKey:MGMGRUserEmail]; if (mailSender==nil) { - mailSender = [[MGMSender new] retain]; + mailSender = [MGMSender new]; [mailSender sendBug:[[bugView textStorage] string] reproduce:[[reproduceView textStorage] string] delegate:self]; } [sendButton setTitle:MGMLocalized(@"Sending...", nil)]; diff --git a/Classes/Framework/MGMContactWindow.h b/Classes/Framework/MGMContactWindow.h index 52e4aef..a38bc73 100644 --- a/Classes/Framework/MGMContactWindow.h +++ b/Classes/Framework/MGMContactWindow.h @@ -20,6 +20,7 @@ IBOutlet NSButton *cancelButton; MGMSender *mailSender; } ++ (id)sharedContactWindow; - (void)setButtonsEnabled:(BOOL)flag; - (void)close; - (IBAction)send:(id)sender; diff --git a/Classes/Framework/MGMContactWindow.m b/Classes/Framework/MGMContactWindow.m index 9bd90aa..4b392f0 100644 --- a/Classes/Framework/MGMContactWindow.m +++ b/Classes/Framework/MGMContactWindow.m @@ -13,7 +13,7 @@ #import "MGMLog.h" @implementation MGMContactWindow -+ (id)new { ++ (id)sharedContactWindow { return [[self alloc] init]; } - (id)init { @@ -67,7 +67,7 @@ [[NSUserDefaults standardUserDefaults] setObject:[userEmailField stringValue] forKey:MGMGRUserEmail]; [[NSUserDefaults standardUserDefaults] setObject:[userNameField stringValue] forKey:MGMGRUserName]; if (mailSender==nil) { - mailSender = [[MGMSender new] retain]; + mailSender = [MGMSender new]; [mailSender sendMessage:[[messageView textStorage] string] subject:[subjectPopUp titleOfSelectedItem] delegate:self]; } [sendButton setTitle:MGMLocalized(@"Sending...", nil)]; diff --git a/Classes/Framework/MGMFeedback.m b/Classes/Framework/MGMFeedback.m index 4b6189d..a4a0e7a 100644 --- a/Classes/Framework/MGMFeedback.m +++ b/Classes/Framework/MGMFeedback.m @@ -12,9 +12,9 @@ @implementation MGMFeedback - (IBAction)openBugReport:(id)sender { - [MGMBugWindow new]; + [MGMBugWindow sharedBugWindow]; } - (IBAction)openContact:(id)sender { - [MGMContactWindow new]; + [MGMContactWindow sharedContactWindow]; } @end diff --git a/Classes/Framework/MGMReportWindow.h b/Classes/Framework/MGMReportWindow.h index 1e38f9f..ea41b39 100644 --- a/Classes/Framework/MGMReportWindow.h +++ b/Classes/Framework/MGMReportWindow.h @@ -31,7 +31,7 @@ extern NSString * const MGMSaveLastDate; NSMenu *appMainMenu; } -+ (id)newWindowWithReport:(NSString *)theReportFile reportDate:(NSDate *)theReportDate; ++ (id)sharedWindowWithReport:(NSString *)theReportFile reportDate:(NSDate *)theReportDate; - (id)initWithReport:(NSString *)theReportFile reportDate:(NSDate *)theReportDate; - (void)setButtonsEnabled:(BOOL)flag; - (void)close; diff --git a/Classes/Framework/MGMReportWindow.m b/Classes/Framework/MGMReportWindow.m index 8dd8f07..efd1cf3 100644 --- a/Classes/Framework/MGMReportWindow.m +++ b/Classes/Framework/MGMReportWindow.m @@ -16,7 +16,7 @@ NSString * const MGMSaveLastDate = @"MGMSaveLastDate"; @implementation MGMReportWindow -+ (id)newWindowWithReport:(NSString *)theReportFile reportDate:(NSDate *)theReportDate { ++ (id)sharedWindowWithReport:(NSString *)theReportFile reportDate:(NSDate *)theReportDate { return [[self alloc] initWithReport:theReportFile reportDate:theReportDate]; } - (id)initWithReport:(NSString *)theReportFile reportDate:(NSDate *)theReportDate { @@ -29,7 +29,7 @@ NSString * const MGMSaveLastDate = @"MGMSaveLastDate"; reportDate = [theReportDate retain]; NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary]; NSUserDefaults *userDefautls = [NSUserDefaults standardUserDefaults]; - MGMSystemInfo *sysInfo = [MGMSystemInfo new]; + MGMSystemInfo *sysInfo = [[MGMSystemInfo new] autorelease]; NSString *applicationName = [sysInfo applicationName]; appMainMenu = [[[NSApplication sharedApplication] mainMenu] retain]; @@ -91,7 +91,7 @@ NSString * const MGMSaveLastDate = @"MGMSaveLastDate"; - (IBAction)sendReport:(id)sender { [[NSUserDefaults standardUserDefaults] setObject:[userEmailField stringValue] forKey:MGMGRUserEmail]; if (mailSender==nil) { - mailSender = [[MGMSender new] retain]; + mailSender = [MGMSender new]; [mailSender sendReport:reportFile reportDate:reportDate userReport:[[userReportView textStorage] string] delegate:self]; } [sendButton setTitle:MGMLocalized(@"Sending...", nil)]; @@ -101,7 +101,7 @@ NSString * const MGMSaveLastDate = @"MGMSaveLastDate"; [[NSUserDefaults standardUserDefaults] setObject:[userEmailField stringValue] forKey:MGMGRUserEmail]; [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:YES] forKey:MGMGRSendAll]; if (mailSender==nil) { - mailSender = [[MGMSender new] retain]; + mailSender = [MGMSender new]; [mailSender sendReport:reportFile reportDate:reportDate userReport:[[userReportView textStorage] string] delegate:self]; } [sendAllButton setTitle:MGMLocalized(@"Sending...", nil)]; diff --git a/Classes/Framework/MGMReporter.m b/Classes/Framework/MGMReporter.m index 23cc2f9..18bde9d 100644 --- a/Classes/Framework/MGMReporter.m +++ b/Classes/Framework/MGMReporter.m @@ -12,8 +12,6 @@ #import "MGMSystemInfo.h" #import "MGMLog.h" -static MGMReporter *MGMReporterSingleton = nil; - NSString * const MGMReportsPath = @"~/Library/Logs/CrashReporter"; NSString * const MGMGRDoneNotification = @"MGMGRDoneNotification"; NSString * const MGMGRUserEmail = @"MGMGRUserEmail"; @@ -24,12 +22,7 @@ NSString * const MGMGRIgnoreAll = @"MGMGRIgnoreAll"; @implementation MGMReporter + (id)sharedReporter { - @synchronized(self) { - if (MGMReporterSingleton == nil) { - MGMReporterSingleton = [[self alloc] init]; - } - } - return MGMReporterSingleton; + return [[self alloc] init]; } - (id)init { if (self = [super init]) { @@ -38,7 +31,7 @@ NSString * const MGMGRIgnoreAll = @"MGMGRIgnoreAll"; NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults]; if ([userDefaults objectForKey:MGMGRIgnoreAll]==nil || ![[userDefaults objectForKey:MGMGRIgnoreAll] boolValue]) { NSFileManager *manager = [NSFileManager defaultManager]; - NSString *applicationName = [[MGMSystemInfo new] applicationEXECName]; + NSString *applicationName = [[[MGMSystemInfo new] autorelease] applicationEXECName]; if (lastDate!=nil) { [lastDate release]; lastDate = nil; @@ -68,11 +61,11 @@ NSString * const MGMGRIgnoreAll = @"MGMGRIgnoreAll"; MGMLog(@"Latest Crash Report %@, %@", lastDate, lastCrashFile); if ([userDefaults objectForKey:MGMGRSendAll]!=nil && [[userDefaults objectForKey:MGMGRSendAll] boolValue]) { if (mailSender==nil) { - mailSender = [[MGMSender new] retain]; + mailSender = [MGMSender new]; [mailSender sendReport:lastCrashFile reportDate:lastDate userReport:@"User set to send all." delegate:self]; } } else { - [MGMReportWindow newWindowWithReport:lastCrashFile reportDate:lastDate]; + [MGMReportWindow sharedWindowWithReport:lastCrashFile reportDate:lastDate]; } } else { [[NSNotificationCenter defaultCenter] postNotificationName:MGMGRDoneNotification object:nil userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], MGMSaveLastDate, nil]]; diff --git a/Classes/Framework/MGMSender.m b/Classes/Framework/MGMSender.m index 12243e4..35f8d88 100644 --- a/Classes/Framework/MGMSender.m +++ b/Classes/Framework/MGMSender.m @@ -111,8 +111,8 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles"; return data; } - (NSDictionary *)defaultObjects { - MGMSystemInfo *sysInfo = [MGMSystemInfo new]; - NSMutableDictionary *objects = [NSMutableDictionary new]; + MGMSystemInfo *sysInfo = [[MGMSystemInfo new] autorelease]; + NSMutableDictionary *objects = [NSMutableDictionary dictionary]; [objects setObject:[sysInfo frameworkVersion] forKey:@"GRVersion"]; [objects setObject:[sysInfo applicationName] forKey:@"Application"]; [objects setObject:[sysInfo applicationIdentifier] forKey:@"Application Identifier"]; @@ -153,7 +153,7 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles"; delegate = theDelegate; NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults]; NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary]; - MGMSystemInfo *sysInfo = [MGMSystemInfo new]; + MGMSystemInfo *sysInfo = [[MGMSystemInfo new] autorelease]; NSString *email = nil, *url = nil, *userEmail = nil, *logFiles = nil; BOOL reportAttached = NO; @@ -233,7 +233,7 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles"; delegate = theDelegate; NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults]; NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary]; - MGMSystemInfo *sysInfo = [MGMSystemInfo new]; + MGMSystemInfo *sysInfo = [[MGMSystemInfo new] autorelease]; NSString *email = nil, *url = nil, *userEmail = nil; if ([userDefaults objectForKey:MGMGRBugsEmail]!=nil && ![[userDefaults objectForKey:MGMGRBugsEmail] isEqualToString:@""]) { @@ -293,7 +293,7 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles"; delegate = theDelegate; NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults]; NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary]; - MGMSystemInfo *sysInfo = [MGMSystemInfo new]; + MGMSystemInfo *sysInfo = [[MGMSystemInfo new] autorelease]; NSString *email = nil, *url = nil, *userEmail = nil, *userName = nil; if ([userDefaults objectForKey:MGMGRBugsEmail]!=nil && ![[userDefaults objectForKey:MGMGRBugsEmail] isEqualToString:@""]) { @@ -360,8 +360,6 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles"; MGMLog(@"%@", [error localizedDescription]); if (delegate!=nil && [delegate respondsToSelector:@selector(sendError:)]) [delegate sendError:error]; - [self release]; - self = nil; } else { [receivedData setLength:0]; } @@ -376,7 +374,6 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles"; if (delegate!=nil && [delegate respondsToSelector:@selector(sendError:)]) [delegate sendError:error]; [self release]; - self = nil; } - (void)connectionDidFinishLoading:(NSURLConnection *)connection { @@ -385,7 +382,5 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles"; if (delegate!=nil && [delegate respondsToSelector:@selector(sendFinished:)]) [delegate sendFinished:receivedString]; } - [self release]; - self = nil; } @end \ No newline at end of file diff --git a/Classes/Framework/MGMSystemInfo.h b/Classes/Framework/MGMSystemInfo.h index 8779d1d..98ddeee 100644 --- a/Classes/Framework/MGMSystemInfo.h +++ b/Classes/Framework/MGMSystemInfo.h @@ -25,6 +25,13 @@ - (int)OSBugFixVersion; - (NSString *)OSVersion; - (NSString *)OSVersionName; +- (BOOL)isAfterCheetah; +- (BOOL)isAfterPuma; +- (BOOL)isAfterJaguar; +- (BOOL)isAfterPanther; +- (BOOL)isAfterTiger; +- (BOOL)isAfterLeopard; +- (BOOL)isAfterSnowLeopard; - (NSString *)language; - (NSString *)applicationIdentifier; - (NSString *)applicationName; diff --git a/Classes/Framework/MGMSystemInfo.m b/Classes/Framework/MGMSystemInfo.m index e45f504..92731bb 100644 --- a/Classes/Framework/MGMSystemInfo.m +++ b/Classes/Framework/MGMSystemInfo.m @@ -31,10 +31,6 @@ NSString * const MGMModel = @"hw.model"; @end @implementation MGMSystemInfo -+ (id)new { - return [[[self alloc] init] autorelease]; -} - - (int)valueFromSystem:(NSString *)theName { int value = 0; unsigned long length = sizeof(value); @@ -207,6 +203,62 @@ NSString * const MGMModel = @"hw.model"; return @"Unknown"; } +- (BOOL)isAfterCheetah { + if ([self OSMajorVersion]==10) { + int minorVersion = [self OSMinorVersion]; + return (minorVersion=>0); + } + return NO; +} + +- (BOOL)isAfterPuma { + if ([self OSMajorVersion]==10) { + int minorVersion = [self OSMinorVersion]; + return (minorVersion=>1); + } + return NO; +} + +- (BOOL)isAfterJaguar { + if ([self OSMajorVersion]==10) { + int minorVersion = [self OSMinorVersion]; + return (minorVersion=>2); + } + return NO; +} + +- (BOOL)isAfterPanther { + if ([self OSMajorVersion]==10) { + int minorVersion = [self OSMinorVersion]; + return (minorVersion=>3); + } + return NO; +} + +- (BOOL)isAfterTiger { + if ([self OSMajorVersion]==10) { + int minorVersion = [self OSMinorVersion]; + return (minorVersion=>4); + } + return NO; +} + +- (BOOL)isAfterLeopard { + if ([self OSMajorVersion]==10) { + int minorVersion = [self OSMinorVersion]; + return (minorVersion=>5); + } + return NO; +} + +- (BOOL)isAfterSnowLeopard { + if ([self OSMajorVersion]==10) { + int minorVersion = [self OSMinorVersion]; + return (minorVersion=>6); + } + return NO; +} + - (NSString *)language { NSArray *languages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"]; if (languages!=nil && [languages count]>=1) diff --git a/GeckoReporter.xcodeproj/grmrgecko.pbxuser b/GeckoReporter.xcodeproj/grmrgecko.pbxuser index 3fee7cc..bda9e42 100644 --- a/GeckoReporter.xcodeproj/grmrgecko.pbxuser +++ b/GeckoReporter.xcodeproj/grmrgecko.pbxuser @@ -136,22 +136,11 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 284508832; - PBXWorkspaceStateSaveDate = 284508832; + PBXPerProjectTemplateStateSaveDate = 284996359; + PBXWorkspaceStateSaveDate = 284996359; }; perUserProjectItems = { - 2A85029A10F05D6B00CA1273 = 2A85029A10F05D6B00CA1273 /* PBXTextBookmark */; - 2AB297B910F51A920080C6A1 = 2AB297B910F51A920080C6A1 /* PBXTextBookmark */; - 2AB297E110F5428A0080C6A1 = 2AB297E110F5428A0080C6A1 /* PBXTextBookmark */; - 2AB297F610F542DF0080C6A1 /* PBXTextBookmark */ = 2AB297F610F542DF0080C6A1 /* PBXTextBookmark */; - 2AB2988010F5537F0080C6A1 /* PBXBookmark */ = 2AB2988010F5537F0080C6A1 /* PBXBookmark */; - 2AB2988E10F5590F0080C6A1 /* PBXTextBookmark */ = 2AB2988E10F5590F0080C6A1 /* PBXTextBookmark */; - 2AB2989710F5590F0080C6A1 /* PBXTextBookmark */ = 2AB2989710F5590F0080C6A1 /* PBXTextBookmark */; - 2AB2989A10F5590F0080C6A1 /* PBXTextBookmark */ = 2AB2989A10F5590F0080C6A1 /* PBXTextBookmark */; - 2AB2989C10F5590F0080C6A1 /* PBXTextBookmark */ = 2AB2989C10F5590F0080C6A1 /* PBXTextBookmark */; - 2AB298A510F55CBA0080C6A1 /* PBXTextBookmark */ = 2AB298A510F55CBA0080C6A1 /* PBXTextBookmark */; - 2AB298A610F55CBA0080C6A1 /* PBXTextBookmark */ = 2AB298A610F55CBA0080C6A1 /* PBXTextBookmark */; - 2AB298A710F55CBA0080C6A1 /* PBXTextBookmark */ = 2AB298A710F55CBA0080C6A1 /* PBXTextBookmark */; + 2A85029A10F05D6B00CA1273 /* PBXTextBookmark */ = 2A85029A10F05D6B00CA1273 /* PBXTextBookmark */; }; sourceControlManager = 2A478DA110E8456500EBC4A9 /* Source Control */; userBuildSettings = { @@ -163,7 +152,7 @@ isSCMEnabled = 0; scmConfiguration = { repositoryNamesForRoots = { - "" = ""; + "" = GeckoReporter; }; }; }; @@ -182,24 +171,24 @@ 2A85014310EFA6A700CA1273 /* MGMFeedback.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1176, 646}}"; - sepNavSelRange = "{181, 0}"; - sepNavVisRange = "{0, 424}"; + sepNavSelRange = "{362, 0}"; + sepNavVisRange = "{0, 452}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; 2A85014710EFA81C00CA1273 /* MGMBugWindow.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1176, 646}}"; - sepNavSelRange = "{182, 0}"; - sepNavVisRange = "{0, 617}"; + sepNavSelRange = "{521, 0}"; + sepNavVisRange = "{0, 640}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; 2A85014810EFA81C00CA1273 /* MGMBugWindow.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1012, 1092}}"; - sepNavSelRange = "{2035, 0}"; - sepNavVisRange = "{0, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {1176, 1157}}"; + sepNavSelRange = "{332, 21}"; + sepNavVisRange = "{0, 1109}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; @@ -224,16 +213,16 @@ 2AB2902810F132290080C6A1 /* MGMContactWindow.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1176, 646}}"; - sepNavSelRange = "{186, 0}"; - sepNavVisRange = "{0, 669}"; + sepNavSelRange = "{577, 0}"; + sepNavVisRange = "{0, 696}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; 2AB2902910F132290080C6A1 /* MGMContactWindow.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1176, 1196}}"; - sepNavSelRange = "{1530, 13}"; - sepNavVisRange = "{941, 1725}"; + sepNavIntBoundsRect = "{{0, 0}, {1176, 1352}}"; + sepNavSelRange = "{344, 25}"; + sepNavVisRange = "{0, 1243}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; @@ -242,36 +231,6 @@ sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; - 2AB297B910F51A920080C6A1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A85014810EFA81C00CA1273 /* MGMBugWindow.m */; - name = "MGMBugWindow.m: 80"; - rLen = 0; - rLoc = 2035; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 2AB297E110F5428A0080C6A1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A85014810EFA81C00CA1273 /* MGMBugWindow.m */; - name = "MGMBugWindow.m: 80"; - rLen = 0; - rLoc = 2035; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 2AB297F610F542DF0080C6A1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A85014810EFA81C00CA1273 /* MGMBugWindow.m */; - name = "MGMBugWindow.m: 80"; - rLen = 0; - rLoc = 2035; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; 2AB2983210F54BA00080C6A1 /* English */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {2973, 646}}"; @@ -311,95 +270,6 @@ sepNavVisRange = "{0, 1229}"; }; }; - 2AB2988010F5537F0080C6A1 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 2AB2987E10F5537D0080C6A1 /* License.txt */; - }; - 2AB2988E10F5590F0080C6A1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A85014810EFA81C00CA1273 /* MGMBugWindow.m */; - name = "MGMBugWindow.m: 80"; - rLen = 0; - rLoc = 2035; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 2AB2989710F5590F0080C6A1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2AB2987E10F5537D0080C6A1 /* License.txt */; - name = "License.txt: 11"; - rLen = 0; - rLoc = 670; - rType = 0; - vrLen = 1229; - vrLoc = 0; - }; - 2AB2989A10F5590F0080C6A1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2AB2989B10F5590F0080C6A1 /* Sparkle.strings */; - rLen = 0; - rLoc = 2147483647; - rType = 0; - }; - 2AB2989B10F5590F0080C6A1 /* Sparkle.strings */ = { - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = Sparkle.strings; - path = "/Users/grmrgecko/Downloads/Sparkle 1.5b6/Extras/Source Code/en.lproj/Sparkle.strings"; - sourceTree = ""; - }; - 2AB2989C10F5590F0080C6A1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2AB2989D10F5590F0080C6A1 /* Sparkle.strings */; - name = "Sparkle.strings: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 2737; - vrLoc = 0; - }; - 2AB2989D10F5590F0080C6A1 /* Sparkle.strings */ = { - isa = PBXFileReference; - name = Sparkle.strings; - path = "/Users/grmrgecko/Downloads/Sparkle 1.5b6/Extras/Source Code/en.lproj/Sparkle.strings"; - sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {2588, 1105}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 2737}"; - }; - }; - 2AB298A510F55CBA0080C6A1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2A85014810EFA81C00CA1273 /* MGMBugWindow.m */; - name = "MGMBugWindow.m: 80"; - rLen = 0; - rLoc = 2035; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - 2AB298A610F55CBA0080C6A1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2AB2987E10F5537D0080C6A1 /* License.txt */; - name = "License.txt: 11"; - rLen = 0; - rLoc = 670; - rType = 0; - vrLen = 1229; - vrLoc = 0; - }; - 2AB298A710F55CBA0080C6A1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 2AB2989D10F5590F0080C6A1 /* Sparkle.strings */; - name = "Sparkle.strings: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 2737; - vrLoc = 0; - }; 2AC8693C10EE7EDE000743D2 /* Prefix.pch */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1176, 646}}"; @@ -426,9 +296,9 @@ }; 2AC8694C10EE8062000743D2 /* MGMReporter.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1176, 1495}}"; - sepNavSelRange = "{183, 0}"; - sepNavVisRange = "{0, 1845}"; + sepNavIntBoundsRect = "{{0, 0}, {1176, 1352}}"; + sepNavSelRange = "{791, 0}"; + sepNavVisRange = "{0, 2162}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; @@ -442,9 +312,9 @@ }; 2AC8694E10EE8062000743D2 /* MGMReportWindow.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1475, 1807}}"; - sepNavSelRange = "{3461, 13}"; - sepNavVisRange = "{2748, 2013}"; + sepNavIntBoundsRect = "{{0, 0}, {1475, 1846}}"; + sepNavSelRange = "{3108, 10}"; + sepNavVisRange = "{1834, 1670}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; @@ -459,16 +329,16 @@ 2AC8695110EE8062000743D2 /* MGMSystemInfo.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1176, 646}}"; - sepNavSelRange = "{185, 0}"; - sepNavVisRange = "{0, 880}"; + sepNavSelRange = "{568, 0}"; + sepNavVisRange = "{0, 1046}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; 2AC8695210EE8062000743D2 /* MGMSystemInfo.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1176, 3224}}"; - sepNavSelRange = "{86, 99}"; - sepNavVisRange = "{0, 1448}"; + sepNavIntBoundsRect = "{{0, 0}, {1176, 4030}}"; + sepNavSelRange = "{4846, 914}"; + sepNavVisRange = "{4169, 1117}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; @@ -526,6 +396,21 @@ dylibVariantSuffix = ""; enableDebugStr = 1; environmentEntries = ( + { + active = YES; + name = NSDebugEnabled; + value = YES; + }, + { + active = YES; + name = NSZombieEnabled; + value = YES; + }, + { + active = YES; + name = MallocStackLogging; + value = YES; + }, ); executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; @@ -575,8 +460,8 @@ 2AC86B4610EE9DD7000743D2 /* MGMLog.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1176, 1196}}"; - sepNavSelRange = "{176, 0}"; - sepNavVisRange = "{0, 1785}"; + sepNavSelRange = "{2825, 6}"; + sepNavVisRange = "{1151, 2082}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; @@ -589,9 +474,9 @@ }; 2AC86CF010EEC54C000743D2 /* MGMSender.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1176, 5239}}"; - sepNavSelRange = "{706, 0}"; - sepNavVisRange = "{0, 1732}"; + sepNavIntBoundsRect = "{{0, 0}, {1209, 5083}}"; + sepNavSelRange = "{19655, 0}"; + sepNavVisRange = "{18391, 2142}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; diff --git a/GeckoReporter.xcodeproj/grmrgecko.perspectivev3 b/GeckoReporter.xcodeproj/grmrgecko.perspectivev3 index 0475155..a4686d5 100644 --- a/GeckoReporter.xcodeproj/grmrgecko.perspectivev3 +++ b/GeckoReporter.xcodeproj/grmrgecko.perspectivev3 @@ -197,88 +197,7 @@ Notifications OpenEditors - - - Content - - PBXProjectModuleGUID - 2AB2989510F5590F0080C6A1 - PBXProjectModuleLabel - License.txt - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 2AB2989610F5590F0080C6A1 - PBXProjectModuleLabel - License.txt - _historyCapacity - 0 - bookmark - 2AB298A610F55CBA0080C6A1 - history - - 2AB2988010F5537F0080C6A1 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {1235, 677}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 60 1235 718 0 0 1280 778 - - - - Content - - PBXProjectModuleGUID - 2AB2989810F5590F0080C6A1 - PBXProjectModuleLabel - Sparkle.strings - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 2AB2989910F5590F0080C6A1 - PBXProjectModuleLabel - Sparkle.strings - _historyCapacity - 0 - bookmark - 2AB298A710F55CBA0080C6A1 - history - - 2AB2989A10F5590F0080C6A1 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {1235, 677}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 15 60 1235 718 0 0 1280 778 - - - + PerspectiveWidths 1280 @@ -363,11 +282,12 @@ 1058C7B0FEA5585E11CA2CBB 034768DFFF38A50411DB9C8B 1C37FBAC04509CD000000102 + 1C37FAAC04509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 16 + 18 2 1 0 @@ -391,7 +311,7 @@ 185 RubberWindowFrame - 0 58 1280 719 0 0 1280 778 + 0 59 1280 719 0 0 1280 778 Module PBXSmartGroupTreeModule @@ -407,7 +327,7 @@ PBXProjectModuleGUID 2A478DDD10E8598900EBC4A9 PBXProjectModuleLabel - MGMBugWindow.m + PBXSplitModuleInNavigatorKey Split0 @@ -415,15 +335,10 @@ PBXProjectModuleGUID 2A478DDE10E8598900EBC4A9 PBXProjectModuleLabel - MGMBugWindow.m - _historyCapacity - 0 - bookmark - 2AB298A510F55CBA0080C6A1 + history 2A85029A10F05D6B00CA1273 - 2AB297E110F5428A0080C6A1 SplitCount @@ -439,7 +354,7 @@ Frame {{0, 0}, {1073, 0}} RubberWindowFrame - 0 58 1280 719 0 0 1280 778 + 0 59 1280 719 0 0 1280 778 Module PBXNavigatorGroup @@ -464,7 +379,7 @@ Frame {{10, 27}, {1073, 646}} RubberWindowFrame - 0 58 1280 719 0 0 1280 778 + 0 59 1280 719 0 0 1280 778 Module XCDetailModule @@ -490,6 +405,27 @@ PBXCVSModuleFilterTypeKey 1032 + PBXCVSModuleTreeModuleColumnData + + PBXCVSModuleTreeModuleColumnWidthsKey + + 655 + 56 + 63 + 60 + 63 + 139 + + PBXCVSModuleTreeModuleColumnsKey + + Name + Status + Update + Revision + Author + Date + + PBXProjectModuleGUID 1CA23EE10692099D00951B8B PBXProjectModuleLabel @@ -546,11 +482,11 @@ TableOfContents - 2AB297F710F542DF0080C6A1 + 2A5B7AC810FCB63600051C18 1CA23ED40692098700951B8B - 2AB297F810F542DF0080C6A1 + 2A5B7AC910FCB63600051C18 2A478DDD10E8598900EBC4A9 - 2AB297F910F542DF0080C6A1 + 2A5B7ACA10FCB63600051C18 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -701,14 +637,14 @@ TableOfContents - 2AB2988F10F5590F0080C6A1 + 2A5B7ACB10FCB63600051C18 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - 2AB2989010F5590F0080C6A1 - 2AB2989110F5590F0080C6A1 - 2AB2989210F5590F0080C6A1 - 2AB2989310F5590F0080C6A1 - 2AB2989410F5590F0080C6A1 + 2A5B7ACC10FCB63600051C18 + 2A5B7ACD10FCB63600051C18 + 2A5B7ACE10FCB63600051C18 + 2A5B7ACF10FCB63600051C18 + 2A5B7AB710FCB54600051C18 ToolbarConfigUserDefaultsMinorVersion 2 @@ -742,15 +678,13 @@ 5 WindowOrderList - 2AB298A810F55CBA0080C6A1 - 2AB298A910F55CBA0080C6A1 - 2AB2989E10F5590F0080C6A1 - 2AB2989F10F5590F0080C6A1 - 2AB2989510F5590F0080C6A1 + 2A478EAD10E881CF00EBC4A9 + 2A5B7AD310FCB63600051C18 + 2A5B7AD410FCB63600051C18 /Development/James' Applications/GeckoReporter/GeckoReporter.xcodeproj WindowString - 0 58 1280 719 0 0 1280 778 + 0 59 1280 719 0 0 1280 778 WindowToolsV3 @@ -1588,7 +1522,7 @@ TableOfContents 2A478EAD10E881CF00EBC4A9 - 2A85015810EFA8BA00CA1273 + 2A5B7AD010FCB63600051C18 2A478EAC10E881CF00EBC4A9 WindowString