From cdb66aa5f2f48ee4491b1b6fefa2c89bbed7d607 Mon Sep 17 00:00:00 2001 From: Reed Stoner Date: Fri, 21 Jan 2011 21:41:29 -0500 Subject: [PATCH 1/4] Added Reload button to toolbar options --- English.lproj/MainMenu.xib | 1762 +++++++++++++++++++++++++++++--- GitX.xcodeproj/project.pbxproj | 7 + PBGitCommitView.xib | 1422 ++++++++++++++++++++++++-- 3 files changed, 2952 insertions(+), 239 deletions(-) diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 8dbbc7494..781c81ff0 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -1,27 +1,26 @@ - + 1050 - 9G55 - 677 - 949.43 - 353.00 + 10J567 + 804 + 1038.35 + 462.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 804 + YES - + YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -80,7 +79,7 @@ - RW5hYmxlIFRlcm1pbmFsIFVzYWdl4oCmA + Enable Terminal Usage… 1048576 2147483647 @@ -89,7 +88,7 @@ - UHJlZmVyZW5jZXPigKY + Preferences… , 1048576 2147483647 @@ -98,7 +97,7 @@ - Q2hlY2sgZm9yIFVwZGF0ZXPigKY + Check for Updates… 2147483647 @@ -213,7 +212,7 @@ YES - TmV34oCmA + New… n 1048576 2147483647 @@ -222,7 +221,7 @@ - T3BlbuKApg + Open… o 1048576 2147483647 @@ -288,7 +287,7 @@ - U2F2ZSBBc+KApg + Save As… S 1048576 2147483647 @@ -316,7 +315,7 @@ - UGFnZSBTZXR1cOKApg + Page Setup… P 1048576 2147483647 @@ -325,7 +324,7 @@ - UHJpbnTigKY + Print… p 1048576 2147483647 @@ -452,7 +451,7 @@ YES - RmluZOKApg + Find… f 1048576 2147483647 @@ -517,7 +516,7 @@ YES - U2hvdyBTcGVsbGluZ+KApg + Show Spelling… : 1048576 2147483647 @@ -656,7 +655,7 @@ - Q3VzdG9taXplIFRvb2xiYXLigKY + Customize Toolbar… 1048576 2147483647 @@ -1236,7 +1235,7 @@ -2 - RmlsZSdzIE93bmVyA + File's Owner -1 @@ -1869,10 +1868,8 @@ YES - + YES - -1.IBPluginDependency - -2.IBPluginDependency -3.IBPluginDependency -3.ImportedFromIB2 103.IBPluginDependency @@ -1960,7 +1957,6 @@ 191.ImportedFromIB2 196.IBPluginDependency 196.ImportedFromIB2 - 205.IBPluginDependency 205.ImportedFromIB2 212.IBPluginDependency 212.ImportedFromIB2 @@ -2045,12 +2041,10 @@ 848.IBPluginDependency 851.IBPluginDependency 852.IBPluginDependency - 908.IBPluginDependency 909.IBPluginDependency 912.IBPluginDependency 915.IBPluginDependency 916.IBPluginDependency - 918.IBPluginDependency 919.IBPluginDependency 927.IBPluginDependency 928.IBPluginDependency @@ -2059,177 +2053,172 @@ YES com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - + {{789, 713}, {138, 23}} 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 - + 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 - + com.apple.InterfaceBuilder.CocoaPlugin - - {{370, 623}, {243, 243}} + + {{443, 492}, {240, 243}} com.apple.InterfaceBuilder.CocoaPlugin - + {{455, 493}, {243, 243}} 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 - + 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 - + {{718, 767}, {197, 73}} com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - - {{521, 736}, {329, 20}} + + {{718, 670}, {329, 20}} com.apple.InterfaceBuilder.CocoaPlugin - + {{297, 739}, {329, 20}} com.apple.InterfaceBuilder.CocoaPlugin - - {{668, 647}, {234, 193}} + + {{865, 477}, {231, 193}} com.apple.InterfaceBuilder.CocoaPlugin - + {{499, 623}, {234, 113}} com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + {{533, 513}, {262, 223}} com.apple.InterfaceBuilder.CocoaPlugin - + {{309, 536}, {262, 203}} 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 - - {{582, 533}, {199, 203}} + + {{388, 469}, {196, 203}} com.apple.InterfaceBuilder.CocoaPlugin - + {{358, 536}, {199, 203}} 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 @@ -2246,9 +2235,7 @@ YES - - YES - + YES @@ -2256,9 +2243,7 @@ YES - - YES - + YES @@ -2274,12 +2259,12 @@ NSObject YES - + YES installCliTool: openPreferencesWindow: - showAboutPanel: saveAction: + showAboutPanel: showHelp: @@ -2291,9 +2276,43 @@ id + + YES + + YES + installCliTool: + openPreferencesWindow: + saveAction: + showAboutPanel: + showHelp: + + + YES + + installCliTool: + id + + + openPreferencesWindow: + id + + + saveAction: + id + + + showAboutPanel: + id + + + showHelp: + id + + + YES - + YES firstResponder window @@ -2304,6 +2323,25 @@ NSWindow + + YES + + YES + firstResponder + window + + + YES + + firstResponder + id + + + window + NSWindow + + + IBProjectSource ApplicationController.h @@ -2322,7 +2360,7 @@ NSObject YES - + YES setDetailedView: setRawView: @@ -2335,30 +2373,88 @@ id + + YES + + YES + setDetailedView: + setRawView: + setTreeView: + + + YES + + setDetailedView: + id + + + setRawView: + id + + + setTreeView: + id + + + IBUserSource + + PBCollapsibleSplitView + PBNiceSplitView + + IBProjectSource + PBCollapsibleSplitView.h + + PBGitCommitController PBViewController YES - + YES commit: refresh: + signOff: YES id id + id + + + + YES + + YES + commit: + refresh: + signOff: + + + YES + + commit: + id + + + refresh: + id + + + signOff: + id + YES - + YES cachedFilesController commitMessageView @@ -2370,9 +2466,43 @@ YES NSArrayController NSTextView - id + PBGitIndexController NSArrayController - id + PBWebChangesController + + + + YES + + YES + cachedFilesController + commitMessageView + indexController + unstagedFilesController + webController + + + YES + + cachedFilesController + NSArrayController + + + commitMessageView + NSTextView + + + indexController + PBGitIndexController + + + unstagedFilesController + NSArrayController + + + webController + PBWebChangesController + @@ -2385,13 +2515,16 @@ PBViewController YES - + YES + openFilesAction: openSelectedFile: refresh: setDetailedView: setRawView: setTreeView: + showCommitsFromTree: + showInFinderAction: toggleQuickView: @@ -2402,15 +2535,73 @@ id id id + id + id + id + + + + YES + + YES + openFilesAction: + openSelectedFile: + refresh: + setDetailedView: + setRawView: + setTreeView: + showCommitsFromTree: + showInFinderAction: + toggleQuickView: + + + YES + + openFilesAction: + id + + + openSelectedFile: + id + + + refresh: + id + + + setDetailedView: + id + + + setRawView: + id + + + setTreeView: + id + + + showCommitsFromTree: + id + + + showInFinderAction: + id + + + toggleQuickView: + id + YES - + YES commitController commitList fileBrowser + historySplitView searchField treeController webView @@ -2420,22 +2611,160 @@ NSArrayController NSTableView NSOutlineView + PBCollapsibleSplitView NSSearchField NSTreeController id + + YES + + YES + commitController + commitList + fileBrowser + historySplitView + searchField + treeController + webView + + + YES + + commitController + NSArrayController + + + commitList + NSTableView + + + fileBrowser + NSOutlineView + + + historySplitView + PBCollapsibleSplitView + + + searchField + NSSearchField + + + treeController + NSTreeController + + + webView + id + + + IBProjectSource PBGitHistoryController.h + + PBGitIndexController + NSObject + + YES + + YES + rowClicked: + tableClicked: + + + YES + NSCell + NSTableView + + + + YES + + YES + rowClicked: + tableClicked: + + + YES + + rowClicked: + NSCell + + + tableClicked: + NSTableView + + + + + YES + + YES + commitController + stagedFilesController + stagedTable + unstagedFilesController + unstagedTable + + + YES + PBGitCommitController + NSArrayController + NSTableView + NSArrayController + NSTableView + + + + YES + + YES + commitController + stagedFilesController + stagedTable + unstagedFilesController + unstagedTable + + + YES + + commitController + PBGitCommitController + + + stagedFilesController + NSArrayController + + + stagedTable + NSTableView + + + unstagedFilesController + NSArrayController + + + unstagedTable + NSTableView + + + + + IBProjectSource + PBGitIndexController.h + + PBGitWindowController NSWindowController YES - + YES showCommitView: showHistoryView: @@ -2446,10 +2775,36 @@ id + + YES + + YES + showCommitView: + showHistoryView: + + + YES + + showCommitView: + id + + + showHistoryView: + id + + + contentView NSView + + contentView + + contentView + NSView + + IBProjectSource PBGitWindowController.h @@ -2460,7 +2815,7 @@ NSWindowController YES - + YES openSelectedFile: refresh: @@ -2479,9 +2834,48 @@ id + + YES + + YES + openSelectedFile: + refresh: + setDetailedView: + setRawView: + setTreeView: + toggleQuickView: + + + YES + + openSelectedFile: + id + + + refresh: + id + + + setDetailedView: + id + + + setRawView: + id + + + setTreeView: + id + + + toggleQuickView: + id + + + YES - + YES commitController commitList @@ -2496,11 +2890,48 @@ NSTreeController + + YES + + YES + commitController + commitList + fileBrowser + treeController + + + YES + + commitController + NSArrayController + + + commitList + NSTableView + + + fileBrowser + NSOutlineView + + + treeController + NSTreeController + + + IBUserSource + + PBNiceSplitView + NSSplitView + + IBProjectSource + PBNiceSplitView.h + + PBRepositoryDocumentController NSDocumentController @@ -2524,19 +2955,918 @@ viewToolbar NSToolbar + + viewToolbar + + viewToolbar + NSToolbar + + IBProjectSource PBViewController.h - - - YES + + PBWebChangesController + PBWebController + + YES + + YES + cachedFilesController + controller + indexController + unstagedFilesController + + + YES + NSArrayController + PBGitCommitController + PBGitIndexController + NSArrayController + + + + YES + + YES + cachedFilesController + controller + indexController + unstagedFilesController + + + YES + + cachedFilesController + NSArrayController + + + controller + PBGitCommitController + + + indexController + PBGitIndexController + + + unstagedFilesController + NSArrayController + + + + + IBProjectSource + PBWebChangesController.h + + + + PBWebController + NSObject + + YES + + YES + repository + view + + + YES + id + WebView + + + + YES + + YES + repository + view + + + YES + + repository + id + + + view + WebView + + + + + IBProjectSource + PBWebController.h + + + + + YES + + NSObject + + IBDocumentRelativeSource + ../Sparkle.framework/Versions/A/Headers/SUUpdater.h + + + + SUUpdater + NSObject + + checkForUpdates: + id + + + checkForUpdates: + + checkForUpdates: + id + + + + delegate + id + + + delegate + + delegate + id + + + + + + + YES + + 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 + + + + NSArrayController + NSObjectController + + IBFrameworkSource + AppKit.framework/Headers/NSArrayController.h + + + + NSBrowser + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSBrowser.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 + + + + NSDocument + NSObject + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + id + id + id + id + id + id + + + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + + printDocument: + id + + + revertDocumentToSaved: + id + + + runPageLayout: + id + + + saveDocument: + id + + + saveDocumentAs: + id + + + saveDocumentTo: + id + + + + + IBFrameworkSource + AppKit.framework/Headers/NSDocument.h + + + + NSDocument + + IBFrameworkSource + AppKit.framework/Headers/NSDocumentScripting.h + + + + NSDocumentController + NSObject + + YES + + YES + clearRecentDocuments: + newDocument: + openDocument: + saveAllDocuments: + + + YES + id + id + id + id + + + + YES + + YES + clearRecentDocuments: + newDocument: + openDocument: + saveAllDocuments: + + + YES + + clearRecentDocuments: + id + + + newDocument: + id + + + openDocument: + id + + + saveAllDocuments: + id + + + + + IBFrameworkSource + AppKit.framework/Headers/NSDocumentController.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSManagedObjectContext + NSObject + + IBFrameworkSource + CoreData.framework/Headers/NSManagedObjectContext.h + + + + NSMatrix + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSMatrix.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSMenuItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSMovieView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMovieView.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 - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUUpdater.h + + 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 + + + + NSObjectController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSObjectController.h + + + + NSOutlineView + NSTableView + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSSearchField + NSTextField + + IBFrameworkSource + AppKit.framework/Headers/NSSearchField.h + + + + NSSplitView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSSplitView.h + + + + NSTableView + NSControl + + + + NSText + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSText.h + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextView + NSText + + IBFrameworkSource + AppKit.framework/Headers/NSTextView.h + + + + NSToolbar + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbar.h + + + + NSTreeController + NSObjectController + + IBFrameworkSource + AppKit.framework/Headers/NSTreeController.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 + + + + NSViewController + NSResponder + + view + NSView + + + view + + view + NSView + + + + IBFrameworkSource + AppKit.framework/Headers/NSViewController.h + + + + 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 + + + showWindow: + + showWindow: + id + + + + IBFrameworkSource + AppKit.framework/Headers/NSWindowController.h @@ -2546,16 +3876,160 @@ checkForUpdates: id + + checkForUpdates: + + checkForUpdates: + id + + delegate id - + + delegate + + delegate + id + + + + + + WebView + NSView + + YES + + YES + goBack: + goForward: + makeTextLarger: + makeTextSmaller: + makeTextStandardSize: + reload: + reloadFromOrigin: + stopLoading: + takeStringURLFrom: + toggleContinuousSpellChecking: + toggleSmartInsertDelete: + + + YES + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + goBack: + goForward: + makeTextLarger: + makeTextSmaller: + makeTextStandardSize: + reload: + reloadFromOrigin: + stopLoading: + takeStringURLFrom: + toggleContinuousSpellChecking: + toggleSmartInsertDelete: + + + YES + + goBack: + id + + + goForward: + id + + + makeTextLarger: + id + + + makeTextSmaller: + id + + + makeTextStandardSize: + id + + + reload: + id + + + reloadFromOrigin: + id + + + stopLoading: + id + + + takeStringURLFrom: + id + + + toggleContinuousSpellChecking: + id + + + toggleSmartInsertDelete: + id + + + + + IBFrameworkSource + WebKit.framework/Headers/WebView.h + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES ../GitX.xcodeproj 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + + + YES + {9, 8} + {7, 2} + + diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index 8f8f62ce3..55e9b60f9 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -779,7 +779,14 @@ isa = PBXProject; buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "GitX" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 29B97314FDCFA39411CA2CEA /* GitTest */; projectDirPath = ""; projectRoot = ""; diff --git a/PBGitCommitView.xib b/PBGitCommitView.xib index 5b8021f88..451bd73d0 100644 --- a/PBGitCommitView.xib +++ b/PBGitCommitView.xib @@ -1,30 +1,37 @@ - + 1050 - 9L31a - 677 - 949.54 - 353.00 + 10J567 + 804 + 1038.35 + 462.00 + + YES + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.WebKitIBPlugin + + + YES + 804 + 804 + + YES - + YES - com.apple.WebKitIBPlugin - com.apple.InterfaceBuilderKit com.apple.InterfaceBuilder.CocoaPlugin + com.apple.WebKitIBPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -54,7 +61,7 @@ Ready to commit LucidaGrande - 1.300000e+01 + 13 1044 @@ -64,7 +71,7 @@ controlColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -88,7 +95,7 @@ 274 YES - + YES Apple HTML pasteboard type Apple PDF pasteboard type @@ -116,7 +123,7 @@ YES - + YES WebKitDefaultFixedFontSize WebKitDefaultFontSize @@ -124,9 +131,9 @@ YES - - - + + + @@ -172,16 +179,16 @@ YES - 1.860000e+02 - 1.000000e+01 - 3.402823e+38 + 186 + 10 + 3.4028229999999999e+38 - 75628032 - 0 + 75628096 + 2048 LucidaGrande - 1.100000e+01 + 11 3100 @@ -219,8 +226,8 @@ - 3.000000e+00 - 2.000000e+00 + 3 + 2 6 @@ -231,12 +238,15 @@ MC41AA - 1.500000e+01 + 15 -566231040 + + 4 15 0 YES + 0 {{1, 1}, {189, 194}} @@ -253,7 +263,7 @@ _doScroller: - 9.933775e-01 + 0.99337750000000002 @@ -263,7 +273,7 @@ 1 _doScroller: - 9.947090e-01 + 0.99470899999999995 {{-1, -1}, {191, 196}} @@ -350,7 +360,7 @@ 2322 YES - + YES Apple HTML pasteboard type Apple PDF pasteboard type @@ -358,7 +368,6 @@ Apple PNG pasteboard type Apple URL pasteboard type CorePasteboardFlavorType 0x6D6F6F76 - CorePasteboardFlavorType 0x75726C20 NSColor pasteboard type NSFilenamesPboardType NSStringPboardType @@ -369,6 +378,7 @@ NeXT font pasteboard type NeXT ruler pasteboard type WebURLsWithTitlesPboardType + public.url {427, 14} @@ -389,16 +399,17 @@ - 4.270000e+02 + 427 1 11235 + 0 + - YES - + YES NSBackgroundColor NSColor @@ -419,10 +430,10 @@ - + YES - + YES NSColor NSUnderline @@ -433,7 +444,7 @@ 1 MCAwIDEAA - + @@ -462,21 +473,21 @@ _doScroller: - 9.916667e-01 + 0.99166670000000001 - 256 + -2147483392 {{-100, -100}, {87, 18}} 1 _doScroller: - 1.000000e+00 - 9.456522e-01 + 1 + 0.94565220000000005 - {{0, 36}, {429, 159}} + {{0, 33}, {429, 159}} 530 @@ -591,12 +602,12 @@ YES - 2.110000e+02 - 1.000000e+01 - 3.402823e+38 + 211 + 10 + 3.4028229999999999e+38 - 75628032 - 0 + 75628096 + 2048 @@ -617,16 +628,19 @@ - 3.000000e+00 - 2.000000e+00 + 3 + 2 - 1.500000e+01 + 15 -566231040 + + 4 15 0 YES + 0 {{1, 1}, {214, 194}} @@ -643,7 +657,7 @@ _doScroller: - 9.951923e-01 + 0.99519230000000003 @@ -653,7 +667,7 @@ 1 _doScroller: - 9.003322e-01 + 0.90033220000000003 {{0, -1}, {216, 196}} @@ -707,8 +721,8 @@ {{6, 7}, {16, 16}} 28938 - 1.600000e+01 - 1.000000e+02 + 16 + 100 {852, 432} @@ -761,9 +775,10 @@ 1 YES - + YES 1E431E79-1591-49E7-9E17-49497CA4622A + AC28E6C2-1911-4F5A-9E4A-BC2F3B95D69C NSToolbarSeparatorItem @@ -790,28 +805,27 @@ YES - 4.000000e+01 + 40 NSImage HistoryViewTemplate History View + YES 0 - 4.000000e+01 + 40 NSImage CommitViewTemplate Commit View - YES 0 - 1 2 @@ -826,6 +840,44 @@ YES 0 + + + AC28E6C2-1911-4F5A-9E4A-BC2F3B95D69C + + Refresh Button + Refresh Button + + + + 268 + {{11, 14}, {64, 25}} + + YES + + -2080244224 + 134217728 + Refresh + + + -2038152961 + 163 + + + 400 + 75 + + + + + + {44, 25} + {143, 25} + YES + YES + 0 + YES + 0 + NSToolbarSeparatorItem @@ -861,10 +913,11 @@ - + YES + YES @@ -1202,6 +1255,14 @@ 283 + + + refresh: + + + + 290 + @@ -1218,7 +1279,7 @@ -2 - RmlsZSdzIE93bmVyA + File's Owner -1 @@ -1321,10 +1382,10 @@ YES - + @@ -1477,6 +1538,7 @@ YES + Commit Toolbar @@ -1542,23 +1604,49 @@ + + 289 + + + YES + + + + + + 287 + + + YES + + + + + + 288 + + + YES - + YES - -1.IBPluginDependency - -2.IBPluginDependency -3.IBPluginDependency 1.IBEditorWindowLastContentRect 1.IBPluginDependency 1.IBViewEditorWindowController.showingBoundsRectangles 1.IBViewEditorWindowController.showingLayoutRectangles + 104.IBPluginDependency 105.CustomClassName + 105.IBPluginDependency + 113.IBPluginDependency 114.CustomClassName + 114.IBPluginDependency 125.IBPluginDependency 130.IBPluginDependency + 130.IBViewBoundsToFrameTransform 131.IBPluginDependency 132.IBPluginDependency 133.CustomClassName @@ -1566,19 +1654,25 @@ 163.IBPluginDependency 164.IBPluginDependency 186.CustomClassName + 186.IBPluginDependency 2.IBPluginDependency + 206.IBPluginDependency + 207.IBPluginDependency + 208.IBPluginDependency + 209.IBPluginDependency 217.IBPluginDependency 225.IBEditorWindowLastContentRect 225.IBPluginDependency 225.editorWindowContentRectSynchronizationRect - 227.IBPluginDependency + 226.IBPluginDependency 239.IBPluginDependency 240.IBPluginDependency 247.IBPluginDependency 248.IBPluginDependency - 254.IBPluginDependency 278.IBPluginDependency 279.IBPluginDependency + 287.IBPluginDependency + 288.IBPluginDependency 42.IBPluginDependency 45.IBPluginDependency 46.IBPluginDependency @@ -1590,23 +1684,28 @@ 56.IBPluginDependency 57.CustomClassName 57.IBPluginDependency + 77.IBPluginDependency 81.IBPluginDependency 86.IBPluginDependency - 96.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilderKit - com.apple.InterfaceBuilderKit - {{428, 510}, {852, 432}} + {{428, 424}, {852, 432}} + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin - - PBIconAndTextCell + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin PBIconAndTextCell + com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAAAAAAAAw0EAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin PBCommitMessageView @@ -1616,7 +1715,12 @@ PBNiceSplitView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{295, 587}, {616, 169}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{286, 687}, {616, 169}} com.apple.InterfaceBuilder.CocoaPlugin {{132, 614}, {616, 0}} com.apple.InterfaceBuilder.CocoaPlugin @@ -1631,6 +1735,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin PBFileChangesTableView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1645,9 +1750,7 @@ YES - - YES - + YES @@ -1655,19 +1758,25 @@ YES - - YES - + YES - 283 + 290 YES + + PBCollapsibleSplitView + PBNiceSplitView + + IBProjectSource + PBCollapsibleSplitView.h + + PBCommitMessageView NSTextView @@ -1689,7 +1798,7 @@ PBViewController YES - + YES commit: refresh: @@ -1702,9 +1811,33 @@ id + + YES + + YES + commit: + refresh: + signOff: + + + YES + + commit: + id + + + refresh: + id + + + signOff: + id + + + YES - + YES cachedFilesController commitMessageView @@ -1721,17 +1854,207 @@ PBWebChangesController + + YES + + YES + cachedFilesController + commitMessageView + indexController + unstagedFilesController + webController + + + YES + + cachedFilesController + NSArrayController + + + commitMessageView + NSTextView + + + indexController + PBGitIndexController + + + unstagedFilesController + NSArrayController + + + webController + PBWebChangesController + + + IBProjectSource PBGitCommitController.h + + PBGitHistoryController + PBViewController + + YES + + YES + openFilesAction: + openSelectedFile: + refresh: + setDetailedView: + setRawView: + setTreeView: + showCommitsFromTree: + showInFinderAction: + toggleQuickView: + + + YES + id + id + id + id + id + id + id + id + id + + + + YES + + YES + openFilesAction: + openSelectedFile: + refresh: + setDetailedView: + setRawView: + setTreeView: + showCommitsFromTree: + showInFinderAction: + toggleQuickView: + + + YES + + openFilesAction: + id + + + openSelectedFile: + id + + + refresh: + id + + + setDetailedView: + id + + + setRawView: + id + + + setTreeView: + id + + + showCommitsFromTree: + id + + + showInFinderAction: + id + + + toggleQuickView: + id + + + + + YES + + YES + commitController + commitList + fileBrowser + historySplitView + searchField + treeController + webView + + + YES + NSArrayController + NSTableView + NSOutlineView + PBCollapsibleSplitView + NSSearchField + NSTreeController + id + + + + YES + + YES + commitController + commitList + fileBrowser + historySplitView + searchField + treeController + webView + + + YES + + commitController + NSArrayController + + + commitList + NSTableView + + + fileBrowser + NSOutlineView + + + historySplitView + PBCollapsibleSplitView + + + searchField + NSSearchField + + + treeController + NSTreeController + + + webView + id + + + + + IBProjectSource + PBGitHistoryController.h + + PBGitIndexController NSObject YES - + YES rowClicked: tableClicked: @@ -1742,9 +2065,28 @@ NSTableView + + YES + + YES + rowClicked: + tableClicked: + + + YES + + rowClicked: + NSCell + + + tableClicked: + NSTableView + + + YES - + YES commitController stagedFilesController @@ -1761,6 +2103,40 @@ NSTableView + + YES + + YES + commitController + stagedFilesController + stagedTable + unstagedFilesController + unstagedTable + + + YES + + commitController + PBGitCommitController + + + stagedFilesController + NSArrayController + + + stagedTable + NSTableView + + + unstagedFilesController + NSArrayController + + + unstagedTable + NSTableView + + + IBProjectSource PBGitIndexController.h @@ -1789,6 +2165,13 @@ viewToolbar NSToolbar + + viewToolbar + + viewToolbar + NSToolbar + + IBProjectSource PBViewController.h @@ -1799,7 +2182,7 @@ PBWebController YES - + YES cachedFilesController controller @@ -1814,6 +2197,35 @@ NSArrayController + + YES + + YES + cachedFilesController + controller + indexController + unstagedFilesController + + + YES + + cachedFilesController + NSArrayController + + + controller + PBGitCommitController + + + indexController + PBGitIndexController + + + unstagedFilesController + NSArrayController + + + IBProjectSource PBWebChangesController.h @@ -1824,7 +2236,7 @@ NSObject YES - + YES repository view @@ -1835,15 +2247,835 @@ WebView + + YES + + YES + repository + view + + + YES + + repository + id + + + view + WebView + + + IBProjectSource PBWebController.h - - 0 - GitX.xcodeproj - 3 + + 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 + + + + NSArrayController + NSObjectController + + IBFrameworkSource + AppKit.framework/Headers/NSArrayController.h + + + + NSBox + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSBox.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 + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSManagedObjectContext + NSObject + + IBFrameworkSource + CoreData.framework/Headers/NSManagedObjectContext.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.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 + + + + NSObjectController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSObjectController.h + + + + NSOutlineView + NSTableView + + + + NSProgressIndicator + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSProgressIndicator.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSScrollView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSScrollView.h + + + + NSScroller + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSScroller.h + + + + NSSearchField + NSTextField + + IBFrameworkSource + AppKit.framework/Headers/NSSearchField.h + + + + NSSegmentedCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSSegmentedCell.h + + + + NSSegmentedControl + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSSegmentedControl.h + + + + NSSplitView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSSplitView.h + + + + NSTableColumn + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableColumn.h + + + + NSTableView + NSControl + + + + NSText + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSText.h + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSTextView + NSText + + IBFrameworkSource + AppKit.framework/Headers/NSTextView.h + + + + NSToolbar + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbar.h + + + + NSToolbarItem + NSObject + + + + NSTreeController + NSObjectController + + IBFrameworkSource + AppKit.framework/Headers/NSTreeController.h + + + + NSUserDefaultsController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSUserDefaultsController.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSViewController + NSResponder + + view + NSView + + + view + + view + NSView + + + + IBFrameworkSource + AppKit.framework/Headers/NSViewController.h + + + + WebView + NSView + + YES + + YES + goBack: + goForward: + makeTextLarger: + makeTextSmaller: + makeTextStandardSize: + reload: + reloadFromOrigin: + stopLoading: + takeStringURLFrom: + toggleContinuousSpellChecking: + toggleSmartInsertDelete: + + + YES + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + goBack: + goForward: + makeTextLarger: + makeTextSmaller: + makeTextStandardSize: + reload: + reloadFromOrigin: + stopLoading: + takeStringURLFrom: + toggleContinuousSpellChecking: + toggleSmartInsertDelete: + + + YES + + goBack: + id + + + goForward: + id + + + makeTextLarger: + id + + + makeTextSmaller: + id + + + makeTextStandardSize: + id + + + reload: + id + + + reloadFromOrigin: + id + + + stopLoading: + id + + + takeStringURLFrom: + id + + + toggleContinuousSpellChecking: + id + + + toggleSmartInsertDelete: + id + + + + + IBFrameworkSource + WebKit.framework/Headers/WebView.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + GitX.xcodeproj + 3 + + YES + + YES + CommitViewTemplate + HistoryViewTemplate + NSMenuCheckmark + NSMenuMixedState + NSSwitch + + + YES + {23, 15} + {25, 15} + {9, 8} + {7, 2} + {15, 15} + + From c8f4f0e2ca13de547e476422f41e0cd2b9b03062 Mon Sep 17 00:00:00 2001 From: Reed Stoner Date: Fri, 21 Jan 2011 22:33:58 -0500 Subject: [PATCH 2/4] Added reload.png --- Images/reload.png | Bin 0 -> 4885 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Images/reload.png diff --git a/Images/reload.png b/Images/reload.png new file mode 100644 index 0000000000000000000000000000000000000000..d81c73b7c229c9fa8f6c54fc725d02cd934ff40d GIT binary patch literal 4885 zcmV+w6YA`VP)4Tx0C)kdSa(!YOShjiY9OI^2}&0*6cGfZ_ueC*5;{l;p-Gh@O+*n9k=_wS z5S1c|C@3NV7ElnZ^k#v8(s?Ivy?1@@TX(&G-mH}~zuEKKd(WAD&g`=T01J*tBKg7r z0Dk_#WGj6w9O0+~j`lr30W`n>F`z(n4I*h;SeQVRe`&wo0T^|vUz%#`Ur7HZW+p=p z0f0$C1a{9|tU<*tyV!<`!-7e{5XXy(UA>5I5RQVd6xqf~8^YHh%~o2l4k7k5!{ zsH-PccL)F)R)05de*kFbA$-KmJ;)WBruubr3v%^?a0UQyEkC~i$Ub%el8d{N$dE2} z1H!`8eSvzYxkCPwnISuY|H%CD0MtWsdp`do6W#)V6AeJk+ka#ftDU`qalQ=lkeAyr z2SaNCfcmt(O%a7`W&*HzaeI5cbbEWV3;@Ij03P|ehLA&dxX_KjdZ88kALHG7{!0S^ z1&117EKmlapc5tl3xM^(RpBiNL&Q9?4CO0(Y*=U#2qe2e6S8{H;b4;x*U+f2lv7#Z#SvwZ6;Vae*)i#- zV`9DI?BmrFM9wgtSx6j8dYD|Al9C#7_FP*1x!37)7Z4d-7ezAhmkwuXT-MCizM`F@ zc~vu4GfyL5t3a>Nw1`mbS`tv|TSh3?u8^tZt)i>?b#1cx-Sw^;_iAcyme*dXJAW&o zKH_%Z9q+rx8*Cd*n$(-c?$OxJ0pSQm>e)SvOH#$6aVO(c?W#ZbT?d0}U`LzD@)J*g&>ul+q%v|%l z#(dW|pYJ^1`+mg#JoIyZp=6Oj!BTpcE-c&r!u_KBe!g;T^}<@zdfYf2|izmGwXQ5=nDGGO+{^^(pE>ShH8xlCl^!?k?VKS@uSUFnx^9Okp%ao*) zn^d$^yN+0^4{ADVjp?}Qj_RK<7%?Ikcbh7iUALgKw6Myw9l~53OiXI zJ9RwwM1yk=@vF;s*Cn?V_cf0-&n2%}?dX|#*{oHK&}!8n|ElQq**C%c#|CuY%DiKHw>&sF z)bhS?IBA6R!Re#kC;Vr=FNiNQU;9U!$MVOcCY&Y@PjO8xPCuK;pC!#{&9l#seXIW- z_rvC=_|MIScZ)TYxFx$~iRF!7eZTWoJXd8`m)9ECgE#OSvzrB5W?Spq(L3>{1zZ3R zEI|aQ2A`o*zysC*N5doGi--s$6S5IH2PA2J)ArLf(^oQ_WAsIvGaY0W!k{r5*dHuY ztfOob>@ytSIoG*SJRH0dd}{nQ0^WOK1+#H=LcM#JgoQ-RMI*&(#6L(f@7I(Hmadc; z!qdyD%aP=Z6o zc-JMy)xeF_ZN$COBgj+VOTcTvyTd2zq>Hb#?}}f$e_DVAiIempu$b%-BpLK0_-;r< zsCF1SZ17ZRI4MFo5*hh2DmU6YM)5T2^gwJ`964S)fh}S5OnqW(l4&w;@?^@b)QGd% zX-sLu=jzgv&pTW=kb%k=xp*rx?vj0$)MfbPq3rrAsW~oJRdP9Vm+}Vk?-XPeh8Niv z%a+iWjF+~Tm6fMf1XL2LbgwB?i(KcqfvG{&tly;6&eo0J8maHQ{rFDf-I|7y#=NF0 z&Dr-dTe9!xJjiP;dw8R*;nDrao$Y-c@1Kl5o$CDYjMDY{`Fi(84^6LT-=&uWuUX#c z^@k5sy?r}~88UyLGrai0^W)6tysxCOpox3aHgoPjaFo$CD3<`RoBOCafkqL4D}4YE zgaNQd0g!$h08t769L@k(Facnr4B$k40OuD6Fnb2@Cx75U5R~F(VK|sAEERSi_6@!V zZUK*nH^8S6dDJhDkbFqS!EOHw!-tiKUa3k2R3>Ion>gD7GPX1@=t#1r7_2Tb!(%p`0JNbhxf_b8(;J zq2o#6rR7cGL-SqY=jE>ukQeCKW4mWwFbOA&dnQEM%fGj0-x*;o5roKd(M&NnaTN)A ziD!~Y`*o!-QX|q;GSLTY@rttia!5If{G7t*!7;_jL-R@$P;HC znz33w+DCQFbq(~i_4N!)4Q-8x#w3#%(+g&$=JgismanWnTF=?6*$LV^60(lIc4Trg zJeG94!x<1YT%uiD+%`N^Jx_bJ`_P;;_RaSD93V-G4_pZH2%ZQ%9`+{OAfhAcNc7#) zak z%;-Gdch#SEi-aZPUotDSt3&H$o1Q!8ha7ZrJOo=XRah9T9ySLTfuDfqzy}Z*=sO|- z@er|wR6>Rz?;t5Cc~mf}5w${dm?ny*jTT93K${MoE4*|>x@x)w`or`I^e-9s7(5vo z8EF`887ml<(Awxs^eB@&QzFwKvm|p2^BasfCI<5sD~(OYeq~W%$zfS$wPLMjV`U3w z8)R2yFX5o$2;dmx)aJa!h2u)+hH*!5Z}7zOqIlEzIQWYBrTAL~ECj~)L<({W-o@GB zHifG9+V5l7_e3~BL|2qSv|p@3{FH>YB&}r6{>xJC(uZWwGBXFBqphMOT(TmbgHMn9}Vbo~+%w*7X)@;p! z!IH;H*cxx6YHMm2XkSd|bAUO@IuVa$9q&A`N|bRSx?Xa7;Q{kh_6qX8=`-mo>gVBK z9xxZEM$Qjf32_WzlTW#||B0PeJEMS8I29PeI@1S2=GA25R3u9(p}I{9*jl^cTt)VuEK%ZpLyh?%Um; z0D1=6ek-g#-SFLse+c*rQ-P(!hTuYQFZfL;ZyZ7-BHkj!km1NalrSn1)lVZubB5+K ztqN^6?J}J;-EDd{`e6DY1~rCqMkdBk#!qNnbPW?b(`lv|W?SZV3?5U2#bD#H%Pc-D zUs>&0U$Ggpb+PNSKjSdu=;5@2-ega%CGJ!nVV-tgXFfPzCBHHMZ-LT1=7Mm+CLBo! zFGShfyf0bUK|~gc>5SNG@p}>_lBxTHq`ah$$s9f4i1&~UkxP*;S9pAI`Vfnfin90N zt17*!+eakSEj8jbo3to8hje4~UKj`&h8Yc*$eCU?TeUc0*={XrlVVfkRCOVvVk)D3h^ zWvyo2NPXxXw!7CF)tdV5d9*A%IP;LBt?;o_d*c(Mr*EHmb^Y#6?Gf#5ed+XS^G)G^ z{#(kR(@@3x*%AE@WuMTW!@f+6I*z@XP@XK9+L*DP&6|7k4SbjQaqy?=g8ZTo1xXoR zDqeQ|#rEsTZ@1rTD;cYts~KyIYe{Q!>&ELf8%!G~H|jPPHx)O-H(R%0TSi+YTdUg^ z+t;Y^->sLZ`2#R$2lxh%aVFY2JH!9Ki=S@@RFmyAR_KcMcQG@EdMchK1zXraJty>A z3ktQ?g?cPh4q-jK^$h>QI5(n>F@*UcIX=Qm+YG``{RK1eAnRE{7}A9ie27LC5QgeE zn7_Nftu=%p`>-gI?@o?=dUXclH;Ip z05t0k4zQg;&vfCMZ|1T|R;IU&bbVuhTn1povPI$+YAzS}x-4(JN0(>D}2q5Ec z;Aij~e{-l_eRn+n(K7xo$*#5C74CAqfg8m7Bd6NmkyE|<-S!C02?#%I=YX{LvkW{fizM9${3nRb)*V3r`$K+H2?QncK65S@B1|Vvu0@J{(npV%Pa7P z{>Rv<-=UobG|=;re~yYeo(NF8|7gMPr=Z#%0PO%$IN96ND;TE<{d?gqg){Vbm65{9 z;ql7ge*g`@Zlzd%y@vn*1BOXNK~z`??Up@gQ&AMhlQgv^X@f~xwb7>O2gJcIs+$f) z6c;~ma1s?k+ytFO94bO_Qx`=Xtl(16QjreT!3xDe9PD7#*pKuh*47lMEltw&%ioFb z#n;DsZ60+{=z*Ji&bjBD|Nq>3a}%3wP5$Q{2#3S#D=RC@SJOkmYLWwifPZ0O;g!$l z^A;8sb|sU^jMaJ$s|nip$;rv2-EQCDa5!#yJf2Q=NiyqwprC!vG!ta65A;_EtvjDDh+3rdYe1PN#2;j*ce8VJ3MI zsI9H_&dtqTqR0gRwy4FVb2H&sY^=u_rw0ZGUYo@^%@$NYUGD-yR=0h(5AKjrf#?c z00yLU5!nUgn|xT6nwpx8d>dpZv&DFrhLp>jD`mC=Q)+}l#HZR;X25Tg-=&QAMMXv1 z^!a84mOLI5IH*rt$&N%KCB*D!6fxE@ruoGjW?mwO1ZHPvJJ`0QL@Gycitl@PN#+X1 z%*@Prh=(MfS)$+c_4R$%rx_C9cK4Fhsw7H*G7_6Yp-^5&!Sj8Hoa+jC!IX=1PZYfv z5|E&Rf`SGLB!q<0MLoWDNbJ)WQSD$b=mz{Eb_+RP@hkbwJYX->IPLuVs%t$Oonpr* z)JzeVLPE%7uwU}zwxdT0PxEdB(DyRSACessE24nE&15o1Mn*=)vrgT|vIHa+5=SZc zfMT1qh1ELZ6ChQzHhMe$b96tduIuOA9|`?}YEMi|d?_w2eol9#07V$t9F>e3C$kVy z$i&&98{}Q?>FN2YjnV6WsOwh@Y|eiVL{73)&!}d|ImP9G#br4V4B!9b!`X!?H%|9AozvX9Gd~N00000NkvXX Hu0mjf-W+Nz literal 0 HcmV?d00001 From 75a8dd04c6d232641dad85b248377bdc2c51fc29 Mon Sep 17 00:00:00 2001 From: Reed Stoner Date: Fri, 21 Jan 2011 22:34:46 -0500 Subject: [PATCH 3/4] changed button to reload icon --- GitX.xcodeproj/project.pbxproj | 4 +++ PBGitCommitView.xib | 47 ++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index 55e9b60f9..5c8c77665 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -31,6 +31,7 @@ 47DBDBCA0E95016F00671A1E /* PBNSURLPathUserDefaultsTransfomer.m in Sources */ = {isa = PBXBuildFile; fileRef = 47DBDBC90E95016F00671A1E /* PBNSURLPathUserDefaultsTransfomer.m */; }; 770B37ED0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 770B37EC0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel */; }; 77C8280E06725ACE000B614F /* ApplicationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77C8280C06725ACE000B614F /* ApplicationController.m */; }; + 8439148812EA878400A9EE01 /* reload.png in Resources */ = {isa = PBXBuildFile; fileRef = 8439148712EA878400A9EE01 /* reload.png */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -190,6 +191,7 @@ 77C82804067257F0000B614F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; 77C8280B06725ACE000B614F /* ApplicationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationController.h; sourceTree = ""; }; 77C8280C06725ACE000B614F /* ApplicationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplicationController.m; sourceTree = ""; }; + 8439148712EA878400A9EE01 /* reload.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = reload.png; path = Images/reload.png; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D1107320486CEB800E47090 /* GitX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GitX.app; sourceTree = BUILT_PRODUCTS_DIR; }; 911111E10E58BD5A00BF76B4 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/RepositoryWindow.xib; sourceTree = ""; }; @@ -417,6 +419,7 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( + 8439148712EA878400A9EE01 /* reload.png */, 3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */, 3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */, F56ADDD70ED19F9E002AC78F /* AddBranchTemplate.png */, @@ -826,6 +829,7 @@ 47DBDB6A0E94EF6500671A1E /* Preferences.xib in Resources */, 47DBDBB10E94F6CA00671A1E /* Updates.png in Resources */, F569AE930F2CBD7C00C2FFA7 /* Credits.html in Resources */, + 8439148812EA878400A9EE01 /* reload.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/PBGitCommitView.xib b/PBGitCommitView.xib index 451bd73d0..9401240bc 100644 --- a/PBGitCommitView.xib +++ b/PBGitCommitView.xib @@ -21,8 +21,8 @@ YES - + YES @@ -850,28 +850,32 @@ 268 - {{11, 14}, {64, 25}} + {{26, 14}, {34, 25}} YES -2080244224 134217728 - Refresh + - -2038152961 + -2033958657 163 + + NSImage + reload + 400 75 - + - {44, 25} - {143, 25} + {34, 25} + {34, 25} YES YES 0 @@ -1347,16 +1351,11 @@ YES - + - - 125 - - - 209 @@ -1627,6 +1626,11 @@ + + 125 + + + @@ -1645,6 +1649,7 @@ 114.CustomClassName 114.IBPluginDependency 125.IBPluginDependency + 125.IBViewBoundsToFrameTransform 130.IBPluginDependency 130.IBViewBoundsToFrameTransform 131.IBPluginDependency @@ -1667,6 +1672,7 @@ 226.IBPluginDependency 239.IBPluginDependency 240.IBPluginDependency + 240.IBSegmentedControlInspectorSelectedSegmentMetadataKey 247.IBPluginDependency 248.IBPluginDependency 278.IBPluginDependency @@ -1691,7 +1697,7 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{428, 424}, {852, 432}} + {{319, 424}, {852, 432}} com.apple.InterfaceBuilder.CocoaPlugin @@ -1702,6 +1708,7 @@ PBIconAndTextCell com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin + com.apple.InterfaceBuilder.CocoaPlugin P4AAAL+AAAAAAAAAw0EAAA @@ -1720,12 +1727,13 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{286, 687}, {616, 169}} + {{415, 197}, {616, 169}} com.apple.InterfaceBuilder.CocoaPlugin {{132, 614}, {616, 0}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1801,14 +1809,12 @@ YES commit: - refresh: signOff: YES id id - id @@ -1816,7 +1822,6 @@ YES commit: - refresh: signOff: @@ -1825,10 +1830,6 @@ commit: id - - refresh: - id - signOff: id @@ -3067,6 +3068,7 @@ NSMenuCheckmark NSMenuMixedState NSSwitch + reload YES @@ -3075,6 +3077,7 @@ {9, 8} {7, 2} {15, 15} + {32, 32} From 8a8924d638366621cb6747136f7d86727891945b Mon Sep 17 00:00:00 2001 From: Reed Stoner Date: Fri, 21 Jan 2011 22:37:20 -0500 Subject: [PATCH 4/4] Changed refresh button label --- PBGitCommitView.xib | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/PBGitCommitView.xib b/PBGitCommitView.xib index 9401240bc..b61e3159a 100644 --- a/PBGitCommitView.xib +++ b/PBGitCommitView.xib @@ -21,7 +21,7 @@ YES - + @@ -844,13 +844,13 @@ AC28E6C2-1911-4F5A-9E4A-BC2F3B95D69C - Refresh Button - Refresh Button + Refresh + Refresh 268 - {{26, 14}, {34, 25}} + {{7, 14}, {34, 25}} YES @@ -861,7 +861,7 @@ -2033958657 163 - + NSImage reload @@ -871,7 +871,7 @@ 75 - + {34, 25} @@ -1697,7 +1697,7 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{319, 424}, {852, 432}} + {{325, 316}, {852, 432}} com.apple.InterfaceBuilder.CocoaPlugin @@ -1727,7 +1727,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{415, 197}, {616, 169}} + {{336, 79}, {616, 169}} com.apple.InterfaceBuilder.CocoaPlugin {{132, 614}, {616, 0}} com.apple.InterfaceBuilder.CocoaPlugin @@ -1809,12 +1809,14 @@ YES commit: + refresh: signOff: YES id id + id @@ -1822,6 +1824,7 @@ YES commit: + refresh: signOff: @@ -1830,6 +1833,10 @@ commit: id + + refresh: + id + signOff: id