adium 2121:945c5dd312c8: Bring the FT progress window up to the ...

commits at adium.im commits at adium.im
Thu May 7 23:50:56 UTC 2009


details:	http://hg.adium.im/adium/rev/945c5dd312c8
revision:	2121:945c5dd312c8
author:		Zachary West <zacw at adium.im>
date:		Thu May 07 19:50:47 2009 -0400

Bring the FT progress window up to the 21st century with a bordered bottom and a textured clear button.

diffstat:

 Resources/FileTransferProgressWindow.nib/classes.nib      |  344 ++++++++++++----
 Resources/FileTransferProgressWindow.nib/info.nib         |   20 +
 Resources/FileTransferProgressWindow.nib/keyedobjects.nib |      
 Source/ESFileTransferProgressWindowController.m           |    4 +
 4 files changed, 274 insertions(+), 94 deletions(-)

diffs (390 lines):

diff -r e98c5ea528e3 -r 945c5dd312c8 Resources/FileTransferProgressWindow.nib/classes.nib
--- a/Resources/FileTransferProgressWindow.nib/classes.nib	Thu May 07 17:22:26 2009 -0400
+++ b/Resources/FileTransferProgressWindow.nib/classes.nib	Thu May 07 19:50:47 2009 -0400
@@ -1,94 +1,250 @@
-{
-    IBClasses = (
-        {
-            ACTIONS = {
-                confirmQuit = id; 
-                reportABug = id; 
-                sendFeedback = id; 
-                showAboutBox = id; 
-                showForums = id; 
-                showHelp = id; 
-            }; 
-            CLASS = AIAdium; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                accountController = AIAccountController; 
-                activityWindowController = BZActivityWindowController; 
-                contactAlertsController = ESContactAlertsController; 
-                contactController = AIContactController; 
-                contentController = AIContentController; 
-                dockController = AIDockController; 
-                fileTransferController = ESFileTransferController; 
-                interfaceController = AIInterfaceController; 
-                loginController = AILoginController; 
-                menuController = AIMenuController; 
-                pluginController = AIPluginController; 
-                preferenceController = AIPreferenceController; 
-                soundController = AISoundController; 
-                toolbarController = AIToolbarController; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {
-            CLASS = AIAlternatingRowOutlineView; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = AIOutlineView; 
-        }, 
-        {CLASS = AIAutoScrollView; LANGUAGE = ObjC; SUPERCLASS = NSScrollView; }, 
-        {
-            CLASS = AIFileTransferProgressOutlineView; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = AIVariableHeightOutlineView; 
-        }, 
-        {
-            ACTIONS = {pasteAsRichText = id; scrollPageDown = id; scrollPageUp = id; }; 
-            CLASS = AIMessageEntryTextView; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = AISendingTextView; 
-        }, 
-        {CLASS = AIOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, 
-        {CLASS = AIPlasticButton; LANGUAGE = ObjC; SUPERCLASS = NSButton; }, 
-        {
-            ACTIONS = {sendContent = id; }; 
-            CLASS = AISendingTextView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {target = id; }; 
-            SUPERCLASS = NSTextView; 
-        }, 
-        {
-            CLASS = AIVariableHeightOutlineView; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = AIAlternatingRowOutlineView; 
-        }, 
-        {
-            CLASS = AIWindowController; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSWindowController; 
-        }, 
-        {CLASS = BZGenericViewCell; LANGUAGE = ObjC; SUPERCLASS = NSCell; }, 
-        {CLASS = BZGenericViewCell1; LANGUAGE = ObjC; SUPERCLASS = NSTableColumn; }, 
-        {
-            ACTIONS = {clearAllCompleteTransfers = id; }; 
-            CLASS = ESFileTransferProgressWindowController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "button_clear" = NSButton; 
-                outlineView = AIVariableHeightOutlineView; 
-                scrollView = NSScrollView; 
-                "textField_statusBar" = NSTextField; 
-            }; 
-            SUPERCLASS = AIWindowController; 
-        }, 
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = NSArray; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = NSMutableArray; LANGUAGE = ObjC; SUPERCLASS = NSArray; }, 
-        {CLASS = NSObject; LANGUAGE = ObjC; }, 
-        {
-            ACTIONS = {runCustomizationPalette = id; }; 
-            CLASS = NSToolbar; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSObject; 
-        }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBClasses</key>
+	<array>
+		<dict>
+			<key>CLASS</key>
+			<string>AIAlternatingRowOutlineView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>AIOutlineView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSApplication</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSTextField</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSControl</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>RBSplitView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>delegate</key>
+				<string>id</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>RBSplitSubview</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>RBSplitSubview</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSMenu</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSWindowController</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>adiumPrint</key>
+				<string>id</string>
+				<key>didAdjustSubviews</key>
+				<string>RBSplitView</string>
+				<key>prefsWindowWillClose</key>
+				<string>SS_PrefsController</string>
+				<key>toggleFindPanel</key>
+				<string>id</string>
+				<key>willAdjustSubviews</key>
+				<string>RBSplitView</string>
+			</dict>
+			<key>CLASS</key>
+			<string>NSObject</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSWindow</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSScrollView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>FirstResponder</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSButton</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSControl</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSOutlineView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSTableView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>AIVariableHeightOutlineView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>AIAlternatingRowOutlineView</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>performFindPanelAction</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>AIOutlineView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSOutlineView</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>closeWindow</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>AIWindowController</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSWindowController</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>clearAllCompleteTransfers</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>ESFileTransferProgressWindowController</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>button_clear</key>
+				<string>NSButton</string>
+				<key>outlineView</key>
+				<string>AIVariableHeightOutlineView</string>
+				<key>scrollView</key>
+				<string>NSScrollView</string>
+				<key>textField_statusBar</key>
+				<string>NSTextField</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>AIWindowController</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSButtonCell</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSActionCell</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>SS_PrefsController</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>delegate</key>
+				<string>id</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>AIAutoScrollView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSScrollView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>AIFileTransferProgressOutlineView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>AIVariableHeightOutlineView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSTableView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSControl</string>
+		</dict>
+	</array>
+	<key>IBVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff -r e98c5ea528e3 -r 945c5dd312c8 Resources/FileTransferProgressWindow.nib/info.nib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/FileTransferProgressWindow.nib/info.nib	Thu May 07 19:50:47 2009 -0400
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBFramework Version</key>
+	<string>677</string>
+	<key>IBLastKnownRelativeProjectPath</key>
+	<string>../Adium.xcodeproj</string>
+	<key>IBOldestOS</key>
+	<integer>5</integer>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>29</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>9G55</string>
+	<key>targetFramework</key>
+	<string>IBCocoaFramework</string>
+</dict>
+</plist>
diff -r e98c5ea528e3 -r 945c5dd312c8 Resources/FileTransferProgressWindow.nib/keyedobjects.nib
Binary file Resources/FileTransferProgressWindow.nib/keyedobjects.nib has changed
diff -r e98c5ea528e3 -r 945c5dd312c8 Source/ESFileTransferProgressWindowController.m
--- a/Source/ESFileTransferProgressWindowController.m	Thu May 07 17:22:26 2009 -0400
+++ b/Source/ESFileTransferProgressWindowController.m	Thu May 07 19:50:47 2009 -0400
@@ -92,7 +92,11 @@
 {
     if ((self = [super initWithWindowNibName:windowNibName])) {
 		progressRows = [[NSMutableArray alloc] init];
+		
+		[self.window setAutorecalculatesContentBorderThickness:YES forEdge:NSMinYEdge];
+		[self.window setContentBorderThickness:24.0 forEdge: NSMinYEdge];
 	}
+	
 	return self;
 }
 




More information about the commits mailing list