diff --git a/Mac/English.lproj/NewMessageWindow.xib b/Mac/English.lproj/NewMessageWindow.xib
index 54a6682..7c5ddb7 100644
--- a/Mac/English.lproj/NewMessageWindow.xib
+++ b/Mac/English.lproj/NewMessageWindow.xib
@@ -169,7 +169,7 @@
-
diff --git a/Mac/NewMessageWindow.m b/Mac/NewMessageWindow.m
index 31d095c..5ebfd73 100644
--- a/Mac/NewMessageWindow.m
+++ b/Mac/NewMessageWindow.m
@@ -226,7 +226,9 @@
{
BOOL retval = NO;
- if (commandSelector == @selector(insertNewline:)) {
+ BOOL isEnter = [[NSApp currentEvent] keyCode] == 76;
+
+ if (commandSelector == @selector(insertNewline:) && !isEnter) {
NSText *text = [[textField window] fieldEditor:YES forObject:nil];
@@ -242,7 +244,7 @@
retval = YES; // causes Apple to NOT fire the default enter action
}
- else if (commandSelector == @selector(noop:)) {
+ else if (commandSelector == @selector(noop:) || isEnter) {
retval = YES;
[self sendPost:control];
}
diff --git a/Mac/TB_SendTemplate.png b/Mac/TB_SendTemplate.png
new file mode 100644
index 0000000..b2602fe
Binary files /dev/null and b/Mac/TB_SendTemplate.png differ
diff --git a/Mac/Tentia.xcodeproj/project.pbxproj b/Mac/Tentia.xcodeproj/project.pbxproj
index 418c8db..9aba9db 100644
--- a/Mac/Tentia.xcodeproj/project.pbxproj
+++ b/Mac/Tentia.xcodeproj/project.pbxproj
@@ -10,6 +10,8 @@
1DDD582C0DA1D0D100B32029 /* NewMessageWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58280DA1D0D100B32029 /* NewMessageWindow.xib */; };
1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */; };
1F122D49118E1DE100E83B77 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1F122D48118E1DE100E83B77 /* Icon.icns */; };
+ 1F132C791666CD9700E4E661 /* TB_SendTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F132C781666CD9700E4E661 /* TB_SendTemplate.png */; };
+ 1F132C7B1666CF6E00E4E661 /* send2.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F132C7A1666CF6E00E4E661 /* send2.png */; };
1F1990C6117BCA960049BEA7 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F1990C5117BCA960049BEA7 /* ApplicationServices.framework */; };
1F1C80F916482A250010B409 /* WebKit in Resources */ = {isa = PBXBuildFile; fileRef = 1F1C80F816482A250010B409 /* WebKit */; };
1F2D79BD165E8C6B000E8428 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F2D79BC165E8C6B000E8428 /* CoreLocation.framework */; };
@@ -20,7 +22,6 @@
1F77DB47118C5F1C007C7F1E /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F77DB46118C5F1C007C7F1E /* Constants.m */; };
1F880B6B165EE0F60022A84D /* NSData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F880B6A165EE0F60022A84D /* NSData+Base64.m */; };
1F880B6E165FE8890022A84D /* MimeType.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F880B6D165FE8890022A84D /* MimeType.m */; };
- 1F9C1B7B1666AE5700A185ED /* send.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F9C1B7A1666AE5700A185ED /* send.png */; };
1FA09847144602530079E258 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FA09846144602530079E258 /* libicucore.dylib */; };
1FC254A01427DFAD0035D84B /* AccessToken.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FC2549B1427D9930035D84B /* AccessToken.m */; };
1FDEF722164EFE9100F927F3 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FDEF721164EFE9100F927F3 /* Growl.framework */; };
@@ -60,6 +61,8 @@
1DDD58290DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NewMessageWindow.xib; sourceTree = ""; };
1DDD582B0DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; };
1F122D48118E1DE100E83B77 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = ""; };
+ 1F132C781666CD9700E4E661 /* TB_SendTemplate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = TB_SendTemplate.png; sourceTree = ""; };
+ 1F132C7A1666CF6E00E4E661 /* send2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = send2.png; sourceTree = ""; };
1F1990C5117BCA960049BEA7 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
1F1C80F816482A250010B409 /* WebKit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = WebKit; path = ../WebKit; sourceTree = ""; };
1F2D79BC165E8C6B000E8428 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = /System/Library/Frameworks/CoreLocation.framework; sourceTree = ""; };
@@ -74,7 +77,6 @@
1F880B6A165EE0F60022A84D /* NSData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Base64.m"; sourceTree = ""; };
1F880B6C165FE8890022A84D /* MimeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MimeType.h; sourceTree = ""; };
1F880B6D165FE8890022A84D /* MimeType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MimeType.m; sourceTree = ""; };
- 1F9C1B7A1666AE5700A185ED /* send.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = send.png; sourceTree = ""; };
1FA09846144602530079E258 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
1FC2549A1427D9930035D84B /* AccessToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = AccessToken.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
1FC2549B1427D9930035D84B /* AccessToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AccessToken.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
@@ -156,7 +158,6 @@
2A37F4AAFDCFA73011CA2CEA /* Twittia 2 */ = {
isa = PBXGroup;
children = (
- 1F9C1B7A1666AE5700A185ED /* send.png */,
1FA09846144602530079E258 /* libicucore.dylib */,
2A37F4ABFDCFA73011CA2CEA /* Classes */,
2A37F4AFFDCFA73011CA2CEA /* Other Sources */,
@@ -204,7 +205,9 @@
children = (
1F1C80F816482A250010B409 /* WebKit */,
1F122D48118E1DE100E83B77 /* Icon.icns */,
+ 1F132C7A1666CF6E00E4E661 /* send2.png */,
1F3F129D164F202000C7C983 /* dsa_pub.pem */,
+ 1F132C781666CD9700E4E661 /* TB_SendTemplate.png */,
2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */,
8D15AC360486D014006FF6A4 /* Tentia-Info.plist */,
089C165FFE840EACC02AAC07 /* InfoPlist.strings */,
@@ -278,7 +281,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 1F9C1B7B1666AE5700A185ED /* send.png in Resources */,
+ 1F132C7B1666CF6E00E4E661 /* send2.png in Resources */,
1F3F129E164F202000C7C983 /* dsa_pub.pem in Resources */,
1FDEF726164F094600F927F3 /* Growl Registration Ticket.growlRegDict in Resources */,
8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */,
@@ -287,6 +290,7 @@
1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */,
1F122D49118E1DE100E83B77 /* Icon.icns in Resources */,
1F1C80F916482A250010B409 /* WebKit in Resources */,
+ 1F132C791666CD9700E4E661 /* TB_SendTemplate.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/Mac/publish/Appcast.xml b/Mac/publish/Appcast.xml
index 42cced1..66e7ea1 100755
--- a/Mac/publish/Appcast.xml
+++ b/Mac/publish/Appcast.xml
@@ -6,15 +6,15 @@
Most recent changes with links to updates.
en
-
- Version 0.4.2
+ Version 0.5.0
10.5.0
http://jabs.nu/Tentia/download/ReleaseNotes.html
- Sun, 25 Nov 2012 22:20:22 +0100
+ Wed, 28 Nov 2012 22:52:59 +0100
+ sparkle:dsaSignature="MC0CFH2zsZdtjwqOfniJWcskUJcQbBViAhUAiBw2Djx5E23qvsz0pUr72aMKxWk=" />
diff --git a/Mac/send.png b/Mac/send.png
deleted file mode 100644
index 77b9151..0000000
Binary files a/Mac/send.png and /dev/null differ
diff --git a/WebKit/img/send.png b/WebKit/img/send.png
deleted file mode 100644
index 77b9151..0000000
Binary files a/WebKit/img/send.png and /dev/null differ