From c76c922414dc7b8d1007027fae7a1a45e541b3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Berg?= Date: Sat, 24 Oct 2009 11:23:38 +0200 Subject: [PATCH] Add missing changes for commit 11cc30 from rastersize's fork --- English.lproj/Preferences.xib | 906 +++++++++++++++++++++++++++++----- PBGitDefaults.h | 3 +- PBGitDefaults.m | 6 + 3 files changed, 782 insertions(+), 133 deletions(-) diff --git a/English.lproj/Preferences.xib b/English.lproj/Preferences.xib index 465f1e1..e91e538 100644 --- a/English.lproj/Preferences.xib +++ b/English.lproj/Preferences.xib @@ -1,26 +1,26 @@ - + 1050 - 9J61 - 677 - 949.46 - 353.00 + 10A411 + 731 + 1033 + 435.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 731 + YES - - - YES - com.apple.InterfaceBuilderKit com.apple.InterfaceBuilder.CocoaPlugin YES - + YES @@ -43,29 +43,29 @@ 268 YES - + 268 - {{17, 54}, {99, 17}} + {{118, 99}, {192, 28}} YES - - 68288064 - 272630784 - Git Executable: - + + 67239424 + 272760832 + Will refresh the repository window when it is selected. + LucidaGrande - 1.300000e+01 - 1044 + 11 + 3100 - + 6 System controlColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -79,28 +79,71 @@ + + + 268 + {{18, 129}, {158, 18}} + + YES + + -2080244224 + 0 + Refresh automatically + + LucidaGrande + 13 + 1044 + + + 1211912703 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + + + 268 + {{17, 74}, {99, 17}} + + YES + + 68288064 + 272630784 + Git Executable: + + + + + + 268 YES - + YES Apple URL pasteboard type NSFilenamesPboardType - {{121, 50}, {179, 22}} + {{121, 70}, {179, 22}} YES 337772033 163840 - - LucidaGrande - 1.100000e+01 - 3100 - + YES @@ -112,7 +155,7 @@ 268 - {{118, 0}, {192, 42}} + {{118, 20}, {192, 42}} YES @@ -128,7 +171,7 @@ 268 - {{306, 54}, {54, 14}} + {{306, 74}, {54, 14}} YES @@ -153,7 +196,7 @@ 268 - {{18, 103}, {203, 18}} + {{18, 151}, {203, 18}} YES @@ -163,35 +206,8 @@ 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 268 - {{18, 78}, {207, 18}} - - YES - - -2080244224 - 0 - U2hvdyAiT3BlbiIgcGFuZWwgb24gbGF1bmNoA - - - 1211912703 - 2 - + 130 + @@ -200,12 +216,12 @@ - {400, 139} + {400, 187} NSView - + 268 YES @@ -238,8 +254,8 @@ 1211912703 - 2 - + 130 + @@ -364,7 +380,7 @@ YES - + YES dateFormat_10_0 dateStyle @@ -374,12 +390,12 @@ YES %m/%d/%y - + - EEEE, MMMM d, yyyy h:mm:ss a + EEEE, dd MMMM, yyyy HH:mm:ss NO @@ -409,11 +425,10 @@ {400, 139} - NSView - + 268 YES @@ -430,8 +445,8 @@ 1211912703 - 2 - + 130 + @@ -441,21 +456,16 @@ {239, 54} - NSView SUUpdater - - YES - PBShowOpenPanelOnLaunch - YES - + 268 YES @@ -468,12 +478,12 @@ -2080244224 0 - RW5hYmxlICdHaXN0IGl0Jw + Enable 'Gist it' 1211912703 - 2 - + 130 + @@ -494,8 +504,8 @@ 1211912703 - 2 - + 130 + @@ -516,8 +526,8 @@ 1211912703 - 2 - + 130 + @@ -538,8 +548,8 @@ 1211912703 - 2 - + 130 + @@ -549,7 +559,6 @@ {400, 116} - NSView @@ -749,7 +758,7 @@ values.gitExecutable YES - + YES NSAllowsEditingMultipleValuesSelection NSNullPlaceholder @@ -889,19 +898,19 @@ - value: values.PBShowOpenPanelOnLaunch - + value: values.PBRefreshAutomatically + - + - value: values.PBShowOpenPanelOnLaunch + value: values.PBRefreshAutomatically value - values.PBShowOpenPanelOnLaunch + values.PBRefreshAutomatically 2 - 121 + 123 @@ -909,28 +918,26 @@ YES 0 - - YES - + -2 - - RmlsZSdzIE93bmVyA + + File's Owner -1 - + First Responder -3 - + Application @@ -938,14 +945,15 @@ YES - - + + + - + General @@ -960,7 +968,7 @@ - + Updates @@ -1090,12 +1098,12 @@ 26 - + 28 - + 42 @@ -1151,7 +1159,7 @@ YES - + Open Panel Accessory @@ -1192,7 +1200,7 @@ - + Integration @@ -1267,26 +1275,38 @@ 118 - + YES - + 119 - - + + + + + 148 + + + YES + + + + + + 149 + + YES - + YES - -1.IBPluginDependency - -2.IBPluginDependency -3.IBPluginDependency 1.IBEditorWindowLastContentRect 1.IBPluginDependency @@ -1304,6 +1324,8 @@ 12.IBPluginDependency 13.IBPluginDependency 14.IBPluginDependency + 148.IBPluginDependency + 149.IBPluginDependency 15.IBEditorWindowLastContentRect 15.IBPluginDependency 16.IBPluginDependency @@ -1316,7 +1338,7 @@ 23.IBPluginDependency 24.IBPluginDependency 25.IBPluginDependency - 26.IBPluginDependency + 28.IBPluginDependency 4.IBEditorWindowLastContentRect 4.IBPluginDependency 4.IBUserGuides @@ -1346,15 +1368,13 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilderKit - com.apple.InterfaceBuilderKit - {{477, 551}, {400, 139}} + {{855, 318}, {400, 187}} com.apple.InterfaceBuilder.CocoaPlugin YES - 1.210000e+02 + 121 0 @@ -1371,6 +1391,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{514, 459}, {106, 71}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1384,13 +1406,13 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{324, 683}, {400, 139}} + {{297, 436}, {400, 139}} com.apple.InterfaceBuilder.CocoaPlugin YES - 4.200000e+01 + 42 0 @@ -1420,9 +1442,7 @@ YES - - YES - + YES @@ -1430,15 +1450,13 @@ YES - - YES - + YES - 121 + 149 @@ -1456,7 +1474,7 @@ DBPrefsWindowController YES - + YES checkGitValidity: resetGitPath: @@ -1471,7 +1489,7 @@ YES - + YES badGitPathIcon generalPrefsView @@ -1526,8 +1544,632 @@ + + YES + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSHelpManager.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSPageLayout.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSController + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSController.h + + + + NSDateFormatter + NSFormatter + + IBFrameworkSource + Foundation.framework/Headers/NSDateFormatter.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSImageView + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSImageView.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSMenuItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSMenuItemCell + NSButtonCell + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItemCell.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUAppcast.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebDownload.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebEditingDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebFrameLoadDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebJavaPlugIn.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPlugin.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPluginContainer.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPolicyDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebResourceLoadDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebScriptObject.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebUIDelegate.h + + + + NSPathCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSPathCell.h + + + + NSPathControl + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSPathControl.h + + + + NSPopUpButton + NSButton + + IBFrameworkSource + AppKit.framework/Headers/NSPopUpButton.h + + + + NSPopUpButtonCell + NSMenuItemCell + + IBFrameworkSource + AppKit.framework/Headers/NSPopUpButtonCell.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSUserDefaultsController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSUserDefaultsController.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSWindow + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSWindowScripting.h + + + + NSWindowController + NSResponder + + showWindow: + id + + + IBFrameworkSource + AppKit.framework/Headers/NSWindowController.h + + + + SUUpdater + NSObject + + checkForUpdates: + id + + + delegate + id + + + + 0 + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES ../GitX.xcodeproj 3 diff --git a/PBGitDefaults.h b/PBGitDefaults.h index fec2430..66a5bfa 100644 --- a/PBGitDefaults.h +++ b/PBGitDefaults.h @@ -16,7 +16,8 @@ + (BOOL) isGravatarEnabled; + (BOOL) confirmPublicGists; + (BOOL) isGistPublic; -+ (BOOL)showWhitespaceDifferences; ++ (BOOL) showWhitespaceDifferences; ++ (BOOL) refreshAutomatically; + (BOOL)openCurDirOnLaunch; + (BOOL)showOpenPanelOnLaunch; diff --git a/PBGitDefaults.m b/PBGitDefaults.m index dc9cfd1..1da3b36 100644 --- a/PBGitDefaults.m +++ b/PBGitDefaults.m @@ -15,6 +15,7 @@ #define kConfirmPublicGists @"PBConfirmPublicGists" #define kPublicGist @"PBGistPublic" #define kShowWhitespaceDifferences @"PBShowWhitespaceDifferences" +#define kRefreshAutomatically @"PBRefreshAutomatically" #define kOpenCurDirOnLaunch @"PBOpenCurDirOnLaunch" #define kShowOpenPanelOnLaunch @"PBShowOpenPanelOnLaunch" @@ -67,6 +68,11 @@ return [[NSUserDefaults standardUserDefaults] boolForKey:kPublicGist]; } ++ (BOOL) refreshAutomatically +{ + return [[NSUserDefaults standardUserDefaults] boolForKey:kRefreshAutomatically]; +} + + (BOOL)showWhitespaceDifferences { return [[NSUserDefaults standardUserDefaults] boolForKey:kShowWhitespaceDifferences];