diff --git a/Mac/Bungloo-Info.plist b/Mac/Bungloo-Info.plist index 87a0d8c..6f11cbf 100644 --- a/Mac/Bungloo-Info.plist +++ b/Mac/Bungloo-Info.plist @@ -42,7 +42,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0.0 + 1.3.0 CFBundleSignature ???? CFBundleURLTypes @@ -57,7 +57,7 @@ CFBundleVersion - 2.0.0 + 1.3.0 LSApplicationCategoryType public.app-category.social-networking LSMinimumSystemVersion diff --git a/Mac/Controller.h b/Mac/Controller.h index b06e762..dab9b67 100644 --- a/Mac/Controller.h +++ b/Mac/Controller.h @@ -60,7 +60,15 @@ - (void)notificateUserAboutMention:(NSString *)text fromName:(NSString *)name withPostId:(NSString *)postId andEntity:(NSString *)entity; - (void)openURL:(NSString *)url; + +- (IBAction)showTimeline:(id)sender; +- (IBAction)showMentions:(id)sender; +- (IBAction)showConversation:(id)sender; - (IBAction)showProfile:(id)sender; +- (IBAction)showSearch:(id)sender; +- (IBAction)showAbout:(id)sender; + + - (void)notificateViewsAboutDeletedPostWithId:(NSString *)postId byEntity:(NSString*)entity; - (void)setString:(NSString *)string forKey:(NSString *)aKey; diff --git a/Mac/Controller.m b/Mac/Controller.m index 0cf5147..4a4c820 100644 --- a/Mac/Controller.m +++ b/Mac/Controller.m @@ -372,13 +372,42 @@ [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]]; } +- (IBAction)showTimeline:(id)sender +{ + [timelineView stringByEvaluatingJavaScriptFromString:@"bungloo.sidebar.onTimeline();"]; +} + +- (IBAction)showMentions:(id)sender +{ + [timelineView stringByEvaluatingJavaScriptFromString:@"bungloo.sidebar.onMentions();"]; +} + +- (IBAction)showConversation:(id)sender +{ + [timelineView stringByEvaluatingJavaScriptFromString:@"bungloo.sidebar.onConversation();"]; +} + - (IBAction)showProfile:(id)sender { - NSString *entity = [self.showProfileTextField stringValue]; - if ([entity rangeOfString:@"."].location != NSNotFound && ([entity hasPrefix:@"http://"] || [entity hasPrefix:@"https://"])) { - NSString *func = [NSString stringWithFormat:@"bungloo.sidebar.onEntityProfile(); bungloo.entityProfile.showProfileForEntity('%@')", entity]; - [timelineView stringByEvaluatingJavaScriptFromString:func]; - } + if ([sender isKindOfClass:[NSMenuItem class]]) { + [timelineView stringByEvaluatingJavaScriptFromString:@"bungloo.sidebar.onEntityProfile();"]; + } else { + NSString *entity = [self.showProfileTextField stringValue]; + if ([entity rangeOfString:@"."].location != NSNotFound && ([entity hasPrefix:@"http://"] || [entity hasPrefix:@"https://"])) { + NSString *func = [NSString stringWithFormat:@"bungloo.sidebar.onEntityProfile(); bungloo.entityProfile.showProfileForEntity('%@')", entity]; + [timelineView stringByEvaluatingJavaScriptFromString:func]; + } + } +} + +- (IBAction)showSearch:(id)sender +{ + [timelineView stringByEvaluatingJavaScriptFromString:@"bungloo.sidebar.onSearch();"]; +} + +- (IBAction)showAbout:(id)sender +{ + [self openURL:@"http://jabs.nu/bungloo"]; } - (void)notificateViewsAboutDeletedPostWithId:(NSString *)postId byEntity:(NSString*)entity diff --git a/Mac/English.lproj/MainMenu.xib b/Mac/English.lproj/MainMenu.xib index 5a0bacb..77f11a0 100644 --- a/Mac/English.lproj/MainMenu.xib +++ b/Mac/English.lproj/MainMenu.xib @@ -2,10 +2,10 @@ 1080 - 12C60 + 12D78 3084 - 1187.34 - 625.00 + 1187.37 + 626.00 YES @@ -686,19 +686,46 @@ View YES - + - Show Toolbar - t - 1572864 + Timeline + 1 + 1048576 2147483647 - + - Customize Toolbar… - + Mentions + 2 + 1048576 + 2147483647 + + + + + + Conversation + 3 + 1048576 + 2147483647 + + + + + + Profile + 4 + 1048576 + 2147483647 + + + + + + Search + 5 1048576 2147483647 @@ -746,34 +773,6 @@ - - - Timeline - 1 - 1048576 - 2147483647 - - - - - - Mentions - 2 - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - Bring All to Front @@ -798,11 +797,10 @@ Help YES - + - Bungloo - ? - 1048576 + About Bungloo + 2147483647 @@ -891,7 +889,7 @@ - {{0, 0}, {1920, 1178}} + {{0, 0}, {2560, 1418}} {10000000000000, 10000000000000} bungloo YES @@ -899,200 +897,6 @@ SUUpdater - - 15 - 2 - {{1077, 328}, {376, 581}} - 1685586944 - Mentions - NSWindow - - - - - 256 - - YES - - - 274 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple URL pasteboard type - Apple Web Archive pasteboard type - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - WebURLsWithTitlesPboardType - public.png - public.url - public.url-name - - - {376, 581} - - - - - - - 12 - - YES - - YES - 12WebKitJavaEnabled - 12WebKitJavaScriptCanOpenWindowsAutomatically - 12WebKitPluginsEnabled - - - YES - - - - - - - NO - YES - - - {376, 581} - - - - - {{0, 0}, {1920, 1178}} - {10000000000000, 10000000000000} - mentions - YES - - - 15 - 2 - {{1292, 328}, {376, 581}} - 1685586944 - Conversation - NSWindow - - - - - 256 - - YES - - - 274 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple URL pasteboard type - Apple Web Archive pasteboard type - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - WebURLsWithTitlesPboardType - public.png - public.url - public.url-name - - - {376, 581} - - - - - - - NO - YES - - - {376, 581} - - - - - {{0, 0}, {1920, 1178}} - {10000000000000, 10000000000000} - conversation - YES - - - 15 - 2 - {{1292, 328}, {376, 581}} - 1685586944 - Profile - NSWindow - - - - - 256 - - YES - - - 274 - - YES - - YES - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple URL pasteboard type - Apple Web Archive pasteboard type - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - WebURLsWithTitlesPboardType - public.png - public.url - public.url-name - - - {376, 581} - - - - - - - NO - YES - - - {376, 581} - - - - - {{0, 0}, {1920, 1178}} - {10000000000000, 10000000000000} - profile - YES - 7 2 @@ -1103,7 +907,7 @@ - + 256 YES @@ -1124,6 +928,7 @@ {{20, 20}, {146, 146}} + YES @@ -1146,6 +951,7 @@ 268 {{194, 82}, {266, 22}} + _NS:9 YES @@ -1192,6 +998,7 @@ 268 {{191, 112}, {163, 17}} + _NS:1535 YES @@ -1225,6 +1032,8 @@ 268 {{391, 46}, {75, 32}} + + _NS:9 YES @@ -1248,6 +1057,7 @@ 268 {{373, 55}, {16, 16}} + _NS:945 28938 @@ -1255,10 +1065,12 @@ {480, 186} + + _NS:20 - {{0, 0}, {1920, 1178}} + {{0, 0}, {2560, 1418}} {10000000000000, 10000000000000} preferences YES @@ -1276,7 +1088,7 @@ - + 256 YES @@ -1285,6 +1097,7 @@ 268 {{17, 79}, {192, 17}} + _NS:1535 YES @@ -1305,6 +1118,7 @@ 268 {{20, 49}, {333, 22}} + _NS:9 YES @@ -1327,6 +1141,8 @@ 268 {{285, 13}, {74, 32}} + + _NS:9 YES @@ -1347,10 +1163,12 @@ {373, 116} + + _NS:21 - {{0, 0}, {1920, 1178}} + {{0, 0}, {2560, 1418}} {10000000000000, 10000000000000} NO @@ -1534,22 +1352,6 @@ 357 - - - runToolbarCustomizationPalette: - - - - 365 - - - - toggleToolbarShown: - - - - 366 - hide: @@ -1670,14 +1472,6 @@ 471 - - - showHelp: - - - - 494 - newDocument: @@ -1718,14 +1512,6 @@ 553 - - - mentionsView - - - - 562 - timelineViewWindow @@ -1734,14 +1520,6 @@ 565 - - - mentionsViewWindow - - - - 566 - globalHotkeyMenuItem @@ -1782,22 +1560,6 @@ 622 - - - conversationView - - - - 632 - - - - conversationViewWindow - - - - 633 - loginEntityTextField @@ -1806,22 +1568,6 @@ 643 - - - profileView - - - - 662 - - - - profileViewWindow - - - - 663 - login: @@ -1864,11 +1610,51 @@ - makeKeyAndOrderFront: - - + showProfile: + + - 656 + 690 + + + + showTimeline: + + + + 691 + + + + showMentions: + + + + 692 + + + + showConversation: + + + + 693 + + + + showSearch: + + + + 694 + + + + showAbout: + + + + 696 @@ -1878,22 +1664,6 @@ 543 - - - delegate - - - - 569 - - - - makeKeyAndOrderFront: - - - - 655 - makeKeyAndOrderFront: @@ -1918,22 +1688,6 @@ 619 - - - delegate - - - - 631 - - - - delegate - - - - 661 - makeKeyAndOrderFront: @@ -2283,21 +2037,14 @@ YES - - + + + + + - - 297 - - - - - 298 - - - 211 @@ -2460,15 +2207,10 @@ YES - + - - 493 - - - 533 @@ -2509,30 +2251,6 @@ - - 559 - - - YES - - - - Mentions - - - 560 - - - YES - - - - - - 561 - - - 592 @@ -2641,30 +2359,6 @@ - - 628 - - - YES - - - - Conversation - - - 629 - - - YES - - - - - - 630 - - - 644 @@ -2681,10 +2375,7 @@ YES - - - @@ -2699,55 +2390,16 @@ - - 648 - - - 649 - - 653 - - - - - 654 - - - 657 - - 658 - - - YES - - - - Profile - - - 659 - - - YES - - - - - - 660 - - - 667 @@ -2815,6 +2467,36 @@ + + 684 + + + + + 685 + + + + + 686 + + + + + 687 + + + + + 688 + + + + + 695 + + + @@ -2863,8 +2545,6 @@ 29.IBPluginDependency 295.IBPluginDependency 296.IBPluginDependency - 297.IBPluginDependency - 298.IBPluginDependency 346.IBPluginDependency 348.IBPluginDependency 349.IBPluginDependency @@ -2886,7 +2566,6 @@ 470.IBPluginDependency 491.IBPluginDependency 492.IBPluginDependency - 493.IBPluginDependency 533.IBPluginDependency 535.IBPluginDependency 535.IBWindowTemplateEditedContentRect @@ -2895,12 +2574,7 @@ 537.IBPluginDependency 541.IBPluginDependency 542.IBPluginDependency - 559.IBPluginDependency - 559.IBWindowTemplateEditedContentRect - 559.NSWindowTemplate.visibleAtLaunch 56.IBPluginDependency - 560.IBPluginDependency - 561.IBPluginDependency 57.IBPluginDependency 58.IBPluginDependency 592.IBPluginDependency @@ -2919,25 +2593,12 @@ 610.IBPluginDependency 613.IBPluginDependency 620.IBPluginDependency - 628.IBPluginDependency - 628.IBWindowTemplateEditedContentRect - 628.NSWindowTemplate.visibleAtLaunch - 629.IBPluginDependency - 630.IBPluginDependency 644.IBPluginDependency 645.IBPluginDependency 646.IBPluginDependency 647.IBPluginDependency - 648.IBPluginDependency 649.IBPluginDependency - 653.IBPluginDependency - 654.IBPluginDependency 657.IBPluginDependency - 658.IBPluginDependency - 658.IBWindowTemplateEditedContentRect - 658.NSWindowTemplate.visibleAtLaunch - 659.IBPluginDependency - 660.IBPluginDependency 667.IBPluginDependency 668.IBPluginDependency 668.NSWindowTemplate.visibleAtLaunch @@ -2948,6 +2609,12 @@ 673.IBPluginDependency 674.IBPluginDependency 675.IBPluginDependency + 684.IBPluginDependency + 685.IBPluginDependency + 686.IBPluginDependency + 687.IBPluginDependency + 688.IBPluginDependency + 695.IBPluginDependency 72.IBPluginDependency 73.IBPluginDependency 79.IBPluginDependency @@ -3022,9 +2689,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin {{202, 175}, {397, 581}} com.apple.InterfaceBuilder.CocoaPlugin @@ -3032,11 +2696,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{344, 175}, {376, 581}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.WebKitIBPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3056,10 +2715,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{344, 175}, {376, 581}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.WebKitIBPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3067,15 +2722,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{344, 175}, {376, 581}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.WebKitIBPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3090,6 +2736,12 @@ 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 + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -3104,7 +2756,7 @@ - 682 + 696 @@ -3119,7 +2771,16 @@ clearCache: login: logout: + openNewMessageWindow: + sendPost: + showAbout: + showConversation: + showConversationForPostId:andEntity: + showMentions: showProfile: + showProfileForEntity: + showSearch: + showTimeline: YES @@ -3127,6 +2788,15 @@ id id id + id + id + id + NSString + id + id + NSString + id + id @@ -3136,7 +2806,16 @@ clearCache: login: logout: + openNewMessageWindow: + sendPost: + showAbout: + showConversation: + showConversationForPostId:andEntity: + showMentions: showProfile: + showProfileForEntity: + showSearch: + showTimeline: YES @@ -3152,28 +2831,58 @@ logout: id + + openNewMessageWindow: + id + + + sendPost: + id + + + showAbout: + id + + + showConversation: + id + + + showConversationForPostId:andEntity: + NSString + + + showMentions: + id + showProfile: id + + showProfileForEntity: + NSString + + + showSearch: + id + + + showTimeline: + id + YES YES - conversationView - conversationViewWindow globalHotkeyMenuItem loginActivityIndicator loginEntityTextField loginViewWindow logoLayer - mentionsView - mentionsViewWindow openProfileWindow - profileView - profileViewWindow showProfileTextField timelineView timelineViewWindow @@ -3181,18 +2890,12 @@ YES - WebView - NSWindow NSMenuItem NSProgressIndicator NSTextField NSWindow NSImageView - WebView - NSWindow NSPanel - WebView - NSWindow NSTextField WebView NSWindow @@ -3203,18 +2906,12 @@ YES YES - conversationView - conversationViewWindow globalHotkeyMenuItem loginActivityIndicator loginEntityTextField loginViewWindow logoLayer - mentionsView - mentionsViewWindow openProfileWindow - profileView - profileViewWindow showProfileTextField timelineView timelineViewWindow @@ -3222,14 +2919,6 @@ YES - - conversationView - WebView - - - conversationViewWindow - NSWindow - globalHotkeyMenuItem NSMenuItem @@ -3250,26 +2939,10 @@ logoLayer NSImageView - - mentionsView - WebView - - - mentionsViewWindow - NSWindow - openProfileWindow NSPanel - - profileView - WebView - - - profileViewWindow - NSWindow - showProfileTextField NSTextField diff --git a/Mac/publish/ReleaseNotes.html b/Mac/publish/ReleaseNotes.html index 6327a16..2c60095 100644 --- a/Mac/publish/ReleaseNotes.html +++ b/Mac/publish/ReleaseNotes.html @@ -13,6 +13,12 @@ +Bungloo 1.3.0 + +Changed to one window +Added search (skate.io) +Bugfixes + Bungloo 1.2.2 Fixed crash on Snow Leopard while opening new post window
Changed to one window
Added search (skate.io)
Bugfixes
Fixed crash on Snow Leopard while opening new post window