Skip to content

V
vlc
Commit 727e57b4 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* seperated the open, sout and sub-open dialogues from the main nib

parent 49de1e5f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 544 additions and 154 deletions
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ 727e57b4
......@@ -105,6 +105,10 @@
ACTIONS = {
clearRecentItems = id;
closeError = id;
intfOpenDisc = id;
intfOpenFile = id;
intfOpenFileGeneric = id;
intfOpenNet = id;
openCrashLog = id;
openDocumentation = id;
openLicense = id;
......@@ -228,6 +232,7 @@
"o_mu_videotrack" = id;
"o_mu_visual" = id;
"o_mu_window" = id;
"o_open" = id;
"o_playlist" = id;
"o_scrollfield" = id;
"o_timefield" = id;
......@@ -238,155 +243,17 @@
SUPERCLASS = NSObject;
},
{
ACTIONS = {
openDisc = id;
openDiscMenusChanged = id;
openDiscStepperChanged = id;
openDiscTypeChanged = id;
openFile = id;
openFileBrowse = id;
openFileGeneric = id;
openFileStreamChanged = id;
openNet = id;
openNetModeChanged = id;
openNetStepperChanged = id;
openVTSBrowse = id;
panelCancel = id;
panelOk = id;
subCloseSheet = id;
subDelayStepperChanged = id;
subFileBrowse = id;
subFpsStepperChanged = id;
subOverride = id;
subSettings = id;
subsChanged = id;
};
ACTIONS = {};
CLASS = VLCOpen;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_cancel" = id;
"o_btn_ok" = id;
"o_disc_chapter" = id;
"o_disc_chapter_lbl" = id;
"o_disc_chapter_stp" = id;
"o_disc_device" = id;
"o_disc_device_lbl" = id;
"o_disc_dvd_menus" = id;
"o_disc_title" = id;
"o_disc_title_lbl" = id;
"o_disc_title_stp" = id;
"o_disc_type" = id;
"o_disc_videots_btn_browse" = id;
"o_disc_videots_folder" = id;
"o_file_btn_browse" = id;
"o_file_path" = id;
"o_file_stream" = id;
"o_file_sub_align_lbl" = id;
"o_file_sub_align_pop" = id;
"o_file_sub_btn_browse" = id;
"o_file_sub_btn_settings" = id;
"o_file_sub_ckbox" = id;
"o_file_sub_delay" = id;
"o_file_sub_delay_lbl" = id;
"o_file_sub_delay_stp" = id;
"o_file_sub_encoding_lbl" = id;
"o_file_sub_encoding_pop" = id;
"o_file_sub_file_box" = id;
"o_file_sub_font_box" = id;
"o_file_sub_fps" = id;
"o_file_sub_fps_lbl" = id;
"o_file_sub_fps_stp" = id;
"o_file_sub_ok_btn" = id;
"o_file_sub_override" = id;
"o_file_sub_path" = id;
"o_file_sub_sheet" = id;
"o_file_sub_size_lbl" = id;
"o_file_sub_size_pop" = id;
"o_mrl" = id;
"o_mrl_lbl" = id;
"o_net_http_url" = id;
"o_net_http_url_lbl" = id;
"o_net_mode" = 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_output_ckbox" = id;
"o_panel" = id;
"o_playlist" = id;
"o_sout_options" = id;
"o_tabview" = id;
};
OUTLETS = {};
SUPERCLASS = NSObject;
},
{
ACTIONS = {
announceChanged = id;
outputChanged = id;
outputCloseSheet = id;
outputFileBrowse = id;
outputInfoChanged = id;
outputMethodChanged = id;
outputSettings = id;
streamPortStepperChanged = id;
streamTTLStepperChanged = id;
transcodeChanged = id;
transcodeInfoChanged = id;
};
ACTIONS = {};
CLASS = VLCOutput;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_browse" = id;
"o_btn_ok" = id;
"o_channel_name" = id;
"o_channel_name_lbl" = id;
"o_display" = id;
"o_dump_chkbox" = id;
"o_file_chkbox" = id;
"o_file_field" = id;
"o_http_chkbox" = id;
"o_method" = id;
"o_misc_lbl" = id;
"o_mux_lbl" = id;
"o_mux_selector" = id;
"o_open_panel" = id;
"o_options_lbl" = id;
"o_output_ckbox" = id;
"o_output_settings" = id;
"o_output_sheet" = id;
"o_rtsp_chkbox" = id;
"o_sap_chkbox" = id;
"o_sdp_url" = id;
"o_sdp_url_lbl" = id;
"o_slp_chkbox" = id;
"o_stream_address" = id;
"o_stream_address_lbl" = id;
"o_stream_port" = id;
"o_stream_port_lbl" = id;
"o_stream_port_stp" = id;
"o_stream_ttl" = id;
"o_stream_ttl_lbl" = id;
"o_stream_ttl_stp" = id;
"o_stream_type" = id;
"o_stream_type_lbl" = id;
"o_transcode_audio_bitrate" = id;
"o_transcode_audio_bitrate_lbl" = id;
"o_transcode_audio_channels" = id;
"o_transcode_audio_channels_lbl" = id;
"o_transcode_audio_chkbox" = id;
"o_transcode_audio_selector" = id;
"o_transcode_lbl" = id;
"o_transcode_video_bitrate" = id;
"o_transcode_video_bitrate_lbl" = id;
"o_transcode_video_chkbox" = id;
"o_transcode_video_scale" = id;
"o_transcode_video_scale_lbl" = id;
"o_transcode_video_selector" = id;
};
OUTLETS = {};
SUPERCLASS = NSObject;
},
{
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 727e57b4
......@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>470 105 505 517 0 0 1024 746 </string>
<string>16 61 505 517 0 0 800 578 </string>
<key>IBEditorPositions</key>
<dict>
<key>1617</key>
......@@ -11,7 +11,7 @@
<key>2197</key>
<string>91 300 596 367 0 0 1024 746 </string>
<key>29</key>
<string>229 690 419 44 0 0 1024 746 </string>
<string>163 439 419 44 0 0 800 578 </string>
<key>915</key>
<string>731 416 165 180 0 0 1024 746 </string>
</dict>
......@@ -24,6 +24,10 @@
<integer>2206</integer>
<integer>2199</integer>
</array>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>7S215</string>
</dict>
......
extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib 0 → 100644
View file @ 727e57b4
This diff is collapsed.
extras/MacOSX/Resources/English.lproj/Open.nib/info.nib 0 → 100644
View file @ 727e57b4
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>-8 61 505 517 0 0 800 578 </string>
<key>IBFramework Version</key>
<string>364.0</string>
<key>IBLockedObjects</key>
<array>
<integer>2203</integer>
<integer>2208</integer>
<integer>2206</integer>
<integer>2199</integer>
</array>
<key>IBSystem Version</key>
<string>7S215</string>
</dict>
</plist>
extras/MacOSX/vlc.pbproj/project.pbxproj
View file @ 727e57b4
......@@ -815,6 +815,7 @@
8E9CA1C106D7DEE800B7186C,
DCA00AA9075F948800E6BF46,
DCF358BB077F10BA007DB450,
DCA693C30789DF8700139EC6,
);
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
......@@ -2244,6 +2245,30 @@
settings = {
};
};
DCA693C10789DF8700139EC6 = {
children = (
DCA693C20789DF8700139EC6,
);
isa = PBXVariantGroup;
name = Open.nib;
path = "";
refType = 4;
sourceTree = "<group>";
};
DCA693C20789DF8700139EC6 = {
isa = PBXFileReference;
lastKnownFileType = wrapper.nib;
name = English;
path = Resources/English.lproj/Open.nib;
refType = 4;
sourceTree = "<group>";
};
DCA693C30789DF8700139EC6 = {
fileRef = DCA693C10789DF8700139EC6;
isa = PBXBuildFile;
settings = {
};
};
DCF358B9077F10BA007DB450 = {
children = (
DCF358BA077F10BA007DB450,
......@@ -2273,6 +2298,7 @@
DCA00AA7075F948800E6BF46,
F74F13EA02C2A79C01EE194C,
DCF358B9077F10BA007DB450,
DCA693C10789DF8700139EC6,
);
isa = PBXGroup;
name = nibs;
......
modules/gui/macosx/controls.m
View file @ 727e57b4
......@@ -54,7 +54,7 @@
{
vlc_mutex_unlock( &p_playlist->object_lock );
vlc_object_release( p_playlist );
[o_open openFileGeneric: nil];
[o_open openFileGeneric];
}
else
{
......
modules/gui/macosx/intf.h
View file @ 727e57b4
......@@ -83,6 +83,7 @@ struct intf_sys_t
intf_thread_t *p_intf; /* The main intf object */
id o_prefs; /* VLCPrefs */
id o_about; /* VLAboutBox */
id o_open; /* VLCOpen */
IBOutlet id o_window; /* main window */
IBOutlet id o_scrollfield; /* info field */
......@@ -261,6 +262,11 @@ struct intf_sys_t
- (IBAction)clearRecentItems:(id)sender;
- (void)openRecentItem:(id)sender;
- (IBAction)intfOpenFile:(id)sender;
- (IBAction)intfOpenFileGeneric:(id)sender;
- (IBAction)intfOpenDisc:(id)sender;
- (IBAction)intfOpenNet:(id)sender;
- (IBAction)viewAbout:(id)sender;
- (IBAction)viewPreferences:(id)sender;
- (IBAction)closeError:(id)sender;
......
modules/gui/macosx/intf.m
View file @ 727e57b4
......@@ -37,6 +37,7 @@
#include "playlist.h"
#include "controls.h"
#include "about.h"
#include "open.h"
/*****************************************************************************
* Local prototypes.
......@@ -376,6 +377,10 @@ static VLCMain *_o_sharedMainInstance = nil;
[self setSubmenusEnabled: FALSE];
[self manageVolumeSlider];
/* let's load the open and sout-option dialogues and init the related classes */
o_open = [[VLCOpen alloc] init];
[o_open getReady];
p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist )
......@@ -1283,6 +1288,26 @@ static VLCMain *_o_sharedMainInstance = nil;
[self application: nil openFile: [sender title]];
}
- (IBAction)intfOpenFile:(id)sender
{
[o_open openFile];
}
- (IBAction)intfOpenFileGeneric:(id)sender
{
[o_open openFileGeneric];
}
- (IBAction)intfOpenDisc:(id)sender
{
[o_open openDisc];
}
- (IBAction)intfOpenNet:(id)sender
{
[o_open openNet];
}
- (IBAction)viewAbout:(id)sender
{
[o_about showPanel];
......
modules/gui/macosx/open.h
View file @ 727e57b4
......@@ -96,24 +96,26 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_sout_options;
}
+ (VLCOpen *)sharedInstance;
- (void)setSubPanel;
- (void)openTarget:(int)i_type;
- (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi;
- (IBAction)openFileGeneric:(id)sender;
- (void)openFileGeneric;
- (void)openFilePathChanged:(NSNotification *)o_notification;
- (IBAction)openFileBrowse:(id)sender;
- (void) pathChosenInPanel: (NSOpenPanel *) sheet withReturn:(int)returnCode contextInfo:(void *)contextInfo;
- (IBAction)openFileStreamChanged:(id)sender;
- (IBAction)openDisc:(id)sender;
- (void)openDisc;
- (IBAction)openDiscTypeChanged:(id)sender;
- (IBAction)openDiscStepperChanged:(id)sender;
- (void)openDiscInfoChanged:(NSNotification *)o_notification;
- (IBAction)openDiscMenusChanged:(id)sender;
- (IBAction)openVTSBrowse:(id)sender;
- (IBAction)openNet:(id)sender;
- (void)openNet;
- (IBAction)openNetModeChanged:(id)sender;
- (IBAction)openNetStepperChanged:(id)sender;
- (void)openNetInfoChanged:(NSNotification *)o_notification;
......@@ -129,6 +131,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
- (IBAction)panelCancel:(id)sender;
- (IBAction)panelOk:(id)sender;
- (IBAction)openFile:(id)sender;
- (void)openFile;
- (void)getReady;
@end
modules/gui/macosx/open.m
View file @ 727e57b4
......@@ -129,6 +129,29 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
*****************************************************************************/
@implementation VLCOpen
static VLCOpen *_o_sharedMainInstance = nil;
+ (VLCOpen *)sharedInstance
{
return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
}
- (id)init
{
if( _o_sharedMainInstance) {
[self dealloc];
} else {
_o_sharedMainInstance = [super init];
}
return _o_sharedMainInstance;
}
- (void)getReady
{
[NSBundle loadNibNamed:@"Open" owner:self];
}
- (void)awakeFromNib
{
intf_thread_t * p_intf = VLCIntf;
......@@ -358,19 +381,19 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
}
}
- (IBAction)openFileGeneric:(id)sender
- (void)openFileGeneric
{
[self openFilePathChanged: nil];
[self openTarget: 0];
}
- (IBAction)openDisc:(id)sender
- (void)openDisc
{
[self openDiscTypeChanged: nil];
[self openTarget: 1];
}
- (IBAction)openNet:(id)sender
- (void)openNet
{
[self openNetModeChanged: nil];
[self openTarget: 2];
......@@ -704,7 +727,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_mrl setStringValue: o_mrl_string];
}
- (IBAction)openFile:(id)sender
- (void)openFile
{
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
int i;
......
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