Fixed some more connections. Added escape key to file drawer to close it.
parent
2f0a4e6669
commit
f36b646b1d
|
@ -20,8 +20,6 @@
|
||||||
IBOutlet NSButton *playButton;
|
IBOutlet NSButton *playButton;
|
||||||
IBOutlet NSButton *prevButton;
|
IBOutlet NSButton *prevButton;
|
||||||
IBOutlet NSButton *nextButton;
|
IBOutlet NSButton *nextButton;
|
||||||
IBOutlet NSButton *addButton;
|
|
||||||
IBOutlet NSButton *remButton;
|
|
||||||
IBOutlet NSButton *infoButton;
|
IBOutlet NSButton *infoButton;
|
||||||
IBOutlet NSButton *fileButton;
|
IBOutlet NSButton *fileButton;
|
||||||
IBOutlet NSButton *shuffleButton;
|
IBOutlet NSButton *shuffleButton;
|
||||||
|
|
|
@ -93,8 +93,6 @@
|
||||||
[playButton setToolTip:NSLocalizedString(@"PlayButtonTooltip", @"")];
|
[playButton setToolTip:NSLocalizedString(@"PlayButtonTooltip", @"")];
|
||||||
[prevButton setToolTip:NSLocalizedString(@"PrevButtonTooltip", @"")];
|
[prevButton setToolTip:NSLocalizedString(@"PrevButtonTooltip", @"")];
|
||||||
[nextButton setToolTip:NSLocalizedString(@"NextButtonTooltip", @"")];
|
[nextButton setToolTip:NSLocalizedString(@"NextButtonTooltip", @"")];
|
||||||
[addButton setToolTip:NSLocalizedString(@"AddButtonTooltip", @"")];
|
|
||||||
[remButton setToolTip:NSLocalizedString(@"RemoveButtonTooltip", @"")];
|
|
||||||
[infoButton setToolTip:NSLocalizedString(@"InfoButtonTooltip", @"")];
|
[infoButton setToolTip:NSLocalizedString(@"InfoButtonTooltip", @"")];
|
||||||
[shuffleButton setToolTip:NSLocalizedString(@"ShuffleButtonTooltip", @"")];
|
[shuffleButton setToolTip:NSLocalizedString(@"ShuffleButtonTooltip", @"")];
|
||||||
[repeatButton setToolTip:NSLocalizedString(@"RepeatButtonTooltip", @"")];
|
[repeatButton setToolTip:NSLocalizedString(@"RepeatButtonTooltip", @"")];
|
||||||
|
@ -209,7 +207,7 @@
|
||||||
- (IBAction)toggleFileDrawer:(id)sender
|
- (IBAction)toggleFileDrawer:(id)sender
|
||||||
{
|
{
|
||||||
[mainWindow makeKeyAndOrderFront:self];
|
[mainWindow makeKeyAndOrderFront:self];
|
||||||
NSLog(@"TOGGLING...");
|
|
||||||
[fileDrawer toggle:self];
|
[fileDrawer toggle:self];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -231,6 +229,7 @@
|
||||||
[infoButton setState:NSOffState];
|
[infoButton setState:NSOffState];
|
||||||
}
|
}
|
||||||
else if ([notification object] == fileDrawer) {
|
else if ([notification object] == fileDrawer) {
|
||||||
|
NSLog(@"CLOSED");
|
||||||
[fileButton setState:NSOffState];
|
[fileButton setState:NSOffState];
|
||||||
|
|
||||||
[mainWindow makeFirstResponder: playlistView];
|
[mainWindow makeFirstResponder: playlistView];
|
||||||
|
|
|
@ -32,11 +32,11 @@
|
||||||
<integer>4</integer>
|
<integer>4</integer>
|
||||||
<key>IBOpenObjects</key>
|
<key>IBOpenObjects</key>
|
||||||
<array>
|
<array>
|
||||||
<integer>463</integer>
|
|
||||||
<integer>513</integer>
|
|
||||||
<integer>29</integer>
|
|
||||||
<integer>21</integer>
|
<integer>21</integer>
|
||||||
<integer>1156</integer>
|
<integer>1156</integer>
|
||||||
|
<integer>29</integer>
|
||||||
|
<integer>463</integer>
|
||||||
|
<integer>513</integer>
|
||||||
</array>
|
</array>
|
||||||
<key>IBSystem Version</key>
|
<key>IBSystem Version</key>
|
||||||
<string>8L127</string>
|
<string>8L127</string>
|
||||||
|
|
Binary file not shown.
|
@ -61,6 +61,8 @@
|
||||||
//Add songs to list
|
//Add songs to list
|
||||||
[[self delegate] addSelectedToPlaylist];
|
[[self delegate] addSelectedToPlaylist];
|
||||||
|
|
||||||
|
[fileDrawer close];
|
||||||
|
} else if (pressedChar == 0x1b) {//Escape
|
||||||
[fileDrawer close];
|
[fileDrawer close];
|
||||||
} else if (pressedChar == NSLeftArrowFunctionKey || pressedChar == NSRightArrowFunctionKey) { //left or right
|
} else if (pressedChar == NSLeftArrowFunctionKey || pressedChar == NSRightArrowFunctionKey) { //left or right
|
||||||
[super keyDown:theEvent];
|
[super keyDown:theEvent];
|
||||||
|
|
Loading…
Reference in New Issue