@@ -115,11 +115,25 @@ class ApplicationController < OSX::NSObject #todo def updateMenuBarCount(notification = nil) - if GNPreferences.sharedInstance.showUnreadCount? && @mail_count && @mail_count > 0 - @status_item.setTitle(@mail_count) + msgCount = messageCount + if GNPreferences.sharedInstance.showUnreadCount? && msgCount > 0 + @status_item.setTitle(msgCount) else @status_item.setTitle('') end + + if msgCount > 0 + @status_item.setToolTip( + msgCount == 1 ? NSLocalizedString("Unread Message") % msgCount : + NSLocalizedString("Unread Messages") % msgCount + ) + @status_item.setImage(@mail_icon) + @status_item.setAlternateImage(@mail_alter_icon) + else + @status_item.setToolTip("") + @status_item.setImage(@app_icon) + @status_item.setAlternateImage(@app_alter_icon) + end end def accountAdded(notification) @@ -142,6 +156,14 @@ class ApplicationController < OSX::NSObject checker = checkerForGuid(notification.userInfo[:guid]) checker.cleanupAndQuit @checkers.delete(checker) + updateMenuBarCount + end + + def accountChecking(notification) + #account = accountForGuid(notification.userInfo[:guid]) + @status_item.setToolTip(NSLocalizedString("Checking Mail")) + @status_item.setImage(@check_icon) + @status_item.setAlternateImage(@check_alter_icon) end def updateAccountMenuItem(notification) @@ -153,11 +175,13 @@ class ApplicationController < OSX::NSObject end if account.enabled? + #todo messages msgItem = menuItem.submenu.addItemWithTitle_action_keyEquivalent_("Last checked: #{notification.userInfo[:checkedAt]}", nil, "") msgItem.enabled = false end + updateMenuBarCount return #todo #new messages @@ -249,6 +273,13 @@ class ApplicationController < OSX::NSObject GNAccountMenuUpdateNotification, nil ) + + center.addObserver_selector_name_object( + self, + "accountChecking", + GNCheckingAccountNotification, + nil + ) end def registerGrowl @@ -285,7 +316,7 @@ class ApplicationController < OSX::NSObject end def messageCount - @checkers.sum { |c| c.messageCount } + @checkers.inject(0) { |n, c| n + c.messageCount } end def setupMenu ApplicationController.rb @@ -11,6 +11,7 @@ GNAccountAddedNotification = "GNAccountAddedNotification" GNAccountRemovedNotification = "GNAccountRemovedNotification" GNAccountChangedNotification = "GNAccountChangedNotification" GNAccountMenuUpdateNotification = "GNAccountMenuUpdateNotification" +GNCheckingAccountNotification = "GNCheckingAccountNotification" PrefsToolbarItemAccounts = "prefsToolbarItemAccounts" Constants.rb @@ -61,9 +61,13 @@ class GNChecker < OSX::NSObject fn = @pipe.fileHandleForReading nc.addObserver_selector_name_object(self, 'checkResult', NSFileHandleReadToEndOfFileCompletionNotification, fn) + NSNotificationCenter.defaultCenter.postNotificationName_object_userInfo(GNCheckingAccountNotification, self, :guid => @account.guid) + @checker.launch fn.readToEndOfFileInBackgroundAndNotify + else + notifyMenuUpdate end end @@ -83,11 +87,11 @@ class GNChecker < OSX::NSObject ) ) #todo, cache result, send notification - notify(@account.username, "todo") should_notify = true + notifyMenuUpdate - if should_notify - NSNotificationCenter.defaultCenter.postNotificationName_object_userInfo(GNAccountMenuUpdateNotification, self, :guid => @account.guid, :checkedAt => checkedAt) + if should_notify && @account.growl + notify(@account.username, "todo") end if should_notify && @account.sound != GNSound::SOUND_NONE && sound = NSSound.soundNamed(@account.sound) sound.play @@ -98,6 +102,10 @@ class GNChecker < OSX::NSObject @checkedAt ? @checkedAt.strftime("%I:%M%p") : "NA" end + def notifyMenuUpdate + NSNotificationCenter.defaultCenter.postNotificationName_object_userInfo(GNAccountMenuUpdateNotification, self, :guid => @account.guid, :checkedAt => checkedAt) + end + def notify(title, desc) Growl::Notifier.sharedInstance.notify('new_messages', title, desc, :click_context => title) end GNChecker.rb 414ab3e538a849c546a44a51bbebb5ae068c5f59 James Chen ashchan@gmail.com http://github.com/ashchan/gmail-notifr/commit/26f836120175d6ff5ac2381233766ed2edc3943f 26f836120175d6ff5ac2381233766ed2edc3943f 2009-08-27T08:17:11-07:00 2009-08-27T08:17:11-07:00 menu bar icons status ba3a75d6d30ec8c8086b77a52d88a1b0824378bb James Chen ashchan@gmail.com