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

diff --git a/Makefile.am b/Makefile.am
index 769cf984d4bf3c9a6f2c7d4549e795db9431bc68..231813133f18e97c51bf92e8715ed3c3a0fc0d64 100644 (file)
--- a/Makefile.am
+++ b/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 \

diff --git a/extras/package/macosx/Resources/English.lproj/About.xib b/extras/package/macosx/Resources/English.lproj/About.xib
index 0b526fee75c33657c3387251947531ff17ac52a2..e0c2154d0d39be371fec29754a732a919bb41d45 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/About.xib
+++ b/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">
@@ -23,7 +23,7 @@
       <bool key="EncodedWithXMLCoder">YES</bool>
       <integer value="2245"/>
       <integer value="2239"/>
-      <integer value="1344"/>
+      <integer value="1345"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -78,7 +78,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 +86,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 +220,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>
@@ -918,12 +918,12 @@
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <reference ref="943165371"/>
-              <reference ref="684344310"/>
               <reference ref="479386874"/>
               <reference ref="133543770"/>
               <reference ref="164401777"/>
               <reference ref="1048236564"/>
               <reference ref="165770629"/>
+              <reference ref="684344310"/>
             </object>
             <reference key="parent" ref="371989265"/>
           </object>
@@ -943,15 +943,6 @@
             <reference key="object" ref="139161632"/>
             <reference key="parent" ref="943165371"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">2231</int>
-            <reference key="object" ref="684344310"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="548775455"/>
-            </object>
-            <reference key="parent" ref="471759747"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">2232</int>
             <reference key="object" ref="479386874"/>
@@ -1092,11 +1083,6 @@
             <reference key="object" ref="1033279449"/>
             <reference key="parent" ref="481393880"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">2269</int>
-            <reference key="object" ref="548775455"/>
-            <reference key="parent" ref="684344310"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">2270</int>
             <reference key="object" ref="367117063"/>
@@ -1163,6 +1149,20 @@
             <reference key="parent" ref="0"/>
             <string key="objectName">Application</string>
           </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">2231</int>
+            <reference key="object" ref="684344310"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="548775455"/>
+            </object>
+            <reference key="parent" ref="471759747"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">2269</int>
+            <reference key="object" ref="548775455"/>
+            <reference key="parent" ref="684344310"/>
+          </object>
         </object>
       </object>
       <object class="NSMutableDictionary" key="flattenedProperties">
@@ -1287,9 +1287,9 @@
             <bytes key="NSTransformStruct">P4AAAL+AAABCigAAwigAAA</bytes>
           </object>
           <boolean value="YES"/>
-          <string>{{452, 330}, {480, 360}}</string>
+          <string>{{452, 316}, {480, 360}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{452, 330}, {480, 360}}</string>
+          <string>{{452, 316}, {480, 360}}</string>
           <boolean value="YES"/>
           <boolean value="YES"/>
           <string>{480, 360}</string>
@@ -1540,7 +1540,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>

diff --git a/extras/package/macosx/Resources/about_bg.png b/extras/package/macosx/Resources/about_bg.png
deleted file mode 100644 (file)
index d1b4d99..0000000
Binary files a/extras/package/macosx/Resources/about_bg.png and /dev/null differ

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index ff8d1a5a60f068d1fd48574a66a187b1970dd379..8ed25694bf70ccb72c00a181ba974be94ce39cbf 100644 (file)
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -211,7 +211,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 */; };
@@ -423,9 +422,9 @@
                CC04334113B28B8200D7D52E /* pause.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pause.png; path = Resources/mainwindow/pause.png; sourceTree = "<group>"; };
                CC04334213B28B8200D7D52E /* play-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "play-pressed.png"; path = "Resources/mainwindow/play-pressed.png"; sourceTree = "<group>"; };
                CC04334313B28B8200D7D52E /* play.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = play.png; path = Resources/mainwindow/play.png; sourceTree = "<group>"; };
-               CC04334413B28B8200D7D52E /* playlist-btn-blue.png */ = {isa = PBXFileReference; name = "playlist-btn-blue.png"; path = "Resources/mainwindow/playlist-btn-blue.png"; sourceTree = "<group>"; };
-               CC04334513B28B8200D7D52E /* playlist-btn-pressed.png */ = {isa = PBXFileReference; name = "playlist-btn-pressed.png"; path = "Resources/mainwindow/playlist-btn-pressed.png"; sourceTree = "<group>"; };
-               CC04334613B28B8200D7D52E /* playlist-btn.png */ = {isa = PBXFileReference; name = "playlist-btn.png"; path = "Resources/mainwindow/playlist-btn.png"; sourceTree = "<group>"; };
+               CC04334413B28B8200D7D52E /* playlist-btn-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-btn-blue.png"; path = "Resources/mainwindow/playlist-btn-blue.png"; sourceTree = "<group>"; };
+               CC04334513B28B8200D7D52E /* playlist-btn-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-btn-pressed.png"; path = "Resources/mainwindow/playlist-btn-pressed.png"; sourceTree = "<group>"; };
+               CC04334613B28B8200D7D52E /* playlist-btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-btn.png"; path = "Resources/mainwindow/playlist-btn.png"; sourceTree = "<group>"; };
                CC04334713B28B8200D7D52E /* progression-fill-left.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "progression-fill-left.png"; path = "Resources/mainwindow/progression-fill-left.png"; sourceTree = "<group>"; };
                CC04334813B28B8200D7D52E /* progression-fill-middle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "progression-fill-middle.png"; path = "Resources/mainwindow/progression-fill-middle.png"; sourceTree = "<group>"; };
                CC04334913B28B8200D7D52E /* progression-fill-right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "progression-fill-right.png"; path = "Resources/mainwindow/progression-fill-right.png"; sourceTree = "<group>"; };
@@ -656,7 +655,6 @@
                DC1A176914E2778A001477C6 /* qtsound.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = qtsound.m; path = ../../../modules/access/qtsound.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>"; };
@@ -710,7 +708,6 @@
                                CC5800F81423A82100166912 /* fspanel (@1.5x) */,
                                CCCB86BF0ACFDE4A00CF1E10 /* fspanel */,
                                DCF358BC077F1236007DB450 /* xibs */,
-                               DCDA5E6408F94518009D93A8 /* about_bg.png */,
                                8E445F86047289E50059A3A7 /* fileicons */,
                                CC0430EE13B2461A00D7D52E /* 10th anniversary ui */,
                                F69B0CA602E24F6401A80112 /* InfoPlist.strings */,
@@ -1314,7 +1311,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 */,

diff --git a/modules/gui/macosx/about.h b/modules/gui/macosx/about.h
index 167ef119745e6ea9192804394d8040620471db8a..0e0c773c82039230bca1845b9a334da47bb014f0 100644 (file)
--- a/modules/gui/macosx/about.h
+++ b/modules/gui/macosx/about.h
@@ -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

diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index 19cb71fba933c988eaf8285daa0f69543aacbe04..138b51d7a9345b74c1c99180f6a4fa97eadaf42d 100644 (file)
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -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