adium 5060:9a08589cf064: Remove the "Send with:" option and its ...
commits at adium.im
commits at adium.im
Wed Sep 12 22:02:36 UTC 2012
details: http://hg.adium.im/adium/rev/9a08589cf064
revision: 5060:9a08589cf064
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Wed Sep 12 17:50:43 2012 -0400
Remove the "Send with:" option and its related uses fixing #15369.
Subject: adium 5061:2831adf5eca9: Improve the messages preference pane's layout. Fixes #16110
details: http://hg.adium.im/adium/rev/2831adf5eca9
revision: 5061:2831adf5eca9
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Wed Sep 12 18:00:06 2012 -0400
Improve the messages preference pane's layout. Fixes #16110
diffs (truncated from 1459 to 1000 lines):
diff -r 46334a3081a9 -r 2831adf5eca9 Frameworks/AIUtilities Framework/Source/AISendingTextView.h
--- a/Frameworks/AIUtilities Framework/Source/AISendingTextView.h Tue Sep 11 21:28:03 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AISendingTextView.h Wed Sep 12 18:00:06 2012 -0400
@@ -32,9 +32,6 @@
SEL selector;
BOOL sendingEnabled;
- BOOL sendOnEnter;
- BOOL sendOnReturn;
-
BOOL nextIsReturn;
BOOL nextIsEnter;
BOOL optionPressedWithNext;
@@ -49,21 +46,6 @@
@property (readwrite, nonatomic) BOOL sendingEnabled;
/*!
- * @brief Whether Return triggers a send
- *
- * Set if Return triggers a send. If it does, the send will be performed instead of a newline being inserted.
- */
- at property (readwrite, nonatomic) BOOL sendOnReturn;
-
-/*!
- * @brief Whether Enter triggers a send
- *
- * Set if Enter triggers a send. If it does, the send will be performed instead of a newline being inserted.
- * @param inBool YES if Enter triggers a send.
- */
- at property (readwrite, nonatomic) BOOL sendOnEnter;
-
-/*!
* @brief Set the target and action to message when a send occurs
*
* When a send occurs, <b>inTarget</b> will be sent <b>inSelector</b>, which should take one argument which will be the sender.
diff -r 46334a3081a9 -r 2831adf5eca9 Frameworks/AIUtilities Framework/Source/AISendingTextView.m
--- a/Frameworks/AIUtilities Framework/Source/AISendingTextView.m Tue Sep 11 21:28:03 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AISendingTextView.m Wed Sep 12 18:00:06 2012 -0400
@@ -60,9 +60,7 @@
- (void)_initSendingTextView
{
returnArray = [[NSMutableArray alloc] init];
- sendOnReturn = YES;
nextIsReturn = NO;
- sendOnEnter = YES;
nextIsEnter = NO;
optionPressedWithNext = NO;
target = nil;
@@ -80,9 +78,6 @@
//If true we will invoke selector on target when a send key is pressed
@synthesize sendingEnabled;
- at synthesize sendOnReturn;
- at synthesize sendOnEnter;
-
- (void)setTarget:(id)inTarget action:(SEL)inSelector
{
target = inTarget;
@@ -114,8 +109,7 @@
theString = [aString string];
}
- if ((sendingEnabled) &&
- ((nextIsReturn && sendOnReturn) || (nextIsEnter && sendOnEnter)) &&
+ if ((sendingEnabled) && nextIsReturn &&
([theString hasSuffix:@"\n"] && !optionPressedWithNext)) {
//Make sure we insert any applicable text first
@@ -146,17 +140,10 @@
if ([theEvent type] == NSKeyDown) {
unichar lastChar = [[theEvent charactersIgnoringModifiers] lastCharacter];
- if (lastChar == NSCarriageReturnCharacter) {
- nextIsEnter = NO;
+ if (lastChar == NSCarriageReturnCharacter || lastChar == NSEnterCharacter) {
nextIsReturn = YES;
optionPressedWithNext = ([theEvent modifierFlags] & NSAlternateKeyMask) != 0;
-
- } else if (lastChar == NSEnterCharacter) {
- nextIsReturn = NO;
- nextIsEnter = YES;
-
- optionPressedWithNext = ([theEvent modifierFlags] & NSAlternateKeyMask) != 0;
}
}
diff -r 46334a3081a9 -r 2831adf5eca9 Frameworks/Adium Framework/Source/AIEditStateWindowController.m
--- a/Frameworks/Adium Framework/Source/AIEditStateWindowController.m Tue Sep 11 21:28:03 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIEditStateWindowController.m Wed Sep 12 18:00:06 2012 -0400
@@ -29,8 +29,6 @@
#define CONTROL_SPACING 8
#define WINDOW_HEIGHT_PADDING 30
-#define SEND_ON_ENTER @"Send On Enter"
-
@interface AIEditStateWindowController ()
- (id)initWithWindowNibName:(NSString *)windowNibName forType:(AIStatusType)inStatusType andAccount:(AIAccount *)inAccount customState:(AIStatus *)inStatusState notifyingTarget:(id)inTarget showSaveCheckbox:(BOOL)inShowSaveCheckbox;
- (id)_positionControl:(id)control relativeTo:(id)guide height:(CGFloat *)height;
@@ -181,10 +179,6 @@
- (void)windowDidLoad
{
// NSNumberFormatter *intFormatter;
- BOOL sendOnEnter;
-
- sendOnEnter = [[adium.preferenceController preferenceForKey:SEND_ON_ENTER
- group:PREF_GROUP_GENERAL] boolValue];
[scrollView_statusMessage setAutohidesScrollers:YES];
[scrollView_statusMessage setAlwaysDrawFocusRingIfFocused:YES];
@@ -193,9 +187,6 @@
[textView_statusMessage setAllowsDocumentBackgroundColorChange:YES];
[textView_autoReply setAllowsDocumentBackgroundColorChange:YES];
-
- [textView_statusMessage setSendOnReturn:NO];
- [textView_statusMessage setSendOnEnter:sendOnEnter];
if ([textView_statusMessage isKindOfClass:[AIMessageEntryTextView class]]) {
[(AIMessageEntryTextView *)textView_statusMessage setClearOnEscape:NO];
@@ -208,13 +199,6 @@
[textView_autoReply setTarget:self action:@selector(okay:)];
[textView_autoReply setDelegate:self];
- //Return inserts a new line
- [textView_autoReply setSendOnReturn:NO];
-
- /* Enter follows the user's preference. By default, then, enter will send the okay: selector.
- * If the user expects enter to insert a newline in a message, however, it will do that here, too. */
- [textView_autoReply setSendOnEnter:sendOnEnter];
-
if ([textView_autoReply isKindOfClass:[AIMessageEntryTextView class]]) {
[(AIMessageEntryTextView *)textView_autoReply setClearOnEscape:NO];
[(AIMessageEntryTextView *)textView_autoReply setPushPopEnabled:NO];
diff -r 46334a3081a9 -r 2831adf5eca9 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m Tue Sep 11 21:28:03 2012 +0200
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m Wed Sep 12 18:00:06 2012 -0400
@@ -731,10 +731,7 @@
- (void)preferencesChangedForGroup:(NSString *)group key:(NSString *)key object:(AIListObject *)object
preferenceDict:(NSDictionary *)prefDict firstTime:(BOOL)firstTime
{
- if ([group isEqualToString:PREF_GROUP_GENERAL]) {
- [textView_outgoing setSendOnReturn:[[prefDict objectForKey:SEND_ON_RETURN] boolValue]];
- [textView_outgoing setSendOnEnter:[[prefDict objectForKey:SEND_ON_ENTER] boolValue]];
- } else if ([group isEqualToString:PREF_GROUP_DUAL_WINDOW_INTERFACE]) {
+ if ([group isEqualToString:PREF_GROUP_DUAL_WINDOW_INTERFACE]) {
if (firstTime || [key isEqualToString:KEY_USER_LIST_ON_RIGHT]) {
userListOnRight = [[prefDict objectForKey:KEY_USER_LIST_ON_RIGHT] boolValue];
diff -r 46334a3081a9 -r 2831adf5eca9 Plugins/General Preferences/AIMessagePreferences.h
--- a/Plugins/General Preferences/AIMessagePreferences.h Tue Sep 11 21:28:03 2012 +0200
+++ b/Plugins/General Preferences/AIMessagePreferences.h Wed Sep 12 18:00:06 2012 -0400
@@ -17,13 +17,13 @@
#import "AIPreferencePane.h"
@interface AIMessagePreferences : AIPreferencePane {
- IBOutlet NSPopUpButton *popUp_sendKeys;
IBOutlet NSPopUpButton *popUp_tabKeys;
IBOutlet NSPopUpButton *popUp_tabPositionMenu;
IBOutlet AILocalizationTextField *label_messages;
+ IBOutlet AILocalizationTextField *label_chatRestore;
+ IBOutlet AILocalizationTextField *label_psychic;
IBOutlet AILocalizationTextField *label_tabs;
- IBOutlet AILocalizationTextField *label_sendWith;
IBOutlet AILocalizationTextField *label_showTabs;
IBOutlet AILocalizationTextField *label_switchTabs;
IBOutlet AILocalizationTextField *label_recentMessages;
diff -r 46334a3081a9 -r 2831adf5eca9 Plugins/General Preferences/AIMessagePreferences.m
--- a/Plugins/General Preferences/AIMessagePreferences.m Tue Sep 11 21:28:03 2012 +0200
+++ b/Plugins/General Preferences/AIMessagePreferences.m Wed Sep 12 18:00:06 2012 -0400
@@ -29,7 +29,6 @@
@interface AIMessagePreferences ()
- (NSMenu *)tabChangeKeysMenu;
-- (NSMenu *)sendKeysMenu;
- (NSMenu *)tabPositionMenu;
@end
@@ -65,28 +64,12 @@
//Configure the preference view
- (void)viewDidLoad
{
- BOOL sendOnEnter, sendOnReturn;
-
//Chat Cycling
[popUp_tabKeys setMenu:[self tabChangeKeysMenu]];
[popUp_tabKeys selectItemWithTag:[[adium.preferenceController preferenceForKey:KEY_TAB_SWITCH_KEYS
group:PREF_GROUP_CHAT_CYCLING] intValue]];
//General
- sendOnEnter = [[adium.preferenceController preferenceForKey:SEND_ON_ENTER
- group:PREF_GROUP_GENERAL] boolValue];
- sendOnReturn = [[adium.preferenceController preferenceForKey:SEND_ON_RETURN
- group:PREF_GROUP_GENERAL] boolValue];
- [popUp_sendKeys setMenu:[self sendKeysMenu]];
-
- if (sendOnEnter && sendOnReturn) {
- [popUp_sendKeys selectItemWithTag:AISendOnBoth];
- } else if (sendOnEnter) {
- [popUp_sendKeys selectItemWithTag:AISendOnEnter];
- } else if (sendOnReturn) {
- [popUp_sendKeys selectItemWithTag:AISendOnReturn];
- }
-
[popUp_tabPositionMenu setMenu:[self tabPositionMenu]];
[popUp_tabPositionMenu selectItemWithTag:[[adium.preferenceController preferenceForKey:KEY_TABBAR_POSITION
group:PREF_GROUP_DUAL_WINDOW_INTERFACE] intValue]];
@@ -96,9 +79,10 @@
- (void)localizePane
{
- [label_messages setLocalizedString:AILocalizedString(@"Messages:", nil)];
+ [label_messages setLocalizedString:AILocalizedString(@"Logging:", nil)];
+ [label_chatRestore setLocalizedString:AILocalizedString(@"Chat restore:", nil)];
+ [label_psychic setLocalizedString:AILocalizedString(@"Psychic mode:", nil)];
[label_recentMessages setLocalizedString:AILocalizedString(@" recent messages in new chats", nil)];
- [label_sendWith setLocalizedString:AILocalizedString(@"Send with:", nil)];
[label_showTabs setLocalizedString:AILocalizedString(@"Show tabs on the:", nil)];
[label_switchTabs setLocalizedString:AILocalizedString(@"Switch tabs with:", nil)];
[label_tabs setLocalizedString:AILocalizedString(@"Tabs:", nil)];
@@ -125,17 +109,6 @@
forKey:KEY_TAB_SWITCH_KEYS
group:PREF_GROUP_CHAT_CYCLING];
- } else if (sender == popUp_sendKeys) {
- AISendKeys keySelect = (AISendKeys)[[sender selectedItem] tag];
- BOOL sendOnEnter = (keySelect == AISendOnEnter || keySelect == AISendOnBoth);
- BOOL sendOnReturn = (keySelect == AISendOnReturn || keySelect == AISendOnBoth);
-
- [adium.preferenceController setPreference:[NSNumber numberWithInt:sendOnEnter]
- forKey:SEND_ON_ENTER
- group:PREF_GROUP_GENERAL];
- [adium.preferenceController setPreference:[NSNumber numberWithInt:sendOnReturn]
- forKey:SEND_ON_RETURN
- group:PREF_GROUP_GENERAL];
}
[self configureControlDimming];
@@ -205,31 +178,6 @@
return [menu autorelease];
}
-- (NSMenu *)sendKeysMenu
-{
- NSMenu *menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
-
- [menu addItemWithTitle:AILocalizedString(@"Enter","Enter key for sending messages")
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AISendOnEnter];
-
- [menu addItemWithTitle:AILocalizedString(@"Return","Return key for sending messages")
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AISendOnReturn];
-
- [menu addItemWithTitle:AILocalizedString(@"Enter and Return","Enter and return key for sending messages")
- target:nil
- action:nil
- keyEquivalent:@""
- tag:AISendOnBoth];
-
- return [menu autorelease];
-}
-
- (NSMenu *)tabPositionMenu
{
NSMenu *menu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
diff -r 46334a3081a9 -r 2831adf5eca9 Plugins/General Preferences/ESGeneralPreferencesPlugin.h
--- a/Plugins/General Preferences/ESGeneralPreferencesPlugin.h Tue Sep 11 21:28:03 2012 +0200
+++ b/Plugins/General Preferences/ESGeneralPreferencesPlugin.h Wed Sep 12 18:00:06 2012 -0400
@@ -26,18 +26,9 @@
AICtrlTab
} AITabKeys;
-typedef enum {
- AISendOnEnter = 0,
- AISendOnReturn,
- AISendOnBoth
-} AISendKeys;
-
#define PREF_GROUP_CHAT_CYCLING @"Chat Cycling"
#define KEY_TAB_SWITCH_KEYS @"Tab Switching Keys"
-#define SEND_ON_RETURN @"Send On Return"
-#define SEND_ON_ENTER @"Send On Enter"
-
#define PREF_GROUP_LOGGING @"Logging"
#define KEY_LOGGER_ENABLE @"Enable Logging"
diff -r 46334a3081a9 -r 2831adf5eca9 Resources/Preferences-Messages.xib
--- a/Resources/Preferences-Messages.xib Tue Sep 11 21:28:03 2012 +0200
+++ b/Resources/Preferences-Messages.xib Wed Sep 12 18:00:06 2012 -0400
@@ -2,28 +2,28 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11C74</string>
- <string key="IBDocument.InterfaceBuilderVersion">1938</string>
- <string key="IBDocument.AppKitVersion">1138.23</string>
- <string key="IBDocument.HIToolboxVersion">567.00</string>
+ <string key="IBDocument.SystemVersion">12A269</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2829</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">1938</string>
+ <string key="NS.object.0">2829</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
- <string>NSPopUpButton</string>
- <string>NSMenuItem</string>
- <string>NSMenu</string>
+ <string>NSBox</string>
+ <string>NSButton</string>
<string>NSButtonCell</string>
- <string>NSButton</string>
- <string>NSTextFieldCell</string>
- <string>NSBox</string>
<string>NSCustomObject</string>
<string>NSCustomView</string>
+ <string>NSMenu</string>
+ <string>NSMenuItem</string>
+ <string>NSPopUpButton</string>
<string>NSPopUpButtonCell</string>
+ <string>NSStepper</string>
<string>NSStepperCell</string>
<string>NSTextField</string>
- <string>NSStepper</string>
+ <string>NSTextFieldCell</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -49,13 +49,12 @@
<object class="NSButton" id="966140670">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{125, 193}, {310, 18}}</string>
+ <string key="NSFrame">{{125, 151}, {310, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="800595576"/>
+ <reference key="NSNextKeyView" ref="1028298734"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="11458043">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Open chats as soon as contacts begin typing</string>
<object class="NSFont" key="NSSupport" id="330646358">
@@ -64,7 +63,7 @@
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="966140670"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage" id="755868720">
<string key="NSClassName">NSImage</string>
@@ -78,22 +77,22 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="702014922">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{125, 115}, {152, 18}}</string>
+ <string key="NSFrame">{{143, 92}, {152, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="493178515"/>
+ <reference key="NSNextKeyView" ref="31316371"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="893107289">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Always show tab bar</string>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="702014922"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="755868720"/>
<reference key="NSAlternateImage" ref="544993524"/>
@@ -102,17 +101,17 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="251751613">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{140, 23}, {120, 17}}</string>
+ <string key="NSFrame">{{140, 20}, {120, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="896190114"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="438810461">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Switch tabs with:</string>
<reference key="NSSupport" ref="330646358"/>
@@ -136,21 +135,21 @@
</object>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSPopUpButton" id="896190114">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{262, 17}, {283, 26}}</string>
+ <string key="NSFrame">{{262, 14}, {283, 26}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="525401209">
- <int key="NSCellFlags">-2076049856</int>
+ <int key="NSCellFlags">-2076180416</int>
<int key="NSCellFlags2">1024</int>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="896190114"/>
- <int key="NSButtonFlags">109199615</int>
+ <int key="NSButtonFlags">109199360</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="330646358"/>
<string key="NSAlternateContents"/>
@@ -191,17 +190,17 @@
<bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">1</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="474272278">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{83, 116}, {39, 17}}</string>
+ <string key="NSFrame">{{83, 113}, {39, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="702014922"/>
+ <reference key="NSNextKeyView" ref="493178515"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="134816027">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Tabs:</string>
<reference key="NSSupport" ref="330646358"/>
@@ -209,22 +208,22 @@
<reference key="NSBackgroundColor" ref="1061840506"/>
<reference key="NSTextColor" ref="55909882"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="493178515">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{125, 95}, {345, 18}}</string>
+ <string key="NSFrame">{{125, 112}, {345, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="31316371"/>
+ <reference key="NSNextKeyView" ref="702014922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="803725628">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Create new chats in tabs</string>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="493178515"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="544993524"/>
<string key="NSAlternateContents"/>
@@ -232,22 +231,22 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="31316371">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{143, 75}, {328, 18}}</string>
+ <string key="NSFrame">{{143, 72}, {328, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="436683369"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="914197721">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Organize tabs into new windows by group</string>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="31316371"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="544993524"/>
<string key="NSAlternateContents"/>
@@ -255,21 +254,21 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSPopUpButton" id="1072315184">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{262, 45}, {147, 26}}</string>
+ <string key="NSFrame">{{262, 42}, {147, 26}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="251751613"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="579052032">
- <int key="NSCellFlags">-2076049856</int>
+ <int key="NSCellFlags">-2076180416</int>
<int key="NSCellFlags2">1024</int>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="1072315184"/>
- <int key="NSButtonFlags">109199615</int>
+ <int key="NSButtonFlags">109199360</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="330646358"/>
<string key="NSAlternateContents"/>
@@ -340,17 +339,17 @@
<bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">1</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="436683369">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{140, 51}, {120, 17}}</string>
+ <string key="NSFrame">{{140, 48}, {120, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1072315184"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="504886613">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Show tabs on the:</string>
<reference key="NSSupport" ref="330646358"/>
@@ -358,17 +357,17 @@
<reference key="NSBackgroundColor" ref="1061840506"/>
<reference key="NSTextColor" ref="55909882"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSBox" id="1028298734">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">12</int>
- <string key="NSFrame">{{20, 145}, {560, 5}}</string>
+ <string key="NSFrame">{{20, 142}, {560, 5}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="474272278"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="330646358"/>
@@ -391,39 +390,74 @@
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
</object>
+ <object class="NSTextField" id="424174386">
+ <reference key="NSNextResponder" ref="1005"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{17, 152}, {105, 17}}</string>
+ <reference key="NSSuperview" ref="1005"/>
+ <reference key="NSNextKeyView" ref="966140670"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="736437910">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">Psychic mode:</string>
+ <reference key="NSSupport" ref="330646358"/>
+ <reference key="NSControlView" ref="424174386"/>
+ <reference key="NSBackgroundColor" ref="1061840506"/>
+ <reference key="NSTextColor" ref="55909882"/>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="73179250">
+ <reference key="NSNextResponder" ref="1005"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{17, 177}, {105, 17}}</string>
+ <reference key="NSSuperview" ref="1005"/>
+ <reference key="NSNextKeyView" ref="424174386"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="295809193">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">Chat restore:</string>
+ <reference key="NSSupport" ref="330646358"/>
+ <reference key="NSControlView" ref="73179250"/>
+ <reference key="NSBackgroundColor" ref="1061840506"/>
+ <reference key="NSTextColor" ref="55909882"/>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
<object class="NSTextField" id="93850705">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{53, 324}, {69, 17}}</string>
+ <string key="NSFrame">{{53, 282}, {69, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="94930040"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="466779074">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Messages:</string>
+ <string key="NSContents">Logging:</string>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="93850705"/>
<reference key="NSBackgroundColor" ref="1061840506"/>
<reference key="NSTextColor" ref="55909882"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="94930040">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{125, 323}, {345, 18}}</string>
+ <string key="NSFrame">{{125, 281}, {345, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="22234491"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="306368818">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Log messages</string>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="94930040"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="544993524"/>
<string key="NSAlternateContents"/>
@@ -431,44 +465,44 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="764101859">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{326, 236}, {120, 32}}</string>
+ <string key="NSFrame">{{326, 194}, {120, 32}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="966140670"/>
+ <reference key="NSNextKeyView" ref="73179250"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="575914530">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Customize...</string>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="764101859"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <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="NSButton" id="257430477">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{143, 271}, {328, 18}}</string>
+ <string key="NSFrame">{{143, 229}, {328, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="132568016"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="371852032">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Log secure chats</string>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="257430477"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="544993524"/>
<string key="NSAlternateContents"/>
@@ -476,22 +510,22 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="132568016">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{143, 245}, {184, 18}}</string>
+ <string key="NSFrame">{{143, 203}, {184, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="63216188"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="212519112">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Log only certain accounts</string>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="132568016"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="544993524"/>
<string key="NSAlternateContents"/>
@@ -499,22 +533,22 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="22234491">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{143, 297}, {55, 18}}</string>
+ <string key="NSFrame">{{143, 255}, {55, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="729123067"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="245271170">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Show</string>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="22234491"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="544993524"/>
<string key="NSAlternateContents"/>
@@ -522,17 +556,17 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="729123067">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{204, 295}, {32, 22}}</string>
+ <string key="NSFrame">{{204, 253}, {32, 22}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1059056891"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="843726698">
- <int key="NSCellFlags">-1804468671</int>
+ <int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">138413056</int>
<string key="NSContents">5</string>
<reference key="NSSupport" ref="330646358"/>
@@ -546,17 +580,17 @@
<reference key="NSColor" ref="208219494"/>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSStepper" id="1059056891">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{236, 292}, {19, 28}}</string>
+ <string key="NSFrame">{{236, 250}, {19, 28}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="245946014"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="554142315">
- <int key="NSCellFlags">917024</int>
+ <int key="NSCellFlags">786464</int>
<int key="NSCellFlags2">0</int>
<reference key="NSControlView" ref="1059056891"/>
<double key="NSValue">10</double>
@@ -565,17 +599,17 @@
<bool key="NSValueWraps">YES</bool>
<bool key="NSAutorepeat">YES</bool>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="245946014">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{253, 298}, {197, 17}}</string>
+ <string key="NSFrame">{{253, 256}, {197, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="257430477"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="519072991">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">4194304</int>
<string key="NSContents"> recent messages in new chats</string>
<reference key="NSSupport" ref="330646358"/>
@@ -583,22 +617,22 @@
<reference key="NSBackgroundColor" ref="1061840506"/>
<reference key="NSTextColor" ref="55909882"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="63216188">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{125, 219}, {345, 18}}</string>
+ <string key="NSFrame">{{125, 177}, {345, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="764101859"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="556142231">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Reopen chats from last time on startup</string>
<reference key="NSSupport" ref="330646358"/>
<reference key="NSControlView" ref="63216188"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="544993524"/>
<string key="NSAlternateContents"/>
@@ -606,79 +640,11 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
- </object>
- <object class="NSTextField" id="800595576">
- <reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{125, 167}, {70, 17}}</string>
- <reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="512202911"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="826678739">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">4194304</int>
- <string key="NSContents">Send with:</string>
- <reference key="NSSupport" ref="330646358"/>
- <reference key="NSControlView" ref="800595576"/>
- <reference key="NSBackgroundColor" ref="1061840506"/>
- <reference key="NSTextColor" ref="55909882"/>
- </object>
- </object>
- <object class="NSPopUpButton" id="512202911">
- <reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{197, 161}, {206, 26}}</string>
- <reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1028298734"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="440319972">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">1024</int>
- <reference key="NSSupport" ref="330646358"/>
- <reference key="NSControlView" ref="512202911"/>
- <int key="NSButtonFlags">109199615</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="330646358"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="68977027">
- <reference key="NSMenu" ref="5563210"/>
- <string type="base64-UTF8" key="NSTitle">IA</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <reference key="NSOnImage" ref="771898366"/>
- <reference key="NSMixedImage" ref="1047312148"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">2</int>
- <reference key="NSTarget" ref="440319972"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="5563210">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="68977027"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
- <string key="NSFrameSize">{600, 359}</string>
+ <string key="NSFrameSize">{600, 317}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="93850705"/>
<string key="NSClassName">NSView</string>
</object>
@@ -687,14 +653,6 @@
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">popUp_sendKeys</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="512202911"/>
- </object>
- <int key="connectionID">137</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">popUp_tabKeys</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="896190114"/>
@@ -727,14 +685,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">label_sendWith</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="800595576"/>
- </object>
- <int key="connectionID">156</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="1005"/>
@@ -761,14 +711,6 @@
<object class="IBActionConnection" key="connection">
<string key="label">changePreference:</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="512202911"/>
- </object>
- <int key="connectionID">175</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">changePreference:</string>
- <reference key="source" ref="1001"/>
<reference key="destination" ref="896190114"/>
</object>
<int key="connectionID">177</int>
@@ -886,6 +828,22 @@
<int key="connectionID">199</int>
</object>
<object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">label_chatRestore</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="73179250"/>
+ </object>
More information about the commits
mailing list