passwordPanelMessage = NSTextField;
passwordPanelOKButton = NSButton;
passwordPanelTextField = NSTextField;
+ passwordPanelTitle = NSTextField;
passwordTextField = NSTextField;
ratingCheckbox = NSButton;
selectPlayerBox = NSBox;
<key>IBOpenObjects</key>
<array>
<integer>6</integer>
- <integer>699</integer>
+ <integer>719</integer>
</array>
<key>IBSystem Version</key>
<string>7B85</string>
result = [networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]];
//Connect
if (result == 1) {
+ [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
currentRemote = [[[networkController networkObject] remote] retain];
[self timerUpdate];
- //[refreshTimer invalidate];
ITDebugLog(@"Connection successful.");
return YES;
} else if (result == 0) {
if ([[exception name] isEqualToString:NSPortTimeoutException] && [networkController isConnectedToServer]) {
NSRunCriticalAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil);
if ([self disconnectFromServer]) {
+ [[PreferencesController sharedPrefs] resetRemotePlayerTextFields];
[NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
} else {
ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");
- (void)applicationWillTerminate:(NSNotification *)note
{
- [self clearHotKeys];
[networkController stopRemoteServerSearch];
+ [self clearHotKeys];
[[NSStatusBar systemStatusBar] removeStatusItem:statusItem];
}
[super dealloc];
}
-
@end
\ No newline at end of file
IBOutlet NSTextField *passwordPanelMessage;
IBOutlet NSButton *passwordPanelOKButton;
IBOutlet NSTextField *passwordPanelTextField;
+ IBOutlet NSTextField *passwordPanelTitle;
IBOutlet NSTextField *passwordTextField;
IBOutlet NSButton *ratingCheckbox;
IBOutlet NSTextField *selectedPlayerTextField;
- (IBAction)changeGeneralSetting:(id)sender;
- (IBAction)changeSharingSetting:(id)sender;
- (IBAction)changeStatusWindowSetting:(id)sender;
+- (void)resetRemotePlayerTextFields;
+
- (IBAction)clearHotKey:(id)sender;
- (IBAction)editHotKey:(id)sender;
- (IBAction)showPrefsWindow:(id)sender;
- (BOOL)showPasswordPanel
{
[passwordPanel setLevel:NSStatusWindowLevel];
- [passwordPanelOKButton setTitle:@"OK"];
+ [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 makeKeyAndOrderFront:nil];
if ([NSApp runModalForWindow:passwordPanel]) {
return YES;
{
[passwordPanel setLevel:NSStatusWindowLevel];
[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 makeKeyAndOrderFront:nil];
if ([NSApp runModalForWindow:passwordPanel]) {
return YES;
}
}
+- (void)resetRemotePlayerTextFields
+{
+ if ([[NetworkController sharedController] isConnectedToServer]) {
+ [selectedPlayerTextField setStringValue:[[[NetworkController sharedController] networkObject] serverName]];
+ [locationTextField setStringValue:[[NetworkController sharedController] remoteHost]];
+ } else {
+ [selectedPlayerTextField setStringValue:@"No shared player selected."];
+ [locationTextField setStringValue:@"-"];
+ }
+}
+
/*************************************************************************/
#pragma mark -
#pragma mark HOTKEY SUPPORT METHODS