@@ -8,7 +8,8 @@ <string key="IBDocument.HIToolboxVersion">352.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="569"/> + <integer value="579"/> + <integer value="344"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -31,7 +32,7 @@ <object class="NSWindowTemplate" id="469667931"> <int key="NSWindowStyleMask">4111</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{368, -103}, {990, 682}}</string> + <string key="NSWindowRect">{{246, 89}, {990, 682}}</string> <int key="NSWTFlags">813170688</int> <string key="NSWindowTitle">GitNub</string> <string key="NSWindowClass">TexturedWindow</string> @@ -311,7 +312,7 @@ <int key="NSColorSpace">3</int> <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes> </object> - <object class="NSColor" key="NSTextColor" id="397514725"> + <object class="NSColor" key="NSTextColor" id="423502281"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">headerTextColor</string> @@ -483,33 +484,33 @@ <reference key="NSColor" ref="227031787"/> <reference key="NSTabView" ref="1049027428"/> </object> - <object class="NSTabViewItem" id="26582685"> + <object class="NSTabViewItem" id="319965955"> <string key="NSIdentifier">browser</string> - <object class="NSView" key="NSView" id="806511338"> + <object class="NSView" key="NSView" id="245622268"> <reference key="NSNextResponder" ref="1049027428"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSSplitView" id="637141095"> - <reference key="NSNextResponder" ref="806511338"/> + <object class="NSSplitView" id="623515617"> + <reference key="NSNextResponder" ref="245622268"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSScrollView" id="899472932"> - <reference key="NSNextResponder" ref="637141095"/> + <object class="NSScrollView" id="270857048"> + <reference key="NSNextResponder" ref="623515617"/> <int key="NSvFlags">4370</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="507817483"> - <reference key="NSNextResponder" ref="899472932"/> + <object class="NSClipView" id="831128914"> + <reference key="NSNextResponder" ref="270857048"/> <int key="NSvFlags">2304</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSOutlineView" id="507273091"> - <reference key="NSNextResponder" ref="507817483"/> + <object class="NSOutlineView" id="377230220"> + <reference key="NSNextResponder" ref="831128914"/> <int key="NSvFlags">4370</int> - <string key="NSFrameSize">{287, 655}</string> - <reference key="NSSuperview" ref="507817483"/> + <string key="NSFrameSize">{287, 640}</string> + <reference key="NSSuperview" ref="831128914"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> <nil key="NSNextResponder"/> @@ -518,7 +519,7 @@ </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTableColumn" id="954310628"> + <object class="NSTableColumn" id="942471857"> <double key="NSWidth">2.840000e+02</double> <double key="NSMinWidth">1.600000e+01</double> <double key="NSMaxWidth">1.000000e+03</double> @@ -531,21 +532,21 @@ <int key="NSColorSpace">3</int> <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes> </object> - <reference key="NSTextColor" ref="397514725"/> + <reference key="NSTextColor" ref="423502281"/> </object> - <object class="NSTextFieldCell" key="NSDataCell" id="495402326"> + <object class="NSTextFieldCell" key="NSDataCell" id="64879124"> <int key="NSCellFlags">337772096</int> <int key="NSCellFlags2">2048</int> <string key="NSContents">Files</string> <reference key="NSSupport" ref="98627494"/> - <reference key="NSControlView" ref="507273091"/> + <reference key="NSControlView" ref="377230220"/> <reference key="NSBackgroundColor" ref="1046813822"/> <reference key="NSTextColor" ref="394328784"/> </object> <int key="NSResizingMask">3</int> <bool key="NSIsResizeable">YES</bool> <bool key="NSIsEditable">YES</bool> - <reference key="NSTableView" ref="507273091"/> + <reference key="NSTableView" ref="377230220"/> </object> </object> <double key="NSIntercellSpacingWidth">3.000000e+00</double> @@ -577,52 +578,52 @@ <float key="NSOutlineViewIndentationPerLevelKey">1.400000e+01</float> </object> </object> - <string key="NSFrameSize">{287, 655}</string> - <reference key="NSSuperview" ref="899472932"/> - <reference key="NSNextKeyView" ref="507273091"/> - <reference key="NSDocView" ref="507273091"/> + <string key="NSFrameSize">{287, 640}</string> + <reference key="NSSuperview" ref="270857048"/> + <reference key="NSNextKeyView" ref="377230220"/> + <reference key="NSDocView" ref="377230220"/> <reference key="NSBGColor" ref="1046813822"/> <int key="NScvFlags">4</int> </object> - <object class="NSScroller" id="11704649"> - <reference key="NSNextResponder" ref="899472932"/> + <object class="NSScroller" id="443632992"> + <reference key="NSNextResponder" ref="270857048"/> <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{225, 0}, {15, 655}}</string> - <reference key="NSSuperview" ref="899472932"/> - <reference key="NSTarget" ref="899472932"/> + <reference key="NSSuperview" ref="270857048"/> + <reference key="NSTarget" ref="270857048"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">9.984520e-01</double> </object> - <object class="NSScroller" id="928228417"> - <reference key="NSNextResponder" ref="899472932"/> + <object class="NSScroller" id="530913792"> + <reference key="NSNextResponder" ref="270857048"/> <int key="NSvFlags">256</int> <string key="NSFrame">{{-100, -100}, {225, 15}}</string> - <reference key="NSSuperview" ref="899472932"/> + <reference key="NSSuperview" ref="270857048"/> <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="899472932"/> + <reference key="NSTarget" ref="270857048"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">9.955752e-01</double> </object> </object> - <string key="NSFrameSize">{287, 655}</string> - <reference key="NSSuperview" ref="637141095"/> - <reference key="NSNextKeyView" ref="507817483"/> + <string key="NSFrameSize">{287, 640}</string> + <reference key="NSSuperview" ref="623515617"/> + <reference key="NSNextKeyView" ref="831128914"/> <int key="NSsFlags">528</int> - <reference key="NSVScroller" ref="11704649"/> - <reference key="NSHScroller" ref="928228417"/> - <reference key="NSContentView" ref="507817483"/> + <reference key="NSVScroller" ref="443632992"/> + <reference key="NSHScroller" ref="530913792"/> + <reference key="NSContentView" ref="831128914"/> <bytes key="NSScrollAmts">QSAAAEEgAABBoAAAQaAAAA</bytes> </object> - <object class="NSCustomView" id="702100468"> - <reference key="NSNextResponder" ref="637141095"/> + <object class="NSCustomView" id="176859736"> + <reference key="NSNextResponder" ref="623515617"/> <int key="NSvFlags">274</int> - <string key="NSFrame">{{288, 0}, {710, 655}}</string> - <reference key="NSSuperview" ref="637141095"/> + <string key="NSFrame">{{288, 0}, {710, 640}}</string> + <reference key="NSSuperview" ref="623515617"/> <string key="NSClassName">NSView</string> </object> </object> - <string key="NSFrame">{{0, -14}, {998, 655}}</string> - <reference key="NSSuperview" ref="806511338"/> + <string key="NSFrameSize">{998, 640}</string> + <reference key="NSSuperview" ref="245622268"/> <bool key="NSIsVertical">YES</bool> <int key="NSDividerStyle">2</int> </object> @@ -635,13 +636,13 @@ <reference key="NSTabView" ref="1049027428"/> </object> </object> - <reference key="NSSelectedTabViewItem" ref="26582685"/> + <reference key="NSSelectedTabViewItem" ref="319965955"/> <reference key="NSFont" ref="98627494"/> <int key="NSTvFlags">6</int> <bool key="NSAllowTruncatedLabels">YES</bool> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="806511338"/> + <reference ref="245622268"/> </object> </object> <object class="NSSegmentedControl" id="637722390"> @@ -1227,7 +1228,7 @@ <string key="NSClassName">CommitsController</string> </object> <object class="NSCustomView" id="591982567"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1255,6 +1256,7 @@ </object> <string key="NSFrameSize">{481, 404}</string> <reference key="NSSuperview" ref="591982567"/> + <reference key="NSNextKeyView"/> <string key="FrameName"/> <string key="GroupName"/> <reference key="Preferences" ref="301908327"/> @@ -1263,6 +1265,7 @@ </object> </object> <string key="NSFrameSize">{481, 404}</string> + <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomObject" id="498734212"> @@ -1271,10 +1274,10 @@ <object class="NSCustomObject" id="580042981"> <string key="NSClassName">NetworkController</string> </object> - <object class="NSCustomObject" id="666841029"> + <object class="NSCustomObject" id="869013782"> <string key="NSClassName">TreeController</string> </object> - <object class="NSCustomObject" id="426484451"> + <object class="NSCustomObject" id="1049074456"> <string key="NSClassName">GNTreeDataSource</string> </object> </object> @@ -1732,34 +1735,42 @@ <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">tree_outline</string> - <reference key="source" ref="666841029"/> - <reference key="destination" ref="507273091"/> + <reference key="source" ref="869013782"/> + <reference key="destination" ref="377230220"/> </object> <int key="connectionID">581</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">file_canvas</string> - <reference key="source" ref="666841029"/> - <reference key="destination" ref="702100468"/> + <reference key="source" ref="869013782"/> + <reference key="destination" ref="176859736"/> </object> <int key="connectionID">582</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">dataSource</string> - <reference key="source" ref="507273091"/> - <reference key="destination" ref="426484451"/> + <string key="label">tree_data_source</string> + <reference key="source" ref="869013782"/> + <reference key="destination" ref="1049074456"/> </object> - <int key="connectionID">584</int> + <int key="connectionID">585</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">tree_data_source</string> - <reference key="source" ref="666841029"/> - <reference key="destination" ref="426484451"/> + <string key="label">main_webview</string> + <reference key="source" ref="869013782"/> + <reference key="destination" ref="591982567"/> </object> - <int key="connectionID">585</int> + <int key="connectionID">586</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">main_canvas</string> + <reference key="source" ref="869013782"/> + <reference key="destination" ref="176859736"/> + </object> + <int key="connectionID">587</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -2240,7 +2251,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="22598373"/> <reference ref="210041055"/> - <reference ref="26582685"/> + <reference ref="319965955"/> </object> <reference key="parent" ref="831824449"/> </object> @@ -2487,90 +2498,90 @@ </object> <object class="IBObjectRecord"> <int key="objectID">567</int> - <reference key="object" ref="26582685"/> + <reference key="object" ref="319965955"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="806511338"/> + <reference ref="245622268"/> </object> <reference key="parent" ref="1049027428"/> </object> <object class="IBObjectRecord"> <int key="objectID">568</int> - <reference key="object" ref="806511338"/> + <reference key="object" ref="245622268"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="637141095"/> + <reference ref="623515617"/> </object> - <reference key="parent" ref="26582685"/> + <reference key="parent" ref="319965955"/> </object> <object class="IBObjectRecord"> <int key="objectID">579</int> - <reference key="object" ref="637141095"/> + <reference key="object" ref="623515617"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="899472932"/> - <reference ref="702100468"/> + <reference ref="270857048"/> + <reference ref="176859736"/> </object> - <reference key="parent" ref="806511338"/> + <reference key="parent" ref="245622268"/> </object> <object class="IBObjectRecord"> <int key="objectID">569</int> - <reference key="object" ref="899472932"/> + <reference key="object" ref="270857048"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="11704649"/> - <reference ref="928228417"/> - <reference ref="507273091"/> + <reference ref="443632992"/> + <reference ref="530913792"/> + <reference ref="377230220"/> </object> - <reference key="parent" ref="637141095"/> + <reference key="parent" ref="623515617"/> </object> <object class="IBObjectRecord"> <int key="objectID">570</int> - <reference key="object" ref="11704649"/> - <reference key="parent" ref="899472932"/> + <reference key="object" ref="443632992"/> + <reference key="parent" ref="270857048"/> </object> <object class="IBObjectRecord"> <int key="objectID">571</int> - <reference key="object" ref="928228417"/> - <reference key="parent" ref="899472932"/> + <reference key="object" ref="530913792"/> + <reference key="parent" ref="270857048"/> </object> <object class="IBObjectRecord"> <int key="objectID">572</int> - <reference key="object" ref="507273091"/> + <reference key="object" ref="377230220"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="954310628"/> + <reference ref="942471857"/> </object> - <reference key="parent" ref="899472932"/> + <reference key="parent" ref="270857048"/> </object> <object class="IBObjectRecord"> <int key="objectID">574</int> - <reference key="object" ref="954310628"/> + <reference key="object" ref="942471857"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="495402326"/> + <reference ref="64879124"/> </object> - <reference key="parent" ref="507273091"/> + <reference key="parent" ref="377230220"/> </object> <object class="IBObjectRecord"> <int key="objectID">577</int> - <reference key="object" ref="495402326"/> - <reference key="parent" ref="954310628"/> + <reference key="object" ref="64879124"/> + <reference key="parent" ref="942471857"/> </object> <object class="IBObjectRecord"> <int key="objectID">578</int> - <reference key="object" ref="702100468"/> - <reference key="parent" ref="637141095"/> + <reference key="object" ref="176859736"/> + <reference key="parent" ref="623515617"/> </object> <object class="IBObjectRecord"> <int key="objectID">580</int> - <reference key="object" ref="666841029"/> + <reference key="object" ref="869013782"/> <reference key="parent" ref="269908025"/> <string key="objectName">TreeController</string> </object> <object class="IBObjectRecord"> <int key="objectID">583</int> - <reference key="object" ref="426484451"/> + <reference key="object" ref="1049074456"/> <reference key="parent" ref="269908025"/> <string key="objectName">GNTreeDataSource</string> </object> @@ -2609,6 +2620,8 @@ <string>2.ImportedFromIB2</string> <string>21.IBEditorWindowLastContentRect</string> <string>21.IBPluginDependency</string> + <string>21.IBViewEditorWindowController.showingBoundsRectangles</string> + <string>21.IBViewEditorWindowController.showingLayoutRectangles</string> <string>21.IBWindowTemplateEditedContentRect</string> <string>21.ImportedFromIB2</string> <string>21.NSWindowTemplate.visibleAtLaunch</string> @@ -2765,9 +2778,11 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> - <string>{{149, 161}, {990, 682}}</string> + <string>{{105, 155}, {990, 682}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{149, 161}, {990, 682}}</string> + <integer value="0" id="8"/> + <reference ref="9"/> + <string>{{105, 155}, {990, 682}}</string> <reference ref="9"/> <reference ref="9"/> <string>{{146, 174}, {990, 682}}</string> @@ -2792,7 +2807,7 @@ <reference ref="9"/> <string>{{70, 809}, {142, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="0" id="8"/> + <reference ref="8"/> <object class="NSColor"> <int key="NSColorSpace">1</int> <bytes key="NSRGB">MC44MDAwMDAwMSAwLjgwMDAwMDAxIDAuODAwMDAwMDEAA</bytes> @@ -2803,7 +2818,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{172, 78}, {481, 404}}</string> + <string>{{364, 27}, {481, 404}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{261, 325}, {481, 404}}</string> <string>GitNubWebView</string> @@ -2925,7 +2940,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">585</int> + <int key="maxID">587</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -3057,7 +3072,7 @@ <object class="IBPartialClassDescription"> <string key="className">GNOutlineView</string> <string key="superclassName">NSOutlineView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="761568913"> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1029472287"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">views/GNOutlineView.h</string> </object> @@ -3088,7 +3103,7 @@ </object> <object class="IBPartialClassDescription"> <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="761568913"/> + <reference key="sourceIdentifier" ref="1029472287"/> </object> <object class="IBPartialClassDescription"> <string key="className">NSSegmentedControl</string> @@ -3162,12 +3177,18 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <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> <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> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -3178,10 +3199,6 @@ <object class="IBPartialClassDescription"> <string key="className">TreeController</string> <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">tree_data_source</string> - <string key="NS.object.0">id</string> - </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBUserSource</string> <string key="minorKey"/> English.lproj/MainMenu.xib @@ -25,4 +25,5 @@ - (BOOL)isLeafNode; - (NSDictionary*)attributes; - (BOOL)isHeading; +- (BOOL)ignoredByGit:(NSString *)fileItem; @end GNFileSystemItem.h @@ -34,13 +34,19 @@ static GNFileSystemItem *rootItem = nil; return [[[NSApplication sharedApplication] delegate] repository_location]; } -// - (NSString *)ignoredByGit:(NSString *)fileItem -// { -// NSString *ret = [NSTask launchedTaskWithLaunchPath:@"/usr/bin/env" arguments: -// [NSArray arrayWithObjects:@"git", @"status", fileItem, nil]]; -// NSLog(@"%s RET: %@", _cmd, ret); -// return ret; -// } +- (BOOL)ignoredByGit:(NSString *)fileItem +{ + NSString *format; + if([[self fullPath] hasSuffix:@"/"]) + format = @"%@%@"; + else + format = @"%@/%@"; + + NSString *file = [NSString stringWithFormat:format, [self fullPath], fileItem]; + + BOOL ignored = [[[NSApplication sharedApplication] delegate] is_file_ignored:file]; + return !ignored; +} // Creates, caches, and returns the array of children // Loads children incrementally GNFileSystemItem.m @@ -53,5 +53,16 @@ return nil; } +- (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item +{ + BOOL isDir; + [[NSFileManager defaultManager] fileExistsAtPath:[item fullPath] isDirectory:&isDir]; + + if([item isHeading] || isDir) + return NO; + + return YES; +} + @end GNTreeDataSource.m @@ -20,6 +20,8 @@ require 'InfoWindowController' OSX.ns_import 'CommitSummaryCell' include OSX +#Grit.debug = true + # we use ENV['PWD'] instead of Dir.getwd if it exists so # `open GitNub` will work, since that launches us at / but leaves ENV['PWD'] intact pwd = Pathname.new(ENV['PWD'].nil? ? Dir.getwd : ENV['PWD']) @@ -61,7 +63,7 @@ class ApplicationController < OSX::NSObject @branch_field.cell.setBackgroundStyle(NSBackgroundStyleRaised) @tab_panel.setDelegate(self) - + setup_search_field setup_refs_view_menu @@ -86,6 +88,11 @@ class ApplicationController < OSX::NSObject end end + def is_file_ignored(file) + #return ignore_list.include?(file) + return false + end + def repository_location REPOSITORY_LOCATION.to_s.gsub('.git', '') end @@ -118,7 +125,32 @@ class ApplicationController < OSX::NSObject Notify.send "tab_view_changed", { :tab_item => tab_item.identifier } end + def swap_branch(item) + @commits_controller.swap_branch(item) + Notify.send('branch_was_changed', {:title => item.title}) + end + + def active_branch + @commits_controller.branch + end + private + def ignore_list + @ignore_list ||= lambda do + # Grit takes over ls-files so we have to run it this way + #repo.git.sh("cd #{repository_location}") + files = repo.git.run(nil, "ls-files", nil, {:others => true, :exclude_from => "#{repo.path}/info/exclude"}, []) + #puts files + + #files = files.split("\n").collect {|f| %(#{repository_location}#{f.strip.chomp}) } + # files.each do |f| + # puts f + # end + #puts files + files + end.call + end + def setup_refs_view_menu [@local_branches_menu, @remote_branches_menu, @tags_menu].each { |m| m.submenu.setAutoenablesItems(false) } @@ -133,7 +165,7 @@ class ApplicationController < OSX::NSObject item = NSMenuItem.alloc.initWithTitle_action_keyEquivalent(head.name, :swap_branch, index.to_s) item.setEnabled(true) item.setTag(index) - item.setTarget(@commits_controller) + item.setTarget(self) menu.submenu.addItem(item) end end controllers/ApplicationController.rb @@ -25,6 +25,8 @@ class CommitsController < OSX::NSObject ib_outlet :commit_details ib_outlet :application_controller + attr_reader :branch + def awakeFromNib @searching = false @current_commit_offset = 0 controllers/CommitsController.rb @@ -15,9 +15,34 @@ class TreeController < OSX::NSObject ib_outlet :tree_outline ib_outlet :file_canvas ib_outlet :tree_data_source + ib_outlet :main_canvas + ib_outlet :main_webview def awakeFromNib - @tree_outline.setDelegate(@tree_data_source) + dsource = GNTreeDataSource.alloc.init + @tree_outline.setDataSource(dsource) + @tree_outline.setDelegate(dsource) @tree_outline.expandItem(@tree_outline.itemAtRow(0)) + NSNotificationCenter.defaultCenter.objc_send(:addObserver, self, + :selector, :item_was_selected, + :name, "NSOutlineViewSelectionDidChangeNotification", + :object, @tree_outline) + + Notify.on 'branch_was_changed' do |opts| + puts "BRANCH WAS CHANGED" + end + end + + def branch_was_changed(branch) + puts "BRANCH WAS CHANGED" + end + + def item_was_selected(notification) + outline_view = notification.object + item = outline_view.itemAtRow(outline_view.selectedRow) + unless item.nil? + puts NSApplication.sharedApplication.delegate.active_branch + puts item.fullPath + end end end controllers/TreeController.rb @@ -13,7 +13,7 @@ module OSX notify.block = block c = OSX::NSDistributedNotificationCenter.defaultCenter - c.addObserver_selector_name_object_ notify, "call:", name, nil + c.addObserver_selector_name_object notify, "call:", name, nil return notify end lib/osx_notify.rb cb998729c0961b41f71e96207938698385d92427 Justin Palmer justin@activereload.net http://github.com/Caged/gitnub/commit/1463286d9bf53a87ea7bbfa49773b39e5a97720c 1463286d9bf53a87ea7bbfa49773b39e5a97720c 2008-10-04T14:02:00-07:00 2008-10-04T14:02:00-07:00 Lazily initialize the data source and other changes 8c1a3fd39398c57863a82f26b643db85457ccab0 Justin Palmer justin@activereload.net