[Fmenu-commits] SF.net SVN: fmenu: [83] English.lproj/MainMenu.nib
Brought to you by:
lensovet
Menu
▾
▴
[Fmenu-commits] SF.net SVN: fmenu: [83] English.lproj/MainMenu.nib
|
From: <len...@us...> - 2008-04-18 07:19:54
|
Revision: 83
http://fmenu.svn.sourceforge.net/fmenu/?rev=83&view=rev
Author: lensovet
Date: 2008-04-18 00:19:43 -0700 (Fri, 18 Apr 2008)
Log Message:
-----------
make Growl-click pref active on actual click, instead of notification creation; make connection timeouts pref-dependent; add manual update checking; new app icon
Modified Paths:
--------------
English.lproj/MainMenu.nib/classes.nib
English.lproj/MainMenu.nib/info.nib
English.lproj/MainMenu.nib/keyedobjects.nib
GNotifier.mm
UpdateMethods.mm
applicationIcon.icns
Modified: English.lproj/MainMenu.nib/classes.nib
===================================================================
--- English.lproj/MainMenu.nib/classes.nib 2008-03-18 02:04:54 UTC (rev 82)
+++ English.lproj/MainMenu.nib/classes.nib 2008-04-18 07:19:43 UTC (rev 83)
@@ -1,203 +1,106 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBClasses</key>
- <array>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key></key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>FirstResponder</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>calculateCount</key>
- <string>id</string>
- <key>fillsearch</key>
- <string>id</string>
- <key>forceUpdate</key>
- <string>id</string>
- <key>goToAccount</key>
- <string>id</string>
- <key>goToAllEvents</key>
- <string>id</string>
- <key>goToEvents</key>
- <string>id</string>
- <key>goToFriendProfile</key>
- <string>id</string>
- <key>goToFriends</key>
- <string>id</string>
- <key>goToGroups</key>
- <string>id</string>
- <key>goToGroupsAdmin</key>
- <string>id</string>
- <key>goToGroupsSecret</key>
- <string>id</string>
- <key>goToGroupsSponsored</key>
- <string>id</string>
- <key>goToGroupsUpdated</key>
- <string>id</string>
- <key>goToHome</key>
- <string>id</string>
- <key>goToMessages</key>
- <string>id</string>
- <key>goToMobile</key>
- <string>id</string>
- <key>goToNotes</key>
- <string>id</string>
- <key>goToNotesAbout</key>
- <string>id</string>
- <key>goToNotesOfFriends</key>
- <string>id</string>
- <key>goToPhotoAlbums</key>
- <string>id</string>
- <key>goToPhotos</key>
- <string>id</string>
- <key>goToPhotosAbout</key>
- <string>id</string>
- <key>goToPhotosOfFriends</key>
- <string>id</string>
- <key>goToPhotosRecentlyTagged</key>
- <string>id</string>
- <key>goToPokes</key>
- <string>id</string>
- <key>goToPrivacy</key>
- <string>id</string>
- <key>goToProfile</key>
- <string>id</string>
- <key>goToReqs</key>
- <string>id</string>
- <key>goToShares</key>
- <string>id</string>
- <key>goToSharesOfFriends</key>
- <string>id</string>
- <key>goToSharesPosted</key>
- <string>id</string>
- <key>goToSharesSent</key>
- <string>id</string>
- <key>goToWall</key>
- <string>id</string>
- <key>openConsole</key>
- <string>id</string>
- <key>openGrowl</key>
- <string>id</string>
- <key>quit</key>
- <string>id</string>
- <key>reset</key>
- <string>id</string>
- <key>setMenuImage</key>
- <string>id</string>
- <key>showAbout</key>
- <string>id</string>
- <key>showPreferences</key>
- <string>id</string>
- <key>showQL</key>
- <string>id</string>
- <key>showReadMe</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>Controller</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>aboutVersionTextField</key>
- <string>NSTextField</string>
- <key>aboutWindow</key>
- <string>NSWindow</string>
- <key>forceUpdateMenuItem</key>
- <string>NSMenuItem</string>
- <key>friendRequestsMenuItem</key>
- <string>NSMenuItem</string>
- <key>friendsMenuItem</key>
- <string>NSMenuItem</string>
- <key>friendsNotesMenuItem</key>
- <string>NSMenuItem</string>
- <key>groupsMenuItem</key>
- <string>NSMenuItem</string>
- <key>initialFocusItem</key>
- <string>NSView</string>
- <key>marketMenuItem</key>
- <string>NSMenuItem</string>
- <key>nameSearch</key>
- <string>NSComboBox</string>
- <key>notesMenuItem</key>
- <string>NSMenuItem</string>
- <key>openGrowl</key>
- <string>NSButton</string>
- <key>photoAlbumsMenuItem</key>
- <string>NSMenuItem</string>
- <key>photosMenuItem</key>
- <string>NSMenuItem</string>
- <key>preferencesWindow</key>
- <string>NSWindow</string>
- <key>prefsTabView</key>
- <string>NSTabView</string>
- <key>quickLaunchMenuItem</key>
- <string>NSMenuItem</string>
- <key>quickLaunchPanel</key>
- <string>NSPanel</string>
- <key>readMeView</key>
- <string>NSTextView</string>
- <key>readMeWindow</key>
- <string>NSWindow</string>
- <key>refreshInterval</key>
- <string>NSTextField</string>
- <key>resetMenuItem</key>
- <string>NSMenuItem</string>
- <key>sharesMenuItem</key>
- <string>NSMenuItem</string>
- <key>sharesUnreadMenuItem</key>
- <string>NSMenuItem</string>
- <key>statusItemMenu</key>
- <string>NSMenu</string>
- <key>timerExplanation</key>
- <string>NSTextField</string>
- <key>totalEventsMenuItem</key>
- <string>NSMenuItem</string>
- <key>totalMessagesMenuItem</key>
- <string>NSMenuItem</string>
- <key>totalPokesMenuItem</key>
- <string>NSMenuItem</string>
- <key>unreadMessagesMenuItem</key>
- <string>NSMenuItem</string>
- <key>unseenPokesMenuItem</key>
- <string>NSMenuItem</string>
- <key>upcomingEventsMenuItem</key>
- <string>NSMenuItem</string>
- <key>usersNameMenuItem</key>
- <string>NSMenuItem</string>
- <key>wallPostsMenuItem</key>
- <string>NSMenuItem</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>checkForUpdates</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>SUUpdater</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- </array>
- <key>IBVersion</key>
- <string>1</string>
-</dict>
-</plist>
+{
+ IBClasses = (
+ {
+ ACTIONS = {
+ calculateCount = id;
+ fillsearch = id;
+ forceUpdate = id;
+ goToAccount = id;
+ goToAllEvents = id;
+ goToEvents = id;
+ goToFriendProfile = id;
+ goToFriends = id;
+ goToGroups = id;
+ goToGroupsAdmin = id;
+ goToGroupsSecret = id;
+ goToGroupsSponsored = id;
+ goToGroupsUpdated = id;
+ goToHome = id;
+ goToMessages = id;
+ goToMobile = id;
+ goToNotes = id;
+ goToNotesAbout = id;
+ goToNotesOfFriends = id;
+ goToPhotoAlbums = id;
+ goToPhotos = id;
+ goToPhotosAbout = id;
+ goToPhotosOfFriends = id;
+ goToPhotosRecentlyTagged = id;
+ goToPokes = id;
+ goToPrivacy = id;
+ goToProfile = id;
+ goToReqs = id;
+ goToShares = id;
+ goToSharesOfFriends = id;
+ goToSharesPosted = id;
+ goToSharesSent = id;
+ goToWall = id;
+ openConsole = id;
+ openGrowl = id;
+ quit = id;
+ reset = id;
+ setMenuImage = id;
+ showAbout = id;
+ showPreferences = id;
+ showQL = id;
+ showReadMe = id;
+ };
+ CLASS = Controller;
+ LANGUAGE = ObjC;
+ OUTLETS = {
+ aboutVersionTextField = NSTextField;
+ aboutWindow = NSWindow;
+ forceUpdateMenuItem = NSMenuItem;
+ friendRequestsMenuItem = NSMenuItem;
+ friendsMenuItem = NSMenuItem;
+ friendsNotesMenuItem = NSMenuItem;
+ groupsMenuItem = NSMenuItem;
+ initialFocusItem = NSView;
+ marketMenuItem = NSMenuItem;
+ nameSearch = NSComboBox;
+ notesMenuItem = NSMenuItem;
+ openGrowl = NSButton;
+ photoAlbumsMenuItem = NSMenuItem;
+ photosMenuItem = NSMenuItem;
+ preferencesWindow = NSWindow;
+ prefsTabView = NSTabView;
+ quickLaunchMenuItem = NSMenuItem;
+ quickLaunchPanel = NSPanel;
+ readMeView = NSTextView;
+ readMeWindow = NSWindow;
+ refreshInterval = NSTextField;
+ resetMenuItem = NSMenuItem;
+ sharesMenuItem = NSMenuItem;
+ sharesUnreadMenuItem = NSMenuItem;
+ statusItemMenu = NSMenu;
+ timerExplanation = NSTextField;
+ totalEventsMenuItem = NSMenuItem;
+ totalMessagesMenuItem = NSMenuItem;
+ totalPokesMenuItem = NSMenuItem;
+ unreadMessagesMenuItem = NSMenuItem;
+ unseenPokesMenuItem = NSMenuItem;
+ upcomingEventsMenuItem = NSMenuItem;
+ usersNameMenuItem = NSMenuItem;
+ wallPostsMenuItem = NSMenuItem;
+ };
+ SUPERCLASS = NSObject;
+ },
+ {
+ ACTIONS = {
+ "" = id;
+ };
+ CLASS = FirstResponder;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
+ ACTIONS = {
+ checkForUpdates = id;
+ };
+ CLASS = SUUpdater;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ }
+ );
+ IBVersion = 1;
+}
\ No newline at end of file
Modified: English.lproj/MainMenu.nib/info.nib
===================================================================
--- English.lproj/MainMenu.nib/info.nib 2008-03-18 02:04:54 UTC (rev 82)
+++ English.lproj/MainMenu.nib/info.nib 2008-04-18 07:19:43 UTC (rev 83)
@@ -2,16 +2,20 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>IBDocumentLocation</key>
+ <string>114 175 356 240 0 0 1440 878 </string>
<key>IBFramework Version</key>
- <string>644</string>
+ <string>489.0</string>
<key>IBLastKnownRelativeProjectPath</key>
<string>../FMenu.xcodeproj</string>
+ <key>IBLockedTabItems</key>
+ <array>
+ <integer>522</integer>
+ </array>
<key>IBOldestOS</key>
<integer>3</integer>
- <key>IBOpenObjects</key>
- <array/>
<key>IBSystem Version</key>
- <string>9C31</string>
+ <string>9C7010</string>
<key>targetFramework</key>
<string>IBCocoaFramework</string>
</dict>
Modified: English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: GNotifier.mm
===================================================================
--- GNotifier.mm 2008-03-18 02:04:54 UTC (rev 82)
+++ GNotifier.mm 2008-04-18 07:19:43 UTC (rev 83)
@@ -51,7 +51,7 @@
NSString *description = @"";
int priority = 0;
BOOL sticky = NO;
- NSString *displayContext = [[NSUserDefaults standardUserDefaults] stringForKey:@"clickContextActive"];
+ //NSString *displayContext = [[NSUserDefaults standardUserDefaults] stringForKey:@"clickContextActive"];
NSString *targetURL = @"";
GenericID *tID = [GenericID createID:@""];
if ([nType isEqual:@"Status update"]) {
@@ -104,7 +104,7 @@
if ([targetURL isEqual:@""] && ![[tID ID] isEqual:@""]) {
targetURL = [tID launchURLString];
}
- NSDictionary *context = [NSDictionary dictionaryWithObjectsAndKeys: displayContext, @"displayContext", targetURL, @"targetURL", nil];
+ NSDictionary *context = [NSDictionary dictionaryWithObjectsAndKeys: targetURL, @"targetURL", nil];
[GrowlApplicationBridge notifyWithTitle:nType description:description notificationName:nType iconData:nil priority:priority isSticky:sticky clickContext:context];
}
}
@@ -112,7 +112,7 @@
- (void) growlNotificationWasClicked:(id)clickContext {
clickContext = (NSDictionary *) clickContext;
NSString *url = nil;
- if ([[clickContext valueForKey:@"displayContext"] boolValue]) {
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"clickContextActive"]) {
if ((url = [clickContext valueForKey:@"targetURL"])) {
if (![url isEqual:@""]) {
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]];
Modified: UpdateMethods.mm
===================================================================
--- UpdateMethods.mm 2008-03-18 02:04:54 UTC (rev 82)
+++ UpdateMethods.mm 2008-04-18 07:19:43 UTC (rev 83)
@@ -123,7 +123,7 @@
Downloader *profileDownloader = nil;
NSXMLDocument *profileDocument = nil;
@try {
- NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookUsersGetInfoURL:[NSArray arrayWithObject:[facebook uid]] fields:[NSArray arrayWithObject:@"name"]] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30];
+ NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookUsersGetInfoURL:[NSArray arrayWithObject:[facebook uid]] fields:[NSArray arrayWithObject:@"name"]] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:[[NSUserDefaults standardUserDefaults] integerForKey:@"updateTime"]*(noOfChecks-1)];
profileDownloader = [[Downloader alloc] initWithRequest:request];
if ([profileDownloader hasError] == NO) {
@@ -148,7 +148,7 @@
Downloader *notificationsDownloader = nil;
NSXMLDocument *notificationsDocument = nil;
@try {
- NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookNotificationsGetURL] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30];
+ NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookNotificationsGetURL] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:[[NSUserDefaults standardUserDefaults] integerForKey:@"updateTime"]*(noOfChecks-1)];
notificationsDownloader = [[Downloader alloc] initWithRequest:request];
if (notificationsDownloader != nil && [notificationsDownloader hasError] == NO) {
@@ -258,7 +258,7 @@
Downloader *wallDownloader = nil;
NSXMLDocument *wallDocument = nil;
@try {
- NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookUsersGetInfoURL:[NSArray arrayWithObject:[facebook uid]] fields:[NSArray arrayWithObject:@"wall_count"]] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30];
+ NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookUsersGetInfoURL:[NSArray arrayWithObject:[facebook uid]] fields:[NSArray arrayWithObject:@"wall_count"]] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:[[NSUserDefaults standardUserDefaults] integerForKey:@"updateTime"]*(noOfChecks-1)];
wallDownloader = [[Downloader alloc] initWithRequest:request];
if (wallDownloader != nil && [wallDownloader hasError] == NO) {
@@ -299,7 +299,7 @@
NSXMLDocument *eventsDocument = nil;
@try {
NSString *fqlQuery = [NSString stringWithFormat:@"select eid, name from event where eid in (select eid from event_member where uid = %@)", [facebook uid]];
- NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookFQLQueryURL:fqlQuery] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30];
+ NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookFQLQueryURL:fqlQuery] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:[[NSUserDefaults standardUserDefaults] integerForKey:@"updateTime"]*(noOfChecks-1)];
eventsDownloader = [[Downloader alloc] initWithRequest:request];
if (eventsDownloader != nil && [eventsDownloader hasError] == NO) {
@@ -329,7 +329,7 @@
NSXMLDocument *eventsDocument = nil;
@try {
NSString *fqlQuery = [NSString stringWithFormat:@"select eid, name from event where eid in (select eid from event_member where uid = %@ and rsvp_status=\"attending\") and start_time >= %i", [facebook uid], (int)[[NSDate date] timeIntervalSince1970]];
- NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookFQLQueryURL:fqlQuery] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30];
+ NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookFQLQueryURL:fqlQuery] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:[[NSUserDefaults standardUserDefaults] integerForKey:@"updateTime"]*(noOfChecks-1)];
eventsDownloader = [[Downloader alloc] initWithRequest:request];
if (eventsDownloader != nil && [eventsDownloader hasError] == NO) {
@@ -377,7 +377,7 @@
BOOL copyData = NO;
@try {
NSString *fqlQuery = [NSString stringWithFormat:@"select %@ from user where uid in (select uid2 from friend where uid1 = %@)", [fields componentsJoinedByString:@", "], [facebook uid]];
- NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookFQLQueryURL:fqlQuery] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30];
+ NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookFQLQueryURL:fqlQuery] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:[[NSUserDefaults standardUserDefaults] integerForKey:@"updateTime"]*(noOfChecks-1)];
friendsDownloader = [[Downloader alloc] initWithRequest:request];
if (friendsDownloader != nil && [friendsDownloader hasError] == NO) {
@@ -483,7 +483,7 @@
Downloader *photosDownloader = nil;
NSXMLDocument *photosDocument = nil;
@try {
- NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookPhotosGetCommentCountURL] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30];
+ NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookPhotosGetCommentCountURL] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:[[NSUserDefaults standardUserDefaults] integerForKey:@"updateTime"]*(noOfChecks-1)];
photosDownloader = [[Downloader alloc] initWithRequest:request];
if (photosDownloader != nil && [photosDownloader hasError] == NO) {
@@ -527,7 +527,7 @@
NSXMLDocument *groupsDocument = nil;
@try {
NSString *fqlQuery = [NSString stringWithFormat:@"select gid, name from group where gid in (select gid from group_member where uid = %@)", [facebook uid]];
- NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookFQLQueryURL:fqlQuery] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30];
+ NSURLRequest *request = [NSURLRequest requestWithURL:[facebook facebookFQLQueryURL:fqlQuery] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:[[NSUserDefaults standardUserDefaults] integerForKey:@"updateTime"]*(noOfChecks-1)];
groupsDownloader = [[Downloader alloc] initWithRequest:request];
if (groupsDownloader != nil && [groupsDownloader hasError] == NO) {
Modified: applicationIcon.icns
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|