[vlc-devel] commit: macosx intf: solve hotkey conflict (Derk-Jan Hartman )

[git version control]

vlc | branch: 1.0-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Fri Jun 12 18:06:00 2009 +0200| [2c7efc617b2d69eff3a36edd69e564dbe5651422] | committer: Derk-Jan Hartman 

macosx intf: solve hotkey conflict

Now we have:
cmd-G : to open the panel to grab from webcam/screen/eyetv
cmd-R : to reveal in Finder, the same as iTunes uses
cmd-shift-R : to start/stop VLC record

backport of [811af572536e1d77ff8c61d92d8b15e0dca92c55]

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2c7efc617b2d69eff3a36edd69e564dbe5651422
---

 .../English.lproj/MainMenu.nib/classes.nib         |    8 ++++----
 .../Resources/English.lproj/MainMenu.nib/info.nib  |    6 +++---
 .../English.lproj/MainMenu.nib/keyedobjects.nib    |  Bin 121429 -> 121366 bytes
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
index 2f1ce7c..b728806 100644
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -496,17 +496,17 @@
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>NSObject</string>
+			<string>ITSlider</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSSlider</string>
 		</dict>
 		<dict>
 			<key>CLASS</key>
-			<string>ITSlider</string>
+			<string>NSObject</string>
 			<key>LANGUAGE</key>
 			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSSlider</string>
 		</dict>
 		<dict>
 			<key>ACTIONS</key>
diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
index 0eb4b91..dbb2e0b 100644
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
@@ -10,12 +10,12 @@
 	<integer>4</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>3568</integer>
 		<integer>21</integer>
-		<integer>2709</integer>
-		<integer>2197</integer>
 		<integer>29</integer>
+		<integer>3568</integer>
+		<integer>2197</integer>
 		<integer>2416</integer>
+		<integer>2709</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>9J61</string>
diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
index ce68861..65702fd 100644
Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ