git.ithinksw.org
/
MenuTunes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://github.com/ksuther/MenuTunes
[MenuTunes.git]
/
English.lproj
/
Preferences.nib
/
classes.nib
diff --git
a/English.lproj/Preferences.nib/classes.nib
b/English.lproj/Preferences.nib/classes.nib
index
da5de05
..
9ddd004
100755
(executable)
--- a/
English.lproj/Preferences.nib/classes.nib
+++ b/
English.lproj/Preferences.nib/classes.nib
@@
-11,7
+11,6
@@
clearHotKey = id;
editHotKey = id;
showPrefsWindow = id;
clearHotKey = id;
editHotKey = id;
showPrefsWindow = id;
- showTestWindow = id;
};
CLASS = PreferencesController;
LANGUAGE = ObjC;
};
CLASS = PreferencesController;
LANGUAGE = ObjC;
@@
-22,10
+21,16
@@
appearanceEffectPopup = NSPopUpButton;
appearanceSpeedSlider = NSSlider;
artistCheckbox = NSButton;
appearanceEffectPopup = NSPopUpButton;
appearanceSpeedSlider = NSSlider;
artistCheckbox = NSButton;
+ audioscrobblerEnabledCheckbox = NSButton;
+ audioscrobblerPasswordTextField = NSSecureTextField;
+ audioscrobblerStatusTextField = NSTextField;
+ audioscrobblerUseCacheCheckbox = NSButton;
+ audioscrobblerUserTextField = NSTextField;
backgroundColorPopup = NSPopUpButton;
backgroundColorWell = NSColorWell;
backgroundStylePopup = NSPopUpButton;
clientPasswordTextField = NSTextField;
backgroundColorPopup = NSPopUpButton;
backgroundColorWell = NSColorWell;
backgroundStylePopup = NSPopUpButton;
clientPasswordTextField = NSTextField;
+ composerCheckbox = NSButton;
hostTextField = NSTextField;
hotKeysTableView = NSTableView;
launchAtLoginCheckbox = NSButton;
hostTextField = NSTextField;
hotKeysTableView = NSTableView;
launchAtLoginCheckbox = NSButton;
@@
-41,9
+46,11
@@
passwordPanelTextField = NSTextField;
passwordPanelTitle = NSTextField;
passwordTextField = NSTextField;
passwordPanelTextField = NSTextField;
passwordPanelTitle = NSTextField;
passwordTextField = NSTextField;
+ playCountCheckbox = NSButton;
positionMatrix = NSMatrix;
ratingCheckbox = NSButton;
runScriptsCheckbox = NSButton;
positionMatrix = NSMatrix;
ratingCheckbox = NSButton;
runScriptsCheckbox = NSButton;
+ screenPopup = NSPopUpButton;
selectPlayerBox = NSBox;
selectPlayerSheet = NSPanel;
selectSharedPlayerButton = NSButton;
selectPlayerBox = NSBox;
selectPlayerSheet = NSPanel;
selectSharedPlayerButton = NSButton;
@@
-53,7
+60,6
@@
sharingTableView = NSTableView;
showOnChangeCheckbox = NSButton;
showScriptsButton = NSButton;
sharingTableView = NSTableView;
showOnChangeCheckbox = NSButton;
showScriptsButton = NSButton;
- showToolTipCheckbox = NSButton;
songsInAdvance = NSTextField;
trackNumberCheckbox = NSButton;
trackTimeCheckbox = NSButton;
songsInAdvance = NSTextField;
trackNumberCheckbox = NSButton;
trackTimeCheckbox = NSButton;