Skip to content

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

* added a summary-tab at the end of the wizard (mostly for debug-reasons, but... 

* added a summary-tab at the end of the wizard (mostly for debug-reasons, but perhaps we want to keep that for the user as well?)
* implemented the entire logic (except encap-formats while transcoding)
* added data collection of all values
* fixed some l10n issues

The wizard is still not useable for streaming, since it does not communicate the settings to the core yet. Additionally, various things still need to be done (see TODO at the beginning of the file).
parent 6febcbfe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 445 additions and 49 deletions
extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib
View file @ 2a67c7a4
......@@ -30,8 +30,7 @@
"o_btn_forward" = id;
"o_t1_btn_mrInfo_strmg" = id;
"o_t1_btn_mrInfo_trnscd" = id;
"o_t1_rdo_streaming" = id;
"o_t1_rdo_transcode" = id;
"o_t1_matrix_strmgOrTrnscd" = id;
"o_t1_txt_notice" = id;
"o_t1_txt_text" = id;
"o_t1_txt_title" = id;
......@@ -41,8 +40,7 @@
"o_t2_fld_pathToNewStrm" = id;
"o_t2_fld_prtExtrctFrom" = id;
"o_t2_fld_prtExtrctTo" = id;
"o_t2_rdo_exstPlstItm" = id;
"o_t2_rdo_newStrm" = id;
"o_t2_matrix_inputSourceType" = id;
"o_t2_tbl_plst" = id;
"o_t2_text" = id;
"o_t2_title" = id;
......@@ -87,6 +85,28 @@
"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_partExtract" = id;
"o_t8_fld_sap" = id;
"o_t8_fld_saveFileTo" = 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_partExtract" = id;
"o_t8_txt_sap" = id;
"o_t8_txt_saveFileTo" = 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_wh_btn_okay" = id;
"o_wh_txt_text" = id;
......
extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib
View file @ 2a67c7a4
......@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>62 303 356 241 0 0 800 578 </string>
<string>397 577 356 241 0 0 1440 878 </string>
<key>IBFramework Version</key>
<string>437.0</string>
<key>IBLockedObjects</key>
......@@ -11,13 +11,13 @@
<integer>6</integer>
<integer>14</integer>
<integer>10</integer>
<integer>270</integer>
</array>
<key>IBOpenObjects</key>
<array>
<integer>268</integer>
<integer>6</integer>
</array>
<key>IBSystem Version</key>
<string>8B15</string>
<string>8C40</string>
</dict>
</plist>
modules/gui/macosx/wizard.h
View file @ 2a67c7a4
......@@ -29,29 +29,40 @@
@interface VLCWizard : NSObject
{
IBOutlet id o_btn_backward;
/* general items */
IBOutlet id o_btn_backward;
IBOutlet id o_btn_cancel;
IBOutlet id o_btn_forward;
IBOutlet id o_tab_pageHolder;
IBOutlet id o_wizard_window;
IBOutlet id o_wizardhelp_window;
IBOutlet id o_wh_txt_title;
IBOutlet id o_wh_txt_text;
IBOutlet id o_wh_btn_okay;
/* page one ("Hello") */
IBOutlet id o_t1_btn_mrInfo_strmg;
IBOutlet id o_t1_btn_mrInfo_trnscd;
IBOutlet id o_t1_rdo_streaming;
IBOutlet id o_t1_rdo_transcode;
IBOutlet id o_t1_matrix_strmgOrTrnscd;
IBOutlet id o_t1_txt_notice;
IBOutlet id o_t1_txt_text;
IBOutlet id o_t1_txt_title;
/* page two ("Input") */
IBOutlet id o_t2_box_prtExtrct;
IBOutlet id o_t2_ckb_enblPartExtrct;
IBOutlet id o_t2_btn_chooseFile;
IBOutlet id o_t2_fld_pathToNewStrm;
IBOutlet id o_t2_fld_prtExtrctFrom;
IBOutlet id o_t2_fld_prtExtrctTo;
IBOutlet id o_t2_rdo_exstPlstItm;
IBOutlet id o_t2_rdo_newStrm;
IBOutlet id o_t2_matrix_inputSourceType;
IBOutlet id o_t2_tbl_plst;
IBOutlet id o_t2_text;
IBOutlet id o_t2_title;
IBOutlet id o_t2_txt_prtExtrctFrom;
IBOutlet id o_t2_txt_prtExtrctTo;
/* page one ("Streaming 1") */
IBOutlet id o_t3_box_dest;
IBOutlet id o_t3_box_strmgMthd;
IBOutlet id o_t3_fld_address;
......@@ -59,6 +70,8 @@
IBOutlet id o_t3_txt_destInfo;
IBOutlet id o_t3_txt_text;
IBOutlet id o_t3_txt_title;
/* page four ("Transcode 1") */
IBOutlet id o_t4_box_audio;
IBOutlet id o_t4_box_video;
IBOutlet id o_t4_ckb_audio;
......@@ -75,9 +88,13 @@
IBOutlet id o_t4_txt_videoCodec;
IBOutlet id o_t4_txt_hintAudio;
IBOutlet id o_t4_txt_hintVideo;
/* page five ("Encap") */
IBOutlet id o_t5_matrix_encap;
IBOutlet id o_t5_text;
IBOutlet id o_t5_title;
/* page six ("Streaming 2") */
IBOutlet id o_t6_ckb_sap;
IBOutlet id o_t6_fld_sap;
IBOutlet id o_t6_fld_ttl;
......@@ -86,17 +103,41 @@
IBOutlet id o_t6_txt_ttl;
IBOutlet id o_t6_btn_mrInfo_ttl;
IBOutlet id o_t6_btn_mrInfo_sap;
/* page seven ("Transcode 2") */
IBOutlet id o_t7_btn_chooseFile;
IBOutlet id o_t7_fld_filePath;
IBOutlet id o_t7_text;
IBOutlet id o_t7_title;
IBOutlet id o_t7_txt_saveFileTo;
IBOutlet id o_tab_pageHolder;
IBOutlet id o_wizard_window;
IBOutlet id o_wizardhelp_window;
IBOutlet id o_wh_txt_title;
IBOutlet id o_wh_txt_text;
IBOutlet id o_wh_btn_okay;
/* page eight ("Summary") */
IBOutlet id o_t8_fld_destination;
IBOutlet id o_t8_fld_encapFormat;
IBOutlet id o_t8_fld_inptStream;
IBOutlet id o_t8_fld_partExtract;
IBOutlet id o_t8_fld_sap;
IBOutlet id o_t8_fld_saveFileTo;
IBOutlet id o_t8_fld_strmgMthd;
IBOutlet id o_t8_fld_trnscdAudio;
IBOutlet id o_t8_fld_trnscdVideo;
IBOutlet id o_t8_fld_ttl;
IBOutlet id o_t8_txt_destination;
IBOutlet id o_t8_txt_encapFormat;
IBOutlet id o_t8_txt_inputStream;
IBOutlet id o_t8_txt_partExtract;
IBOutlet id o_t8_txt_sap;
IBOutlet id o_t8_txt_saveFileTo;
IBOutlet id o_t8_txt_strmgMthd;
IBOutlet id o_t8_txt_text;
IBOutlet id o_t8_txt_title;
IBOutlet id o_t8_txt_trnscdAudio;
IBOutlet id o_t8_txt_trnscdVideo;
IBOutlet id o_t8_txt_ttl;
NSMutableDictionary * o_userSelections;
NSArray * o_videoCodecs;
NSArray * o_audioCodecs;
}
- (IBAction)cancelRun:(id)sender;
- (IBAction)nextTab:(id)sender;
......@@ -119,4 +160,5 @@
+ (VLCWizard *)sharedInstance;
- (void)showWizard;
- (void)showSummary;
@end
modules/gui/macosx/wizard.m
View file @ 2a67c7a4
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