diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 09f243c..7544963 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -3,11 +3,12 @@ 1050 9F33 - 672 + 670 949.34 352.00 YES + YES @@ -1094,30 +1095,6 @@ 868 - - - setDetailedView: - - - - 904 - - - - setRawView: - - - - 905 - - - - setTreeView: - - - - 906 - openDocument: @@ -1134,14 +1111,6 @@ 910 - - - refresh: - - - - 917 - checkForUpdates: @@ -1150,6 +1119,46 @@ 920 + + + viewMenu + + + + 922 + + + + setDetailedView: + + + + 923 + + + + setRawView: + + + + 924 + + + + setTreeView: + + + + 925 + + + + refresh: + + + + 926 + @@ -2028,7 +2037,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{415, 640}, {243, 243}} + {{370, 623}, {243, 243}} com.apple.InterfaceBuilder.CocoaPlugin {{455, 493}, {243, 243}} @@ -2086,13 +2095,13 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{494, 855}, {329, 20}} + {{267, 866}, {329, 20}} com.apple.InterfaceBuilder.CocoaPlugin {{297, 739}, {329, 20}} com.apple.InterfaceBuilder.CocoaPlugin - {{459, 740}, {234, 143}} + {{414, 723}, {234, 143}} com.apple.InterfaceBuilder.CocoaPlugin {{499, 623}, {234, 113}} @@ -2102,7 +2111,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{506, 632}, {262, 223}} + {{279, 643}, {262, 223}} com.apple.InterfaceBuilder.CocoaPlugin {{309, 536}, {262, 203}} @@ -2164,7 +2173,7 @@ - 920 + 926 @@ -2237,8 +2246,8 @@ - PBGitWindowController - NSWindowController + PBGitHistoryController + NSViewController YES @@ -2279,6 +2288,73 @@ NSTreeController + + IBProjectSource + PBGitHistoryController.h + + + + PBGitWindowController + NSWindowController + + YES + + YES + contentView + searchField + + + YES + NSView + NSSearchField + + + + IBProjectSource + PBGitWindowController.h + + + + PBGitWindowController + NSWindowController + + YES + + YES + openSelectedFile: + refresh: + setDetailedView: + setRawView: + setTreeView: + toggleQuickView: + + + YES + id + id + id + id + id + id + + + + YES + + YES + commitController + commitList + fileBrowser + treeController + + + YES + NSArrayController + NSTableView + NSOutlineView + NSTreeController + + IBUserSource diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib index 88110d5..0d05ef7 100644 --- a/PBGitHistoryView.xib +++ b/PBGitHistoryView.xib @@ -791,7 +791,7 @@ WebURLsWithTitlesPboardType - {543, 121} + {543, 112} @@ -1279,14 +1279,6 @@ 96 - - - delegate - - - - 97 - value: arrangedObjects.dateString @@ -1300,7 +1292,7 @@ arrangedObjects.dateString NSConditionallySetsEditable - + 2 @@ -1327,6 +1319,14 @@ 106 + + + delegate + + + + 107 + @@ -1829,7 +1829,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{327, 234}, {852, 432}} + {{328, 233}, {852, 432}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1859,7 +1859,7 @@ - 106 + 107 diff --git a/PBGitWindowController.h b/PBGitWindowController.h index 61a3a41..7b8546f 100644 --- a/PBGitWindowController.h +++ b/PBGitWindowController.h @@ -11,6 +11,7 @@ @interface PBGitWindowController : NSWindowController { IBOutlet NSSearchField* searchField; + IBOutlet NSArrayController* searchController; PBGitRepository* repository; IBOutlet NSView* contentView; NSViewController* viewController; @@ -18,6 +19,7 @@ @property (retain) PBGitRepository *repository; @property (readonly) NSViewController *viewController; +@property (retain) NSArrayController *searchController; - (id)initWithRepository:(PBGitRepository*)theRepository; - (void) focusOnSearchField; diff --git a/PBGitWindowController.m b/PBGitWindowController.m index a25436e..f0ebad5 100644 --- a/PBGitWindowController.m +++ b/PBGitWindowController.m @@ -12,7 +12,7 @@ @implementation PBGitWindowController -@synthesize repository, viewController; +@synthesize repository, viewController, searchController; - (id)initWithRepository:(PBGitRepository*)theRepository; { @@ -43,9 +43,13 @@ break; } + + //// embed the current view to our host view [contentView addSubview: [viewController view]]; + [self bind:@"searchController" toObject:viewController withKeyPath:@"commitController" options:nil]; + // make sure we automatically resize the controller's view to the current window size [[viewController view] setFrame: [contentView bounds]];