adium 5290:e067b2e6db29: Add the ability to use shift+enter like...
commits at adium.im
commits at adium.im
Mon Feb 4 17:36:12 UTC 2013
details: http://hg.adium.im/adium/rev/e067b2e6db29
revision: 5290:e067b2e6db29
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Mon Feb 04 00:35:50 2013 -0500
Add the ability to use shift+enter like option+enter. Fixes #16285 with help from Detmud.
Subject: adium 5291:f5fcae0bb8ce: Fix a few more declarations to match their parents.
details: http://hg.adium.im/adium/rev/f5fcae0bb8ce
revision: 5291:f5fcae0bb8ce
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Mon Jan 21 23:05:46 2013 -0500
Fix a few more declarations to match their parents.
Subject: adium 5292:6242de120f00: int->NSInteger for some sheetDidEnd methods.
details: http://hg.adium.im/adium/rev/6242de120f00
revision: 5292:6242de120f00
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Mon Jan 21 21:15:28 2013 -0500
int->NSInteger for some sheetDidEnd methods.
Subject: adium 5293:819cf9fc69b0: Add the ability to use shift+enter like option+enter. Fixes #16285 with help from Detmud.
details: http://hg.adium.im/adium/rev/819cf9fc69b0
revision: 5293:819cf9fc69b0
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Mon Feb 04 00:35:50 2013 -0500
Add the ability to use shift+enter like option+enter. Fixes #16285 with help from Detmud.
(transplanted from e067b2e6db29c1e0879b49834d14bde5a56fcb44)
Subject: adium 5294:ad75d7f54bdc: merge adium-1.6 into default
details: http://hg.adium.im/adium/rev/ad75d7f54bdc
revision: 5294:ad75d7f54bdc
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Mon Feb 04 12:35:14 2013 -0500
merge adium-1.6 into default
diffs (121 lines):
diff -r 793e8f6efb3a -r ad75d7f54bdc Frameworks/Adium Framework/Source/AIEditStateWindowController.m
--- a/Frameworks/Adium Framework/Source/AIEditStateWindowController.m Tue Jan 29 01:19:28 2013 +0100
+++ b/Frameworks/Adium Framework/Source/AIEditStateWindowController.m Mon Feb 04 12:35:14 2013 -0500
@@ -37,7 +37,7 @@
- (void)setAccount:(AIAccount *)inAccount;
- (void)configureForAccountAndWorkingStatusState;
-- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
- (void)notifyOfStateChange;
@end
@@ -253,7 +253,7 @@
/*!
* Invoked as the sheet closes, dismiss the sheet
*/
-- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
{
//Stop tracking with the controllerDict
NSNumber *targetHash = [NSNumber numberWithUnsignedInteger:[target hash]];
diff -r 793e8f6efb3a -r ad75d7f54bdc Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Tue Jan 29 01:19:28 2013 +0100
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Mon Feb 04 12:35:14 2013 -0500
@@ -301,6 +301,14 @@
[super keyDown:inEvent];
}
+ } else if (inChar == NSEnterCharacter || inChar == NSCarriageReturnCharacter) {
+ //Make shift+enter work the same as option+enter
+ if (flags & NSShiftKeyMask) {
+ [super insertLineBreak:self];
+ } else {
+ [super keyDown:inEvent];
+ }
+
} else {
[super keyDown:inEvent];
}
diff -r 793e8f6efb3a -r ad75d7f54bdc Frameworks/Adium Framework/Source/CSNewContactAlertWindowController.m
--- a/Frameworks/Adium Framework/Source/CSNewContactAlertWindowController.m Tue Jan 29 01:19:28 2013 +0100
+++ b/Frameworks/Adium Framework/Source/CSNewContactAlertWindowController.m Mon Feb 04 12:35:14 2013 -0500
@@ -39,7 +39,7 @@
- (void)updateHeaderView;
-- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
- (void)alertDetailsForHeaderChanged:(NSNotification *)aNotification;
@end
@@ -153,7 +153,7 @@
}
// Called as the user list edit sheet closes, dismisses the sheet
-- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
{
[self cleanUpDetailsPane];
diff -r 793e8f6efb3a -r ad75d7f54bdc Frameworks/PSMTabBarControl.framework/Versions/A/PSMTabBarControl
Binary file Frameworks/PSMTabBarControl.framework/Versions/A/PSMTabBarControl has changed
diff -r 793e8f6efb3a -r ad75d7f54bdc Frameworks/PSMTabBarControl.framework/Versions/A/Resources/Info.plist
--- a/Frameworks/PSMTabBarControl.framework/Versions/A/Resources/Info.plist Tue Jan 29 01:19:28 2013 +0100
+++ b/Frameworks/PSMTabBarControl.framework/Versions/A/Resources/Info.plist Mon Feb 04 12:35:14 2013 -0500
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
- <string>12A269</string>
+ <string>12C60</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
@@ -23,16 +23,16 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
- <string>4G144l</string>
+ <string>4H127</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
- <string>12A264</string>
+ <string>12C37</string>
<key>DTSDKName</key>
<string>macosx10.8</string>
<key>DTXcode</key>
- <string>0450</string>
+ <string>0460</string>
<key>DTXcodeBuild</key>
- <string>4G144l</string>
+ <string>4H127</string>
</dict>
</plist>
diff -r 793e8f6efb3a -r ad75d7f54bdc Plugins/General Preferences/ESGeneralPreferences.m
--- a/Plugins/General Preferences/ESGeneralPreferences.m Tue Jan 29 01:19:28 2013 +0100
+++ b/Plugins/General Preferences/ESGeneralPreferences.m Mon Feb 04 12:35:14 2013 -0500
@@ -124,7 +124,7 @@
#endif
}
-- (BOOL)shortcutRecorder:(SRRecorderControl *)aRecorder isKeyCode:(signed short)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason
+- (BOOL)shortcutRecorder:(SRRecorderControl *)aRecorder isKeyCode:(NSInteger)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason
{
return NO;
}
diff -r 793e8f6efb3a -r ad75d7f54bdc Source/AIContactInfoWindowController.m
--- a/Source/AIContactInfoWindowController.m Tue Jan 29 01:19:28 2013 +0100
+++ b/Source/AIContactInfoWindowController.m Mon Feb 04 12:35:14 2013 -0500
@@ -58,8 +58,8 @@
@interface NSWindow (FakeLeopardAdditions)
- (void)setAutorecalculatesContentBorderThickness:(BOOL)autorecalculateContentBorderThickness forEdge:(NSRectEdge)edge;
-- (float)contentBorderThicknessForEdge:(NSRectEdge)edge;
-- (void)setContentBorderThickness:(float)borderThickness forEdge:(NSRectEdge)edge;
+- (CGFloat)contentBorderThicknessForEdge:(NSRectEdge)edge;
+- (void)setContentBorderThickness:(CGFloat)borderThickness forEdge:(NSRectEdge)edge;
@end
@implementation AIContactInfoWindowController
More information about the commits
mailing list