Added a play count option to track info.

[MenuTunes.git] / PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index fa8d29d..76bbc23 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -1,5 +1,6 @@
 #import "PreferencesController.h"
 #import "MainController.h"
 #import "PreferencesController.h"
 #import "MainController.h"

+#import "MenuController.h"

 #import "NetworkController.h"
 #import "NetworkObject.h"
 #import "StatusWindow.h"
 #import "NetworkController.h"
 #import "NetworkObject.h"
 #import "StatusWindow.h"


@@ -9,8 +10,10 @@
 #import <netinet/in.h>
 #import <arpa/inet.h>
 #import <openssl/sha.h>
 #import <netinet/in.h>
 #import <arpa/inet.h>
 #import <openssl/sha.h>

+#import <sys/types.h>
+#import <sys/stat.h>

 
 

-#import <ITFoundation/ITFoundation.h>
+#import <ITFoundation/ITLoginItem.h>

 
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITKeyCombo.h>
 
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITKeyCombo.h>


@@ -45,7 +48,6 @@
 - (void)repopulateEffectPopupsForVerticalPosition:(ITVerticalWindowPosition)vPos horizontalPosition:(ITHorizontalWindowPosition)hPos;
 - (BOOL)effect:(Class)effectClass supportsVerticalPosition:(ITVerticalWindowPosition)vPos withHorizontalPosition:(ITHorizontalWindowPosition)hPos;
 - (IBAction)changeMenus:(id)sender;
 - (void)repopulateEffectPopupsForVerticalPosition:(ITVerticalWindowPosition)vPos horizontalPosition:(ITHorizontalWindowPosition)hPos;
 - (BOOL)effect:(Class)effectClass supportsVerticalPosition:(ITVerticalWindowPosition)vPos withHorizontalPosition:(ITHorizontalWindowPosition)hPos;
 - (IBAction)changeMenus:(id)sender;

-- (void)setLaunchesAtLogin:(BOOL)flag;

 @end
 
 
 @end
 
 


@@ -84,6 +86,8 @@ static PreferencesController *prefs = nil;
         hotKeysArray = [[NSArray alloc] initWithObjects:@"PlayPause",
                                                        @"NextTrack",
                                                        @"PrevTrack",
         hotKeysArray = [[NSArray alloc] initWithObjects:@"PlayPause",
                                                        @"NextTrack",
                                                        @"PrevTrack",

+                                                       @"FastForward",
+                                                       @"Rewind",

                                                        @"ShowPlayer",
                                                        @"TrackInfo",
                                                        @"UpcomingSongs",
                                                        @"ShowPlayer",
                                                        @"TrackInfo",
                                                        @"UpcomingSongs",


@@ -93,11 +97,14 @@ static PreferencesController *prefs = nil;
                                                        @"DecrementRating",
                                                        @"ToggleShuffle",
                                                        @"ToggleLoop",
                                                        @"DecrementRating",
                                                        @"ToggleShuffle",
                                                        @"ToggleLoop",

+                                                       @"PopupMenu",

                                                        nil];
         
         hotKeyNamesArray = [[NSArray alloc] initWithObjects:@"Play/Pause",
                                                        @"Next Track",
                                                        @"Previous Track",
                                                        nil];
         
         hotKeyNamesArray = [[NSArray alloc] initWithObjects:@"Play/Pause",
                                                        @"Next Track",
                                                        @"Previous Track",

+                                                       @"Fast Forward",
+                                                       @"Rewind",

                                                        @"Show Player",
                                                        @"Track Info",
                                                        @"Upcoming Songs",
                                                        @"Show Player",
                                                        @"Track Info",
                                                        @"Upcoming Songs",


@@ -107,6 +114,7 @@ static PreferencesController *prefs = nil;
                                                        @"Decrement Rating",
                                                        @"Toggle Shuffle",
                                                        @"Toggle Loop",
                                                        @"Decrement Rating",
                                                        @"Toggle Shuffle",
                                                        @"Toggle Loop",

+                                                       @"Pop-up status menu",

                                                        nil];
         hotKeysDictionary = [[NSMutableDictionary alloc] init];
         controller = nil;
                                                        nil];
         hotKeysDictionary = [[NSMutableDictionary alloc] init];
         controller = nil;


@@ -146,9 +154,11 @@ static PreferencesController *prefs = nil;
     [passwordPanelOKButton setTitle:@"Connect"];
     [passwordPanelTitle setStringValue:@"Password Required"];
     [passwordPanelMessage setStringValue:[NSString stringWithFormat:@"Please enter a password for access to the MenuTunes player named %@ at %@.", [[[NetworkController sharedController] networkObject] serverName], [[NetworkController sharedController] remoteHost]]];
     [passwordPanelOKButton setTitle:@"Connect"];
     [passwordPanelTitle setStringValue:@"Password Required"];
     [passwordPanelMessage setStringValue:[NSString stringWithFormat:@"Please enter a password for access to the MenuTunes player named %@ at %@.", [[[NetworkController sharedController] networkObject] serverName], [[NetworkController sharedController] remoteHost]]];

-    [passwordPanel center];

     [passwordPanel setLevel:NSStatusWindowLevel];
     [passwordPanel setLevel:NSStatusWindowLevel];

-    [passwordPanel makeKeyAndOrderFront:nil];
+    [NSApp activateIgnoringOtherApps:YES];
+    [passwordPanel center];
+    [passwordPanel orderFrontRegardless];
+    [passwordPanel makeKeyWindow];

     if ([NSApp runModalForWindow:passwordPanel]) {
         return YES;
     } else {
     if ([NSApp runModalForWindow:passwordPanel]) {
         return YES;
     } else {


@@ -162,9 +172,11 @@ static PreferencesController *prefs = nil;
     [passwordPanelOKButton setTitle:@"Retry"];
     [passwordPanelTitle setStringValue:@"Invalid Password"];
     [passwordPanelMessage setStringValue:[NSString stringWithFormat:@"The password entered for access to the MenuTunes player named %@ at %@ is invalid.  Please provide a new password.", [[[NetworkController sharedController] networkObject] serverName], [[NetworkController sharedController] remoteHost]]];
     [passwordPanelOKButton setTitle:@"Retry"];
     [passwordPanelTitle setStringValue:@"Invalid Password"];
     [passwordPanelMessage setStringValue:[NSString stringWithFormat:@"The password entered for access to the MenuTunes player named %@ at %@ is invalid.  Please provide a new password.", [[[NetworkController sharedController] networkObject] serverName], [[NetworkController sharedController] remoteHost]]];

-    [passwordPanel center];

     [passwordPanel setLevel:NSStatusWindowLevel];
     [passwordPanel setLevel:NSStatusWindowLevel];

-    [passwordPanel makeKeyAndOrderFront:nil];
+    [NSApp activateIgnoringOtherApps:YES];
+    [passwordPanel center];
+    [passwordPanel orderFrontRegardless];
+    [passwordPanel makeKeyWindow];

     if ([NSApp runModalForWindow:passwordPanel]) {
         return YES;
     } else {
     if ([NSApp runModalForWindow:passwordPanel]) {
         return YES;
     } else {


@@ -193,39 +205,55 @@ static PreferencesController *prefs = nil;
     }
 
     [self resetRemotePlayerTextFields];
     }
 
     [self resetRemotePlayerTextFields];

-    [window center];
+    [launchAtLoginCheckbox becomeFirstResponder];

     [NSApp activateIgnoringOtherApps:YES];
     [NSApp activateIgnoringOtherApps:YES];

-    [window performSelector:@selector(makeKeyAndOrderFront:) withObject:self afterDelay:0.0];
-}
-
-- (IBAction)showTestWindow:(id)sender
-{
-    [controller showTestWindow];
+    [window center];
+    [window orderFrontRegardless];
+    [window makeKeyWindow];

 }
 
 - (IBAction)changeGeneralSetting:(id)sender
 {
     ITDebugLog(@"Changing general setting of tag %i.", [sender tag]);
     if ( [sender tag] == 1010) {
 }
 
 - (IBAction)changeGeneralSetting:(id)sender
 {
     ITDebugLog(@"Changing general setting of tag %i.", [sender tag]);
     if ( [sender tag] == 1010) {

-        [self setLaunchesAtLogin:SENDER_STATE];
+        ITSetApplicationLaunchOnLogin([[NSBundle mainBundle] bundlePath], SENDER_STATE);

     } else if ( [sender tag] == 1020) {
         [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"];
     } else if ( [sender tag] == 1030) {
         [df setInteger:[sender intValue] forKey:@"SongsInAdvance"];
     } else if ( [sender tag] == 1020) {
         [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"];
     } else if ( [sender tag] == 1030) {
         [df setInteger:[sender intValue] forKey:@"SongsInAdvance"];

-
+        if ([[controller currentRemote] playerRunningState] == ITMTRemotePlayerRunning) {
+            [[controller menuController] performSelector:@selector(rebuildSubmenus) withObject:nil afterDelay:0];
+        }

     } else if ( [sender tag] == 1040) {
         // This will not be executed.  Song info always shows the title of the song.
         // [df setBool:SENDER_STATE forKey:@"showName"];
     } else if ( [sender tag] == 1050) {
         [df setBool:SENDER_STATE forKey:@"showArtist"];
     } else if ( [sender tag] == 1040) {
         // This will not be executed.  Song info always shows the title of the song.
         // [df setBool:SENDER_STATE forKey:@"showName"];
     } else if ( [sender tag] == 1050) {
         [df setBool:SENDER_STATE forKey:@"showArtist"];

+    } else if ( [sender tag] == 1055) {
+        [df setBool:SENDER_STATE forKey:@"showComposer"];

     } else if ( [sender tag] == 1060) {
         [df setBool:SENDER_STATE forKey:@"showAlbum"];
     } else if ( [sender tag] == 1070) {
         [df setBool:SENDER_STATE forKey:@"showTime"];
     } else if ( [sender tag] == 1080) {
         [df setBool:SENDER_STATE forKey:@"showTrackNumber"];
     } else if ( [sender tag] == 1060) {
         [df setBool:SENDER_STATE forKey:@"showAlbum"];
     } else if ( [sender tag] == 1070) {
         [df setBool:SENDER_STATE forKey:@"showTime"];
     } else if ( [sender tag] == 1080) {
         [df setBool:SENDER_STATE forKey:@"showTrackNumber"];

+    } else if ( [sender tag] == 1085) {
+        [df setBool:SENDER_STATE forKey:@"showPlayCount"];

     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];
     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];

+    } else if ( [sender tag] == 1100) {
+        [df setBool:SENDER_STATE forKey:@"showAlbumArtwork"];
+    } else if ( [sender tag] == 1110) {
+        [df setBool:SENDER_STATE forKey:@"runScripts"];
+        if (SENDER_STATE) {
+            [runScriptsCheckbox setState:NSOnState];
+            [showScriptsButton setEnabled:YES];
+        } else {
+            [showScriptsButton setEnabled:NO];
+        }
+    } else if ( [sender tag] == 1120) {
+        mkdir([[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] cString], 0744);
+        [[NSWorkspace sharedWorkspace] openFile:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];

     }
     [df synchronize];
 }
     }
     [df synchronize];
 }


@@ -427,10 +455,12 @@ static PreferencesController *prefs = nil;
     } else if ( [sender tag] == 2030) {
     
         [self setStatusWindowEntryEffect:[[sender selectedItem] representedObject]];
     } else if ( [sender tag] == 2030) {
     
         [self setStatusWindowEntryEffect:[[sender selectedItem] representedObject]];

+        [(MainController *)controller showCurrentTrackInfo];

         
     } else if ( [sender tag] == 2040) {
     
         [self setStatusWindowExitEffect:[[sender selectedItem] representedObject]];
         
     } else if ( [sender tag] == 2040) {
     
         [self setStatusWindowExitEffect:[[sender selectedItem] representedObject]];

+        [(MainController *)controller showCurrentTrackInfo];

         
     } else if ( [sender tag] == 2050) {
         float newTime = ( -([sender floatValue]) );
         
     } else if ( [sender tag] == 2050) {
         float newTime = ( -([sender floatValue]) );


@@ -464,9 +494,11 @@ static PreferencesController *prefs = nil;
         }
 
         [df setInteger:setting forKey:@"statusWindowBackgroundMode"];
         }
 
         [df setInteger:setting forKey:@"statusWindowBackgroundMode"];

+        [(MainController *)controller showCurrentTrackInfo];

         
     } else if ( [sender tag] == 2091) {
         [self setCustomColor:[sender color] updateWell:NO];
         
     } else if ( [sender tag] == 2091) {
         [self setCustomColor:[sender color] updateWell:NO];

+        [(MainController *)controller showCurrentTrackInfo];

     } else if ( [sender tag] == 2092) {
         
         int selectedItem = [sender indexOfSelectedItem];
     } else if ( [sender tag] == 2092) {
         
         int selectedItem = [sender indexOfSelectedItem];


@@ -484,6 +516,7 @@ static PreferencesController *prefs = nil;
         } else {
             [self setCustomColor:[NSColor colorWithCalibratedWhite:0.15 alpha:0.70] updateWell:YES];
         }
         } else {
             [self setCustomColor:[NSColor colorWithCalibratedWhite:0.15 alpha:0.70] updateWell:YES];
         }

+        [(MainController *)controller showCurrentTrackInfo];

 
     } else if ( [sender tag] == 2095) {
         [df setInteger:[sender indexOfSelectedItem] forKey:@"statusWindowSizing"];
 
     } else if ( [sender tag] == 2095) {
         [df setInteger:[sender indexOfSelectedItem] forKey:@"statusWindowSizing"];


@@ -495,11 +528,6 @@ static PreferencesController *prefs = nil;
 
 - (void)registerDefaults
 {
 
 - (void)registerDefaults
 {

-    BOOL found = NO;
-    NSMutableDictionary *loginWindow;
-    NSMutableArray *loginArray;
-    NSEnumerator *loginEnum;
-    id anItem;

     ITDebugLog(@"Registering defaults.");
     [df setObject:[NSArray arrayWithObjects:
         @"trackInfo",
     ITDebugLog(@"Registering defaults.");
     [df setObject:[NSArray arrayWithObjects:
         @"trackInfo",


@@ -515,11 +543,15 @@ static PreferencesController *prefs = nil;
         @"quit",
         nil] forKey:@"menu"];
 
         @"quit",
         nil] forKey:@"menu"];
 

+    [df setInteger:MT_CURRENT_VERSION forKey:@"appVersion"];

     [df setInteger:5 forKey:@"SongsInAdvance"];
 //  [df setBool:YES forKey:@"showName"];  // Song info will always show song title.
     [df setBool:YES forKey:@"showArtist"];
     [df setInteger:5 forKey:@"SongsInAdvance"];
 //  [df setBool:YES forKey:@"showName"];  // Song info will always show song title.
     [df setBool:YES forKey:@"showArtist"];

+    [df setBool:YES forKey:@"showAlbumArtwork"];

     [df setBool:NO forKey:@"showAlbum"];
     [df setBool:NO forKey:@"showAlbum"];

+    [df setBool:NO forKey:@"showComposer"];

     [df setBool:NO forKey:@"showTime"];
     [df setBool:NO forKey:@"showTime"];

+    [df setBool:NO forKey:@"showToolTip"];

 
     [df setObject:@"ITCutWindowEffect" forKey:@"statusWindowAppearanceEffect"];
     [df setObject:@"ITDissolveWindowEffect" forKey:@"statusWindowVanishEffect"];
 
     [df setObject:@"ITCutWindowEffect" forKey:@"statusWindowAppearanceEffect"];
     [df setObject:@"ITDissolveWindowEffect" forKey:@"statusWindowVanishEffect"];


@@ -528,24 +560,15 @@ static PreferencesController *prefs = nil;
     [df setFloat:4.0 forKey:@"statusWindowVanishDelay"];
     [df setInteger:(int)ITWindowPositionBottom forKey:@"statusWindowVerticalPosition"];
     [df setInteger:(int)ITWindowPositionLeft forKey:@"statusWindowHorizontalPosition"];
     [df setFloat:4.0 forKey:@"statusWindowVanishDelay"];
     [df setInteger:(int)ITWindowPositionBottom forKey:@"statusWindowVerticalPosition"];
     [df setInteger:(int)ITWindowPositionLeft forKey:@"statusWindowHorizontalPosition"];

+    [[StatusWindow sharedWindow] setVerticalPosition:(int)ITWindowPositionBottom];
+    [[StatusWindow sharedWindow] setHorizontalPosition:(int)ITWindowPositionLeft];

     [df setBool:YES forKey:@"showSongInfoOnChange"];
     
     [df setObject:[NSArchiver archivedDataWithRootObject:[NSColor blueColor]] forKey:@"statusWindowBackgroundColor"];
     
     [df synchronize];
     
     [df setBool:YES forKey:@"showSongInfoOnChange"];
     
     [df setObject:[NSArchiver archivedDataWithRootObject:[NSColor blueColor]] forKey:@"statusWindowBackgroundColor"];
     
     [df synchronize];
     

-    loginWindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
-    loginArray = [loginWindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-    loginEnum = [loginArray objectEnumerator];
-
-    while ( (anItem = [loginEnum nextObject]) ) {
-        if ( [[[anItem objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]] ) {
-            found = YES;
-        }
-    }
-    [loginWindow release];
-    
-    if (!found) {
+    if (ITDoesApplicationLaunchOnLogin([[NSBundle mainBundle] bundlePath])) {

         [[StatusWindowController sharedController] showSetupQueryWindow];
     }
 }
         [[StatusWindowController sharedController] showSetupQueryWindow];
     }
 }


@@ -556,7 +579,7 @@ static PreferencesController *prefs = nil;
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
     
     [[StatusWindow sharedWindow] vanish:self];
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
     

-    [self setLaunchesAtLogin:YES];
+    ITSetApplicationLaunchOnLogin([[NSBundle mainBundle] bundlePath], YES);

 }
 
 - (void)autoLaunchCancel
 }
 
 - (void)autoLaunchCancel


@@ -736,15 +759,14 @@ static PreferencesController *prefs = nil;
 
 - (void)setupUI
 {
 
 - (void)setupUI
 {

-    NSMutableDictionary *loginwindow;
-    NSMutableArray      *loginarray;
-    NSEnumerator   *loginEnum;

     NSEnumerator   *keyArrayEnum;
     NSString       *serverName;
     NSData         *colorData;
     int selectedBGStyle;
     id anItem;
     
     NSEnumerator   *keyArrayEnum;
     NSString       *serverName;
     NSData         *colorData;
     int selectedBGStyle;
     id anItem;
     

+    [df setInteger:MT_CURRENT_VERSION forKey:@"appVersion"];
+    

     ITDebugLog(@"Setting up preferences UI.");
     // Fill in the number of songs in advance to show field
     [songsInAdvance setIntValue:[df integerForKey:@"SongsInAdvance"]];
     ITDebugLog(@"Setting up preferences UI.");
     // Fill in the number of songs in advance to show field
     [songsInAdvance setIntValue:[df integerForKey:@"SongsInAdvance"]];


@@ -767,21 +789,24 @@ static PreferencesController *prefs = nil;
     [nameCheckbox setState:NSOnState];  // Song info will ALWAYS show song title.
     [nameCheckbox setEnabled:NO];  // Song info will ALWAYS show song title.
     [artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState];
     [nameCheckbox setState:NSOnState];  // Song info will ALWAYS show song title.
     [nameCheckbox setEnabled:NO];  // Song info will ALWAYS show song title.
     [artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState];

+    [composerCheckbox setState:[df boolForKey:@"showComposer"] ? NSOnState : NSOffState];

     [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState];
     [trackNumberCheckbox setState:[df boolForKey:@"showTrackNumber"] ? NSOnState : NSOffState];
     [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState];
     [trackNumberCheckbox setState:[df boolForKey:@"showTrackNumber"] ? NSOnState : NSOffState];

+    [playCountCheckbox setState:[df boolForKey:@"showPlayCount"] ? NSOnState : NSOffState];

     [ratingCheckbox setState:[df boolForKey:@"showTrackRating"] ? NSOnState : NSOffState];
     [ratingCheckbox setState:[df boolForKey:@"showTrackRating"] ? NSOnState : NSOffState];

+    [albumArtworkCheckbox setState:[df boolForKey:@"showAlbumArtwork"] ? NSOnState : NSOffState];
+    
+    if ([df boolForKey:@"runScripts"]) {
+        [runScriptsCheckbox setState:NSOnState];
+        [showScriptsButton setEnabled:YES];
+    } else {
+        [showScriptsButton setEnabled:NO];
+    }

     
     // Set the launch at login checkbox state
     ITDebugLog(@"Setting launch at login state.");
     
     // Set the launch at login checkbox state
     ITDebugLog(@"Setting launch at login state.");

-    [df synchronize];
-    loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
-    loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-    
-    loginEnum = [loginarray objectEnumerator];
-    while ( (anItem = [loginEnum nextObject]) ) {
-        if ([[[anItem objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
-            [launchAtLoginCheckbox setState:NSOnState];
-        }
+    if (ITDoesApplicationLaunchOnLogin([[NSBundle mainBundle] bundlePath])) {
+        [launchAtLoginCheckbox setState:NSOnState];

     }
     
     // Set the launch player checkbox state
     }
     
     // Set the launch player checkbox state


@@ -863,7 +888,7 @@ static PreferencesController *prefs = nil;
     [nameTextField setStringValue:serverName];
     
     [selectPlayerBox setContentView:zeroConfView];
     [nameTextField setStringValue:serverName];
     
     [selectPlayerBox setContentView:zeroConfView];

-    if ([[df dataForKey:@"sharedPlayerPassword"] length]) {
+    if ([[df dataForKey:@"sharedPlayerPassword"] length] > 0) {

         [passwordTextField setStringValue:@"p4s5w0rdMT1.2"];
     } else {
         [passwordTextField setStringValue:@""];
         [passwordTextField setStringValue:@"p4s5w0rdMT1.2"];
     } else {
         [passwordTextField setStringValue:@""];


@@ -977,36 +1002,11 @@ static PreferencesController *prefs = nil;
     ITDebugLog(@"Synchronizing menus");
     [df setObject:myItems forKey:@"menu"];
     [df synchronize];
     ITDebugLog(@"Synchronizing menus");
     [df setObject:myItems forKey:@"menu"];
     [df synchronize];

-}
-
-- (void)setLaunchesAtLogin:(BOOL)flag
-{
-    NSMutableDictionary *loginwindow;
-    NSMutableArray *loginarray;
-    ITDebugLog(@"Setting launches at login: %i", flag);
-    [df synchronize];
-    loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
-    loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];

     
     

-    if (flag) {
-        NSDictionary *itemDict = [NSDictionary dictionaryWithObjectsAndKeys:
-        [[NSBundle mainBundle] bundlePath], @"Path",
-        [NSNumber numberWithInt:0], @"Hide", nil];
-        [loginarray addObject:itemDict];
-    } else {
-        int i;
-        for (i = 0; i < [loginarray count]; i++) {
-            NSDictionary *tempDict = [loginarray objectAtIndex:i];
-            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
-                [loginarray removeObjectAtIndex:i];
-                break;
-            }
-        }
+    //If we're connected over a network, refresh the menu immediately
+    if ([[NetworkController sharedController] isConnectedToServer]) {
+        [controller timerUpdate];

     }
     }

-    [df setPersistentDomain:loginwindow forName:@"loginwindow"];
-    [df synchronize];
-    [loginwindow release];
-    ITDebugLog(@"Finished setting launches at login.");

 }
 
 
 }