VisualizationView.rb @@ -40,13 +40,8 @@ class ApplicationController < OSX::NSObject return true end - def awakeFromNib - begin - @repo = Grit::Repo.new(REPOSITORY_LOCATION) - rescue Grit::InvalidGitRepositoryError - return false - end - + def awakeFromNib + repo @window.delegate = self column = @commits_table.tableColumns[0] cell = CommitSummaryCell.alloc.init @@ -58,6 +53,14 @@ class ApplicationController < OSX::NSObject @branch_field.cell.setBackgroundStyle(NSBackgroundStyleRaised) end + def repo + begin + @repo ||= Grit::Repo.new(REPOSITORY_LOCATION) + rescue Grit::InvalidGitRepositoryError + return false + end + end + ib_action :show_info_panel def show_info_panel(sender) if @info_controller.nil? @@ -68,8 +71,15 @@ class ApplicationController < OSX::NSObject ib_action :swap_tab def swap_tab(segment) - tags = %w(commits network) - tag = segment.cell.tagForSegment(segment.selectedSegment) - @tab_panel.selectTabViewItemWithIdentifier(tags[tag]) + tag = %w(commits network)[segment.cell.tagForSegment(segment.selectedSegment)] + @tab_panel.selectTabViewItemWithIdentifier(tag) end + + # def tabView_didSelectTabViewItem(tab_view, tab_view_item) + # item = tab_view_item.identifier + # if item == "network" + # @controller ||= VisualizationController.alloc.init_with_repo(@repo) + # tab_view_item.setView(@controller.view) + # end + # end end ApplicationController.rb @@ -8,7 +8,8 @@ <string key="IBDocument.HIToolboxVersion">352.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="2"/> + <integer value="344"/> + <integer value="491"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -219,7 +220,7 @@ <string key="NSContents">Branch:</string> <reference key="NSSupport" ref="98627494"/> <reference key="NSControlView" ref="869639466"/> - <object class="NSColor" key="NSBackgroundColor" id="614213217"> + <object class="NSColor" key="NSBackgroundColor" id="227031787"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> <string key="NSColorName">controlColor</string> @@ -239,22 +240,22 @@ </object> </object> </object> - <object class="NSTabView" id="612505419"> + <object class="NSTabView" id="1049027428"> <reference key="NSNextResponder" ref="831824449"/> <int key="NSvFlags">4114</int> <string key="NSFrame">{{0, 44}, {1045, 664}}</string> <reference key="NSSuperview" ref="831824449"/> <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTabViewItem" id="58701569"> + <object class="NSTabViewItem" id="22598373"> <string key="NSIdentifier">commits</string> - <object class="NSView" key="NSView" id="880862063"> + <object class="NSView" key="NSView" id="339403319"> <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSSplitView" id="476771339"> - <reference key="NSNextResponder" ref="880862063"/> + <reference key="NSNextResponder" ref="339403319"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -397,7 +398,7 @@ </object> </object> <string key="NSFrameSize">{1011, 639}</string> - <reference key="NSSuperview" ref="880862063"/> + <reference key="NSSuperview" ref="339403319"/> <bool key="NSIsVertical">YES</bool> <int key="NSDividerStyle">2</int> </object> @@ -405,42 +406,52 @@ <string key="NSFrameSize">{1045, 664}</string> </object> <string key="NSLabel">Commits</string> - <reference key="NSColor" ref="614213217"/> - <reference key="NSTabView" ref="612505419"/> + <reference key="NSColor" ref="227031787"/> + <reference key="NSTabView" ref="1049027428"/> </object> - <object class="NSTabViewItem" id="232305301"> + <object class="NSTabViewItem" id="210041055"> <string key="NSIdentifier">network</string> - <object class="NSView" key="NSView" id="553269542"> - <reference key="NSNextResponder" ref="612505419"/> + <object class="NSView" key="NSView" id="856932408"> + <reference key="NSNextResponder" ref="1049027428"/> <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSCustomView" id="48941844"> + <reference key="NSNextResponder" ref="856932408"/> + <int key="NSvFlags">274</int> + <string key="NSFrameSize">{990, 639}</string> + <reference key="NSSuperview" ref="856932408"/> + <string key="NSClassName">VisualizationView</string> + </object> + </object> <string key="NSFrameSize">{1045, 664}</string> - <reference key="NSSuperview" ref="612505419"/> + <reference key="NSSuperview" ref="1049027428"/> </object> <string key="NSLabel">Network</string> - <reference key="NSColor" ref="614213217"/> - <reference key="NSTabView" ref="612505419"/> + <reference key="NSColor" ref="227031787"/> + <reference key="NSTabView" ref="1049027428"/> </object> </object> - <reference key="NSSelectedTabViewItem" ref="232305301"/> + <reference key="NSSelectedTabViewItem" ref="210041055"/> <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="553269542"/> + <reference ref="856932408"/> </object> </object> - <object class="NSSegmentedControl" id="1028843998"> + <object class="NSSegmentedControl" id="637722390"> <reference key="NSNextResponder" ref="831824449"/> <int key="NSvFlags">292</int> <string key="NSFrame">{{186, 9}, {71, 25}}</string> <reference key="NSSuperview" ref="831824449"/> <bool key="NSEnabled">YES</bool> - <object class="NSSegmentedCell" key="NSCell" id="751099816"> + <object class="NSSegmentedCell" key="NSCell" id="523062467"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> <reference key="NSSupport" ref="333987"/> - <reference key="NSControlView" ref="1028843998"/> + <reference key="NSControlView" ref="637722390"/> <object class="NSMutableArray" key="NSSegmentImages"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSSegmentItem"> @@ -879,7 +890,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> @@ -932,6 +943,7 @@ </object> </object> <string key="NSFrameSize">{481, 404}</string> + <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomObject" id="498734212"> @@ -1297,7 +1309,7 @@ <object class="IBOutletConnection" key="connection"> <string key="label">extras_segment</string> <reference key="source" ref="620275248"/> - <reference key="destination" ref="1028843998"/> + <reference key="destination" ref="637722390"/> </object> <int key="connectionID">498</int> </object> @@ -1305,7 +1317,7 @@ <object class="IBOutletConnection" key="connection"> <string key="label">tab_panel</string> <reference key="source" ref="620275248"/> - <reference key="destination" ref="612505419"/> + <reference key="destination" ref="1049027428"/> </object> <int key="connectionID">500</int> </object> @@ -1313,10 +1325,26 @@ <object class="IBActionConnection" key="connection"> <string key="label">swap_tab:</string> <reference key="source" ref="620275248"/> - <reference key="destination" ref="1028843998"/> + <reference key="destination" ref="637722390"/> </object> <int key="connectionID">503</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="1049027428"/> + <reference key="destination" ref="620275248"/> + </object> + <int key="connectionID">504</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">application_controller</string> + <reference key="source" ref="48941844"/> + <reference key="destination" ref="620275248"/> + </object> + <int key="connectionID">506</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1360,8 +1388,8 @@ <reference ref="60591724"/> <reference ref="1072506144"/> <reference ref="869639466"/> - <reference ref="612505419"/> - <reference ref="1028843998"/> + <reference ref="1049027428"/> + <reference ref="637722390"/> </object> <reference key="parent" ref="469667931"/> </object> @@ -1801,31 +1829,31 @@ </object> <object class="IBObjectRecord"> <int key="objectID">485</int> - <reference key="object" ref="612505419"/> + <reference key="object" ref="1049027428"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="58701569"/> - <reference ref="232305301"/> + <reference ref="22598373"/> + <reference ref="210041055"/> </object> <reference key="parent" ref="831824449"/> </object> <object class="IBObjectRecord"> <int key="objectID">486</int> - <reference key="object" ref="58701569"/> + <reference key="object" ref="22598373"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="880862063"/> + <reference ref="339403319"/> </object> - <reference key="parent" ref="612505419"/> + <reference key="parent" ref="1049027428"/> </object> <object class="IBObjectRecord"> <int key="objectID">487</int> - <reference key="object" ref="880862063"/> + <reference key="object" ref="339403319"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="476771339"/> </object> - <reference key="parent" ref="58701569"/> + <reference key="parent" ref="22598373"/> </object> <object class="IBObjectRecord"> <int key="objectID">343</int> @@ -1835,7 +1863,7 @@ <reference ref="1052727212"/> <reference ref="573867155"/> </object> - <reference key="parent" ref="880862063"/> + <reference key="parent" ref="339403319"/> </object> <object class="IBObjectRecord"> <int key="objectID">255</int> @@ -1888,34 +1916,40 @@ </object> <object class="IBObjectRecord"> <int key="objectID">490</int> - <reference key="object" ref="232305301"/> + <reference key="object" ref="210041055"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="553269542"/> + <reference ref="856932408"/> </object> - <reference key="parent" ref="612505419"/> + <reference key="parent" ref="1049027428"/> </object> <object class="IBObjectRecord"> <int key="objectID">491</int> - <reference key="object" ref="553269542"/> + <reference key="object" ref="856932408"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="48941844"/> </object> - <reference key="parent" ref="232305301"/> + <reference key="parent" ref="210041055"/> </object> <object class="IBObjectRecord"> <int key="objectID">496</int> - <reference key="object" ref="1028843998"/> + <reference key="object" ref="637722390"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="751099816"/> + <reference ref="523062467"/> </object> <reference key="parent" ref="831824449"/> </object> <object class="IBObjectRecord"> <int key="objectID">497</int> - <reference key="object" ref="751099816"/> - <reference key="parent" ref="1028843998"/> + <reference key="object" ref="523062467"/> + <reference key="parent" ref="637722390"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">505</int> + <reference key="object" ref="48941844"/> + <reference key="parent" ref="856932408"/> </object> </object> </object> @@ -2039,6 +2073,7 @@ <string>485.IBAttributePlaceholdersKey</string> <string>496.IBPluginDependency</string> <string>497.IBPluginDependency</string> + <string>505.IBPluginDependency</string> <string>56.IBPluginDependency</string> <string>56.ImportedFromIB2</string> <string>57.IBEditorWindowLastContentRect</string> @@ -2194,13 +2229,14 @@ <string key="NS.key.0">InitialTabViewItem</string> <object class="IBInitialTabViewItemAttribute" key="NS.object.0"> <string key="name">InitialTabViewItem</string> - <reference key="object" ref="612505419"/> - <reference key="initialTabViewItem" ref="58701569"/> + <reference key="object" ref="1049027428"/> + <reference key="initialTabViewItem" ref="22598373"/> </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> <reference ref="9"/> <string>{{488, 641}, {218, 193}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2230,7 +2266,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">503</int> + <int key="maxID">506</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -2388,6 +2424,25 @@ <string key="minorKey"/> </object> </object> + <object class="IBPartialClassDescription"> + <string key="className">VisualizationView</string> + <string key="superclassName">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">VisualizationView.rb</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">VisualizationView</string> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">application_controller</string> + <string key="NS.object.0">id</string> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> </object> </object> <int key="IBDocument.localizationMode">0</int> English.lproj/MainMenu.xib @@ -21,6 +21,7 @@ 285BB54A0D849EA60027980C /* InfoWindowController.rb in Resources */ = {isa = PBXBuildFile; fileRef = 285BB5470D849EA60027980C /* InfoWindowController.rb */; }; 286F109E0D7A49380055A0D1 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 286F109D0D7A49380055A0D1 /* WebKit.framework */; }; 28851B3E0DB0571A00FA9C7D /* network.png in Resources */ = {isa = PBXBuildFile; fileRef = 28851B3D0DB0571A00FA9C7D /* network.png */; }; + 28851B970DB147AA00FA9C7D /* VisualizationView.rb in Resources */ = {isa = PBXBuildFile; fileRef = 28851B960DB147AA00FA9C7D /* VisualizationView.rb */; }; 288853050D7CE2E500862D67 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 288853040D7CE2E500862D67 /* LICENSE */; }; 2888530D0D7CEA5200862D67 /* gitnub-icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2888530C0D7CEA5200862D67 /* gitnub-icon.icns */; }; 288853C90D7E06A600862D67 /* commit.html in Resources */ = {isa = PBXBuildFile; fileRef = 288853C80D7E06A600862D67 /* commit.html */; }; @@ -69,6 +70,7 @@ 285BB5470D849EA60027980C /* InfoWindowController.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = InfoWindowController.rb; sourceTree = "<group>"; }; 286F109D0D7A49380055A0D1 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; }; 28851B3D0DB0571A00FA9C7D /* network.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = network.png; sourceTree = "<group>"; }; + 28851B960DB147AA00FA9C7D /* VisualizationView.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = VisualizationView.rb; sourceTree = "<group>"; }; 288853040D7CE2E500862D67 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; }; 2888530C0D7CEA5200862D67 /* gitnub-icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "gitnub-icon.icns"; sourceTree = "<group>"; }; 288853C80D7E06A600862D67 /* commit.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = commit.html; sourceTree = "<group>"; }; @@ -163,6 +165,7 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( + 28851B960DB147AA00FA9C7D /* VisualizationView.rb */, 283254650D8B792500D99366 /* lib */, 285BB52F0D849C890027980C /* TexturedWindow.rb */, 285BB4690D8306C60027980C /* mime-types */, @@ -277,6 +280,7 @@ 283254680D8B792500D99366 /* lib in Resources */, 0A4023590D949E0E00659E01 /* ImageLoadOperation.rb in Resources */, 28851B3E0DB0571A00FA9C7D /* network.png in Resources */, + 28851B970DB147AA00FA9C7D /* VisualizationView.rb in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; GitNub.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ class InfoWindowController < OSX::NSWindowController ib_outlet :push_url ib_outlet :clone_url ib_outlet :commits_count + def init_with_repository(repository) @repo = repository initWithWindowNibName("Info") InfoWindowController.rb 1d06d2cee77d78cc3f34dc8c73a626e73ac1853f Justin Palmer justin@activereload.net http://github.com/kballard/gitnub/commit/05a6b82844fe45353d4a9fe627d12d35cafc6d5f 05a6b82844fe45353d4a9fe627d12d35cafc6d5f 2008-04-12T13:17:46-07:00 2008-04-12T13:17:46-07:00 Testing out the quartz drawing. Getting some where a8ff6a75153e96f59685a43ee339b6d2517b9e5b Justin Palmer justin@activereload.net