* implemented the generic VLC media player Help window on OSX to match the QT4...

* implemented the generic VLC media player Help window on OSX to match the QT4 interface. Additionally, I modified the HTML source a bit, so potential umlauts won't be displayed as UTF-16 on OSX, which would lead to German umlauts being Chinese characters, etc. BTW. Withthis commit, we also link against the WebKit framework..

configure.ac

@@ -5305,7 +5305,7 @@ AC_ARG_ENABLE(macosx,
      VLC_ADD_PLUGINS([access_eyetv])
      VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation])
      VLC_ADD_LDFLAGS([minimal_macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL])
-     VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit])
+     VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit,-framework,WebKit])
      VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
      VLC_ADD_OBJCFLAGS( [minimal_macosx],[-fobjc-exceptions] )
    fi],
@@ -5315,7 +5315,7 @@ AC_ARG_ENABLE(macosx,
      VLC_ADD_BUILTINS([macosx])
      VLC_ADD_BUILTINS([minimal_macosx])
      VLC_ADD_LDFLAGS([minimal_macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL])
-     VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit])
+     VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit,-framework,WebKit])
      VLC_ADD_OBJCFLAGS([macosx],[-fobjc-exceptions])
      VLC_ADD_OBJCFLAGS([minimal_macosx],[-fobjc-exceptions])
     ])])

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

@@ -10,6 +10,8 @@
                 "o_copyright_field" = id; 
                 "o_credits_scrollview" = id; 
                 "o_credits_textview" = id; 
+                "o_help_web_view" = id; 
+                "o_help_window" = id; 
                 "o_name_version_field" = id; 
                 "o_revision_field" = id; 
             }; 

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

@@ -5,14 +5,15 @@
 	<key>IBDocumentLocation</key>
 	<string>45 176 505 517 0 0 1024 746 </string>
 	<key>IBFramework Version</key>
-	<string>437.0</string>
+	<string>446.1</string>
 	<key>IBLockedObjects</key>
 	<array/>
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>1345</integer>
+		<integer>2239</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8C46</string>
+	<string>8R3032</string>
 </dict>
 </plist>

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

@@ -213,6 +213,7 @@
                 togglePlaylist = id; 
                 viewAbout = id; 
                 viewErrorsAndWarnings = id; 
+                viewHelp = id; 
                 viewPreferences = id; 
             }; 
             CLASS = VLCMain; 
@@ -267,6 +268,7 @@
                 "o_mi_fullscreen" = id; 
                 "o_mi_fwd" = id; 
                 "o_mi_half_window" = id; 
+                "o_mi_help" = id; 
                 "o_mi_hide" = id; 
                 "o_mi_hide_others" = id; 
                 "o_mi_info" = id; 

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>647 66 478 430 0 0 1440 878 </string>
+	<string>328 138 478 430 0 0 1280 778 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>1617</key>
@@ -25,11 +25,11 @@
 	<array/>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>21</integer>
 		<integer>1789</integer>
-		<integer>29</integer>
-		<integer>2769</integer>
 		<integer>2730</integer>
+		<integer>2769</integer>
+		<integer>29</integer>
+		<integer>21</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8R3032</string>

extras/MacOSX/vlc.xcodeproj/project.pbxproj

@@ -84,6 +84,7 @@
 		CC4ED9B70ABE07C800CA4CC5 /* repeat_single_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9B00ABE07C800CA4CC5 /* repeat_single_embedded_blue.png */; };
 		CC4ED9B80ABE07C800CA4CC5 /* shuffle_embedded_blue.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9B10ABE07C800CA4CC5 /* shuffle_embedded_blue.png */; };
 		CC4ED9B90ABE07C800CA4CC5 /* shuffle_embedded.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4ED9B20ABE07C800CA4CC5 /* shuffle_embedded.png */; };
+		CC962E2D0CC7992800A56695 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC962E2C0CC7992800A56695 /* WebKit.framework */; };
 		CCCB86DB0ACFDFB300CF1E10 /* fs_time_slider.png in Resources */ = {isa = PBXBuildFile; fileRef = CCCB86C00ACFDFB300CF1E10 /* fs_time_slider.png */; };
 		CCCB86DC0ACFDFB400CF1E10 /* fs_skip_next_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = CCCB86C10ACFDFB300CF1E10 /* fs_skip_next_highlight.png */; };
 		CCCB86DD0ACFDFB400CF1E10 /* fs_skip_next.png in Resources */ = {isa = PBXBuildFile; fileRef = CCCB86C20ACFDFB300CF1E10 /* fs_skip_next.png */; };
@@ -975,6 +976,7 @@
 		CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppleRemote.m; path = ../../modules/gui/macosx/AppleRemote.m; sourceTree = SOURCE_ROOT; };
 		CC6EDD4F0B9CA2140096068A /* eyetv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eyetv.h; path = ../../modules/gui/macosx/eyetv.h; sourceTree = SOURCE_ROOT; };
 		CC6EDD500B9CA2140096068A /* eyetv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = eyetv.m; path = ../../modules/gui/macosx/eyetv.m; sourceTree = SOURCE_ROOT; };
+		CC962E2C0CC7992800A56695 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
 		CCC593780AB4A9FB0004FF52 /* embeddedwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = embeddedwindow.h; path = ../../modules/gui/macosx/embeddedwindow.h; sourceTree = SOURCE_ROOT; };
 		CCC593790AB4A9FB0004FF52 /* embeddedwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = embeddedwindow.m; path = ../../modules/gui/macosx/embeddedwindow.m; sourceTree = SOURCE_ROOT; };
 		CCCB86C00ACFDFB300CF1E10 /* fs_time_slider.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_time_slider.png; path = Resources/fs_time_slider.png; sourceTree = "<group>"; };
@@ -1039,6 +1041,7 @@
 				1058C7AFFEA557BF11CA2CBB /* Cocoa.framework in Frameworks */,
 				CC3DC89C0A7CDB9600B53F32 /* ApplicationServices.framework in Frameworks */,
 				CC1941250B9C1F8400635F6B /* QTKit.framework in Frameworks */,
+				CC962E2D0CC7992800A56695 /* WebKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1144,6 +1147,7 @@
 		1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				CC962E2C0CC7992800A56695 /* WebKit.framework */,
 				CC1941240B9C1F8400635F6B /* QTKit.framework */,
 				CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */,
 				1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */,

include/vlc_intf_strings.h

@@ -116,12 +116,12 @@
                   "will be turned to black and white, except the parts that "\
                   "are of the color that you select in the settings.")
 
-#define I_LONGHELP N_("<html>" \
-    "<h2>Welcome to VLC media player help</h2>" \
+#define I_LONGHELP N_("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />" \
+    "<h2>Welcome to VLC media player Help</h2>" \
         "<h3>Documentation</h3>" \
             "<p>You can find VLC documentation on VideoLAN's <a href=\"http://wiki.videolan.org\">wiki</a> website.</p>" \
             "<p>If you are a newcomer to VLC media player, please read the<br><a href=\"http://wiki.videolan.org/Documentation:VLC_for_dummies\"><em>Introduction to VLC media player</em></a>.</p>" \
-            "<p>You will find some information on how to use the player in the <br>\"<a href=\"http://wiki.videolan.org/Documentation:Play_HowTo\"><em>How to play files with VLC media player<em></a>\" document.</p>" \
+            "<p>You will find some information on how to use the player in the <br>\"<a href=\"http://wiki.videolan.org/Documentation:Play_HowTo\"><em>How to play files with VLC media player</em></a>\" document.</p>" \
             "<p>For all the saving, converting, transcoding, encoding, muxing and streaming tasks, you should find useful information in the <a href=\"http://wiki.videolan.org/Documentation:Streaming_HowTo\">Streaming Documentation</a>.</p>" \
             "<p>If you are unsure about terminology, please consult the <a href=\"http://wiki.videolan.org/Knowledge_Base\">knowledge base</a>.</p>" \
             "<p>To understand the main keyboard shortcuts, read the <a href=\"http://wiki.videolan.org/Hotkeys\">shortcuts</a> page.</p>" \
@@ -130,6 +130,6 @@
             "<p>You might then get (and give) help on the <a href=\"http://forum.videolan.org\">Forums</a>, the <a href=\"http://www.videolan.org/vlc/lists.html\">mailing-lists</a> or our IRC channel ( <a href=\"http://www.videolan.org/webirc/\"><em>#videolan</em></a> on irc.freenode.net ).</p>" \
         "<h3>Contribute to the project</h3>" \
             "<p>You can help the VideoLAN project giving some of your time to help the community, to design skins, to translate the documentation, to test and to code. You can also give funds and material to help us. And of course, you can <b>promote</b> VLC media player.</p>" \
-    "</html>")
+    "</body></html>")
 
 #endif

modules/gui/macosx/about.h

@@ -26,6 +26,7 @@
  *****************************************************************************/
 @interface VLAboutBox : NSObject
 {
+    /* main about panel and stuff related to its views */
     IBOutlet id o_about_window;
     IBOutlet id o_name_version_field;
     IBOutlet id o_revision_field;
@@ -47,9 +48,14 @@
     NSDictionary *o_info_dict;
     CFBundleRef localInfoBundle;
     NSDictionary *o_local_dict;
+    
+    /* generic help window */
+    IBOutlet id o_help_window;
+    IBOutlet id o_help_web_view;
 }
 
 + (VLAboutBox *)sharedInstance;
-- (void)showPanel;
+- (void)showAbout;
+- (void)showHelp;
 
 @end

modules/gui/macosx/about.m

@@ -26,6 +26,8 @@
  *****************************************************************************/
 #include "intf.h"
 #include "about.h"
+#include <vlc_intf_strings.h>
+#import <WebKit/WebKit.h>
 
 /*****************************************************************************
  * VLAboutBox implementation
@@ -50,7 +52,11 @@ static VLAboutBox *_o_sharedInstance = nil;
     return _o_sharedInstance;
 }
 
-- (void)showPanel
+/*****************************************************************************
+* VLC About Window
+*****************************************************************************/
+
+- (void)showAbout
 {
     if (!o_credits_path)
     {
@@ -209,4 +215,17 @@ static VLAboutBox *_o_sharedInstance = nil;
     }
 }
 
+/*****************************************************************************
+* VLC Generic Help Window
+*****************************************************************************/
+
+- (void)showHelp
+{
+    [o_help_window setTitle: _NS("VLC media player Help")];
+    [o_help_window makeKeyAndOrderFront: self];
+
+    [[o_help_web_view mainFrame] loadHTMLString: [NSString stringWithString: _NS(I_LONGHELP)]
+                                        baseURL: [NSURL URLWithString:@"http://videolan.org"]];
+}
+
 @end

modules/gui/macosx/intf.h

@@ -253,6 +253,7 @@ struct intf_sys_t
     IBOutlet id o_mi_bring_atf;
 
     IBOutlet id o_mu_help;
+    IBOutlet id o_mi_help;
     IBOutlet id o_mi_readme;
     IBOutlet id o_mi_documentation;
     IBOutlet id o_mi_website;
@@ -347,11 +348,10 @@ struct intf_sys_t
 - (IBAction)viewAbout:(id)sender;
 - (IBAction)viewPreferences:(id)sender;
 - (IBAction)checkForUpdate:(id)sender;
+- (IBAction)viewHelp:(id)sender;
 - (IBAction)openReadMe:(id)sender;
 - (IBAction)openDocumentation:(id)sender;
-- (IBAction)reportABug:(id)sender;
 - (IBAction)openWebsite:(id)sender;
-- (IBAction)openLicense:(id)sender;
 - (IBAction)openForum:(id)sender;
 - (IBAction)openDonate:(id)sender;
 - (IBAction)openCrashLog:(id)sender;

modules/gui/macosx/intf.m

@@ -667,6 +667,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_bring_atf setTitle: _NS("Bring All to Front")];
 
     [o_mu_help setTitle: _NS("Help")];
+    [o_mi_help setTitle: _NS("VLC media player Help...")];
     [o_mi_readme setTitle: _NS("ReadMe / FAQ...")];
     [o_mi_documentation setTitle: _NS("Online Documentation...")];
     [o_mi_website setTitle: _NS("VideoLAN Website...")];
@@ -1879,12 +1880,12 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)viewAbout:(id)sender
 {
-    if ( !nib_about_loaded )
+    if( !nib_about_loaded )
     {
         nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
-        [o_about showPanel];
+        [o_about showAbout];
     } else {
-        [o_about showPanel];
+        [o_about showAbout];
     }
 }
 
@@ -1898,12 +1899,23 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)checkForUpdate:(id)sender
 {
-    if ( !nib_update_loaded )
+    if( !nib_update_loaded )
         nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
 
     [o_update showUpdateWindow];
 }
 
+- (IBAction)viewHelp:(id)sender
+{
+    if( !nib_about_loaded )
+    {
+        nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
+        [o_about showHelp];
+    }
+    else
+        [o_about showHelp];
+}
+
 - (IBAction)openReadMe:(id)sender
 {
     NSString * o_path = [[NSBundle mainBundle]