diff --git a/English.lproj/Preferences.xib b/English.lproj/Preferences.xib index e90280b..ff1e4cf 100644 --- a/English.lproj/Preferences.xib +++ b/English.lproj/Preferences.xib @@ -3,18 +3,18 @@ 1050 10C540 - 759 + 740 1038.25 458.00 com.apple.InterfaceBuilder.CocoaPlugin - 759 + 740 YES + - YES @@ -100,7 +100,7 @@ controlColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -297,7 +297,7 @@ NSView - + 268 YES @@ -306,7 +306,6 @@ 268 {{39, 45}, {82, 14}} - YES 68288064 @@ -323,7 +322,6 @@ 268 {{18, 103}, {260, 18}} - YES -2080244224 @@ -346,7 +344,6 @@ 268 {{130, 78}, {102, 22}} - YES -2076049856 @@ -434,7 +431,6 @@ 268 {{39, 80}, {89, 17}} - YES 68288064 @@ -451,7 +447,6 @@ 268 {{130, 45}, {251, 14}} - YES 68288064 @@ -476,7 +471,7 @@ - EEEE, MMMM d, yyyy h:mm:ss a + EEEE, d. MMMM yyyy HH:mm:ss NO @@ -489,7 +484,6 @@ 268 {{128, 13}, {96, 28}} - YES 67239424 @@ -507,8 +501,6 @@ {400, 139} - - NSView @@ -547,11 +539,6 @@ SUUpdater - - YES - PBCommitMessageViewHasVerticalLine - PBCommitMessageViewVerticalLineLength - YES @@ -971,22 +958,6 @@ 113 - - - value: values.PBShowWhitespaceDifferences - - - - - - value: values.PBShowWhitespaceDifferences - value - values.PBShowWhitespaceDifferences - 2 - - - 117 - value: values.PBShowOpenPanelOnLaunch @@ -1051,6 +1022,26 @@ 135 + + + value: values.PBShowWhitespaceDifferences + + + + + + value: values.PBShowWhitespaceDifferences + value + values.PBShowWhitespaceDifferences + + NSValidatesImmediately + + + 2 + + + 136 + @@ -1652,7 +1643,7 @@ - 135 + 136 @@ -2125,6 +2116,69 @@ Foundation.framework/Headers/NSURLDownload.h + + NSObject + + IBFrameworkSource + ImageKit.framework/Headers/IKImageBrowserView.h + + + + NSObject + + IBFrameworkSource + ImageKit.framework/Headers/IKSaveOptions.h + + + + NSObject + + IBFrameworkSource + ImageKit.framework/Headers/ImageKitDeprecated.h + + + + NSObject + + IBFrameworkSource + PDFKit.framework/Headers/PDFDocument.h + + + + NSObject + + IBFrameworkSource + PDFKit.framework/Headers/PDFView.h + + + + NSObject + + IBFrameworkSource + QuartzComposer.framework/Headers/QCCompositionParameterView.h + + + + NSObject + + IBFrameworkSource + QuartzComposer.framework/Headers/QCCompositionPickerView.h + + + + NSObject + + IBFrameworkSource + QuartzFilters.framework/Headers/QuartzFilterManager.h + + + + NSObject + + IBFrameworkSource + QuickLookUI.framework/Headers/QLPreviewPanel.h + + NSObject @@ -2353,14 +2407,13 @@ 0 - IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx com.apple.InterfaceBuilder.CocoaPlugin.macosx - + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 @@ -2369,9 +2422,5 @@ YES ../GitX.xcodeproj 3 - - NSStopProgressFreestandingTemplate - {83, 83} - diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib index 8641614..0f486eb 100644 --- a/PBGitHistoryView.xib +++ b/PBGitHistoryView.xib @@ -3,7 +3,7 @@ 1050 10C540 - 762 + 740 1038.25 458.00 @@ -15,18 +15,18 @@ YES - 762 - 762 + 740 + 740 YES - + YES - com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -131,7 +131,7 @@ NSQuickLookTemplate - + IA 400 75 @@ -408,7 +408,7 @@ 3 - MC4zMzMzMzI5OQA + MC4zMzMzMzI5ODU2AA 6 @@ -436,7 +436,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -480,7 +480,7 @@ DateColumn 165 10 - 3.4028229999999999e+38 + 3.4028230607370965e+38 75628096 2048 @@ -511,7 +511,7 @@ SHAColumn 30 10 - 3.4028229999999999e+38 + 3.4028230607370965e+38 75628096 2048 @@ -573,7 +573,7 @@ _doScroller: - 0.87603305785123964 + 0.87603306770324707 @@ -583,7 +583,7 @@ 1 _doScroller: - 0.9988276670574443 + 0.99882769584655762 @@ -881,7 +881,7 @@ 3 - MC4zMzMzMzI5OQA + MC4zMzMzMzI5ODU2AA @@ -928,7 +928,7 @@ _doScroller: - 0.9948186 + 0.99481862783432007 @@ -938,8 +938,8 @@ 1 _doScroller: - 0.0045045049999999998 - 0.99801189999999995 + 0.0045045050792396069 + 0.99801188707351685 {208, 234} @@ -964,7 +964,7 @@ 2322 - {545, 120} + {545, 98} @@ -1151,7 +1151,7 @@ 7 - {1186, 1e+07} + {1190, 1e+07} {0, 0} @@ -1174,7 +1174,7 @@ _doScroller: - 0.030031680000000002 + 0.030031679198145866 @@ -1185,7 +1185,7 @@ _doScroller: 1 - 0.94565220000000005 + 0.94565218687057495 {{209, 0}, {645, 234}} @@ -2980,6 +2980,9 @@ commitController commitList historyController + pullItem + pushItem + rebaseItem YES @@ -2987,6 +2990,9 @@ NSArrayController PBCommitList PBGitHistoryController + KBPopUpToolbarItem + KBPopUpToolbarItem + KBPopUpToolbarItem @@ -3470,6 +3476,69 @@ Foundation.framework/Headers/NSURLDownload.h + + NSObject + + IBFrameworkSource + ImageKit.framework/Headers/IKImageBrowserView.h + + + + NSObject + + IBFrameworkSource + ImageKit.framework/Headers/IKSaveOptions.h + + + + NSObject + + IBFrameworkSource + ImageKit.framework/Headers/ImageKitDeprecated.h + + + + NSObject + + IBFrameworkSource + PDFKit.framework/Headers/PDFDocument.h + + + + NSObject + + IBFrameworkSource + PDFKit.framework/Headers/PDFView.h + + + + NSObject + + IBFrameworkSource + QuartzComposer.framework/Headers/QCCompositionParameterView.h + + + + NSObject + + IBFrameworkSource + QuartzComposer.framework/Headers/QCCompositionPickerView.h + + + + NSObject + + IBFrameworkSource + QuartzFilters.framework/Headers/QuartzFilterManager.h + + + + NSObject + + IBFrameworkSource + QuickLookUI.framework/Headers/QLPreviewPanel.h + + NSObject @@ -3800,14 +3869,13 @@ 0 - IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx com.apple.InterfaceBuilder.CocoaPlugin.macosx - + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 @@ -3816,30 +3884,5 @@ YES GitX.xcodeproj 3 - - YES - - YES - AddBranchTemplate - AddLabelTemplate - CherryPickTemplate - DetailViewTemplate - MergeTemplate - NSPathTemplate - NSQuickLookTemplate - RebaseTemplate - - - YES - {20, 12} - {23, 12} - {18.5143, 12.3429} - {17, 17} - {16.4571, 12.3429} - {16, 9} - {19, 11} - {16.4571, 13.3714} - -