move the "open torrent URL" sheet into its own xib file

Transmission.xcodeproj/project.pbxproj

@@ -278,6 +278,8 @@
 		A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
 		A2F41DAB0D0B916B006CE378 /* YingYangTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F41DAA0D0B916B006CE378 /* YingYangTemplate.png */; };
 		A2F41F8E0D73595100B82116 /* InfoTracker.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F41F8D0D73595100B82116 /* InfoTracker.png */; };
+		A2F7CF5513035F7B0016FF10 /* URLSheetWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A2F7CF5413035F7B0016FF10 /* URLSheetWindow.xib */; };
+		A2F7CF5F13035FFD0016FF10 /* URLSheetWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2F7CF5E13035FFD0016FF10 /* URLSheetWindowController.m */; };
 		A2F8CD430F3D0F4A00DB356A /* miniupnpcstrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A2F8CD420F3D0F4A00DB356A /* miniupnpcstrings.h */; };
 		A2FB057F0BFEB6800095564D /* DragOverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2FB057D0BFEB6800095564D /* DragOverlayView.m */; };
 		A2FB701C0D95CAEA0001F331 /* GroupsController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2FB701B0D95CAEA0001F331 /* GroupsController.m */; };
@@ -846,6 +848,9 @@
 		A2F1511F0CD438BA001F3B0E /* Lock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Lock.png; path = macosx/Images/Lock.png; sourceTree = "<group>"; };
 		A2F41DAA0D0B916B006CE378 /* YingYangTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = YingYangTemplate.png; path = macosx/Images/YingYangTemplate.png; sourceTree = "<group>"; };
 		A2F41F8D0D73595100B82116 /* InfoTracker.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = InfoTracker.png; path = macosx/Images/InfoTracker.png; sourceTree = "<group>"; };
+		A2F7CF5413035F7B0016FF10 /* URLSheetWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = URLSheetWindow.xib; path = macosx/URLSheetWindow.xib; sourceTree = "<group>"; };
+		A2F7CF5D13035FFD0016FF10 /* URLSheetWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = URLSheetWindowController.h; path = macosx/URLSheetWindowController.h; sourceTree = "<group>"; };
+		A2F7CF5E13035FFD0016FF10 /* URLSheetWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = URLSheetWindowController.m; path = macosx/URLSheetWindowController.m; sourceTree = "<group>"; };
 		A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
 		A2F8CD420F3D0F4A00DB356A /* miniupnpcstrings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = miniupnpcstrings.h; path = "third-party/miniupnp/miniupnpcstrings.h"; sourceTree = "<group>"; };
 		A2FB057C0BFEB6800095564D /* DragOverlayView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DragOverlayView.h; path = macosx/DragOverlayView.h; sourceTree = "<group>"; };
@@ -1053,6 +1058,8 @@
 				A25892630CF1F7E800CCCDDF /* StatsWindowController.m */,
 				A2085DD90C53BC74000BC3B7 /* AboutWindowController.h */,
 				A2085DDA0C53BC74000BC3B7 /* AboutWindowController.m */,
+				A2F7CF5D13035FFD0016FF10 /* URLSheetWindowController.h */,
+				A2F7CF5E13035FFD0016FF10 /* URLSheetWindowController.m */,
 				A234D0D40C79FB6000A82373 /* Additions */,
 				E1B6FBF80C0D719B0015FE4D /* Info Window */,
 				A26AF2220D2DA42800FF7140 /* File Outline View */,
@@ -1143,6 +1150,7 @@
 				A233BD320D8C6585007EE7B4 /* MessageWindow.xib */,
 				A233BD680D8CF2C7007EE7B4 /* StatsWindow.xib */,
 				A231274B0D11D0B7003F9AFF /* AboutWindow.xib */,
+				A2F7CF5413035F7B0016FF10 /* URLSheetWindow.xib */,
 				A2D307B00D9EC9F50051FD27 /* BlocklistStatusWindow.xib */,
 				A209ECA1114319C3002B02D1 /* InfoWindow.xib */,
 				A209EAEA1142D294002B02D1 /* InfoGeneralView.xib */,
@@ -1981,6 +1989,7 @@
 				A209EC12114301C6002B02D1 /* InfoOptionsView.xib in Resources */,
 				A209ECA2114319C3002B02D1 /* InfoWindow.xib in Resources */,
 				A21F15AD11729A9F00CF5A9C /* AddMagnetWindow.xib in Resources */,
+				A2F7CF5513035F7B0016FF10 /* URLSheetWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2170,6 +2179,7 @@
 				A21F15AC11729A8B00CF5A9C /* AddMagnetWindowController.m in Sources */,
 				A2661D6112D0E8D9004F69D5 /* FilterBarView.m in Sources */,
 				A25BB02A12F4F517004B724E /* InfoTabButtonBack.m in Sources */,
+				A2F7CF5F13035FFD0016FF10 /* URLSheetWindowController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

macosx/Controller.h

@@ -39,6 +39,7 @@
 @class StatusBarView;
 @class Torrent;
 @class TorrentTableView;
+@class URLSheetWindowController;
 
 typedef enum
 {
@@ -96,10 +97,6 @@ typedef enum
     IBOutlet NSMenu                 * fGroupsSetMenu, * fGroupsSetContextMenu, * fGroupFilterMenu;
     IBOutlet NSPopUpButton          * fGroupsButton;
     
-    IBOutlet NSWindow               * fURLSheetWindow;
-    IBOutlet NSTextField            * fURLSheetTextField;
-    IBOutlet NSButton               * fURLSheetOpenButton;
-    
     #warning change to QLPreviewPanel
     id                              fPreviewPanel;
     BOOL                            fQuitting;
@@ -133,9 +130,8 @@ typedef enum
 - (void) duplicateOpenMagnetAlert: (NSString *) address transferName: (NSString *) name;
 
 - (void) openURL: (NSString *) urlString;
-- (void) openURLEndSheet:       (id) sender;
-- (void) openURLCancelEndSheet: (id) sender;
 - (void) openURLShowSheet: (id) sender;
+- (void) urlSheetDidEnd: (URLSheetWindowController *) controller url: (NSString *) urlString returnCode: (NSInteger) returnCode;
 
 - (void) quitSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo;
 

macosx/Controller.m

@@ -36,6 +36,7 @@
 #import "PrefsController.h"
 #import "GroupsController.h"
 #import "AboutWindowController.h"
+#import "URLSheetWindowController.h"
 #import "AddWindowController.h"
 #import "AddMagnetWindowController.h"
 #import "MessageWindowController.h"
@@ -1225,49 +1226,17 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) openURLShowSheet: (id) sender
 {
-    [NSApp beginSheet: fURLSheetWindow modalForWindow: fWindow modalDelegate: self
+    [[[URLSheetWindowController alloc] initWithController: self] beginSheetForWindow: fWindow];
-            didEndSelector: @selector(urlSheetDidEnd:returnCode:contextInfo:) contextInfo: nil];
 }
 
-- (void) openURLEndSheet: (id) sender
+#warning need to remember sheet text between runs
+- (void) urlSheetDidEnd: (URLSheetWindowController *) controller url: (NSString *) urlString returnCode: (NSInteger) returnCode
 {
-    [fURLSheetWindow orderOut: sender];
-    [NSApp endSheet: fURLSheetWindow returnCode: 1];
-}
-
-- (void) openURLCancelEndSheet: (id) sender
-{
-    [fURLSheetWindow orderOut: sender];
-    [NSApp endSheet: fURLSheetWindow returnCode: 0];
-}
-
-- (void) controlTextDidChange: (NSNotification *) notification
-{
-    if ([notification object] != fURLSheetTextField)
-        return;
-    
-    NSString * string = [fURLSheetTextField stringValue];
-    BOOL enable = YES;
-    if ([string isEqualToString: @""])
-        enable = NO;
-    else
-    {
-        NSRange prefixRange = [string rangeOfString: @"://"];
-        if (prefixRange.location != NSNotFound && [string length] == NSMaxRange(prefixRange))
-            enable = NO;
-    }
-    
-    [fURLSheetOpenButton setEnabled: enable];
-}
-
-- (void) urlSheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
-{
-    [fURLSheetTextField selectText: self];
     if (returnCode != 1)
         return;
     
-    NSString * urlString = [fURLSheetTextField stringValue];
     [self performSelectorOnMainThread: @selector(openURL:) withObject: urlString waitUntilDone: NO];
+    [controller release];
 }
 
 - (void) createFile: (id) sender

macosx/Makefile.am

@@ -8,6 +8,7 @@ EXTRA_DIST = \
     InfoWindow.xib \
     MessageWindow.xib \
     StatsWindow.xib \
+    URLSheetWindow.xib \
     Defaults.plist \
     Info.plist \
     Transmission_Prefix.pch \
@@ -144,7 +145,9 @@ EXTRA_DIST = \
     TrackerNode.h \
     TrackerNode.m \
     TrackerTableView.h \
-    TrackerTableView.m
+    TrackerTableView.m \
+    URLSheetWindowController.h \
+    URLSheetWindowController.m
 
 dist-hook:
 	rm -rf `find $(distdir)/ -type d -name .svn`

macosx/URLSheetWindowController.h

@@ -0,0 +1,44 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2011 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+@class Controller;
+
+@interface URLSheetWindowController : NSWindowController
+{
+	IBOutlet NSTextField * fLabelField;
+    IBOutlet NSTextField * fTextField;
+    IBOutlet NSButton * fOpenButton;
+    
+    Controller * fController;
+}
+
+- (id) initWithController: (Controller *) controller;
+- (void) beginSheetForWindow: (NSWindow *) window;
+
+- (void) openURLEndSheet: (id) sender;
+- (void) openURLCancelEndSheet: (id) sender;
+
+@end

macosx/URLSheetWindowController.m

@@ -0,0 +1,83 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2011 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
+
+#import "URLSheetWindowController.h"
+#import "Controller.h"
+
+@implementation URLSheetWindowController
+
+- (id) initWithController: (Controller *) controller
+{
+    if ((self = [self initWithWindowNibName: @"URLSheetWindow"]))
+    {
+        fController = controller;
+    }
+    return self;
+}
+
+- (void) awakeFromNib
+{
+    [fLabelField setStringValue: NSLocalizedString(@"Internet address of torrent file:", "URL sheet label")];
+}
+
+- (IBAction) beginSheetForWindow: (NSWindow *) window
+{
+    [NSApp beginSheet: [self window] modalForWindow: window modalDelegate: self
+        didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) contextInfo: nil];
+}
+
+- (void) openURLEndSheet: (id) sender
+{
+    [[self window] orderOut: sender];
+    [NSApp endSheet: [self window] returnCode: 1];
+}
+
+- (void) openURLCancelEndSheet: (id) sender
+{
+    [[self window] orderOut: sender];
+    [NSApp endSheet: [self window] returnCode: 0];
+}
+
+- (void) sheetDidEnd: (NSWindow *) sheet returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
+{
+    [fController urlSheetDidEnd: self url: [fTextField stringValue] returnCode: returnCode];
+}
+
+- (void) controlTextDidChange: (NSNotification *) notification
+{
+    NSString * string = [fTextField stringValue];
+    BOOL enable = YES;
+    if ([string isEqualToString: @""])
+        enable = NO;
+    else
+    {
+        NSRange prefixRange = [string rangeOfString: @"://"];
+        if (prefixRange.location != NSNotFound && [string length] == NSMaxRange(prefixRange))
+            enable = NO;
+    }
+    
+    [fOpenButton setEnabled: enable];
+}
+
+@end

macosx/en.lproj/MainMenu.xib

@@ -2620,110 +2620,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 			<object class="NSUserDefaultsController" id="171637775">
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
-			<object class="NSWindowTemplate" id="992647214">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{168, 356}, {400, 177}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">Window</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
-				<string key="NSWindowContentMinSize">{400, 177}</string>
-				<object class="NSView" key="NSWindowView" id="13427666">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="188853779">
-							<reference key="NSNextResponder" ref="13427666"/>
-							<int key="NSvFlags">274</int>
-							<string key="NSFrame">{{20, 50}, {360, 80}}</string>
-							<reference key="NSSuperview" ref="13427666"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="1061347416">
-								<int key="NSCellFlags">-1805517311</int>
-								<int key="NSCellFlags2">272630272</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="622385820"/>
-								<reference key="NSControlView" ref="188853779"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="570792161"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textColor</string>
-									<reference key="NSColor" ref="438270934"/>
-								</object>
-							</object>
-						</object>
-						<object class="NSButton" id="1001733131">
-							<reference key="NSNextResponder" ref="13427666"/>
-							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{304, 12}, {82, 32}}</string>
-							<reference key="NSSuperview" ref="13427666"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="172529900">
-								<int key="NSCellFlags">604110336</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Open</string>
-								<reference key="NSSupport" ref="622385820"/>
-								<reference key="NSControlView" ref="1001733131"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="622385820"/>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSButton" id="868942125">
-							<reference key="NSNextResponder" ref="13427666"/>
-							<int key="NSvFlags">289</int>
-							<string key="NSFrame">{{222, 12}, {82, 32}}</string>
-							<reference key="NSSuperview" ref="13427666"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="376796441">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Cancel</string>
-								<reference key="NSSupport" ref="622385820"/>
-								<reference key="NSControlView" ref="868942125"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="622385820"/>
-								<string key="NSAlternateContents"/>
-								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSTextField" id="38988792">
-							<reference key="NSNextResponder" ref="13427666"/>
-							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 140}, {200, 17}}</string>
-							<reference key="NSSuperview" ref="13427666"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="116883959">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">272629760</int>
-								<string key="NSContents">Internet address of torrent file:</string>
-								<reference key="NSSupport" ref="622385820"/>
-								<reference key="NSControlView" ref="38988792"/>
-								<reference key="NSBackgroundColor" ref="969793804"/>
-								<reference key="NSTextColor" ref="911300388"/>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{400, 177}</string>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-				<string key="NSMinSize">{400, 199}</string>
-				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
-			</object>
 			<object class="NSMenu" id="354817592">
 				<string key="NSTitle">ActionMenu</string>
 				<object class="NSMutableArray" key="NSMenuItems">
@@ -4038,38 +3934,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 					</object>
 					<int key="connectionID">1847</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fURLSheetWindow</string>
-						<reference key="source" ref="30116300"/>
-						<reference key="destination" ref="992647214"/>
-					</object>
-					<int key="connectionID">1853</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fURLSheetTextField</string>
-						<reference key="source" ref="30116300"/>
-						<reference key="destination" ref="188853779"/>
-					</object>
-					<int key="connectionID">1854</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openURLEndSheet:</string>
-						<reference key="source" ref="30116300"/>
-						<reference key="destination" ref="1001733131"/>
-					</object>
-					<int key="connectionID">1855</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openURLCancelEndSheet:</string>
-						<reference key="source" ref="30116300"/>
-						<reference key="destination" ref="868942125"/>
-					</object>
-					<int key="connectionID">1856</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">openURLShowSheet:</string>
@@ -4830,22 +4694,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 					</object>
 					<int key="connectionID">3154</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fURLSheetOpenButton</string>
-						<reference key="source" ref="30116300"/>
-						<reference key="destination" ref="1001733131"/>
-					</object>
-					<int key="connectionID">3156</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="188853779"/>
-						<reference key="destination" ref="30116300"/>
-					</object>
-					<int key="connectionID">3157</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">toggleStatusString:</string>
@@ -6361,64 +6209,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Shared Defaults</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1848</int>
-						<reference key="object" ref="992647214"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="13427666"/>
-						</object>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">URLSheetWindow</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1849</int>
-						<reference key="object" ref="13427666"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="188853779"/>
-							<reference ref="1001733131"/>
-							<reference ref="868942125"/>
-							<reference ref="38988792"/>
-						</object>
-						<reference key="parent" ref="992647214"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1850</int>
-						<reference key="object" ref="188853779"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1061347416"/>
-						</object>
-						<reference key="parent" ref="13427666"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1851</int>
-						<reference key="object" ref="1001733131"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="172529900"/>
-						</object>
-						<reference key="parent" ref="13427666"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1852</int>
-						<reference key="object" ref="868942125"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="376796441"/>
-						</object>
-						<reference key="parent" ref="13427666"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1857</int>
-						<reference key="object" ref="38988792"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="116883959"/>
-						</object>
-						<reference key="parent" ref="13427666"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">1936</int>
 						<reference key="object" ref="588646173"/>
@@ -6725,26 +6515,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 						<reference key="object" ref="745428997"/>
 						<reference key="parent" ref="128892418"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3064</int>
-						<reference key="object" ref="1061347416"/>
-						<reference key="parent" ref="188853779"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3065</int>
-						<reference key="object" ref="172529900"/>
-						<reference key="parent" ref="1001733131"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3066</int>
-						<reference key="object" ref="376796441"/>
-						<reference key="parent" ref="868942125"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3067</int>
-						<reference key="object" ref="116883959"/>
-						<reference key="parent" ref="38988792"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2683</int>
 						<reference key="object" ref="97165992"/>
@@ -7341,24 +7111,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 					<string>1815.ImportedFromIB2</string>
 					<string>1846.IBPluginDependency</string>
 					<string>1846.ImportedFromIB2</string>
-					<string>1848.IBEditorWindowLastContentRect</string>
-					<string>1848.IBPluginDependency</string>
-					<string>1848.IBWindowTemplateEditedContentRect</string>
-					<string>1848.ImportedFromIB2</string>
-					<string>1848.windowTemplate.hasMaxSize</string>
-					<string>1848.windowTemplate.hasMinSize</string>
-					<string>1848.windowTemplate.maxSize</string>
-					<string>1848.windowTemplate.minSize</string>
-					<string>1849.IBPluginDependency</string>
-					<string>1849.ImportedFromIB2</string>
-					<string>1850.IBPluginDependency</string>
-					<string>1850.ImportedFromIB2</string>
-					<string>1851.IBPluginDependency</string>
-					<string>1851.ImportedFromIB2</string>
-					<string>1852.IBPluginDependency</string>
-					<string>1852.ImportedFromIB2</string>
-					<string>1857.IBPluginDependency</string>
-					<string>1857.ImportedFromIB2</string>
 					<string>1858.IBPluginDependency</string>
 					<string>1858.ImportedFromIB2</string>
 					<string>1860.IBPluginDependency</string>
@@ -7607,10 +7359,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 					<string>3061.IBPluginDependency</string>
 					<string>3062.IBPluginDependency</string>
 					<string>3063.IBPluginDependency</string>
-					<string>3064.IBPluginDependency</string>
-					<string>3065.IBPluginDependency</string>
-					<string>3066.IBPluginDependency</string>
-					<string>3067.IBPluginDependency</string>
 					<string>3077.IBPluginDependency</string>
 					<string>3078.IBPluginDependency</string>
 					<string>3078.ImportedFromIB2</string>
@@ -7959,24 +7707,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{0, 818}, {400, 177}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{0, 818}, {400, 177}}</string>
-					<integer value="1"/>
-					<integer value="0"/>
-					<integer value="1"/>
-					<string>{3.40282e+38, 3.40282e+38}</string>
-					<string>{400, 177}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -8229,10 +7959,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 					<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>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
@@ -8390,8 +8116,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<string>linkTrac:</string>
 							<string>moveDataFilesSelected:</string>
 							<string>openShowSheet:</string>
-							<string>openURLCancelEndSheet:</string>
-							<string>openURLEndSheet:</string>
 							<string>openURLShowSheet:</string>
 							<string>removeDeleteData:</string>
 							<string>removeNoDelete:</string>
@@ -8489,8 +8213,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -8509,8 +8231,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<string>linkTrac:</string>
 							<string>moveDataFilesSelected:</string>
 							<string>openShowSheet:</string>
-							<string>openURLCancelEndSheet:</string>
-							<string>openURLEndSheet:</string>
 							<string>openURLShowSheet:</string>
 							<string>removeDeleteData:</string>
 							<string>removeNoDelete:</string>
@@ -8603,14 +8323,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 								<string key="name">openShowSheet:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">openURLCancelEndSheet:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">openURLEndSheet:</string>
-								<string key="candidateClassName">id</string>
-							</object>
 							<object class="IBActionInfo">
 								<string key="name">openURLShowSheet:</string>
 								<string key="candidateClassName">id</string>
@@ -8814,9 +8526,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<string>fTotalDLImageView</string>
 							<string>fTotalTorrentsField</string>
 							<string>fTotalULField</string>
-							<string>fURLSheetOpenButton</string>
-							<string>fURLSheetTextField</string>
-							<string>fURLSheetWindow</string>
 							<string>fUploadLimitItem</string>
 							<string>fUploadMenu</string>
 							<string>fUploadNoLimitItem</string>
@@ -8857,9 +8566,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<string>NSImageView</string>
 							<string>NSTextField</string>
 							<string>NSTextField</string>
-							<string>NSButton</string>
-							<string>NSTextField</string>
-							<string>NSWindow</string>
 							<string>NSMenuItem</string>
 							<string>NSMenu</string>
 							<string>NSMenuItem</string>
@@ -8903,9 +8609,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 							<string>fTotalDLImageView</string>
 							<string>fTotalTorrentsField</string>
 							<string>fTotalULField</string>
-							<string>fURLSheetOpenButton</string>
-							<string>fURLSheetTextField</string>
-							<string>fURLSheetWindow</string>
 							<string>fUploadLimitItem</string>
 							<string>fUploadMenu</string>
 							<string>fUploadNoLimitItem</string>
@@ -9045,18 +8748,6 @@ AAAAAAAAAAAAAAAAA</bytes>
 								<string key="name">fTotalULField</string>
 								<string key="candidateClassName">NSTextField</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fURLSheetOpenButton</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fURLSheetTextField</string>
-								<string key="candidateClassName">NSTextField</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">fURLSheetWindow</string>
-								<string key="candidateClassName">NSWindow</string>
-							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">fUploadLimitItem</string>
 								<string key="candidateClassName">NSMenuItem</string>