From 50e582bafcac46bc17068e0e6513d1208c7aa3ee Mon Sep 17 00:00:00 2001 From: Jeena Paradies Date: Wed, 28 Nov 2012 22:08:02 +0100 Subject: [PATCH] fixed repost link and added send post button --- Mac/English.lproj/NewMessageWindow.xib | 193 +++++++++++++++++++++++-- Mac/NewMessageWindow.h | 2 +- Mac/NewMessageWindow.m | 9 +- Mac/Tentia.xcodeproj/project.pbxproj | 4 + Mac/publish/ReleaseNotes.html | 7 + Mac/send.png | Bin 0 -> 226 bytes WebKit/img/send.png | Bin 0 -> 226 bytes WebKit/scripts/controller/Profile.js | 5 + WebKit/scripts/helper/Core.js | 4 + 9 files changed, 207 insertions(+), 17 deletions(-) create mode 100644 Mac/send.png create mode 100644 WebKit/img/send.png diff --git a/Mac/English.lproj/NewMessageWindow.xib b/Mac/English.lproj/NewMessageWindow.xib index a90811e..54a6682 100644 --- a/Mac/English.lproj/NewMessageWindow.xib +++ b/Mac/English.lproj/NewMessageWindow.xib @@ -96,9 +96,10 @@ 289 - {{257, 2}, {38, 17}} + {{215, 3}, {38, 17}} + YES 68157504 @@ -157,6 +158,38 @@ NO + + + 289 + {{258, 2}, {38, 16}} + + + _NS:9 + YES + + -2080374784 + 134217728 + + + LucidaGrande-Bold + 11 + 3357 + + _NS:9 + + -2033434624 + 268435623 + + NSImage + send + + + DQ + 400 + 75 + + NO + {299, 113} @@ -194,6 +227,84 @@ + + + 268 + {29, 15} + _NS:9 + YES + + 67108864 + 134217728 + + + _NS:9 + + -2030813184 + 39 + + 549650432 + {1, 1} + + YES + + YES + + + + TU0AKgAAAAoAAAAOAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA +AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAAQAA +ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABh3MABwAAB7gAAAC4 +AAAAAAAAB7hhcHBsAiAAAG1udHJHUkFZWFlaIAfQAAIADgAMAAAAAGFjc3BBUFBMAAAAAG5vbmUAAAAA +AAAAAAAAAAAAAAAAAAD21gABAAAAANMtYXBwbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAABWRlc2MAAADAAAAAb2RzY20AAAEwAAAGLGNwcnQAAAdcAAAAOHd0cHQAAAeU +AAAAFGtUUkMAAAeoAAAADmRlc2MAAAAAAAAAFUdlbmVyaWMgR3JheSBQcm9maWxlAAAAAAAAAAAAAAAV +R2VuZXJpYyBHcmF5IFByb2ZpbGUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAABtbHVjAAAAAAAAAB4AAAAMc2tTSwAAACoAAAF4aHJIUgAAADoAAAGiY2FFUwAAACwAAAHc +cHRCUgAAACoAAAIIdWtVQQAAACwAAAIyZnJGVQAAACoAAAJeemhUVwAAABAAAAKIaXRJVAAAAC4AAAKY +bmJOTwAAACwAAALGa29LUgAAABgAAALyY3NDWgAAACQAAAMKaGVJTAAAACAAAAMuZGVERQAAADoAAANO +aHVIVQAAAC4AAAOIc3ZTRQAAAC4AAAO2emhDTgAAABAAAAPkamFKUAAAABYAAAP0cm9STwAAACIAAAQK +ZWxHUgAAACQAAAQscHRQTwAAADgAAARQbmxOTAAAACoAAASIZXNFUwAAACgAAASydGhUSAAAACQAAATa +dHJUUgAAACIAAAT+ZmlGSQAAACwAAAUgcGxQTAAAADYAAAVMcnVSVQAAACYAAAWCYXJFRwAAACgAAAWo +ZW5VUwAAACgAAAXQZGFESwAAADQAAAX4AFYBYQBlAG8AYgBlAGMAbgD9ACAAcwBpAHYA/QAgAHAAcgBv +AGYAaQBsAEcAZQBuAGUAcgBpAQ0AawBpACAAcAByAG8AZgBpAGwAIABzAGkAdgBpAGgAIAB0AG8AbgBv +AHYAYQBQAGUAcgBmAGkAbAAgAGQAZQAgAGcAcgBpAHMAIABnAGUAbgDoAHIAaQBjAFAAZQByAGYAaQBs +ACAAQwBpAG4AegBhACAARwBlAG4A6QByAGkAYwBvBBcEMAQzBDAEOwRMBD0EOAQ5ACAEPwRABD4ERAQw +BDkEOwAgAEcAcgBhAHkAUAByAG8AZgBpAGwAIABnAOkAbgDpAHIAaQBxAHUAZQAgAGcAcgBpAHOQGnUo +cHCWjoJyX2ljz4/wAFAAcgBvAGYAaQBsAG8AIABnAHIAaQBnAGkAbwAgAGcAZQBuAGUAcgBpAGMAbwBH +AGUAbgBlAHIAaQBzAGsAIABnAHIA5QB0AG8AbgBlAHAAcgBvAGYAaQBsx3y8GAAgAEcAcgBhAHkAINUE +uFzTDMd8AE8AYgBlAGMAbgD9ACABYQBlAGQA/QAgAHAAcgBvAGYAaQBsBeQF6AXVBeQF2QXcACAARwBy +AGEAeQAgBdsF3AXcBdkAQQBsAGwAZwBlAG0AZQBpAG4AZQBzACAARwByAGEAdQBzAHQAdQBmAGUAbgAt +AFAAcgBvAGYAaQBsAMEAbAB0AGEAbADhAG4AbwBzACAAcwB6APwAcgBrAGUAIABwAHIAbwBmAGkAbABH +AGUAbgBlAHIAaQBzAGsAIABnAHIA5QBzAGsAYQBsAGUAcAByAG8AZgBpAGxmbpAacHBepmPPj/Blh072 +TgCCLDCwMOwwpDDXMO0w1TChMKQw6wBQAHIAbwBmAGkAbAAgAGcAcgBpACAAZwBlAG4AZQByAGkDkwO1 +A70DuQO6A8wAIAPAA8EDvwPGA68DuwAgA7MDugPBA7kAUABlAHIAZgBpAGwAIABnAGUAbgDpAHIAaQBj +AG8AIABkAGUAIABjAGkAbgB6AGUAbgB0AG8AcwBBAGwAZwBlAG0AZQBlAG4AIABnAHIAaQBqAHMAcABy +AG8AZgBpAGUAbABQAGUAcgBmAGkAbAAgAGcAcgBpAHMAIABnAGUAbgDpAHIAaQBjAG8OQg4bDiMORA4f +DiUOTA4qDjUOQA4XDjIOFw4xDkgOJw5EDhsARwBlAG4AZQBsACAARwByAGkAIABQAHIAbwBmAGkAbABp +AFkAbABlAGkAbgBlAG4AIABoAGEAcgBtAGEAYQBwAHIAbwBmAGkAaQBsAGkAVQBuAGkAdwBlAHIAcwBh +AGwAbgB5ACAAcAByAG8AZgBpAGwAIABzAHoAYQByAG8BWwBjAGkEHgQxBEkEOAQ5ACAEQQQ1BEAESwQ5 +ACAEPwRABD4ERAQ4BDsETAZFBkQGQQAgBioGOQYxBkoGQQAgAEcAcgBhAHkAIAYnBkQGOQYnBkUARwBl +AG4AZQByAGkAYwAgAEcAcgBhAHkAIABQAHIAbwBmAGkAbABlAEcAZQBuAGUAcgBlAGwAIABnAHIA5QB0 +AG8AbgBlAGIAZQBzAGsAcgBpAHYAZQBsAHMAZXRleHQAAAAAQ29weXJpZ2h0IDIwMDcgQXBwbGUgSW5j +LiwgYWxsIHJpZ2h0cyByZXNlcnZlZC4AWFlaIAAAAAAAAPNRAAEAAAABFsxjdXJ2AAAAAAAAAAEBzQAA +A + + + + + + 3 + MCAwAA + + + + + 200 + 25 + + NO + @@ -206,14 +317,6 @@ 18 - - - sendTweet: - - - - 100031 - textField @@ -262,6 +365,22 @@ 100054 + + + sendPost: + + + + 100068 + + + + sendPostButtonPressed: + + + + 100070 + delegate @@ -318,8 +437,9 @@ YES - + + @@ -385,6 +505,34 @@ + + 100059 + + + YES + + + + + + 100060 + + + + + 100065 + + + YES + + + + + + 100066 + + + @@ -402,6 +550,10 @@ 100040.IBPluginDependency 100041.IBPluginDependency 100043.IBPluginDependency + 100059.IBPluginDependency + 100060.IBPluginDependency + 100065.IBPluginDependency + 100066.IBPluginDependency 5.IBPluginDependency 5.IBWindowTemplateEditedContentRect 6.IBPluginDependency @@ -420,6 +572,10 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{127, 736}, {299, 113}} com.apple.InterfaceBuilder.CocoaPlugin @@ -436,7 +592,7 @@ - 100056 + 100070 @@ -451,7 +607,8 @@ addCurrentLocation: addImage: openAddMenu: - sendTweet: + sendPost: + sendPostButtonPressed: YES @@ -459,6 +616,7 @@ id id NSControl + id @@ -468,7 +626,8 @@ addCurrentLocation: addImage: openAddMenu: - sendTweet: + sendPost: + sendPostButtonPressed: YES @@ -485,9 +644,13 @@ id - sendTweet: + sendPost: NSControl + + sendPostButtonPressed: + id + @@ -558,12 +721,14 @@ NSAddTemplate NSMenuCheckmark NSMenuMixedState + send YES {8, 8} {11, 11} {10, 3} + {11, 11} diff --git a/Mac/NewMessageWindow.h b/Mac/NewMessageWindow.h index 3c17540..624361d 100644 --- a/Mac/NewMessageWindow.h +++ b/Mac/NewMessageWindow.h @@ -33,7 +33,7 @@ @property (retain, nonatomic) CLLocation *currentLocation; @property (retain, nonatomic) NSString *imageFilePath; -- (IBAction)sendTweet:(NSControl *)control; +- (IBAction)sendPost:(NSControl *)control; - (void)inReplyTo:(NSString *)userName statusId:(NSString *)statusId withString:(NSString *)string; - (void)withString:(NSString *)aString; - (IBAction)addCurrentLocation:(id)sender; diff --git a/Mac/NewMessageWindow.m b/Mac/NewMessageWindow.m index 336adca..31d095c 100644 --- a/Mac/NewMessageWindow.m +++ b/Mac/NewMessageWindow.m @@ -192,9 +192,14 @@ [menuItem setTitle:@"Current location not available"]; } +- (IBAction)sendPostButtonPressed:(id)sender +{ + [self sendPost:self.textField]; +} + #pragma mark Keyboard delegate methods -- (IBAction)sendTweet:(NSControl *)control { +- (IBAction)sendPost:(NSControl *)control { if ([[control stringValue] length] <= MESSAGE_MAX_LENGTH) { PostModel *post = [[[PostModel alloc] init] autorelease]; post.text = [control stringValue]; @@ -239,7 +244,7 @@ } else if (commandSelector == @selector(noop:)) { retval = YES; - [self sendTweet:control]; + [self sendPost:control]; } return retval; diff --git a/Mac/Tentia.xcodeproj/project.pbxproj b/Mac/Tentia.xcodeproj/project.pbxproj index 7bd7286..418c8db 100644 --- a/Mac/Tentia.xcodeproj/project.pbxproj +++ b/Mac/Tentia.xcodeproj/project.pbxproj @@ -20,6 +20,7 @@ 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 */; }; @@ -73,6 +74,7 @@ 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; }; @@ -154,6 +156,7 @@ 2A37F4AAFDCFA73011CA2CEA /* Twittia 2 */ = { isa = PBXGroup; children = ( + 1F9C1B7A1666AE5700A185ED /* send.png */, 1FA09846144602530079E258 /* libicucore.dylib */, 2A37F4ABFDCFA73011CA2CEA /* Classes */, 2A37F4AFFDCFA73011CA2CEA /* Other Sources */, @@ -275,6 +278,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 1F9C1B7B1666AE5700A185ED /* send.png in Resources */, 1F3F129E164F202000C7C983 /* dsa_pub.pem in Resources */, 1FDEF726164F094600F927F3 /* Growl Registration Ticket.growlRegDict in Resources */, 8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */, diff --git a/Mac/publish/ReleaseNotes.html b/Mac/publish/ReleaseNotes.html index 07a7b8c..fcb50c7 100644 --- a/Mac/publish/ReleaseNotes.html +++ b/Mac/publish/ReleaseNotes.html @@ -14,6 +14,13 @@ +

Tentia 0.5.0

+

Added "Send" button to "New Post" window

+

Added Profile view

+

Added follow and unfollow possibility

+ +
+

Tentia 0.4.2

Removed Photo post type because the Tent protocol in version 0.1.0 does not quite support it yet

diff --git a/Mac/send.png b/Mac/send.png new file mode 100644 index 0000000000000000000000000000000000000000..77b9151a7cf7d2f0fe57ee95871a0c4735a053d4 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XT0C7GLn>}1B{(o=W@i4EEMQPe5?!RBwnTtM;-f|l#}W31 zibHE6H|sTs3MVTGs4$u897z4-s9?sBRHtI-x?y(XE{TbuOh5S?bQn_DoaQn!ar$_0 zNnCu()|JZ;#22uRS$LL;883f;6SF+SFLg$bv+R%D+?co=-?6dYW?R6^%D~9Ru;RI% VUHws^NT7QdJYD@<);T3K0RW5dK)nC} literal 0 HcmV?d00001 diff --git a/WebKit/img/send.png b/WebKit/img/send.png new file mode 100644 index 0000000000000000000000000000000000000000..77b9151a7cf7d2f0fe57ee95871a0c4735a053d4 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XT0C7GLn>}1B{(o=W@i4EEMQPe5?!RBwnTtM;-f|l#}W31 zibHE6H|sTs3MVTGs4$u897z4-s9?sBRHtI-x?y(XE{TbuOh5S?bQn_DoaQn!ar$_0 zNnCu()|JZ;#22uRS$LL;883f;6SF+SFLg$bv+R%D+?co=-?6dYW?R6^%D~9Ru;RI% VUHws^NT7QdJYD@<);T3K0RW5dK)nC} literal 0 HcmV?d00001 diff --git a/WebKit/scripts/controller/Profile.js b/WebKit/scripts/controller/Profile.js index 8c0d8e7..070f6d7 100644 --- a/WebKit/scripts/controller/Profile.js +++ b/WebKit/scripts/controller/Profile.js @@ -128,6 +128,7 @@ function(HostApp, Core, Paths, URI) { this.profile_template.gender.parentNode.style.display = "none"; this.profile_template.url.parentNode.parentNode.style.display = "none"; + this.profile_template.following_button.style.display = ""; this.setFollowingButton(false); this.body.innerHTML = ""; @@ -137,6 +138,10 @@ function(HostApp, Core, Paths, URI) { var _this = this; + if (HostApp.stringForKey("entity") == this.entity) { + this.profile_template.following_button.style.display = "none"; + } + Paths.findProfileURL(this.entity, function(profile_url) { if (profile_url) { diff --git a/WebKit/scripts/helper/Core.js b/WebKit/scripts/helper/Core.js index 47d21b9..d4b43ad 100644 --- a/WebKit/scripts/helper/Core.js +++ b/WebKit/scripts/helper/Core.js @@ -229,6 +229,10 @@ function(jQuery, Paths, URI, HostApp, Followings) { template.reposted_by.innerText = status.__repost.entity; template.reposted_by.title = status.__repost.entity; template.reposted_by.style.display = ''; + template.reposted_by.onclick = function(e) { + HostApp.showProfileForEntity(status.__repost.entity); + return false; + } if (this.followings.followings[status.__repost.entity]) {