git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Should Build and Run with the new Controller
[MenuTunes.git]
/
PreferencesController.m
diff --git
a/PreferencesController.m
b/PreferencesController.m
index
c230e13
..
9d8e2f0
100755
(executable)
--- a/
PreferencesController.m
+++ b/
PreferencesController.m
@@
-152,6
+152,7
@@
static PreferencesController *prefs = nil;
// Update vanish delay
} else if ( [sender tag] == 2080) {
// Update "Song Info window when song changes" setting.
// Update vanish delay
} else if ( [sender tag] == 2080) {
// Update "Song Info window when song changes" setting.
+ [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
}
}
}
}
@@
-459,6
+460,8
@@
static PreferencesController *prefs = nil;
toggleShuffleCombo = [combo copy];
[toggleShuffleButton setTitle:string];
}
toggleShuffleCombo = [combo copy];
[toggleShuffleButton setTitle:string];
}
+ [df setKeyCombo:combo forKey:setHotKey];
+ [controller rebuildMenu];
[self cancelHotKey:sender];
}
[self cancelHotKey:sender];
}
@@
-778,7
+781,11
@@
static PreferencesController *prefs = nil;
{
if (aTableView == menuTableView) {
if ([[aTableColumn identifier] isEqualToString:@"name"]) {
{
if (aTableView == menuTableView) {
if ([[aTableColumn identifier] isEqualToString:@"name"]) {
- return [myItems objectAtIndex:rowIndex];
+ NSString *object = [myItems objectAtIndex:rowIndex];
+ if ([object isEqualToString:@"Show Player"]) {
+ return [NSString stringWithFormat:@"Show %@", [[controller currentRemote] playerSimpleName]];
+ }
+ return object;
} else {
if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
{
} else {
if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
{