git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding new controller into CVS under the name NewMainController. However, building...
[MenuTunes.git]
/
OldMainController.m
diff --git
a/OldMainController.m
b/OldMainController.m
index
ce163c1
..
dab1899
100755
(executable)
--- a/
OldMainController.m
+++ b/
OldMainController.m
@@
-294,8
+294,8
@@
eqItem = [menu addItemWithTitle:@"EQ Presets"
action:nil
keyEquivalent:@""];
eqItem = [menu addItemWithTitle:@"EQ Presets"
action:nil
keyEquivalent:@""];
- } else if ([item isEqualToString:@"Preferences
É
"]) {
- [menu addItemWithTitle:@"Preferences
É
"
+ } else if ([item isEqualToString:@"Preferences
…
"]) {
+ [menu addItemWithTitle:@"Preferences
…
"
action:@selector(showPreferences:)
keyEquivalent:@""];
} else if ([item isEqualToString:@"Quit"]) {
action:@selector(showPreferences:)
keyEquivalent:@""];
} else if ([item isEqualToString:@"Quit"]) {
@@
-513,7
+513,7
@@
//
//
// If we want to show the new track floater, do it here!
//
//
// If we want to show the new track floater, do it here!
- //[self showCurrentTrackInfo];
+ //[self showCurrentTrackInfo
StatusWindow
];
//
//
[self rebuildMenu];
//
//
[self rebuildMenu];
@@
-653,6
+653,7
@@
[[HotKeyCenter sharedCenter] removeHotKey:@"PlayPause"];
[[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
[[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
[[HotKeyCenter sharedCenter] removeHotKey:@"PlayPause"];
[[HotKeyCenter sharedCenter] removeHotKey:@"NextTrack"];
[[HotKeyCenter sharedCenter] removeHotKey:@"PrevTrack"];
+ [[HotKeyCenter sharedCenter] removeHotKey:@"ToggleVisualizer"];
[[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
[[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
[[HotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"];
[[HotKeyCenter sharedCenter] removeHotKey:@"TrackInfo"];
[[HotKeyCenter sharedCenter] removeHotKey:@"UpcomingSongs"];
[[HotKeyCenter sharedCenter] removeHotKey:@"ToggleLoop"];
@@
-685,16
+686,22
@@
target:self action:@selector(prevSong:)];
}
target:self action:@selector(prevSong:)];
}
+ if ([defaults objectForKey:@"ToggleVisualizer"] != nil) {
+ [[HotKeyCenter sharedCenter] addHotKey:@"ToggleVisualizer"
+ combo:[defaults keyComboForKey:@"ToggleVisualizer"]
+ target:self action:@selector(toggleVisualizer)];
+ }
+
if ([defaults objectForKey:@"TrackInfo"] != nil) {
[[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
combo:[defaults keyComboForKey:@"TrackInfo"]
if ([defaults objectForKey:@"TrackInfo"] != nil) {
[[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo"
combo:[defaults keyComboForKey:@"TrackInfo"]
- target:self action:@selector(showCurrentTrackInfo)];
+ target:self action:@selector(showCurrentTrackInfo
StatusWindow
)];
}
if ([defaults objectForKey:@"UpcomingSongs"] != nil) {
[[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
combo:[defaults keyComboForKey:@"UpcomingSongs"]
}
if ([defaults objectForKey:@"UpcomingSongs"] != nil) {
[[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs"
combo:[defaults keyComboForKey:@"UpcomingSongs"]
- target:self action:@selector(showUpcomingSongs)];
+ target:self action:@selector(showUpcomingSongs
StatusWindow
)];
}
if ([defaults objectForKey:@"ToggleLoop"] != nil) {
}
if ([defaults objectForKey:@"ToggleLoop"] != nil) {
@@
-740,7
+747,7
@@
//
//
//
//
-- (void)showCurrentTrackInfo
+- (void)showCurrentTrackInfo
StatusWindow
{
NSString *trackName = [currentRemote currentSongTitle];
if (!statusWindow && [trackName length]) {
{
NSString *trackName = [currentRemote currentSongTitle];
if (!statusWindow && [trackName length]) {
@@
-796,7
+803,7
@@
}
}
}
}
-- (void)showUpcomingSongs
+- (void)showUpcomingSongs
StatusWindow
{
int curPlaylist = [currentRemote currentPlaylistIndex];
if (!statusWindow) {
{
int curPlaylist = [currentRemote currentPlaylistIndex];
if (!statusWindow) {
@@
-854,6
+861,11
@@
{
}
{
}
+- (void)toggleVisualizer
+{
+ NSLog(@"Visualizer On/Off");
+}
+
- (void)fadeAndCloseStatusWindow
{
[statusWindow orderOut:self];
- (void)fadeAndCloseStatusWindow
{
[statusWindow orderOut:self];
@@
-894,10
+906,10
@@
//Space -- ARGH!
case 49:
{
//Space -- ARGH!
case 49:
{
- MenuRef menuRef = _NSGetCarbonMenu([item menu]);
+
/*
MenuRef menuRef = _NSGetCarbonMenu([item menu]);
SetMenuItemCommandKey(menuRef, 1, NO, 49);
SetMenuItemModifiers(menuRef, 1, kMenuNoCommandModifier);
SetMenuItemCommandKey(menuRef, 1, NO, 49);
SetMenuItemModifiers(menuRef, 1, kMenuNoCommandModifier);
- SetMenuItemKeyGlyph(menuRef, 1, kMenuBlankGlyph);
+ SetMenuItemKeyGlyph(menuRef, 1, kMenuBlankGlyph);
*/
charcode = 'b';
}
charcode = 'b';
}