[vlc-commits] commit: macosx: connect the right slider outlet. close #3598 ( Sebastien Zwickert )
git at videolan.org
git at videolan.org
Tue May 11 00:43:43 CEST 2010
vlc/vlc-1.1 | branch: master | Sebastien Zwickert <dilaroga at free.fr> | Mon May 10 21:03:21 2010 +0200| [eeec4f28ccdff16b5ea73c9973888dea15b12d59] | committer: Jean-Baptiste Kempf
macosx: connect the right slider outlet. close #3598
Signed-off-by: Pierre d'Herbemont <pdherbemont at free.fr>
(cherry picked from commit f22a1f3ffaf9a92f3edd06f6d2b9edf0551d4fb3)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=eeec4f28ccdff16b5ea73c9973888dea15b12d59
---
.../English.lproj/MainMenu.nib/designable.nib | 64 +++++--------------
.../English.lproj/MainMenu.nib/keyedobjects.nib | Bin 153663 -> 153667 bytes
2 files changed, 17 insertions(+), 47 deletions(-)
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 cb4d555..c206048 100644
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
@@ -2,20 +2,20 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1040</int>
- <string key="IBDocument.SystemVersion">10C540</string>
+ <string key="IBDocument.SystemVersion">10D573</string>
<string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">460.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">740</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="235"/>
- <integer value="21"/>
<integer value="4376"/>
+ <integer value="235"/>
<integer value="2417"/>
+ <integer value="21"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -7151,14 +7151,6 @@ LCAuLi4</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">o_slider</string>
- <reference key="source" ref="284663135"/>
- <reference key="destination" ref="400811827"/>
- </object>
- <int key="connectionID">2810</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">o_btn_fullscreen</string>
<reference key="source" ref="284663135"/>
<reference key="destination" ref="750753776"/>
@@ -7885,6 +7877,14 @@ LCAuLi4</string>
</object>
<int key="connectionID">4395</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">o_timeslider</string>
+ <reference key="source" ref="284663135"/>
+ <reference key="destination" ref="400811827"/>
+ </object>
+ <int key="connectionID">4396</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -12128,7 +12128,7 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>{{350, 595}, {576, 81}}</string>
+ <string>{{223, 595}, {576, 81}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12193,9 +12193,9 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>{{350, 659}, {238, 63}}</string>
+ <string>{{237, 786}, {238, 63}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{350, 659}, {238, 63}}</string>
+ <string>{{237, 786}, {238, 63}}</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
@@ -12672,7 +12672,7 @@ LCAuLi4</string>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">4395</int>
+ <int key="maxID">4396</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -13885,36 +13885,6 @@ LCAuLi4</string>
</object>
</object>
</object>
- <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBDocumentRelativeSource</string>
- <string key="minorKey">../../../../contrib/hosts/i686-apple-darwin10/Sparkle/Sparkle.framework/Versions/A/Headers/SUAppcast.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="35471893">
- <string key="majorKey">IBDocumentRelativeSource</string>
- <string key="minorKey">../../../../contrib/hosts/i686-apple-darwin10/Sparkle/Sparkle.framework/Versions/A/Headers/SUUpdater.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">SUUpdater</string>
- <string key="superclassName">NSObject</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">checkForUpdates:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">delegate</string>
- <string key="NS.object.0">id</string>
- </object>
- <reference key="sourceIdentifier" ref="35471893"/>
- </object>
- </object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
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 a103dfc..f11cea0 100644
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
More information about the vlc-commits
mailing list