jeena/Bungloo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

fixed #151

Browse source
This commit is contained in:
Jeena Paradies 2013-02-17 11:41:30 +01:00
parent 9028d5a783
commit 9f6c9f9131
5 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mac/Controller.h
View file

@ -79,7 +79,6 @@
- (void)setSecret:(NSString *)string; - (void)setSecret:(NSString *)string;
- (NSString *)secret; - (NSString *)secret;
- (NSString *)stringForKey:(NSString *)aKey; - (NSString *)stringForKey:(NSString *)aKey;
- (void)storeAccessToken:(NSString *)accessToken secret:(NSString *)secret userId:(NSString *)userId andScreenName:(NSString *)screenName;
- (void)loggedIn; - (void)loggedIn;
- (IBAction)login:(id)sender; - (IBAction)login:(id)sender;

48
Mac/Controller.m
View file

@ -37,16 +37,16 @@
name:@"openNewMessageWindow" name:@"openNewMessageWindow"
object:nil]; object:nil];
[nc addObserver:self [nc addObserver:self
selector:@selector(sendTweet:) selector:@selector(sendPost:)
name:@"sendTweet" name:@"sendPost"
object:nil]; object:nil];
[nc addObserver:self [nc addObserver:self
selector:@selector(authentificationSucceded:) selector:@selector(authentificationSucceded:)
name:@"authentificationSucceded" name:@"authentificationSucceded"
object:nil]; object:nil];
[nc addObserver:self [nc addObserver:self
selector:@selector(getTweetUpdates:) selector:@selector(getPostUpdates:)
name:@"getTweetUpdates" name:@"getPostUpdates"
object:nil]; object:nil];
NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager]; NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
@ -165,40 +165,40 @@
- (void)initHotKeys - (void)initHotKeys
{ {
NSInteger newTweetKey = kVK_ANSI_M; // http://boredzo.org/blog/archives/2007-05-22/virtual-key-codes NSInteger newPostKey = kVK_ANSI_M; // http://boredzo.org/blog/archives/2007-05-22/virtual-key-codes
NSInteger newTweetModifierKey = controlKey + cmdKey + optionKey; // cmdKey 256, shitfKey 512, optionKey 2048, controlKey 4096 NSInteger newPostModifierKey = controlKey + cmdKey + optionKey; // cmdKey 256, shitfKey 512, optionKey 2048, controlKey 4096
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSInteger defaultsNewTweetKey = (NSInteger)[defaults integerForKey:@"newTweetKey"]; NSInteger defaultsNewPostKey = (NSInteger)[defaults integerForKey:@"newPostKey"];
if ([defaults objectForKey:@"newTweetKey"] != nil) if ([defaults objectForKey:@"newPostKey"] != nil)
{ {
newTweetKey = defaultsNewTweetKey; newPostKey = defaultsNewPostKey;
} }
else else
{ {
[defaults setInteger:newTweetKey forKey:@"newTweetKey"]; [defaults setInteger:newPostKey forKey:@"newPostKey"];
} }
NSInteger defaultsNewTweetModifierKey = (NSInteger)[defaults integerForKey:@"newTweetModifierKey"]; NSInteger defaultsNewPostModifierKey = (NSInteger)[defaults integerForKey:@"newPostModifierKey"];
if ([defaults objectForKey:@"newTweetModifierKey"] != nil) if ([defaults objectForKey:@"newPostModifierKey"] != nil)
{ {
newTweetModifierKey = defaultsNewTweetModifierKey; newPostModifierKey = defaultsNewPostModifierKey;
} }
else else
{ {
[defaults setInteger:newTweetModifierKey forKey:@"newTweetModifierKey"]; [defaults setInteger:newPostModifierKey forKey:@"newPostModifierKey"];
} }
[defaults synchronize]; [defaults synchronize];
NSUInteger cocoaModifiers = 0; NSUInteger cocoaModifiers = 0;
if (newTweetModifierKey & shiftKey) cocoaModifiers = cocoaModifiers | NSShiftKeyMask; if (newPostModifierKey & shiftKey) cocoaModifiers = cocoaModifiers | NSShiftKeyMask;
if (newTweetModifierKey & optionKey) cocoaModifiers = cocoaModifiers | NSAlternateKeyMask; if (newPostModifierKey & optionKey) cocoaModifiers = cocoaModifiers | NSAlternateKeyMask;
if (newTweetModifierKey & controlKey) cocoaModifiers = cocoaModifiers | NSControlKeyMask; if (newPostModifierKey & controlKey) cocoaModifiers = cocoaModifiers | NSControlKeyMask;
if (newTweetModifierKey & cmdKey) cocoaModifiers = cocoaModifiers | NSCommandKeyMask; if (newPostModifierKey & cmdKey) cocoaModifiers = cocoaModifiers | NSCommandKeyMask;
[globalHotkeyMenuItem setKeyEquivalent:[Constants stringFromVirtualKeyCode:newTweetKey]]; [globalHotkeyMenuItem setKeyEquivalent:[Constants stringFromVirtualKeyCode:newPostKey]];
[globalHotkeyMenuItem setKeyEquivalentModifierMask:cocoaModifiers]; [globalHotkeyMenuItem setKeyEquivalentModifierMask:cocoaModifiers];
/* CARBON from http://github.com/Xjs/drama-button/blob/carbon/Drama_ButtonAppDelegate.m */ /* CARBON from http://github.com/Xjs/drama-button/blob/carbon/Drama_ButtonAppDelegate.m */
@ -214,7 +214,7 @@
EventHotKeyRef g_HotKeyRef; EventHotKeyRef g_HotKeyRef;
RegisterEventHotKey(newTweetKey, newTweetModifierKey, g_HotKeyID, GetApplicationEventTarget(), 0, &g_HotKeyRef); RegisterEventHotKey(newPostKey, newPostModifierKey, g_HotKeyID, GetApplicationEventTarget(), 0, &g_HotKeyRef);
/* end CARBON */ /* end CARBON */
} }
@ -309,8 +309,8 @@
} }
else else
{ {
NewMessageWindow *newTweet = (NewMessageWindow *)[[NSDocumentController sharedDocumentController] openUntitledDocumentAndDisplay:YES error:nil]; NewMessageWindow *newPost = (NewMessageWindow *)[[NSDocumentController sharedDocumentController] openUntitledDocumentAndDisplay:YES error:nil];
[newTweet withString:aString]; [newPost withString:aString];
} }
} }
@ -320,7 +320,7 @@
[self openNewMessageWindowWithString:[text stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; [self openNewMessageWindowWithString:[text stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
} }
- (IBAction)sendTweet:(id)sender - (IBAction)sendPost:(id)sender
{ {
PostModel *post = (PostModel *)[sender object]; PostModel *post = (PostModel *)[sender object];
NSString *text = [[post.text stringByReplacingOccurrencesOfString:@"\\" withString:@"\\\\"] stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""]; NSString *text = [[post.text stringByReplacingOccurrencesOfString:@"\\" withString:@"\\\\"] stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
@ -477,7 +477,7 @@
} }
} }
- (void)getTweetUpdates:(id)sender - (void)getPostUpdates:(id)sender
{ {
[timelineView stringByEvaluatingJavaScriptFromString:@"bungloo_instance.getNewData(true)"]; [timelineView stringByEvaluatingJavaScriptFromString:@"bungloo_instance.getNewData(true)"];
[mentionsView stringByEvaluatingJavaScriptFromString:@"bungloo_instance.getNewData(true)"]; [mentionsView stringByEvaluatingJavaScriptFromString:@"bungloo_instance.getNewData(true)"];

4
Mac/NewMessageWindow.m
View file

@ -1,5 +1,5 @@
// //
// NewTweetWindow.m // NewPostWindow.m
// bungloo // bungloo
// //
// Created by Jeena on 16.04.10. // Created by Jeena on 16.04.10.
@ -234,7 +234,7 @@
post.location = self.currentLocation; post.location = self.currentLocation;
post.imageFilePath = self.imageFilePath; post.imageFilePath = self.imageFilePath;
post.isPrivate = self.togglePrivateButton.image == [NSImage imageNamed:NSImageNameLockLockedTemplate]; post.isPrivate = self.togglePrivateButton.image == [NSImage imageNamed:NSImageNameLockLockedTemplate];
[[NSNotificationCenter defaultCenter] postNotificationName:@"sendTweet" object:post]; [[NSNotificationCenter defaultCenter] postNotificationName:@"sendPost" object:post];
[self close]; [self close];
} else { } else {
NSBeep(); NSBeep();

2
Mac/PostModel.h
View file

@ -1,5 +1,5 @@
// //
// TweetModel.h // PostModel.h
// bungloo // bungloo
// //
// Created by Jeena on 10.01.11. // Created by Jeena on 10.01.11.

2
Mac/PostModel.m
View file

@ -1,5 +1,5 @@
// //
// TweetModel.m // PostModel.m
// bungloo // bungloo
// //
// Created by Jeena on 10.01.11. // Created by Jeena on 10.01.11.