* additional GUI-fixes

* implemented the streaming-method-tab correctly (forgot that previously...)
* implemented MRL-composition when transcoding (still needs to be done for streaming)
* fixed various other stuff here and there

not usable yet - work will be continued after July 21th

(refs #13)

extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib

@@ -12,6 +12,7 @@
                 "t2_chooseStreamOrPlst" = id; 
                 "t2_enableExtract" = id; 
                 "t3_addressEntered" = id; 
+                "t3_strmMthdChanged" = id; 
                 "t4_AudCdcChanged" = id; 
                 "t4_VidCdcChanged" = id; 
                 "t4_enblAudTrnscd" = id; 
@@ -51,6 +52,7 @@
                 "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; 
@@ -88,6 +90,7 @@
                 "o_t8_fld_destination" = id; 
                 "o_t8_fld_encapFormat" = id; 
                 "o_t8_fld_inptStream" = id; 
+                "o_t8_fld_mrl" = id; 
                 "o_t8_fld_partExtract" = id; 
                 "o_t8_fld_sap" = id; 
                 "o_t8_fld_saveFileTo" = id; 
@@ -98,6 +101,7 @@
                 "o_t8_txt_destination" = id; 
                 "o_t8_txt_encapFormat" = id; 
                 "o_t8_txt_inputStream" = id; 
+                "o_t8_txt_mrl" = id; 
                 "o_t8_txt_partExtract" = id; 
                 "o_t8_txt_sap" = id; 
                 "o_t8_txt_saveFileTo" = id; 

extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib

@@ -15,8 +15,8 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>6</integer>
 		<integer>268</integer>
+		<integer>6</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8C40</string>

modules/gui/macosx/intf.m

@@ -444,7 +444,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
 
     /* main menu */
-    [o_mi_about setTitle: _NS("About VLC media player")];
+    [o_mi_about setTitle: _NS("About VLC media player...")];
     [o_mi_prefs setTitle: _NS("Preferences...")];
     [o_mi_add_intf setTitle: _NS("Add Interface")];
     [o_mu_add_intf setTitle: _NS("Add Interface")];

modules/gui/macosx/wizard.h

@@ -70,6 +70,7 @@
     IBOutlet id o_t3_txt_destInfo;
     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;
@@ -122,6 +123,7 @@
     IBOutlet id o_t8_fld_trnscdAudio;
     IBOutlet id o_t8_fld_trnscdVideo;
     IBOutlet id o_t8_fld_ttl;
+	IBOutlet id o_t8_fld_mrl;
     IBOutlet id o_t8_txt_destination;
     IBOutlet id o_t8_txt_encapFormat;
     IBOutlet id o_t8_txt_inputStream;
@@ -134,10 +136,13 @@
     IBOutlet id o_t8_txt_trnscdAudio;
     IBOutlet id o_t8_txt_trnscdVideo;
     IBOutlet id o_t8_txt_ttl;
+	IBOutlet id o_t8_txt_mrl;
 	
 	NSMutableDictionary * o_userSelections;
 	NSArray * o_videoCodecs;
 	NSArray * o_audioCodecs;
+	NSArray * o_encapFormats;
+	NSString * o_mrl;
 }
 - (IBAction)cancelRun:(id)sender;
 - (IBAction)nextTab:(id)sender;
@@ -148,6 +153,7 @@
 - (IBAction)t2_chooseStreamOrPlst:(id)sender;
 - (IBAction)t2_enableExtract:(id)sender;
 - (IBAction)t3_addressEntered:(id)sender;
+- (IBAction)t3_strmMthdChanged:(id)sender;
 - (IBAction)t4_AudCdcChanged:(id)sender;
 - (IBAction)t4_enblAudTrnscd:(id)sender;
 - (IBAction)t4_enblVidTrnscd:(id)sender;
@@ -159,7 +165,9 @@
 - (IBAction)wh_closeSheet:(id)sender;
 
 + (VLCWizard *)sharedInstance;
+
 - (void)showWizard;
 - (void)showSummary;
 - (void)resetWizard;
+- (void)createMrl;
 @end

modules/gui/wxwindows/streamdata.h

@@ -132,7 +132,7 @@ static struct method methods_array[] =
      "to stream to several computers, but it does not work over Internet."),
      N_("Enter the multicast address to stream to in this field. "
      "This must be an IP address between 224.0.0.0 an 239.255.255.255 "
-     "For a private use, enter an address beginning with 239.255."),
+     "For a private use, enter an address beginning with 239.255"),
      { MUX_TS, -1,-1,-1,-1,-1,-1,-1,-1 } },
     {"http://",N_("HTTP"),
      N_("Use this to stream to several computers. This method is "
@@ -158,13 +158,13 @@ static struct encap encaps_array[] =
     { MUX_PS, "ps","MPEG PS", N_("MPEG Program Stream") },
     { MUX_TS, "ts","MPEG TS", N_("MPEG Transport Stream") },
     { MUX_MPEG, "ps", "MPEG 1", N_("MPEG 1 Format") },
-    { MUX_OGG, "ogg", "OGG", N_("OGG") },
-    { MUX_RAW, "raw", "RAW", N_("RAW") },
-    { MUX_ASF, "asf","ASF", N_("ASF") },
-//    { MUX_AVI, "avi","AVI", N_("AVI") },
-    { MUX_MP4, "mp4","MP4", N_("MPEG4") },
-    { MUX_MOV, "mov","MOV", N_("MOV") },
-    { MUX_WAV, "wav","WAV", N_("WAV") },
+    { MUX_OGG, "ogg", "OGG", "OGG" },
+    { MUX_RAW, "raw", "RAW", "RAW" },
+    { MUX_ASF, "asf","ASF", "ASF" },
+//    { MUX_AVI, "avi","AVI", "AVI" },
+    { MUX_MP4, "mp4","MP4", "MPEG4" },
+    { MUX_MOV, "mov","MOV", "MOV" },
+    { MUX_WAV, "wav","WAV", "WAV" },
     { -1 , NULL,NULL , NULL } /* Do not remove me */
 };