GRMrGecko/GeckoReporter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug with isAfterTiger, ... and fixed bug with MGMGRContactEmail not being used in MGMContactWindow.

Browse Source
This commit is contained in:
GRMrGecko 2010-01-12 14:11:52 +00:00
parent f54a3317f6
commit f554bfe1f6
4 changed files with 75 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Classes/Framework/MGMSender.m
View File

@ -296,7 +296,11 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles";
MGMSystemInfo *sysInfo = [[MGMSystemInfo new] autorelease]; MGMSystemInfo *sysInfo = [[MGMSystemInfo new] autorelease];
NSString *email = nil, *url = nil, *userEmail = nil, *userName = nil; NSString *email = nil, *url = nil, *userEmail = nil, *userName = nil;
if ([userDefaults objectForKey:MGMGRBugsEmail]!=nil && ![[userDefaults objectForKey:MGMGRBugsEmail] isEqualToString:@""]) { if ([userDefaults objectForKey:MGMGRContactEmail]!=nil && ![[userDefaults objectForKey:MGMGRContactEmail] isEqualToString:@""]) {
email = [userDefaults objectForKey:MGMGRContactEmail];
} else if ([infoDictionary objectForKey:MGMGRContactEmail]!=nil && ![[infoDictionary objectForKey:MGMGRContactEmail] isEqualToString:@""]) {
email = [infoDictionary objectForKey:MGMGRContactEmail];
} else if ([userDefaults objectForKey:MGMGRBugsEmail]!=nil && ![[userDefaults objectForKey:MGMGRBugsEmail] isEqualToString:@""]) {
email = [userDefaults objectForKey:MGMGRBugsEmail]; email = [userDefaults objectForKey:MGMGRBugsEmail];
} else if ([infoDictionary objectForKey:MGMGRBugsEmail]!=nil && ![[infoDictionary objectForKey:MGMGRBugsEmail] isEqualToString:@""]) { } else if ([infoDictionary objectForKey:MGMGRBugsEmail]!=nil && ![[infoDictionary objectForKey:MGMGRBugsEmail] isEqualToString:@""]) {
email = [infoDictionary objectForKey:MGMGRBugsEmail]; email = [infoDictionary objectForKey:MGMGRBugsEmail];
@ -304,10 +308,6 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles";
email = [userDefaults objectForKey:MGMGRCrashEmail]; email = [userDefaults objectForKey:MGMGRCrashEmail];
} else if ([infoDictionary objectForKey:MGMGRCrashEmail]!=nil && ![[infoDictionary objectForKey:MGMGRCrashEmail] isEqualToString:@""]) { } else if ([infoDictionary objectForKey:MGMGRCrashEmail]!=nil && ![[infoDictionary objectForKey:MGMGRCrashEmail] isEqualToString:@""]) {
email = [infoDictionary objectForKey:MGMGRCrashEmail]; email = [infoDictionary objectForKey:MGMGRCrashEmail];
} else if ([userDefaults objectForKey:MGMGRContactEmail]!=nil && ![[userDefaults objectForKey:MGMGRContactEmail] isEqualToString:@""]) {
email = [userDefaults objectForKey:MGMGRContactEmail];
} else if ([infoDictionary objectForKey:MGMGRContactEmail]!=nil && ![[infoDictionary objectForKey:MGMGRContactEmail] isEqualToString:@""]) {
email = [infoDictionary objectForKey:MGMGRContactEmail];
} else { } else {
email = MGMDefaultBugsEmail; email = MGMDefaultBugsEmail;
} }

14
Classes/Framework/MGMSystemInfo.m
View File

@ -206,7 +206,7 @@ NSString * const MGMModel = @"hw.model";
- (BOOL)isAfterCheetah { - (BOOL)isAfterCheetah {
if ([self OSMajorVersion]==10) { if ([self OSMajorVersion]==10) {
int minorVersion = [self OSMinorVersion]; int minorVersion = [self OSMinorVersion];
return (minorVersion=>0); return (minorVersion>=0);
} }
return NO; return NO;
} }
@ -214,7 +214,7 @@ NSString * const MGMModel = @"hw.model";
- (BOOL)isAfterPuma { - (BOOL)isAfterPuma {
if ([self OSMajorVersion]==10) { if ([self OSMajorVersion]==10) {
int minorVersion = [self OSMinorVersion]; int minorVersion = [self OSMinorVersion];
return (minorVersion=>1); return (minorVersion>=1);
} }
return NO; return NO;
} }
@ -222,7 +222,7 @@ NSString * const MGMModel = @"hw.model";
- (BOOL)isAfterJaguar { - (BOOL)isAfterJaguar {
if ([self OSMajorVersion]==10) { if ([self OSMajorVersion]==10) {
int minorVersion = [self OSMinorVersion]; int minorVersion = [self OSMinorVersion];
return (minorVersion=>2); return (minorVersion>=2);
} }
return NO; return NO;
} }
@ -230,7 +230,7 @@ NSString * const MGMModel = @"hw.model";
- (BOOL)isAfterPanther { - (BOOL)isAfterPanther {
if ([self OSMajorVersion]==10) { if ([self OSMajorVersion]==10) {
int minorVersion = [self OSMinorVersion]; int minorVersion = [self OSMinorVersion];
return (minorVersion=>3); return (minorVersion>=3);
} }
return NO; return NO;
} }
@ -238,7 +238,7 @@ NSString * const MGMModel = @"hw.model";
- (BOOL)isAfterTiger { - (BOOL)isAfterTiger {
if ([self OSMajorVersion]==10) { if ([self OSMajorVersion]==10) {
int minorVersion = [self OSMinorVersion]; int minorVersion = [self OSMinorVersion];
return (minorVersion=>4); return (minorVersion>=4);
} }
return NO; return NO;
} }
@ -246,7 +246,7 @@ NSString * const MGMModel = @"hw.model";
- (BOOL)isAfterLeopard { - (BOOL)isAfterLeopard {
if ([self OSMajorVersion]==10) { if ([self OSMajorVersion]==10) {
int minorVersion = [self OSMinorVersion]; int minorVersion = [self OSMinorVersion];
return (minorVersion=>5); return (minorVersion>=5);
} }
return NO; return NO;
} }
@ -254,7 +254,7 @@ NSString * const MGMModel = @"hw.model";
- (BOOL)isAfterSnowLeopard { - (BOOL)isAfterSnowLeopard {
if ([self OSMajorVersion]==10) { if ([self OSMajorVersion]==10) {
int minorVersion = [self OSMinorVersion]; int minorVersion = [self OSMinorVersion];
return (minorVersion=>6); return (minorVersion>=6);
} }
return NO; return NO;
} }

44
GeckoReporter.xcodeproj/grmrgecko.pbxuser
View File

@ -136,10 +136,12 @@
PBXFileDataSource_Warnings_ColumnID, PBXFileDataSource_Warnings_ColumnID,
); );
}; };
PBXPerProjectTemplateStateSaveDate = 284996359; PBXPerProjectTemplateStateSaveDate = 284998280;
PBXWorkspaceStateSaveDate = 284996359; PBXWorkspaceStateSaveDate = 284998280;
}; };
perUserProjectItems = { perUserProjectItems = {
2A5B7B1010FCBA8B00051C18 /* PBXTextBookmark */ = 2A5B7B1010FCBA8B00051C18 /* PBXTextBookmark */;
2A5B7B1C10FCBA9500051C18 /* PBXTextBookmark */ = 2A5B7B1C10FCBA9500051C18 /* PBXTextBookmark */;
2A85029A10F05D6B00CA1273 /* PBXTextBookmark */ = 2A85029A10F05D6B00CA1273 /* PBXTextBookmark */; 2A85029A10F05D6B00CA1273 /* PBXTextBookmark */ = 2A85029A10F05D6B00CA1273 /* PBXTextBookmark */;
}; };
sourceControlManager = 2A478DA110E8456500EBC4A9 /* Source Control */; sourceControlManager = 2A478DA110E8456500EBC4A9 /* Source Control */;
@ -160,6 +162,26 @@
isa = PBXCodeSenseManager; isa = PBXCodeSenseManager;
indexTemplatePath = ""; indexTemplatePath = "";
}; };
2A5B7B1010FCBA8B00051C18 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2AC8694C10EE8062000743D2 /* MGMReporter.m */;
name = "MGMReporter.m: 28";
rLen = 0;
rLoc = 835;
rType = 0;
vrLen = 785;
vrLoc = 442;
};
2A5B7B1C10FCBA9500051C18 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2AC8694C10EE8062000743D2 /* MGMReporter.m */;
name = "MGMReporter.m: 28";
rLen = 0;
rLoc = 835;
rType = 0;
vrLen = 0;
vrLoc = 0;
};
2A85014210EFA6A700CA1273 /* MGMFeedback.h */ = { 2A85014210EFA6A700CA1273 /* MGMFeedback.h */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1176, 646}}"; sepNavIntBoundsRect = "{{0, 0}, {1176, 646}}";
@ -296,9 +318,9 @@
}; };
2AC8694C10EE8062000743D2 /* MGMReporter.m */ = { 2AC8694C10EE8062000743D2 /* MGMReporter.m */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1176, 1352}}"; sepNavIntBoundsRect = "{{0, 0}, {1219, 1365}}";
sepNavSelRange = "{791, 0}"; sepNavSelRange = "{835, 0}";
sepNavVisRange = "{0, 2162}"; sepNavVisRange = "{442, 785}";
sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}";
}; };
}; };
@ -336,9 +358,9 @@
}; };
2AC8695210EE8062000743D2 /* MGMSystemInfo.m */ = { 2AC8695210EE8062000743D2 /* MGMSystemInfo.m */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1176, 4030}}"; sepNavIntBoundsRect = "{{0, 0}, {1176, 4277}}";
sepNavSelRange = "{4846, 914}"; sepNavSelRange = "{5446, 12}";
sepNavVisRange = "{4169, 1117}"; sepNavVisRange = "{4820, 911}";
sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}";
}; };
}; };
@ -474,9 +496,9 @@
}; };
2AC86CF010EEC54C000743D2 /* MGMSender.m */ = { 2AC86CF010EEC54C000743D2 /* MGMSender.m */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1209, 5083}}"; sepNavIntBoundsRect = "{{0, 0}, {1209, 4875}}";
sepNavSelRange = "{19655, 0}"; sepNavSelRange = "{16252, 0}";
sepNavVisRange = "{18391, 2142}"; sepNavVisRange = "{14265, 3068}";
sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}";
}; };
}; };

57
GeckoReporter.xcodeproj/grmrgecko.perspectivev3
View File

@ -287,14 +287,14 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array> <array>
<array> <array>
<integer>18</integer> <integer>39</integer>
<integer>2</integer> <integer>37</integer>
<integer>1</integer> <integer>28</integer>
<integer>0</integer> <integer>0</integer>
</array> </array>
</array> </array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 0}, {185, 660}}</string> <string>{{0, 107}, {185, 660}}</string>
</dict> </dict>
<key>PBXTopSmartGroupGIDs</key> <key>PBXTopSmartGroupGIDs</key>
<array/> <array/>
@ -327,7 +327,7 @@
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
<string>2A478DDD10E8598900EBC4A9</string> <string>2A478DDD10E8598900EBC4A9</string>
<key>PBXProjectModuleLabel</key> <key>PBXProjectModuleLabel</key>
<string></string> <string>MGMReporter.m</string>
<key>PBXSplitModuleInNavigatorKey</key> <key>PBXSplitModuleInNavigatorKey</key>
<dict> <dict>
<key>Split0</key> <key>Split0</key>
@ -335,10 +335,15 @@
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
<string>2A478DDE10E8598900EBC4A9</string> <string>2A478DDE10E8598900EBC4A9</string>
<key>PBXProjectModuleLabel</key> <key>PBXProjectModuleLabel</key>
<string></string> <string>MGMReporter.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>2A5B7B1C10FCBA9500051C18</string>
<key>history</key> <key>history</key>
<array> <array>
<string>2A85029A10F05D6B00CA1273</string> <string>2A85029A10F05D6B00CA1273</string>
<string>2A5B7B1010FCBA8B00051C18</string>
</array> </array>
</dict> </dict>
<key>SplitCount</key> <key>SplitCount</key>
@ -482,11 +487,11 @@
</array> </array>
<key>TableOfContents</key> <key>TableOfContents</key>
<array> <array>
<string>2A5B7AC810FCB63600051C18</string> <string>2A5B7B1310FCBA9400051C18</string>
<string>1CA23ED40692098700951B8B</string> <string>1CA23ED40692098700951B8B</string>
<string>2A5B7AC910FCB63600051C18</string> <string>2A5B7B1410FCBA9400051C18</string>
<string>2A478DDD10E8598900EBC4A9</string> <string>2A478DDD10E8598900EBC4A9</string>
<string>2A5B7ACA10FCB63600051C18</string> <string>2A5B7B1510FCBA9400051C18</string>
<string>1CA23EDF0692099D00951B8B</string> <string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string> <string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string> <string>1CA23EE10692099D00951B8B</string>
@ -539,12 +544,12 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{0, 0}, {1280, 202}}</string> <string>{{0, 0}, {1280, 187}}</string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXDebugCLIModule</string> <string>PBXDebugCLIModule</string>
<key>Proportion</key> <key>Proportion</key>
<string>202pt</string> <string>187pt</string>
</dict> </dict>
<dict> <dict>
<key>ContentConfiguration</key> <key>ContentConfiguration</key>
@ -563,8 +568,8 @@
<string>yes</string> <string>yes</string>
<key>sizes</key> <key>sizes</key>
<array> <array>
<string>{{0, 0}, {625, 229}}</string> <string>{{0, 0}, {625, 237}}</string>
<string>{{625, 0}, {655, 229}}</string> <string>{{625, 0}, {655, 237}}</string>
</array> </array>
</dict> </dict>
<key>VerticalSplitView</key> <key>VerticalSplitView</key>
@ -579,8 +584,8 @@
<string>yes</string> <string>yes</string>
<key>sizes</key> <key>sizes</key>
<array> <array>
<string>{{0, 0}, {1280, 229}}</string> <string>{{0, 0}, {1280, 237}}</string>
<string>{{0, 229}, {1280, 242}}</string> <string>{{0, 237}, {1280, 249}}</string>
</array> </array>
</dict> </dict>
</dict> </dict>
@ -600,7 +605,7 @@
<key>DebugSTDIOWindowFrame</key> <key>DebugSTDIOWindowFrame</key>
<string>{{200, 200}, {500, 300}}</string> <string>{{200, 200}, {500, 300}}</string>
<key>Frame</key> <key>Frame</key>
<string>{{0, 207}, {1280, 471}}</string> <string>{{0, 192}, {1280, 486}}</string>
<key>PBXDebugSessionStackFrameViewKey</key> <key>PBXDebugSessionStackFrameViewKey</key>
<dict> <dict>
<key>DebugVariablesTableConfiguration</key> <key>DebugVariablesTableConfiguration</key>
@ -613,13 +618,13 @@
<real>425</real> <real>425</real>
</array> </array>
<key>Frame</key> <key>Frame</key>
<string>{{625, 0}, {655, 229}}</string> <string>{{625, 0}, {655, 237}}</string>
</dict> </dict>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXDebugSessionModule</string> <string>PBXDebugSessionModule</string>
<key>Proportion</key> <key>Proportion</key>
<string>471pt</string> <string>486pt</string>
</dict> </dict>
</array> </array>
<key>Name</key> <key>Name</key>
@ -637,14 +642,14 @@
</array> </array>
<key>TableOfContents</key> <key>TableOfContents</key>
<array> <array>
<string>2A5B7ACB10FCB63600051C18</string> <string>2A5B7B1610FCBA9400051C18</string>
<string>1CCC7628064C1048000F2A68</string> <string>1CCC7628064C1048000F2A68</string>
<string>1CCC7629064C1048000F2A68</string> <string>1CCC7629064C1048000F2A68</string>
<string>2A5B7ACC10FCB63600051C18</string> <string>2A5B7B1710FCBA9400051C18</string>
<string>2A5B7ACD10FCB63600051C18</string> <string>2A5B7B1810FCBA9400051C18</string>
<string>2A5B7ACE10FCB63600051C18</string> <string>2A5B7B1910FCBA9400051C18</string>
<string>2A5B7ACF10FCB63600051C18</string> <string>2A5B7B1A10FCBA9400051C18</string>
<string>2A5B7AB710FCB54600051C18</string> <string>2A478DDD10E8598900EBC4A9</string>
</array> </array>
<key>ToolbarConfigUserDefaultsMinorVersion</key> <key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string> <string>2</string>
@ -678,9 +683,7 @@
<integer>5</integer> <integer>5</integer>
<key>WindowOrderList</key> <key>WindowOrderList</key>
<array> <array>
<string>2A478EAD10E881CF00EBC4A9</string> <string>2A5B7B1B10FCBA9400051C18</string>
<string>2A5B7AD310FCB63600051C18</string>
<string>2A5B7AD410FCB63600051C18</string>
<string>/Development/James' Applications/GeckoReporter/GeckoReporter.xcodeproj</string> <string>/Development/James' Applications/GeckoReporter/GeckoReporter.xcodeproj</string>
</array> </array>
<key>WindowString</key> <key>WindowString</key>