adium 5173:da32a86783c1: Add the Source/Destination picker with ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/da32a86783c1
revision:	5173:da32a86783c1
branch:		adium-1.6
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Oct 22 17:22:21 2012 +0200

Add the Source/Destination picker with a delay, so the animation (hopefully) doesn't mess up resizing the message view.
Subject: adium 5174:6042e7db9896: Made the account selection top bar slightly thinner, so it looks better when both popup buttons are shown.

details:	http://hg.adium.im/adium/rev/6042e7db9896
revision:	5174:6042e7db9896
branch:		adium-1.6
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Oct 22 17:23:07 2012 +0200

Made the account selection top bar slightly thinner, so it looks better when both popup buttons are shown.

diffs (104 lines):

diff -r 8f6ffea43e59 -r 6042e7db9896 Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib
--- a/Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib	Mon Oct 22 16:59:04 2012 +0200
+++ b/Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib	Mon Oct 22 17:23:07 2012 +0200
@@ -48,7 +48,7 @@
 							<object class="NSPopUpButton" id="762366467">
 								<reference key="NSNextResponder" ref="1005"/>
 								<int key="NSvFlags">270</int>
-								<string key="NSFrame">{{50, 2}, {212, 26}}</string>
+								<string key="NSFrame">{{50, 1}, {212, 26}}</string>
 								<reference key="NSSuperview" ref="1005"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView"/>
@@ -128,7 +128,7 @@
 							<object class="NSPopUpButton" id="70819358">
 								<reference key="NSNextResponder" ref="1005"/>
 								<int key="NSvFlags">270</int>
-								<string key="NSFrame">{{50, 30}, {212, 26}}</string>
+								<string key="NSFrame">{{50, 29}, {212, 26}}</string>
 								<reference key="NSSuperview" ref="1005"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="251755580"/>
@@ -197,8 +197,8 @@
 							</object>
 							<object class="NSTextField" id="251755580">
 								<reference key="NSNextResponder" ref="1005"/>
-								<int key="NSvFlags">260</int>
-								<string key="NSFrame">{{7, 7}, {41, 17}}</string>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{7, 6}, {41, 17}}</string>
 								<reference key="NSSuperview" ref="1005"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="762366467"/>
@@ -234,8 +234,8 @@
 							</object>
 							<object class="NSTextField" id="476591228">
 								<reference key="NSNextResponder" ref="1005"/>
-								<int key="NSvFlags">260</int>
-								<string key="NSFrame">{{23, 37}, {25, 17}}</string>
+								<int key="NSvFlags">268</int>
+								<string key="NSFrame">{{23, 34}, {25, 17}}</string>
 								<reference key="NSSuperview" ref="1005"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="70819358"/>
@@ -254,14 +254,14 @@
 								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 							</object>
 						</array>
-						<string key="NSFrameSize">{480, 60}</string>
+						<string key="NSFrameSize">{480, 58}</string>
 						<reference key="NSSuperview" ref="323709103"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="476591228"/>
 						<string key="NSClassName">AITopBarGradientView</string>
 					</object>
 				</array>
-				<string key="NSFrameSize">{480, 60}</string>
+				<string key="NSFrameSize">{480, 58}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="1005"/>
@@ -532,7 +532,7 @@
 						<string key="label_contacts">NSTextField</string>
 						<string key="popUp_accounts">NSPopUpButton</string>
 						<string key="popUp_contacts">NSPopUpButton</string>
-						<string key="view_backgroundView">AIAccountSelectionView</string>
+						<string key="view_backgroundView">AITopBarGradientView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="label_accounts">
@@ -553,7 +553,7 @@
 						</object>
 						<object class="IBToOneOutletInfo" key="view_backgroundView">
 							<string key="name">view_backgroundView</string>
-							<string key="candidateClassName">AIAccountSelectionView</string>
+							<string key="candidateClassName">AITopBarGradientView</string>
 						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff -r 8f6ffea43e59 -r 6042e7db9896 Plugins/Dual Window Interface/AIAccountSelectionViewController.m
--- a/Plugins/Dual Window Interface/AIAccountSelectionViewController.m	Mon Oct 22 16:59:04 2012 +0200
+++ b/Plugins/Dual Window Interface/AIAccountSelectionViewController.m	Mon Oct 22 17:23:07 2012 +0200
@@ -127,8 +127,8 @@
     
     [owner unhideTopBarController:self];
     
-    [self.view setFrameSize:NSMakeSize(NSWidth(self.view.superview.frame), 30 * ((choicesForAccount ? 1 : 0) + (choicesForContact ? 1 : 0)))];
-    [view_backgroundView setBoundsOrigin:NSMakePoint(0.0f, choicesForContact ? 0.0f : -30.0f)];
+    [self.view setFrameSize:NSMakeSize(NSWidth(self.view.superview.frame), 29.0 * ((choicesForAccount ? 1 : 0) + (choicesForContact ? 1 : 0)))];
+    [view_backgroundView setBoundsOrigin:NSMakePoint(0.0f, choicesForContact ? 0.0f : -29.0f)];
     
     [owner didResizeTopbarController:self];
 }
diff -r 8f6ffea43e59 -r 6042e7db9896 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m	Mon Oct 22 16:59:04 2012 +0200
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m	Mon Oct 22 17:23:07 2012 +0200
@@ -155,7 +155,7 @@
 
         [sourceDestination.view setHidden:TRUE];
         
-        [self addTopBarController:sourceDestination];
+		[self performSelector:@selector(addTopBarController:) withObject:sourceDestination afterDelay:.2f];
 
         [sourceDestination release];