CommitSummaryCell.h CommitSummaryCell.m @@ -12,7 +12,7 @@ require 'mime-types/lib/mime/types' require 'grit/lib/grit' require 'InfoWindowController' -OSX.ns_import 'ImageTextCell' +OSX.ns_import 'CommitSummaryCell' include OSX REPOSITORY_LOCATION = ENV['PWD'].nil? ? '' : ENV['PWD'] @@ -43,9 +43,8 @@ class ApplicationController < OSX::NSObject @window.delegate = self column = @commits_table.tableColumns[0] - cell = ImageTextCell.alloc.init + cell = CommitSummaryCell.alloc.init column.dataCell = cell - cell.dataDelegate = @commits_controller @main_view.setFrameSize(@main_canvas.frame.size) @main_canvas.addSubview(@main_view) ApplicationController.rb @@ -87,28 +87,15 @@ class CommitsController < OSX::NSObject @commits ? @commits.size : 0 end - # There is something fishy with ImageTextCell and this method so - # we set the commit object to be used in dataElementForCell and return nil def tableView_objectValueForTableColumn_row(table_view, table_column, row) - @commit = @commits[row] - return nil + @commits[row].message.gsub(/\n/, ' ').to_s end - # ImageTextCell data methods - def primaryTextForCell_data(cell, data) - data.message.gsub(/\n/, ' ').to_s - end - - def secondaryTextForCell_data(cell, data) - %(by #{data.committer.name} on #{data.committed_date.strftime("%A, %b %d, %I:%M %p")}) - end - - def iconForCell_data(icon, data) - @icons[data.committer.email] - end - - def dataElementForCell(cell) - @commit + objc_method :tableView_willDisplayCell_forTableColumn_row, 'v@:@@@i' + def tableView_willDisplayCell_forTableColumn_row(table_view, cell, table_column, row) + commit = @commits[row] + cell.subtitle = %(by #{commit.committer.name} on #{commit.committed_date.strftime("%A, %b %d, %I:%M %p")}) + cell.gravatarImage = @icons[commit.committer.email] end def webView_didFinishLoadForFrame(view, frame) CommitsController.rb @@ -8,8 +8,6 @@ /* Begin PBXBuildFile section */ 285BB47C0D8306C60027980C /* mime-types in Resources */ = {isa = PBXBuildFile; fileRef = 285BB4690D8306C60027980C /* mime-types */; }; - 285BB5300D849C890027980C /* ImageTextCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 285BB52D0D849C890027980C /* ImageTextCell.h */; }; - 285BB5310D849C890027980C /* ImageTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 285BB52E0D849C890027980C /* ImageTextCell.m */; }; 285BB5320D849C890027980C /* TexturedWindow.rb in Resources */ = {isa = PBXBuildFile; fileRef = 285BB52F0D849C890027980C /* TexturedWindow.rb */; }; 285BB53D0D849DD20027980C /* added.png in Resources */ = {isa = PBXBuildFile; fileRef = 285BB5380D849DD20027980C /* added.png */; }; 285BB53E0D849DD20027980C /* committer.png in Resources */ = {isa = PBXBuildFile; fileRef = 285BB5390D849DD20027980C /* committer.png */; }; @@ -28,6 +26,8 @@ 288CB41A0D8789DD0092B5CC /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 288CB4180D8789DD0092B5CC /* MainMenu.xib */; }; 288CB41D0D878A1C0092B5CC /* Info.xib in Resources */ = {isa = PBXBuildFile; fileRef = 288CB41C0D878A1C0092B5CC /* Info.xib */; }; 28DA55180D84C3A600D39FBF /* refresh.png in Resources */ = {isa = PBXBuildFile; fileRef = 28DA55170D84C3A600D39FBF /* refresh.png */; }; + 4D922CA80D8889DB002A5539 /* CommitSummaryCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D922CA60D8889DB002A5539 /* CommitSummaryCell.h */; }; + 4D922CA90D8889DB002A5539 /* CommitSummaryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D922CA70D8889DB002A5539 /* CommitSummaryCell.m */; }; 4DDCA7070ACC9A6100E082CE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 4DDCA7080ACC9A6100E082CE /* rb_main.rb in Resources */ = {isa = PBXBuildFile; fileRef = E8F5E25803AEB7C803A81C6F /* rb_main.rb */; }; 4DDCA70A0ACC9A6100E082CE /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; @@ -50,8 +50,6 @@ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; 284B71470D7CDE340075DA6C /* nub.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = nub.xcodeproj; path = nub/nub.xcodeproj; sourceTree = "<group>"; }; 285BB4690D8306C60027980C /* mime-types */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "mime-types"; sourceTree = "<group>"; }; - 285BB52D0D849C890027980C /* ImageTextCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageTextCell.h; sourceTree = "<group>"; }; - 285BB52E0D849C890027980C /* ImageTextCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageTextCell.m; sourceTree = "<group>"; }; 285BB52F0D849C890027980C /* TexturedWindow.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = TexturedWindow.rb; sourceTree = "<group>"; }; 285BB5380D849DD20027980C /* added.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = added.png; sourceTree = "<group>"; }; 285BB5390D849DD20027980C /* committer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = committer.png; sourceTree = "<group>"; }; @@ -73,6 +71,8 @@ 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; 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>"; }; + 4D922CA60D8889DB002A5539 /* CommitSummaryCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommitSummaryCell.h; sourceTree = "<group>"; }; + 4D922CA70D8889DB002A5539 /* CommitSummaryCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommitSummaryCell.m; sourceTree = "<group>"; }; 4DDCA7110ACC9A6100E082CE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; }; 4DDCA7120ACC9A6100E082CE /* GitNub.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GitNub.app; sourceTree = BUILT_PRODUCTS_DIR; }; E8F5E24E03AEB6EC03A81C6F /* RubyCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RubyCocoa.framework; path = /Library/Frameworks/RubyCocoa.framework; sourceTree = "<absolute>"; }; @@ -99,6 +99,8 @@ 285BB5450D849EA60027980C /* ApplicationController.rb */, 285BB5460D849EA60027980C /* CommitsController.rb */, 285BB5470D849EA60027980C /* InfoWindowController.rb */, + 4D922CA60D8889DB002A5539 /* CommitSummaryCell.h */, + 4D922CA70D8889DB002A5539 /* CommitSummaryCell.m */, ); name = Classes; sourceTree = "<group>"; @@ -157,8 +159,6 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( - 285BB52D0D849C890027980C /* ImageTextCell.h */, - 285BB52E0D849C890027980C /* ImageTextCell.m */, 285BB52F0D849C890027980C /* TexturedWindow.rb */, 285BB4690D8306C60027980C /* mime-types */, 288854540D7E352C00862D67 /* grit */, @@ -202,7 +202,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 285BB5300D849C890027980C /* ImageTextCell.h in Headers */, + 4D922CA80D8889DB002A5539 /* CommitSummaryCell.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -297,7 +297,7 @@ buildActionMask = 2147483647; files = ( 4DDCA70A0ACC9A6100E082CE /* main.m in Sources */, - 285BB5310D849C890027980C /* ImageTextCell.m in Sources */, + 4D922CA90D8889DB002A5539 /* CommitSummaryCell.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; GitNub.xcodeproj/project.pbxproj ImageTextCell.h ImageTextCell.m 41487b0d312fba88728433a2c4ebd44457c05e74 Benjamin Stiglitz ben@tanjero.com http://github.com/kballard/gitnub/commit/88e9717531fef063bf68056e3a65bc62e206b4cf 88e9717531fef063bf68056e3a65bc62e206b4cf 2008-03-12T15:45:28-07:00 2008-03-12T15:45:28-07:00 Cleaned up the image and text cell so it's not insane 13defdac7ee1308bee0fb3e6676f271b220f0a23 Benjamin Stiglitz ben@tanjero.com