From: Matthew Judy Date: Wed, 1 Oct 2003 19:40:20 +0000 (+0000) Subject: All kindza shisnit. X-Git-Tag: v1.0~19 X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/9c8f6e1b9b0b947d898a3d9bae3acb3999879791 All kindza shisnit. --- diff --git a/English.lproj/Preferences.nib/classes.nib b/English.lproj/Preferences.nib/classes.nib index e9fde62..8e7e804 100755 --- a/English.lproj/Preferences.nib/classes.nib +++ b/English.lproj/Preferences.nib/classes.nib @@ -18,12 +18,14 @@ OUTLETS = { albumCheckbox = NSButton; allTableView = NSTableView; + appearanceEffectPopup = NSPopUpButton; + appearanceSpeedSlider = NSSlider; artistCheckbox = NSButton; keyComboField = NSTextField; keyComboPanel = NSPanel; launchAtLoginCheckbox = NSButton; launchPlayerAtLaunchCheckbox = NSButton; - menuTableView = NSTableView; + menuTableView = CustomMenuTableView; nameCheckbox = NSButton; nextTrackButton = NSButton; playPauseButton = NSButton; @@ -31,6 +33,7 @@ ratingCheckbox = NSButton; ratingDecrementButton = NSButton; ratingIncrementButton = NSButton; + showOnChangeCheckbox = NSButton; showPlayerButton = NSButton; songsInAdvance = NSTextField; toggleLoopButton = NSButton; @@ -39,6 +42,9 @@ trackNumberCheckbox = NSButton; trackTimeCheckbox = NSButton; upcomingSongsButton = NSButton; + vanishDelaySlider = NSSlider; + vanishEffectPopup = NSPopUpButton; + vanishSpeedSlider = NSSlider; volumeDecrementButton = NSButton; volumeIncrementButton = NSButton; window = NSWindow; diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib index 6d64f8c..c052b3a 100755 --- a/English.lproj/Preferences.nib/info.nib +++ b/English.lproj/Preferences.nib/info.nib @@ -23,6 +23,7 @@ IBOpenObjects 6 + 115 IBSystem Version 6L60 diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib index 5587b1e..61b1455 100755 Binary files a/English.lproj/Preferences.nib/keyedobjects.nib and b/English.lproj/Preferences.nib/keyedobjects.nib differ diff --git a/MTBlingController.m b/MTBlingController.m index bc20477..d270412 100755 --- a/MTBlingController.m +++ b/MTBlingController.m @@ -49,7 +49,7 @@ [window center]; [window makeKeyAndOrderFront:nil]; - [window setLevel:NSStatusWindowLevel]; +// [window setLevel:NSStatusWindowLevel]; } - (void)showPanelIfNeeded diff --git a/MTShizzleWindow.m b/MTShizzleWindow.m index b5241c8..ede4cd2 100755 --- a/MTShizzleWindow.m +++ b/MTShizzleWindow.m @@ -144,6 +144,7 @@ static MTShizzleWindow *_privateSharedWindow = nil; regLater = [[NSButton alloc] initWithFrame:NSMakeRect(138, 16, 116, 25)]; [regLater setTitle:@"Register Later"]; + [regLater setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]]; [regLater setTarget:_sender]; [regLater setAction:@selector(registerLater:)]; [regLater setBezelStyle:NSRoundedBezelStyle]; @@ -151,6 +152,7 @@ static MTShizzleWindow *_privateSharedWindow = nil; verifyKey = [[NSButton alloc] initWithFrame:NSMakeRect(255, 16, 116, 25)]; [verifyKey setTitle:@"Verify Key"]; + [verifyKey setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]]; [verifyKey setTarget:_sender]; [verifyKey setAction:@selector(verifyKey:)]; [verifyKey setBezelStyle:NSRoundedBezelStyle]; diff --git a/MainController.m b/MainController.m index 36212c4..edd1e78 100755 --- a/MainController.m +++ b/MainController.m @@ -695,6 +695,25 @@ static MainController *sharedController; [statusWindowController showShuffleWindow:newShuffleEnabled]; } +- (void)registerNowOK +{ + [[StatusWindow sharedWindow] setLocked:NO]; + [[StatusWindow sharedWindow] vanish:self]; + [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES]; + + [self blingNow]; +} + +- (void)registerNowCancel +{ + [[StatusWindow sharedWindow] setLocked:NO]; + [[StatusWindow sharedWindow] vanish:self]; + [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES]; + + [NSApp terminate]; +} + + /*************************************************************************/ #pragma mark - #pragma mark WORKSPACE NOTIFICATION HANDLERS diff --git a/PreferencesController.h b/PreferencesController.h index bd77dbb..015d083 100755 --- a/PreferencesController.h +++ b/PreferencesController.h @@ -44,7 +44,13 @@ IBOutlet NSButton *volumeDecrementButton; IBOutlet NSButton *volumeIncrementButton; IBOutlet NSWindow *window; - + IBOutlet NSPopUpButton *appearanceEffectPopup; + IBOutlet NSPopUpButton *vanishEffectPopup; + IBOutlet NSSlider *appearanceSpeedSlider; + IBOutlet NSSlider *vanishSpeedSlider; + IBOutlet NSSlider *vanishDelaySlider; + IBOutlet NSButton *showOnChangeCheckbox; + MainController *controller; NSUserDefaults *df; NSMutableArray *availableItems; diff --git a/PreferencesController.m b/PreferencesController.m index 9308630..5999bdf 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -272,22 +272,17 @@ static PreferencesController *prefs = nil; id anItem; ITDebugLog(@"Registering defaults."); [df setObject:[NSArray arrayWithObjects: + @"trackInfo", + @"separator", @"playPause", @"prevTrack", @"nextTrack", - @"fastForward", - @"rewind", - @"showPlayer", @"separator", - @"songRating", - @"eqPresets", @"playlists", @"upcomingSongs", @"separator", @"preferences", @"quit", - @"separator", - @"trackInfo", nil] forKey:@"menu"]; [df setInteger:5 forKey:@"SongsInAdvance"]; @@ -296,6 +291,13 @@ static PreferencesController *prefs = nil; [df setBool:NO forKey:@"showAlbum"]; [df setBool:NO forKey:@"showTime"]; + [df setInteger:2100 forKey:@"statusWindowAppearanceEffect"]; + [df setInteger:2101 forKey:@"statusWindowVanishEffect"]; + [df setFloat:0.8 forKey:@"statusWindowAppearanceSpeed"]; + [df setFloat:0.8 forKey:@"statusWindowVanishSpeed"]; + [df setFloat:4.0 forKey:@"statusWindowVanishDelay"]; + [df setBool:YES forKey:@"showSongInfoOnChange"]; + [df synchronize]; loginWindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; @@ -723,6 +725,16 @@ static PreferencesController *prefs = nil; [launchAtLoginCheckbox setState:NSOnState]; } } + + // Setup the positioning controls + + // Setup effects controls + [appearanceEffectPopup selectItem:[appearanceEffectPopup itemAtIndex:[appearanceEffectPopup indexOfItemWithTag:[df integerForKey:@"statusWindowAppearanceEffect"]]]]; + [vanishEffectPopup selectItem:[vanishEffectPopup itemAtIndex:[vanishEffectPopup indexOfItemWithTag:[df integerForKey:@"statusWindowVanishEffect"]]]]; + [appearanceSpeedSlider setFloatValue:-([df floatForKey:@"statusWindowAppearanceSpeed"])]; + [vanishSpeedSlider setFloatValue:-([df floatForKey:@"statusWindowVanishSpeed"])]; + [vanishDelaySlider setFloatValue:[df floatForKey:@"statusWindowVanishDelay"]]; + [showOnChangeCheckbox setState:([df boolForKey:@"showSongInfoOnChange"] ? NSOnState : NSOffState)]; } - (IBAction)changeMenus:(id)sender diff --git a/StatusWindowController.m b/StatusWindowController.m index 10d6eee..b64bb76 100755 --- a/StatusWindowController.m +++ b/StatusWindowController.m @@ -228,7 +228,7 @@ static StatusWindowController *sharedController; - (void)showRegistrationQueryWindow { - NSString *message = @"xxjghsdkfj\nHAHA"; + NSString *message = @"Your 7-day unlimited trial period has elapsed.\nYou must register to continue using MenuTunes."; [_window setImage:[NSImage imageNamed:@"Register"]]; [_window buildDialogWindowWithMessage:message