adium 5009:84858e796c42: Resurect a basic AIAdvancedPreferencePa...
commits at adium.im
commits at adium.im
Sun Aug 19 23:54:55 UTC 2012
details: http://hg.adium.im/adium/rev/84858e796c42
revision: 5009:84858e796c42
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Sun Aug 19 13:22:59 2012 -0400
Resurect a basic AIAdvancedPreferencePane for plugins with preferences which fixes #16068. Xtra plugins will need to update their nibs to make them fit in better in the new layout.
Subject: adium 5010:d80b95868668: 295cfdd71c39 got lost in a merge somewhere. Fixes #16103
details: http://hg.adium.im/adium/rev/d80b95868668
revision: 5010:d80b95868668
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Sun Aug 19 15:29:27 2012 -0400
295cfdd71c39 got lost in a merge somewhere. Fixes #16103
Subject: adium 5011:c540b194d9f1: The contact list menu item in the dock now always brings it to the front instead of toggling its vilibility. Fixes #4848
details: http://hg.adium.im/adium/rev/c540b194d9f1
revision: 5011:c540b194d9f1
branch: adium-1.6
author: Aaron Dodson <gonfunko at gmail.com>
date: Fri Aug 03 09:02:20 2012 -0700
The contact list menu item in the dock now always brings it to the front instead of toggling its vilibility. Fixes #4848
r=wix
Subject: adium 5012:3f57100aabf9: Add a signup or about button to each account setup pane. Fixes #3792
details: http://hg.adium.im/adium/rev/3f57100aabf9
revision: 5012:3f57100aabf9
branch: adium-1.6
author: Ariel Chinn <arielchinn at gmail.com>
date: Mon Aug 29 17:56:00 2011 +0300
Add a signup or about button to each account setup pane. Fixes #3792
r=wix
diffs (truncated from 5365 to 1000 lines):
diff -r 516beabfa823 -r 3f57100aabf9 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Thu Aug 09 20:46:10 2012 -0400
+++ b/Adium.xcodeproj/project.pbxproj Mon Aug 29 17:56:00 2011 +0300
@@ -1055,6 +1055,8 @@
4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.xib */; };
5A1781860EC1215D00BA1E04 /* AIAutoScrollTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */; };
5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.m */; };
+ 5A1E24A915BC746B003A6F9E /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 5A1E24AA15BC746B003A6F9E /* AIAdvancedPreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */; };
5A1E3A1214DCE60400724574 /* Preferences-Xtras.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */; };
5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.xib */; };
5A27FA7D14A272330063489D /* pref-messagehistory.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7914A272330063489D /* pref-messagehistory.png */; };
@@ -3879,6 +3881,8 @@
5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAutoScrollTextView.m; path = Source/AIAutoScrollTextView.m; sourceTree = "<group>"; };
5A17D65B130F76B4002C852F /* AIGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGradientView.h; path = Source/AIGradientView.h; sourceTree = "<group>"; };
5A17D65C130F76B4002C852F /* AIGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGradientView.m; path = Source/AIGradientView.m; sourceTree = "<group>"; };
+ 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdvancedPreferencePane.h; path = "Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.h"; sourceTree = "<group>"; };
+ 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAdvancedPreferencePane.m; path = "Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.m"; sourceTree = "<group>"; };
5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-Xtras.xib"; path = "Resources/Preferences-Xtras.xib"; sourceTree = "<group>"; };
5A1FEA601334549300C14951 /* MessageView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MessageView.xib; path = "Plugins/Dual Window Interface/MessageView.xib"; sourceTree = "<group>"; };
5A22D6E114834F44004E15F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/AIFacebookXMPPAccountView.xib"; sourceTree = "<group>"; };
@@ -8716,6 +8720,8 @@
4BAA1B360632ED8B00D8B92C /* AIActionDetailsPane.m */,
F5793923033E74C301A8010A /* AIPreferencePane.h */,
F5793913033E748F01A8010A /* AIPreferencePane.m */,
+ 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */,
+ 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */,
4BAD188C066A83550002008E /* AIModularPaneCategoryView.h */,
4BAD188D066A83550002008E /* AIModularPaneCategoryView.m */,
);
@@ -9018,6 +9024,7 @@
34F17FCE0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h in Headers */,
63B0EC9D0F8FBB660062476B /* AIProxyListObject.h in Headers */,
979AA6A714D59DC8008730DF /* AIBoolToControlTextColorTransformer.h in Headers */,
+ 5A1E24A915BC746B003A6F9E /* AIAdvancedPreferencePane.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10500,6 +10507,7 @@
34F17FCF0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m in Sources */,
63B0EC9C0F8FBB660062476B /* AIProxyListObject.m in Sources */,
979AA6A814D59DC8008730DF /* AIBoolToControlTextColorTransformer.m in Sources */,
+ 5A1E24AA15BC746B003A6F9E /* AIAdvancedPreferencePane.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r 516beabfa823 -r 3f57100aabf9 Frameworks/Adium Framework/Resources/AccountSetup.xib
--- a/Frameworks/Adium Framework/Resources/AccountSetup.xib Thu Aug 09 20:46:10 2012 -0400
+++ b/Frameworks/Adium Framework/Resources/AccountSetup.xib Mon Aug 29 17:56:00 2011 +0300
@@ -2,19 +2,21 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11D50b</string>
- <string key="IBDocument.InterfaceBuilderVersion">2182</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
+ <string key="IBDocument.SystemVersion">12A269</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2549</string>
+ <string key="IBDocument.AppKitVersion">1187</string>
+ <string key="IBDocument.HIToolboxVersion">624.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2182</string>
+ <string key="NS.object.0">2549</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
+ <string>NSCustomObject</string>
<string>NSCustomView</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
- <string>NSCustomObject</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -23,38 +25,62 @@
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="956489815">
- <object class="NSCustomObject" id="985716603">
+ <array class="NSMutableArray" key="IBDocument.RootObjects" id="19952949">
+ <object class="NSCustomObject" id="105115939">
<string key="NSClassName">AIAccountViewController</string>
</object>
- <object class="NSCustomObject" id="448436558">
+ <object class="NSCustomObject" id="567296318">
<string key="NSClassName">FirstResponder</string>
</object>
- <object class="NSCustomObject" id="223831329">
+ <object class="NSCustomObject" id="848357648">
<string key="NSClassName">NSApplication</string>
</object>
- <object class="NSCustomView" id="466473250">
- <nil key="NSNextResponder"/>
+ <object class="NSCustomView" id="561449010">
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextField" id="748451024">
- <reference key="NSNextResponder" ref="466473250"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{142, 30}, {240, 22}}</string>
- <reference key="NSSuperview" ref="466473250"/>
+ <object class="NSButton" id="881747913">
+ <reference key="NSNextResponder" ref="561449010"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{139, 21}, {183, 32}}</string>
+ <reference key="NSSuperview" ref="561449010"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="43717607">
- <int key="NSCellFlags">-1804468671</int>
- <int key="NSCellFlags2">4195328</int>
- <string key="NSContents"/>
- <object class="NSFont" key="NSSupport" id="462753129">
+ <object class="NSButtonCell" key="NSCell" id="435985870">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Sign up for an account</string>
+ <object class="NSFont" key="NSSupport" id="271196206">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
- <reference key="NSControlView" ref="748451024"/>
+ <reference key="NSControlView" ref="881747913"/>
+ <int key="NSButtonFlags">-2038284288</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="637763381">
+ <reference key="NSNextResponder" ref="561449010"/>
+ <int key="NSvFlags">264</int>
+ <string key="NSFrame">{{142, 99}, {240, 22}}</string>
+ <reference key="NSSuperview" ref="561449010"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="857466580"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="549862236">
+ <int key="NSCellFlags">-1804599231</int>
+ <int key="NSCellFlags2">4195328</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="271196206"/>
+ <reference key="NSControlView" ref="637763381"/>
<bool key="NSDrawsBackground">YES</bool>
- <object class="NSColor" key="NSBackgroundColor" id="662241499">
+ <object class="NSColor" key="NSBackgroundColor" id="569525630">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
@@ -63,30 +89,33 @@
<bytes key="NSWhite">MQA</bytes>
</object>
</object>
- <object class="NSColor" key="NSTextColor" id="95747089">
+ <object class="NSColor" key="NSTextColor" id="560351688">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textColor</string>
- <object class="NSColor" key="NSColor" id="898628577">
+ <object class="NSColor" key="NSColor" id="730790499">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSTextField" id="799374456">
- <reference key="NSNextResponder" ref="466473250"/>
+ <object class="NSTextField" id="999421420">
+ <reference key="NSNextResponder" ref="561449010"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{0, 33}, {140, 17}}</string>
- <reference key="NSSuperview" ref="466473250"/>
+ <string key="NSFrame">{{0, 102}, {140, 17}}</string>
+ <reference key="NSSuperview" ref="561449010"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="637763381"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="75437158">
- <int key="NSCellFlags">67239424</int>
+ <object class="NSTextFieldCell" key="NSCell" id="861635100">
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">User Name:</string>
- <reference key="NSSupport" ref="462753129"/>
- <reference key="NSControlView" ref="799374456"/>
- <object class="NSColor" key="NSBackgroundColor" id="481080978">
+ <reference key="NSSupport" ref="271196206"/>
+ <reference key="NSControlView" ref="999421420"/>
+ <object class="NSColor" key="NSBackgroundColor" id="102860041">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
@@ -95,49 +124,59 @@
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
- <object class="NSColor" key="NSTextColor" id="889857435">
+ <object class="NSColor" key="NSTextColor" id="817639000">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
- <reference key="NSColor" ref="898628577"/>
+ <reference key="NSColor" ref="730790499"/>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSTextField" id="685776581">
- <reference key="NSNextResponder" ref="466473250"/>
+ <object class="NSTextField" id="857466580">
+ <reference key="NSNextResponder" ref="561449010"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{0, 3}, {140, 17}}</string>
- <reference key="NSSuperview" ref="466473250"/>
+ <string key="NSFrame">{{0, 72}, {140, 17}}</string>
+ <reference key="NSSuperview" ref="561449010"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="140484279"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="687090422">
- <int key="NSCellFlags">67239424</int>
+ <object class="NSTextFieldCell" key="NSCell" id="950271547">
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Password:</string>
- <reference key="NSSupport" ref="462753129"/>
- <reference key="NSControlView" ref="685776581"/>
- <reference key="NSBackgroundColor" ref="481080978"/>
- <reference key="NSTextColor" ref="889857435"/>
+ <reference key="NSSupport" ref="271196206"/>
+ <reference key="NSControlView" ref="857466580"/>
+ <reference key="NSBackgroundColor" ref="102860041"/>
+ <reference key="NSTextColor" ref="817639000"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSTextField" id="449085043">
- <reference key="NSNextResponder" ref="466473250"/>
+ <object class="NSTextField" id="140484279">
+ <reference key="NSNextResponder" ref="561449010"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{142, 0}, {240, 22}}</string>
- <reference key="NSSuperview" ref="466473250"/>
+ <string key="NSFrame">{{142, 69}, {240, 22}}</string>
+ <reference key="NSSuperview" ref="561449010"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="881747913"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="934387351">
- <int key="NSCellFlags">-1804468671</int>
+ <object class="NSTextFieldCell" key="NSCell" id="534731647">
+ <int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">4195328</int>
<string key="NSContents"/>
- <reference key="NSSupport" ref="462753129"/>
- <reference key="NSControlView" ref="449085043"/>
+ <reference key="NSSupport" ref="271196206"/>
+ <reference key="NSControlView" ref="140484279"/>
<bool key="NSDrawsBackground">YES</bool>
- <reference key="NSBackgroundColor" ref="662241499"/>
- <reference key="NSTextColor" ref="95747089"/>
+ <reference key="NSBackgroundColor" ref="569525630"/>
+ <reference key="NSTextColor" ref="560351688"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
- <string key="NSFrameSize">{460, 52}</string>
+ <string key="NSFrameSize">{460, 121}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="999421420"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
</object>
@@ -149,72 +188,88 @@
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">view_setup</string>
- <reference key="source" ref="985716603"/>
- <reference key="destination" ref="466473250"/>
+ <reference key="source" ref="105115939"/>
+ <reference key="destination" ref="561449010"/>
</object>
<int key="connectionID">13</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">textField_accountUIDLabel</string>
- <reference key="source" ref="985716603"/>
- <reference key="destination" ref="799374456"/>
+ <reference key="source" ref="105115939"/>
+ <reference key="destination" ref="999421420"/>
</object>
<int key="connectionID">15</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">textField_accountUID</string>
- <reference key="source" ref="985716603"/>
- <reference key="destination" ref="748451024"/>
+ <reference key="source" ref="105115939"/>
+ <reference key="destination" ref="637763381"/>
</object>
<int key="connectionID">16</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">textField_password</string>
- <reference key="source" ref="985716603"/>
- <reference key="destination" ref="449085043"/>
+ <reference key="source" ref="105115939"/>
+ <reference key="destination" ref="140484279"/>
</object>
<int key="connectionID">17</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">changedPreference:</string>
- <reference key="source" ref="985716603"/>
- <reference key="destination" ref="748451024"/>
+ <reference key="source" ref="105115939"/>
+ <reference key="destination" ref="637763381"/>
</object>
<int key="connectionID">18</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">changedPreference:</string>
- <reference key="source" ref="985716603"/>
- <reference key="destination" ref="449085043"/>
+ <reference key="source" ref="105115939"/>
+ <reference key="destination" ref="140484279"/>
</object>
<int key="connectionID">19</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">label_password</string>
- <reference key="source" ref="985716603"/>
- <reference key="destination" ref="685776581"/>
+ <reference key="source" ref="105115939"/>
+ <reference key="destination" ref="857466580"/>
</object>
<int key="connectionID">45</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
+ <string key="label">button_SignUp</string>
+ <reference key="source" ref="105115939"/>
+ <reference key="destination" ref="881747913"/>
+ </object>
+ <int key="connectionID">54</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">signUpAccount:</string>
+ <reference key="source" ref="105115939"/>
+ <reference key="destination" ref="881747913"/>
+ </object>
+ <int key="connectionID">55</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
<string key="label">view_anchorToRightSide</string>
- <reference key="source" ref="799374456"/>
- <reference key="destination" ref="748451024"/>
+ <reference key="source" ref="999421420"/>
+ <reference key="destination" ref="637763381"/>
</object>
<int key="connectionID">43</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">view_anchorToRightSide</string>
- <reference key="source" ref="685776581"/>
- <reference key="destination" ref="449085043"/>
+ <reference key="source" ref="857466580"/>
+ <reference key="destination" ref="140484279"/>
</object>
<int key="connectionID">44</int>
</object>
@@ -224,91 +279,105 @@
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
- <reference key="children" ref="956489815"/>
+ <reference key="children" ref="19952949"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
- <reference key="object" ref="985716603"/>
+ <reference key="object" ref="105115939"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
- <reference key="object" ref="448436558"/>
+ <reference key="object" ref="567296318"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">5</int>
- <reference key="object" ref="466473250"/>
+ <reference key="object" ref="561449010"/>
<array class="NSMutableArray" key="children">
- <reference ref="748451024"/>
- <reference ref="799374456"/>
- <reference ref="685776581"/>
- <reference ref="449085043"/>
+ <reference ref="637763381"/>
+ <reference ref="999421420"/>
+ <reference ref="857466580"/>
+ <reference ref="140484279"/>
+ <reference ref="881747913"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">Setup</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
- <reference key="object" ref="748451024"/>
+ <reference key="object" ref="637763381"/>
<array class="NSMutableArray" key="children">
- <reference ref="43717607"/>
+ <reference ref="549862236"/>
</array>
- <reference key="parent" ref="466473250"/>
+ <reference key="parent" ref="561449010"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
- <reference key="object" ref="799374456"/>
+ <reference key="object" ref="999421420"/>
<array class="NSMutableArray" key="children">
- <reference ref="75437158"/>
+ <reference ref="861635100"/>
</array>
- <reference key="parent" ref="466473250"/>
+ <reference key="parent" ref="561449010"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
- <reference key="object" ref="685776581"/>
+ <reference key="object" ref="857466580"/>
<array class="NSMutableArray" key="children">
- <reference ref="687090422"/>
+ <reference ref="950271547"/>
</array>
- <reference key="parent" ref="466473250"/>
+ <reference key="parent" ref="561449010"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">12</int>
- <reference key="object" ref="449085043"/>
+ <reference key="object" ref="140484279"/>
<array class="NSMutableArray" key="children">
- <reference ref="934387351"/>
+ <reference ref="534731647"/>
</array>
- <reference key="parent" ref="466473250"/>
+ <reference key="parent" ref="561449010"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">47</int>
- <reference key="object" ref="43717607"/>
- <reference key="parent" ref="748451024"/>
+ <reference key="object" ref="549862236"/>
+ <reference key="parent" ref="637763381"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">48</int>
- <reference key="object" ref="75437158"/>
- <reference key="parent" ref="799374456"/>
+ <reference key="object" ref="861635100"/>
+ <reference key="parent" ref="999421420"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">49</int>
- <reference key="object" ref="687090422"/>
- <reference key="parent" ref="685776581"/>
+ <reference key="object" ref="950271547"/>
+ <reference key="parent" ref="857466580"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">50</int>
- <reference key="object" ref="934387351"/>
- <reference key="parent" ref="449085043"/>
+ <reference key="object" ref="534731647"/>
+ <reference key="parent" ref="140484279"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
- <reference key="object" ref="223831329"/>
+ <reference key="object" ref="848357648"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">51</int>
+ <reference key="object" ref="881747913"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="435985870"/>
+ </array>
+ <reference key="parent" ref="561449010"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">52</int>
+ <reference key="object" ref="435985870"/>
+ <reference key="parent" ref="881747913"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -326,31 +395,38 @@
<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="50.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="51.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="52.CustomClassName">AILocalizationButtonCell</string>
+ <string key="52.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">50</int>
+ <int key="maxID">55</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">AIAccountViewController</string>
<string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">changedPreference:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">changedPreference:</string>
- <object class="IBActionInfo" key="NS.object.0">
+ <dictionary class="NSMutableDictionary" key="actions">
+ <string key="changedPreference:">id</string>
+ <string key="signUpAccount:">id</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="changedPreference:">
<string key="name">changedPreference:</string>
<string key="candidateClassName">id</string>
</object>
- </object>
+ <object class="IBActionInfo" key="signUpAccount:">
+ <string key="name">signUpAccount:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
+ <string key="button_SignUp">NSButton</string>
<string key="checkBox_checkMail">NSButton</string>
<string key="checkBox_sendTyping">NSButton</string>
<string key="label_alias">NSTextField</string>
@@ -375,6 +451,10 @@
<string key="view_setup">NSView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="button_SignUp">
+ <string key="name">button_SignUp</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
<object class="IBToOneOutletInfo" key="checkBox_checkMail">
<string key="name">checkBox_checkMail</string>
<string key="candidateClassName">NSButton</string>
@@ -470,6 +550,38 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">AILocalizationButtonCell</string>
+ <string key="superclassName">NSButtonCell</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="view_anchorToLeftSide">NSView</string>
+ <string key="view_anchorToRightSide">NSView</string>
+ <string key="window_anchorOnLeftSide">NSWindow</string>
+ <string key="window_anchorOnRightSide">NSWindow</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AILocalizationButtonCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">AILocalizationTextField</string>
<string key="superclassName">NSTextField</string>
<dictionary class="NSMutableDictionary" key="outlets">
@@ -501,6 +613,24 @@
<string key="minorKey">./Classes/AILocalizationTextField.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">selectServiceType:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">selectServiceType:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">selectServiceType:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/NSObject.h</string>
+ </object>
+ </object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
@@ -509,10 +639,6 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
</object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1060" key="NS.object.0"/>
- </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<real value="3200" key="NS.object.0"/>
diff -r 516beabfa823 -r 3f57100aabf9 Frameworks/Adium Framework/Source/AIAccountViewController.h
--- a/Frameworks/Adium Framework/Source/AIAccountViewController.h Thu Aug 09 20:46:10 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAccountViewController.h Mon Aug 29 17:56:00 2011 +0300
@@ -34,6 +34,7 @@
IBOutlet NSTextField *textField_accountUID; //UID field
IBOutlet NSTextField *label_password; //Label on the password field
IBOutlet NSTextField *textField_password; //Password field
+ IBOutlet NSButton *button_SignUp; //Sign up for account
IBOutlet NSTextField *textField_connectHost; //Connect host
IBOutlet NSTextField *textField_connectPort; //Connect port
IBOutlet NSTextField *textField_alias; //User alias (or display name)
@@ -65,6 +66,7 @@
- (NSView *)privacyView;
- (void)configureForAccount:(AIAccount *)inAccount;
- (IBAction)changedPreference:(id)sender;
+- (IBAction)signUpAccount:(id)sender;
- (NSString *)nibName;
- (void)saveConfiguration;
diff -r 516beabfa823 -r 3f57100aabf9 Frameworks/Adium Framework/Source/AIAccountViewController.m
--- a/Frameworks/Adium Framework/Source/AIAccountViewController.m Thu Aug 09 20:46:10 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIAccountViewController.m Mon Aug 29 17:56:00 2011 +0300
@@ -216,6 +216,9 @@
NSString *savedPassword = [adium.accountController passwordForAccount:account];
[textField_password setStringValue:[savedPassword length] ? savedPassword : @""];
+ //Account sign up button text
+ [button_SignUp setTitle:[service accountSetupLabel]];
+
//User alias (display name)
NSString *alias = [[[account preferenceForKey:KEY_ACCOUNT_DISPLAY_NAME group:GROUP_ACCOUNT_STATUS] attributedString] string];
[textField_alias setStringValue:(alias ? alias : @"")];
@@ -339,6 +342,17 @@
}
/*!
+ * @brief Invoked when the account sign up button is clicked
+ *
+ * This method is invoked when the account sign up button is clicked. It defaults to opening the account sign up URL
+ * in the default browser, but can be used to override this behaviour.
+ */
+- (IBAction)signUpAccount:(id)sender
+{
+ [[NSWorkspace sharedWorkspace] openURL:[account.service serviceAccountSetupURL]];
+}
+
+/*!
* @brief Dictionary mapping Adium preference keys to exposed binding keys
*
* The objects of the dictionary should be Adium preference keys
diff -r 516beabfa823 -r 3f57100aabf9 Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.h Mon Aug 29 17:56:00 2011 +0300
@@ -0,0 +1,23 @@
+/*
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import "AIPreferencePane.h"
+
+ at interface AIAdvancedPreferencePane : AIPreferencePane {
+
+}
+
+ at end
diff -r 516beabfa823 -r 3f57100aabf9 Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.m
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Source/AIAdvancedPreferencePane.m Mon Aug 29 17:56:00 2011 +0300
@@ -0,0 +1,41 @@
+/*
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import "AIAdvancedPreferencePane.h"
+
+ at implementation AIAdvancedPreferencePane
+- (AIPreferenceCategory)category
+{
+ return AIPref_Advanced;
+}
+
+- (NSImage *)paneIcon
+{
+ return [self image];
+}
+
+- (NSImage *)image
+{
+ return nil;
+}
+
+//Resizable
+- (BOOL)resizable
+{
+ return YES;
+}
+
+ at end
diff -r 516beabfa823 -r 3f57100aabf9 Frameworks/Adium Framework/Source/AIService.h
--- a/Frameworks/Adium Framework/Source/AIService.h Thu Aug 09 20:46:10 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIService.h Mon Aug 29 17:56:00 2011 +0300
@@ -51,6 +51,8 @@
@property (readonly, nonatomic) NSString *userNameLabel;
@property (readonly, nonatomic) NSString *contactUserNameLabel;
@property (readonly, nonatomic) NSString *UIDPlaceholder;
+ at property (readonly, nonatomic) NSURL *serviceAccountSetupURL;
+ at property (readonly, nonatomic) NSString *accountSetupLabel;
@property (readonly, nonatomic) AIServiceImportance serviceImportance;
- (NSImage *)defaultServiceIconOfType:(AIServiceIconType)iconType;
- (NSString *)pathForDefaultServiceIconOfType:(AIServiceIconType)iconType;
diff -r 516beabfa823 -r 3f57100aabf9 Frameworks/Adium Framework/Source/AIService.m
--- a/Frameworks/Adium Framework/Source/AIService.m Thu Aug 09 20:46:10 2012 -0400
+++ b/Frameworks/Adium Framework/Source/AIService.m Mon Aug 29 17:56:00 2011 +0300
@@ -20,6 +20,8 @@
#import <Adium/AIAccountViewController.h>
#import "AICreateCommand.h"
+#define ADIUM_ACCOUNT_CREATION_PAGE @"http://trac.adium.im/wiki/CreatingAnAccount#Sigingupforanaccount"
+
/*!
* @class AIService
* @brief An IM Service
@@ -208,6 +210,39 @@
}
/*!
+ * @brief Account creation URL
+ *
+ * URL to a page at which the user can sign up to an account on this service or a page that explains how one can sign up for an account
+ *
+ * This will be used for the button in the account setup pane
+ *
+ * By default, returns a URL to the account signup page on the Adium wiki
+ *
+ * @return NSURL for account creation
+ */
+- (NSURL *)serviceAccountSetupURL
+{
+ return [NSURL URLWithString:ADIUM_ACCOUNT_CREATION_PAGE];
+}
+
+/*!
+ * @brief Label for account setup
+ *
+ * String to use for describing the page that the account creation URL leads to. This value varies according to the nature of the page linked to.
+ * Examples "Get AIM Account", "About Lotus", "Get Google Account"
+ *
+ * This will be used for the button in the account setup pane
+ *
+ * By default, return a localized string for "Sign up for an account"
+ *
+ * @return NSString label for account setup
+ */
+- (NSString *)accountSetupLabel
+{
+ return AILocalizedString(@"Sign up for an account", @"Defualt label for account registration button in account setup pane.");
+}
+
+/*!
* @brief Service importance
*
* Importance grouping of this service. Used to make service listings and menus more organized by placing more important
diff -r 516beabfa823 -r 3f57100aabf9 Plugins/Bonjour/AWBonjourService.m
--- a/Plugins/Bonjour/AWBonjourService.m Thu Aug 09 20:46:10 2012 -0400
+++ b/Plugins/Bonjour/AWBonjourService.m Mon Aug 29 17:56:00 2011 +0300
@@ -51,6 +51,14 @@
- (NSString *)longDescription{
return @"Bonjour";
}
+- (NSURL *)serviceAccountSetupURL
+{
+ return [NSURL URLWithString:AILocalizedString(@"http://en.wikipedia.org/wiki/Bonjour_(software)", @"URL for Bonjour signup or about page. Replace with the URL to an equivalent page in your language if one exists.")];
+}
+- (NSString *)accountSetupLabel
+{
+ return AILocalizedString(@"About Bonjour", @"Text for Bonjour sign up button");
+}
- (NSCharacterSet *)allowedCharacters{
return [[NSCharacterSet illegalCharacterSet] invertedSet];
}
diff -r 516beabfa823 -r 3f57100aabf9 Plugins/General Preferences/AIMessagePreferences.m
--- a/Plugins/General Preferences/AIMessagePreferences.m Thu Aug 09 20:46:10 2012 -0400
+++ b/Plugins/General Preferences/AIMessagePreferences.m Mon Aug 29 17:56:00 2011 +0300
@@ -152,39 +152,57 @@
#define RIGHTWARDS_ARROW "\u2192"
#define SHIFT_ARROW "\u21E7"
#define OPTION_KEY "\u2325"
+#define TAB_KEY "\u21E5"
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Arrows (%@ and %@)","Directional arrow keys word"), [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW], [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
+ [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Ctrl + Tab (%@ and %@)","Ctrl/Ctrl+Shift + Tab key word"),
+ [NSString stringWithUTF8String:"^" TAB_KEY],
+ [NSString stringWithUTF8String:"^" SHIFT_ARROW TAB_KEY]]
+ target:nil
+ action:nil
+ keyEquivalent:@""
+ tag:AICtrlTab];
+
+ [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Arrows (%@ and %@)","Directional arrow keys word"),
+ [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
+ [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
target:nil
action:nil
keyEquivalent:@""
tag:AISwitchArrows];
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Shift + Arrows (%@ and %@)","Shift key word + Directional arrow keys word"), [NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW], [NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
+ [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Shift + Arrows (%@ and %@)","Shift key word + Directional arrow keys word"),
+ [NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
+ [NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
target:nil
action:nil
keyEquivalent:@""
tag:AISwitchShiftArrows];
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Option + Arrows (%@ and %@)","Option key word + Directional arrow keys word"), [NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW], [NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
+ [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Option + Arrows (%@ and %@)","Option key word + Directional arrow keys word"),
+ [NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
+ [NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
target:nil
action:nil
keyEquivalent:@""
- tag:AIOptArrows];
+ tag:AIOptArrows];
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Brackets (%@ and %@)","Word for [ and ] keys"), [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "["], [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "]"]]
+ [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Brackets (%@ and %@)","Word for [ and ] keys"),
+ [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "["],
+ [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "]"]]
target:nil
action:nil
keyEquivalent:@""
tag:AIBrackets];
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Curly braces (%@ and %@)","Word for { and } keys"), [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "{"], [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "}"]]
+ [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Curly braces (%@ and %@)","Word for { and } keys"),
+ [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "{"],
+ [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "}"]]
target:nil
action:nil
keyEquivalent:@""
tag:AIBraces];
-
- return [menu autorelease];
+ return [menu autorelease];
}
- (NSMenu *)sendKeysMenu
@@ -209,7 +227,7 @@
keyEquivalent:@""
tag:AISendOnBoth];
- return [menu autorelease];
+ return [menu autorelease];
}
- (NSMenu *)tabPositionMenu
diff -r 516beabfa823 -r 3f57100aabf9 Plugins/General Preferences/ESGeneralPreferences.m
--- a/Plugins/General Preferences/ESGeneralPreferences.m Thu Aug 09 20:46:10 2012 -0400
+++ b/Plugins/General Preferences/ESGeneralPreferences.m Mon Aug 29 17:56:00 2011 +0300
@@ -170,70 +170,6 @@
#endif
}
-/*!
- * @brief Construct our menu by hand for easy localization
- */
-- (NSMenu *)tabChangeKeysMenu
-{
- NSMenu *menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
-#define PLACE_OF_INTEREST_SIGN "\u2318"
-#define LEFTWARDS_ARROW "\u2190"
-#define RIGHTWARDS_ARROW "\u2192"
-#define SHIFT_ARROW "\u21E7"
-#define OPTION_KEY "\u2325"
-#define TAB_KEY "\u21E5"
-
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Ctrl + Tab (%@ and %@)","Ctrl/Ctrl+Shift + Tab key word"),
- [NSString stringWithUTF8String:"^" TAB_KEY],
- [NSString stringWithUTF8String:"^" SHIFT_ARROW TAB_KEY]]
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AICtrlTab];
-
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Arrows (%@ and %@)","Directional arrow keys word"),
- [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
- [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AISwitchArrows];
-
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Shift + Arrows (%@ and %@)","Shift key word + Directional arrow keys word"),
- [NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
- [NSString stringWithUTF8String:SHIFT_ARROW PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AISwitchShiftArrows];
-
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Option + Arrows (%@ and %@)","Option key word + Directional arrow keys word"),
- [NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN LEFTWARDS_ARROW],
- [NSString stringWithUTF8String:OPTION_KEY PLACE_OF_INTEREST_SIGN RIGHTWARDS_ARROW]]
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AIOptArrows];
-
- [menu addItemWithTitle:[NSString stringWithFormat:AILocalizedString(@"Brackets (%@ and %@)","Word for [ and ] keys"),
- [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "["],
- [NSString stringWithUTF8String:PLACE_OF_INTEREST_SIGN "]"]]
- target:nil
More information about the commits
mailing list