Permalink
Browse files

Added search field bound to common options. Show filter chain activit…

…y. General tidyup.
  • Loading branch information...
1 parent 576f5e4 commit 9081e466075de9c871baa0eb55328d6f36557bb3 @mmower committed Feb 15, 2009
View
9 AppController.h
@@ -15,10 +15,15 @@
NSArray *requests;
IBOutlet NSArrayController *requestsController;
+ IBOutlet NSPanel *progressPanel;
+ IBOutlet NSProgressIndicator *progressIndicator;
}
-@property (assign) NSArray *requests;
-@property (assign) NSArrayController *requestsController;
+@property (assign) NSArray *requests;
+@property (assign) NSArrayController *requestsController;
+
+@property (readonly) NSPanel *progressPanel;
+@property (readonly) NSProgressIndicator *progressIndicator;
- (IBAction)openDocument:(id)sender;
View
4 AppController.m
@@ -15,6 +15,8 @@ @implementation AppController
@synthesize requests;
@synthesize requestsController;
+@synthesize progressPanel;
+@synthesize progressIndicator;
- (void)awakeFromNib {
requestDetailsController = [[RequestDetailsController alloc] initWithAppController:self];
@@ -32,7 +34,7 @@ - (IBAction)openDocument:(id)sender {
- (void)parseLogFile:(NSString *)logFile {
- LogParser *parser = [[LogParser alloc] init];
+ LogParser *parser = [[LogParser alloc] initWithAppController:self];
[self setRequests:[parser parseLogFile:logFile]];
}
View
536 English.lproj/MainMenu.xib
@@ -8,7 +8,8 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="371"/>
+ <integer value="577"/>
+ <integer value="562"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1113,7 +1114,7 @@
<object class="NSWindowTemplate" id="972006081">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{335, 30}, {1133, 720}}</string>
+ <string key="NSWindowRect">{{395, 296}, {1133, 720}}</string>
<int key="NSWTFlags">1946157056</int>
<string key="NSWindowTitle">Spike</string>
<string key="NSWindowClass">NSWindow</string>
@@ -1137,7 +1138,7 @@
<object class="NSTableView" id="590521299">
<reference key="NSNextResponder" ref="305723515"/>
<int key="NSvFlags">256</int>
- <string key="NSFrameSize">{1076, 646}</string>
+ <string key="NSFrameSize">{1076, 608}</string>
<reference key="NSSuperview" ref="305723515"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="12914194">
@@ -1156,7 +1157,7 @@
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="153955425">
- <double key="NSWidth">1.020000e+02</double>
+ <double key="NSWidth">1.100000e+02</double>
<double key="NSMinWidth">4.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1219,7 +1220,7 @@
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
- <object class="NSColor" key="NSColor">
+ <object class="NSColor" key="NSColor" id="1062816170">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
</object>
@@ -1233,17 +1234,16 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="590521299"/>
</object>
- <object class="NSTableColumn" id="398683280">
- <double key="NSWidth">5.300000e+01</double>
+ <object class="NSTableColumn" id="840286356">
+ <double key="NSWidth">6.400000e+01</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">3.402823e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Status</string>
+ <string key="NSContents">Filter</string>
<reference key="NSSupport" ref="26"/>
<object class="NSColor" key="NSBackgroundColor" id="62397096">
<int key="NSColorSpace">6</int>
@@ -1256,6 +1256,35 @@
</object>
<reference key="NSTextColor" ref="16937021"/>
</object>
+ <object class="NSImageCell" key="NSDataCell" id="514174834">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">33685504</int>
+ <object class="NSCustomResource" key="NSContents">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSActionTemplate</string>
+ </object>
+ <reference key="NSSupport" ref="26"/>
+ <int key="NSAlign">0</int>
+ <int key="NSScale">0</int>
+ <int key="NSStyle">0</int>
+ <bool key="NSAnimates">NO</bool>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="590521299"/>
+ </object>
+ <object class="NSTableColumn" id="398683280">
+ <double key="NSWidth">5.300000e+01</double>
+ <double key="NSMinWidth">1.000000e+01</double>
+ <double key="NSMaxWidth">3.402823e+38</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628032</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Status</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSBackgroundColor" ref="62397096"/>
+ <reference key="NSTextColor" ref="16937021"/>
+ </object>
<object class="NSTextFieldCell" key="NSDataCell" id="177946534">
<int key="NSCellFlags">337772096</int>
<int key="NSCellFlags2">-2147481600</int>
@@ -1330,7 +1359,6 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="590521299"/>
</object>
<object class="NSTableColumn" id="522158288">
@@ -1356,11 +1384,10 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="590521299"/>
</object>
<object class="NSTableColumn" id="788284790">
- <double key="NSWidth">1.360000e+02</double>
+ <double key="NSWidth">1.740000e+02</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">3.402823e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1382,11 +1409,10 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="590521299"/>
</object>
<object class="NSTableColumn" id="542146688">
- <double key="NSWidth">1.330000e+02</double>
+ <double key="NSWidth">1.850000e+02</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">3.402823e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1408,11 +1434,10 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="590521299"/>
</object>
<object class="NSTableColumn" id="140139924">
- <double key="NSWidth">1.300000e+02</double>
+ <double key="NSWidth">1.420000e+02</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">3.402823e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1434,11 +1459,10 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="590521299"/>
</object>
<object class="NSTableColumn" id="30428026">
- <double key="NSWidth">6.900000e+01</double>
+ <double key="NSWidth">5.600000e+01</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">3.402823e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1502,11 +1526,10 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="590521299"/>
</object>
<object class="NSTableColumn" id="117986914">
- <double key="NSWidth">6.400000e+01</double>
+ <double key="NSWidth">6.700000e+01</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">3.402823e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1572,11 +1595,10 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="590521299"/>
</object>
<object class="NSTableColumn" id="912066705">
- <double key="NSWidth">6.400000e+01</double>
+ <double key="NSWidth">6.600000e+01</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">3.402823e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1642,11 +1664,10 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="590521299"/>
</object>
<object class="NSTableColumn" id="649769586">
- <double key="NSWidth">2.320000e+02</double>
+ <double key="NSWidth">6.300000e+01</double>
<double key="NSMinWidth">1.000000e+01</double>
<double key="NSMaxWidth">3.402823e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1712,7 +1733,6 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
- <bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="590521299"/>
</object>
</object>
@@ -1736,7 +1756,7 @@
<bool key="NSAllowsTypeSelect">YES</bool>
</object>
</object>
- <string key="NSFrame">{{1, 17}, {1076, 646}}</string>
+ <string key="NSFrame">{{1, 17}, {1076, 608}}</string>
<reference key="NSSuperview" ref="996643746"/>
<reference key="NSNextKeyView" ref="590521299"/>
<reference key="NSDocView" ref="590521299"/>
@@ -1746,7 +1766,7 @@
<object class="NSScroller" id="996032442">
<reference key="NSNextResponder" ref="996643746"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{1077, 17}, {15, 646}}</string>
+ <string key="NSFrame">{{1077, 17}, {15, 608}}</string>
<reference key="NSSuperview" ref="996643746"/>
<reference key="NSTarget" ref="996643746"/>
<string key="NSAction">_doScroller:</string>
@@ -1756,7 +1776,7 @@
<object class="NSScroller" id="858188273">
<reference key="NSNextResponder" ref="996643746"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{1, 663}, {1076, 15}}</string>
+ <string key="NSFrame">{{1, 625}, {1076, 15}}</string>
<reference key="NSSuperview" ref="996643746"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="996643746"/>
@@ -1779,7 +1799,7 @@
</object>
<reference ref="83598371"/>
</object>
- <string key="NSFrame">{{20, 21}, {1093, 679}}</string>
+ <string key="NSFrame">{{20, 21}, {1093, 641}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSNextKeyView" ref="305723515"/>
<int key="NSsFlags">50</int>
@@ -1790,16 +1810,79 @@
<reference key="NSCornerView" ref="83598371"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object>
+ <object class="NSSearchField" id="122216333">
+ <reference key="NSNextResponder" ref="439893737"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{20, 678}, {329, 22}}</string>
+ <reference key="NSSuperview" ref="439893737"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSSearchFieldCell" key="NSCell" id="30116451">
+ <int key="NSCellFlags">343014976</int>
+ <int key="NSCellFlags2">268436480</int>
+ <reference key="NSSupport" ref="60906396"/>
+ <string key="NSPlaceholderString">Controller</string>
+ <reference key="NSControlView" ref="122216333"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <int key="NSTextBezelStyle">1</int>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textBackgroundColor</string>
+ <reference key="NSColor" ref="934652967"/>
+ </object>
+ <reference key="NSTextColor" ref="97964767"/>
+ <object class="NSButtonCell" key="NSSearchButtonCell">
+ <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">search</string>
+ <string key="NSAction">_searchFieldSearch:</string>
+ <reference key="NSTarget" ref="30116451"/>
+ <reference key="NSControlView" ref="122216333"/>
+ <int key="NSButtonFlags">138690815</int>
+ <int key="NSButtonFlags2">0</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <object class="NSButtonCell" key="NSCancelButtonCell">
+ <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">clear</string>
+ <object class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableDictionary">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>AXDescription</string>
+ <string>NSAccessibilityEncodedAttributesValueType</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cancel</string>
+ <reference ref="9"/>
+ </object>
+ </object>
+ </object>
+ <string key="NSAction">_searchFieldCancel:</string>
+ <reference key="NSTarget" ref="30116451"/>
+ <reference key="NSControlView" ref="122216333"/>
+ <int key="NSButtonFlags">138690815</int>
+ <int key="NSButtonFlags2">0</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <int key="NSMaximumRecents">255</int>
+ </object>
+ </object>
</object>
<string key="NSFrameSize">{1133, 720}</string>
<reference key="NSSuperview"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
- <object class="NSCustomObject" id="755631768">
- <string key="NSClassName">NSFontManager</string>
- </object>
<object class="NSArrayController" id="940822822">
<object class="NSMutableArray" key="NSDeclaredKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1817,9 +1900,9 @@
<string>realTime</string>
<string>renderTime</string>
<string>dbTime</string>
+ <string>halted</string>
</object>
<string key="NSObjectClassName">RailsRequest</string>
- <bool key="NSEditable">YES</bool>
<object class="_NSManagedProxy" key="_NSManagedProxy"/>
<bool key="NSAvoidsEmptySelection">YES</bool>
<bool key="NSPreservesSelection">YES</bool>
@@ -1830,6 +1913,57 @@
<object class="NSCustomObject" id="278795957">
<string key="NSClassName">AppController</string>
</object>
+ <object class="NSWindowTemplate" id="59486324">
+ <int key="NSWindowStyleMask">17</int>
+ <int key="NSWindowBacking">2</int>
+ <string key="NSWindowRect">{{763, 536}, {488, 111}}</string>
+ <int key="NSWTFlags">-1543502848</int>
+ <string key="NSWindowTitle">Logile Analysis</string>
+ <string key="NSWindowClass">NSPanel</string>
+ <nil key="NSViewClass"/>
+ <object class="NSView" key="NSWindowView" id="364786548">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSProgressIndicator" id="991637727">
+ <reference key="NSNextResponder" ref="364786548"/>
+ <int key="NSvFlags">1290</int>
+ <object class="NSPSMatrix" key="NSDrawMatrix"/>
+ <string key="NSFrame">{{18, 47}, {452, 20}}</string>
+ <reference key="NSSuperview" ref="364786548"/>
+ <int key="NSpiFlags">16392</int>
+ <double key="NSMinValue">2.000000e+01</double>
+ <double key="NSMaxValue">1.000000e+02</double>
+ </object>
+ <object class="NSTextField" id="90660679">
+ <reference key="NSNextResponder" ref="364786548"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{17, 75}, {110, 17}}</string>
+ <reference key="NSSuperview" ref="364786548"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="622155800">
+ <int key="NSCellFlags">68288064</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents">Loading logfile...</string>
+ <reference key="NSSupport" ref="60906396"/>
+ <reference key="NSControlView" ref="90660679"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlColor</string>
+ <reference key="NSColor" ref="1062816170"/>
+ </object>
+ <reference key="NSTextColor" ref="97964767"/>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{488, 111}</string>
+ <reference key="NSSuperview"/>
+ </object>
+ <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -2132,46 +2266,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">addFontTrait:</string>
- <reference key="source" ref="755631768"/>
- <reference key="destination" ref="305399458"/>
- </object>
- <int key="connectionID">421</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">addFontTrait:</string>
- <reference key="source" ref="755631768"/>
- <reference key="destination" ref="814362025"/>
- </object>
- <int key="connectionID">422</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">modifyFont:</string>
- <reference key="source" ref="755631768"/>
- <reference key="destination" ref="885547335"/>
- </object>
- <int key="connectionID">423</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">orderFrontFontPanel:</string>
- <reference key="source" ref="755631768"/>
- <reference key="destination" ref="159677712"/>
- </object>
- <int key="connectionID">424</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">modifyFont:</string>
- <reference key="source" ref="755631768"/>
- <reference key="destination" ref="158063935"/>
- </object>
- <int key="connectionID">425</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">raiseBaseline:</string>
<reference key="source" ref="1014"/>
<reference key="destination" ref="941806246"/>
@@ -2554,6 +2648,161 @@
</object>
<int key="connectionID">535</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">progressIndicator</string>
+ <reference key="source" ref="278795957"/>
+ <reference key="destination" ref="991637727"/>
+ </object>
+ <int key="connectionID">567</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">progressPanel</string>
+ <reference key="source" ref="278795957"/>
+ <reference key="destination" ref="59486324"/>
+ </object>
+ <int key="connectionID">568</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: arrangedObjects.halted</string>
+ <reference key="source" ref="840286356"/>
+ <reference key="destination" ref="940822822"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="840286356"/>
+ <reference key="NSDestination" ref="940822822"/>
+ <string key="NSLabel">value: arrangedObjects.halted</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">arrangedObjects.halted</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSValueTransformerName</string>
+ <string key="NS.object.0">HaltedColumnTransformer</string>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">576</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">predicate: filterPredicate</string>
+ <reference key="source" ref="30116451"/>
+ <reference key="destination" ref="940822822"/>
+ <object class="NSNibBindingConnector" key="connector" id="643904866">
+ <reference key="NSSource" ref="30116451"/>
+ <reference key="NSDestination" ref="940822822"/>
+ <string key="NSLabel">predicate: filterPredicate</string>
+ <string key="NSBinding">predicate</string>
+ <string key="NSKeyPath">filterPredicate</string>
+ <object class="NSDictionary" key="NSOptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSDisplayName</string>
+ <string>NSPredicateFormat</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Controller</string>
+ <string>controller contains $value</string>
+ </object>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">581</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">predicate2: filterPredicate</string>
+ <reference key="source" ref="30116451"/>
+ <reference key="destination" ref="940822822"/>
+ <object class="NSNibBindingConnector" key="connector" id="953439156">
+ <reference key="NSSource" ref="30116451"/>
+ <reference key="NSDestination" ref="940822822"/>
+ <string key="NSLabel">predicate2: filterPredicate</string>
+ <string key="NSBinding">predicate2</string>
+ <string key="NSKeyPath">filterPredicate</string>
+ <object class="NSDictionary" key="NSOptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSDisplayName</string>
+ <string>NSPredicateFormat</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Action</string>
+ <string>action contains $value</string>
+ </object>
+ </object>
+ <reference key="NSPreviousConnector" ref="643904866"/>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">584</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">predicate3: filterPredicate</string>
+ <reference key="source" ref="30116451"/>
+ <reference key="destination" ref="940822822"/>
+ <object class="NSNibBindingConnector" key="connector" id="311349878">
+ <reference key="NSSource" ref="30116451"/>
+ <reference key="NSDestination" ref="940822822"/>
+ <string key="NSLabel">predicate3: filterPredicate</string>
+ <string key="NSBinding">predicate3</string>
+ <string key="NSKeyPath">filterPredicate</string>
+ <object class="NSDictionary" key="NSOptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSDisplayName</string>
+ <string>NSPredicateFormat</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Client</string>
+ <string>client.address contains $value</string>
+ </object>
+ </object>
+ <reference key="NSPreviousConnector" ref="953439156"/>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">587</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">predicate4: filterPredicate</string>
+ <reference key="source" ref="30116451"/>
+ <reference key="destination" ref="940822822"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="30116451"/>
+ <reference key="NSDestination" ref="940822822"/>
+ <string key="NSLabel">predicate4: filterPredicate</string>
+ <string key="NSBinding">predicate4</string>
+ <string key="NSKeyPath">filterPredicate</string>
+ <object class="NSDictionary" key="NSOptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSDisplayName</string>
+ <string>NSPredicateFormat</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Session</string>
+ <string>session contains $value</string>
+ </object>
+ </object>
+ <reference key="NSPreviousConnector" ref="311349878"/>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">590</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -3141,6 +3390,7 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="996643746"/>
+ <reference ref="122216333"/>
</object>
<reference key="parent" ref="972006081"/>
</object>
@@ -3450,11 +3700,6 @@
<reference key="parent" ref="175441468"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">420</int>
- <reference key="object" ref="755631768"/>
- <reference key="parent" ref="1049"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">459</int>
<reference key="object" ref="940822822"/>
<reference key="parent" ref="1049"/>
@@ -3492,6 +3737,7 @@
<reference ref="117986914"/>
<reference ref="912066705"/>
<reference ref="649769586"/>
+ <reference ref="840286356"/>
</object>
<reference key="parent" ref="996643746"/>
</object>
@@ -3704,6 +3950,73 @@
<reference key="object" ref="20003890"/>
<reference key="parent" ref="88265213"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">562</int>
+ <reference key="object" ref="59486324"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="364786548"/>
+ </object>
+ <reference key="parent" ref="1049"/>
+ <string key="objectName">Progress Panel</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">563</int>
+ <reference key="object" ref="364786548"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="991637727"/>
+ <reference ref="90660679"/>
+ </object>
+ <reference key="parent" ref="59486324"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">564</int>
+ <reference key="object" ref="991637727"/>
+ <reference key="parent" ref="364786548"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">565</int>
+ <reference key="object" ref="90660679"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="622155800"/>
+ </object>
+ <reference key="parent" ref="364786548"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">566</int>
+ <reference key="object" ref="622155800"/>
+ <reference key="parent" ref="90660679"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">569</int>
+ <reference key="object" ref="840286356"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="514174834"/>
+ </object>
+ <reference key="parent" ref="590521299"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">575</int>
+ <reference key="object" ref="514174834"/>
+ <reference key="parent" ref="840286356"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">577</int>
+ <reference key="object" ref="122216333"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="30116451"/>
+ </object>
+ <reference key="parent" ref="439893737"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">578</int>
+ <reference key="object" ref="30116451"/>
+ <reference key="parent" ref="122216333"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -3895,7 +4208,6 @@
<string>417.IBPluginDependency</string>
<string>418.IBPluginDependency</string>
<string>419.IBPluginDependency</string>
- <string>420.IBPluginDependency</string>
<string>459.IBPluginDependency</string>
<string>463.IBPluginDependency</string>
<string>464.IBPluginDependency</string>
@@ -3915,18 +4227,39 @@
<string>479.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string>
+ <string>520.IBPluginDependency</string>
+ <string>521.IBPluginDependency</string>
+ <string>522.IBPluginDependency</string>
+ <string>523.IBPluginDependency</string>
<string>524.IBPluginDependency</string>
+ <string>526.IBPluginDependency</string>
+ <string>527.IBPluginDependency</string>
+ <string>528.IBPluginDependency</string>
+ <string>529.IBPluginDependency</string>
+ <string>530.IBPluginDependency</string>
+ <string>531.IBPluginDependency</string>
<string>536.IBPluginDependency</string>
<string>537.IBPluginDependency</string>
<string>538.IBPluginDependency</string>
<string>539.IBPluginDependency</string>
<string>540.IBPluginDependency</string>
<string>56.IBPluginDependency</string>
<string>56.ImportedFromIB2</string>
+ <string>562.IBEditorWindowLastContentRect</string>
+ <string>562.IBPluginDependency</string>
+ <string>562.IBWindowTemplateEditedContentRect</string>
+ <string>562.NSWindowTemplate.visibleAtLaunch</string>
+ <string>563.IBPluginDependency</string>
+ <string>564.IBPluginDependency</string>
+ <string>565.IBPluginDependency</string>
+ <string>566.IBPluginDependency</string>
<string>57.IBEditorWindowLastContentRect</string>
<string>57.IBPluginDependency</string>
<string>57.ImportedFromIB2</string>
<string>57.editorWindowContentRectSynchronizationRect</string>
+ <string>575.IBPluginDependency</string>
+ <string>577.IBPluginDependency</string>
+ <string>578.IBPluginDependency</string>
<string>58.IBPluginDependency</string>
<string>58.ImportedFromIB2</string>
<string>72.IBPluginDependency</string>
@@ -4090,8 +4423,8 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{368, 136}, {1133, 720}}</string>
- <string>{{368, 136}, {1133, 720}}</string>
+ <string>{{353, 48}, {1133, 720}}</string>
+ <string>{{353, 48}, {1133, 720}}</string>
<reference ref="9"/>
<string>{{33, 99}, {480, 360}}</string>
<string>{3.40282e+38, 3.40282e+38}</string>
@@ -4161,7 +4494,6 @@
<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>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4170,12 +4502,33 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <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>{{641, 679}, {488, 111}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{641, 679}, {488, 111}}</string>
+ <boolean value="NO"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{219, 50}, {186, 183}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{23, 794}, {245, 183}}</string>
<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>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
@@ -4225,7 +4578,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">540</int>
+ <int key="maxID">590</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4238,8 +4591,19 @@
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">requestsController</string>
- <string key="NS.object.0">NSArrayController</string>
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>progressIndicator</string>
+ <string>progressPanel</string>
+ <string>requestsController</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSProgressIndicator</string>
+ <string>NSPanel</string>
+ <string>NSArrayController</string>
+ </object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
View
307 English.lproj/RequestDetails.xib
@@ -231,7 +231,7 @@
</object>
<reference ref="878764156"/>
</object>
- <string key="NSFrame">{{20, 381}, {377, 185}}</string>
+ <string key="NSFrame">{{20, 401}, {377, 185}}</string>
<reference key="NSSuperview" ref="319064147"/>
<reference key="NSNextKeyView" ref="1019543818"/>
<int key="NSsFlags">50</int>
@@ -358,7 +358,7 @@
</object>
<reference ref="719395938"/>
</object>
- <string key="NSFrame">{{20, 264}, {377, 109}}</string>
+ <string key="NSFrame">{{20, 284}, {377, 109}}</string>
<reference key="NSSuperview" ref="319064147"/>
<reference key="NSNextKeyView" ref="253806502"/>
<int key="NSsFlags">50</int>
@@ -405,7 +405,7 @@
<string>WebURLsWithTitlesPboardType</string>
</object>
</object>
- <string key="NSFrameSize">{360, 132}</string>
+ <string key="NSFrameSize">{360, 88}</string>
<reference key="NSSuperview" ref="909518699"/>
<object class="NSTextContainer" key="NSTextContainer" id="67110667">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -596,7 +596,7 @@
<nil key="NSDelegate"/>
</object>
</object>
- <string key="NSFrame">{{1, 1}, {360, 234}}</string>
+ <string key="NSFrame">{{1, 1}, {360, 254}}</string>
<reference key="NSSuperview" ref="1000905743"/>
<reference key="NSNextKeyView" ref="200082955"/>
<reference key="NSDocView" ref="200082955"/>
@@ -610,7 +610,7 @@
<object class="NSScroller" id="348213247">
<reference key="NSNextResponder" ref="1000905743"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{361, 1}, {15, 234}}</string>
+ <string key="NSFrame">{{361, 1}, {15, 254}}</string>
<reference key="NSSuperview" ref="1000905743"/>
<reference key="NSTarget" ref="1000905743"/>
<string key="NSAction">_doScroller:</string>
@@ -628,7 +628,7 @@
<double key="NSPercent">9.456522e-01</double>
</object>
</object>
- <string key="NSFrame">{{20, 20}, {377, 236}}</string>
+ <string key="NSFrame">{{20, 20}, {377, 256}}</string>
<reference key="NSSuperview" ref="319064147"/>
<reference key="NSNextKeyView" ref="909518699"/>
<int key="NSsFlags">18</int>
@@ -639,14 +639,18 @@
<object class="NSTextField" id="247247200">
<reference key="NSNextResponder" ref="319064147"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 638}, {38, 17}}</string>
+ <string key="NSFrame">{{17, 643}, {29, 16}}</string>
<reference key="NSSuperview" ref="319064147"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="51193370">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">URL</string>
- <reference key="NSSupport" ref="10612766"/>
+ <object class="NSFont" key="NSSupport" id="445099649">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">1.200000e+01</double>
+ <int key="NSfFlags">16</int>
+ </object>
<reference key="NSControlView" ref="247247200"/>
<object class="NSColor" key="NSBackgroundColor" id="19044644">
<int key="NSColorSpace">6</int>
@@ -657,56 +661,101 @@
<reference key="NSTextColor" ref="957460101"/>
</object>
</object>
- <object class="NSTextField" id="504027047">
+ <object class="NSTextField" id="675270843">
<reference key="NSNextResponder" ref="319064147"/>
- <int key="NSvFlags">266</int>
- <string key="NSFrame">{{17, 624}, {383, 13}}</string>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{17, 618}, {52, 16}}</string>
<reference key="NSSuperview" ref="319064147"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="88622751">
+ <object class="NSTextFieldCell" key="NSCell" id="808382662">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
- <string key="NSContents">Label</string>
- <object class="NSFont" key="NSSupport" id="24">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">1.000000e+01</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="504027047"/>
+ <string key="NSContents">Session</string>
+ <reference key="NSSupport" ref="445099649"/>
+ <reference key="NSControlView" ref="675270843"/>
<reference key="NSBackgroundColor" ref="19044644"/>
<reference key="NSTextColor" ref="957460101"/>
</object>
</object>
- <object class="NSTextField" id="675270843">
+ <object class="NSTextField" id="372048408">
<reference key="NSNextResponder" ref="319064147"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 595}, {52, 17}}</string>
+ <string key="NSFrame">{{17, 594}, {34, 16}}</string>
<reference key="NSSuperview" ref="319064147"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="808382662">
+ <object class="NSTextFieldCell" key="NSCell" id="675753400">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
- <string key="NSContents">Session</string>
- <reference key="NSSupport" ref="10612766"/>
- <reference key="NSControlView" ref="675270843"/>
+ <string key="NSContents">Filter</string>
+ <reference key="NSSupport" ref="445099649"/>
+ <reference key="NSControlView" ref="372048408"/>
<reference key="NSBackgroundColor" ref="19044644"/>
<reference key="NSTextColor" ref="957460101"/>
</object>
</object>
- <object class="NSTextField" id="629294038">
+ <object class="NSTextField" id="859593679">
<reference key="NSNextResponder" ref="319064147"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{17, 574}, {383, 13}}</string>
+ <string key="NSFrame">{{78, 616}, {319, 16}}</string>
<reference key="NSSuperview" ref="319064147"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="388546662">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">272630784</int>
- <string key="NSContents">Label</string>
- <reference key="NSSupport" ref="24"/>
- <reference key="NSControlView" ref="629294038"/>
- <reference key="NSBackgroundColor" ref="19044644"/>
- <reference key="NSTextColor" ref="957460101"/>
+ <object class="NSTextFieldCell" key="NSCell" id="23816274">
+ <int key="NSCellFlags">-2072904127</int>
+ <int key="NSCellFlags2">272892928</int>
+ <string key="NSContents"/>
+ <object class="NSFont" key="NSSupport" id="22">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">9.000000e+00</double>
+ <int key="NSfFlags">3614</int>
+ </object>
+ <reference key="NSControlView" ref="859593679"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <object class="NSColor" key="NSBackgroundColor" id="361120755">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textBackgroundColor</string>
+ <reference key="NSColor" ref="442155024"/>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="909210866">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textColor</string>
+ <reference key="NSColor" ref="449953610"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSTextField" id="535759328">
+ <reference key="NSNextResponder" ref="319064147"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{78, 643}, {319, 16}}</string>
+ <reference key="NSSuperview" ref="319064147"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="300301413">
+ <int key="NSCellFlags">-2072904127</int>
+ <int key="NSCellFlags2">272892928</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="22"/>
+ <reference key="NSControlView" ref="535759328"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <reference key="NSBackgroundColor" ref="361120755"/>
+ <reference key="NSTextColor" ref="909210866"/>
+ </object>
+ </object>
+ <object class="NSTextField" id="453653233">
+ <reference key="NSNextResponder" ref="319064147"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{78, 594}, {319, 16}}</string>
+ <reference key="NSSuperview" ref="319064147"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="987102278">
+ <int key="NSCellFlags">-1804468671</int>
+ <int key="NSCellFlags2">272892928</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="22"/>
+ <reference key="NSControlView" ref="453653233"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <reference key="NSBackgroundColor" ref="361120755"/>
+ <reference key="NSTextColor" ref="909210866"/>
</object>
</object>
</object>
@@ -720,6 +769,8 @@
<object class="NSMutableArray" key="NSDeclaredKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>description</string>
+ <string>appController.requestsController.selection.session</string>
+ <string>appController.requestsController.selection.url</string>
</object>
<bool key="NSEditable">YES</bool>
<object class="_NSManagedProxy" key="_NSManagedProxy"/>
@@ -806,38 +857,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
- <string key="label">value: appController.requestsController.selection.url</string>
- <reference key="source" ref="504027047"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="504027047"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">value: appController.requestsController.selection.url</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">appController.requestsController.selection.url</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">49</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: appController.requestsController.selection.session</string>
- <reference key="source" ref="629294038"/>
- <reference key="destination" ref="1001"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="629294038"/>
- <reference key="NSDestination" ref="1001"/>
- <string key="NSLabel">value: appController.requestsController.selection.session</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">appController.requestsController.selection.session</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">54</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
<string key="label">contentArray: appController.requestsController.selection.params</string>
<reference key="source" ref="692961281"/>
<reference key="destination" ref="1001"/>
@@ -900,6 +919,54 @@
</object>
<int key="connectionID">59</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: appController.requestsController.selection.session</string>
+ <reference key="source" ref="859593679"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="859593679"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">value: appController.requestsController.selection.session</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">appController.requestsController.selection.session</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">70</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: appController.requestsController.selection.filter</string>
+ <reference key="source" ref="453653233"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="453653233"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">value: appController.requestsController.selection.filter</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">appController.requestsController.selection.filter</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">76</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: appController.requestsController.selection.url</string>
+ <reference key="source" ref="535759328"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="535759328"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">value: appController.requestsController.selection.url</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">appController.requestsController.selection.url</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">78</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -944,13 +1011,15 @@
<reference key="object" ref="319064147"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1000905743"/>
<reference ref="247247200"/>
- <reference ref="504027047"/>
<reference ref="675270843"/>
- <reference ref="629294038"/>
+ <reference ref="372048408"/>
<reference ref="11450380"/>
<reference ref="46458979"/>
- <reference ref="1000905743"/>
+ <reference ref="859593679"/>
+ <reference ref="535759328"/>
+ <reference ref="453653233"/>
</object>
<reference key="parent" ref="998420937"/>
</object>
@@ -1116,52 +1185,80 @@
<reference key="parent" ref="247247200"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">47</int>
- <reference key="object" ref="504027047"/>
+ <int key="objectID">50</int>
+ <reference key="object" ref="675270843"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="88622751"/>
+ <reference ref="808382662"/>
</object>
<reference key="parent" ref="319064147"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">48</int>
- <reference key="object" ref="88622751"/>
- <reference key="parent" ref="504027047"/>
+ <int key="objectID">51</int>
+ <reference key="object" ref="808382662"/>
+ <reference key="parent" ref="675270843"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">50</int>
- <reference key="object" ref="675270843"/>
+ <int key="objectID">55</int>
+ <reference key="object" ref="692961281"/>
+ <reference key="parent" ref="1002"/>
+ <string key="objectName">Params Controller</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">60</int>
+ <reference key="object" ref="372048408"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="808382662"/>
+ <reference ref="675753400"/>
</object>
<reference key="parent" ref="319064147"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">51</int>
- <reference key="object" ref="808382662"/>
- <reference key="parent" ref="675270843"/>
+ <int key="objectID">61</int>
+ <reference key="object" ref="675753400"/>
+ <reference key="parent" ref="372048408"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">52</int>
- <reference key="object" ref="629294038"/>
+ <int key="objectID">65</int>
+ <reference key="object" ref="859593679"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="388546662"/>
+ <reference ref="23816274"/>
</object>
<reference key="parent" ref="319064147"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">53</int>
- <reference key="object" ref="388546662"/>
- <reference key="parent" ref="629294038"/>
+ <int key="objectID">66</int>
+ <reference key="object" ref="23816274"/>
+ <reference key="parent" ref="859593679"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">55</int>
- <reference key="object" ref="692961281"/>
- <reference key="parent" ref="1002"/>
- <string key="objectName">Params Controller</string>
+ <int key="objectID">71</int>
+ <reference key="object" ref="535759328"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="300301413"/>
+ </object>
+ <reference key="parent" ref="319064147"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">72</int>
+ <reference key="object" ref="300301413"/>
+ <reference key="parent" ref="535759328"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">74</int>
+ <reference key="object" ref="453653233"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="987102278"/>
+ </object>
+ <reference key="parent" ref="319064147"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">75</int>
+ <reference key="object" ref="987102278"/>
+ <reference key="parent" ref="453653233"/>
</object>
</object>
</object>
@@ -1187,6 +1284,7 @@
<string>18.IBPluginDependency</string>
<string>19.IBPluginDependency</string>
<string>2.IBPluginDependency</string>
+ <string>2.IBUserGuides</string>
<string>20.IBPluginDependency</string>
<string>22.IBPluginDependency</string>
<string>3.IBPluginDependency</string>
@@ -1197,14 +1295,18 @@
<string>4.IBPluginDependency</string>
<string>45.IBPluginDependency</string>
<string>46.IBPluginDependency</string>
- <string>47.IBPluginDependency</string>
- <string>48.IBPluginDependency</string>
<string>50.IBPluginDependency</string>
<string>51.IBPluginDependency</string>
- <string>52.IBPluginDependency</string>
- <string>53.IBPluginDependency</string>
<string>55.IBPluginDependency</string>
+ <string>60.IBPluginDependency</string>
+ <string>61.IBPluginDependency</string>
+ <string>65.IBPluginDependency</string>
+ <string>66.IBPluginDependency</string>
<string>7.IBPluginDependency</string>
+ <string>71.IBPluginDependency</string>
+ <string>72.IBPluginDependency</string>
+ <string>74.IBPluginDependency</string>
+ <string>75.IBPluginDependency</string>
<string>8.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
</object>
@@ -1213,9 +1315,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilderKit</string>
<string>com.apple.InterfaceBuilderKit</string>
- <string>{{371, 173}, {417, 675}}</string>
+ <string>{{403, 43}, {417, 675}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{371, 173}, {417, 675}}</string>
+ <string>{{403, 43}, {417, 675}}</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1228,6 +1330,13 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSMutableArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </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>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1270,7 +1379,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">59</int>
+ <int key="maxID">78</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
View
15 HaltedColumnTransformer.h
@@ -0,0 +1,15 @@
+//
+// HaltedColumnTransformer.h
+// Spike
+//
+// Created by Matt Mower on 15/02/2009.
+// Copyright 2009 LucidMac Software. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface HaltedColumnTransformer : NSValueTransformer {
+
+}
+
+@end
View
35 HaltedColumnTransformer.m
@@ -0,0 +1,35 @@
+//
+// HaltedColumnTransformer.m
+// Spike
+//
+// Created by Matt Mower on 15/02/2009.
+// Copyright 2009 LucidMac Software. All rights reserved.
+//
+
+#import "HaltedColumnTransformer.h"
+
+@implementation HaltedColumnTransformer
+
+// + (void)initialize {
+// if( !onImage ) {
+// onImage = [NSImage imageNamed:@"red_dot.tif"];
+// }
+// }
+
++ (Class)transformedValueClass {
+ return [NSImage class];
+}
+
++ (BOOL)allowsReverseTransformation {
+ return NO;
+}
+
+- (id)transformedValue:(id)value {
+ if( [value boolValue] ) {
+ return [NSImage imageNamed:@"NSActionTemplate"];
+ } else {
+ return nil;
+ }
+}
+
+@end
View
4 LogParser.h
@@ -9,11 +9,15 @@
#import <Cocoa/Cocoa.h>
@class RailsRequest;
+@class AppController;
@interface LogParser : NSObject {
+ AppController *appController;
NSDateFormatter *dateParser;
}
+- (id)initWithAppController:(AppController *)theAppController;
+
- (NSArray *)parseLogFile:(NSString *)logFileName;
- (NSArray *)parseLogLines:(NSArray *)lines;
- (RailsRequest *)parseRequest:(NSArray *)lines;
View
56 LogParser.m
@@ -11,6 +11,7 @@
#import "RailsRequest.h"
#import "HashParser.h"
#import "Parameter.h"
+#import "AppController.h"
@interface LogParser ()
- (void)scanProcessing:(NSString *)line intoRequest:(RailsRequest *)request;
@@ -19,12 +20,14 @@ - (NSArray *)convertToParamsTable:(NSDictionary *)hash;
- (void)scanSession:(NSString *)line intoRequest:(RailsRequest *)request;
- (void)scanCompleted:(NSString *)line intoRequest:(RailsRequest *)request;
- (void)scanRender:(NSString *)line intoRequest:(RailsRequest *)request;
+- (void)scanFilter:(NSString *)line intoRequest:(RailsRequest *)request;
@end
@implementation LogParser
-- (id)init {
+- (id)initWithAppController:(AppController *)theAppController {
if( ( self = [super init] ) ) {
+ appController = theAppController;
dateParser = [[NSDateFormatter alloc] init];
[dateParser setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
}
@@ -33,36 +36,49 @@ - (id)init {
}
- (NSArray *)parseLogFile:(NSString *)logFileName {
+ [[appController progressPanel] makeKeyAndOrderFront:self];
+ [[appController progressIndicator] setIndeterminate:YES];
NSArray *logContent = [[NSString stringWithContentsOfFile:logFileName] componentsSeparatedByString:@"\n"];
return [self parseLogLines:logContent];
}
- (NSArray *)parseLogLines:(NSArray *)lines {
NSMutableArray *requests = [[NSMutableArray alloc] init];
+ double linesProcessed = 0.0;
+
+ [[appController progressIndicator] setMinValue:0];
+ [[appController progressIndicator] setMaxValue:[lines count]];
+ [[appController progressIndicator] setDoubleValue:linesProcessed];
+ [[appController progressIndicator] setIndeterminate:NO];
+
NSLog( @"%d lines to parse.", [lines count] );
+
NSMutableArray *lineGroup = [[NSMutableArray alloc] init];
for( NSString *line in lines ) {
line = [line stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
- if( [line isEqualToString:@""] ) {
- continue;
- }
-
- if( [line hasPrefix:@"Processing"] ) {
- if( [lineGroup count] > 0 ) {
- [requests addObject:[self parseRequest:lineGroup]];
- [lineGroup removeAllObjects];
- // break;
+ if( ![line isEqualToString:@""] ) {
+ if( [line hasPrefix:@"Processing"] ) {
+ if( [lineGroup count] > 0 ) {
+ [requests addObject:[self parseRequest:lineGroup]];
+ [lineGroup removeAllObjects];
+ // break;
+ }
}
+
+ [lineGroup addObject:line];
}
- [lineGroup addObject:line];
+ linesProcessed += 1;
+ [[appController progressIndicator] setDoubleValue:linesProcessed];
}
NSLog( @"%d requests parsed.", [requests count] );
+ [[appController progressPanel] orderOut:self];
+
return requests;
}
@@ -80,6 +96,8 @@ - (RailsRequest *)parseRequest:(NSArray *)lines {
[self scanCompleted:line intoRequest:request];
} else if( [line hasPrefix:@"Rendering"] ) {
[self scanRender:line intoRequest:request];
+ } else if( [line hasPrefix:@"Filter"] ) {
+ [self scanFilter:line intoRequest:request];
}
}
@@ -215,10 +233,11 @@ - (void)scanCompleted:(NSString *)line intoRequest:(RailsRequest *)request {
}
+
- (void)scanRender:(NSString *)line intoRequest:(RailsRequest *)request {
NSString *render = [line substringFromIndex:10];
- if( [render rangeOfString:@"(internal_server_error)"].location != NSNotFound ) {
+ if( [render rangeOfString:@"(internal_server_error)"].location != NSNotFound || [render rangeOfString:@"(not_found)"].location != NSNotFound ) {
request.status = 500;
} else if( [render rangeOfString:@".html"].location != NSNotFound ) {
NSRange match = [render rangeOfString:@"public"];
@@ -228,4 +247,17 @@ - (void)scanRender:(NSString *)line intoRequest:(RailsRequest *)request {
}
}
+
+- (void)scanFilter:(NSString *)line intoRequest:(RailsRequest *)request {
+ NSScanner *scanner = [NSScanner scannerWithString:line];
+
+ NSString *buffer;
+ [scanner scanString:@"Filter chain halted as [:" intoString:nil];
+ [scanner scanUpToString:@"]" intoString:&buffer];
+
+ [request setHalted:YES];
+ [request setFilter:buffer];
+}
+
+
@end
View
4 RailsRequest.h
@@ -24,6 +24,8 @@
NSArray *params;
NSMutableArray *renders;
NSAttributedString *sourceLog;
+ BOOL halted;
+ NSString *filter;
}
@property int status;
@@ -41,5 +43,7 @@
@property (assign) NSArray *params;
@property (assign) NSMutableArray *renders;
@property (assign) NSAttributedString *sourceLog;
+@property BOOL halted;
+@property (assign) NSString *filter;
@end
View
2 RailsRequest.m
@@ -33,5 +33,7 @@ - (id)init {
@synthesize params;
@synthesize renders;
@synthesize sourceLog;
+@synthesize halted;
+@synthesize filter;
@end
View
6 Spike.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
C9592FB60F483CF5004A49FA /* RequestDetails.xib in Resources */ = {isa = PBXBuildFile; fileRef = C9592FB40F483CF5004A49FA /* RequestDetails.xib */; };
C9592FBB0F483D45004A49FA /* TDParseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9592FBA0F483D45004A49FA /* TDParseKit.framework */; };
C9592FBE0F483D4B004A49FA /* TDParseKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = C9592FBA0F483D45004A49FA /* TDParseKit.framework */; };
+ C959306A0F4871B0004A49FA /* HaltedColumnTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = C95930690F4871B0004A49FA /* HaltedColumnTransformer.m */; };
C9AAECF60F46D05D00D6C171 /* HashParser.m in Sources */ = {isa = PBXBuildFile; fileRef = C9AAECF50F46D05D00D6C171 /* HashParser.m */; };
C9AAED650F46EF0900D6C171 /* NSArray+TDParseKitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = C9AAED620F46EF0900D6C171 /* NSArray+TDParseKitAdditions.m */; };
C9AAED660F46EF0900D6C171 /* NSString+TDParseKitAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = C9AAED640F46EF0900D6C171 /* NSString+TDParseKitAdditions.m */; };
@@ -51,6 +52,8 @@
8D1107320486CEB800E47090 /* Spike.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Spike.app; sourceTree = BUILT_PRODUCTS_DIR; };
C9592FB50F483CF5004A49FA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/RequestDetails.xib; sourceTree = "<group>"; };
C9592FBA0F483D45004A49FA /* TDParseKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TDParseKit.framework; path = frameworks/TDParseKit.framework; sourceTree = "<group>"; };
+ C95930680F4871B0004A49FA /* HaltedColumnTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HaltedColumnTransformer.h; sourceTree = "<group>"; };
+ C95930690F4871B0004A49FA /* HaltedColumnTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HaltedColumnTransformer.m; sourceTree = "<group>"; };
C9AAECF40F46D05D00D6C171 /* HashParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashParser.h; sourceTree = "<group>"; };
C9AAECF50F46D05D00D6C171 /* HashParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HashParser.m; sourceTree = "<group>"; };
C9AAED610F46EF0900D6C171 /* NSArray+TDParseKitAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+TDParseKitAdditions.h"; sourceTree = "<group>"; };
@@ -101,6 +104,8 @@
C9AAEDD60F4781C500D6C171 /* Parameter.m */,
C9AAEE1C0F479DFF00D6C171 /* RequestDetailsController.h */,
C9AAEE1D0F479DFF00D6C171 /* RequestDetailsController.m */,
+ C95930680F4871B0004A49FA /* HaltedColumnTransformer.h */,
+ C95930690F4871B0004A49FA /* HaltedColumnTransformer.m */,
);
name = Classes;
sourceTree = "<group>";
@@ -239,6 +244,7 @@
C9AAED660F46EF0900D6C171 /* NSString+TDParseKitAdditions.m in Sources */,
C9AAEDD70F4781C500D6C171 /* Parameter.m in Sources */,
C9AAEE1E0F479DFF00D6C171 /* RequestDetailsController.m in Sources */,
+ C959306A0F4871B0004A49FA /* HaltedColumnTransformer.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

0 comments on commit 9081e46

Please sign in to comment.