macosx: replace the 'basic' vs 'all' radio button on the bottom left of the...

macosx: replace the 'basic' vs 'all' radio button on the bottom left of the prefs window with a simple button, which is nicer and more 'Mac-like'

modules/gui/macosx/prefs.h

@@ -40,7 +40,7 @@
     IBOutlet id o_save_btn;
     IBOutlet id o_cancel_btn;
     IBOutlet id o_reset_btn;
-    IBOutlet id o_basicFull_matrix;
+    IBOutlet id o_showBasic_btn;
 }
 
 + (VLCPrefs *)sharedInstance;

modules/gui/macosx/prefs.m

@@ -194,9 +194,6 @@ static VLCPrefs *_o_sharedMainInstance = nil;
 
 - (void)showPrefs
 {
-    [[o_basicFull_matrix cellAtRow:0 column:0] setState: NSOffState];
-    [[o_basicFull_matrix cellAtRow:0 column:1] setState: NSOnState];
-    
     [o_prefs_window center];
     [o_prefs_window makeKeyAndOrderFront:self];
     [_rootTreeItem resetView];
@@ -208,8 +205,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
     [o_save_btn setTitle: _NS("Save")];
     [o_cancel_btn setTitle: _NS("Cancel")];
     [o_reset_btn setTitle: _NS("Reset All")];
-    [[o_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
-    [[o_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
+    [o_showBasic_btn setTitle: _NS("Show Basic")];
 }
 
 - (IBAction)savePrefs: (id)sender
@@ -247,8 +243,6 @@ static VLCPrefs *_o_sharedMainInstance = nil;
 - (IBAction)buttonAction: (id)sender
 {
     [o_prefs_window orderOut: self];
-    [[o_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState];
-    [[o_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState];
     [[[VLCMain sharedInstance] simplePreferences] showSimplePrefs];
 }
 

modules/gui/macosx/simple_prefs.h

@@ -122,8 +122,7 @@
     IBOutlet id o_osd_osd_ckb;
     IBOutlet id o_osd_view;
 
-    IBOutlet id o_sprefs_basic_box;
-    IBOutlet id o_sprefs_basicFull_matrix;
+    IBOutlet id o_sprefs_showAll_btn;
     IBOutlet id o_sprefs_cancel_btn;
     IBOutlet id o_sprefs_controls_box;
     IBOutlet id o_sprefs_reset_btn;

modules/gui/macosx/simple_prefs.m

@@ -277,8 +277,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
     [o_video_snap_seqnum_ckb setTitle: _NS("Sequential numbering")];
 
     /* generic stuff */
-    [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 0] setTitle: _NS("Basic")];
-    [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setTitle: _NS("All")];
+    [o_sprefs_showAll_btn setTitle: _NS("Show All")];
     [o_sprefs_cancel_btn setTitle: _NS("Cancel")];
     [o_sprefs_reset_btn setTitle: _NS("Reset All")];
     [o_sprefs_save_btn setTitle: _NS("Save")];
@@ -421,9 +420,6 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
     int i, y = 0;
     char *psz_tmp;
 
-    [[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOnState];
-    [[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOffState];
-
     /**********************
      * interface settings *
      **********************/
@@ -672,11 +668,9 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na
                                         @selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil,
                                         _NS("Beware this will reset the VLC media player preferences.\n"
                                             "Are you sure you want to continue?") );
-    else if( sender == o_sprefs_basicFull_matrix )
+    else if( sender == o_sprefs_showAll_btn )
     {
         [o_sprefs_win orderOut: self];
-        [[o_sprefs_basicFull_matrix cellAtRow:0 column:0] setState: NSOffState];
-        [[o_sprefs_basicFull_matrix cellAtRow:0 column:1] setState: NSOnState];
         [[[VLCMain sharedInstance] preferences] showPrefs];
     }
     else