macosx: added missing backgrounds for the button bar at the bottom of the window

diff --git a/Makefile.am b/Makefile.am
index 3f3af87912ff931fc8723947a1afc5d99ef03acd..0bec971de828aa0f97016ec11fdd95159f4a795c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -197,6 +197,7 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/icons/wmv.icns \
        extras/package/macosx/Resources/mainwindow/back-pressed.png \
        extras/package/macosx/Resources/mainwindow/back.png \
+       extras/package/macosx/Resources/mainwindow/bottom-background.png \
        extras/package/macosx/Resources/mainwindow/bottom-bar-mini.png \
        extras/package/macosx/Resources/mainwindow/effects-double-buttons-blue.png \
        extras/package/macosx/Resources/mainwindow/effects-double-buttons-pressed.png \
@@ -247,6 +248,7 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/volumetrack.png \
        extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
+       extras/package/macosx/Resources/mainwindow/bottom-background_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-blue_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark.png \

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
index 957bfba05dd2ba093a5d43b6b5c5a8d56dd6c228..0527bbf4b68b4f98529f964515ee02ca9341f7ca 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
@@ -12,10 +12,10 @@
                </object>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="2"/>
-                       <integer value="24"/>
                        <integer value="2197"/>
+                       <integer value="2"/>
                        <integer value="2417"/>
+                       <integer value="24"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -37,10 +37,10 @@
                                <string key="NSClassName">NSApplication</string>
                        </object>
                        <object class="NSWindowTemplate" id="498338108">
-                               <int key="NSWindowStyleMask">4111</int>
+                               <int key="NSWindowStyleMask">15</int>
                                <int key="NSWindowBacking">2</int>
                                <string key="NSWindowRect">{{53, 419}, {604, 310}}</string>
-                               <int key="NSWTFlags">1881669632</int>
+                               <int key="NSWTFlags">1881670656</int>
                                <string key="NSWindowTitle">VLC media player</string>
                                <string key="NSWindowClass">VLCControllerWindow</string>
                                <nil key="NSViewClass"/>
@@ -51,6 +51,38 @@
                                        <int key="NSvFlags">256</int>
                                        <object class="NSMutableArray" key="NSSubviews">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSImageView" id="1041205852">
+                                                       <reference key="NSNextResponder" ref="429932428"/>
+                                                       <int key="NSvFlags">290</int>
+                                                       <object class="NSMutableSet" key="NSDragTypes">
+                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                               <object class="NSArray" key="set.sortedObjects">
+                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                       <string>Apple PDF pasteboard type</string>
+                                                                       <string>Apple PICT pasteboard type</string>
+                                                                       <string>Apple PNG pasteboard type</string>
+                                                                       <string>NSFilenamesPboardType</string>
+                                                                       <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+                                                                       <string>NeXT TIFF v4.0 pasteboard type</string>
+                                                               </object>
+                                                       </object>
+                                                       <string key="NSFrame">{{-1, 0}, {605, 36}}</string>
+                                                       <reference key="NSSuperview" ref="429932428"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSImageCell" key="NSCell" id="360339763">
+                                                               <int key="NSCellFlags">130560</int>
+                                                               <int key="NSCellFlags2">33554432</int>
+                                                               <object class="NSCustomResource" key="NSContents">
+                                                                       <string key="NSClassName">NSImage</string>
+                                                                       <string key="NSResourceName">bottom-background</string>
+                                                               </object>
+                                                               <int key="NSAlign">0</int>
+                                                               <int key="NSScale">1</int>
+                                                               <int key="NSStyle">0</int>
+                                                               <bool key="NSAnimates">NO</bool>
+                                                       </object>
+                                                       <bool key="NSEditable">YES</bool>
+                                               </object>
                                                <object class="NSImageView" id="784705424">
                                                        <reference key="NSNextResponder" ref="429932428"/>
                                                        <int key="NSvFlags">289</int>
@@ -6778,6 +6810,7 @@ LCAuLi4</string>
                                                        <reference ref="915491793"/>
                                                        <reference ref="704525034"/>
                                                        <reference ref="664576649"/>
+                                                       <reference ref="1041205852"/>
                                                </object>
                                                <reference key="parent" ref="498338108"/>
                                        </object>
@@ -9219,6 +9252,20 @@ LCAuLi4</string>
                                                <reference key="object" ref="664576649"/>
                                                <reference key="parent" ref="429932428"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">4432</int>
+                                               <reference key="object" ref="1041205852"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="360339763"/>
+                                               </object>
+                                               <reference key="parent" ref="429932428"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">4433</int>
+                                               <reference key="object" ref="360339763"/>
+                                               <reference key="parent" ref="1041205852"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
@@ -9876,6 +9923,9 @@ LCAuLi4</string>
                                        <string>4423.ImportedFromIB2</string>
                                        <string>4424.IBPluginDependency</string>
                                        <string>4425.IBPluginDependency</string>
+                                       <string>4432.IBPluginDependency</string>
+                                       <string>4432.IBViewBoundsToFrameTransform</string>
+                                       <string>4433.IBPluginDependency</string>
                                        <string>446.IBPluginDependency</string>
                                        <string>446.ImportedFromIB2</string>
                                        <string>5.IBPluginDependency</string>
@@ -10621,6 +10671,11 @@ LCAuLi4</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <object class="NSAffineTransform">
+                                               <bytes key="NSTransformStruct">AUOvgABBqAAAA</bytes>
+                                       </object>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
@@ -10686,7 +10741,7 @@ LCAuLi4</string>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">4431</int>
+                       <int key="maxID">4433</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -14403,6 +14458,7 @@ LCAuLi4</string>
                                <string>NSMenuMixedState</string>
                                <string>back</string>
                                <string>back-pressed</string>
+                               <string>bottom-background</string>
                                <string>display_left</string>
                                <string>display_middle</string>
                                <string>display_right</string>
@@ -14452,6 +14508,7 @@ LCAuLi4</string>
                                <string>{7, 2}</string>
                                <string>{35, 23}</string>
                                <string>{35, 23}</string>
+                               <string>{1.44005, 8.64029}</string>
                                <string>{8, 36}</string>
                                <string>{8, 36}</string>
                                <string>{8, 36}</string>
@@ -14478,7 +14535,7 @@ LCAuLi4</string>
                                <string>{33, 20}</string>
                                <string>{29, 30}</string>
                                <string>{39, 39}</string>
-                               <string>{28, 23}</string>
+                               <string>{512, 512}</string>
                                <string>{28, 23}</string>
                                <string>{28, 23}</string>
                                <string>{28, 23}</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 28fa927569ce766e398a95e9a9b349af4ddffb1f..45c77b82c3dfa59ec3782aec5ddd3f9f7b6a4738 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/mainwindow/bottom-background.png b/extras/package/macosx/Resources/mainwindow/bottom-background.png
new file mode 100644 (file)
index 0000000..80e7b9a
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow/bottom-background.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png b/extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png
new file mode 100644 (file)
index 0000000..4ebd04a
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png differ

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index b3a7e813fd42ca70822081f89cf1be3a687e1268..f900bc7d0cdfe748734f7bd651078d00008da2f4 100644 (file)
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -194,6 +194,8 @@
                CC8062641021F8790021EB9A /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CC8062631021F8790021EB9A /* dsa_pub.pem */; };
                CC84FB2D130083BB00816D38 /* BGHUDAppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */; };
                CC84FB481300843200816D38 /* BGHUDAppKit.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */; };
+               CC9B43AF13B29C79000205AE /* bottom-background.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43AE13B29C79000205AE /* bottom-background.png */; };
+               CC9B43B113B29FCF000205AE /* bottom-background_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43B013B29FCF000205AE /* bottom-background_dark.png */; };
                CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCBE999E0F922C51000705F8 /* CoreServices.framework */; };
                CCC0C2AA13A285F700AC92B3 /* VideoEffects.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCC0C2A813A285F700AC92B3 /* VideoEffects.nib */; };
                CCF11B540F8BFB520088542D /* ErrorPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCF11B520F8BFB520088542D /* ErrorPanel.nib */; };
@@ -455,6 +457,8 @@
                CC8062631021F8790021EB9A /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Resources/dsa_pub.pem; sourceTree = "<group>"; };
                CC84FB2C130083BB00816D38 /* BGHUDAppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BGHUDAppKit.framework; path = ../../contrib/BGHUDAppKit/BGHUDAppKit.framework; sourceTree = SOURCE_ROOT; };
                CC962E2C0CC7992800A56695 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
+               CC9B43AE13B29C79000205AE /* bottom-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background.png"; path = "Resources/mainwindow/bottom-background.png"; sourceTree = "<group>"; };
+               CC9B43B013B29FCF000205AE /* bottom-background_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background_dark.png"; path = "Resources/mainwindow_dark/bottom-background_dark.png"; sourceTree = "<group>"; };
                CCB24D5D0D54BBAE004D780C /* simple_prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = simple_prefs.m; path = ../../../modules/gui/macosx/simple_prefs.m; sourceTree = SOURCE_ROOT; };
                CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_prefs.h; path = ../../../modules/gui/macosx/simple_prefs.h; sourceTree = SOURCE_ROOT; };
                CCBE999E0F922C51000705F8 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
@@ -689,6 +693,7 @@
                        children = (
                                CC04321113B246DF00D7D52E /* back_dark.png */,
                                CC04321213B246DF00D7D52E /* back-pressed_dark.png */,
+                               CC9B43B013B29FCF000205AE /* bottom-background_dark.png */,
                                CC04321313B246DF00D7D52E /* effects-double-buttons_dark.png */,
                                CC04321413B246DF00D7D52E /* effects-double-buttons-blue_dark.png */,
                                CC04321513B246DF00D7D52E /* effects-double-buttons-pressed_dark.png */,
@@ -739,6 +744,7 @@
                                CC04332B13B28B8200D7D52E /* back-pressed.png */,
                                CC04332C13B28B8200D7D52E /* back.png */,
                                CC04332D13B28B8200D7D52E /* bottom-bar-mini.png */,
+                               CC9B43AE13B29C79000205AE /* bottom-background.png */,
                                CC04332E13B28B8200D7D52E /* effects-double-buttons-blue.png */,
                                CC04332F13B28B8200D7D52E /* effects-double-buttons-pressed.png */,
                                CC04333013B28B8200D7D52E /* effects-double-buttons.png */,
@@ -1154,6 +1160,8 @@
                                CC0433D213B28C8C00D7D52E /* spref_cone_Interface_64.png in Resources */,
                                CC0433D313B28C8C00D7D52E /* spref_cone_Subtitles_64.png in Resources */,
                                CC0433D413B28C8C00D7D52E /* spref_cone_Video_64.png in Resources */,
+                               CC9B43AF13B29C79000205AE /* bottom-background.png in Resources */,
+                               CC9B43B113B29FCF000205AE /* bottom-background_dark.png in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };