vlc/vlc-2.0 | branch: master | David Fuhrmann <[email protected]> | Wed Jun 27 20:02:05 2012 +0200| [bc2c368b1c3c2ddeaff7b9cb61f0a157f612ed1c] | committer: David Fuhrmann
macosx: open panel: set mrl textfield as noneditable manual merge of 3194c5215695c69ff67b40a369fa5e2bf0336a74 > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=bc2c368b1c3c2ddeaff7b9cb61f0a157f612ed1c --- .../macosx/Resources/English.lproj/Open.xib | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/Open.xib b/extras/package/macosx/Resources/English.lproj/Open.xib index 62ba9f6..629366e 100644 --- a/extras/package/macosx/Resources/English.lproj/Open.xib +++ b/extras/package/macosx/Resources/English.lproj/Open.xib @@ -12,14 +12,15 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="2304"/> + <integer value="3013"/> <integer value="1264"/> + <integer value="2297"/> + <integer value="2346"/> <integer value="637"/> + <integer value="2304"/> <integer value="2301"/> + <integer value="2838"/> <integer value="3289"/> - <integer value="3013"/> - <integer value="2297"/> - <integer value="2346"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -4396,7 +4397,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes> <bool key="NSWindowIsRestorable">YES</bool> </object> <object class="NSCustomView" id="146872184"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -4417,7 +4418,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes> <reference key="NSSuperview" ref="907806527"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="461334910"> - <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags">-2072904127</int> <int key="NSCellFlags2">4326400</int> <string key="NSContents"/> <reference key="NSSupport" ref="26"/> @@ -4454,6 +4455,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes> </object> </object> <string key="NSFrameSize">{553, 52}</string> + <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> <string key="NSExtension">NSResponder</string> </object> @@ -11914,7 +11916,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> - <string>{{34, 443}, {527, 222}}</string> + <string>{{329, 443}, {527, 222}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -12213,7 +12215,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABCcAAAwowAAA</bytes> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{404, 853}, {528, 222}}</string> + <string>{{404, 784}, {528, 222}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -12447,7 +12449,7 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{266, 305}, {295, 205}}</string> + <string>{{329, 305}, {295, 205}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSAffineTransform"/> <boolean value="YES"/> @@ -12551,9 +12553,9 @@ eHQAAAAAQ29weXJpZ2h0IEFwcGxlLCBJbmMuLCAyMDA5AA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> - <string>{{329, 853}, {574, 380}}</string> + <string>{{329, 626}, {574, 380}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{329, 853}, {574, 380}}</string> + <string>{{329, 626}, {574, 380}}</string> <boolean value="YES"/> <boolean value="YES"/> <string>{213, 107}</string> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
