Browse code

General cleanup, changed license from GPL to whatever, because most of the code isn't really GPL code, and what was GPL is now pretty much gone.

Fixed pretty-printing up a bit-

Nat! authored on 21/04/2014 23:48:11
Showing 13 changed files
... ...
@@ -43,7 +43,6 @@
43 43
 /* End PBXAggregateTarget section */
44 44
 
45 45
 /* Begin PBXBuildFile section */
46
-		4103A7191903E3B700072F47 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 44D5E5CA54724FE68CA8AEF5 /* libPods.a */; };
47 46
 		4126E8DD1903E497000400C3 /* MulleHTMLTidy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4126E8D61903E497000400C3 /* MulleHTMLTidy.h */; settings = {ATTRIBUTES = (Public, ); }; };
48 47
 		4126E8DE1903E497000400C3 /* NSString+MulleHTMLTidy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4126E8D71903E497000400C3 /* NSString+MulleHTMLTidy.h */; settings = {ATTRIBUTES = (Public, ); }; };
49 48
 		4126E8DF1903E497000400C3 /* buffio.h in Headers */ = {isa = PBXBuildFile; fileRef = 4126E8D91903E497000400C3 /* buffio.h */; settings = {ATTRIBUTES = (Public, ); }; };
... ...
@@ -61,6 +60,7 @@
61 61
 		41648EA41900076F00FF1A6A /* NSTask+MullePATH.m in Sources */ = {isa = PBXBuildFile; fileRef = 41648EA31900076F00FF1A6A /* NSTask+MullePATH.m */; };
62 62
 		41741AD0182EB8C80065E5FD /* mulle.icns in Resources */ = {isa = PBXBuildFile; fileRef = 41741ACF182EB8C80065E5FD /* mulle.icns */; };
63 63
 		41741AD3182EBA1C0065E5FD /* MulleScionSyntax.plist in Resources */ = {isa = PBXBuildFile; fileRef = 41741AD1182EB90F0065E5FD /* MulleScionSyntax.plist */; };
64
+		482D9222007A4EC3B439F727 /* libPods-libMulleHTMLTidy.dylib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0726F855ADEE411CA590AEDB /* libPods-libMulleHTMLTidy.dylib.a */; };
64 65
 		F487F4B8141EADEF0093D633 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F487F4B7141EADEF0093D633 /* main.m */; };
65 66
 		F487F4BF141EADEF0093D633 /* MulleScionistDokument.m in Sources */ = {isa = PBXBuildFile; fileRef = F487F4BE141EADEF0093D633 /* MulleScionistDokument.m */; };
66 67
 		F487F4D2141EAE730093D633 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F487F4D0141EAE730093D633 /* MainMenu.xib */; };
... ...
@@ -129,6 +129,8 @@
129 129
 /* End PBXCopyFilesBuildPhase section */
130 130
 
131 131
 /* Begin PBXFileReference section */
132
+		0726F855ADEE411CA590AEDB /* libPods-libMulleHTMLTidy.dylib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-libMulleHTMLTidy.dylib.a"; sourceTree = BUILT_PRODUCTS_DIR; };
133
+		3F1D20ED0318471BBEF929B8 /* Pods-libMulleHTMLTidy.dylib.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-libMulleHTMLTidy.dylib.xcconfig"; path = "Pods/Pods-libMulleHTMLTidy.dylib.xcconfig"; sourceTree = "<group>"; };
132 134
 		4103A6F31903E34A00072F47 /* libMulleHTMLTidy.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libMulleHTMLTidy.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
133 135
 		4103A6F41903E34A00072F47 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
134 136
 		4103A7051903E34A00072F47 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
... ...
@@ -195,7 +197,7 @@
195 195
 			isa = PBXFrameworksBuildPhase;
196 196
 			buildActionMask = 2147483647;
197 197
 			files = (
198
-				4103A7191903E3B700072F47 /* libPods.a in Frameworks */,
198
+				482D9222007A4EC3B439F727 /* libPods-libMulleHTMLTidy.dylib.a in Frameworks */,
199 199
 			);
200 200
 			runOnlyForDeploymentPostprocessing = 0;
201 201
 		};
... ...
@@ -262,6 +264,7 @@
262 262
 				F487F4A8141EADEF0093D633 /* Products */,
263 263
 				4126E8EA1903E735000400C3 /* libPodsXcodeDummy.c */,
264 264
 				868D25B85DEB4BBBAF3C1176 /* Pods.xcconfig */,
265
+				3F1D20ED0318471BBEF929B8 /* Pods-libMulleHTMLTidy.dylib.xcconfig */,
265 266
 			);
266 267
 			sourceTree = "<group>";
267 268
 		};
... ...
@@ -283,6 +286,7 @@
283 283
 				F487F505141EAF8A0093D633 /* WebKit.framework */,
284 284
 				4103A6F41903E34A00072F47 /* Cocoa.framework */,
285 285
 				4103A7051903E34A00072F47 /* XCTest.framework */,
286
+				0726F855ADEE411CA590AEDB /* libPods-libMulleHTMLTidy.dylib.a */,
286 287
 			);
287 288
 			name = Frameworks;
288 289
 			sourceTree = "<group>";
... ...
@@ -443,9 +447,9 @@
443 443
 			targets = (
444 444
 				41648E7618FFDDED00FF1A6A /* All */,
445 445
 				F487F4A6141EADEF0093D633 /* MulleScionist */,
446
+				4103A6F21903E34A00072F47 /* libMulleHTMLTidy.dylib */,
446 447
 				41741AD4182EC0440065E5FD /* grab UKSyntaxColoredTextDocument from github */,
447 448
 				41741ADE18303AFC0065E5FD /* grab MulleScion from github */,
448
-				4103A6F21903E34A00072F47 /* libMulleHTMLTidy.dylib */,
449 449
 			);
450 450
 		};
451 451
 /* End PBXProject section */
... ...
@@ -498,7 +502,7 @@
498 498
 			);
499 499
 			runOnlyForDeploymentPostprocessing = 0;
500 500
 			shellPath = /bin/sh;
501
-			shellScript = "\"${SRCROOT}/Pods/Pods-resources.sh\"\n";
501
+			shellScript = "\"${SRCROOT}/Pods/Pods-libMulleHTMLTidy.dylib-resources.sh\"\n";
502 502
 			showEnvVarsInLog = 0;
503 503
 		};
504 504
 		41741AD8182EC0530065E5FD /* Git Clone If Needed */ = {
... ...
@@ -593,7 +597,7 @@
593 593
 /* Begin XCBuildConfiguration section */
594 594
 		4103A7131903E34A00072F47 /* Debug */ = {
595 595
 			isa = XCBuildConfiguration;
596
-			baseConfigurationReference = 868D25B85DEB4BBBAF3C1176 /* Pods.xcconfig */;
596
+			baseConfigurationReference = 3F1D20ED0318471BBEF929B8 /* Pods-libMulleHTMLTidy.dylib.xcconfig */;
597 597
 			buildSettings = {
598 598
 				DYLIB_COMPATIBILITY_VERSION = 1;
599 599
 				DYLIB_CURRENT_VERSION = 1;
... ...
@@ -605,7 +609,7 @@
605 605
 		};
606 606
 		4103A7141903E34A00072F47 /* Release */ = {
607 607
 			isa = XCBuildConfiguration;
608
-			baseConfigurationReference = 868D25B85DEB4BBBAF3C1176 /* Pods.xcconfig */;
608
+			baseConfigurationReference = 3F1D20ED0318471BBEF929B8 /* Pods-libMulleHTMLTidy.dylib.xcconfig */;
609 609
 			buildSettings = {
610 610
 				DYLIB_COMPATIBILITY_VERSION = 1;
611 611
 				DYLIB_CURRENT_VERSION = 1;
... ...
@@ -1,3 +1,6 @@
1 1
 platform :osx, '10.4'
2
-pod "MulleHTMLTidy", '>= 18.48.7'
2
+
3
+target :"libMulleHTMLTidy.dylib" do
4
+    pod "MulleHTMLTidy", :path => '../MulleHTMLTidy'
5
+end
3 6
 
... ...
@@ -1,32 +1,49 @@
1
-# MulleScionDrake
1
+# MulleScionist
2 2
 
3 3
 A simple [MulleScion](http://www.mulle-kybernetik.com/software/git/MulleScion/) 
4 4
 Template Editor for HTML.
5 5
 
6
-MulleScionDrake is a native, open-source template editor for MulleScion HTML templates for OS X. It has 
6
+MulleScionist is a native, open-source template editor for MulleScion HTML templates for OS X. It has
7 7
 syntax highlighting and a live-updating rendered WebKit preview.
8
+You can use the WebKit Inspector from within MulleScionist.
9
+
10
+MulleScionist has also an option to pretty print your HTML code, with limited
11
+support for MulleScion syntax.
8 12
 
9 13
 
10 14
 ![](screeny.png "Screenshot")
11
-![](raw/master/screeny.png "Screenshot")
15
+![](raw/master/screeny.png "Screenshot") 
16
+
17
+# History
12 18
 
19
+MulleScionist is the follow-up project to MulleScionDrake, which was based on
20
+ManDrake by Sveinbjorn Thordarson.
13 21
 
14 22
 # Credits
15 23
 
16
-Converted to MulleScion by:
24
+MulleScionist, MulleHTMLTidy by:
25
+
26
+> Nat! [Mulle kybernetiK](http://www.mulle-kybernetik.com)
27
+
28
+mulle-tidy by:
17 29
 
18 30
 > Nat! [Mulle kybernetiK](http://www.mulle-kybernetik.com)
19 31
 
20
-Created by:
32
+tidy-html5 by:
33
+
34
+> W3C, Dave Ragget and others.
35
+
36
+ManDrake by:
37
+
38
+>Sveinbjorn Thordarson <sveinbjornt@gmail.com>
39
+
40
+UKSyntaxColoredTextDocument by:
41
+
42
+> Uli Kusterer 
21 43
 
22
-> Sveinbjorn Thordarson <sveinbjornt@gmail.com>
44
+NoodleLineView by:
23 45
 
24
-Special thanks:
46
+> Paul Kim 
25 47
 
26
-> Uli Kusterer for syntax coloring
27
-> 
28
-> Paul Kim for NoodleLineView
29
-> 
30
-> Dirk Engling 
31 48
 
32 49
 
33 50
Binary files a/screeny.png and b/screeny.png differ
... ...
@@ -38,7 +38,7 @@
38 38
 	<key>LSMinimumSystemVersion</key>
39 39
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
40 40
 	<key>NSHumanReadableCopyright</key>
41
-	<string>GNU GPL License.</string>
41
+	<string>A wiley mixture of Open Source licenses</string>
42 42
 	<key>NSMainNibFile</key>
43 43
 	<string>MainMenu</string>
44 44
 	<key>NSPrincipalClass</key>
... ...
@@ -1,28 +1,13 @@
1 1
 /*
2
- 
3
- MulleScionDrake - MulleScion template editor 
4
- Copyright (C) 2011 Sveinbjorn Thordarson <sveinbjornt@gmail.com>
5
- Copyright (c) 2013 Mulle kybernetiK, code by Nat!
6
- 
7
- This program is free software; you can redistribute it and/or modify
8
- it under the terms of the GNU General Public License as published by
9
- the Free Software Foundation; either version 2 of the License, or
10
- (at your option) any later version.
11
- 
12
- This program is distributed in the hope that it will be useful,
13
- but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
- GNU General Public License for more details.
16
- 
17
- You should have received a copy of the GNU General Public License
18
- along with this program; if not, write to the Free Software
19
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20
- 
2
+  MulleScionist - MulleScion template editor
3
+  Copyright (c) 2013, 2014 Mulle kybernetiK, code by Nat!
21 4
  */
5
+
22 6
 #import <AppKit/AppKit.h>
23 7
 
8
+
24 9
 @interface MulleScionistAppDelegate : NSObject <NSApplicationDelegate>
25 10
 
26
-+ (void)initialize;
11
++ (void) initialize;
27 12
 
28 13
 @end
... ...
@@ -1,25 +1,11 @@
1 1
 /*
2
-  MulleScionDrake - MulleScion template editor
3
-  Copyright (C) 2011 Sveinbjorn Thordarson <sveinbjornt@gmail.com>
4
-  Copyright (c) 2013 Mulle kybernetiK, code by Nat!
5
- 
6
- This program is free software; you can redistribute it and/or modify
7
- it under the terms of the GNU General Public License as published by
8
- the Free Software Foundation; either version 2 of the License, or
9
- (at your option) any later version.
10
- 
11
- This program is distributed in the hope that it will be useful,
12
- but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- GNU General Public License for more details.
15
- 
16
- You should have received a copy of the GNU General Public License
17
- along with this program; if not, write to the Free Software
18
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19
- 
2
+  MulleScionist - MulleScion template editor
3
+  Copyright (c) 2013, 2014 Mulle kybernetiK, code by Nat!
20 4
  */
5
+
21 6
 #import "MulleScionistAppDelegate.h"
22 7
 
8
+
23 9
 @implementation MulleScionistAppDelegate
24 10
 
25 11
 + (void) initialize
... ...
@@ -31,7 +17,7 @@
31 31
                     forKey:@"Refresh"];
32 32
    [defaultPrefs setObject:[NSNumber numberWithBool:YES]
33 33
                     forKey:@"WebKitDeveloperExtras"];
34
-   [[NSUserDefaults standardUserDefaults] registerDefaults: defaultPrefs];
34
+   [[NSUserDefaults standardUserDefaults] registerDefaults:defaultPrefs];
35 35
 }
36 36
 
37 37
 @end
... ...
@@ -1,27 +1,11 @@
1 1
 /*
2
- 
3
- MulleScionDrake - MulleScion template editor 
4
- Copyright (C) 2011 Sveinbjorn Thordarson <sveinbjornt@gmail.com>
5
- Copyright (c) 2013 Mulle kybernetiK, code by Nat!
6
- 
7
- This program is free software; you can redistribute it and/or modify
8
- it under the terms of the GNU General Public License as published by
9
- the Free Software Foundation; either version 2 of the License, or
10
- (at your option) any later version.
11
- 
12
- This program is distributed in the hope that it will be useful,
13
- but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
- GNU General Public License for more details.
16
- 
17
- You should have received a copy of the GNU General Public License
18
- along with this program; if not, write to the Free Software
19
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20
- 
2
+  MulleScionist - MulleScion template editor
3
+  Copyright (c) 2013, 2014 Mulle kybernetiK, code by Nat!
21 4
  */
22 5
 #import "UKSyntaxColoredTextDocument.h"
23 6
 #import <WebKit/WebKit.h>
24 7
 
8
+
25 9
 @class NoodleLineNumberView;
26 10
 
27 11
 @interface MulleScionistDokument : UKSyntaxColoredTextDocument
... ...
@@ -42,7 +26,6 @@
42 42
    NoodleLineNumberView    *lineNumberView;
43 43
 
44 44
    NSPoint                 currentScrollPosition;
45
-   NSTimer                 *refreshTimer;
46 45
    BOOL                    loadDefault_;
47 46
    
48 47
    NSString                *mulleScionDirPath_;
... ...
@@ -1,24 +1,10 @@
1 1
 /*
2
- MulleScionDrake - MulleScion template editor
3
- Copyright (C) 2011 Sveinbjorn Thordarson <sveinbjornt@gmail.com>
4
- Copyright (c) 2013 Mulle kybernetiK, code by Nat!
5
- 
6
- This program is free software; you can redistribute it and/or modify
7
- it under the terms of the GNU General Public License as published by
8
- the Free Software Foundation; either version 2 of the License, or
9
- (at your option) any later version.
10
- 
11
- This program is distributed in the hope that it will be useful,
12
- but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- GNU General Public License for more details.
15
- 
16
- You should have received a copy of the GNU General Public License
17
- along with this program; if not, write to the Free Software
18
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19
- 
2
+  MulleScionist - MulleScion template editor
3
+  Copyright (c) 2013, 2014 Mulle kybernetiK, code by Nat!
20 4
  */
5
+
21 6
 #import "MulleScionistDokument.h"
7
+
22 8
 #import <Foundation/NSDebug.h>
23 9
 #import <MulleHTMLTidy.h>
24 10
 
... ...
@@ -29,16 +15,6 @@
29 29
 
30 30
 @implementation MulleScionistDokument
31 31
 
32
-- (id)init
33
-{
34
-    if (self = [super init]) 
35
-	{
36
-		refreshTimer = NULL;
37
-    }
38
-    return self;
39
-}
40
-
41
-
42 32
 - (void) loadDefaultScionAndPlistIfNeeded
43 33
 {
44 34
    NSBundle   *bundle;
... ...
@@ -48,6 +24,7 @@
48 48
    
49 49
    if( ! self->loadDefault_)
50 50
       return;
51
+   
51 52
    bundle = [NSBundle mainBundle];
52 53
    path   = [bundle pathForResource:@"default"
53 54
                              ofType:@"scion"];
... ...
@@ -62,7 +39,7 @@
62 62
 
63 63
 
64 64
 - (id) initWithType:(NSString *) typeName
65
-             error:(NSError **)outError;
65
+              error:(NSError **)outError;
66 66
 {
67 67
    self = [super initWithType:typeName
68 68
                         error:outError];
... ...
@@ -74,24 +51,22 @@
74 74
 }
75 75
 
76 76
 
77
-- (NSString *)windowNibName
77
+- (NSString *) windowNibName
78 78
 {
79
-    return @"MulleScionistDokument";
79
+   return( @"MulleScionistDokument");
80 80
 }
81 81
 
82
-- (void)windowControllerDidLoadNib:(NSWindowController *) aController
82
+
83
+- (void) windowControllerDidLoadNib:(NSWindowController *) aController
83 84
 {
84 85
    [self loadDefaultScionAndPlistIfNeeded];
85 86
    
86 87
    // set up line numbering for text view
87 88
    scrollView = [textView enclosingScrollView];
88 89
    NSParameterAssert( scrollView);
89
-
90
+   
90 91
    lineNumberView = [[[MarkerLineNumberView alloc] initWithScrollView:scrollView] autorelease];
91 92
    [scrollView setVerticalRulerView:lineNumberView];
92
-   [scrollView setHasHorizontalRuler:NO];
93
-   [scrollView setHasVerticalRuler:YES];
94
-   [scrollView setRulersVisible:YES];
95 93
    
96 94
    [textView setSmartInsertDeleteEnabled:YES];
97 95
    if( [textView respondsToSelector:@selector( setAutomaticQuoteSubstitutionEnabled:)])
... ...
@@ -110,30 +85,41 @@
110 110
    [super windowControllerDidLoadNib: aController];
111 111
 }
112 112
 
113
--(void)dealloc
113
+
114
+- (void) dealloc
114 115
 {
115 116
    [mulleScionDirPath_ release];
117
+   [environment_ release];
116 118
    [super dealloc];
117 119
 }
118 120
 
119 121
 #pragma mark Web Preview
120 122
 
121
-- (IBAction)refresh:(id)sender
122
-{	
123
-	// generate preview
124
-	[refreshProgressIndicator startAnimation: self];
125
-	[self drawWebView];
126
-	[refreshProgressIndicator stopAnimation: self];
123
+- (IBAction) refresh:(id)sender
124
+{
125
+   NSWindow      *window;
126
+   NSResponder   *responder;
127
+   
128
+   window    = [textView window];
129
+   responder = [window firstResponder];
130
+   [NSObject cancelPreviousPerformRequestsWithTarget:self
131
+                                            selector:@selector( updatePreview)
132
+                                              object:nil];
133
+   [refreshProgressIndicator startAnimation: self];
134
+   [self drawWebView];
135
+   [refreshProgressIndicator stopAnimation: self];
136
+   
137
+   if( responder)
138
+      [window makeFirstResponder:responder]; // just in case
127 139
 }
128 140
 
129
-- (IBAction)refreshChanged:(id)sender
141
+
142
+- (IBAction) refreshChanged:(id) sender
130 143
 {
131
-    NSLog(@"REFRESH CHANGED");
132
-    [[NSUserDefaults standardUserDefaults] setObject: [refreshTypePopupButton titleOfSelectedItem] forKey: @"Refresh"];
144
+   [[NSUserDefaults standardUserDefaults] setObject: [refreshTypePopupButton titleOfSelectedItem] forKey: @"Refresh"];
133 145
 }
134 146
 
135 147
 
136
-
137 148
 - (void) textDidChange:(NSNotification *) aNotification
138 149
 {
139 150
    NSString *refreshText = [refreshTypePopupButton titleOfSelectedItem];
... ...
@@ -213,11 +199,32 @@
213 213
    return( cmdString);
214 214
 }
215 215
 
216
+- (NSView <WebDocumentView> *) webViewDocumentView
217
+{
218
+   return( [[[webView mainFrame] frameView] documentView]);
219
+}
220
+
221
+- (void) loadHTMLIntoWebView
222
+{
223
+   NSScrollView   *webScrollView;
224
+   NSURLRequest   *request;
225
+   NSURL          *url;
226
+   
227
+   // get the current scroll position of the document view of the web view
228
+   webScrollView         = [[self webViewDocumentView] enclosingScrollView];
229
+   currentScrollPosition = [[webScrollView contentView] bounds].origin;
230
+   
231
+   url     = [NSURL fileURLWithPath: @"/tmp/MulleScionDrakeTemp.html"];
232
+   request = [NSURLRequest requestWithURL: url];
233
+   // tell the web view to load the generated, local html file
234
+   [[webView mainFrame] loadRequest:request];
235
+}
216 236
 
217 237
 - (void) drawWebView
218 238
 {
219
-   NSString    *cmdString;
220
-   NSString    *log;
239
+   NSString       *cmdString;
240
+   NSString       *log;
241
+
221 242
    
222 243
    cmdString = [self commandStringWithTemplateString:[textView string]
223 244
                                   propertyListString:[plistTextView string]];
... ...
@@ -246,66 +253,71 @@
246 246
    
247 247
    [logTextView setString:log ? log : @"No errors"];
248 248
    
249
-   // get the current scroll position of the document view of the web view
250
-   NSScrollView *theScrollView = [[[[webView mainFrame] frameView] documentView] enclosingScrollView];
251
-   NSRect scrollViewBounds = [[theScrollView contentView] bounds];
252
-   currentScrollPosition=scrollViewBounds.origin;
253
-   
254
-   // tell the web view to load the generated, local html file
255
-   [[webView mainFrame] loadRequest: [NSURLRequest requestWithURL: [NSURL fileURLWithPath: @"/tmp/MulleScionDrakeTemp.html"]]];
256
-   
249
+   [self loadHTMLIntoWebView];
257 250
 }
258 251
 
252
+
259 253
 // delegate method we receive when it's done loading the html file. 
260
-- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
254
+- (void) webView:(WebView *)sender
255
+didFinishLoadForFrame:(WebFrame *)frame
261 256
 {
262
-	// restore the scroll position
263
-	[[[[webView mainFrame] frameView] documentView] scrollPoint:currentScrollPosition];
257
+   // restore the scroll position
258
+   [[self webViewDocumentView] scrollPoint:currentScrollPosition];
264 259
 }
265 260
 
266
-- (void)updatePreview
261
+- (void) updatePreview
267 262
 {
268
-	[self refresh: self];
269
-	[refreshTimer invalidate];
270
-	refreshTimer = NULL;
263
+   [NSObject cancelPreviousPerformRequestsWithTarget:self
264
+                                            selector:@selector( updatePreview)
265
+                                              object:nil];
266
+   [self refresh: self];
271 267
 }
272 268
 
273 269
 #pragma mark UKSyntaxColored stuff
274 270
 
275
--(NSString*) syntaxDefinitionFilename 
271
+- (NSString *) syntaxDefinitionFilename
276 272
 {
277
-	return @"MulleScionSyntax";
273
+   return( @"MulleScionSyntax");
278 274
 }
279 275
 
280
--(NSStringEncoding) stringEncoding 
276
+
277
+- (NSStringEncoding) stringEncoding
281 278
 {
282
-    return NSUTF8StringEncoding;
279
+   return( NSUTF8StringEncoding);
283 280
 }
284 281
 
285
-- (BOOL) readFromData:(NSData *)data
286
-               ofType:(NSString *)typeName
287
-               error:(NSError **)outError
282
+- (BOOL) readFromData:(NSData *) data
283
+               ofType:(NSString *) typeName
284
+               error:(NSError **) outError
288 285
 {
289 286
    return( [super readFromData:data
290 287
                         ofType:typeName
291 288
                          error:outError]);
292 289
 }
290
+
293 291
 #pragma mark UKSyntaxColoredTextViewDelegate methods
294 292
 
295
--(NSString *)syntaxDefinitionFilenameForTextViewController: (UKSyntaxColoredTextViewController *)sender 
293
+- (NSString *) syntaxDefinitionFilenameForTextViewController: (UKSyntaxColoredTextViewController *) sender
296 294
 {
297 295
    return( [self syntaxDefinitionFilename]);
298 296
 }
299 297
 
300
--(NSDictionary*) syntaxDefinitionDictionaryForTextViewController: (UKSyntaxColoredTextViewController*)sender
298
+
299
+- (NSDictionary*) syntaxDefinitionDictionaryForTextViewController: (UKSyntaxColoredTextViewController*) sender
301 300
 {
302
-    NSBundle* theBundle = [NSBundle mainBundle];
303
-    NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile: [theBundle pathForResource: [self syntaxDefinitionFilename] ofType:@"plist"]];
304
-    if (!dict) 
305
-	{
306
-        NSLog(@"Failed to find the syntax dictionary");
307
-    }
308
-    return dict;
301
+   NSBundle       *bundle;
302
+   NSDictionary   *dict;
303
+   NSString       *path;
304
+   
305
+   bundle = [NSBundle mainBundle];
306
+   path   = [bundle pathForResource:[self syntaxDefinitionFilename]
307
+                             ofType:@"plist"];
308
+   dict = [NSDictionary dictionaryWithContentsOfFile:path];
309
+   if( ! dict)
310
+   {
311
+      NSLog(@"Failed to find the syntax dictionary at \"%@\"", path);
312
+   }
313
+   return( dict);
309 314
 }
310 315
 
311 316
 # pragma mark -
... ...
@@ -327,7 +339,7 @@
327 327
                                                        error:&error];
328 328
    // could also show XML here if needed
329 329
    return( plist);
330
-   //   [plistTextView setString:[plist description]];
330
+   //   return( [plist description]);
331 331
 }
332 332
 
333 333
 
... ...
@@ -372,19 +384,13 @@
372 372
       return;
373 373
    
374 374
    plist = @"{}";
375
-   
376
-   type = [[url path] pathExtension];
375
+   type  = [[url path] pathExtension];
377 376
    if( [type isEqualToString:@"plist"])
378
-   {
379 377
       plist = [self openPlist:url];
380
-   }
381 378
    else
382 379
       if( [type isEqualToString:@"bundle"] || [type isEqualToString:@"framework"])
383
-      {
384 380
          plist = [self openBundle:url];
385
-      }
386 381
    
387
-
388 382
    if( ! plist)
389 383
    {
390 384
       NSRunAlertPanel(@"Load Error", @"failed to load dataSource", @"OK", nil, nil);
... ...
@@ -402,18 +408,48 @@
402 402
    NSDictionary    *options;
403 403
    MulleHTMLTidy   *tidy;
404 404
    NSData          *data;
405
-
405
+   NSNumber        *no;
406
+   NSNumber        *yes;
407
+   NSNumber        *_auto_;
406 408
 
407 409
    // It would actually be better to move this into a separate executable,
408 410
    // for stability and memory usage
409
-   
411
+
412
+   // use options to make tidy as harmless as possible, just pretty print
413
+   no      = [NSNumber numberWithBool:NO];
414
+   yes     = [NSNumber numberWithBool:YES];
415
+   _auto_  = [NSNumber numberWithBool:2 /* auto */];
410 416
    options = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInt:3], @"indent-spaces",
411
-              [NSNumber numberWithBool:2 /* auto */], @"indent",
417
+              _auto_, @"indent",
418
+              [NSNumber numberWithInt:0], @"wrap",
419
+              yes, @"markup",
420
+              no, @"coerce-endtags",
421
+              no, @"drop-empty-paras",
422
+              no, @"drop-empty-elements",
423
+              no, @"fix-bad-comments",
424
+              no, @"quote-nbsp",
425
+              no, @"quote-ampersand",
426
+              no, @"wrap-sections",
427
+              no, @"wrap-asp",
428
+              no, @"wrap-jste",
429
+              no, @"wrap-php",
430
+              no, @"fix-backslash",
431
+              no, @"quote-ampersand",
432
+              no, @"tidy-mark",
433
+              no, @"fix-uri",
434
+              no, @"lower-literals",
435
+              no, @"join-styles",
436
+              no, @"ncr",
437
+              no, @"merge-emphasis",
438
+              no, @"merge-divs",
439
+              no, @"merge-spans",
440
+              yes, @"preserve-entities",
441
+              no, @"anchor-as-name",
412 442
               nil];
413 443
    
414 444
    data = [[textView string] dataUsingEncoding:NSUTF8StringEncoding];
415 445
    tidy = [[MulleHTMLTidy new] autorelease];
416
-   [tidy setPrettyPrintOptions:options];
446
+   [tidy setOptions:options];
417 447
 
418 448
    if( [tidy parseXHTMLData:data
419 449
    allowLossyConversion:NO])
... ...
@@ -1,4 +1,4 @@
1
-{\rtf1\ansi\ansicpg1252\cocoartf1265
1
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
2 2
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
3 3
 {\colortbl;\red255\green255\blue255;}
4 4
 \paperw11900\paperh16840\vieww9600\viewh8400\viewkind0
... ...
@@ -19,7 +19,7 @@ Created by:
19 19
 \b Special thanks:
20 20
 \b0 \
21 21
 	Uli Kusterer for syntax coloring\
22
-	The anonymous author of NoodleLineView\
22
+	Paul Kom for oodleLineView\
23 23
 	Dirk Engling\
24 24
 \
25 25
 }
26 26
\ No newline at end of file
... ...
@@ -786,8 +786,8 @@
786 786
 								<object class="NSMenuItem" id="282124473">
787 787
 									<reference key="NSMenu" ref="567643404"/>
788 788
 									<string key="NSTitle">Pretty Print File</string>
789
-									<string key="NSKeyEquiv"/>
790
-									<int key="NSKeyEquivModMask">1048576</int>
789
+									<string key="NSKeyEquiv">i</string>
790
+									<int key="NSKeyEquivModMask">262144</int>
791 791
 									<int key="NSMnemonicLoc">2147483647</int>
792 792
 									<reference key="NSOnImage" ref="1033313550"/>
793 793
 									<reference key="NSMixedImage" ref="310636482"/>
... ...
@@ -2651,108 +2651,6 @@
2651 2651
 						<string key="minorKey">./Classes/MulleScionistDokument.h</string>
2652 2652
 					</object>
2653 2653
 				</object>
2654
-				<object class="IBPartialClassDescription">
2655
-					<string key="className">NSDocument</string>
2656
-					<dictionary class="NSMutableDictionary" key="actions">
2657
-						<string key="browseDocumentVersions:">id</string>
2658
-						<string key="duplicateDocument:">id</string>
2659
-						<string key="lockDocument:">id</string>
2660
-						<string key="moveDocument:">id</string>
2661
-						<string key="moveDocumentToUbiquityContainer:">id</string>
2662
-						<string key="printDocument:">id</string>
2663
-						<string key="renameDocument:">id</string>
2664
-						<string key="revertDocumentToSaved:">id</string>
2665
-						<string key="runPageLayout:">id</string>
2666
-						<string key="saveDocument:">id</string>
2667
-						<string key="saveDocumentAs:">id</string>
2668
-						<string key="saveDocumentTo:">id</string>
2669
-						<string key="saveDocumentToPDF:">id</string>
2670
-						<string key="unlockDocument:">id</string>
2671
-					</dictionary>
2672
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
2673
-						<object class="IBActionInfo" key="browseDocumentVersions:">
2674
-							<string key="name">browseDocumentVersions:</string>
2675
-							<string key="candidateClassName">id</string>
2676
-						</object>
2677
-						<object class="IBActionInfo" key="duplicateDocument:">
2678
-							<string key="name">duplicateDocument:</string>
2679
-							<string key="candidateClassName">id</string>
2680
-						</object>
2681
-						<object class="IBActionInfo" key="lockDocument:">
2682
-							<string key="name">lockDocument:</string>
2683
-							<string key="candidateClassName">id</string>
2684
-						</object>
2685
-						<object class="IBActionInfo" key="moveDocument:">
2686
-							<string key="name">moveDocument:</string>
2687
-							<string key="candidateClassName">id</string>
2688
-						</object>
2689
-						<object class="IBActionInfo" key="moveDocumentToUbiquityContainer:">
2690
-							<string key="name">moveDocumentToUbiquityContainer:</string>
2691
-							<string key="candidateClassName">id</string>
2692
-						</object>
2693
-						<object class="IBActionInfo" key="printDocument:">
2694
-							<string key="name">printDocument:</string>
2695
-							<string key="candidateClassName">id</string>
2696
-						</object>
2697
-						<object class="IBActionInfo" key="renameDocument:">
2698
-							<string key="name">renameDocument:</string>
2699
-							<string key="candidateClassName">id</string>
2700
-						</object>
2701
-						<object class="IBActionInfo" key="revertDocumentToSaved:">
2702
-							<string key="name">revertDocumentToSaved:</string>
2703
-							<string key="candidateClassName">id</string>
2704
-						</object>
2705
-						<object class="IBActionInfo" key="runPageLayout:">
2706
-							<string key="name">runPageLayout:</string>
2707
-							<string key="candidateClassName">id</string>
2708
-						</object>
2709
-						<object class="IBActionInfo" key="saveDocument:">
2710
-							<string key="name">saveDocument:</string>
2711
-							<string key="candidateClassName">id</string>
2712
-						</object>
2713
-						<object class="IBActionInfo" key="saveDocumentAs:">
2714
-							<string key="name">saveDocumentAs:</string>
2715
-							<string key="candidateClassName">id</string>
2716
-						</object>
2717
-						<object class="IBActionInfo" key="saveDocumentTo:">
2718
-							<string key="name">saveDocumentTo:</string>
2719
-							<string key="candidateClassName">id</string>
2720
-						</object>
2721
-						<object class="IBActionInfo" key="saveDocumentToPDF:">
2722
-							<string key="name">saveDocumentToPDF:</string>
2723
-							<string key="candidateClassName">id</string>
2724
-						</object>
2725
-						<object class="IBActionInfo" key="unlockDocument:">
2726
-							<string key="name">unlockDocument:</string>
2727
-							<string key="candidateClassName">id</string>
2728
-						</object>
2729
-					</dictionary>
2730
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
2731
-						<string key="majorKey">IBProjectSource</string>
2732
-						<string key="minorKey">./Classes/NSDocument.h</string>
2733
-					</object>
2734
-				</object>
2735
-				<object class="IBPartialClassDescription">
2736
-					<string key="className">NSTextView</string>
2737
-					<dictionary class="NSMutableDictionary" key="actions">
2738
-						<string key="orderFrontSharingServicePicker:">id</string>
2739
-						<string key="toggleQuickLookPreviewPanel:">id</string>
2740
-					</dictionary>
2741
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
2742
-						<object class="IBActionInfo" key="orderFrontSharingServicePicker:">
2743
-							<string key="name">orderFrontSharingServicePicker:</string>
2744
-							<string key="candidateClassName">id</string>
2745
-						</object>
2746
-						<object class="IBActionInfo" key="toggleQuickLookPreviewPanel:">
2747
-							<string key="name">toggleQuickLookPreviewPanel:</string>
2748
-							<string key="candidateClassName">id</string>
2749
-						</object>
2750
-					</dictionary>
2751
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
2752
-						<string key="majorKey">IBProjectSource</string>
2753
-						<string key="minorKey">./Classes/NSTextView.h</string>
2754
-					</object>
2755
-				</object>
2756 2654
 				<object class="IBPartialClassDescription">
2757 2655
 					<string key="className">UKSyntaxColoredTextDocument</string>
2758 2656
 					<string key="superclassName">NSDocument</string>
... ...
@@ -2927,24 +2825,6 @@
2927 2927
 						<string key="minorKey">./Classes/UKTextDocGoToBox.h</string>
2928 2928
 					</object>
2929 2929
 				</object>
2930
-				<object class="IBPartialClassDescription">
2931
-					<string key="className">WebView</string>
2932
-					<object class="NSMutableDictionary" key="actions">
2933
-						<string key="NS.key.0">reloadFromOrigin:</string>
2934
-						<string key="NS.object.0">id</string>
2935
-					</object>
2936
-					<object class="NSMutableDictionary" key="actionInfosByName">
2937
-						<string key="NS.key.0">reloadFromOrigin:</string>
2938
-						<object class="IBActionInfo" key="NS.object.0">
2939
-							<string key="name">reloadFromOrigin:</string>
2940
-							<string key="candidateClassName">id</string>
2941
-						</object>
2942
-					</object>
2943
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
2944
-						<string key="majorKey">IBProjectSource</string>
2945
-						<string key="minorKey">./Classes/WebView.h</string>
2946
-					</object>
2947
-				</object>
2948 2930
 			</array>
2949 2931
 		</object>
2950 2932
 		<int key="IBDocument.localizationMode">0</int>
... ...
@@ -139,6 +139,7 @@
139 139
 			<key>Keywords</key>
140 140
 			<array>
141 141
 				<string>if</string>
142
+				<string>else</string>
142 143
 				<string>endif</string>
143 144
 				<string>while</string>
144 145
 				<string>endwhile</string>
... ...
@@ -146,6 +147,7 @@
146 146
 				<string>endfor</string>
147 147
 				<string>set</string>
148 148
 				<string>NSMakeRange</string>
149
+				<string>log</string>
149 150
 				<string>filter</string>
150 151
 				<string>verbatim</string>
151 152
 			</array>
... ...
@@ -99,7 +99,7 @@
99 99
 																<string>WebURLsWithTitlesPboardType</string>
100 100
 																<string>public.url</string>
101 101
 															</set>
102
-															<string key="NSFrameSize">{528, 225}</string>
102
+															<string key="NSFrameSize">{543, 210}</string>
103 103
 															<reference key="NSSuperview" ref="74212334"/>
104 104
 															<reference key="NSWindow"/>
105 105
 															<reference key="NSNextKeyView" ref="114069088"/>
... ...
@@ -119,7 +119,7 @@
119 119
 																	<nil key="NSDelegate"/>
120 120
 																</object>
121 121
 																<reference key="NSTextView" ref="153826488"/>
122
-																<double key="NSWidth">528</double>
122
+																<double key="NSWidth">543</double>
123 123
 																<int key="NSTCFlags">1</int>
124 124
 															</object>
125 125
 															<object class="NSTextViewSharedData" key="NSSharedData">
... ...
@@ -167,12 +167,12 @@
167 167
 																<int key="NSPreferredTextFinderStyle">1</int>
168 168
 															</object>
169 169
 															<int key="NSTVFlags">6</int>
170
-															<string key="NSMaxSize">{528, 10000000}</string>
171
-															<string key="NSMinize">{311, 225}</string>
170
+															<string key="NSMaxSize">{543, 10000000}</string>
171
+															<string key="NSMinize">{326, 210}</string>
172 172
 															<nil key="NSDelegate"/>
173 173
 														</object>
174 174
 													</array>
175
-													<string key="NSFrame">{{1, 1}, {311, 225}}</string>
175
+													<string key="NSFrame">{{1, 1}, {326, 210}}</string>
176 176
 													<reference key="NSSuperview" ref="956423577"/>
177 177
 													<reference key="NSWindow"/>
178 178
 													<reference key="NSNextKeyView" ref="153826488"/>
... ...
@@ -207,12 +207,13 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
207 207
 												</object>
208 208
 												<object class="NSScroller" id="114069088">
209 209
 													<reference key="NSNextResponder" ref="956423577"/>
210
-													<int key="NSvFlags">256</int>
210
+													<int key="NSvFlags">-2147483392</int>
211 211
 													<string key="NSFrame">{{312, 1}, {15, 225}}</string>
212 212
 													<reference key="NSSuperview" ref="956423577"/>
213 213
 													<reference key="NSWindow"/>
214 214
 													<reference key="NSNextKeyView" ref="144540953"/>
215 215
 													<string key="NSReuseIdentifierKey">_NS:83</string>
216
+													<bool key="NSEnabled">YES</bool>
216 217
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
217 218
 													<reference key="NSTarget" ref="956423577"/>
218 219
 													<string key="NSAction">_doScroller:</string>
... ...
@@ -220,8 +221,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
220 220
 												</object>
221 221
 												<object class="NSScroller" id="469203446">
222 222
 													<reference key="NSNextResponder" ref="956423577"/>
223
-													<int key="NSvFlags">-2147483392</int>
224
-													<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
223
+													<int key="NSvFlags">256</int>
224
+													<string key="NSFrame">{{1, 211}, {326, 15}}</string>
225 225
 													<reference key="NSSuperview" ref="956423577"/>
226 226
 													<reference key="NSWindow"/>
227 227
 													<reference key="NSNextKeyView" ref="74212334"/>
... ...
@@ -231,8 +232,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
231 231
 													<int key="NSsFlags">1</int>
232 232
 													<reference key="NSTarget" ref="956423577"/>
233 233
 													<string key="NSAction">_doScroller:</string>
234
-													<double key="NSCurValue">1</double>
235
-													<double key="NSPercent">0.94565218687057495</double>
234
+													<double key="NSPercent">0.60036832412523022</double>
236 235
 												</object>
237 236
 											</array>
238 237
 											<string key="NSFrameSize">{328, 227}</string>
... ...
@@ -241,7 +241,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
241 241
 											<reference key="NSNextKeyView" ref="469203446"/>
242 242
 											<string key="NSReuseIdentifierKey">_NS:9</string>
243 243
 											<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
244
-											<int key="NSsFlags">133266</int>
244
+											<int key="NSsFlags">133810</int>
245 245
 											<reference key="NSVScroller" ref="114069088"/>
246 246
 											<reference key="NSHScroller" ref="469203446"/>
247 247
 											<reference key="NSContentView" ref="74212334"/>
... ...
@@ -283,7 +283,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
283 283
 																		<string>WebURLsWithTitlesPboardType</string>
284 284
 																		<string>public.url</string>
285 285
 																	</set>
286
-																	<string key="NSFrameSize">{540, 156}</string>
286
+																	<string key="NSFrameSize">{555, 141}</string>
287 287
 																	<reference key="NSSuperview" ref="1034529273"/>
288 288
 																	<reference key="NSWindow"/>
289 289
 																	<reference key="NSNextKeyView" ref="529487136"/>
... ...
@@ -303,7 +303,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
303 303
 																			<nil key="NSDelegate"/>
304 304
 																		</object>
305 305
 																		<reference key="NSTextView" ref="134316409"/>
306
-																		<double key="NSWidth">540</double>
306
+																		<double key="NSWidth">555</double>
307 307
 																		<int key="NSTCFlags">1</int>
308 308
 																	</object>
309 309
 																	<object class="NSTextViewSharedData" key="NSSharedData">
... ...
@@ -326,12 +326,12 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
326 326
 																		<int key="NSPreferredTextFinderStyle">1</int>
327 327
 																	</object>
328 328
 																	<int key="NSTVFlags">6</int>
329
-																	<string key="NSMaxSize">{540, 10000000}</string>
330
-																	<string key="NSMinize">{311, 156}</string>
329
+																	<string key="NSMaxSize">{555, 10000000}</string>
330
+																	<string key="NSMinize">{326, 141}</string>
331 331
 																	<nil key="NSDelegate"/>
332 332
 																</object>
333 333
 															</array>
334
-															<string key="NSFrame">{{1, 1}, {311, 156}}</string>
334
+															<string key="NSFrame">{{1, 1}, {326, 141}}</string>
335 335
 															<reference key="NSSuperview" ref="305849995"/>
336 336
 															<reference key="NSWindow"/>
337 337
 															<reference key="NSNextKeyView" ref="134316409"/>
... ...
@@ -363,12 +363,13 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
363 363
 														</object>
364 364
 														<object class="NSScroller" id="529487136">
365 365
 															<reference key="NSNextResponder" ref="305849995"/>
366
-															<int key="NSvFlags">256</int>
366
+															<int key="NSvFlags">-2147483392</int>
367 367
 															<string key="NSFrame">{{312, 1}, {15, 156}}</string>
368 368
 															<reference key="NSSuperview" ref="305849995"/>
369 369
 															<reference key="NSWindow"/>
370 370
 															<reference key="NSNextKeyView" ref="14841239"/>
371 371
 															<string key="NSReuseIdentifierKey">_NS:83</string>
372
+															<bool key="NSEnabled">YES</bool>
372 373
 															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
373 374
 															<reference key="NSTarget" ref="305849995"/>
374 375
 															<string key="NSAction">_doScroller:</string>
... ...
@@ -376,8 +377,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
376 376
 														</object>
377 377
 														<object class="NSScroller" id="119622005">
378 378
 															<reference key="NSNextResponder" ref="305849995"/>
379
-															<int key="NSvFlags">-2147483392</int>
380
-															<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
379
+															<int key="NSvFlags">256</int>
380
+															<string key="NSFrame">{{1, 142}, {326, 15}}</string>
381 381
 															<reference key="NSSuperview" ref="305849995"/>
382 382
 															<reference key="NSWindow"/>
383 383
 															<reference key="NSNextKeyView" ref="1034529273"/>
... ...
@@ -387,8 +388,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
387 387
 															<int key="NSsFlags">1</int>
388 388
 															<reference key="NSTarget" ref="305849995"/>
389 389
 															<string key="NSAction">_doScroller:</string>
390
-															<double key="NSCurValue">1</double>
391
-															<double key="NSPercent">0.94565218687057495</double>
390
+															<double key="NSPercent">0.58738738738738738</double>
392 391
 														</object>
393 392
 													</array>
394 393
 													<string key="NSFrameSize">{328, 158}</string>
... ...
@@ -397,7 +397,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
397 397
 													<reference key="NSNextKeyView" ref="119622005"/>
398 398
 													<string key="NSReuseIdentifierKey">_NS:9</string>
399 399
 													<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
400
-													<int key="NSsFlags">133266</int>
400
+													<int key="NSsFlags">133810</int>
401 401
 													<reference key="NSVScroller" ref="529487136"/>
402 402
 													<reference key="NSHScroller" ref="119622005"/>
403 403
 													<reference key="NSContentView" ref="1034529273"/>
... ...
@@ -409,6 +409,42 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
409 409
 													<reference key="NSNextResponder" ref="144540953"/>
410 410
 													<int key="NSvFlags">268</int>
411 411
 													<array class="NSMutableArray" key="NSSubviews">
412
+														<object class="NSButton" id="872330999">
413
+															<reference key="NSNextResponder" ref="14841239"/>
414
+															<int key="NSvFlags">265</int>
415
+															<string key="NSFrame">{{260, 94}, {57, 20}}</string>
416
+															<reference key="NSSuperview" ref="14841239"/>
417
+															<reference key="NSWindow"/>
418
+															<reference key="NSNextKeyView" ref="437724191"/>
419
+															<string key="NSReuseIdentifierKey">_NS:9</string>
420
+															<bool key="NSEnabled">YES</bool>
421
+															<object class="NSButtonCell" key="NSCell" id="1018938581">
422
+																<int key="NSCellFlags">67108864</int>
423
+																<int key="NSCellFlags2">268566528</int>
424
+																<string key="NSContents">Trace</string>
425
+																<object class="NSFont" key="NSSupport" id="26">
426
+																	<string key="NSName">.LucidaGrandeUI</string>
427
+																	<double key="NSSize">11</double>
428
+																	<int key="NSfFlags">3100</int>
429
+																</object>
430
+																<string key="NSCellIdentifier">_NS:9</string>
431
+																<reference key="NSControlView" ref="872330999"/>
432
+																<int key="NSButtonFlags">1211912448</int>
433
+																<int key="NSButtonFlags2">2</int>
434
+																<object class="NSCustomResource" key="NSNormalImage">
435
+																	<string key="NSClassName">NSImage</string>
436
+																	<string key="NSResourceName">NSSwitch</string>
437
+																</object>
438
+																<object class="NSButtonImageSource" key="NSAlternateImage">
439
+																	<string key="NSImageName">NSSwitch</string>
440
+																</object>
441
+																<string key="NSAlternateContents"/>
442
+																<string key="NSKeyEquivalent"/>
443
+																<int key="NSPeriodicDelay">200</int>
444
+																<int key="NSPeriodicInterval">25</int>
445
+															</object>
446
+															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
447
+														</object>
412 448
 														<object class="NSScrollView" id="437724191">
413 449
 															<reference key="NSNextResponder" ref="14841239"/>
414 450
 															<int key="NSvFlags">274</int>
... ...
@@ -420,7 +456,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
420 420
 																		<object class="NSTextView" id="157462489">
421 421
 																			<reference key="NSNextResponder" ref="429686640"/>
422 422
 																			<int key="NSvFlags">2322</int>
423
-																			<string key="NSFrameSize">{0, 90}</string>
423
+																			<string key="NSFrameSize">{15, 111}</string>
424 424
 																			<reference key="NSSuperview" ref="429686640"/>
425 425
 																			<reference key="NSWindow"/>
426 426
 																			<reference key="NSNextKeyView" ref="91957353"/>
... ...
@@ -440,7 +476,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
440 440
 																					<nil key="NSDelegate"/>
441 441
 																				</object>
442 442
 																				<reference key="NSTextView" ref="157462489"/>
443
-																				<double key="NSWidth">0.0</double>
443
+																				<double key="NSWidth">15</double>
444 444
 																				<int key="NSTCFlags">1</int>
445 445
 																			</object>
446 446
 																			<object class="NSTextViewSharedData" key="NSSharedData">
... ...
@@ -467,10 +503,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
467 467
 																			</object>
468 468
 																			<int key="NSTVFlags">6</int>
469 469
 																			<string key="NSMaxSize">{540, 10000000}</string>
470
+																			<string key="NSMinize">{326, 111}</string>
470 471
 																			<nil key="NSDelegate"/>
471 472
 																		</object>
472 473
 																	</array>
473
-																	<string key="NSFrame">{{1, 1}, {311, 90}}</string>
474
+																	<string key="NSFrame">{{1, 1}, {326, 111}}</string>
474 475
 																	<reference key="NSSuperview" ref="437724191"/>
475 476
 																	<reference key="NSWindow"/>
476 477
 																	<reference key="NSNextKeyView" ref="157462489"/>
... ...
@@ -502,12 +539,13 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
502 502
 																</object>
503 503
 																<object class="NSScroller" id="91957353">
504 504
 																	<reference key="NSNextResponder" ref="437724191"/>
505
-																	<int key="NSvFlags">256</int>
506
-																	<string key="NSFrame">{{312, 1}, {15, 90}}</string>
505
+																	<int key="NSvFlags">-2147483392</int>
506
+																	<string key="NSFrame">{{312, 1}, {15, 111}}</string>
507 507
 																	<reference key="NSSuperview" ref="437724191"/>
508 508
 																	<reference key="NSWindow"/>
509 509
 																	<reference key="NSNextKeyView" ref="778876534"/>
510 510
 																	<string key="NSReuseIdentifierKey">_NS:83</string>
511
+																	<bool key="NSEnabled">YES</bool>
511 512
 																	<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
512 513
 																	<reference key="NSTarget" ref="437724191"/>
513 514
 																	<string key="NSAction">_doScroller:</string>
... ...
@@ -521,6 +559,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
521 521
 																	<reference key="NSWindow"/>
522 522
 																	<reference key="NSNextKeyView" ref="429686640"/>
523 523
 																	<string key="NSReuseIdentifierKey">_NS:33</string>
524
+																	<bool key="NSEnabled">YES</bool>
524 525
 																	<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
525 526
 																	<int key="NSsFlags">1</int>
526 527
 																	<reference key="NSTarget" ref="437724191"/>
... ...
@@ -529,12 +568,12 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
529 529
 																	<double key="NSPercent">0.94565218687057495</double>
530 530
 																</object>
531 531
 															</array>
532
-															<string key="NSFrameSize">{328, 92}</string>
532
+															<string key="NSFrameSize">{328, 113}</string>
533 533
 															<reference key="NSSuperview" ref="14841239"/>
534 534
 															<reference key="NSWindow"/>
535 535
 															<reference key="NSNextKeyView" ref="325965293"/>
536 536
 															<string key="NSReuseIdentifierKey">_NS:9</string>
537
-															<int key="NSsFlags">133138</int>
537
+															<int key="NSsFlags">133682</int>
538 538
 															<reference key="NSVScroller" ref="91957353"/>
539 539
 															<reference key="NSHScroller" ref="325965293"/>
540 540
 															<reference key="NSContentView" ref="429686640"/>
... ...
@@ -542,42 +581,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
542 542
 															<double key="NSMaxMagnification">4</double>
543 543
 															<double key="NSMagnification">1</double>
544 544
 														</object>
545
-														<object class="NSButton" id="872330999">
546
-															<reference key="NSNextResponder" ref="14841239"/>
547
-															<int key="NSvFlags">268</int>
548
-															<string key="NSFrame">{{7, 93}, {57, 20}}</string>
549
-															<reference key="NSSuperview" ref="14841239"/>
550
-															<reference key="NSWindow"/>
551
-															<reference key="NSNextKeyView" ref="437724191"/>
552
-															<string key="NSReuseIdentifierKey">_NS:9</string>
553
-															<bool key="NSEnabled">YES</bool>
554
-															<object class="NSButtonCell" key="NSCell" id="1018938581">
555
-																<int key="NSCellFlags">-2080374784</int>
556
-																<int key="NSCellFlags2">268566528</int>
557
-																<string key="NSContents">Trace</string>
558
-																<object class="NSFont" key="NSSupport" id="26">
559
-																	<string key="NSName">.LucidaGrandeUI</string>
560
-																	<double key="NSSize">11</double>
561
-																	<int key="NSfFlags">3100</int>
562
-																</object>
563
-																<string key="NSCellIdentifier">_NS:9</string>
564
-																<reference key="NSControlView" ref="872330999"/>
565
-																<int key="NSButtonFlags">1211912448</int>
566
-																<int key="NSButtonFlags2">2</int>
567
-																<object class="NSCustomResource" key="NSNormalImage">
568
-																	<string key="NSClassName">NSImage</string>
569
-																	<string key="NSResourceName">NSSwitch</string>
570
-																</object>
571
-																<object class="NSButtonImageSource" key="NSAlternateImage">
572
-																	<string key="NSImageName">NSSwitch</string>
573
-																</object>
574
-																<string key="NSAlternateContents"/>
575
-																<string key="NSKeyEquivalent"/>
576
-																<int key="NSPeriodicDelay">200</int>
577
-																<int key="NSPeriodicInterval">25</int>
578
-															</object>
579
-															<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
580
-														</object>
581 545
 													</array>
582 546
 													<string key="NSFrame">{{0, 168}, {328, 112}}</string>
583 547
 													<reference key="NSSuperview" ref="144540953"/>
... ...
@@ -692,18 +695,18 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
692 692
 												<string key="NSKeyEquivalent"/>
693 693
 												<int key="NSPeriodicDelay">400</int>
694 694
 												<int key="NSPeriodicInterval">75</int>
695
-												<object class="NSMenuItem" key="NSMenuItem" id="331406113">
695
+												<object class="NSMenuItem" key="NSMenuItem" id="327647930">
696 696
 													<reference key="NSMenu" ref="471507879"/>
697
-													<string key="NSTitle">delayed</string>
697
+													<string key="NSTitle">live</string>
698 698
 													<string key="NSKeyEquiv"/>
699 699
 													<int key="NSKeyEquivModMask">1048576</int>
700 700
 													<int key="NSMnemonicLoc">2147483647</int>
701 701
 													<int key="NSState">1</int>
702
-													<object class="NSCustomResource" key="NSOnImage" id="387281556">
702
+													<object class="NSCustomResource" key="NSOnImage" id="712936708">
703 703
 														<string key="NSClassName">NSImage</string>
704 704
 														<string key="NSResourceName">NSMenuCheckmark</string>
705 705
 													</object>
706
-													<object class="NSCustomResource" key="NSMixedImage" id="798506238">
706
+													<object class="NSCustomResource" key="NSMixedImage" id="785820181">
707 707
 														<string key="NSClassName">NSImage</string>
708 708
 														<string key="NSResourceName">NSMenuMixedState</string>
709 709
 													</object>
... ...
@@ -714,27 +717,27 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
714 714
 												<object class="NSMenu" key="NSMenu" id="471507879">
715 715
 													<string key="NSTitle">OtherViews</string>
716 716
 													<array class="NSMutableArray" key="NSMenuItems">
717
-														<object class="NSMenuItem" id="327647930">
717
+														<reference ref="327647930"/>
718
+														<object class="NSMenuItem" id="331406113">
718 719
 															<reference key="NSMenu" ref="471507879"/>
719
-															<string key="NSTitle">live</string>
720
+															<string key="NSTitle">delayed</string>
720 721
 															<string key="NSKeyEquiv"/>
721 722
 															<int key="NSKeyEquivModMask">1048576</int>
722 723
 															<int key="NSMnemonicLoc">2147483647</int>
723 724
 															<int key="NSState">1</int>
724
-															<reference key="NSOnImage" ref="387281556"/>
725
-															<reference key="NSMixedImage" ref="798506238"/>
725
+															<reference key="NSOnImage" ref="712936708"/>
726
+															<reference key="NSMixedImage" ref="785820181"/>
726 727
 															<string key="NSAction">_popUpItemAction:</string>
727 728
 															<reference key="NSTarget" ref="163136336"/>
728 729
 														</object>
729
-														<reference ref="331406113"/>
730 730
 														<object class="NSMenuItem" id="202277036">
731 731
 															<reference key="NSMenu" ref="471507879"/>
732 732
 															<string key="NSTitle">manual</string>
733 733
 															<string key="NSKeyEquiv"/>
734 734
 															<int key="NSKeyEquivModMask">1048576</int>
735 735
 															<int key="NSMnemonicLoc">2147483647</int>
736
-															<reference key="NSOnImage" ref="387281556"/>
737
-															<reference key="NSMixedImage" ref="798506238"/>
736
+															<reference key="NSOnImage" ref="712936708"/>
737
+															<reference key="NSMixedImage" ref="785820181"/>
738 738
 															<string key="NSAction">_popUpItemAction:</string>
739 739
 															<reference key="NSTarget" ref="163136336"/>
740 740
 														</object>
... ...
@@ -817,7 +820,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
817 817
 													<boolean value="YES" key="WebKitPluginsEnabled"/>
818 818
 												</dictionary>
819 819
 											</object>
820
-											<bool key="UseBackForwardList">NO</bool>
820
+											<bool key="UseBackForwardList">YES</bool>
821 821
 											<bool key="AllowsUndo">YES</bool>
822 822
 										</object>
823 823
 									</array>