Skip to content

V
vlc-gpu
Commit 3820b435 authored by Jon Lech Johansen's avatar Jon Lech Johansen
Browse files
Options

./extras/MacOSX/.../MainMenu.nib: added Open Target panel 

  ./modules/gui/macosx/open.[mh]: Open Target code
parent 89987e11
Expand all Show whitespace changes
Inline Side-by-side
Showing with 391 additions and 248 deletions
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ 3820b435
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
}; };
CLASS = VLCControls; CLASS = VLCControls;
LANGUAGE = ObjC; LANGUAGE = ObjC;
OUTLETS = {o_open = id; }; OUTLETS = {"o_open" = id; };
SUPERCLASS = NSObject; SUPERCLASS = NSObject;
}, },
{ {
...@@ -32,106 +32,119 @@ ...@@ -32,106 +32,119 @@
CLASS = VLCMain; CLASS = VLCMain;
LANGUAGE = ObjC; LANGUAGE = ObjC;
OUTLETS = { OUTLETS = {
o_controls = id; "o_controls" = id;
o_dmi_pause = id; "o_dmi_pause" = id;
o_dmi_play = id; "o_dmi_play" = id;
o_dmi_stop = id; "o_dmi_stop" = id;
o_messages = id; "o_messages" = id;
o_mi_about = id; "o_mi_about" = id;
o_mi_bring_atf = id; "o_mi_bring_atf" = id;
o_mi_chapter = id; "o_mi_chapter" = id;
o_mi_clear = id; "o_mi_clear" = id;
o_mi_copy = id; "o_mi_copy" = id;
o_mi_cut = id; "o_mi_cut" = id;
o_mi_deinterlace = id; "o_mi_deinterlace" = id;
o_mi_faster = id; "o_mi_faster" = id;
o_mi_fullscreen = id; "o_mi_fullscreen" = id;
o_mi_hide = id; "o_mi_hide" = id;
o_mi_hide_others = id; "o_mi_hide_others" = id;
o_mi_language = id; "o_mi_language" = id;
o_mi_loop = id; "o_mi_loop" = id;
o_mi_messages = id; "o_mi_messages" = id;
o_mi_minimize = id; "o_mi_minimize" = id;
o_mi_mute = id; "o_mi_mute" = id;
o_mi_next = id; "o_mi_next" = id;
o_mi_open_disc = id; "o_mi_open_disc" = id;
o_mi_open_file = id; "o_mi_open_file" = id;
o_mi_open_net = id; "o_mi_open_net" = id;
o_mi_open_quickly = id; "o_mi_open_quickly" = id;
o_mi_open_recent = id; "o_mi_open_recent" = id;
o_mi_open_recent_cm = id; "o_mi_open_recent_cm" = id;
o_mi_paste = id; "o_mi_paste" = id;
o_mi_pause = id; "o_mi_pause" = id;
o_mi_play = id; "o_mi_play" = id;
o_mi_playlist = id; "o_mi_playlist" = id;
o_mi_previous = id; "o_mi_previous" = id;
o_mi_program = id; "o_mi_program" = id;
o_mi_quit = id; "o_mi_quit" = id;
o_mi_select_all = id; "o_mi_select_all" = id;
o_mi_show_all = id; "o_mi_show_all" = id;
o_mi_slower = id; "o_mi_slower" = id;
o_mi_stop = id; "o_mi_stop" = id;
o_mi_subtitle = id; "o_mi_subtitle" = id;
o_mi_title = id; "o_mi_title" = id;
o_mi_vol_down = id; "o_mi_vol_down" = id;
o_mi_vol_up = id; "o_mi_vol_up" = id;
o_msgs_btn_ok = id; "o_msgs_btn_ok" = id;
o_msgs_panel = id; "o_msgs_panel" = id;
o_mu_controls = id; "o_mu_controls" = id;
o_mu_edit = id; "o_mu_edit" = id;
o_mu_file = id; "o_mu_file" = id;
o_mu_view = id; "o_mu_view" = id;
o_mu_window = id; "o_mu_window" = id;
o_playlist = id; "o_playlist" = id;
o_window = id; "o_window" = id;
}; };
SUPERCLASS = NSObject; SUPERCLASS = NSObject;
}, },
{ {
ACTIONS = { ACTIONS = {
openDisc = id; openDisc = id;
openDiscStepperChanged = id;
openDiscTypeChanged = id; openDiscTypeChanged = id;
openFile = id; openFile = id;
openFileBrowse = id;
openFilePathChanged = id;
openNet = id; openNet = id;
openNetModeChanged = id; openNetModeChanged = id;
openQuickly = id; openNetStepperChanged = id;
panelCancel = id; panelCancel = id;
panelOk = id; panelOk = id;
}; };
CLASS = VLCOpen; CLASS = VLCOpen;
LANGUAGE = ObjC; LANGUAGE = ObjC;
OUTLETS = { OUTLETS = {
o_disc_btn_cancel = id; "o_btn_cancel" = id;
o_disc_btn_ok = id; "o_btn_ok" = id;
o_disc_chapter = id; "o_disc_chapter" = id;
o_disc_device = id; "o_disc_chapter_lbl" = id;
o_disc_lbl_sp = id; "o_disc_chapter_stp" = id;
o_disc_lbl_type = id; "o_disc_device" = id;
o_disc_panel = id; "o_disc_device_lbl" = id;
o_disc_title = id; "o_disc_title" = id;
o_disc_type = id; "o_disc_title_lbl" = id;
o_net_address = id; "o_disc_title_stp" = id;
o_net_box_addr = id; "o_disc_type" = id;
o_net_box_mode = id; "o_disc_type_lbl" = id;
o_net_btn_cancel = id; "o_file_btn_browse" = id;
o_net_btn_ok = id; "o_file_path" = id;
o_net_mode = id; "o_mrl" = id;
o_net_panel = id; "o_net_cs_addr" = id;
o_net_port = id; "o_net_cs_addr_lbl" = id;
o_net_port_lbl = id; "o_net_cs_port" = id;
o_net_port_stp = id; "o_net_cs_port_lbl" = id;
o_playlist = id; "o_net_cs_port_stp" = id;
o_quickly_btn_cancel = id; "o_net_http_url" = id;
o_quickly_btn_ok = id; "o_net_http_url_lbl" = id;
o_quickly_panel = id; "o_net_mode" = id;
o_quickly_source = id; "o_net_udp_port" = id;
"o_net_udp_port_lbl" = id;
"o_net_udp_port_stp" = id;
"o_net_udpm_addr" = id;
"o_net_udpm_addr_lbl" = id;
"o_net_udpm_port" = id;
"o_net_udpm_port_lbl" = id;
"o_net_udpm_port_stp" = id;
"o_panel" = id;
"o_playlist" = id;
"o_tabview" = id;
}; };
SUPERCLASS = NSObject; SUPERCLASS = NSObject;
}, },
{ {
CLASS = VLCPlaylist; CLASS = VLCPlaylist;
LANGUAGE = ObjC; LANGUAGE = ObjC;
OUTLETS = {o_btn_close = id; o_panel = id; o_table_view = id; }; OUTLETS = {"o_btn_close" = id; "o_panel" = id; "o_table_view" = id; };
SUPERCLASS = NSObject; SUPERCLASS = NSObject;
}, },
{CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; } {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 3820b435
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="0.9"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key> <key>IBDocumentLocation</key>
<string>98 729 428 434 0 0 1600 1178 </string> <string>98 729 428 434 0 0 1600 1178 </string>
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
<string>93 566 72 114 0 0 1600 1178 </string> <string>93 566 72 114 0 0 1600 1178 </string>
</dict> </dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>263.2</string> <string>283.0</string>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>21</integer> <integer>636</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
<string>5S66</string> <string>6D52</string>
</dict> </dict>
</plist> </plist>
modules/gui/macosx/open.h
View file @ 3820b435
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* open.h: MacOS X plugin for vlc * open.h: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: open.h,v 1.1 2002/08/04 17:23:43 sam Exp $ * $Id: open.h,v 1.2 2002/10/05 00:10:17 jlj Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* *
...@@ -30,42 +30,61 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -30,42 +30,61 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
{ {
IBOutlet id o_playlist; IBOutlet id o_playlist;
IBOutlet id o_disc_panel; IBOutlet id o_panel;
IBOutlet id o_disc_btn_ok;
IBOutlet id o_disc_btn_cancel; IBOutlet id o_mrl;
IBOutlet id o_disc_lbl_type; IBOutlet id o_tabview;
IBOutlet id o_disc_lbl_sp;
IBOutlet id o_btn_ok;
IBOutlet id o_btn_cancel;
IBOutlet id o_file_path;
IBOutlet id o_file_btn_browse;
IBOutlet id o_disc_type; IBOutlet id o_disc_type;
IBOutlet id o_disc_type_lbl;
IBOutlet id o_disc_device;
IBOutlet id o_disc_device_lbl;
IBOutlet id o_disc_title; IBOutlet id o_disc_title;
IBOutlet id o_disc_title_lbl;
IBOutlet id o_disc_title_stp;
IBOutlet id o_disc_chapter; IBOutlet id o_disc_chapter;
IBOutlet id o_disc_device; IBOutlet id o_disc_chapter_lbl;
IBOutlet id o_disc_chapter_stp;
IBOutlet id o_net_panel;
IBOutlet id o_net_btn_ok;
IBOutlet id o_net_btn_cancel;
IBOutlet id o_net_box_mode;
IBOutlet id o_net_box_addr;
IBOutlet id o_net_mode; IBOutlet id o_net_mode;
IBOutlet id o_net_address; IBOutlet id o_net_udp_port;
IBOutlet id o_net_port; IBOutlet id o_net_udp_port_lbl;
IBOutlet id o_net_port_lbl; IBOutlet id o_net_udp_port_stp;
IBOutlet id o_net_port_stp; IBOutlet id o_net_udpm_addr;
IBOutlet id o_net_udpm_addr_lbl;
IBOutlet id o_quickly_panel; IBOutlet id o_net_udpm_port;
IBOutlet id o_quickly_btn_ok; IBOutlet id o_net_udpm_port_lbl;
IBOutlet id o_quickly_btn_cancel; IBOutlet id o_net_udpm_port_stp;
IBOutlet id o_quickly_source; IBOutlet id o_net_cs_addr;
IBOutlet id o_net_cs_addr_lbl;
IBOutlet id o_net_cs_port;
IBOutlet id o_net_cs_port_lbl;
IBOutlet id o_net_cs_port_stp;
IBOutlet id o_net_http_url;
IBOutlet id o_net_http_url_lbl;
} }
- (void)openTarget:(int)i_type;
- (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi;
- (IBAction)openFile:(id)sender; - (IBAction)openFile:(id)sender;
- (void)openFilePathChanged:(NSNotification *)o_notification;
- (IBAction)openDisc:(id)sender; - (IBAction)openDisc:(id)sender;
- (IBAction)openDiscTypeChanged:(id)sender; - (IBAction)openDiscTypeChanged:(id)sender;
- (IBAction)openDiscStepperChanged:(id)sender;
- (void)openDiscInfoChanged:(NSNotification *)o_notification;
- (IBAction)openNet:(id)sender; - (IBAction)openNet:(id)sender;
- (IBAction)openNetModeChanged:(id)sender; - (IBAction)openNetModeChanged:(id)sender;
- (IBAction)openNetStepperChanged:(id)sender;
- (IBAction)openQuickly:(id)sender; - (void)openNetInfoChanged:(NSNotification *)o_notification;
- (IBAction)panelCancel:(id)sender; - (IBAction)panelCancel:(id)sender;
- (IBAction)panelOk:(id)sender; - (IBAction)panelOk:(id)sender;
......
modules/gui/macosx/open.m
View file @ 3820b435
This diff is collapsed.
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