Skip to content

V
vlc-1.1
Commit bebef986 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

macosx: Set nib deplyment target to 10.4, and don't use toolbar from nib as... 

macosx: Set nib deplyment target to 10.4, and don't use toolbar from nib as this is not supported in 10.4. (Thanks dj).

Fix #1830 (.nib not 10.4 compatible).
parent 658039e1
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 55 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
View file @ bebef986
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
<data> <data>
<int key="IBDocument.SystemTarget">1050</int> <int key="IBDocument.SystemTarget">1040</int>
<string key="IBDocument.SystemVersion">9E17</string> <string key="IBDocument.SystemVersion">9E17</string>
<string key="IBDocument.InterfaceBuilderVersion">667</string> <string key="IBDocument.InterfaceBuilderVersion">667</string>
<string key="IBDocument.AppKitVersion">949.33</string> <string key="IBDocument.AppKitVersion">949.33</string>
...@@ -318,36 +318,7 @@ ...@@ -318,36 +318,7 @@
<int key="NSWTFlags">1881669632</int> <int key="NSWTFlags">1881669632</int>
<string key="NSWindowTitle">VLC media player</string> <string key="NSWindowTitle">VLC media player</string>
<string key="NSWindowClass">VLCControllerWindow</string> <string key="NSWindowClass">VLCControllerWindow</string>
<object class="NSToolbar" key="NSViewClass" id="89609267"> <nil key="NSViewClass"/>
<object class="NSMutableString" key="NSToolbarIdentifier">
<characters key="NS.bytes">33859FC5-243A-4329-AA07-DC771FCF99D6</characters>
</object>
<nil key="NSToolbarDelegate"/>
<bool key="NSToolbarPrefersToBeShown">YES</bool>
<bool key="NSToolbarShowsBaselineSeparator">NO</bool>
<bool key="NSToolbarAllowsUserCustomization">NO</bool>
<bool key="NSToolbarAutosavesConfiguration">YES</bool>
<int key="NSToolbarDisplayMode">2</int>
<int key="NSToolbarSizeMode">1</int>
<object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="NSArray" key="NSToolbarIBAllowedItems">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="NSToolbarIBSelectableItems">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<object class="NSView" key="NSWindowView" id="179044500"> <object class="NSView" key="NSWindowView" id="179044500">
<reference key="NSNextResponder"/> <reference key="NSNextResponder"/>
...@@ -585,7 +556,7 @@ ...@@ -585,7 +556,7 @@
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{0, 41}</string> <string key="NSMinSize">{338, 51}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSFrameAutosaveName">vlc</string> <string key="NSFrameAutosaveName">vlc</string>
</object> </object>
...@@ -6858,14 +6829,6 @@ ...@@ -6858,14 +6829,6 @@
</object> </object>
<int key="connectionID">3664</int> <int key="connectionID">3664</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="89609267"/>
<reference key="destination" ref="592369951"/>
</object>
<int key="connectionID">3665</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">togglePlaylist:</string> <string key="label">togglePlaylist:</string>
...@@ -7110,7 +7073,6 @@ ...@@ -7110,7 +7073,6 @@
<object class="NSMutableArray" key="children"> <object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="179044500"/> <reference ref="179044500"/>
<reference ref="89609267"/>
</object> </object>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
<string key="objectName">vlc</string> <string key="objectName">vlc</string>
...@@ -9772,14 +9734,6 @@ ...@@ -9772,14 +9734,6 @@
<reference key="object" ref="246536150"/> <reference key="object" ref="246536150"/>
<reference key="parent" ref="111740499"/> <reference key="parent" ref="111740499"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">3607</int>
<reference key="object" ref="89609267"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="parent" ref="451177334"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">3647</int> <int key="objectID">3647</int>
<reference key="object" ref="104993218"/> <reference key="object" ref="104993218"/>
...@@ -10508,8 +10462,6 @@ ...@@ -10508,8 +10462,6 @@
<string>3586.CustomClassName</string> <string>3586.CustomClassName</string>
<string>3586.IBPluginDependency</string> <string>3586.IBPluginDependency</string>
<string>3586.ImportedFromIB2</string> <string>3586.ImportedFromIB2</string>
<string>3607.IBEditorWindowLastContentRect</string>
<string>3607.IBPluginDependency</string>
<string>3647.IBPluginDependency</string> <string>3647.IBPluginDependency</string>
<string>3647.ImportedFromIB2</string> <string>3647.ImportedFromIB2</string>
<string>3648.IBPluginDependency</string> <string>3648.IBPluginDependency</string>
...@@ -10824,9 +10776,9 @@ ...@@ -10824,9 +10776,9 @@
<reference ref="9"/> <reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/> <reference ref="9"/>
<string>{{181, 706}, {338, 29}}</string> <string>{{181, 725}, {338, 29}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{181, 706}, {338, 29}}</string> <string>{{181, 725}, {338, 29}}</string>
<reference ref="9"/> <reference ref="9"/>
<reference ref="9"/> <reference ref="9"/>
<reference ref="9"/> <reference ref="9"/>
...@@ -11173,8 +11125,6 @@ ...@@ -11173,8 +11125,6 @@
<string>VLBrushedMetalImageView</string> <string>VLBrushedMetalImageView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/> <reference ref="9"/>
<string>{{10, 809}, {616, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/> <reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......
modules/gui/macosx/intf.m
View file @ bebef986
...@@ -392,6 +392,15 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -392,6 +392,15 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_msgs_panel setExcludedFromWindowsMenu: YES]; [o_msgs_panel setExcludedFromWindowsMenu: YES];
[o_msgs_panel setDelegate: self]; [o_msgs_panel setDelegate: self];
/* In code and not in Nib for 10.4 compat */
NSToolbar * toolbar = [[[NSToolbar alloc] initWithIdentifier:@"mainControllerToolbar"] autorelease];
[toolbar setDelegate:self];
[toolbar setShowsBaselineSeparator:NO];
[toolbar setAllowsUserCustomization:NO];
[toolbar setDisplayMode:NSToolbarDisplayModeIconOnly];
[toolbar setAutosavesConfiguration:YES];
[o_window setToolbar:toolbar];
i_key = config_GetInt( p_intf, "key-quit" ); i_key = config_GetInt( p_intf, "key-quit" );
[o_mi_quit setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; [o_mi_quit setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_quit setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; [o_mi_quit setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment