[Adium-svn] rev 19123 - in branches/adium-1.0: Resources/FileTransferProgressWindow.nib Source
evands at adiumx.com
evands at adiumx.com
Tue Mar 13 07:02:40 CDT 2007
Author: evands
Date: 2007-03-13 07:02:40 -0500 (Tue, 13 Mar 2007)
New Revision: 19123
Added:
branches/adium-1.0/Source/AIFileTransferProgressOutlineView.h
branches/adium-1.0/Source/AIFileTransferProgressOutlineView.m
Modified:
branches/adium-1.0/Resources/FileTransferProgressWindow.nib/classes.nib
branches/adium-1.0/Resources/FileTransferProgressWindow.nib/keyedobjects.nib
branches/adium-1.0/Source/ESFileTransferProgressView.h
branches/adium-1.0/Source/ESFileTransferProgressView.m
Log:
Merged [19122]: Left/right now appropriately hide/show the details in the file transfer progress window. Closes #1813
Modified: branches/adium-1.0/Resources/FileTransferProgressWindow.nib/classes.nib
===================================================================
--- branches/adium-1.0/Resources/FileTransferProgressWindow.nib/classes.nib 2007-03-13 12:02:00 UTC (rev 19122)
+++ branches/adium-1.0/Resources/FileTransferProgressWindow.nib/classes.nib 2007-03-13 12:02:40 UTC (rev 19123)
@@ -36,6 +36,11 @@
},
{CLASS = AIAutoScrollView; LANGUAGE = ObjC; SUPERCLASS = NSScrollView; },
{
+ CLASS = AIFileTransferProgressOutlineView;
+ LANGUAGE = ObjC;
+ SUPERCLASS = AIVariableHeightOutlineView;
+ },
+ {
ACTIONS = {pasteAsRichText = id; scrollPageDown = id; scrollPageUp = id; };
CLASS = AIMessageEntryTextView;
LANGUAGE = ObjC;
Modified: branches/adium-1.0/Resources/FileTransferProgressWindow.nib/keyedobjects.nib
===================================================================
--- branches/adium-1.0/Resources/FileTransferProgressWindow.nib/keyedobjects.nib 2007-03-13 12:02:00 UTC (rev 19122)
+++ branches/adium-1.0/Resources/FileTransferProgressWindow.nib/keyedobjects.nib 2007-03-13 12:02:40 UTC (rev 19123)
@@ -1,16 +1,16 @@
bplist00Ô
Y$archiverX$versionT$topX$objects_NSKeyedArchiver Ñ ]IB.objectdata¯ 1 5 6 < = A E Q Y q r s t x | § ¯ ° ³ ½ ¾ ¿ Ä Æ Ë Ì Ï Ó Ú ð ñ ò ø
-()*+0148JKRSV[\_glorv{|
¥¦§°±²³¶·¹º»¼¿ÀÄÉÊÏÐÕÖÛÜáâÉçìíòóö q !")#$%*/CWXYZ[\]^_`abcdefgjmpU$nullß
+()*+0148JKRSV[\_glorv{|
¦§¨±²³´·¸º»¼½ÀÁÅÊËÐÑÖ×ÜÝâãÊèíîóô÷
+!q"#$)%&+0DXYZ[\]^_`abcdefghknqU$nullß
! " # $ % & ' ( ) * + , - . / 0_NSObjectsValues_NSAccessibilityConnectors_NSClassesValuesZNSOidsKeys[NSNamesKeys]NSClassesKeys_NSAccessibilityOidsValues\NSOidsValues_NSVisibleWindowsV$class]NSConnections]NSNamesValues]NSObjectsKeys_NSAccessibilityOidsKeys[NSFramework]NSFontManagerYNSNextOidVNSRootmxynwzok Ò 2 3 4[NSClassName_&ESFileTransferProgressWindowControllerÒ 7 8 9 :X$classesZ$classname¢ : ;^NSCustomObjectXNSObject_IBCocoaFrameworkÒ > ? @ZNS.objects Ò 7 8 B C£ C D ;\NSMutableSetUNSSetÒ > F P© G H I J K L M N O Z\^`bdfh<Ô R S T U V W 0]NSDestinationWNSLabelXNSSource
XYÜ Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p_NSWindowStyleMask_NSWindowBackingYNSMinSize]NSWindowTitle]NSWindowClass\NSWindowRect\NSScreenRectYNSMaxSize\NSWindowViewYNSWTFlags[NSViewClassU
-TVpx W_{{396, 555}, {295, 126}}PWNSPanelÒ u v wYNS.stringTViewÒ 7 8 y z£ z { ;_NSMutableStringXNSStringÔ } ~ . ZNSSubviews_NSNextResponderWNSFrame RSÒ >
P£ "M<× ~ m m [NSSuperviewYNSEnabledXNSvFlagsVNSCell "!_{{-4, 6}, {302, 14}}Ø ¡ h ¤ ¥ ¦_NSBackgroundColor[NSTextColorYNSSupportZNSContents]NSControlView[NSCellFlags\NSCellFlags2 þ @ Ô ¨ © ª « ¬ ®VNSSizeVNSNameXNSfFlags"A0 \LucidaGrandeÒ 7 8 ± ²¢ ² ;VNSFontÕ ´ µ ¶ · ¸ ¹ º » ¼WNSColor[NSColorName\NSColorSpace]NSCatalogNameVSystem\controlColorÓ À ¶ Á  ¼WNSWhiteK0.66666669 Ò 7 8 Å ´¢ ´ ;Õ ´ µ ¶ · Ç È º » ¼_controlTextColorÓ À ¶ Í Â ¼B0 Ò 7 8 РѤ Ñ Ò ;_NSTextFieldCell\NSActionCellÒ 7 8 Ô Õ¦ Õ Ö × Ø Ù ;[NSTextField\%NSTextFieldYNSControlVNSView[NSResponderÞ } ~ Û Ü Ý Þ ß à á 2 â m m å æ ç è é ê ë å í î ï]NSNextKeyView_NSOriginalClassName[NSHScrollerXNSsFlags[NSVScroller]NSContentView\NSScrollAmts%&$LIE&BO A A #_AIAutoScrollView\NSScrollViewÒ > ó P£ å ë è&EI<Ú } ~ Û ù ú û ü ÿ ÿYNSBGColorYNSDocViewYNScvFlags'""(=(C DÒ > P¡ ÿ(<ß ~
- 2 Ü å å í !"#$%& é_NSIntercellSpacingWidth_NSColumnAutoresizingStyle[NSRowHeight_NSDraggingSourceMaskForLocalYNSTvFlags_NSIntercellSpacingHeight_NSDraggingSourceMaskForNonLocal\NSCornerView[NSFrameSize[NSGridColor^NSTableColumns"@@ &"A R@ &"@ B)* ,+?/=_AIVariableHeightOutlineView[NSTableViewY{295, 99}Ô ~ .-./ -ÿÿÿÿ ._{{-32, -34}, {16, 17}}Ò 7 823¤3 Ø Ù ;]_NSCornerViewÒ > 5 P¡60<Ú9):;<=>?@  ÿBCDE GHI^NSResizingMask\NSHeaderCellZNSMinWidthWNSWidth\NSIdentifier^NSIsResizeableZNSDataCellZNSMaxWidth(2"A "C 1 8"Dz ;Vialone× LM ¡OPQ"4537þ TIrisÓ À ¶ T  ¼K0.33333299 Õ ´ µ ¶ · ÇX º » ¼6_headerTextColorÒ 7 8]^¥^ Ñ Ò ;_NSTableHeaderCell× ` b ÿ ¤ef:9( 1þ@ Ô ¨ © ªh ¬ k"A@ Ó À ¶ m  ¼B1 Ò 7 8pq¢q ;]NSTableColumnÒ 7 8st£tu ;^NSMutableArrayWNSArrayÕ ´ µ ¶ · ¸x º » ¼>_controlBackgroundColorÕ ´ µ ¶ · }~ º » ¼A@YgridColorÓ À ¶  ¼D0.5 Ò 7 8¢ ;^NSClassSwapper_{{1, 1}, {295, 99}}Ò 7 8¤ Ø Ù ;ZNSClipViewØ ~ .XNSTargetYNSPercentXNSAction"""FH"?ÌÍG_{{-30, 1}, {15, 99}}\_doScroller:Ò 7 8¥ × Ø Ù ;ZNSScrollerÙ ~ Þ ¡£¤"""J H"?}ÙK_{{-100, -100}, {423, 15}}_{{-1, 26}, {297, 101}}ר ~ 2© m m¬®¯[NSExtensionPN!QO_{{6, 3}, {44, 19}}_AIPlasticButtonXNSButtonÒ 7 8´µ¤µ Ø Ù ;\NSCustomView_{{1, 9}, {295, 126}}Ò 7 8¸ Ø£ Ø Ù ;_{{0, 0}, {1680, 1028}}Z{295, 148}_{1000, 3.40282e+38}Ò 7 8½¾¢¾ ;_NSWindowTemplateVwindowÒ 7 8Á£Âà ;_NSNibOutletConnector^NSNibConnectorÔ R S T 0Æ W U[Y
-XdelegateÔ R S T Ì W 0]Y_textField_statusBarÔ R S T ÿÒ W 0(_Y[outlineViewÔ R S T Ø W 0"aYZscrollViewÔ R S T 0Þ W ÿcY(ZdataSourceÔ R S T 0ä W ÿeY(Ô R S T é W 0MgY\button_clearÔ R S T 0ïð ijM_clearAllCompleteTransfers:Ò 7 8ôõ£õÃ ;_NSNibControlConnectorÒ > ÷ÿ§6 m ÿ U0M"(
-lÒ 7 8u¢u ;Ò > ÿ§ ÿ m U m m 0(
-"lÒ >
-ÿ§6 ÿ U 00M"(
-lÒ > ÿ§pqrstuvl\NSTextField1VView12]NSScrollView1\StatusWindow\File's OwnerÒ > &ÿ¢ ÿ"(lÒ > +ÿ¢ ï #)lÒ > 0ÿ¯ I O U K6 H m J L ÿ G 0 N M\h
-`0Z^Mb"( fdlÒ > Dÿ¯EFGHIJKLMNOPQRSTU{|}~
lo}V~
{|SmÒ > h P <Ò > kÿ lÒ > nÿ lÒ 7 8qr¢r ;^NSIBObjectData # , 1 : L Q V d fÚì%1?[h{¬ÆÒàêñóõ÷ùûýÿ
+TVpx W_{{396, 555}, {295, 126}}PWNSPanelÒ u v wYNS.stringTViewÒ 7 8 y z£ z { ;_NSMutableStringXNSStringÔ } ~ . ZNSSubviews_NSNextResponderWNSFrame RSÒ >
P£ "M<× ~ m m [NSSuperviewYNSEnabledXNSvFlagsVNSCell "!_{{-4, 6}, {302, 14}}Ø ¡ h ¤ ¥ ¦_NSBackgroundColor[NSTextColorYNSSupportZNSContents]NSControlView[NSCellFlags\NSCellFlags2 þ @ Ô ¨ © ª « ¬ ®VNSSizeVNSNameXNSfFlags"A0 \LucidaGrandeÒ 7 8 ± ²¢ ² ;VNSFontÕ ´ µ ¶ · ¸ ¹ º » ¼WNSColor[NSColorName\NSColorSpace]NSCatalogNameVSystem\controlColorÓ À ¶ Á  ¼WNSWhiteK0.66666669 Ò 7 8 Å ´¢ ´ ;Õ ´ µ ¶ · Ç È º » ¼_controlTextColorÓ À ¶ Í Â ¼B0 Ò 7 8 РѤ Ñ Ò ;_NSTextFieldCell\NSActionCellÒ 7 8 Ô Õ¦ Õ Ö × Ø Ù ;[NSTextField\%NSTextFieldYNSControlVNSView[NSResponderÞ } ~ Û Ü Ý Þ ß à á 2 â m m å æ ç è é ê ë å í î ï]NSNextKeyView_NSOriginalClassName[NSHScrollerXNSsFlags[NSVScroller]NSContentView\NSScrollAmts%&$LIRE&BO A A #_AIAutoScrollView\NSScrollViewÒ > ó P£ å ë è&EI<Ú } ~ Û ù ú û ü ÿ ÿYNSBGColorYNSDocViewYNScvFlags'""(=(C DÒ > P¡ ÿ(<ß ~
+ 2 Ü å å í !"#$%& é_NSIntercellSpacingWidth_NSColumnAutoresizingStyle[NSRowHeight_NSDraggingSourceMaskForLocalYNSTvFlags_NSIntercellSpacingHeight_NSDraggingSourceMaskForNonLocal\NSCornerView[NSFrameSize[NSGridColor^NSTableColumns"@@ &"A R@ &"@ B)* ,+?/=_!AIFileTransferProgressOutlineView[NSTableViewY{295, 99}Ô ~ .-./ -ÿÿÿÿ ._{{-32, -34}, {16, 17}}Ò 7 823¤3 Ø Ù ;]_NSCornerViewÒ > 5 P¡60<Ú9):;<=>?@  ÿBCDE GHI^NSResizingMask\NSHeaderCellZNSMinWidthWNSWidth\NSIdentifier^NSIsResizeableZNSDataCellZNSMaxWidth(2"A "C 1 8"Dz ;Vialone× LM ¡OPQ"4537þ TIrisÓ À ¶ T  ¼K0.33333299 Õ ´ µ ¶ · ÇX º » ¼6_headerTextColorÒ 7 8]^¥^ Ñ Ò ;_NSTableHeaderCell× ` b ÿ ¤ef:9( 1þ@ Ô ¨ © ªh ¬ k"A@ Ó À ¶ m  ¼B1 Ò 7 8pq¢q ;]NSTableColumnÒ 7 8st£tu ;^NSMutableArrayWNSArrayÕ ´ µ ¶ · ¸x º » ¼>_controlBackgroundColorÕ ´ µ ¶ · }~ º » ¼A@YgridColorÓ À ¶  ¼D0.5 Ò 7 8¢ ;^NSClassSwapper_{{1, 1}, {295, 99}}Ò 7 8¤ Ø Ù ;ZNSClipViewÙ ~ .XNSTargetYNSPercentXNSAction"""F H"?ÌÍG_{{-30, 1}, {15, 99}}\_doScroller:Ò 7 8¥ × Ø Ù ;ZNSScrollerÙ ~ Þ ¡¢¤¥"""J H"?}ÙK_{{-100, -100}, {423, 15}}_{{-1, 26}, {297, 101}}ש ~ 2ª m m®¯°[NSExtensionPN!QO_{{6, 3}, {44, 19}}_AIPlasticButtonXNSButtonÒ 7 8µ¶¤¶ Ø Ù ;\NSCustomView_{{1, 9}, {295, 126}}Ò 7 8¹ Ø£ Ø Ù ;_{{0, 0}, {1440, 878}}Z{295, 148}_{1000, 3.40282e+38}Ò 7 8¾¿¢¿ ;_NSWindowTemplateVwindowÒ 7 8ÂãÃÄ ;_NSNibOutletConnector^NSNibConnectorÔ R S T 0Ç W U[Y
+XdelegateÔ R S T Í W 0]Y_textField_statusBarÔ R S T ÿÓ W 0(_Y[outlineViewÔ R S T Ù W 0"aYZscrollViewÔ R S T 0ß W ÿcY(ZdataSourceÔ R S T 0å W ÿeY(Ô R S T ê W 0MgY\button_clearÔ R S T 0ðñ ijM_clearAllCompleteTransfers:Ò 7 8õö£öÄ ;_NSNibControlConnectorÒ > ø § 6 m U ÿ0"M
+(lÒ 7 8u¢u ;Ò > § m ÿ U m m 0 (
+"lÒ > § 6 U ÿ 00"M
+(lÒ > §pqrstuvl\NSTextField1]NSScrollView1VView12\StatusWindow\File's OwnerÒ > ' ¢ ÿ"(lÒ > , ¢ ï #)lÒ > 1 ¯ m I ÿ K G L N M 0 O H U 6 J\(` bfdhZ
+"0M^lÒ > E ¯FGHIJKLMNOPQRSTUV{|}~
lo|SmV{}
~Ò > i P <Ò > l lÒ > o lÒ 7 8rs¢s ;^NSIBObjectData # , 1 : L Q V d fÚì%1?[h{¬ÆÒàêñóõ÷ùûýÿ
*,.W`ity¤¸¹»ÄËØÞçúüþ
-5>@BDFw§µÃÐÝçôþ
@@ -25,38 +25,42 @@
°
Ë
í
-ú!&(*/1279>@BDFHJLNPnz¢¤½ÆÏÝæéëí%2=ERalwy{
µ·¹»½¿ÄÉÖâäùûýÿ
+ú!&(*/1279>@BDFHJLNPt¨ªÃÌÕãìïñó+8CKXgr}»½¿ÁÃÅÊÏÜèêÿ
-
-
-'
-;
-X
-Z
-\
+
+
+
+
+"
+-
+A
^
`
b
-g
-j
-{
-
-
-
+d
+f
+h
+m
+p
+
-
-
-
-¡
-¦
-´
-½
-Ä
-Ó
-Û
-ð
-ò
-ô
+
+
+
+
+
+
+§
+¬
+º
+Ã
+Ê
+Ù
+á
ö
-ø&(*,.8EJLUZi½ÆÐÙÛÝßáãèê"-RTVXZ]_df¸ÄÆÈÊÌÎÐÒçù!8AHal£ª³ºÑàñóõ÷ù1BDFHJVgikmoz¯±³µ·ÈÊÌÎÐÝîðòôö#;DSUWY[]_aclqz¢±³µ·¹»½¿ÁÊÙÛÝßáãåçéöý%.3579BGIKMV{}
¨ÍÏÑÓÕ×ÙÛÝßáãåçéëíïñóõ÷ùûýÿ
-&')235>C s R
\ No newline at end of file
+ø
+ú
+ü
+þ,.024>KPR[`o
¢ÇÐÚãåçéëìîóõ"-8]_acehjoq¦ÃÏÑÓÕ×ÙÛÝò
+,CLSkv´½ÄÛêûýÿ!#%;LNPRT`qsuwy¨¹»½¿ÁÒÔÖØÚçøúüþ &-EN]_acegikmv{¡£¬»½¿ÁÃÅÇÉËÔãåçéëíïñó "/8=?ACLQSUW`
¡£¥§©²×ÙÛÝßáãåçéëíïñóõ÷ùûýÿ
+$%'013<=?HM t \
\ No newline at end of file
Copied: branches/adium-1.0/Source/AIFileTransferProgressOutlineView.h (from rev 19122, trunk/Source/AIFileTransferProgressOutlineView.h)
===================================================================
--- branches/adium-1.0/Source/AIFileTransferProgressOutlineView.h (rev 0)
+++ branches/adium-1.0/Source/AIFileTransferProgressOutlineView.h 2007-03-13 12:02:40 UTC (rev 19123)
@@ -0,0 +1,16 @@
+//
+// AIFileTransferProgressOutlineView.h
+// Adium
+//
+// Created by Evan Schoenberg on 3/13/07.
+// Copyright 2007 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import <AIUtilities/AIVariableHeightOutlineView.h>
+
+ at interface AIFileTransferProgressOutlineView : AIVariableHeightOutlineView {
+
+}
+
+ at end
Copied: branches/adium-1.0/Source/AIFileTransferProgressOutlineView.m (from rev 19122, trunk/Source/AIFileTransferProgressOutlineView.m)
===================================================================
--- branches/adium-1.0/Source/AIFileTransferProgressOutlineView.m (rev 0)
+++ branches/adium-1.0/Source/AIFileTransferProgressOutlineView.m 2007-03-13 12:02:40 UTC (rev 19123)
@@ -0,0 +1,33 @@
+//
+// AIFileTransferProgressOutlineView.m
+// Adium
+//
+// Created by Evan Schoenberg on 3/13/07.
+//
+
+#import "AIFileTransferProgressOutlineView.h"
+#import "ESFileTransferProgressRow.h"
+#import "ESFileTransferProgressView.h"
+
+ at implementation AIFileTransferProgressOutlineView
+- (void)keyDown:(NSEvent *)theEvent
+{
+ NSString *charactersIgnoringModifiers = [theEvent charactersIgnoringModifiers];
+
+ if ([charactersIgnoringModifiers length]) {
+ unichar inChar = [charactersIgnoringModifiers characterAtIndex:0];
+
+ if (inChar == NSLeftArrowFunctionKey) {
+ [(ESFileTransferProgressView *)[(ESFileTransferProgressRow *)[self itemAtRow:[self selectedRow]] view] setShowsDetails:NO];
+ } else if (inChar == NSRightArrowFunctionKey) {
+ [(ESFileTransferProgressView *)[(ESFileTransferProgressRow *)[self itemAtRow:[self selectedRow]] view] setShowsDetails:YES];
+ } else {
+ [super keyDown:theEvent];
+ }
+ } else {
+ [super keyDown:theEvent];
+ }
+}
+
+
+ at end
Modified: branches/adium-1.0/Source/ESFileTransferProgressView.h
===================================================================
--- branches/adium-1.0/Source/ESFileTransferProgressView.h 2007-03-13 12:02:00 UTC (rev 19122)
+++ branches/adium-1.0/Source/ESFileTransferProgressView.h 2007-03-13 12:02:40 UTC (rev 19123)
@@ -75,6 +75,7 @@
speedStatus:(NSString *)inTransferSpeedStatus;
- (IBAction)toggleDetails:(id)sender;
+- (void)setShowsDetails:(BOOL)flag;
- (void)setAllowsCancel:(BOOL)flag;
Modified: branches/adium-1.0/Source/ESFileTransferProgressView.m
===================================================================
--- branches/adium-1.0/Source/ESFileTransferProgressView.m 2007-03-13 12:02:00 UTC (rev 19122)
+++ branches/adium-1.0/Source/ESFileTransferProgressView.m 2007-03-13 12:02:40 UTC (rev 19123)
@@ -237,6 +237,13 @@
to:newFrame.size.height];
}
+- (void)setShowsDetails:(BOOL)flag
+{
+ if (showingDetails != flag) {
+ [self toggleDetails:nil];
+ }
+}
+
- (void)setAllowsCancel:(BOOL)flag
{
[button_stopResume setEnabled:flag];
More information about the Adium-svn
mailing list