macosx: make sure that the info-panel doesn't float.

Additionally, fixed an inconsistency in the nib-file.

diff --git a/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib
index 5dd1fdb0eb13da28add050df34fa404706bf359d..b53f8c6f6aafe5a0568d9831eac3628d346487a2 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib
@@ -1,177 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IBClasses</key>
-       <array>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSApplication</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSResponder</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSTextField</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSControl</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSObject</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>createOutlineGroup</key>
-                               <string>id</string>
-                               <key>deleteOutlineGroup</key>
-                               <string>id</string>
-                               <key>metaFieldChanged</key>
-                               <string>id</string>
-                               <key>saveMetaData</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>VLCInfo</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_audio_box</key>
-                               <string>id</string>
-                               <key>o_audio_decoded_lbl</key>
-                               <string>id</string>
-                               <key>o_audio_decoded_txt</key>
-                               <string>id</string>
-                               <key>o_author_lbl</key>
-                               <string>id</string>
-                               <key>o_author_txt</key>
-                               <string>id</string>
-                               <key>o_collection_lbl</key>
-                               <string>id</string>
-                               <key>o_collection_txt</key>
-                               <string>id</string>
-                               <key>o_copyright_lbl</key>
-                               <string>id</string>
-                               <key>o_copyright_txt</key>
-                               <string>id</string>
-                               <key>o_date_lbl</key>
-                               <string>id</string>
-                               <key>o_date_txt</key>
-                               <string>id</string>
-                               <key>o_demux_bitrate_lbl</key>
-                               <string>id</string>
-                               <key>o_demux_bitrate_txt</key>
-                               <string>id</string>
-                               <key>o_demux_bytes_lbl</key>
-                               <string>id</string>
-                               <key>o_demux_bytes_txt</key>
-                               <string>id</string>
-                               <key>o_description_lbl</key>
-                               <string>id</string>
-                               <key>o_description_txt</key>
-                               <string>id</string>
-                               <key>o_displayed_lbl</key>
-                               <string>id</string>
-                               <key>o_displayed_txt</key>
-                               <string>id</string>
-                               <key>o_fps_lbl</key>
-                               <string>id</string>
-                               <key>o_fps_txt</key>
-                               <string>id</string>
-                               <key>o_genre_lbl</key>
-                               <string>id</string>
-                               <key>o_genre_txt</key>
-                               <string>id</string>
-                               <key>o_image_well</key>
-                               <string>id</string>
-                               <key>o_info_window</key>
-                               <string>id</string>
-                               <key>o_input_bitrate_lbl</key>
-                               <string>id</string>
-                               <key>o_input_bitrate_txt</key>
-                               <string>id</string>
-                               <key>o_input_box</key>
-                               <string>id</string>
-                               <key>o_language_lbl</key>
-                               <string>id</string>
-                               <key>o_language_txt</key>
-                               <string>id</string>
-                               <key>o_lost_abuffers_lbl</key>
-                               <string>id</string>
-                               <key>o_lost_abuffers_txt</key>
-                               <string>id</string>
-                               <key>o_lost_frames_lbl</key>
-                               <string>id</string>
-                               <key>o_lost_frames_txt</key>
-                               <string>id</string>
-                               <key>o_nowPlaying_lbl</key>
-                               <string>id</string>
-                               <key>o_nowPlaying_txt</key>
-                               <string>id</string>
-                               <key>o_outline_view</key>
-                               <string>id</string>
-                               <key>o_played_abuffers_lbl</key>
-                               <string>id</string>
-                               <key>o_played_abuffers_txt</key>
-                               <string>id</string>
-                               <key>o_publisher_lbl</key>
-                               <string>id</string>
-                               <key>o_publisher_txt</key>
-                               <string>id</string>
-                               <key>o_read_bytes_lbl</key>
-                               <string>id</string>
-                               <key>o_read_bytes_txt</key>
-                               <string>id</string>
-                               <key>o_saveMetaData_btn</key>
-                               <string>id</string>
-                               <key>o_sent_bitrate_lbl</key>
-                               <string>id</string>
-                               <key>o_sent_bitrate_txt</key>
-                               <string>id</string>
-                               <key>o_sent_bytes_lbl</key>
-                               <string>id</string>
-                               <key>o_sent_bytes_txt</key>
-                               <string>id</string>
-                               <key>o_sent_packets_lbl</key>
-                               <string>id</string>
-                               <key>o_sent_packets_txt</key>
-                               <string>id</string>
-                               <key>o_seqNum_lbl</key>
-                               <string>id</string>
-                               <key>o_seqNum_txt</key>
-                               <string>id</string>
-                               <key>o_sout_box</key>
-                               <string>id</string>
-                               <key>o_tab_view</key>
-                               <string>id</string>
-                               <key>o_title_lbl</key>
-                               <string>id</string>
-                               <key>o_title_txt</key>
-                               <string>id</string>
-                               <key>o_uri_lbl</key>
-                               <string>id</string>
-                               <key>o_uri_txt</key>
-                               <string>id</string>
-                               <key>o_video_box</key>
-                               <string>id</string>
-                               <key>o_video_decoded_lbl</key>
-                               <string>id</string>
-                               <key>o_video_decoded_txt</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-       </array>
-       <key>IBVersion</key>
-       <string>1</string>
-</dict>
-</plist>
+{
+    IBClasses =     (
+                {
+            CLASS = NSApplication;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSResponder;
+        },
+                {
+            CLASS = NSObject;
+            LANGUAGE = ObjC;
+        },
+                {
+            CLASS = NSTextField;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSControl;
+        },
+                {
+            ACTIONS =             {
+                createOutlineGroup = id;
+                deleteOutlineGroup = id;
+                metaFieldChanged = id;
+                saveMetaData = id;
+            };
+            CLASS = VLCInfo;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_audio_box" = id;
+                "o_audio_decoded_lbl" = id;
+                "o_audio_decoded_txt" = id;
+                "o_author_lbl" = id;
+                "o_author_txt" = id;
+                "o_collection_lbl" = id;
+                "o_collection_txt" = id;
+                "o_copyright_lbl" = id;
+                "o_copyright_txt" = id;
+                "o_date_lbl" = id;
+                "o_date_txt" = id;
+                "o_demux_bitrate_lbl" = id;
+                "o_demux_bitrate_txt" = id;
+                "o_demux_bytes_lbl" = id;
+                "o_demux_bytes_txt" = id;
+                "o_description_lbl" = id;
+                "o_description_txt" = id;
+                "o_displayed_lbl" = id;
+                "o_displayed_txt" = id;
+                "o_fps_lbl" = id;
+                "o_fps_txt" = id;
+                "o_genre_lbl" = id;
+                "o_genre_txt" = id;
+                "o_image_well" = id;
+                "o_info_window" = id;
+                "o_input_bitrate_lbl" = id;
+                "o_input_bitrate_txt" = id;
+                "o_input_box" = id;
+                "o_language_lbl" = id;
+                "o_language_txt" = id;
+                "o_lost_abuffers_lbl" = id;
+                "o_lost_abuffers_txt" = id;
+                "o_lost_frames_lbl" = id;
+                "o_lost_frames_txt" = id;
+                "o_nowPlaying_lbl" = id;
+                "o_nowPlaying_txt" = id;
+                "o_outline_view" = id;
+                "o_played_abuffers_lbl" = id;
+                "o_played_abuffers_txt" = id;
+                "o_publisher_lbl" = id;
+                "o_publisher_txt" = id;
+                "o_read_bytes_lbl" = id;
+                "o_read_bytes_txt" = id;
+                "o_saveMetaData_btn" = id;
+                "o_sent_bitrate_lbl" = id;
+                "o_sent_bitrate_txt" = id;
+                "o_sent_bytes_lbl" = id;
+                "o_sent_bytes_txt" = id;
+                "o_sent_packets_lbl" = id;
+                "o_sent_packets_txt" = id;
+                "o_seqNum_lbl" = id;
+                "o_seqNum_txt" = id;
+                "o_sout_box" = id;
+                "o_tab_view" = id;
+                "o_title_lbl" = id;
+                "o_title_txt" = id;
+                "o_uri_lbl" = id;
+                "o_uri_txt" = id;
+                "o_video_box" = id;
+                "o_video_decoded_lbl" = id;
+                "o_video_decoded_txt" = id;
+            };
+            SUPERCLASS = NSObject;
+        }
+    );
+    IBVersion = 1;
+}
\ No newline at end of file

diff --git a/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib b/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib
index d54ea320ebd4fddbb8e4e3a1439e19778c8f28d7..87d23af3d225f06f11d96ac77ff4cc404525458b 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib
@@ -2,18 +2,20 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+       <key>IBDocumentLocation</key>
+       <string>69 68 356 240 0 0 1280 778 </string>
        <key>IBFramework Version</key>
-       <string>644</string>
+       <string>489.0</string>
        <key>IBLastKnownRelativeProjectPath</key>
        <string>../../vlc.xcodeproj</string>
        <key>IBOldestOS</key>
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>3</integer>
+               <integer>2</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>9C31</string>
+       <string>9E17</string>
        <key>targetFramework</key>
        <string>IBCocoaFramework</string>
 </dict>

diff --git a/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib
index 6936ec9130b45f438e349ed633c6d8c4732547ae..f07524ca818ad16e224f942c2167117ec572fb09 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index 16a51c3350d643c436c4d151c84925b9c93af400..f702e3053e04da2aa71b3700ebfce1be1974b895 100644 (file)
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -64,7 +64,8 @@ static VLCInfo *_o_sharedInstance = nil;
 
 - (void)awakeFromNib
 {
-    [o_info_window setExcludedFromWindowsMenu: TRUE];
+    [o_info_window setExcludedFromWindowsMenu: YES];
+    [o_info_window setFloatingPanel: NO];
 
     [o_info_window setTitle: _NS("Media Information")];
     [o_uri_lbl setStringValue: _NS("Location")];
@@ -114,7 +115,7 @@ static VLCInfo *_o_sharedInstance = nil;
     [o_info_window setInitialFirstResponder: o_uri_txt];
     [o_info_window setDelegate: self];
 
-    /* We may be awoken from nib way after initialiwation
+    /* We may be awoken from nib way after initialisation
      * Update ourselves */
     [self updatePanelWithItem:p_item];
 }
@@ -420,7 +421,7 @@ static VLCInfo *_o_sharedInstance = nil;
 error:
     pl_Release( VLCIntf );
     NSRunAlertPanel(_NS("Error while saving meta"),
-        _NS("Impossible to save the meta data."),
+        _NS("VLC was unable to save the meta data."),
         _NS("OK"), nil, nil);
 }