kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Common file viewer for historic and commit views

Browse Source
This commit is contained in:
German Laullon
2010-06-14 10:29:18 -07:00
parent 6e20f39515
commit 26d9adca8e
15 changed files with 1421 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FileViewer/FileViewer.xib
+816
View File
@@ -0,0 +1,816 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10D573</string>
<string key="IBDocument.InterfaceBuilderVersion">762</string>
<string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">460.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.WebKitIBPlugin</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>762</string>
<string>762</string>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.WebKitIBPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1001">
<string key="NSClassName">FileViewerController</string>
</object>
<object class="NSCustomObject" id="1003">
<string key="NSClassName">FirstResponder</string>
</object>
<object class="NSCustomObject" id="1004">
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="1005">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="WebView" id="35097993">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">274</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple HTML pasteboard type</string>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple URL pasteboard type</string>
<string>Apple Web Archive pasteboard type</string>
<string>NSColor pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NSStringPboardType</string>
<string>NeXT RTFD pasteboard type</string>
<string>NeXT Rich Text Format v1.0 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
<string>WebURLsWithTitlesPboardType</string>
<string>public.png</string>
<string>public.url</string>
<string>public.url-name</string>
</object>
</object>
<string key="NSFrame">{{0, 3}, {800, 474}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
<string key="GroupName"/>
<object class="WebPreferences" key="Preferences">
<string key="Identifier"/>
<object class="NSMutableDictionary" key="Values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>WebKitDefaultFixedFontSize</string>
<string>WebKitDefaultFontSize</string>
<string>WebKitMinimumFontSize</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="12"/>
<integer value="12"/>
<integer value="1"/>
</object>
</object>
</object>
<bool key="UseBackForwardList">YES</bool>
<bool key="AllowsUndo">YES</bool>
</object>
<object class="NSCustomView" id="886742837">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 475}, {800, 25}}</string>
<reference key="NSSuperview" ref="1005"/>
<string key="NSClassName">MGScopeBar</string>
</object>
</object>
<string key="NSFrameSize">{800, 500}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomObject" id="707228103">
<string key="NSClassName">FileViewerController</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">scopeBar</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="886742837"/>
</object>
<int key="connectionID">22</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">webViewFileViwer</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="35097993"/>
</object>
<int key="connectionID">23</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="1005"/>
</object>
<int key="connectionID">24</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">scopeBar</string>
<reference key="source" ref="707228103"/>
<reference key="destination" ref="886742837"/>
</object>
<int key="connectionID">26</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
<reference key="object" ref="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="1001"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="1003"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="1004"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">1</int>
<reference key="object" ref="1005"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="886742837"/>
<reference ref="35097993"/>
</object>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">20</int>
<reference key="object" ref="35097993"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">21</int>
<reference key="object" ref="886742837"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">25</int>
<reference key="object" ref="707228103"/>
<reference key="parent" ref="0"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
<string>1.WindowOrigin</string>
<string>1.editorWindowContentRectSynchronizationRect</string>
<string>20.IBPluginDependency</string>
<string>21.IBPluginDependency</string>
<string>25.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{{185, 62}, {800, 500}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{628, 654}</string>
<string>{{217, 442}, {480, 272}}</string>
<string>com.apple.WebKitIBPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">26</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">FileViewerController</string>
<string key="superclassName">NSViewController</string>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>displayControl</string>
<string>scopeBar</string>
<string>webViewFileViwer</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSSegmentedCell</string>
<string>MGScopeBar</string>
<string>WebView</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">FileViewer/FileViewerController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MGScopeBar</string>
<string key="superclassName">NSView</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">MGScopeBar/MGScopeBar.h</string>
</object>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">NSActionCell</string>
<string key="superclassName">NSCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<string key="superclassName">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="181871344">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="99036257">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="633794103">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSCell</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSFormatter</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSMenu</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="123660962">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<reference key="sourceIdentifier" ref="181871344"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<reference key="sourceIdentifier" ref="99036257"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<reference key="sourceIdentifier" ref="633794103"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<reference key="sourceIdentifier" ref="123660962"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="400165691">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSError.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Sparkle.framework/Headers/SUUpdater.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebDownload.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebEditingDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebFrameLoadDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebJavaPlugIn.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebPlugin.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebPluginContainer.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebPolicyDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebResourceLoadDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebScriptObject.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebUIDelegate.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSResponder</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSSegmentedCell</string>
<string key="superclassName">NSActionCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSSegmentedCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
<string key="superclassName">NSResponder</string>
<reference key="sourceIdentifier" ref="400165691"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSViewController</string>
<string key="superclassName">NSResponder</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">view</string>
<string key="NS.object.0">NSView</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">WebView</string>
<string key="superclassName">NSView</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>goBack:</string>
<string>goForward:</string>
<string>makeTextLarger:</string>
<string>makeTextSmaller:</string>
<string>makeTextStandardSize:</string>
<string>reload:</string>
<string>reloadFromOrigin:</string>
<string>stopLoading:</string>
<string>takeStringURLFrom:</string>
<string>toggleContinuousSpellChecking:</string>
<string>toggleSmartInsertDelete:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">WebKit.framework/Headers/WebView.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../GitX.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>
</archive>
FileViewer/FileViewerController.h
+37
View File
@@ -0,0 +1,37 @@
//
// FileViewerController.h
// GitX
//
// Created by German Laullon on 11/06/10.
// Copyright 2010 __MyCompanyName__. All rights reserved.
//
#import <Cocoa/Cocoa.h>
#import <WebKit/WebKit.h>
#import "MGScopeBar.h"
#import "PBGitRepository.h"
@interface FileViewerController : NSViewController <MGScopeBarDelegate> {
IBOutlet NSSegmentedCell *displayControl;
IBOutlet MGScopeBar *scopeBar;
IBOutlet WebView *webViewFileViwer;
NSMutableArray *groups;
NSString *file;
NSString *sha;
PBGitRepository *repository;
bool commit;
}
- (id)initWithRepository:(PBGitRepository *)theRepository;
- (void)showFile:(NSString *)file sha:(NSString *)sha;
- (NSString*)refSpec;
-(NSString *)parseBlame:(NSString *)string;
@property(retain) NSMutableArray *groups;
@property(readwrite) bool commit;
@end
FileViewer/FileViewerController.m
+257
View File
@@ -0,0 +1,257 @@
//
// FileViewerController.m
// GitX
//
// Created by German Laullon on 11/06/10.
// Copyright 2010 __MyCompanyName__. All rights reserved.
//
#import "FileViewerController.h"
#define GROUP_LABEL @"Label" // string
#define GROUP_SEPARATOR @"HasSeparator" // BOOL as NSNumber
#define GROUP_SELECTION_MODE @"SelectionMode" // MGScopeBarGroupSelectionMode (int) as NSNumber
#define GROUP_ITEMS @"Items" // array of dictionaries, each containing the following keys:
#define ITEM_IDENTIFIER @"Identifier" // string
#define ITEM_NAME @"Name" // string
@implementation FileViewerController
#pragma mark Setup and teardown
- (id)initWithRepository:(PBGitRepository *)theRepository
{
repository=theRepository;
return [self initWithNibName:@"FileViewer" bundle:[NSBundle mainBundle]];
}
- (void)awakeFromNib
{
self.groups = [NSMutableArray arrayWithCapacity:0];
scopeBar.delegate = self;
NSArray *items = [NSArray arrayWithObjects:
[NSDictionary dictionaryWithObjectsAndKeys:
@"source", ITEM_IDENTIFIER,
@"Source", ITEM_NAME,
nil],
[NSDictionary dictionaryWithObjectsAndKeys:
@"blame", ITEM_IDENTIFIER,
@"Blame", ITEM_NAME,
nil],
[NSDictionary dictionaryWithObjectsAndKeys:
(commit)?@"commit":@"diff", ITEM_IDENTIFIER,
@"Diff", ITEM_NAME,
nil],
nil];
[self.groups addObject:[NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithBool:NO], GROUP_SEPARATOR,
[NSNumber numberWithInt:MGRadioSelectionMode], GROUP_SELECTION_MODE, // single selection group.
items, GROUP_ITEMS,
nil]];
[scopeBar reloadData];
[webViewFileViwer setFrameLoadDelegate:self];
}
- (void)dealloc
{
self.groups = nil;
[super dealloc];
}
#pragma mark MGScopeBarDelegate methods
- (int)numberOfGroupsInScopeBar:(MGScopeBar *)theScopeBar
{
return [self.groups count];
}
- (NSArray *)scopeBar:(MGScopeBar *)theScopeBar itemIdentifiersForGroup:(int)groupNumber
{
return [[self.groups objectAtIndex:groupNumber] valueForKeyPath:[NSString stringWithFormat:@"%@.%@", GROUP_ITEMS, ITEM_IDENTIFIER]];
}
- (NSString *)scopeBar:(MGScopeBar *)theScopeBar labelForGroup:(int)groupNumber
{
return [[self.groups objectAtIndex:groupNumber] objectForKey:GROUP_LABEL]; // might be nil, which is fine (nil means no label).
}
- (NSString *)scopeBar:(MGScopeBar *)theScopeBar titleOfItem:(NSString *)identifier inGroup:(int)groupNumber
{
NSArray *items = [[self.groups objectAtIndex:groupNumber] objectForKey:GROUP_ITEMS];
if (items) {
for (NSDictionary *item in items) {
if ([[item objectForKey:ITEM_IDENTIFIER] isEqualToString:identifier]) {
return [item objectForKey:ITEM_NAME];
break;
}
}
}
return nil;
}
- (MGScopeBarGroupSelectionMode)scopeBar:(MGScopeBar *)theScopeBar selectionModeForGroup:(int)groupNumber
{
return [[[self.groups objectAtIndex:groupNumber] objectForKey:GROUP_SELECTION_MODE] intValue];
}
- (void)scopeBar:(MGScopeBar *)theScopeBar selectedStateChanged:(BOOL)selected forItem:(NSString *)identifier inGroup:(int)groupNumber
{
NSString *path = [NSString stringWithFormat:@"html/views/%@", identifier];
NSString *html = [[NSBundle mainBundle] pathForResource:@"index" ofType:@"html" inDirectory:path];
NSLog(@"[FileViewerController scopeBar:selectedStateChanged] -> file: '%@' (%@)",html,identifier);
NSURLRequest * request = [NSURLRequest requestWithURL:[NSURL fileURLWithPath:html]];
[[webViewFileViwer mainFrame] loadRequest:request];
}
- (void)showFile:(NSString *)f sha:(NSString *)s{
file=f;
sha=s;
NSString *show=[[[scopeBar selectedItems] objectAtIndex:0] objectAtIndex:0];
NSLog(@"[showFile:sha] showFile:%@ sha:%@ (show=%@)",file,sha,show);
[self scopeBar:scopeBar selectedStateChanged:true forItem:show inGroup:0];
}
- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
{
NSString *txt;
NSString *show=[[[scopeBar selectedItems] objectAtIndex:0] objectAtIndex:0];
if(show==@"source")
txt=[repository outputForArguments:[NSArray arrayWithObjects:@"show", [self refSpec], nil]];
else if(show==@"blame")
txt=[self parseBlame:[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"blame", @"-p", file, sha, nil]]];
else if((show==@"diff") || (show==@"commit"))
txt=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff", (sha!=nil)?sha:file , (sha!=nil)?file:nil, nil]];
else
return; // XXXX controlar mejor.
NSLog(@"didFinishLoadForFrame -> txt: '%@'",[txt substringToIndex:80]);
id script = [webViewFileViwer windowScriptObject];
[script callWebScriptMethod:@"showFile"
withArguments:[NSArray arrayWithObjects:txt, nil]];
//NSLog(@"%@",[[[[sender mainFrame] DOMDocument] documentElement] outerHTML]);
}
- (NSString*)refSpec
{
return [NSString stringWithFormat:@"%@:%@", (sha!=nil)?sha:@"HEAD", file];
}
-(NSString *)parseBlame:(NSString *)string
{
string=[string stringByReplacingOccurrencesOfString:@"<" withString:@"&lt;"];
string=[string stringByReplacingOccurrencesOfString:@">" withString:@"&gt;"];
NSArray *lines = [string componentsSeparatedByString:@"\n"];
NSString *line;
NSMutableDictionary *headers=[NSMutableDictionary dictionary];
NSMutableString *res=[NSMutableString string];
[res appendString:@"<table class='blocks'>\n"];
int i=0;
while(i<[lines count]){
line=[lines objectAtIndex:i];
NSArray *header=[line componentsSeparatedByString:@" "];
if([header count]==4){
int nLines=[(NSString *)[header objectAtIndex:3] intValue];
[res appendFormat:@"<tr class='block l%d'>\n",nLines];
line=[lines objectAtIndex:++i];
if([[[line componentsSeparatedByString:@" "] objectAtIndex:0] isEqual:@"author"]){
NSString *author=line;
NSString *summary=nil;
while(summary==nil){
line=[lines objectAtIndex:i++];
if([[[line componentsSeparatedByString:@" "] objectAtIndex:0] isEqual:@"summary"]){
summary=line;
}
}
NSString *block=[NSString stringWithFormat:@"<td><p class='author'>%@</p><p class='summary'>%@</p></td>\n<td>\n",author,summary];
[headers setObject:block forKey:[header objectAtIndex:0]];
}
[res appendString:[headers objectForKey:[header objectAtIndex:0]]];
NSMutableString *code=[NSMutableString string];
do{
line=[lines objectAtIndex:i++];
}while([line characterAtIndex:0]!='\t');
line=[line stringByReplacingOccurrencesOfString:@"\t" withString:@"&nbsp;&nbsp;&nbsp;&nbsp;"];
[code appendString:line];
[code appendString:@"\n"];
int n;
for(n=1;n<nLines;n++){
line=[lines objectAtIndex:i++];
do{
line=[lines objectAtIndex:i++];
}while([line characterAtIndex:0]!='\t');
line=[line stringByReplacingOccurrencesOfString:@"\t" withString:@"&nbsp;&nbsp;&nbsp;&nbsp;"];
[code appendString:line];
[code appendString:@"\n"];
}
[res appendFormat:@"<pre class='first-line: %@;brush: objc'>%@</pre>",[header objectAtIndex:2],code];
[res appendString:@"</td>\n"];
}else{
break;
}
[res appendString:@"</tr>\n"];
}
[res appendString:@"</table>\n"];
//NSLog(@"%@",res);
return (NSString *)res;
}
#pragma mark Accessors and properties
/*
- (IBAction)updateFileViwer:(id)sender
{
NSString *type
int option=[displayControl selectedSegment];
if(option==0)
type=@"source";
else if(option==1)
type=@"blame";
else if(option==2)
type=@"diff";
}
- (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
{
NSString *messageString = [error localizedDescription];
NSString *moreString = [error localizedFailureReason] ?
[error localizedFailureReason] :
NSLocalizedString(@"Try typing the URL again.", nil);
messageString = [NSString stringWithFormat:@"%@. %@", messageString, moreString];
NSLog(@"ERROR!!!! - %@",messageString);
}
/*
NSArray *objects = [treeController selectedObjects];
NSArray *content = [treeController content];
if ([objects count] && [content count]) {
PBGitTree *treeItem = [objects objectAtIndex:0];
currentFileBrowserSelectionPath = [treeItem.fullPath componentsSeparatedByString:@"/"];
NSString *txt=[treeItem contents:[displayControl selectedSegment]];
*/
@synthesize groups;
@synthesize commit;
@end
GitX.xcodeproj/project.pbxproj
+56
View File
@@ -22,6 +22,13 @@
/* Begin PBXBuildFile section */
056438B70ED0C40B00985397 /* DetailViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 056438B60ED0C40B00985397 /* DetailViewTemplate.png */; };
315CB97B11C3305F003B8DBE /* FileViewerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 315CB97A11C3305F003B8DBE /* FileViewerController.m */; };
315CB9B011C339DA003B8DBE /* FileViewer.xib in Resources */ = {isa = PBXBuildFile; fileRef = 315CB9AF11C339DA003B8DBE /* FileViewer.xib */; };
31A520AC11C6983900F604D0 /* test.html in Resources */ = {isa = PBXBuildFile; fileRef = 31A520AB11C6983900F604D0 /* test.html */; };
31D70AFB11C4006C00F4B199 /* MGRecessedPopUpButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 31D70AF111C4006C00F4B199 /* MGRecessedPopUpButtonCell.m */; };
31D70AFC11C4006C00F4B199 /* MGScopeBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 31D70AF311C4006C00F4B199 /* MGScopeBar.m */; };
31D70AFD11C4006C00F4B199 /* ReadMe.txt in Resources */ = {isa = PBXBuildFile; fileRef = 31D70AF911C4006C00F4B199 /* ReadMe.txt */; };
31D70AFE11C4006C00F4B199 /* Source Code License.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 31D70AFA11C4006C00F4B199 /* Source Code License.rtf */; };
3BC07F4C0ED5A5C5009A7768 /* HistoryViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */; };
3BC07F4D0ED5A5C5009A7768 /* CommitViewTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */; };
47DBDB580E94EDE700671A1E /* DBPrefsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 47DBDB570E94EDE700671A1E /* DBPrefsWindowController.m */; };
@@ -296,6 +303,18 @@
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
315CB97911C3305F003B8DBE /* FileViewerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileViewerController.h; path = FileViewer/FileViewerController.h; sourceTree = "<group>"; };
315CB97A11C3305F003B8DBE /* FileViewerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FileViewerController.m; path = FileViewer/FileViewerController.m; sourceTree = "<group>"; };
315CB9AF11C339DA003B8DBE /* FileViewer.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = FileViewer.xib; path = FileViewer/FileViewer.xib; sourceTree = "<group>"; };
31A520AB11C6983900F604D0 /* test.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = test.html; sourceTree = "<group>"; };
31D70AF011C4006C00F4B199 /* MGRecessedPopUpButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGRecessedPopUpButtonCell.h; sourceTree = "<group>"; };
31D70AF111C4006C00F4B199 /* MGRecessedPopUpButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGRecessedPopUpButtonCell.m; sourceTree = "<group>"; };
31D70AF211C4006C00F4B199 /* MGScopeBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGScopeBar.h; sourceTree = "<group>"; };
31D70AF311C4006C00F4B199 /* MGScopeBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGScopeBar.m; sourceTree = "<group>"; };
31D70AF711C4006C00F4B199 /* MGScopeBar_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGScopeBar_Prefix.pch; sourceTree = "<group>"; };
31D70AF811C4006C00F4B199 /* MGScopeBarDelegateProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGScopeBarDelegateProtocol.h; sourceTree = "<group>"; };
31D70AF911C4006C00F4B199 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
31D70AFA11C4006C00F4B199 /* Source Code License.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = "Source Code License.rtf"; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* GitX_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitX_Prefix.pch; sourceTree = "<group>"; };
3BC07F4A0ED5A5C5009A7768 /* HistoryViewTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HistoryViewTemplate.png; path = Images/HistoryViewTemplate.png; sourceTree = "<group>"; };
3BC07F4B0ED5A5C5009A7768 /* CommitViewTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = CommitViewTemplate.png; path = Images/CommitViewTemplate.png; sourceTree = "<group>"; };
@@ -665,6 +684,8 @@
29B97314FDCFA39411CA2CEA /* GitTest */ = {
isa = PBXGroup;
children = (
31D70AEF11C4006C00F4B199 /* MGScopeBar */,
315CB97811C32FC2003B8DBE /* FileViewer */,
C3138B6211C2F39900BE6CBE /* html */,
F5886A080ED5D26B0066E74C /* SpeedTest */,
913D5E420E5563FD00CECEA2 /* cli */,
@@ -750,6 +771,31 @@
name = Frameworks;
sourceTree = "<group>";
};
315CB97811C32FC2003B8DBE /* FileViewer */ = {
isa = PBXGroup;
children = (
315CB97911C3305F003B8DBE /* FileViewerController.h */,
315CB97A11C3305F003B8DBE /* FileViewerController.m */,
315CB9AF11C339DA003B8DBE /* FileViewer.xib */,
);
name = FileViewer;
sourceTree = "<group>";
};
31D70AEF11C4006C00F4B199 /* MGScopeBar */ = {
isa = PBXGroup;
children = (
31D70AF011C4006C00F4B199 /* MGRecessedPopUpButtonCell.h */,
31D70AF111C4006C00F4B199 /* MGRecessedPopUpButtonCell.m */,
31D70AF211C4006C00F4B199 /* MGScopeBar.h */,
31D70AF311C4006C00F4B199 /* MGScopeBar.m */,
31D70AF711C4006C00F4B199 /* MGScopeBar_Prefix.pch */,
31D70AF811C4006C00F4B199 /* MGScopeBarDelegateProtocol.h */,
31D70AF911C4006C00F4B199 /* ReadMe.txt */,
31D70AFA11C4006C00F4B199 /* Source Code License.rtf */,
);
path = MGScopeBar;
sourceTree = "<group>";
};
47DBDB920E94F47200671A1E /* Preference Icons */ = {
isa = PBXGroup;
children = (
@@ -819,6 +865,7 @@
C3138B9311C2F48400BE6CBE /* commit.js */,
C3138B9411C2F48400BE6CBE /* index.html */,
C3138B9511C2F48400BE6CBE /* multipleSelection.js */,
31A520AB11C6983900F604D0 /* test.html */,
);
path = commit;
sourceTree = "<group>";
@@ -1434,6 +1481,10 @@
C3138C3111C2F48400BE6CBE /* diff.css in Resources */,
C3138C3211C2F48400BE6CBE /* GitX.css in Resources */,
C3138C3311C2F48400BE6CBE /* notification.css in Resources */,
315CB9B011C339DA003B8DBE /* FileViewer.xib in Resources */,
31D70AFD11C4006C00F4B199 /* ReadMe.txt in Resources */,
31D70AFE11C4006C00F4B199 /* Source Code License.rtf in Resources */,
31A520AC11C6983900F604D0 /* test.html in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1613,6 +1664,9 @@
C3138C1611C2F48400BE6CBE /* shLegacy.js in Sources */,
C3138C1711C2F48400BE6CBE /* shCore.js in Sources */,
C3138C1811C2F48400BE6CBE /* shLegacy.js in Sources */,
315CB97B11C3305F003B8DBE /* FileViewerController.m in Sources */,
31D70AFB11C4006C00F4B199 /* MGRecessedPopUpButtonCell.m in Sources */,
31D70AFC11C4006C00F4B199 /* MGScopeBar.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1820,6 +1874,7 @@
26FC0A890875C7B200E6366F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_C_LANGUAGE_STANDARD = c99;
GCC_ENABLE_OBJC_GC = required;
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = DEBUG_BUILD;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1837,6 +1892,7 @@
ppc,
i386,
);
GCC_C_LANGUAGE_STANDARD = c99;
GCC_ENABLE_OBJC_GC = required;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PBGitCommitController.h
+4
View File
@@ -8,6 +8,7 @@
#import <Cocoa/Cocoa.h>
#import "PBViewController.h"
#import "FileViewerController.h"
@class PBGitIndexController, PBIconAndTextCell, PBWebChangesController, PBGitIndex;
@@ -21,6 +22,9 @@
IBOutlet NSArrayController *cachedFilesController;
IBOutlet NSButton *commitButton;
IBOutlet NSView *fileViewer;
FileViewerController *fileViewerController;
IBOutlet PBGitIndexController *indexController;
IBOutlet PBWebChangesController *webController;
}
PBGitCommitController.m
+13
View File
@@ -62,6 +62,19 @@
[cachedFilesController setAutomaticallyRearrangesObjects:NO];
[unstagedFilesController setAutomaticallyRearrangesObjects:NO];
fileViewerController=[[FileViewerController alloc] retain];
[fileViewerController setCommit:true];
[fileViewerController initWithRepository:repository];
[fileViewerController loadView];
// XXXX :( ?
NSMutableArray *sv=[NSMutableArray arrayWithArray:[[fileViewer superview] subviews]];
[sv removeObjectAtIndex:0];
[sv insertObject:[fileViewerController view] atIndex:0];
[[fileViewer superview] setSubviews:sv];
webController.fileViewerController=fileViewerController;
}
- (void) removeView
PBGitCommitView.xib
+65 -314
View File
@@ -7,17 +7,8 @@
<string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">460.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.WebKitIBPlugin</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>762</string>
<string>762</string>
</object>
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">762</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -26,7 +17,6 @@
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.WebKitIBPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -53,157 +43,18 @@
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomView" id="414637020">
<reference key="NSNextResponder" ref="750704519"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButton" id="34954920">
<reference key="NSNextResponder" ref="414637020"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{862, 3}, {37, 25}}</string>
<reference key="NSSuperview" ref="414637020"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="53200352">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">QuickLook</string>
<object class="NSFont" key="NSSupport" id="554612341">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="34954920"/>
<int key="NSButtonFlags">-2033958657</int>
<int key="NSButtonFlags2">163</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSQuickLookTemplate</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
</object>
<object class="NSSegmentedControl" id="586314856">
<reference key="NSNextResponder" ref="414637020"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 3}, {108, 25}}</string>
<reference key="NSSuperview" ref="414637020"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="239521833">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<reference key="NSSupport" ref="554612341"/>
<reference key="NSControlView" ref="586314856"/>
<object class="NSMutableArray" key="NSSegmentImages">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSSegmentItem">
<string key="NSSegmentItemLabel">Diff</string>
<string key="NSSegmentItemTooltip">Detailed View</string>
<bool key="NSSegmentItemSelected">YES</bool>
<int key="NSSegmentItemImageScaling">2</int>
</object>
<object class="NSSegmentItem">
<string key="NSSegmentItemLabel">Blame</string>
<string key="NSSegmentItemTooltip">Tree View</string>
<int key="NSSegmentItemTag">9</int>
<int key="NSSegmentItemImageScaling">2</int>
</object>
</object>
<int key="NSSegmentStyle">2</int>
</object>
</object>
<object class="NSBox" id="228140399">
<reference key="NSNextResponder" ref="414637020"/>
<int key="NSvFlags">10</int>
<string key="NSFrame">{{0, -2}, {909, 5}}</string>
<reference key="NSSuperview" ref="414637020"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="554612341"/>
<object class="NSColor" key="NSBackgroundColor" id="282216416">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
<object class="NSColor" key="NSColor" id="818038086">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
</object>
</object>
<int key="NSBorderType">3</int>
<int key="NSBoxType">2</int>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
</object>
</object>
<string key="NSFrame">{{0, 511}, {909, 30}}</string>
<reference key="NSSuperview" ref="750704519"/>
<string key="NSClassName">PBGitGradientBarView</string>
</object>
<object class="NSSplitView" id="812432808">
<reference key="NSNextResponder" ref="750704519"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="WebView" id="79644284">
<object class="NSCustomView" id="33610104">
<reference key="NSNextResponder" ref="812432808"/>
<int key="NSvFlags">274</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple HTML pasteboard type</string>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple URL pasteboard type</string>
<string>Apple Web Archive pasteboard type</string>
<string>NSColor pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NSStringPboardType</string>
<string>NeXT RTFD pasteboard type</string>
<string>NeXT Rich Text Format v1.0 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
<string>WebURLsWithTitlesPboardType</string>
<string>public.png</string>
<string>public.url</string>
<string>public.url-name</string>
</object>
</object>
<string key="NSFrameSize">{909, 228}</string>
<int key="NSvFlags">4370</int>
<string key="NSFrameSize">{1351, 234}</string>
<reference key="NSSuperview" ref="812432808"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
<string key="GroupName"/>
<object class="WebPreferences" key="Preferences">
<string key="Identifier"/>
<object class="NSMutableDictionary" key="Values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>WebKitDefaultFixedFontSize</string>
<string>WebKitDefaultFontSize</string>
<string>WebKitMinimumFontSize</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="12"/>
<integer value="12"/>
<integer value="1"/>
</object>
</object>
</object>
<bool key="UseBackForwardList">YES</bool>
<bool key="AllowsUndo">YES</bool>
<bool key="NSViewCanDrawConcurrently">YES</bool>
<string key="NSClassName">NSView</string>
</object>
<object class="NSSplitView" id="217294340">
<reference key="NSNextResponder" ref="812432808"/>
@@ -233,7 +84,7 @@
<object class="NSTableView" id="588180404">
<reference key="NSNextResponder" ref="614437325"/>
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{202, 251}</string>
<string key="NSFrameSize">{302, 310}</string>
<reference key="NSSuperview" ref="614437325"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
@@ -244,7 +95,7 @@
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="746911078">
<double key="NSWidth">199</double>
<double key="NSWidth">299</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">3.4028229999999999e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -260,7 +111,10 @@
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">headerColor</string>
<reference key="NSColor" ref="818038086"/>
<object class="NSColor" key="NSColor" id="818038086">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="94707925">
<int key="NSColorSpace">6</int>
@@ -322,7 +176,7 @@
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
<string key="NSFrame">{{1, 1}, {202, 251}}</string>
<string key="NSFrame">{{1, 1}, {302, 310}}</string>
<reference key="NSSuperview" ref="563607114"/>
<reference key="NSNextKeyView" ref="588180404"/>
<reference key="NSDocView" ref="588180404"/>
@@ -349,7 +203,7 @@
<double key="NSPercent">0.99470899999999995</double>
</object>
</object>
<string key="NSFrame">{{-1, -1}, {204, 253}}</string>
<string key="NSFrame">{{-1, -1}, {304, 312}}</string>
<reference key="NSSuperview" ref="663963274"/>
<reference key="NSNextKeyView" ref="614437325"/>
<int key="NSsFlags">562</int>
@@ -359,11 +213,11 @@
<bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
</object>
</object>
<string key="NSFrameSize">{203, 257}</string>
<string key="NSFrameSize">{303, 316}</string>
<reference key="NSSuperview" ref="208180574"/>
</object>
</object>
<string key="NSFrameSize">{203, 272}</string>
<string key="NSFrameSize">{303, 331}</string>
<reference key="NSSuperview" ref="217294340"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -371,7 +225,12 @@
<int key="NSCellFlags2">0</int>
<string key="NSContents">Unstaged Changes</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSBackgroundColor" ref="282216416"/>
<object class="NSColor" key="NSBackgroundColor" id="282216416">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
<reference key="NSColor" ref="818038086"/>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
@@ -396,14 +255,18 @@
<object class="NSButton" id="792511503">
<reference key="NSNextResponder" ref="154221104"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{368, 0}, {96, 32}}</string>
<string key="NSFrame">{{596, 0}, {96, 32}}</string>
<reference key="NSSuperview" ref="154221104"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="767461980">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Commit</string>
<reference key="NSSupport" ref="554612341"/>
<object class="NSFont" key="NSSupport" id="554612341">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="792511503"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">301990017</int>
@@ -449,7 +312,7 @@
<string>public.url</string>
</object>
</object>
<string key="NSFrame">{{0, 9}, {456, 14}}</string>
<string key="NSFrameSize">{684, 15}</string>
<reference key="NSSuperview" ref="245211955"/>
<object class="NSTextContainer" key="NSTextContainer" id="311869542">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -467,7 +330,7 @@
<nil key="NSDelegate"/>
</object>
<reference key="NSTextView" ref="1023793991"/>
<double key="NSWidth">456</double>
<double key="NSWidth">684</double>
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
@@ -519,11 +382,11 @@
</object>
<int key="NSTVFlags">6</int>
<string key="NSMaxSize">{1161, 1e+07}</string>
<string key="NSMinize">{223, 0}</string>
<string key="NSMinize">{216, 0}</string>
<nil key="NSDelegate"/>
</object>
</object>
<string key="NSFrame">{{1, 1}, {456, 214}}</string>
<string key="NSFrame">{{1, 1}, {684, 273}}</string>
<reference key="NSSuperview" ref="227052526"/>
<reference key="NSNextKeyView" ref="1023793991"/>
<reference key="NSDocView" ref="1023793991"/>
@@ -555,7 +418,7 @@
<double key="NSPercent">0.94565220000000005</double>
</object>
</object>
<string key="NSFrame">{{0, 36}, {458, 216}}</string>
<string key="NSFrame">{{0, 33}, {686, 275}}</string>
<reference key="NSSuperview" ref="154221104"/>
<reference key="NSNextKeyView" ref="245211955"/>
<int key="NSsFlags">530</int>
@@ -593,7 +456,7 @@
<object class="NSButton" id="1042222292">
<reference key="NSNextResponder" ref="154221104"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{272, 0}, {96, 32}}</string>
<string key="NSFrame">{{500, 0}, {96, 32}}</string>
<reference key="NSSuperview" ref="154221104"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="964972443">
@@ -611,11 +474,11 @@
</object>
</object>
</object>
<string key="NSFrameSize">{458, 257}</string>
<string key="NSFrameSize">{686, 316}</string>
<reference key="NSSuperview" ref="635871052"/>
</object>
</object>
<string key="NSFrame">{{212, 0}, {458, 272}}</string>
<string key="NSFrame">{{312, 0}, {686, 331}}</string>
<reference key="NSSuperview" ref="217294340"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -658,7 +521,7 @@
<object class="NSTableView" id="638535043">
<reference key="NSNextResponder" ref="551030904"/>
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{229, 251}</string>
<string key="NSFrameSize">{343, 310}</string>
<reference key="NSSuperview" ref="551030904"/>
<int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool>
@@ -670,7 +533,7 @@
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="79177434">
<double key="NSWidth">226</double>
<double key="NSWidth">340</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">3.4028229999999999e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -711,7 +574,7 @@
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
<string key="NSFrame">{{1, 1}, {229, 251}}</string>
<string key="NSFrame">{{1, 1}, {343, 310}}</string>
<reference key="NSSuperview" ref="617511385"/>
<reference key="NSNextKeyView" ref="638535043"/>
<reference key="NSDocView" ref="638535043"/>
@@ -738,7 +601,7 @@
<double key="NSPercent">0.90033220000000003</double>
</object>
</object>
<string key="NSFrame">{{0, -1}, {231, 253}}</string>
<string key="NSFrame">{{0, -1}, {345, 312}}</string>
<reference key="NSSuperview" ref="559277910"/>
<reference key="NSNextKeyView" ref="551030904"/>
<int key="NSsFlags">562</int>
@@ -748,11 +611,11 @@
<bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
</object>
</object>
<string key="NSFrameSize">{230, 257}</string>
<string key="NSFrameSize">{344, 316}</string>
<reference key="NSSuperview" ref="955377287"/>
</object>
</object>
<string key="NSFrame">{{679, 0}, {230, 272}}</string>
<string key="NSFrame">{{1007, 0}, {344, 331}}</string>
<reference key="NSSuperview" ref="217294340"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -773,17 +636,17 @@
<bool key="NSTransparent">NO</bool>
</object>
</object>
<string key="NSFrame">{{0, 237}, {909, 272}}</string>
<string key="NSFrame">{{0, 243}, {1351, 331}}</string>
<reference key="NSSuperview" ref="812432808"/>
<bool key="NSIsVertical">YES</bool>
</object>
</object>
<string key="NSFrameSize">{909, 509}</string>
<string key="NSFrameSize">{1351, 574}</string>
<reference key="NSSuperview" ref="750704519"/>
<string key="NSAutosaveName">CommitViewSplitView</string>
</object>
</object>
<string key="NSFrameSize">{909, 541}</string>
<string key="NSFrameSize">{1351, 574}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
@@ -875,22 +738,6 @@
</object>
<int key="connectionID">122</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="1007648253"/>
<reference key="destination" ref="79644284"/>
</object>
<int key="connectionID">136</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">frameLoadDelegate</string>
<reference key="source" ref="79644284"/>
<reference key="destination" ref="1007648253"/>
</object>
<int key="connectionID">137</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: arrangedObjects.path</string>
@@ -1117,27 +964,11 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">upperToolbarView</string>
<reference key="source" ref="446885874"/>
<reference key="destination" ref="414637020"/>
<string key="label">fileViewer</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="33610104"/>
</object>
<int key="connectionID">356</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">displayControl</string>
<reference key="source" ref="1007648253"/>
<reference key="destination" ref="239521833"/>
</object>
<int key="connectionID">357</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">displayControlChanged:</string>
<reference key="source" ref="1007648253"/>
<reference key="destination" ref="239521833"/>
</object>
<int key="connectionID">358</int>
<int key="connectionID">361</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -1173,7 +1004,6 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="812432808"/>
<reference ref="414637020"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -1206,7 +1036,7 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="217294340"/>
<reference ref="79644284"/>
<reference ref="33610104"/>
</object>
<reference key="parent" ref="750704519"/>
</object>
@@ -1235,10 +1065,10 @@
<reference key="object" ref="635871052"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="227052526"/>
<reference ref="792511503"/>
<reference ref="18874447"/>
<reference ref="1042222292"/>
<reference ref="227052526"/>
</object>
<reference key="parent" ref="217294340"/>
</object>
@@ -1413,54 +1243,13 @@
<reference key="parent" ref="1042222292"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">125</int>
<reference key="object" ref="79644284"/>
<int key="objectID">360</int>
<reference key="object" ref="33610104"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="parent" ref="812432808"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">322</int>
<reference key="object" ref="414637020"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="34954920"/>
<reference ref="228140399"/>
<reference ref="586314856"/>
</object>
<reference key="parent" ref="750704519"/>
<string key="objectName">History Upper Toolbar</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">323</int>
<reference key="object" ref="586314856"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="239521833"/>
</object>
<reference key="parent" ref="414637020"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">324</int>
<reference key="object" ref="34954920"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="53200352"/>
</object>
<reference key="parent" ref="414637020"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">330</int>
<reference key="object" ref="228140399"/>
<reference key="parent" ref="414637020"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">336</int>
<reference key="object" ref="53200352"/>
<reference key="parent" ref="34954920"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">337</int>
<reference key="object" ref="239521833"/>
<reference key="parent" ref="586314856"/>
<string key="objectName">File viewer</string>
</object>
</object>
</object>
@@ -1479,7 +1268,6 @@
<string>113.IBPluginDependency</string>
<string>114.CustomClassName</string>
<string>114.IBPluginDependency</string>
<string>125.IBPluginDependency</string>
<string>130.IBPluginDependency</string>
<string>131.IBPluginDependency</string>
<string>132.IBPluginDependency</string>
@@ -1497,14 +1285,7 @@
<string>248.IBPluginDependency</string>
<string>278.IBPluginDependency</string>
<string>279.IBPluginDependency</string>
<string>322.IBPluginDependency</string>
<string>323.IBPluginDependency</string>
<string>324.IBAttributePlaceholdersKey</string>
<string>324.IBPluginDependency</string>
<string>330.IBPluginDependency</string>
<string>336.IBPluginDependency</string>
<string>337.IBPluginDependency</string>
<string>337.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
<string>360.IBPluginDependency</string>
<string>45.IBPluginDependency</string>
<string>46.IBPluginDependency</string>
<string>47.IBPluginDependency</string>
@@ -1522,7 +1303,7 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{615, 74}, {909, 541}}</string>
<string>{{54, 9}, {1351, 574}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="0"/>
<integer value="0"/>
@@ -1532,7 +1313,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>PBIconAndTextCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.WebKitIBPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1552,20 +1332,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
<string key="name">ToolTip</string>
<reference key="object" ref="34954920"/>
<string key="toolTip">Quick Look</string>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>PBFileChangesTableView</string>
@@ -1596,7 +1362,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">358</int>
<int key="maxID">363</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1642,6 +1408,7 @@
<string>cachedFilesController</string>
<string>commitButton</string>
<string>commitMessageView</string>
<string>fileViewer</string>
<string>indexController</string>
<string>unstagedFilesController</string>
<string>webController</string>
@@ -1651,6 +1418,7 @@
<string>NSArrayController</string>
<string>NSButton</string>
<string>NSTextView</string>
<string>NSView</string>
<string>PBGitIndexController</string>
<string>NSArrayController</string>
<string>PBWebChangesController</string>
@@ -2300,14 +2068,6 @@
<string key="minorKey">AppKit.framework/Headers/NSSegmentedCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSSegmentedControl</string>
<string key="superclassName">NSControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSSegmentedControl.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSSplitView</string>
<string key="superclassName">NSView</string>
@@ -2458,17 +2218,8 @@
<string key="IBDocument.LastKnownRelativeProjectPath">GitX.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSQuickLookTemplate</string>
<string>NSSwitch</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{19, 11}</string>
<string>{15, 15}</string>
</object>
<string key="NS.key.0">NSSwitch</string>
<string key="NS.object.0">{15, 15}</string>
</object>
</data>
</archive>
PBGitHistoryController.h
+4 -3
View File
@@ -12,6 +12,7 @@
#import "PBGitTree.h"
#import "PBViewController.h"
#import "PBCollapsibleSplitView.h"
#import "FileViewerController.h"
@class PBGitSidebarController;
@class PBGitGradientBarView;
@@ -39,9 +40,9 @@
IBOutlet NSButton *localRemoteBranchesFilterItem;
IBOutlet NSButton *selectedBranchFilterItem;
IBOutlet WebView *webViewFileViwer;
IBOutlet NSSegmentedCell *displayControl;
IBOutlet NSSplitView *fileViewer;
FileViewerController *fileViewerController;
IBOutlet id webView;
int selectedCommitDetailsIndex;
BOOL forceSelectionUpdate;
PBGitHistoryController.m
+17 -46
View File
@@ -79,7 +79,14 @@
//[scopeBarView setTopShade:207/255.0 bottomShade:180/255.0];
[self updateBranchFilterMatrix];
[webViewFileViwer setFrameLoadDelegate:self];
// [webViewFileViwer setFrameLoadDelegate:self];
fileViewerController=[[FileViewerController alloc] retain];
[fileViewerController initWithRepository:repository];
[fileViewerController loadView];
//[fileViewer setAutoresizesSubviews:YES];
[fileViewer addSubview:[fileViewerController view]];
[super awakeFromNib];
}
@@ -213,7 +220,15 @@
if ([(NSString *)context isEqualToString: @"treeChange"]) {
[self updateQuicklookForce: NO];
[self saveFileBrowserSelection];
[self updateFileViwer:nil];
NSLog(@"---> %@",object);
NSArray *objects = [(NSTreeController *)object selectedObjects];
if([objects count]){
PBGitTree *tree=(PBGitTree *)[objects objectAtIndex:0];
NSLog(@"---> %@",tree.fullPath);
[fileViewerController showFile:tree.fullPath sha:tree.sha];
}
//[self updateFileViwer:nil];
return;
}
@@ -691,48 +706,4 @@
return iconRect;
}
- (IBAction)updateFileViwer:(id)sender
{
NSString *type=@"source";
if([displayControl selectedSegment]==1){
type=@"blame";
}else if([displayControl selectedSegment]==2){
type=@"diff";
}
NSString *path = [NSString stringWithFormat:@"html/views/%@", type];
NSString *file = [[NSBundle mainBundle] pathForResource:@"index" ofType:@"html" inDirectory:path];
NSLog(@"updateFileViwer -> file: '%@'",file);
NSURLRequest * request = [NSURLRequest requestWithURL:[NSURL fileURLWithPath:file]];
[[webViewFileViwer mainFrame] loadRequest:request];
}
- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
{
NSArray *objects = [treeController selectedObjects];
NSArray *content = [treeController content];
if ([objects count] && [content count]) {
PBGitTree *treeItem = [objects objectAtIndex:0];
currentFileBrowserSelectionPath = [treeItem.fullPath componentsSeparatedByString:@"/"];
NSString *txt=[treeItem contents:[displayControl selectedSegment]];
NSLog(@"didFinishLoadForFrame -> txt: '%@'",[txt substringToIndex:80]);
id script = [webViewFileViwer windowScriptObject];
[script callWebScriptMethod:@"showFile"
withArguments:[NSArray arrayWithObjects:txt, nil]];
}
}
- (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
{
NSString *messageString = [error localizedDescription];
NSString *moreString = [error localizedFailureReason] ?
[error localizedFailureReason] :
NSLocalizedString(@"Try typing the URL again.", nil);
messageString = [NSString stringWithFormat:@"%@. %@", messageString, moreString];
NSLog(@"ERROR!!!! - %@",messageString);
}
@end
PBGitHistoryView.xib
+42 -294
View File
@@ -21,7 +21,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="399"/>
<integer value="10"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -111,7 +111,7 @@
<object class="NSButton" id="16222431">
<reference key="NSNextResponder" ref="172148644"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{848, 3}, {37, 25}}</string>
<string key="NSFrame">{{906, 3}, {37, 25}}</string>
<reference key="NSSuperview" ref="172148644"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="102056827">
@@ -126,7 +126,7 @@
<reference key="NSControlView" ref="16222431"/>
<int key="NSButtonFlags">-2033958657</int>
<int key="NSButtonFlags2">163</int>
<object class="NSCustomResource" key="NSNormalImage" id="298131678">
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSQuickLookTemplate</string>
</object>
@@ -297,7 +297,7 @@
<object class="NSBox" id="923983319">
<reference key="NSNextResponder" ref="172148644"/>
<int key="NSvFlags">10</int>
<string key="NSFrame">{{0, -2}, {895, 5}}</string>
<string key="NSFrame">{{0, -2}, {953, 5}}</string>
<reference key="NSSuperview" ref="172148644"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -325,7 +325,7 @@
<bool key="NSTransparent">NO</bool>
</object>
</object>
<string key="NSFrame">{{0, 583}, {895, 30}}</string>
<string key="NSFrame">{{0, 587}, {953, 30}}</string>
<reference key="NSSuperview" ref="319362431"/>
<string key="NSClassName">PBGitGradientBarView</string>
</object>
@@ -342,7 +342,7 @@
<object class="NSBox" id="147470634">
<reference key="NSNextResponder" ref="24227530"/>
<int key="NSvFlags">10</int>
<string key="NSFrame">{{0, 116}, {895, 5}}</string>
<string key="NSFrame">{{0, 117}, {953, 5}}</string>
<reference key="NSSuperview" ref="24227530"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -374,13 +374,13 @@
<object class="NSTableView" id="254268962">
<reference key="NSNextResponder" ref="546023969"/>
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{895, 102}</string>
<string key="NSFrameSize">{953, 103}</string>
<reference key="NSSuperview" ref="546023969"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="942510576">
<reference key="NSNextResponder" ref="906093892"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{895, 17}</string>
<string key="NSFrameSize">{953, 17}</string>
<reference key="NSSuperview" ref="906093892"/>
<reference key="NSTableView" ref="254268962"/>
</object>
@@ -394,7 +394,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="1025472344">
<string key="NSIdentifier">SubjectColumn</string>
<double key="NSWidth">592</double>
<double key="NSWidth">650</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -559,7 +559,7 @@
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
<string key="NSFrame">{{0, 17}, {895, 102}}</string>
<string key="NSFrame">{{0, 17}, {953, 103}}</string>
<reference key="NSSuperview" ref="663765878"/>
<reference key="NSNextKeyView" ref="254268962"/>
<reference key="NSDocView" ref="254268962"/>
@@ -592,7 +592,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="942510576"/>
</object>
<string key="NSFrameSize">{895, 17}</string>
<string key="NSFrameSize">{953, 17}</string>
<reference key="NSSuperview" ref="663765878"/>
<reference key="NSNextKeyView" ref="942510576"/>
<reference key="NSDocView" ref="942510576"/>
@@ -601,7 +601,7 @@
</object>
<reference ref="806470424"/>
</object>
<string key="NSFrameSize">{895, 119}</string>
<string key="NSFrameSize">{953, 120}</string>
<reference key="NSSuperview" ref="24227530"/>
<reference key="NSNextKeyView" ref="546023969"/>
<int key="NSsFlags">560</int>
@@ -645,7 +645,7 @@
<object class="NSSearchField" id="354285291">
<reference key="NSNextResponder" ref="428755155"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{705, 2}, {180, 19}}</string>
<string key="NSFrame">{{763, 2}, {180, 19}}</string>
<reference key="NSSuperview" ref="428755155"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="1022125543">
@@ -745,12 +745,12 @@
</object>
</object>
</object>
<string key="NSFrame">{{0, 119}, {895, 24}}</string>
<string key="NSFrame">{{0, 120}, {953, 24}}</string>
<reference key="NSSuperview" ref="24227530"/>
<string key="NSClassName">PBGitGradientBarView</string>
</object>
</object>
<string key="NSFrameSize">{895, 143}</string>
<string key="NSFrameSize">{953, 144}</string>
<reference key="NSSuperview" ref="202620420"/>
<string key="NSClassName">NSView</string>
</object>
@@ -762,7 +762,7 @@
<object class="NSTabView" id="135073984">
<reference key="NSNextResponder" ref="560436169"/>
<int key="NSvFlags">18</int>
<string key="NSFrameSize">{895, 440}</string>
<string key="NSFrameSize">{953, 443}</string>
<reference key="NSSuperview" ref="560436169"/>
<object class="NSMutableArray" key="NSTabViewItems">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -802,7 +802,7 @@
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
<string key="GroupName"/>
<object class="WebPreferences" key="Preferences" id="996470461">
<object class="WebPreferences" key="Preferences">
<string key="Identifier"/>
<object class="NSMutableDictionary" key="Values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -860,7 +860,7 @@
<object class="NSOutlineView" id="216928480">
<reference key="NSNextResponder" ref="859661469"/>
<int key="NSvFlags">4368</int>
<string key="NSFrameSize">{159, 425}</string>
<string key="NSFrameSize">{938, 428}</string>
<reference key="NSSuperview" ref="859661469"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
@@ -871,7 +871,7 @@
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="728334291">
<double key="NSWidth">156</double>
<double key="NSWidth">935</double>
<double key="NSMinWidth">16</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -904,7 +904,7 @@
<reference key="NSBackgroundColor" ref="965176493"/>
<reference key="NSGridColor" ref="248885916"/>
<double key="NSRowHeight">17</double>
<int key="NSTvFlags">-624951296</int>
<int key="NSTvFlags">-759169024</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
<int key="NSColumnAutoresizingStyle">4</int>
@@ -914,7 +914,7 @@
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
<string key="NSFrame">{{1, 1}, {159, 425}}</string>
<string key="NSFrame">{{1, 1}, {938, 428}}</string>
<reference key="NSSuperview" ref="776605770"/>
<reference key="NSNextKeyView" ref="216928480"/>
<reference key="NSDocView" ref="216928480"/>
@@ -924,7 +924,7 @@
<object class="NSScroller" id="692013536">
<reference key="NSNextResponder" ref="776605770"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{160, 1}, {15, 425}}</string>
<string key="NSFrame">{{939, 1}, {15, 428}}</string>
<reference key="NSSuperview" ref="776605770"/>
<reference key="NSTarget" ref="776605770"/>
<string key="NSAction">_doScroller:</string>
@@ -933,16 +933,15 @@
<object class="NSScroller" id="471196443">
<reference key="NSNextResponder" ref="776605770"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{1, 426}, {159, 15}}</string>
<string key="NSFrame">{{1, 429}, {938, 15}}</string>
<reference key="NSSuperview" ref="776605770"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="776605770"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">0.0045045049999999998</double>
<double key="NSPercent">0.99801189999999995</double>
<double key="NSPercent">0.93923240938166308</double>
</object>
</object>
<string key="NSFrameSize">{176, 442}</string>
<string key="NSFrameSize">{955, 445}</string>
<reference key="NSSuperview" ref="626906425"/>
<reference key="NSNextKeyView" ref="859661469"/>
<int key="NSsFlags">50</int>
@@ -951,143 +950,14 @@
<reference key="NSContentView" ref="859661469"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object>
<object class="NSCustomView" id="505177858">
<reference key="NSNextResponder" ref="626906425"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="WebView" id="59059856">
<reference key="NSNextResponder" ref="505177858"/>
<int key="NSvFlags">274</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple HTML pasteboard type</string>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple URL pasteboard type</string>
<string>Apple Web Archive pasteboard type</string>
<string>NSColor pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NSStringPboardType</string>
<string>NeXT RTFD pasteboard type</string>
<string>NeXT Rich Text Format v1.0 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
<string>WebURLsWithTitlesPboardType</string>
<string>public.png</string>
<string>public.url</string>
<string>public.url-name</string>
</object>
</object>
<string key="NSFrameSize">{720, 411}</string>
<reference key="NSSuperview" ref="505177858"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
<string key="GroupName"/>
<reference key="Preferences" ref="996470461"/>
<bool key="UseBackForwardList">YES</bool>
<bool key="AllowsUndo">YES</bool>
</object>
<object class="NSCustomView" id="502709061">
<reference key="NSNextResponder" ref="505177858"/>
<int key="NSvFlags">266</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButton" id="262808078">
<reference key="NSNextResponder" ref="502709061"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{673, 3}, {37, 25}}</string>
<reference key="NSSuperview" ref="502709061"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="325362753">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">QuickLook</string>
<reference key="NSSupport" ref="924107556"/>
<reference key="NSControlView" ref="262808078"/>
<int key="NSButtonFlags">-2033958657</int>
<int key="NSButtonFlags2">163</int>
<reference key="NSNormalImage" ref="298131678"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
</object>
<object class="NSSegmentedControl" id="737343933">
<reference key="NSNextResponder" ref="502709061"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 3}, {162, 25}}</string>
<reference key="NSSuperview" ref="502709061"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="607494970">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<reference key="NSSupport" ref="924107556"/>
<reference key="NSControlView" ref="737343933"/>
<object class="NSMutableArray" key="NSSegmentImages">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSSegmentItem">
<string key="NSSegmentItemLabel">Show</string>
<string key="NSSegmentItemTooltip">Detailed View</string>
<bool key="NSSegmentItemSelected">YES</bool>
<int key="NSSegmentItemImageScaling">2</int>
</object>
<object class="NSSegmentItem">
<string key="NSSegmentItemLabel">Blame</string>
<string key="NSSegmentItemTooltip">Tree View</string>
<int key="NSSegmentItemTag">9</int>
<int key="NSSegmentItemImageScaling">2</int>
</object>
<object class="NSSegmentItem">
<string key="NSSegmentItemLabel">Diff</string>
<int key="NSSegmentItemImageScaling">0</int>
</object>
</object>
<int key="NSSegmentStyle">2</int>
</object>
</object>
<object class="NSBox" id="167111508">
<reference key="NSNextResponder" ref="502709061"/>
<int key="NSvFlags">10</int>
<string key="NSFrame">{{0, -2}, {720, 5}}</string>
<reference key="NSSuperview" ref="502709061"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="924107556"/>
<reference key="NSBackgroundColor" ref="870781813"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
</object>
</object>
<int key="NSBorderType">3</int>
<int key="NSBoxType">2</int>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
</object>
</object>
<string key="NSFrame">{{0, 412}, {720, 30}}</string>
<reference key="NSSuperview" ref="505177858"/>
<string key="NSClassName">NSView</string>
</object>
</object>
<string key="NSFrame">{{177, 0}, {720, 442}}</string>
<reference key="NSSuperview" ref="626906425"/>
<string key="NSClassName">NSView</string>
</object>
</object>
<string key="NSFrame">{{-1, -1}, {897, 442}}</string>
<string key="NSFrame">{{-1, -1}, {955, 445}}</string>
<reference key="NSSuperview" ref="657042048"/>
<bool key="NSIsVertical">YES</bool>
<int key="NSDividerStyle">2</int>
</object>
</object>
<string key="NSFrameSize">{895, 440}</string>
<string key="NSFrameSize">{953, 443}</string>
<reference key="NSSuperview" ref="135073984"/>
</object>
<string key="NSLabel">Tree</string>
@@ -1106,24 +976,25 @@
</object>
</object>
</object>
<string key="NSFrame">{{0, 144}, {895, 440}}</string>
<string key="NSFrame">{{0, 145}, {953, 443}}</string>
<reference key="NSSuperview" ref="202620420"/>
<string key="NSClassName">NSView</string>
</object>
</object>
<string key="NSFrameSize">{895, 584}</string>
<string key="NSFrameSize">{953, 588}</string>
<reference key="NSSuperview" ref="319362431"/>
<int key="NSDividerStyle">2</int>
<string key="NSAutosaveName">HistoryViewSplitView</string>
</object>
</object>
<string key="NSFrameSize">{895, 613}</string>
<string key="NSFrameSize">{953, 617}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomObject" id="892732705">
<string key="NSClassName">PBRefController</string>
</object>
<object class="NSViewController" id="216727784"/>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -1753,53 +1624,13 @@
</object>
<int key="connectionID">398</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: selectedCommitDetailsIndex</string>
<reference key="source" ref="262808078"/>
<reference key="destination" ref="1001"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="262808078"/>
<reference key="NSDestination" ref="1001"/>
<string key="NSLabel">enabled: selectedCommitDetailsIndex</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">selectedCommitDetailsIndex</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">416</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleQLPreviewPanel:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="262808078"/>
</object>
<int key="connectionID">419</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">webViewFileViwer</string>
<string key="label">fileViewer</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="59059856"/>
<reference key="destination" ref="626906425"/>
</object>
<int key="connectionID">425</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">displayControl</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="607494970"/>
</object>
<int key="connectionID">426</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">updateFileViwer:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="607494970"/>
</object>
<int key="connectionID">429</int>
<int key="connectionID">438</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2051,7 +1882,6 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="776605770"/>
<reference ref="505177858"/>
</object>
<reference key="parent" ref="657042048"/>
</object>
@@ -2295,64 +2125,9 @@
<reference key="parent" ref="16222431"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">399</int>
<reference key="object" ref="505177858"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="502709061"/>
<reference ref="59059856"/>
</object>
<reference key="parent" ref="626906425"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">400</int>
<reference key="object" ref="502709061"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="262808078"/>
<reference ref="167111508"/>
<reference ref="737343933"/>
</object>
<reference key="parent" ref="505177858"/>
<string key="objectName">File Show Control Toolbar</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">401</int>
<reference key="object" ref="737343933"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="607494970"/>
</object>
<reference key="parent" ref="502709061"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">402</int>
<reference key="object" ref="262808078"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="325362753"/>
</object>
<reference key="parent" ref="502709061"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">408</int>
<reference key="object" ref="167111508"/>
<reference key="parent" ref="502709061"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">414</int>
<reference key="object" ref="325362753"/>
<reference key="parent" ref="262808078"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">415</int>
<reference key="object" ref="607494970"/>
<reference key="parent" ref="737343933"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">424</int>
<reference key="object" ref="59059856"/>
<reference key="parent" ref="505177858"/>
<int key="objectID">435</int>
<reference key="object" ref="216727784"/>
<reference key="parent" ref="0"/>
</object>
</object>
</object>
@@ -2439,18 +2214,9 @@
<string>388.IBPluginDependency</string>
<string>39.IBPluginDependency</string>
<string>39.ImportedFromIB2</string>
<string>399.IBPluginDependency</string>
<string>4.IBAttributePlaceholdersKey</string>
<string>4.IBPluginDependency</string>
<string>400.IBPluginDependency</string>
<string>401.IBPluginDependency</string>
<string>402.IBAttributePlaceholdersKey</string>
<string>402.IBPluginDependency</string>
<string>408.IBPluginDependency</string>
<string>414.IBPluginDependency</string>
<string>415.IBPluginDependency</string>
<string>415.IBSegmentedControlInspectorSelectedSegmentMetadataKey</string>
<string>424.IBPluginDependency</string>
<string>435.IBPluginDependency</string>
<string>46.IBEditorWindowLastContentRect</string>
<string>46.IBPluginDependency</string>
<string>48.IBPluginDependency</string>
@@ -2606,7 +2372,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
@@ -2616,22 +2381,7 @@
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
<string key="name">ToolTip</string>
<reference key="object" ref="262808078"/>
<string key="toolTip">Quick Look</string>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="2"/>
<string>com.apple.WebKitIBPlugin</string>
<string>{{1414, 293}, {895, 613}}</string>
<string>{{110, 110}, {953, 617}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
@@ -2667,7 +2417,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">429</int>
<int key="maxID">438</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2778,8 +2528,8 @@
<string>cherryPickButton</string>
<string>commitController</string>
<string>commitList</string>
<string>displayControl</string>
<string>fileBrowser</string>
<string>fileViewer</string>
<string>historySplitView</string>
<string>localRemoteBranchesFilterItem</string>
<string>mergeButton</string>
@@ -2791,7 +2541,6 @@
<string>treeController</string>
<string>upperToolbarView</string>
<string>webView</string>
<string>webViewFileViwer</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2799,8 +2548,8 @@
<string>NSButton</string>
<string>NSArrayController</string>
<string>NSTableView</string>
<string>NSSegmentedCell</string>
<string>NSOutlineView</string>
<string>NSSplitView</string>
<string>PBCollapsibleSplitView</string>
<string>NSButton</string>
<string>NSButton</string>
@@ -2812,7 +2561,6 @@
<string>NSTreeController</string>
<string>PBGitGradientBarView</string>
<string>id</string>
<string>WebView</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
PBGitTree.m
-7
View File
@@ -128,13 +128,6 @@
if ([self fileSize] > 52428800) // ~50MB
return [NSString stringWithFormat:@"%@ is too big to be displayed (%d bytes)", [self fullPath], [self fileSize]];
if(option==0)
contents=[repository outputForArguments:[NSArray arrayWithObjects:@"show", [self refSpec], nil]];
else if(option==1)
contents=[PBGitTree parseBlame:[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"blame", @"-p", self.fullPath, self.sha, nil]]];
else if(option==2)
contents=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff", self.sha, self.fullPath, nil]];
if ([self hasBinaryHeader:contents])
return [NSString stringWithFormat:@"%@ appears to be a binary file of %d bytes", [self fullPath], [self fileSize]];
PBWebChangesController.h
+4
View File
@@ -22,7 +22,11 @@
PBChangedFile *selectedFile;
BOOL selectedFileIsCached;
FileViewerController *fileViewerController;
}
@property(readwrite) FileViewerController *fileViewerController;
-(IBAction)displayControlChanged:(id)sender;
- (void) refresh;
PBWebChangesController.m
+7 -2
View File
@@ -12,6 +12,8 @@
@implementation PBWebChangesController
@synthesize fileViewerController;
- (void) awakeFromNib
{
selectedFile = nil;
@@ -72,8 +74,11 @@
- (void) refresh
{
if (!finishedLoading)
[fileViewerController showFile:[selectedFile path] sha:nil];
/*if (!finishedLoading)
return;
[fileViewerController showFile:selectedFile sha:@""];
id script = [view windowScriptObject];
@@ -85,7 +90,7 @@
[script callWebScriptMethod:@"showFileBlame"
withArguments:[NSArray arrayWithObjects:selectedFile ?: (id)[NSNull null],
[NSNumber numberWithBool:selectedFileIsCached], nil]];
}
}*/
}
- (void)stageHunk:(NSString *)hunk reverse:(BOOL)reverse
html/views/commit/commit.js
+4
View File
@@ -179,6 +179,10 @@ var diffHeader;
var originalDiff;
var originalCached;
var showFile = function(diff) {
displayDiff(diff,false);
}
var displayDiff = function(diff, cached)
{
diffHeader = diff.split("\n").slice(0,4).join("\n");
html/views/commit/test.html
+95
View File
@@ -0,0 +1,95 @@
<html><head>
<title>Diff for file</title>
<link rel="stylesheet" href="../../css/GitX.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="../../lib/GitX.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/md5.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/diffHighlighter.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/keyboardNavigation.js" type="text/javascript" charset="utf-8"></script>
<link rel="stylesheet" href="commit.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="commit.js" type="text/javascript" chahrset="utf-8"></script>
<script src="multipleSelection.js" type="text/javascript" chahrset="utf-8"></script>
</head><body>
<h1 id="title">
<input type="range" min="1" max="8" value="3" id="contextSize">
<span id="contextTitle">Context:</span>
<span id="status">Nothing to commit</span>
</h1>
<div id="notification" style="display:none">
<img src="../../images/spinner.gif" alt="Spinner" id="spinner">
<div id="notification_message"></div>
</div>
<!-- we use "state" for the current status (as opposed to something in the diff
and we use the notification for short notifications, which can occur together
with a diff display -->
<div id="state">
Nothing to commit (working directory clean)
</div>
<div id="diff" class="diff"><div class="file" id="file_index_0"><div class="fileHeader">PBWebChangesController.m</div><div class="diffContent"><div class="lineno">...
12
13
14
15
16
17
...
72
73
74
75
76
77
78
79
...
85
86
87
88
89
90
91
</div><div class="lineno">...
12
13
14
15
16
17
18
19
...
74
75
76
77
78
79
80
81
82
83
84
...
90
91
92
93
94
95
96
</div><div class="lines"><div index="0" class="hunkheader"><a href="#" class="hunkbutton" onclick="discardHunk(this, event); return false">Discard</a><a href="#" class="hunkbutton" onclick="addHunk(this, false); return false">Stage</a>@@ -12,6 +12,8 @@</div><div index="1" class="noopline"> </div><div index="2" class="noopline"> @implementation PBWebChangesController</div><div index="3" class="noopline"> </div><div index="4" class="addline">+@synthesize fileViewerController;</div><div index="5" class="addline">+</div><div index="6" class="noopline"> - (void) awakeFromNib</div><div index="7" class="noopline"> {</div><div index="8" class="noopline"> selectedFile = nil;</div><div index="9" class="hunkheader"><a href="#" class="hunkbutton" onclick="discardHunk(this, event); return false">Discard</a><a href="#" class="hunkbutton" onclick="addHunk(this, false); return false">Stage</a>@@ -72,8 +74,11 @@ -(IBAction)displayControlChanged:(id)sender{</div><div index="10" class="noopline"> </div><div index="11" class="noopline"> - (void) refresh</div><div index="12" class="noopline"> {</div><div index="13" class="delline">- if (!finishedLoading)</div><div index="14" class="addline">+ [fileViewerController showFile:[selectedFile path] sha:nil];</div><div index="15" class="addline">+ /*if (!finishedLoading)</div><div index="16" class="noopline"> return;</div><div index="17" class="addline">+<span class="whitespace"> </span></div><div index="18" class="addline">+ [fileViewerController showFile:selectedFile sha:@""];</div><div index="19" class="noopline"> </div><div index="20" class="noopline"> id script = [view windowScriptObject];</div><div index="21" class="noopline"> </div><div index="22" class="hunkheader"><a href="#" class="hunkbutton" onclick="discardHunk(this, event); return false">Discard</a><a href="#" class="hunkbutton" onclick="addHunk(this, false); return false">Stage</a>@@ -85,7 +90,7 @@ - (void) refresh</div><div index="23" class="noopline"> [script callWebScriptMethod:@"showFileBlame"</div><div index="24" class="noopline"> withArguments:[NSArray arrayWithObjects:selectedFile ?: (id)[NSNull null],</div><div index="25" class="noopline"> [NSNumber numberWithBool:selectedFileIsCached], nil]];</div><div index="26" class="delline">- }</div><div index="27" class="addline">+ }*/</div><div index="28" class="noopline"> }</div><div index="29" class="noopline"> </div><div index="30" class="noopline"> - (void)stageHunk:(NSString *)hunk reverse:(BOOL)reverse</div></div></div></div></div>
</body></html>