mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
Hopefully make the searchfield not break
This commit is contained in:
+116
-40
@@ -3,11 +3,12 @@
|
||||
<data>
|
||||
<int key="IBDocument.SystemTarget">1050</int>
|
||||
<string key="IBDocument.SystemVersion">9F33</string>
|
||||
<string key="IBDocument.InterfaceBuilderVersion">672</string>
|
||||
<string key="IBDocument.InterfaceBuilderVersion">670</string>
|
||||
<string key="IBDocument.AppKitVersion">949.34</string>
|
||||
<string key="IBDocument.HIToolboxVersion">352.00</string>
|
||||
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<integer value="339"/>
|
||||
</object>
|
||||
<object class="NSArray" key="IBDocument.PluginDependencies">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
@@ -1094,30 +1095,6 @@
|
||||
</object>
|
||||
<int key="connectionID">868</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBActionConnection" key="connection">
|
||||
<string key="label">setDetailedView:</string>
|
||||
<reference key="source" ref="954860085"/>
|
||||
<reference key="destination" ref="1062123434"/>
|
||||
</object>
|
||||
<int key="connectionID">904</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBActionConnection" key="connection">
|
||||
<string key="label">setRawView:</string>
|
||||
<reference key="source" ref="954860085"/>
|
||||
<reference key="destination" ref="260530711"/>
|
||||
</object>
|
||||
<int key="connectionID">905</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBActionConnection" key="connection">
|
||||
<string key="label">setTreeView:</string>
|
||||
<reference key="source" ref="954860085"/>
|
||||
<reference key="destination" ref="310106156"/>
|
||||
</object>
|
||||
<int key="connectionID">906</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBActionConnection" key="connection">
|
||||
<string key="label">openDocument:</string>
|
||||
@@ -1134,14 +1111,6 @@
|
||||
</object>
|
||||
<int key="connectionID">910</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBActionConnection" key="connection">
|
||||
<string key="label">refresh:</string>
|
||||
<reference key="source" ref="954860085"/>
|
||||
<reference key="destination" ref="554502465"/>
|
||||
</object>
|
||||
<int key="connectionID">917</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBActionConnection" key="connection">
|
||||
<string key="label">checkForUpdates:</string>
|
||||
@@ -1150,6 +1119,46 @@
|
||||
</object>
|
||||
<int key="connectionID">920</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBOutletConnection" key="connection">
|
||||
<string key="label">viewMenu</string>
|
||||
<reference key="source" ref="859235683"/>
|
||||
<reference key="destination" ref="245837913"/>
|
||||
</object>
|
||||
<int key="connectionID">922</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBActionConnection" key="connection">
|
||||
<string key="label">setDetailedView:</string>
|
||||
<reference key="source" ref="954860085"/>
|
||||
<reference key="destination" ref="1062123434"/>
|
||||
</object>
|
||||
<int key="connectionID">923</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBActionConnection" key="connection">
|
||||
<string key="label">setRawView:</string>
|
||||
<reference key="source" ref="954860085"/>
|
||||
<reference key="destination" ref="260530711"/>
|
||||
</object>
|
||||
<int key="connectionID">924</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBActionConnection" key="connection">
|
||||
<string key="label">setTreeView:</string>
|
||||
<reference key="source" ref="954860085"/>
|
||||
<reference key="destination" ref="310106156"/>
|
||||
</object>
|
||||
<int key="connectionID">925</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBActionConnection" key="connection">
|
||||
<string key="label">refresh:</string>
|
||||
<reference key="source" ref="954860085"/>
|
||||
<reference key="destination" ref="554502465"/>
|
||||
</object>
|
||||
<int key="connectionID">926</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBMutableOrderedSet" key="objectRecords">
|
||||
<object class="NSArray" key="orderedObjects">
|
||||
@@ -2028,7 +2037,7 @@
|
||||
<reference ref="9"/>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<reference ref="9"/>
|
||||
<string>{{415, 640}, {243, 243}}</string>
|
||||
<string>{{370, 623}, {243, 243}}</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<reference ref="9"/>
|
||||
<string>{{455, 493}, {243, 243}}</string>
|
||||
@@ -2086,13 +2095,13 @@
|
||||
<reference ref="9"/>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<reference ref="9"/>
|
||||
<string>{{494, 855}, {329, 20}}</string>
|
||||
<string>{{267, 866}, {329, 20}}</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<reference ref="9"/>
|
||||
<string>{{297, 739}, {329, 20}}</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<reference ref="9"/>
|
||||
<string>{{459, 740}, {234, 143}}</string>
|
||||
<string>{{414, 723}, {234, 143}}</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<reference ref="9"/>
|
||||
<string>{{499, 623}, {234, 113}}</string>
|
||||
@@ -2102,7 +2111,7 @@
|
||||
<reference ref="9"/>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<reference ref="9"/>
|
||||
<string>{{506, 632}, {262, 223}}</string>
|
||||
<string>{{279, 643}, {262, 223}}</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<reference ref="9"/>
|
||||
<string>{{309, 536}, {262, 203}}</string>
|
||||
@@ -2164,7 +2173,7 @@
|
||||
</object>
|
||||
</object>
|
||||
<nil key="sourceID"/>
|
||||
<int key="maxID">920</int>
|
||||
<int key="maxID">926</int>
|
||||
</object>
|
||||
<object class="IBClassDescriber" key="IBDocument.Classes">
|
||||
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
|
||||
@@ -2237,8 +2246,8 @@
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">PBGitWindowController</string>
|
||||
<string key="superclassName">NSWindowController</string>
|
||||
<string key="className">PBGitHistoryController</string>
|
||||
<string key="superclassName">NSViewController</string>
|
||||
<object class="NSMutableDictionary" key="actions">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSMutableArray" key="dict.sortedKeys">
|
||||
@@ -2279,6 +2288,73 @@
|
||||
<string>NSTreeController</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBProjectSource</string>
|
||||
<string key="minorKey">PBGitHistoryController.h</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">PBGitWindowController</string>
|
||||
<string key="superclassName">NSWindowController</string>
|
||||
<object class="NSMutableDictionary" key="outlets">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSMutableArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>contentView</string>
|
||||
<string>searchField</string>
|
||||
</object>
|
||||
<object class="NSMutableArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>NSView</string>
|
||||
<string>NSSearchField</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBProjectSource</string>
|
||||
<string key="minorKey">PBGitWindowController.h</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBPartialClassDescription">
|
||||
<string key="className">PBGitWindowController</string>
|
||||
<string key="superclassName">NSWindowController</string>
|
||||
<object class="NSMutableDictionary" key="actions">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSMutableArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>openSelectedFile:</string>
|
||||
<string>refresh:</string>
|
||||
<string>setDetailedView:</string>
|
||||
<string>setRawView:</string>
|
||||
<string>setTreeView:</string>
|
||||
<string>toggleQuickView:</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>
|
||||
<string>id</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="NSMutableDictionary" key="outlets">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<object class="NSMutableArray" key="dict.sortedKeys">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>commitController</string>
|
||||
<string>commitList</string>
|
||||
<string>fileBrowser</string>
|
||||
<string>treeController</string>
|
||||
</object>
|
||||
<object class="NSMutableArray" key="dict.values">
|
||||
<bool key="EncodedWithXMLCoder">YES</bool>
|
||||
<string>NSArrayController</string>
|
||||
<string>NSTableView</string>
|
||||
<string>NSOutlineView</string>
|
||||
<string>NSTreeController</string>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBClassDescriptionSource" key="sourceIdentifier">
|
||||
<string key="majorKey">IBUserSource</string>
|
||||
<string key="minorKey"/>
|
||||
|
||||
+12
-12
@@ -791,7 +791,7 @@
|
||||
<string>WebURLsWithTitlesPboardType</string>
|
||||
</object>
|
||||
</object>
|
||||
<string key="NSFrameSize">{543, 121}</string>
|
||||
<string key="NSFrameSize">{543, 112}</string>
|
||||
<reference key="NSSuperview" ref="321980917"/>
|
||||
<object class="NSTextContainer" key="NSTextContainer" id="480935218">
|
||||
<object class="NSLayoutManager" key="NSLayoutManager">
|
||||
@@ -1279,14 +1279,6 @@
|
||||
</object>
|
||||
<int key="connectionID">96</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBOutletConnection" key="connection">
|
||||
<string key="label">delegate</string>
|
||||
<reference key="source" ref="202620420"/>
|
||||
<reference key="destination" ref="1001"/>
|
||||
</object>
|
||||
<int key="connectionID">97</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBBindingConnection" key="connection">
|
||||
<string key="label">value: arrangedObjects.dateString</string>
|
||||
@@ -1300,7 +1292,7 @@
|
||||
<string key="NSKeyPath">arrangedObjects.dateString</string>
|
||||
<object class="NSDictionary" key="NSOptions">
|
||||
<string key="NS.key.0">NSConditionallySetsEditable</string>
|
||||
<integer value="1" key="NS.object.0"/>
|
||||
<reference key="NS.object.0" ref="9"/>
|
||||
</object>
|
||||
<int key="NSNibBindingConnectorVersion">2</int>
|
||||
</object>
|
||||
@@ -1327,6 +1319,14 @@
|
||||
</object>
|
||||
<int key="connectionID">106</int>
|
||||
</object>
|
||||
<object class="IBConnectionRecord">
|
||||
<object class="IBOutletConnection" key="connection">
|
||||
<string key="label">delegate</string>
|
||||
<reference key="source" ref="202620420"/>
|
||||
<reference key="destination" ref="1001"/>
|
||||
</object>
|
||||
<int key="connectionID">107</int>
|
||||
</object>
|
||||
</object>
|
||||
<object class="IBMutableOrderedSet" key="objectRecords">
|
||||
<object class="NSArray" key="orderedObjects">
|
||||
@@ -1829,7 +1829,7 @@
|
||||
</object>
|
||||
</object>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<string>{{327, 234}, {852, 432}}</string>
|
||||
<string>{{328, 233}, {852, 432}}</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
|
||||
@@ -1859,7 +1859,7 @@
|
||||
</object>
|
||||
</object>
|
||||
<nil key="sourceID"/>
|
||||
<int key="maxID">106</int>
|
||||
<int key="maxID">107</int>
|
||||
</object>
|
||||
<object class="IBClassDescriber" key="IBDocument.Classes">
|
||||
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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]];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user