macosx: draw vlc.icns instead of a bogus white png with an icon in the about panel

no user-visible change. However, we save 29KB and don't need to update that graphic for HiDPI

This is a manual backport of a574f2f9052027ccd279e0431f7ae625e351cad7.

Makefile.am

@@ -98,7 +98,6 @@ ChangeLog: Makefile.am
 
 EXTRA_DIST += \
 	extras/package/macosx/README.MacOSX.rtf \
-	extras/package/macosx/Resources/about_bg.png \
 	extras/package/macosx/Resources/dsa_pub.pem \
 	extras/package/macosx/Resources/English.lproj/About.xib \
 	extras/package/macosx/Resources/English.lproj/AudioEffects.xib \

extras/package/macosx/Resources/English.lproj/About.xib

@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
   <data>
     <int key="IBDocument.SystemTarget">1050</int>
-    <string key="IBDocument.SystemVersion">11C74</string>
+    <string key="IBDocument.SystemVersion">11E53</string>
     <string key="IBDocument.InterfaceBuilderVersion">851</string>
-    <string key="IBDocument.AppKitVersion">1138.23</string>
-    <string key="IBDocument.HIToolboxVersion">567.00</string>
+    <string key="IBDocument.AppKitVersion">1138.47</string>
+    <string key="IBDocument.HIToolboxVersion">569.00</string>
     <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
       <bool key="EncodedWithXMLCoder">YES</bool>
       <object class="NSArray" key="dict.sortedKeys">
@@ -21,8 +21,6 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="2245"/>
-      <integer value="2239"/>
       <integer value="1344"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -78,7 +76,7 @@
                   <string>NeXT TIFF v4.0 pasteboard type</string>
                 </object>
               </object>
-              <string key="NSFrameSize">{600, 275}</string>
+              <string key="NSFrame">{{33, 70}, {153, 172}}</string>
               <reference key="NSSuperview" ref="471759747"/>
               <bool key="NSEnabled">YES</bool>
               <object class="NSImageCell" key="NSCell" id="548775455">
@@ -86,7 +84,7 @@
                 <int key="NSCellFlags2">33554432</int>
                 <object class="NSCustomResource" key="NSContents">
                   <string key="NSClassName">NSImage</string>
-                  <string key="NSResourceName">about_bg</string>
+                  <string key="NSResourceName">vlc</string>
                 </object>
                 <int key="NSAlign">2</int>
                 <int key="NSScale">2</int>
@@ -220,7 +218,7 @@
                   <reference key="NSDocView" ref="139161632"/>
                   <reference key="NSBGColor" ref="256701342"/>
                   <object class="NSCursor" key="NSCursor">
-                    <string key="NSHotSpot">{4, 4}</string>
+                    <string key="NSHotSpot">{1, -1}</string>
                     <int key="NSCursorType">0</int>
                   </object>
                   <int key="NScvFlags">4</int>
@@ -411,7 +409,7 @@
         <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
         <string key="NSWindowContentMinSize">{213, 107}</string>
         <object class="NSView" key="NSWindowView" id="214470677">
-          <reference key="NSNextResponder"/>
+          <nil key="NSNextResponder"/>
           <int key="NSvFlags">256</int>
           <object class="NSMutableArray" key="NSSubviews">
             <bool key="EncodedWithXMLCoder">YES</bool>
@@ -441,7 +439,6 @@
               </object>
               <string key="NSFrame">{{0, 40}, {480, 360}}</string>
               <reference key="NSSuperview" ref="214470677"/>
-              <reference key="NSNextKeyView"/>
               <string key="FrameName"/>
               <string key="GroupName"/>
               <object class="WebPreferences" key="Preferences">
@@ -552,7 +549,6 @@
             </object>
           </object>
           <string key="NSFrameSize">{480, 400}</string>
-          <reference key="NSSuperview"/>
         </object>
         <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
         <string key="NSMinSize">{213, 129}</string>
@@ -576,7 +572,7 @@
         <string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
         <string key="NSWindowContentMinSize">{480, 360}</string>
         <object class="NSView" key="NSWindowView" id="482940942">
-          <reference key="NSNextResponder"/>
+          <nil key="NSNextResponder"/>
           <int key="NSvFlags">256</int>
           <object class="NSMutableArray" key="NSSubviews">
             <bool key="EncodedWithXMLCoder">YES</bool>
@@ -658,7 +654,6 @@
                   </object>
                   <string key="NSFrame">{{1, 1}, {478, 358}}</string>
                   <reference key="NSSuperview" ref="481393880"/>
-                  <reference key="NSNextKeyView" ref="1033279449"/>
                   <reference key="NSDocView" ref="1033279449"/>
                   <reference key="NSBGColor" ref="620122354"/>
                   <object class="NSCursor" key="NSCursor">
@@ -690,7 +685,6 @@
               </object>
               <string key="NSFrameSize">{480, 360}</string>
               <reference key="NSSuperview" ref="482940942"/>
-              <reference key="NSNextKeyView" ref="480961721"/>
               <int key="NSsFlags">133650</int>
               <reference key="NSVScroller" ref="947547661"/>
               <reference key="NSHScroller" ref="695622842"/>
@@ -698,7 +692,6 @@
             </object>
           </object>
           <string key="NSFrameSize">{480, 360}</string>
-          <reference key="NSSuperview"/>
         </object>
         <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
         <string key="NSMinSize">{480, 382}</string>
@@ -1540,7 +1533,7 @@
     <nil key="IBDocument.LastKnownRelativeProjectPath"/>
     <int key="IBDocument.defaultPropertyAccessControl">3</int>
     <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-      <string key="NS.key.0">about_bg</string>
+      <string key="NS.key.0">vlc</string>
       <string key="NS.object.0">{128, 128}</string>
     </object>
   </data>

extras/package/macosx/vlc.xcodeproj/project.pbxproj

@@ -210,7 +210,6 @@
 		CC402EB90E00ABBB006A4BA4 /* vlc.scriptSuite in Resources */ = {isa = PBXBuildFile; fileRef = 8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */; };
 		CC402EBA0E00ABBB006A4BA4 /* vlc.scriptTerminology in Resources */ = {isa = PBXBuildFile; fileRef = 8EBF3FA503F140960059A3A7 /* vlc.scriptTerminology */; };
 		CC402EBB0E00ABBB006A4BA4 /* README.MacOSX.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */; };
-		CC402EF30E00ABBB006A4BA4 /* about_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = DCDA5E6408F94518009D93A8 /* about_bg.png */; };
 		CC402F3C0E00ABBB006A4BA4 /* noart.png in Resources */ = {isa = PBXBuildFile; fileRef = CC1C41D00D9BAD7F002728FA /* noart.png */; };
 		CC402F410E00ABBB006A4BA4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
 		CC402F420E00ABBB006A4BA4 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */; };
@@ -643,7 +642,6 @@
 		CCF0777C13659A8000AF19FD /* SPMediaKeyTap.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPMediaKeyTap.m; path = ../../../modules/gui/macosx/SPMediaKeyTap.m; sourceTree = "<group>"; };
 		DC769AB7085DF0DB001A838D /* wizard.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; name = wizard.m; path = ../../../modules/gui/macosx/wizard.m; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 0; };
 		DC769AB8085DF0DB001A838D /* wizard.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = wizard.h; path = ../../../modules/gui/macosx/wizard.h; sourceTree = SOURCE_ROOT; };
-		DCDA5E6408F94518009D93A8 /* about_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = about_bg.png; path = Resources/about_bg.png; sourceTree = "<group>"; };
 		DCE7BD0608A5724D007B10AE /* bookmarks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = bookmarks.m; path = ../../../modules/gui/macosx/bookmarks.m; sourceTree = SOURCE_ROOT; };
 		DCE7BD0708A5724D007B10AE /* bookmarks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bookmarks.h; path = ../../../modules/gui/macosx/bookmarks.h; sourceTree = SOURCE_ROOT; };
 		F69B0CA702E24F6401A80112 /* English */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.plist.strings; name = English; path = Resources/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -697,7 +695,6 @@
 				CC5800F81423A82100166912 /* fspanel (@1.5x) */,
 				CCCB86BF0ACFDE4A00CF1E10 /* fspanel */,
 				DCF358BC077F1236007DB450 /* xibs */,
-				DCDA5E6408F94518009D93A8 /* about_bg.png */,
 				8E445F86047289E50059A3A7 /* fileicons */,
 				CC0430EE13B2461A00D7D52E /* 10th anniversary ui */,
 				F69B0CA602E24F6401A80112 /* InfoPlist.strings */,
@@ -1293,7 +1290,6 @@
 				CC402EB90E00ABBB006A4BA4 /* vlc.scriptSuite in Resources */,
 				CC402EBA0E00ABBB006A4BA4 /* vlc.scriptTerminology in Resources */,
 				CC402EBB0E00ABBB006A4BA4 /* README.MacOSX.rtf in Resources */,
-				CC402EF30E00ABBB006A4BA4 /* about_bg.png in Resources */,
 				CC402F3C0E00ABBB006A4BA4 /* noart.png in Resources */,
 				CC04323B13B246DF00D7D52E /* back_dark.png in Resources */,
 				CC04323C13B246DF00D7D52E /* back-pressed_dark.png in Resources */,

modules/gui/macosx/about.h

 /*****************************************************************************
  * about.h: MacOS X About Panel
  *****************************************************************************
- * Copyright (C) 2001-2007 VLC authors and VideoLAN
+ * Copyright (C) 2001-2012 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -38,6 +38,7 @@
     IBOutlet id o_credits_scrollview;
     IBOutlet id o_gpl_btn;
     IBOutlet id o_name_field;
+    id o_color_backdrop;
 
     NSTimer *o_scroll_timer;
     float f_current;
@@ -65,3 +66,7 @@
 - (IBAction)helpGoHome:(id)sender;
 
 @end
+
+@interface VLAboutColoredBackdrop : NSView
+
+@end

modules/gui/macosx/about.m

 /*****************************************************************************
  * about.m: MacOS X About Panel
  *****************************************************************************
- * Copyright (C) 2001-2011 VLC authors and VideoLAN
+ * Copyright (C) 2001-2012 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -65,6 +65,7 @@ static VLAboutBox *_o_sharedInstance = nil;
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
+    [o_color_backdrop release];
     [super dealloc];
 }
 
@@ -72,6 +73,10 @@ static VLAboutBox *_o_sharedInstance = nil;
 {
     if (OSX_LION)
         [o_about_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
+
+    /* add a colored backdrop to get a white window background */
+    o_color_backdrop = [[VLAboutColoredBackdrop alloc] initWithFrame: [[o_about_window contentView] frame]];
+    [[o_about_window contentView] addSubview: o_color_backdrop positioned: NSWindowBelow relativeTo: nil];
 }
 
 /*****************************************************************************
@@ -232,3 +237,12 @@ static VLAboutBox *_o_sharedInstance = nil;
 }
 
 @end
+
+@implementation VLAboutColoredBackdrop
+
+- (void)drawRect:(NSRect)rect {
+    [[NSColor whiteColor] setFill];
+    NSRectFill(rect);
+}
+
+@end