Removed the 'Advanced' function from the complete prefs because we want them to be...

Additionally, removed the temporary Simple Prefences menu item.

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
index 28be9821b1c023e7a604eab55dabcdb31927c1eb..2df39a726f368c1f50799065065a8853326a1519 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
@@ -21,12 +21,12 @@
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>282</integer>
-               <integer>915</integer>
                <integer>2416</integer>
-               <integer>29</integer>
                <integer>2197</integer>
+               <integer>282</integer>
                <integer>21</integer>
+               <integer>29</integer>
+               <integer>915</integer>
        </array>
        <key>IBSystem Version</key>
        <string>9E17</string>

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
index ba671302d5296e8b38fc981246d789f3163691ef..b51de45d2528418fd6ede0ba5efb7da6b5298991 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
index 6d6e7e5150bce5247f74cb05dd58a0a3814792b5..8705ae9486d96a7c9b0dbcf484b3f7b3d8907497 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
@@ -21,7 +21,6 @@
         },
                 {
             ACTIONS =             {
-                advancedToggle = id;
                 buttonAction = id;
                 closePrefs = id;
                 resetAll = id;
@@ -30,7 +29,6 @@
             CLASS = VLCPrefs;
             LANGUAGE = ObjC;
             OUTLETS =             {
-                "o_advanced_ckb" = id;
                 "o_basicFull_matrix" = id;
                 "o_cancel_btn" = id;
                 "o_prefs_view" = id;

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
index bc7626f30e5c5e36c4175de5aafe8a35d4f34257..b1e7e80edf60ca5ebc6b6e74ecf16a360195d538 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
@@ -7,9 +7,9 @@
        <key>IBEditorPositions</key>
        <dict>
                <key>2311</key>
-               <string>345 435 590 230 0 0 1280 778 </string>
+               <string>345 426 590 230 0 0 1280 778 </string>
                <key>2330</key>
-               <string>345 223 590 502 0 0 1280 778 </string>
+               <string>345 222 590 502 0 0 1280 778 </string>
                <key>2440</key>
                <string>345 307 590 389 0 0 1280 778 </string>
                <key>2523</key>
@@ -27,16 +27,16 @@
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>2562</integer>
-               <integer>2523</integer>
                <integer>2311</integer>
+               <integer>2562</integer>
+               <integer>1530</integer>
                <integer>2440</integer>
-               <integer>2668</integer>
+               <integer>2523</integer>
                <integer>2330</integer>
-               <integer>1530</integer>
+               <integer>2668</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>9D34</string>
+       <string>9E17</string>
        <key>targetFramework</key>
        <string>IBCocoaFramework</string>
 </dict>

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
index 79d7a117deafc043674761955c44a50e140741ff..7ad238505e3ad6fd99b8c471939a73edd98e370b 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 78b29a6f938f9b4d00909588ce095ee34378385d..e54438d98ce0da62227554373b8a7ae7dca312b4 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1920,12 +1920,7 @@ end:
         o_prefs= [[VLCPrefs alloc] init];
     }
 
-    if( sender == o_mi_sprefs )
-    {
-        [o_sprefs showSimplePrefs];
-    }
-    else
-        [o_prefs showPrefs];
+    [o_sprefs showSimplePrefs];
 }
 
 - (IBAction)checkForUpdate:(id)sender

diff --git a/modules/gui/macosx/prefs.h b/modules/gui/macosx/prefs.h
index 49407dc932bbc0c39635300c7d956378e099067f..932af1549ab296d42b59d78f7ee81352dbbddb23 100644 (file)
--- a/modules/gui/macosx/prefs.h
+++ b/modules/gui/macosx/prefs.h
@@ -41,7 +41,7 @@
 - (NSString *)getTitle;
 - (NSString *)getHelp;
 - (BOOL)hasPrefs:(NSString *)o_module_name;
-- (NSView *)showView:(NSScrollView *)o_prefs_view advancedView:(bool) b_advanced;
+- (NSView *)showView:(NSScrollView *)o_prefs_view;
 - (void)applyChanges;
 - (void)resetView;
 
@@ -53,7 +53,6 @@
 @interface VLCPrefs : NSObject
 {
     intf_thread_t *p_intf;
-    bool b_advanced;
     VLCTreeItem *o_config_tree;
     NSView *o_empty_view;
     NSMutableDictionary *o_save_prefs;
@@ -65,7 +64,6 @@
     IBOutlet id o_save_btn;
     IBOutlet id o_cancel_btn;
     IBOutlet id o_reset_btn;
-    IBOutlet id o_advanced_ckb;
     IBOutlet id o_basicFull_matrix;
 }
 
@@ -77,7 +75,6 @@
 - (IBAction)savePrefs: (id)sender;
 - (IBAction)closePrefs: (id)sender;
 - (IBAction)resetAll: (id)sender;
-- (IBAction)advancedToggle: (id)sender;
 - (IBAction)buttonAction: (id)sender;
 
 @end

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index f384790a5c3a3e93c044f4f18512adf908e2c247..0e25e9af6770c8e113c3b8c067bc8d570b79a3c5 100644 (file)
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -30,7 +30,6 @@
    - the documentview with all the prefs widgets in it
    - a saveChanges action
    - a revertChanges action
-   - an advanced action (to hide/show advanced options)
    - a redraw view action
    - the children action should generate a list of the treeitems children (to be used by VLCPrefs datasource)
 
@@ -97,10 +96,8 @@ static VLCPrefs *_o_sharedMainInstance = nil;
 - (void)awakeFromNib
 {
     p_intf = VLCIntf;
-    b_advanced = config_GetInt( p_intf, "advanced" );
 
     [self initStrings];
-    [o_advanced_ckb setState: b_advanced];
     [o_prefs_view setBorderType: NSGrooveBorder];
     [o_prefs_view setHasVerticalScroller: YES];
     [o_prefs_view setDrawsBackground: NO];
@@ -128,7 +125,6 @@ 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_advanced_ckb setTitle: _NS("Advanced")];
     [[o_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
     [[o_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
 }
@@ -164,20 +160,10 @@ static VLCPrefs *_o_sharedMainInstance = nil;
         config_ResetAll( p_intf );
         [[VLCTreeItem rootItem] resetView];
         [[o_tree itemAtRow:[o_tree selectedRow]]
-            showView:o_prefs_view advancedView:
-            ( [o_advanced_ckb state] == NSOnState ) ? true : false];
+            showView:o_prefs_view];
     }
 }
 
-- (IBAction)advancedToggle: (id)sender
-{
-    b_advanced = !b_advanced;
-    [o_advanced_ckb setState: b_advanced];
-    /* refresh the view of the current treeitem */
-    [[o_tree itemAtRow:[o_tree selectedRow]] showView:o_prefs_view advancedView:
-        ( [o_advanced_ckb state] == NSOnState ) ? true : false];
-}
-
 - (IBAction)buttonAction: (id)sender
 {
     [o_prefs_window orderOut: self];
@@ -197,9 +183,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
 /* update the document view to the view of the selected tree item */
 - (void)outlineViewSelectionDidChange:(NSNotification *)o_notification
 {
-    [[o_tree itemAtRow:[o_tree selectedRow]] showView: o_prefs_view
-        advancedView:( [o_advanced_ckb state] == NSOnState ) ?
-        true : false];
+    [[o_tree itemAtRow:[o_tree selectedRow]] showView: o_prefs_view];
 }
 
 @end
@@ -521,7 +505,6 @@ static VLCTreeItem *o_root_item = nil;
 }
 
 - (NSView *)showView:(NSScrollView *)o_prefs_view
-    advancedView:(bool) b_advanced
 {
     NSRect          s_vrc;
     NSView          *o_view;
@@ -648,27 +631,19 @@ static VLCTreeItem *o_root_item = nil;
         int i_lastItem = 0;
         int i_yPos = -2;
         int i_max_label = 0;
-        int i_show_advanced = 0;
 
         NSEnumerator *enumerator = [o_subviews objectEnumerator];
         VLCConfigControl *o_widget;
         NSRect o_frame;
  
         while( ( o_widget = [enumerator nextObject] ) )
-            if( ( [o_widget isAdvanced] ) && (! b_advanced) )
-                continue;
-            else if( i_max_label < [o_widget getLabelSize] )
+            if( i_max_label < [o_widget getLabelSize] )
                 i_max_label = [o_widget getLabelSize];
 
         enumerator = [o_subviews objectEnumerator];
         while( ( o_widget = [enumerator nextObject] ) )
         {
             int i_widget;
-            if( ( [o_widget isAdvanced] ) && (! b_advanced) )
-            {
-                i_show_advanced++;
-                continue;
-            }
 
             i_widget = [o_widget getViewType];
             i_yPos += [VLCConfigControl calcVerticalMargin:i_widget
@@ -683,28 +658,7 @@ static VLCTreeItem *o_root_item = nil;
             i_lastItem = i_widget;
             [o_view addSubview:o_widget];
          }
-        if( i_show_advanced != 0 )
-        {
-            /* We add the advanced notice... */
-            NSRect s_rc = [o_view frame];
-            NSTextField *o_label;
-            s_rc.size.height = 17;
-            s_rc.origin.x = LEFTMARGIN;
-            s_rc.origin.y = i_yPos += [VLCConfigControl
-                                        calcVerticalMargin:CONFIG_ITEM_STRING
-                                        lastItem:i_lastItem];
-            o_label = [[[NSTextField alloc] initWithFrame: s_rc] retain];
-            [o_label setDrawsBackground: NO];
-            [o_label setBordered: NO];
-            [o_label setEditable: NO];
-            [o_label setSelectable: NO];
-            [o_label setStringValue: _NS("Some options are hidden. " \
-                                "Check \"Advanced\" to display them.")];
-            [o_label setFont:[NSFont systemFontOfSize:10]];
-            [o_label sizeToFit];
-            [o_view addSubview:o_label];
-            i_yPos += [o_label frame].size.height;
-        }
+
         o_frame = [o_view frame];
         o_frame.size.height = i_yPos;
         [o_view setFrame:o_frame];