* port of the WX-advanded-GUI to OSX (refs #268)

- the adjust-image-filter and the audio-filters are completely useable

ToDo:
- complete i18n support
- video-filters
- loading the settings from the prefs correctly
- probably minor layout tweaks, etc.

Makefile.am

@@ -561,6 +561,8 @@ VLC-release.app: vlc
 	    voutgl.m \
 	    wizard.h \
 	    wizard.m \
+	    extended.h \
+	    extended.m \
 	    vout.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -671,6 +673,8 @@ VLC.app: vlc
 	    voutgl.m \
 	    wizard.h \
 	    wizard.m \
+	    extended.h \
+	    extended.m \
 	    vout.m; do \
 	  cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \

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

+{
+    IBClasses = (
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            ACTIONS = {
+                "adjImg_Enbl" = id; 
+                "adjImg_rstrDefaults" = id; 
+                "adjImg_sliders" = id; 
+                "audFtls_hdphnVirt" = id; 
+                "audFtls_maxLevelSld" = id; 
+                "audFtls_vlmeNorm" = id; 
+                "extWin_exp_adjImg" = id; 
+                "extWin_exp_audFlts" = id; 
+                "extWin_exp_vidFlts" = id; 
+                vidFlts = id; 
+                "vidFlts_mrInfo" = id; 
+            }; 
+            CLASS = VLCExtended; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "o_adjustImg_view" = id; 
+                "o_audioFlts_view" = id; 
+                "o_box_adjImg" = id; 
+                "o_box_audFlts" = id; 
+                "o_box_vidFlts" = id; 
+                "o_btn_rstrDefaults" = id; 
+                "o_btn_vidFlts_mrInfo" = id; 
+                "o_ckb_blur" = id; 
+                "o_ckb_distortion" = id; 
+                "o_ckb_enblAdjustImg" = id; 
+                "o_ckb_hdphnVirt" = id; 
+                "o_ckb_imgClone" = id; 
+                "o_ckb_imgCrop" = id; 
+                "o_ckb_imgInvers" = id; 
+                "o_ckb_trnsform" = id; 
+                "o_ckb_vlme_norm" = id; 
+                "o_expBtn_adjustImage" = id; 
+                "o_expBtn_audioFlts" = id; 
+                "o_expBtn_videoFlts" = id; 
+                "o_extWin_adjImg_sepe" = id; 
+                "o_extWin_vidFlts_sepe" = id; 
+                "o_extended_window" = id; 
+                "o_lbl_adjustImage" = id; 
+                "o_lbl_audioFlts" = id; 
+                "o_lbl_brightness" = id; 
+                "o_lbl_contrast" = id; 
+                "o_lbl_gamma" = id; 
+                "o_lbl_hue" = id; 
+                "o_lbl_maxLevel" = id; 
+                "o_lbl_saturation" = id; 
+                "o_lbl_videoFlts" = id; 
+                "o_sld_brightness" = id; 
+                "o_sld_contrast" = id; 
+                "o_sld_gamma" = id; 
+                "o_sld_hue" = id; 
+                "o_sld_maxLevel" = id; 
+                "o_sld_saturation" = id; 
+                "o_videoFilters_view" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>219 20 356 292 0 0 1440 878 </string>
+	<key>IBEditorPositions</key>
+	<dict>
+		<key>13</key>
+		<string>506 668 390 138 0 0 1440 878 </string>
+		<key>32</key>
+		<string>525 497 390 213 0 0 1440 878 </string>
+		<key>5</key>
+		<string>598 370 390 196 0 0 1440 878 </string>
+	</dict>
+	<key>IBFramework Version</key>
+	<string>437.0</string>
+	<key>IBLockedObjects</key>
+	<array>
+		<integer>32</integer>
+	</array>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>18</integer>
+		<integer>32</integer>
+		<integer>5</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>8C46</string>
+</dict>
+</plist>

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

@@ -2,12 +2,6 @@
     IBClasses = (
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {CLASS = MPSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; }, 
-        {
-            ACTIONS = {showPanel = id; }; 
-            CLASS = VLAboutBox; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSObject; 
-        }, 
         {CLASS = VLBrushedMetalImageView; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, 
         {CLASS = VLCApplication; LANGUAGE = ObjC; SUPERCLASS = NSApplication; }, 
         {CLASS = VLCControllerView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
@@ -71,6 +65,43 @@
             }; 
             SUPERCLASS = NSObject; 
         }, 
+        {
+            CLASS = VLCExtended; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "o_adjustImg_view" = id; 
+                "o_audioFlts_view" = id; 
+                "o_btn_rstrDefaults" = id; 
+                "o_btn_vidFlts_mrInfo" = id; 
+                "o_ckb_blur" = id; 
+                "o_ckb_distortion" = id; 
+                "o_ckb_enblAdjustImg" = id; 
+                "o_ckb_hdphn_virt" = id; 
+                "o_ckb_imgClone" = id; 
+                "o_ckb_imgCrop" = id; 
+                "o_ckb_imgInvers" = id; 
+                "o_ckb_trnsform" = id; 
+                "o_ckb_vlme_norm" = id; 
+                "o_expBtn_adjustImage" = id; 
+                "o_expBtn_audioFlts" = id; 
+                "o_expBtn_videoFlts" = id; 
+                "o_extended_window" = id; 
+                "o_lbl_brightness" = id; 
+                "o_lbl_contrast" = id; 
+                "o_lbl_gamma" = id; 
+                "o_lbl_hue" = id; 
+                "o_lbl_maxLevel" = id; 
+                "o_lbl_saturation" = id; 
+                "o_sld_brightness" = id; 
+                "o_sld_contrast" = id; 
+                "o_sld_gamma" = id; 
+                "o_sld_hue" = id; 
+                "o_sld_maxLevel" = id; 
+                "o_sld_saturation" = id; 
+                "o_videoFilters_view" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
         {
             ACTIONS = {
                 createOutlineGroup = id; 
@@ -113,6 +144,7 @@
                 openRecentItem = id; 
                 openWebsite = id; 
                 reportABug = id; 
+                showExtended = id; 
                 showWizard = id; 
                 timesliderUpdate = id; 
                 togglePlaylist = id; 
@@ -162,6 +194,7 @@
                 "o_mi_documentation" = id; 
                 "o_mi_double_window" = id; 
                 "o_mi_equalizer" = id; 
+                "o_mi_extended" = id; 
                 "o_mi_faster" = id; 
                 "o_mi_ffmpeg_pp" = id; 
                 "o_mi_fittoscreen" = id; 
@@ -242,8 +275,6 @@
             }; 
             SUPERCLASS = NSObject; 
         }, 
-        {CLASS = VLCOpen; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = VLCOutput; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {
             ACTIONS = {
                 deleteItem = id; 
@@ -285,22 +316,7 @@
             }; 
             SUPERCLASS = NSObject; 
         }, 
-        {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, 
-        {
-            ACTIONS = {advancedToggle = id; closePrefs = id; resetAll = id; savePrefs = id; }; 
-            CLASS = VLCPrefs; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "o_advanced_ckb" = id; 
-                "o_cancel_btn" = id; 
-                "o_prefs_view" = id; 
-                "o_prefs_window" = id; 
-                "o_reset_btn" = id; 
-                "o_save_btn" = id; 
-                "o_tree" = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }
+        {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }
     ); 
     IBVersion = 1; 
 }
\ No newline at end of file

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

@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>43 309 496 270 0 0 1024 746 </string>
+	<string>52 78 496 270 0 0 1440 878 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1617</key>
 		<string>542 480 104 149 0 0 1024 746 </string>
 		<key>2197</key>
-		<string>214 442 596 144 0 0 1024 746 </string>
+		<string>422 532 596 143 0 0 1440 878 </string>
 		<key>29</key>
 		<string>557 789 437 44 0 0 1440 878 </string>
 		<key>915</key>
@@ -21,10 +21,11 @@
 	<array/>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
+		<integer>2029</integer>
 		<integer>21</integer>
+		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8C40</string>
+	<string>8C46</string>
 </dict>
 </plist>

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -813,6 +813,7 @@
 				DCF358BB077F10BA007DB450,
 				DCA693C30789DF8700139EC6,
 				DCFCCDB9085CE18F001E36AF,
+				DC7F46ED08A183FC0027DB24,
 			);
 			isa = PBXResourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -895,6 +896,8 @@
 				8E9CA1A606D7DEE800B7186C,
 				DC769AB8085DF0DB001A838D,
 				DC769AB7085DF0DB001A838D,
+				DC7F46F008A187F60027DB24,
+				DC7F46F108A187F60027DB24,
 			);
 			isa = PBXGroup;
 			name = Classes;
@@ -2159,12 +2162,15 @@
 //DC4
 		DC769AB7085DF0DB001A838D = {
 			fileEncoding = 5;
+			indentWidth = 4;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.objc;
 			name = wizard.m;
 			path = ../../modules/gui/macosx/wizard.m;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
+			tabWidth = 4;
+			usesTabs = 0;
 		};
 		DC769AB8085DF0DB001A838D = {
 			fileEncoding = 5;
@@ -2175,6 +2181,50 @@
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
+		DC7F46EB08A183FC0027DB24 = {
+			children = (
+				DC7F46EC08A183FC0027DB24,
+			);
+			isa = PBXVariantGroup;
+			name = Extended.nib;
+			path = "";
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		DC7F46EC08A183FC0027DB24 = {
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.nib;
+			name = English;
+			path = Resources/English.lproj/Extended.nib;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		DC7F46ED08A183FC0027DB24 = {
+			fileRef = DC7F46EB08A183FC0027DB24;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		DC7F46F008A187F60027DB24 = {
+			explicitFileType = sourcecode.c.objc;
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = extended.h;
+			path = ../../modules/gui/macosx/extended.h;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+			usesTabs = 0;
+		};
+		DC7F46F108A187F60027DB24 = {
+			explicitFileType = sourcecode.c.objc;
+			fileEncoding = 5;
+			includeInIndex = 0;
+			isa = PBXFileReference;
+			name = extended.m;
+			path = ../../modules/gui/macosx/extended.m;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
 		DCA00AA7075F948800E6BF46 = {
 			children = (
 				DCA00AA8075F948800E6BF46,
@@ -2260,6 +2310,7 @@
 				DCF358B9077F10BA007DB450,
 				DCA693C10789DF8700139EC6,
 				DCFCCDB7085CE18F001E36AF,
+				DC7F46EB08A183FC0027DB24,
 			);
 			isa = PBXGroup;
 			name = nibs;

modules/gui/macosx/Modules.am

@@ -30,5 +30,7 @@ SOURCES_macosx = \
 	vout.h \
 	wizard.h \
 	wizard.m \
+	extended.h \
+	extended.m \
 	$(NULL)
 

modules/gui/macosx/extended.h

+/*****************************************************************************
+ * extended.h: MacOS X Extended interface panel
+ *****************************************************************************
+ * Copyright (C) 2005 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Felix Khne <fkuehne@users.sf.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * VLCExtended 
+ *****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+@interface VLCExtended : NSObject
+{
+    /* views and window */
+    IBOutlet id o_adjustImg_view;
+    IBOutlet id o_audioFlts_view;
+    IBOutlet id o_videoFilters_view;
+    IBOutlet id o_extended_window;
+    
+    /* window content */
+    IBOutlet id o_expBtn_adjustImage;
+    IBOutlet id o_expBtn_audioFlts;
+    IBOutlet id o_expBtn_videoFlts;
+    IBOutlet id o_lbl_audioFlts;
+    IBOutlet id o_lbl_videoFlts;
+    IBOutlet id o_lbl_adjustImage;
+    IBOutlet id o_extWin_adjImg_sepe;
+    IBOutlet id o_extWin_vidFlts_sepe;
+    IBOutlet id o_box_vidFlts;
+    IBOutlet id o_box_audFlts;
+    IBOutlet id o_box_adjImg;
+    
+    /* video filters */
+    IBOutlet id o_btn_vidFlts_mrInfo;
+    IBOutlet id o_ckb_blur;
+    IBOutlet id o_ckb_distortion;
+    IBOutlet id o_ckb_imgClone;
+    IBOutlet id o_ckb_imgCrop;
+    IBOutlet id o_ckb_imgInvers;
+    IBOutlet id o_ckb_trnsform;
+    
+    /* audio filters */
+    IBOutlet id o_ckb_vlme_norm;
+    IBOutlet id o_ckb_hdphnVirt;
+    IBOutlet id o_lbl_maxLevel;
+    IBOutlet id o_sld_maxLevel;
+    
+    /* adjust image */
+    IBOutlet id o_btn_rstrDefaults;
+    IBOutlet id o_ckb_enblAdjustImg;
+    IBOutlet id o_lbl_brightness;
+    IBOutlet id o_lbl_contrast;
+    IBOutlet id o_lbl_gamma;
+    IBOutlet id o_lbl_hue;
+    IBOutlet id o_lbl_saturation;
+    IBOutlet id o_sld_brightness;
+    IBOutlet id o_sld_contrast;
+    IBOutlet id o_sld_gamma;
+    IBOutlet id o_sld_hue;
+    IBOutlet id o_sld_saturation;
+    
+    /* global variables */
+    BOOL * o_adjImg_expanded;
+    BOOL * o_audFlts_expanded;
+    BOOL * o_vidFlts_expanded;
+}
+
+- (IBAction)adjImg_Enbl:(id)sender;
+- (IBAction)adjImg_rstrDefaults:(id)sender;
+- (IBAction)adjImg_sliders:(id)sender;
+- (IBAction)audFtls_hdphnVirt:(id)sender;
+- (IBAction)audFtls_maxLevelSld:(id)sender;
+- (IBAction)audFtls_vlmeNorm:(id)sender;
+- (IBAction)extWin_exp_adjImg:(id)sender;
+- (IBAction)extWin_exp_audFlts:(id)sender;
+- (IBAction)extWin_exp_vidFlts:(id)sender;
+- (IBAction)vidFlts:(id)sender;
+- (IBAction)vidFlts_mrInfo:(id)sender;
+
++ (VLCExtended *)sharedInstance;
+
+- (void)showPanel;
+- (void)initStrings;
+- (void)changeVFiltersString: (char *)psz_name onOrOff: (BOOL)o_onOrOff;
+- (void)changeAFiltersString: (char *)psz_name onOrOff: (BOOL)o_onOrOff;
+@end

modules/gui/macosx/intf.h

@@ -91,9 +91,11 @@ struct intf_sys_t
     id o_about;                 /* VLAboutBox     */
     id o_open;                  /* VLCOpen        */
     id o_wizard;                /* VLCWizard      */
+    id o_extended;              /* VLCExtended    */
     BOOL nib_open_loaded;       /* reference to the open-nib */
     BOOL nib_about_loaded;      /* reference to the about-nib */
     BOOL nib_wizard_loaded;     /* reference to the wizard-nib */
+    BOOL nib_extended_loaded;   /* reference to the extended-nib */
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_playlist_view;/* playlist view  */
@@ -226,6 +228,7 @@ struct intf_sys_t
     IBOutlet id o_mi_close_window;
     IBOutlet id o_mi_controller;
     IBOutlet id o_mi_equalizer;
+    IBOutlet id o_mi_extended;
     IBOutlet id o_mi_playlist;
     IBOutlet id o_mi_info;
     IBOutlet id o_mi_messages;
@@ -292,6 +295,7 @@ struct intf_sys_t
 - (IBAction)intfOpenNet:(id)sender;
 
 - (IBAction)showWizard:(id)sender;
+- (IBAction)showExtended:(id)sender;
 
 - (IBAction)viewAbout:(id)sender;
 - (IBAction)viewPreferences:(id)sender;

modules/gui/macosx/intf.m

@@ -39,6 +39,7 @@
 #include "about.h"
 #include "open.h"
 #include "wizard.h"
+#include "extended.h"
 
 /*****************************************************************************
  * Local prototypes.
@@ -298,6 +299,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_prefs = nil;
     o_open = [[VLCOpen alloc] init];
     o_wizard = [[VLCWizard alloc] init];
+    o_extended = [[VLCExtended alloc] init];
 
     i_lastShownVolume = -1;
     return _o_sharedMainInstance;
@@ -527,6 +529,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_close_window setTitle: _NS("Close Window")];
     [o_mi_controller setTitle: _NS("Controller")];
     [o_mi_equalizer setTitle: _NS("Equalizer")];
+    [o_mi_extended setTitle: _NS("Extended controls")];
     [o_mi_playlist setTitle: _NS("Playlist")];
     [o_mi_info setTitle: _NS("Info")];
     [o_mi_messages setTitle: _NS("Messages")];
@@ -1444,6 +1447,18 @@ static VLCMain *_o_sharedMainInstance = nil;
     }
 }
 
+- (IBAction)showExtended:(id)sender
+{
+    if (!nib_extended_loaded)
+    {
+        nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
+        [o_extended initStrings];
+        [o_extended showPanel];
+    } else {
+        [o_extended showPanel];
+    }
+}
+
 - (IBAction)viewAbout:(id)sender
 {
     if (!nib_about_loaded)