* implemented a general, re-usable help-panel used by all 4 "More Info" buttons ...

* copied the todo to the file

diff --git a/extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib
index e0916e774c2f64eee2a26aa552a803fdd00d5a45..65a78ba3af2cf6eb851d154e60c0611044fd99f5 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib
@@ -20,6 +20,7 @@
                 "t6_mrInfo_sap" = id; 
                 "t6_mrInfo_ttl" = id; 
                 "t7_selectTrnscdDestFile" = id; 
+                "wh_closeSheet" = id; 
             }; 
             CLASS = VLCWizard; 
             LANGUAGE = ObjC; 
@@ -87,7 +88,11 @@
                 "o_t7_title" = id; 
                 "o_t7_txt_saveFileTo" = id; 
                 "o_tab_pageHolder" = id; 
+                "o_wh_btn_okay" = id; 
+                "o_wh_txt_text" = id; 
+                "o_wh_txt_title" = id; 
                 "o_wizard_window" = id; 
+                "o_wizardhelp_window" = id; 
             }; 
             SUPERCLASS = NSObject; 
         }

diff --git a/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib b/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib
index be5f5cfc2410fa66e80c1807fb14ba774a751cdd..926bf2f91cc422965383266699511fdcb3c723ec 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib
@@ -5,7 +5,7 @@
        <key>IBDocumentLocation</key>
        <string>62 303 356 241 0 0 800 578 </string>
        <key>IBFramework Version</key>
-       <string>364.0</string>
+       <string>437.0</string>
        <key>IBLockedObjects</key>
        <array>
                <integer>6</integer>
@@ -14,9 +14,10 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
+               <integer>268</integer>
                <integer>6</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>7W98</string>
+       <string>8B15</string>
 </dict>
 </plist>

diff --git a/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib
index 366fd18515a44fd18c2528fbf093c146b0bd2d28..65ff8f0f91e83e882c2795eb991320d8397c08a3 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib and b/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/wizard.h b/modules/gui/macosx/wizard.h
index b0895502bdb3c13a868b210bd5f06538ee2da652..e4281de83d9439ed2ccd9aef850bfc9a9e2fba9c 100644 (file)
--- a/modules/gui/macosx/wizard.h
+++ b/modules/gui/macosx/wizard.h
@@ -93,6 +93,10 @@
     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;
 }
 - (IBAction)cancelRun:(id)sender;
 - (IBAction)nextTab:(id)sender;
@@ -111,6 +115,7 @@
 - (IBAction)t6_mrInfo_ttl:(id)sender;
 - (IBAction)t6_mrInfo_sap:(id)sender;
 - (IBAction)t7_selectTrnscdDestFile:(id)sender;
+- (IBAction)wh_closeSheet:(id)sender;
 
 + (VLCWizard *)sharedInstance;
 - (void)showWizard;

diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m
index f0048cec0d3c3eba5b645add7d3e637248078b63..9eaa57fa68702d7991118992d24d42e521438372 100644 (file)
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -26,7 +26,13 @@
  * Note: this code is based upon ../wxwindows/wizard.cpp,
  *       written by Clément Stenac.
  *****************************************************************************/ 
- 
+
+/* TODO:
+    - implementation of the logic, i.e. handling of the collected values, respective manipulation of the GUI, start of the stream
+    - move some arrays to an external header file
+    - some GUI things (e.g. radio buttons on page 2, etc. - see FIXMEs)
+    - l10n string fixes (both in OSX and WX) */
+
  
 /*****************************************************************************
  * Preamble
@@ -63,6 +69,8 @@ static VLCWizard *_o_sharedInstance = nil;
 {
     /* some minor cleanup */
     [o_t2_tbl_plst setEnabled:NO];
+       [o_wizardhelp_window setExcludedFromWindowsMenu:YES];
+       
 
     /* FIXME: make the both arrays global */
 
@@ -170,6 +178,9 @@ static VLCWizard *_o_sharedInstance = nil;
                               "additionnal parameters for your transcoding.")];
     [o_t7_txt_saveFileTo setStringValue: _NS("Select the file to save to")];
     [o_t7_btn_chooseFile setTitle: _NS("Choose...")];
+       
+       /* wizard help window */
+       [o_wh_btn_okay setTitle: _NS("OK")];
 }
 
 - (IBAction)cancelRun:(id)sender
@@ -191,12 +202,31 @@ static VLCWizard *_o_sharedInstance = nil;
 
 - (IBAction)t1_mrInfo_streaming:(id)sender
 {
-    /* show a simple notify sheet for the help */
+    /* show a sheet for the help */
+       /* since NSAlert does not exist on OSX < 10.3, we use our own implementation */
+       [o_wh_txt_title setStringValue: _NS("Stream to network")];
+       [o_wh_txt_text setStringValue: _NS("Use this to stream on a network.")];
+       [NSApp beginSheet: o_wizardhelp_window
+            modalForWindow: o_wizard_window
+            modalDelegate: o_wizardhelp_window
+            didEndSelector: nil
+            contextInfo: nil];
 }
 
 - (IBAction)t1_mrInfo_transcode:(id)sender
 {
-    /* show a simple notify sheet for the help */
+    /* show a sheet for the help */
+       [o_wh_txt_title setStringValue: _NS("Transcode/Save to file")];
+       [o_wh_txt_text setStringValue: _NS("Use this to save a stream to a file. You "\
+                       "have the possibility to reencode the stream. You can save whatever "\
+                       "VLC can read.\nPlease notice that VLC is not very suited " \
+                       "for file to file transcoding. You should use its transcoding " \
+            "features to save network streams, for example.")];
+       [NSApp beginSheet: o_wizardhelp_window
+            modalForWindow: o_wizard_window
+            modalDelegate: o_wizardhelp_window
+            didEndSelector: nil
+            contextInfo: nil];
 }
 
 - (IBAction)t2_addNewStream:(id)sender
@@ -290,12 +320,34 @@ static VLCWizard *_o_sharedInstance = nil;
 
 - (IBAction)t6_mrInfo_ttl:(id)sender
 {
-    /* show a simple notify sheet for the help */
+    /* show a sheet for the help */
+       [o_wh_txt_title setStringValue: _NS("Time-To-Live (TTL)")];
+       [o_wh_txt_text setStringValue: _NS("Define the TTL (Time-To-Live) of the stream. "\
+                       "This parameter is the maximum number of routers your stream can go "
+                       "through. If you don't know what it means, or if you want to stream on " \
+                       "your local network only, leave this setting to 1.")];
+       [NSApp beginSheet: o_wizardhelp_window
+            modalForWindow: o_wizard_window
+            modalDelegate: o_wizardhelp_window
+            didEndSelector: nil
+            contextInfo: nil];
 }
 
 - (IBAction)t6_mrInfo_sap:(id)sender
 {
-    /* show a simple notify sheet for the help */
+    /* show a sheet for the help */
+       [o_wh_txt_title setStringValue: _NS("SAP Announce")];
+       [o_wh_txt_text setStringValue: _NS("When streaming using UDP, you can " \
+               "announce your streams using the SAP/SDP announcing protocol. This " \
+               "way, the clients won't have to type in the multicast address, it " \
+               "will appear in their playlist if they enable the SAP extra interface.\n" \
+               "If you want to give a name to your stream, enter it here, " \
+               "else, a default name will be used.")];
+       [NSApp beginSheet: o_wizardhelp_window
+            modalForWindow: o_wizard_window
+            modalDelegate: o_wizardhelp_window
+            didEndSelector: nil
+            contextInfo: nil];
 }
 
 - (IBAction)t7_selectTrnscdDestFile:(id)sender
@@ -316,4 +368,11 @@ static VLCWizard *_o_sharedInstance = nil;
     }
 }
 
+- (IBAction)wh_closeSheet:(id)sender
+{
+       /* close the help sheet */
+       [NSApp endSheet:o_wizardhelp_window];
+       [o_wizardhelp_window close];
+}
+
 @end