Skip to content

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

macosx: Fixed the appereance of playlist items in the Streaming/Transcoding Wizard 

Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent b745d031
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 145 deletions
extras/package/macosx/Resources/English.lproj/Wizard.nib/classes.nib
View file @ 6f00c8d1
{
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = VLCPlaylistCommon; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
CLASS = VLCPlaylistWizard;
LANGUAGE = ObjC;
OUTLETS = {
"o_outline_view" = id;
"o_tc_author" = id;
"o_tc_duration" = id;
"o_tc_name" = id;
};
SUPERCLASS = VLCPlaylistCommon;
},
{
ACTIONS = {
cancelRun = id;
nextTab = id;
prevTab = id;
"t1_mrInfo_streaming" = id;
"t1_mrInfo_transcode" = id;
"t2_addNewStream" = id;
"t2_chooseStreamOrPlst" = id;
"t2_enableExtract" = id;
"t3_strmMthdChanged" = id;
"t4_AudCdcChanged" = id;
"t4_VidCdcChanged" = id;
"t4_enblAudTrnscd" = id;
"t4_enblVidTrnscd" = id;
"t67_mrInfo_local" = id;
"t6_enblSapAnnce" = id;
"t6_mrInfo_sap" = id;
"t6_mrInfo_ttl" = id;
"t7_selectTrnscdDestFile" = id;
};
CLASS = VLCWizard;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_backward" = id;
"o_btn_cancel" = id;
"o_btn_forward" = id;
"o_playlist_wizard" = id;
"o_t1_btn_mrInfo_strmg" = id;
"o_t1_btn_mrInfo_trnscd" = id;
"o_t1_matrix_strmgOrTrnscd" = id;
"o_t1_txt_notice" = id;
"o_t1_txt_text" = id;
"o_t1_txt_title" = id;
"o_t2_box_prtExtrct" = id;
"o_t2_btn_chooseFile" = id;
"o_t2_ckb_enblPartExtrct" = id;
"o_t2_fld_pathToNewStrm" = id;
"o_t2_fld_prtExtrctFrom" = id;
"o_t2_fld_prtExtrctTo" = id;
"o_t2_matrix_inputSourceType" = id;
"o_t2_tbl_plst" = id;
"o_t2_text" = id;
"o_t2_title" = id;
"o_t2_txt_prtExtrctFrom" = id;
"o_t2_txt_prtExtrctTo" = id;
"o_t3_box_dest" = id;
"o_t3_box_strmgMthd" = id;
"o_t3_fld_address" = id;
"o_t3_matrix_stmgMhd" = id;
"o_t3_txt_destInfo" = id;
"o_t3_txt_strgMthdInfo" = id;
"o_t3_txt_text" = id;
"o_t3_txt_title" = id;
"o_t4_box_audio" = id;
"o_t4_box_video" = id;
"o_t4_ckb_audio" = id;
"o_t4_ckb_video" = id;
"o_t4_pop_audioBitrate" = id;
"o_t4_pop_audioCodec" = id;
"o_t4_pop_videoBitrate" = id;
"o_t4_pop_videoCodec" = id;
"o_t4_text" = id;
"o_t4_title" = id;
"o_t4_txt_bitrateAudio" = id;
"o_t4_txt_bitrateVideo" = id;
"o_t4_txt_codecAudio" = id;
"o_t4_txt_codecVideo" = id;
"o_t4_txt_hintAudio" = id;
"o_t4_txt_hintVideo" = id;
"o_t5_matrix_encap" = id;
"o_t5_text" = id;
"o_t5_title" = id;
"o_t6_btn_mrInfo_local" = id;
"o_t6_btn_mrInfo_sap" = id;
"o_t6_btn_mrInfo_ttl" = id;
"o_t6_ckb_local" = id;
"o_t6_ckb_sap" = id;
"o_t6_ckb_soverlay" = id;
"o_t6_fld_sap" = id;
"o_t6_fld_ttl" = id;
"o_t6_text" = id;
"o_t6_title" = id;
"o_t6_txt_ttl" = id;
"o_t7_btn_chooseFile" = id;
"o_t7_btn_mrInfo_local" = id;
"o_t7_ckb_local" = id;
"o_t7_ckb_soverlay" = id;
"o_t7_fld_filePath" = id;
"o_t7_text" = id;
"o_t7_title" = id;
"o_t7_txt_saveFileTo" = id;
"o_t8_fld_destination" = id;
"o_t8_fld_encapFormat" = id;
"o_t8_fld_inptStream" = id;
"o_t8_fld_local" = id;
"o_t8_fld_mrl" = id;
"o_t8_fld_partExtract" = id;
"o_t8_fld_sap" = id;
"o_t8_fld_saveFileTo" = id;
"o_t8_fld_soverlay" = id;
"o_t8_fld_strmgMthd" = id;
"o_t8_fld_trnscdAudio" = id;
"o_t8_fld_trnscdVideo" = id;
"o_t8_fld_ttl" = id;
"o_t8_txt_destination" = id;
"o_t8_txt_encapFormat" = id;
"o_t8_txt_inputStream" = id;
"o_t8_txt_local" = id;
"o_t8_txt_mrl" = id;
"o_t8_txt_partExtract" = id;
"o_t8_txt_sap" = id;
"o_t8_txt_saveFileTo" = id;
"o_t8_txt_soverlay" = id;
"o_t8_txt_strmgMthd" = id;
"o_t8_txt_text" = id;
"o_t8_txt_title" = id;
"o_t8_txt_trnscdAudio" = id;
"o_t8_txt_trnscdVideo" = id;
"o_t8_txt_ttl" = id;
"o_tab_pageHolder" = id;
"o_wizard_window" = id;
};
SUPERCLASS = NSObject;
IBClasses = (
{
CLASS = FirstResponder;
LANGUAGE = ObjC;
SUPERCLASS = NSObject;
},
{
CLASS = VLCPlaylistCommon;
LANGUAGE = ObjC;
SUPERCLASS = NSObject;
},
{
CLASS = VLCPlaylistWizard;
LANGUAGE = ObjC;
OUTLETS = {
"o_outline_view" = id;
"o_tc_author" = id;
"o_tc_duration" = id;
"o_tc_name" = id;
};
SUPERCLASS = VLCPlaylistCommon;
},
{
ACTIONS = {
cancelRun = id;
nextTab = id;
prevTab = id;
"t1_mrInfo_streaming" = id;
"t1_mrInfo_transcode" = id;
"t2_addNewStream" = id;
"t2_chooseStreamOrPlst" = id;
"t2_enableExtract" = id;
"t3_strmMthdChanged" = id;
"t4_AudCdcChanged" = id;
"t4_VidCdcChanged" = id;
"t4_enblAudTrnscd" = id;
"t4_enblVidTrnscd" = id;
"t67_mrInfo_local" = id;
"t6_enblSapAnnce" = id;
"t6_mrInfo_sap" = id;
"t6_mrInfo_ttl" = id;
"t7_selectTrnscdDestFile" = id;
};
CLASS = VLCWizard;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_backward" = id;
"o_btn_cancel" = id;
"o_btn_forward" = id;
"o_playlist_wizard" = id;
"o_t1_btn_mrInfo_strmg" = id;
"o_t1_btn_mrInfo_trnscd" = id;
"o_t1_matrix_strmgOrTrnscd" = id;
"o_t1_txt_notice" = id;
"o_t1_txt_text" = id;
"o_t1_txt_title" = id;
"o_t2_box_prtExtrct" = id;
"o_t2_btn_chooseFile" = id;
"o_t2_ckb_enblPartExtrct" = id;
"o_t2_fld_pathToNewStrm" = id;
"o_t2_fld_prtExtrctFrom" = id;
"o_t2_fld_prtExtrctTo" = id;
"o_t2_matrix_inputSourceType" = id;
"o_t2_tbl_plst" = id;
"o_t2_text" = id;
"o_t2_title" = id;
"o_t2_txt_prtExtrctFrom" = id;
"o_t2_txt_prtExtrctTo" = id;
"o_t3_box_dest" = id;
"o_t3_box_strmgMthd" = id;
"o_t3_fld_address" = id;
"o_t3_matrix_stmgMhd" = id;
"o_t3_txt_destInfo" = id;
"o_t3_txt_strgMthdInfo" = id;
"o_t3_txt_text" = id;
"o_t3_txt_title" = id;
"o_t4_box_audio" = id;
"o_t4_box_video" = id;
"o_t4_ckb_audio" = id;
"o_t4_ckb_video" = id;
"o_t4_pop_audioBitrate" = id;
"o_t4_pop_audioCodec" = id;
"o_t4_pop_videoBitrate" = id;
"o_t4_pop_videoCodec" = id;
"o_t4_text" = id;
"o_t4_title" = id;
"o_t4_txt_bitrateAudio" = id;
"o_t4_txt_bitrateVideo" = id;
"o_t4_txt_codecAudio" = id;
"o_t4_txt_codecVideo" = id;
"o_t4_txt_hintAudio" = id;
"o_t4_txt_hintVideo" = id;
"o_t5_matrix_encap" = id;
"o_t5_text" = id;
"o_t5_title" = id;
"o_t6_btn_mrInfo_local" = id;
"o_t6_btn_mrInfo_sap" = id;
"o_t6_btn_mrInfo_ttl" = id;
"o_t6_ckb_local" = id;
"o_t6_ckb_sap" = id;
"o_t6_ckb_soverlay" = id;
"o_t6_fld_sap" = id;
"o_t6_fld_ttl" = id;
"o_t6_text" = id;
"o_t6_title" = id;
"o_t6_txt_ttl" = id;
"o_t7_btn_chooseFile" = id;
"o_t7_btn_mrInfo_local" = id;
"o_t7_ckb_local" = id;
"o_t7_ckb_soverlay" = id;
"o_t7_fld_filePath" = id;
"o_t7_text" = id;
"o_t7_title" = id;
"o_t7_txt_saveFileTo" = id;
"o_t8_fld_destination" = id;
"o_t8_fld_encapFormat" = id;
"o_t8_fld_inptStream" = id;
"o_t8_fld_local" = id;
"o_t8_fld_mrl" = id;
"o_t8_fld_partExtract" = id;
"o_t8_fld_sap" = id;
"o_t8_fld_saveFileTo" = id;
"o_t8_fld_soverlay" = id;
"o_t8_fld_strmgMthd" = id;
"o_t8_fld_trnscdAudio" = id;
"o_t8_fld_trnscdVideo" = id;
"o_t8_fld_ttl" = id;
"o_t8_txt_destination" = id;
"o_t8_txt_encapFormat" = id;
"o_t8_txt_inputStream" = id;
"o_t8_txt_local" = id;
"o_t8_txt_mrl" = id;
"o_t8_txt_partExtract" = id;
"o_t8_txt_sap" = id;
"o_t8_txt_saveFileTo" = id;
"o_t8_txt_soverlay" = id;
"o_t8_txt_strmgMthd" = id;
"o_t8_txt_text" = id;
"o_t8_txt_title" = id;
"o_t8_txt_trnscdAudio" = id;
"o_t8_txt_trnscdVideo" = id;
"o_t8_txt_ttl" = id;
"o_tab_pageHolder" = id;
"o_wizard_window" = id;
};
SUPERCLASS = NSObject;
}
);
IBVersion = 1;
);
IBVersion = 1;
}
\ No newline at end of file
extras/package/macosx/Resources/English.lproj/Wizard.nib/info.nib
View file @ 6f00c8d1
<?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">
<!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>255 498 356 241 0 0 1024 746 </string>
<key>IBFramework Version</key>
<string>446.1</string>
<string>489.0</string>
<key>IBLockedObjects</key>
<array>
<integer>6</integer>
......@@ -17,6 +17,6 @@
<integer>6</integer>
</array>
<key>IBSystem Version</key>
<string>8R3032</string>
<string>9E17</string>
</dict>
</plist>
modules/gui/macosx/wizard.m
View file @ 6f00c8d1
......@@ -344,10 +344,12 @@ static VLCWizard *_o_sharedInstance = nil;
[[o_t2_matrix_inputSourceType cellAtRow:1 column:0] setTitle:
_NS("Existing playlist item")];
[o_t2_btn_chooseFile setTitle: _NS("Choose...")];
[[[o_t2_tbl_plst tableColumnWithIdentifier:@"1"] headerCell]
[[[o_t2_tbl_plst tableColumnWithIdentifier:@"name"] headerCell]
setStringValue: _NS("Title")];
[[[o_t2_tbl_plst tableColumnWithIdentifier:@"2"] headerCell]
[[[o_t2_tbl_plst tableColumnWithIdentifier:@"artist"] headerCell]
setStringValue: _NS("Author")];
[[[o_t2_tbl_plst tableColumnWithIdentifier:@"duration"] headerCell]
setStringValue: _NS("Duration")];
[o_t2_box_prtExtrct setTitle: _NS("Partial Extract")];
[o_t2_ckb_enblPartExtrct setTitle: _NS("Enable")];
[o_t2_ckb_enblPartExtrct setToolTip: _NS("This can be used to read only a "
......
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