Removes trailing spaces. Removes tabs.

[vlc] / modules / gui / macosx / wizard.h

diff --git a/modules/gui/macosx/wizard.h b/modules/gui/macosx/wizard.h
index 3de3c1b349ae7463f8fff1ce6e543655162f11d6..f27234a965d0edc2812509bfd90ccba902b66288 100644 (file)
--- a/modules/gui/macosx/wizard.h
+++ b/modules/gui/macosx/wizard.h
@@ -1,16 +1,16 @@
 /*****************************************************************************
  * wizard.h: MacOS X Streaming Wizard
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2006 the VideoLAN team
  * $Id$
  *
- * Authors: Felix Kühne <fkuehne@users.sf.net> 
+ * Authors: Felix Kühne <fkuehne@users.sf.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -18,29 +18,25 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
- * VLCWizard 
+ * VLCWizard
  *****************************************************************************/
  
 #import <Cocoa/Cocoa.h>
 
 @interface VLCWizard : NSObject
-{    
+{
     /* 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;
     IBOutlet id o_playlist_wizard;
-    
+ 
     /* page one ("Hello") */
     IBOutlet id o_t1_btn_mrInfo_strmg;
     IBOutlet id o_t1_btn_mrInfo_trnscd;
@@ -48,7 +44,7 @@
     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;
@@ -62,7 +58,7 @@
     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;
@@ -72,7 +68,7 @@
     IBOutlet id o_t3_txt_text;
     IBOutlet id o_t3_txt_title;
     IBOutlet id o_t3_txt_strgMthdInfo;
-    
+ 
     /* page four ("Transcode 1") */
     IBOutlet id o_t4_box_audio;
     IBOutlet id o_t4_box_video;
@@ -90,12 +86,12 @@
     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;
@@ -106,8 +102,9 @@
     IBOutlet id o_t6_btn_mrInfo_ttl;
     IBOutlet id o_t6_btn_mrInfo_sap;
     IBOutlet id o_t6_btn_mrInfo_local;
+    IBOutlet id o_t6_ckb_soverlay;
     IBOutlet id o_t6_ckb_local;
-    
+ 
     /* page seven ("Transcode 2") */
     IBOutlet id o_t7_btn_chooseFile;
     IBOutlet id o_t7_fld_filePath;
@@ -115,8 +112,9 @@
     IBOutlet id o_t7_title;
     IBOutlet id o_t7_txt_saveFileTo;
     IBOutlet id o_t7_btn_mrInfo_local;
+    IBOutlet id o_t7_ckb_soverlay;
     IBOutlet id o_t7_ckb_local;
-    
+ 
     /* page eight ("Summary") */
     IBOutlet id o_t8_fld_destination;
     IBOutlet id o_t8_fld_encapFormat;
@@ -127,6 +125,7 @@
     IBOutlet id o_t8_fld_strmgMthd;
     IBOutlet id o_t8_fld_trnscdAudio;
     IBOutlet id o_t8_fld_trnscdVideo;
+    IBOutlet id o_t8_fld_soverlay;
     IBOutlet id o_t8_fld_ttl;
     IBOutlet id o_t8_fld_mrl;
     IBOutlet id o_t8_fld_local;
@@ -141,16 +140,19 @@
     IBOutlet id o_t8_txt_title;
     IBOutlet id o_t8_txt_trnscdAudio;
     IBOutlet id o_t8_txt_trnscdVideo;
+    IBOutlet id o_t8_txt_soverlay;
     IBOutlet id o_t8_txt_ttl;
     IBOutlet id o_t8_txt_mrl;
     IBOutlet id o_t8_txt_local;
-    
+ 
     NSMutableDictionary * o_userSelections;
     NSArray * o_videoCodecs;
     NSArray * o_audioCodecs;
     NSArray * o_encapFormats;
     NSArray * o_strmgMthds;
     NSString * o_opts;
+ 
+    BOOL b_keepSettingsOrNot;
 }
 - (IBAction)cancelRun:(id)sender;
 - (IBAction)nextTab:(id)sender;
@@ -170,7 +172,6 @@
 - (IBAction)t6_mrInfo_sap:(id)sender;
 - (IBAction)t67_mrInfo_local:(id)sender;
 - (IBAction)t7_selectTrnscdDestFile:(id)sender;
-- (IBAction)wh_closeSheet:(id)sender;
 
 + (VLCWizard *)sharedInstance;