adium 3159:ed57eaa7f328: Change "Generate" to "Regenerate" in Pr...
commits at adium.im
commits at adium.im
Sun Mar 21 04:12:51 UTC 2010
details: http://hg.adium.im/adium/rev/ed57eaa7f328
revision: 3159:ed57eaa7f328
author: Tyler Funnell <tyler.funnell at gmail.com>
date: Sun Mar 21 00:06:56 2010 -0400
Change "Generate" to "Regenerate" in Preferences. Fixes #1128
diffs (307 lines):
diff -r d7fe2ee7d9b1 -r ed57eaa7f328 Copyright.txt
--- a/Copyright.txt Tue Mar 16 22:14:34 2010 -0400
+++ b/Copyright.txt Sun Mar 21 00:06:56 2010 -0400
@@ -22,6 +22,7 @@
Augie Fackler
Ken Ferry
Christopher Forsythe
+Tyler Funnell
Brian Ganninger
Ryan Govostes
Asher Haig
diff -r d7fe2ee7d9b1 -r ed57eaa7f328 Resources/en.lproj/OTRPrefs.nib/classes.nib
--- a/Resources/en.lproj/OTRPrefs.nib/classes.nib Tue Mar 16 22:14:34 2010 -0400
+++ b/Resources/en.lproj/OTRPrefs.nib/classes.nib Sun Mar 21 00:06:56 2010 -0400
@@ -6,14 +6,6 @@
<array>
<dict>
<key>CLASS</key>
- <string>AIObject</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
<string>NSApplication</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -22,6 +14,19 @@
</dict>
<dict>
<key>CLASS</key>
+ <string>RBSplitView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>delegate</key>
+ <string>id</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>RBSplitSubview</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
<string>NSTextField</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -29,14 +34,42 @@
<string>NSControl</string>
</dict>
<dict>
+ <key>CLASS</key>
+ <string>AIAdvancedPreferencePane</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>AIModularPane</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>RBSplitSubview</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSMenu</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
<key>ACTIONS</key>
<dict>
<key>adiumPrint</key>
<string>id</string>
+ <key>didAdjustSubviews</key>
+ <string>RBSplitView</string>
<key>prefsWindowWillClose</key>
<string>SS_PrefsController</string>
<key>toggleFindPanel</key>
<string>id</string>
+ <key>willAdjustSubviews</key>
+ <string>RBSplitView</string>
</dict>
<key>CLASS</key>
<string>NSObject</string>
@@ -52,34 +85,88 @@
<string>NSResponder</string>
</dict>
<dict>
+ <key>CLASS</key>
+ <string>NSScrollView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSMenuItem</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
<key>ACTIONS</key>
<dict>
- <key>generate</key>
- <string>id</string>
- <key>selectAccount</key>
- <string>id</string>
- <key>showFingerprint</key>
+ <key>changePreference</key>
<string>id</string>
</dict>
<key>CLASS</key>
- <string>ESGaimOTRPreferences</string>
+ <string>AIModularPane</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
- <key>button_generate</key>
- <string>NSButton</string>
- <key>button_showFingerprint</key>
- <string>NSButton</string>
- <key>popUp_accounts</key>
- <string>NSPopUpButton</string>
- <key>tableView_fingerprints</key>
- <string>NSTableView</string>
- <key>textField_privateKey</key>
- <string>NSTextField</string>
+ <key>plugin</key>
+ <string>id</string>
+ <key>view</key>
+ <string>NSView</string>
</dict>
<key>SUPERCLASS</key>
- <string>AIPreferencePane</string>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSButton</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSControl</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSPopUpButton</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSButton</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSPopUpButtonCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSMenuItemCell</string>
</dict>
<dict>
<key>CLASS</key>
@@ -102,22 +189,6 @@
</dict>
<dict>
<key>CLASS</key>
- <string>FirstResponder</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>AIPreferencePane</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>AIModularPane</string>
- </dict>
- <dict>
- <key>CLASS</key>
<string>NSButtonCell</string>
<key>LANGUAGE</key>
<string>ObjC</string>
@@ -127,22 +198,30 @@
<dict>
<key>ACTIONS</key>
<dict>
- <key>changePreference</key>
+ <key>generate</key>
+ <string>id</string>
+ <key>showFingerprint</key>
<string>id</string>
</dict>
<key>CLASS</key>
- <string>AIModularPane</string>
+ <string>ESOTRPreferences</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
- <key>plugin</key>
- <string>id</string>
- <key>view</key>
- <string>NSView</string>
+ <key>button_generate</key>
+ <string>NSButton</string>
+ <key>button_showFingerprint</key>
+ <string>NSButton</string>
+ <key>popUp_accounts</key>
+ <string>NSPopUpButton</string>
+ <key>tableView_fingerprints</key>
+ <string>NSTableView</string>
+ <key>textField_privateKey</key>
+ <string>NSTextField</string>
</dict>
<key>SUPERCLASS</key>
- <string>AIObject</string>
+ <string>AIAdvancedPreferencePane</string>
</dict>
<dict>
<key>CLASS</key>
@@ -159,7 +238,7 @@
</dict>
<dict>
<key>CLASS</key>
- <string>NSButton</string>
+ <string>NSTableView</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
diff -r d7fe2ee7d9b1 -r ed57eaa7f328 Resources/en.lproj/OTRPrefs.nib/info.nib
--- a/Resources/en.lproj/OTRPrefs.nib/info.nib Tue Mar 16 22:14:34 2010 -0400
+++ b/Resources/en.lproj/OTRPrefs.nib/info.nib Sun Mar 21 00:06:56 2010 -0400
@@ -3,7 +3,9 @@
<plist version="1.0">
<dict>
<key>IBFramework Version</key>
- <string>667</string>
+ <string>677</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../Adium.xcodeproj</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
@@ -11,7 +13,7 @@
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>9D34</string>
+ <string>9J61</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
diff -r d7fe2ee7d9b1 -r ed57eaa7f328 Resources/en.lproj/OTRPrefs.nib/keyedobjects.nib
Binary file Resources/en.lproj/OTRPrefs.nib/keyedobjects.nib has changed
diff -r d7fe2ee7d9b1 -r ed57eaa7f328 Source/ESOTRPreferences.m
--- a/Source/ESOTRPreferences.m Tue Mar 16 22:14:34 2010 -0400
+++ b/Source/ESOTRPreferences.m Sun Mar 21 00:06:56 2010 -0400
@@ -194,8 +194,10 @@
fingerprint_buf, accountname, protocol);
if (fingerprint) {
+ [button_generate setTitle:AILocalizedString(@"Regenerate", nil)];
fingerprintString = [NSString stringWithFormat:AILocalizedString(@"Fingerprint: %.80s",nil), fingerprint];
} else {
+ [button_generate setTitle:AILocalizedString(@"Generate", nil)];
fingerprintString = AILocalizedString(@"No private key present", "Message to show in the Encryption OTR preferences when an account is selected which does not have a private key");
}
}
More information about the commits
mailing list