adium 5189:5de1870f10b9: Removed unused IBOutlets, added one for...

commits at adium.im commits at adium.im
Tue Oct 23 21:01:21 UTC 2012


details:	http://hg.adium.im/adium/rev/5de1870f10b9
revision:	5189:5de1870f10b9
branch:		adium-1.6
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Tue Oct 23 23:00:32 2012 +0200

Removed unused IBOutlets, added one for the account label. Added some localization.

diffs (105 lines):

diff -r ea160e1daf21 -r 5de1870f10b9 Resources/NewMessagePrompt.xib
--- a/Resources/NewMessagePrompt.xib	Tue Oct 23 22:47:51 2012 +0200
+++ b/Resources/NewMessagePrompt.xib	Tue Oct 23 23:00:32 2012 +0200
@@ -568,6 +568,14 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
+						<string key="label">label_account</string>
+						<reference key="source" ref="853528324"/>
+						<reference key="destination" ref="210405386"/>
+					</object>
+					<int key="connectionID">103</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="65469044"/>
 						<reference key="destination" ref="853528324"/>
@@ -918,7 +926,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">102</int>
+			<int key="maxID">103</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1004,8 +1012,7 @@
 						<string key="button_cancel">NSButton</string>
 						<string key="button_okay">NSButton</string>
 						<string key="field_search">AINewMessageSearchField</string>
-						<string key="label_from">NSTextField</string>
-						<string key="label_to">NSTextField</string>
+						<string key="label_account">NSTextField</string>
 						<string key="popup_account">NSButton</string>
 						<string key="table_results">AINewMessageTableView</string>
 					</dictionary>
@@ -1022,12 +1029,8 @@
 							<string key="name">field_search</string>
 							<string key="candidateClassName">AINewMessageSearchField</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="label_from">
-							<string key="name">label_from</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="label_to">
-							<string key="name">label_to</string>
+						<object class="IBToOneOutletInfo" key="label_account">
+							<string key="name">label_account</string>
 							<string key="candidateClassName">NSTextField</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="popup_account">
diff -r ea160e1daf21 -r 5de1870f10b9 Source/AINewMessagePromptController.h
--- a/Source/AINewMessagePromptController.h	Tue Oct 23 22:47:51 2012 +0200
+++ b/Source/AINewMessagePromptController.h	Tue Oct 23 23:00:32 2012 +0200
@@ -19,12 +19,10 @@
 #import "AINewMessageTableView.h"
 
 @interface AINewMessagePromptController : AIWindowController <NSTableViewDataSource, NSTableViewDelegate, NSControlTextEditingDelegate, AIAccountMenuDelegate> {
-	IBOutlet	NSTextField	*label_from;
-	IBOutlet	NSTextField	*label_to;
-	
 	IBOutlet	NSButton	*button_okay;
 	IBOutlet	NSButton	*button_cancel;
 	
+	IBOutlet	NSTextField	*label_account;
 	AIAccountMenu 			*accountMenu;
 	AIAccount				*account;
 	IBOutlet	NSButton	*popup_account;
diff -r ea160e1daf21 -r 5de1870f10b9 Source/AINewMessagePromptController.m
--- a/Source/AINewMessagePromptController.m	Tue Oct 23 22:47:51 2012 +0200
+++ b/Source/AINewMessagePromptController.m	Tue Oct 23 23:00:32 2012 +0200
@@ -85,10 +85,8 @@
 {
 	[super windowDidLoad];
 	
-	[label_from setLocalizedString:AILocalizedString(@"From:",nil)];
-	[label_to setLocalizedString:AILocalizedString(@"To:",nil)];
-	
 	[button_okay setLocalizedString:AILocalizedStringFromTable(@"Message", @"Buttons", "Button title to open a message window the specific contact from the 'New Chat' window")];
+	[button_cancel setLocalizedString:AILocalizedStringFromTable(@"Cancel", @"Buttons", nil)];
 	
 	[[self window] setTitle:AILocalizedString(@"New Message",nil)];
 	
@@ -97,6 +95,7 @@
 	[table_results setDoubleAction:@selector(okay:)];
 	[table_results setTarget:self];
 	
+	[label_account setLocalizedString:AILocalizedString(@"Account:", nil)];
 	accountMenu = [[AIAccountMenu accountMenuWithDelegate:self
 											  submenuType:AIAccountNoSubmenu
 										   showTitleVerbs:NO] retain];
@@ -406,11 +405,7 @@
 			if (numberOfOnlineAccounts > 1) {
 				[account release];
 				account = nil;
-				anyItem = [[[NSMenuItem alloc] initWithTitle:
-							AILocalizedStringFromTableInBundle(@"Any",
-															   nil,
-															   [NSBundle bundleForClass:[AIAccountPlusFieldPromptController class]],
-															   nil)
+				anyItem = [[[NSMenuItem alloc] initWithTitle:AILocalizedString(@"Any", @"New message window label to show contacts for 'Any' account.")
 													  action:nil
 											   keyEquivalent:@""] autorelease];
 				break;




More information about the commits mailing list