adium 4475:430f6e4dfc2e: Reconnect runToolbarCustomizationPalett...

commits at adium.im commits at adium.im
Sun Jan 8 14:46:45 UTC 2012


details:	http://hg.adium.im/adium/rev/430f6e4dfc2e
revision:	4475:430f6e4dfc2e
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Sun Jan 08 15:46:01 2012 +0100

Reconnect runToolbarCustomizationPalette and toggleToolbarShown IBActions, which got removed in 1d96c04dc242, so "Show Toolbar" and "Customize Toolbar" should work and be localizable again.

Refs #15751, fixes #15759

diffs (95 lines):

diff -r 9cc87d0274e7 -r 430f6e4dfc2e Resources/MainMenu.xib
--- a/Resources/MainMenu.xib	Sun Jan 08 06:26:45 2012 +0100
+++ b/Resources/MainMenu.xib	Sun Jan 08 15:46:01 2012 +0100
@@ -614,8 +614,7 @@
 								<object class="NSMenuItem" id="287694887">
 									<reference key="NSMenu" ref="310167997"/>
 									<string key="NSTitle">Show Toolbar</string>
-									<string key="NSKeyEquiv">T</string>
-									<int key="NSKeyEquivModMask">1048576</int>
+									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="145266427"/>
 									<reference key="NSMixedImage" ref="551713053"/>
@@ -2541,6 +2540,22 @@
 					<int key="connectionID">7382</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleToolbarShown:</string>
+						<reference key="source" ref="276456795"/>
+						<reference key="destination" ref="287694887"/>
+					</object>
+					<int key="connectionID">7390</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">runToolbarCustomizationPalette:</string>
+						<reference key="source" ref="276456795"/>
+						<reference key="destination" ref="852785755"/>
+					</object>
+					<int key="connectionID">7391</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="651876030"/>
@@ -3468,7 +3483,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">7389</int>
+			<int key="maxID">7391</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3744,11 +3759,13 @@
 						<string key="pasteAndMatchStyle:">id</string>
 						<string key="pasteWithImagesAndColors:">id</string>
 						<string key="reopenChat:">id</string>
+						<string key="runToolbarCustomizationPalette:">id</string>
 						<string key="setFontPanelSettingsAsDefaultFont:">id</string>
 						<string key="showContactListAndBringToFront:">id</string>
 						<string key="showPreferenceWindow:">id</string>
 						<string key="toggleFontPanel:">id</string>
 						<string key="toggleFontTrait:">id</string>
+						<string key="toggleToolbarShown:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="adiumPrint:">
@@ -3783,6 +3800,10 @@
 							<string key="name">reopenChat:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="runToolbarCustomizationPalette:">
+							<string key="name">runToolbarCustomizationPalette:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="setFontPanelSettingsAsDefaultFont:">
 							<string key="name">setFontPanelSettingsAsDefaultFont:</string>
 							<string key="candidateClassName">id</string>
@@ -3803,6 +3824,10 @@
 							<string key="name">toggleFontTrait:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="toggleToolbarShown:">
+							<string key="name">toggleToolbarShown:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="button_fontPanelSetAsDefault">NSButton</string>
diff -r 9cc87d0274e7 -r 430f6e4dfc2e Source/AIInterfaceController.h
--- a/Source/AIInterfaceController.h	Sun Jan 08 06:26:45 2012 +0100
+++ b/Source/AIInterfaceController.h	Sun Jan 08 15:46:01 2012 +0100
@@ -98,8 +98,8 @@
 - (IBAction)setFontPanelSettingsAsDefaultFont:(id)sender;
 
 - (IBAction)toggleFontTrait:(id)sender;
-- (void)toggleToolbarShown:(id)sender;
-- (void)runToolbarCustomizationPalette:(id)sender;
+- (IBAction)toggleToolbarShown:(id)sender;
+- (IBAction)runToolbarCustomizationPalette:(id)sender;
 
 - (IBAction)showPreferenceWindow:(id)sender;
 




More information about the commits mailing list