@@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">352.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="579"/> + <integer value="578"/> <integer value="344"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> @@ -488,12 +488,12 @@ <string key="NSIdentifier">browser</string> <object class="NSView" key="NSView" id="245622268"> <reference key="NSNextResponder" ref="1049027428"/> - <int key="NSvFlags">256</int> + <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSSplitView" id="623515617"> <reference key="NSNextResponder" ref="245622268"/> - <int key="NSvFlags">256</int> + <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSScrollView" id="270857048"> @@ -1277,9 +1277,6 @@ <object class="NSCustomObject" id="869013782"> <string key="NSClassName">TreeController</string> </object> - <object class="NSCustomObject" id="1049074456"> - <string key="NSClassName">GNTreeDataSource</string> - </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -1750,14 +1747,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">tree_data_source</string> - <reference key="source" ref="869013782"/> - <reference key="destination" ref="1049074456"/> - </object> - <int key="connectionID">585</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">main_webview</string> <reference key="source" ref="869013782"/> <reference key="destination" ref="591982567"/> @@ -2579,12 +2568,6 @@ <reference key="parent" ref="269908025"/> <string key="objectName">TreeController</string> </object> - <object class="IBObjectRecord"> - <int key="objectID">583</int> - <reference key="object" ref="1049074456"/> - <reference key="parent" ref="269908025"/> - <string key="objectName">GNTreeDataSource</string> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -2747,7 +2730,6 @@ <string>58.IBPluginDependency</string> <string>58.ImportedFromIB2</string> <string>580.IBPluginDependency</string> - <string>583.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -2818,7 +2800,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{364, 27}, {481, 404}}</string> + <string>{{396, 69}, {481, 404}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{261, 325}, {481, 404}}</string> <string>GitNubWebView</string> @@ -2917,7 +2899,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -2940,7 +2921,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">587</int> + <int key="maxID">588</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -3078,14 +3059,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">GNTreeDataSource</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">GNTreeDataSource.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">GitNubWebView</string> <string key="superclassName">WebView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -3178,7 +3151,6 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>file_canvas</string> <string>main_canvas</string> - <string>main_webview</string> <string>tree_data_source</string> <string>tree_outline</string> </object> @@ -3188,7 +3160,6 @@ <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> English.lproj/MainMenu.xib @@ -14,7 +14,6 @@ static GNFileSystemItem *rootItem = nil; { if (self = [super init]) { - relativePath = [[path lastPathComponent] copy]; parent = obj; } @@ -70,9 +69,9 @@ static GNFileSystemItem *rootItem = nil; continue; } - if([self ignoredByGit:sourceFile]) { - continue; - } + // if([self ignoredByGit:sourceFile]) { + // continue; + // } GNFileSystemItem *newChild = [[GNFileSystemItem alloc] initWithPath:sourceFile parent:self]; [children addObject:newChild]; GNFileSystemItem.m @@ -236,19 +236,20 @@ class CommitsController < OSX::NSObject def search_commits(category, query) unless query == "" + branch = @branch.to_s @searching = true repo = @application_controller.repo case category.downcase.to_sym when :message - @commits = Grit::Commit.find_all(repo, @branch, {:grep => query, :i => true}) + @commits = Grit::Commit.find_all(repo, branch, {:grep => query, :i => true}) when :committer - @commits = Grit::Commit.find_all(repo, @branch, {:committer => query}) + @commits = Grit::Commit.find_all(repo, branch, {:committer => query}) when :author - @commits = Grit::Commit.find_all(repo, @branch, {:author => query}) + @commits = Grit::Commit.find_all(repo, branch, {:author => query}) when :sha1 @commits = [repo.commit(query)] when :path - @commits = repo.log(@branch, query) + @commits = repo.log(branch, query) end @commits_table.reloadData select_latest_commit controllers/CommitsController.rb @@ -16,9 +16,13 @@ class TreeController < OSX::NSObject ib_outlet :file_canvas ib_outlet :tree_data_source ib_outlet :main_canvas - ib_outlet :main_webview def awakeFromNib + main_view = WebView.alloc.init + main_view.setAutoresizingMask(NSViewWidthSizable|NSViewHeightSizable) + main_view.setFrameSize(@main_canvas.frame.size) + @main_canvas.addSubview(main_view) + dsource = GNTreeDataSource.alloc.init @tree_outline.setDataSource(dsource) @tree_outline.setDelegate(dsource) controllers/TreeController.rb 9b900127ea95210803ccc8fb48da2e6dbfbb0349 Justin Palmer justin@activereload.net http://github.com/Caged/gitnub/commit/2b70bce1e33659a98654a6940553f4621a9074db 2b70bce1e33659a98654a6940553f4621a9074db 2008-10-04T15:19:17-07:00 2008-10-04T15:19:17-07:00 Add blame view canvas and make sure searching uses strings insted of symbols bbb4e42ad3e3df4a8291dfecdb8122b0fd50bc09 Justin Palmer justin@activereload.net