* enable multiple selections for streaming as well (closes #522) and put some news

diff --git a/NEWS b/NEWS
index 41dac0b756c4e13b69a59020dcf5b4556c446471..3ca8a692f73e9cfff832f7c17b3acde5c4f9e199 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -34,8 +34,8 @@ Interfaces:
     - Improved playlist handling
     - Support for popup menus, animated bitmaps, equalizer, ...
  * OS X
-    - Overlay control panel
-    - 
+    - support for processing multiple items with the wizard in a single run
+    - option to save selections in the wizard for a session (default enabled)
  * HTTP
     - Much improved default interface pages
 

diff --git a/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib
index cad9ebf6bbda65cc28189246c15dc42591181038..fc043378fb3eaf638f7490feb50960f31957708a 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.m b/modules/gui/macosx/wizard.m
index 3906f8109503dc24021978d3d5e8a3eeba597570..53df29be7673915a6ae7c481456d2f84332d1ec1 100644 (file)
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -525,16 +525,13 @@ static VLCWizard *_o_sharedInstance = nil;
         o_mode = [[o_t1_matrix_strmgOrTrnscd selectedCell] title];
         if( [o_mode isEqualToString: _NS("Stream to network")] )
         {
-            /* we will be streaming -- we can't allow multiple selections */
+            /* we will be streaming */
             [o_userSelections setObject:@"strmg" forKey:@"trnscdOrStrmg"];
-            [o_t2_tbl_plst setAllowsMultipleSelection: NO];
         }
         else
         {
-            /* we will just do some transcoding, so we can allow multiple
-             * selections in our playlist */
+            /* we will just do some transcoding */
             [o_userSelections setObject:@"trnscd" forKey:@"trnscdOrStrmg"];
-            [o_t2_tbl_plst setAllowsMultipleSelection: YES];
         }
         [o_btn_backward setEnabled:YES];
         [o_tab_pageHolder selectTabViewItemAtIndex:1];