From a3d4c973369987e14cc0c05964e288ea0eac11dc Mon Sep 17 00:00:00 2001 From: nealsid Date: Mon, 6 Apr 2009 00:25:29 +0000 Subject: Incorporate feedback from first Breakpad integration. This upload fixes five issues: 1) Preston's email was hardcoded in the xib :-( 2) Changed from xib to NIB to facilitate Tiger building 3) Changed the logs location to be user specifiable by BreakpadMinidumpLocation key, or ~/Library/Breakpad/ by default 4) Fixed GTM Defines problem in order to build on Tiger 5) Also set CFBundleIcon in the sender program correctly, and updated plist, and renamed ReporterIcons to crash_report_sendER.ICNS. However the rietveld upload script doesn't appear to pick up renamed files correctly, so that file doesn't show up in the patch upload. Also various comments were updated for accuracy. git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@323 4c0a9323-5329-0410-9bdc-e9ce6186880e --- .../sender/English.lproj/Breakpad.nib/classes.nib | 33 + .../mac/sender/English.lproj/Breakpad.nib/info.nib | 20 + .../English.lproj/Breakpad.nib/keyedobjects.nib | Bin 0 -> 10208 bytes src/client/mac/sender/English.lproj/Breakpad.xib | 834 --------------------- src/client/mac/sender/ReporterIcon.graffle | 2 +- src/client/mac/sender/ReporterIcon.icns | Bin 170816 -> 0 bytes .../mac/sender/crash_report_sender-Info.plist | 2 + src/client/mac/sender/crash_report_sender.icns | Bin 0 -> 170816 bytes 8 files changed, 56 insertions(+), 835 deletions(-) create mode 100644 src/client/mac/sender/English.lproj/Breakpad.nib/classes.nib create mode 100644 src/client/mac/sender/English.lproj/Breakpad.nib/info.nib create mode 100644 src/client/mac/sender/English.lproj/Breakpad.nib/keyedobjects.nib delete mode 100644 src/client/mac/sender/English.lproj/Breakpad.xib delete mode 100644 src/client/mac/sender/ReporterIcon.icns create mode 100644 src/client/mac/sender/crash_report_sender.icns (limited to 'src/client/mac/sender') diff --git a/src/client/mac/sender/English.lproj/Breakpad.nib/classes.nib b/src/client/mac/sender/English.lproj/Breakpad.nib/classes.nib new file mode 100644 index 00000000..2636d457 --- /dev/null +++ b/src/client/mac/sender/English.lproj/Breakpad.nib/classes.nib @@ -0,0 +1,33 @@ + + + + + IBClasses + + + ACTIONS + + cancel + id + sendReport + id + showPrivacyPolicy + id + + CLASS + Reporter + LANGUAGE + ObjC + OUTLETS + + alertWindow + NSWindow + + SUPERCLASS + NSObject + + + IBVersion + 1 + + diff --git a/src/client/mac/sender/English.lproj/Breakpad.nib/info.nib b/src/client/mac/sender/English.lproj/Breakpad.nib/info.nib new file mode 100644 index 00000000..55565cda --- /dev/null +++ b/src/client/mac/sender/English.lproj/Breakpad.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../../Breakpad.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 2 + + IBSystem Version + 9F33 + targetFramework + IBCocoaFramework + + diff --git a/src/client/mac/sender/English.lproj/Breakpad.nib/keyedobjects.nib b/src/client/mac/sender/English.lproj/Breakpad.nib/keyedobjects.nib new file mode 100644 index 00000000..50dff43d Binary files /dev/null and b/src/client/mac/sender/English.lproj/Breakpad.nib/keyedobjects.nib differ diff --git a/src/client/mac/sender/English.lproj/Breakpad.xib b/src/client/mac/sender/English.lproj/Breakpad.xib deleted file mode 100644 index 7b5053a5..00000000 --- a/src/client/mac/sender/English.lproj/Breakpad.xib +++ /dev/null @@ -1,834 +0,0 @@ - - - - 1050 - 9F33 - 670 - 949.34 - 352.00 - - YES - - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - YES - - Reporter - - - FirstResponder - - - NSApplication - - - 1 - 2 - {{196, 157}, {484, 353}} - 536871936 - - NSWindow - - {3.40282e+38, 3.40282e+38} - - - 264 - - YES - - - 266 - {{89, 279}, {378, 54}} - - YES - - 67239424 - 272629760 - RE8gTk9UIExPQ0FMSVpFLiBUaGUgPFJlYWxseSBMb25nIENvbXBhbnkgTmFtZT4gcHJvZ3JhbSA8UmVh -bGx5IExvbmcgQXBwIE5hbWUgSGVyZT4gaGFzIHVuZXhwZWN0ZWRseSBxdWl0LiA - - LucidaGrande-Bold - 1.400000e+01 - 16 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2OQA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 268 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{20, 269}, {64, 64}} - - YES - - 130560 - 33554432 - - NSImage - NSApplicationIcon - - 0 - 0 - 0 - NO - - YES - - - - 266 - {{17, 191}, {450, 70}} - - YES - - 67239424 - 272760832 - RE8gTk9UIExPQ0FMSVpFLiBUaGUgc3lzdGVtIGFuZCBvdGhlciBhcHBsaWNhdGlvbnMgaGF2ZSBub3Qg -YmVlbiBhZmZlY3RlZC4gQSByZXBvcnQgaGFzIGJlZW4gY3JlYXRlZCB0aGF0IHlvdSBjYW4gc2VuZCB0 -byA8UmVhbGx5IExvbmcgQ29tcGFueSBOYW1lPiB0byBoZWxwIGlkZW50aWZ5IHRoZSBwcm9ibGVtLgoK -UGxlYXNlIGhlbHAgdXMgZml4IHRoZSBwcm9ibGVtIGJ5IGRlc2NyaWJpbmcgd2hhdCBoYXBwZW5lZCBi -ZWZvcmUgdGhlIGNyYXNoLg - - LucidaGrande - 1.100000e+01 - 3100 - - - - - - - - - 290 - {{17, 85}, {450, 28}} - - YES - - 67239424 - 272760832 - DO NOT LOCALIZE. Providing your email address is optional and will allow us contact you in case we need more details. - - - - - - - - - 289 - {{353, 12}, {117, 32}} - - YES - - 67239424 - 134217728 - Send Report - - LucidaGrande - 1.300000e+01 - 1044 - - - -2038284033 - 129 - - - DQ - 200 - 25 - - - - - 289 - {{243, 12}, {110, 32}} - - YES - - 67239424 - 134217728 - Cancel - - - -2038284033 - 129 - - - Gw - 200 - 25 - - - - - 290 - {{59, 58}, {195, 19}} - - YES - - -1804468671 - 272761856 - preston.jackson@gmail.com - - optional - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - - - - - - 292 - {{17, 60}, {37, 14}} - - YES - - 68288064 - 71435264 - Email: - - - - - - - - - 289 - {{352, 59}, {16, 17}} - - YES - - -2080244224 - 262144 - Privacy Policy - - LucidaGrande - 9.000000e+00 - 3614 - - - -2040250113 - 36 - - NSImage - NSFollowLinkFreestandingTemplate - - - - 400 - 75 - - - - - 289 - {{259, 60}, {89, 14}} - - YES - - 68288064 - 71435264 - Privacy Policy - - - - - - - - - 274 - {{20, 124}, {444, 61}} - - YES - - 341966337 - 272760832 - DO NOT LOCALIZE: Line 1 Line 1 Line 1 Line 1 Line 1 Line 1 Line 1 Line 1 Line Line 2 Line 2 Line 2 Line 2 Line 2 Line 2 Line 2 Line 2 Line 2 Line 2 Line 2 Line 2 Line 3 Line 3 Line 3 Line 3 Line 3 Line 3 Line 3 Line 3 Line 3 Line 3 Line 3 Line 3 Line 4 Line 4 Line 4 Line 4 Line 4 Line 4 Line 4 Line 4 Line 4 Line 4 Line 4 Line 4 - - - YES - - - - - - {484, 353} - - - {{0, 0}, {1680, 1028}} - {3.40282e+38, 3.40282e+38} - - - - - YES - - - alertWindow - - - - 42 - - - - sendReport: - - - - 45 - - - - cancel: - - - - 46 - - - - showPrivacyPolicy: - - - - 53 - - - - value: headerMessage - - - - - - value: headerMessage - value - headerMessage - 2 - - - 85 - - - - value: reportMessage - - - - - - value: reportMessage - value - reportMessage - 2 - - - 86 - - - - value: emailMessage - - - - - - value: emailMessage - value - emailMessage - 2 - - - 87 - - - - value: emailValue - - - - - - value: emailValue - value - emailValue - - NSNullPlaceholder - optional - - 2 - - - 90 - - - - initialFirstResponder - - - - 91 - - - - value: commentsValue - - - - - - value: commentsValue - value - commentsValue - - NSNullPlaceholder - optional comments - - 2 - - - 124 - - - - nextKeyView - - - - 125 - - - - nextKeyView - - - - 126 - - - - nextKeyView - - - - 127 - - - - delegate - - - - 128 - - - - - YES - - 0 - - YES - - - - - - -2 - - - RmlsZSdzIE93bmVyA - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - YES - - - - - - 2 - - - YES - - - - - - - - - - - - - - - - 3 - - - YES - - - - - - 4 - - - - - 6 - - - YES - - - - - - 7 - - - - - 8 - - - YES - - - - - - 9 - - - - - 12 - - - YES - - - - - - 13 - - - - - 14 - - - YES - - - - - - 15 - - - - - 18 - - - YES - - - - - - 19 - - - - - 20 - - - YES - - - - - - 21 - - - - - 48 - - - YES - - - - - - 49 - - - - - 58 - - - YES - - - - - - 59 - - - - - 66 - - - YES - - - - - - 67 - - - - - 116 - - - YES - - - - - - 117 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 1.IBViewEditorWindowController.showingBoundsRectangles - 1.IBViewEditorWindowController.showingLayoutRectangles - 1.IBWindowTemplateEditedContentRect - 1.NSWindowTemplate.visibleAtLaunch - 1.WindowOrigin - 1.editorWindowContentRectSynchronizationRect - 116.IBPluginDependency - 117.IBPluginDependency - 12.IBPluginDependency - 13.IBPluginDependency - 14.IBPluginDependency - 15.IBPluginDependency - 18.IBPluginDependency - 19.IBPluginDependency - 2.IBPluginDependency - 2.IBUserGuides - 20.IBPluginDependency - 21.IBPluginDependency - 3.IBPluginDependency - 4.IBPluginDependency - 48.IBPluginDependency - 49.IBPluginDependency - 58.IBPluginDependency - 59.IBPluginDependency - 6.IBPluginDependency - 66.IBPluginDependency - 67.IBPluginDependency - 7.IBPluginDependency - 8.IBPluginDependency - 9.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{641, 409}, {484, 353}} - com.apple.InterfaceBuilder.CocoaPlugin - - - {{641, 409}, {484, 353}} - - {196, 240} - {{357, 418}, {480, 270}} - 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 - - YES - - - 1.120000e+02 - 1 - - - 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 - - - - YES - - YES - - - YES - - - - - YES - - YES - - - YES - - - - 128 - - - - YES - - Reporter - NSObject - - YES - - YES - cancel: - sendReport: - showPrivacyPolicy: - - - YES - id - id - id - - - - alertWindow - NSWindow - - - IBProjectSource - sender/crash_report_sender.h - - - - - 0 - ../../Breakpad.xcodeproj - 3 - - diff --git a/src/client/mac/sender/ReporterIcon.graffle b/src/client/mac/sender/ReporterIcon.graffle index 62cee85a..14a0e7c4 100644 --- a/src/client/mac/sender/ReporterIcon.graffle +++ b/src/client/mac/sender/ReporterIcon.graffle @@ -65,7 +65,7 @@ CreationDate 2008-11-14 16:58:15 -0700 Creator - Preston Jackson + John P. Developer DisplayScale 1 pt = 1 px FileType diff --git a/src/client/mac/sender/ReporterIcon.icns b/src/client/mac/sender/ReporterIcon.icns deleted file mode 100644 index e8c21242..00000000 Binary files a/src/client/mac/sender/ReporterIcon.icns and /dev/null differ diff --git a/src/client/mac/sender/crash_report_sender-Info.plist b/src/client/mac/sender/crash_report_sender-Info.plist index 1ded1261..445926dd 100644 --- a/src/client/mac/sender/crash_report_sender-Info.plist +++ b/src/client/mac/sender/crash_report_sender-Info.plist @@ -6,6 +6,8 @@ English CFBundleExecutable ${EXECUTABLE_NAME} + CFBundleIconFile + crash_report_sender CFBundleIdentifier com.Breakpad.${PRODUCT_NAME:identifier} CFBundleInfoDictionaryVersion diff --git a/src/client/mac/sender/crash_report_sender.icns b/src/client/mac/sender/crash_report_sender.icns new file mode 100644 index 00000000..e8c21242 Binary files /dev/null and b/src/client/mac/sender/crash_report_sender.icns differ -- cgit v1.2.1