Skip to content

V
vlc-2-2
Commit c2aa99a5 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

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

Additionally, fixed an inconsistency in the nib-file.
parent b9d34123
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 183 deletions
extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib
View file @ c2aa99a5
<?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"> IBClasses = (
<plist version="1.0"> {
<dict> CLASS = NSApplication;
<key>IBClasses</key> LANGUAGE = ObjC;
<array> SUPERCLASS = NSResponder;
<dict> },
<key>CLASS</key> {
<string>NSApplication</string> CLASS = NSObject;
<key>LANGUAGE</key> LANGUAGE = ObjC;
<string>ObjC</string> },
<key>SUPERCLASS</key> {
<string>NSResponder</string> CLASS = NSTextField;
</dict> LANGUAGE = ObjC;
<dict> SUPERCLASS = NSControl;
<key>CLASS</key> },
<string>NSTextField</string> {
<key>LANGUAGE</key> ACTIONS = {
<string>ObjC</string> createOutlineGroup = id;
<key>SUPERCLASS</key> deleteOutlineGroup = id;
<string>NSControl</string> metaFieldChanged = id;
</dict> saveMetaData = id;
<dict> };
<key>CLASS</key> CLASS = VLCInfo;
<string>NSObject</string> LANGUAGE = ObjC;
<key>LANGUAGE</key> OUTLETS = {
<string>ObjC</string> "o_audio_box" = id;
</dict> "o_audio_decoded_lbl" = id;
<dict> "o_audio_decoded_txt" = id;
<key>ACTIONS</key> "o_author_lbl" = id;
<dict> "o_author_txt" = id;
<key>createOutlineGroup</key> "o_collection_lbl" = id;
<string>id</string> "o_collection_txt" = id;
<key>deleteOutlineGroup</key> "o_copyright_lbl" = id;
<string>id</string> "o_copyright_txt" = id;
<key>metaFieldChanged</key> "o_date_lbl" = id;
<string>id</string> "o_date_txt" = id;
<key>saveMetaData</key> "o_demux_bitrate_lbl" = id;
<string>id</string> "o_demux_bitrate_txt" = id;
</dict> "o_demux_bytes_lbl" = id;
<key>CLASS</key> "o_demux_bytes_txt" = id;
<string>VLCInfo</string> "o_description_lbl" = id;
<key>LANGUAGE</key> "o_description_txt" = id;
<string>ObjC</string> "o_displayed_lbl" = id;
<key>OUTLETS</key> "o_displayed_txt" = id;
<dict> "o_fps_lbl" = id;
<key>o_audio_box</key> "o_fps_txt" = id;
<string>id</string> "o_genre_lbl" = id;
<key>o_audio_decoded_lbl</key> "o_genre_txt" = id;
<string>id</string> "o_image_well" = id;
<key>o_audio_decoded_txt</key> "o_info_window" = id;
<string>id</string> "o_input_bitrate_lbl" = id;
<key>o_author_lbl</key> "o_input_bitrate_txt" = id;
<string>id</string> "o_input_box" = id;
<key>o_author_txt</key> "o_language_lbl" = id;
<string>id</string> "o_language_txt" = id;
<key>o_collection_lbl</key> "o_lost_abuffers_lbl" = id;
<string>id</string> "o_lost_abuffers_txt" = id;
<key>o_collection_txt</key> "o_lost_frames_lbl" = id;
<string>id</string> "o_lost_frames_txt" = id;
<key>o_copyright_lbl</key> "o_nowPlaying_lbl" = id;
<string>id</string> "o_nowPlaying_txt" = id;
<key>o_copyright_txt</key> "o_outline_view" = id;
<string>id</string> "o_played_abuffers_lbl" = id;
<key>o_date_lbl</key> "o_played_abuffers_txt" = id;
<string>id</string> "o_publisher_lbl" = id;
<key>o_date_txt</key> "o_publisher_txt" = id;
<string>id</string> "o_read_bytes_lbl" = id;
<key>o_demux_bitrate_lbl</key> "o_read_bytes_txt" = id;
<string>id</string> "o_saveMetaData_btn" = id;
<key>o_demux_bitrate_txt</key> "o_sent_bitrate_lbl" = id;
<string>id</string> "o_sent_bitrate_txt" = id;
<key>o_demux_bytes_lbl</key> "o_sent_bytes_lbl" = id;
<string>id</string> "o_sent_bytes_txt" = id;
<key>o_demux_bytes_txt</key> "o_sent_packets_lbl" = id;
<string>id</string> "o_sent_packets_txt" = id;
<key>o_description_lbl</key> "o_seqNum_lbl" = id;
<string>id</string> "o_seqNum_txt" = id;
<key>o_description_txt</key> "o_sout_box" = id;
<string>id</string> "o_tab_view" = id;
<key>o_displayed_lbl</key> "o_title_lbl" = id;
<string>id</string> "o_title_txt" = id;
<key>o_displayed_txt</key> "o_uri_lbl" = id;
<string>id</string> "o_uri_txt" = id;
<key>o_fps_lbl</key> "o_video_box" = id;
<string>id</string> "o_video_decoded_lbl" = id;
<key>o_fps_txt</key> "o_video_decoded_txt" = id;
<string>id</string> };
<key>o_genre_lbl</key> SUPERCLASS = NSObject;
<string>id</string> }
<key>o_genre_txt</key> );
<string>id</string> IBVersion = 1;
<key>o_image_well</key> }
<string>id</string> \ No newline at end of file
<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>
extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib
View file @ c2aa99a5
...@@ -2,18 +2,20 @@ ...@@ -2,18 +2,20 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key>
<string>69 68 356 240 0 0 1280 778 </string>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>644</string> <string>489.0</string>
<key>IBLastKnownRelativeProjectPath</key> <key>IBLastKnownRelativeProjectPath</key>
<string>../../vlc.xcodeproj</string> <string>../../vlc.xcodeproj</string>
<key>IBOldestOS</key> <key>IBOldestOS</key>
<integer>5</integer> <integer>5</integer>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>3</integer> <integer>2</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>9C31</string> <string>9E17</string>
<key>targetFramework</key> <key>targetFramework</key>
<string>IBCocoaFramework</string> <string>IBCocoaFramework</string>
</dict> </dict>
......
modules/gui/macosx/playlistinfo.m
View file @ c2aa99a5
...@@ -64,7 +64,8 @@ static VLCInfo *_o_sharedInstance = nil; ...@@ -64,7 +64,8 @@ static VLCInfo *_o_sharedInstance = nil;
- (void)awakeFromNib - (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_info_window setTitle: _NS("Media Information")];
[o_uri_lbl setStringValue: _NS("Location")]; [o_uri_lbl setStringValue: _NS("Location")];
...@@ -114,7 +115,7 @@ static VLCInfo *_o_sharedInstance = nil; ...@@ -114,7 +115,7 @@ static VLCInfo *_o_sharedInstance = nil;
[o_info_window setInitialFirstResponder: o_uri_txt]; [o_info_window setInitialFirstResponder: o_uri_txt];
[o_info_window setDelegate: self]; [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 */ * Update ourselves */
[self updatePanelWithItem:p_item]; [self updatePanelWithItem:p_item];
} }
...@@ -420,7 +421,7 @@ static VLCInfo *_o_sharedInstance = nil; ...@@ -420,7 +421,7 @@ static VLCInfo *_o_sharedInstance = nil;
error: error:
pl_Release( VLCIntf ); pl_Release( VLCIntf );
NSRunAlertPanel(_NS("Error while saving meta"), 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); _NS("OK"), nil, nil);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment