Skip to content

V
vlc
Commit 5f194336 authored by David Fuhrmann's avatar David Fuhrmann
Browse files
Options

macosx: use VLCDropView for the controls bar drop area 

This removes VLCThreeImageDropView and thus duplicated
D&D code.
parent b85e854c
Hide whitespace changes
Inline Side-by-side
Showing with 1453 additions and 1424 deletions
extras/package/macosx/Resources/English.lproj/DetachedVideoWindow.xib
View file @ 5f194336
......@@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">12D78</string>
<string key="IBDocument.SystemVersion">12F45</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1187.37</string>
<string key="IBDocument.AppKitVersion">1187.40</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2"/>
<integer value="5"/>
<integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
......@@ -54,269 +54,280 @@
<int key="NSvFlags">290</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomView" id="146519853">
<object class="NSCustomView" id="123272820">
<reference key="NSNextResponder" ref="113392663"/>
<int key="NSvFlags">290</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomView" id="147134085">
<reference key="NSNextResponder" ref="146519853"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{1, 1}, {60, 12}}</string>
<reference key="NSSuperview" ref="146519853"/>
<string key="NSClassName">VLCThreePartImageView</string>
<object class="NSCustomView" id="146519853">
<reference key="NSNextResponder" ref="123272820"/>
<int key="NSvFlags">290</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomView" id="147134085">
<reference key="NSNextResponder" ref="146519853"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{1, 1}, {60, 12}}</string>
<reference key="NSSuperview" ref="146519853"/>
<string key="NSClassName">VLCThreePartImageView</string>
</object>
<object class="NSSlider" id="737614494">
<reference key="NSNextResponder" ref="146519853"/>
<int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{1, 0}, {168, 15}}</string>
<reference key="NSSuperview" ref="146519853"/>
<bool key="NSViewCanDrawConcurrently">YES</bool>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="743222304">
<int key="NSCellFlags">-2080112384</int>
<int key="NSCellFlags2">131072</int>
<object class="NSMutableString" key="NSContents">
<characters key="NS.bytes"/>
</object>
<object class="NSFont" key="NSSupport">
<string key="NSName">Helvetica</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
<reference key="NSControlView" ref="737614494"/>
<double key="NSMaxValue">10000</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">3260.3068524096384</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
<bool key="NSVertical">NO</bool>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSProgressIndicator" id="242221086">
<reference key="NSNextResponder" ref="146519853"/>
<int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{0, 2}, {171, 12}}</string>
<reference key="NSSuperview" ref="146519853"/>
<int key="NSpiFlags">16650</int>
<double key="NSMaxValue">100</double>
</object>
<object class="NSCustomView" id="714132571">
<reference key="NSNextResponder" ref="146519853"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{171, 14}</string>
<reference key="NSSuperview" ref="146519853"/>
<string key="NSReuseIdentifierKey">_NS:1109</string>
<string key="NSClassName">VLCThreePartImageView</string>
</object>
</object>
<string key="NSFrame">{{96, 10}, {171, 14}}</string>
<reference key="NSSuperview" ref="123272820"/>
<string key="NSReuseIdentifierKey">_NS:1109</string>
<string key="NSClassName">VLCProgressView</string>
</object>
<object class="NSSlider" id="737614494">
<reference key="NSNextResponder" ref="146519853"/>
<int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{1, 0}, {168, 15}}</string>
<reference key="NSSuperview" ref="146519853"/>
<bool key="NSViewCanDrawConcurrently">YES</bool>
<object class="NSImageView" id="1034029023">
<reference key="NSNextResponder" ref="123272820"/>
<int key="NSvFlags">289</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">{{349, 0}, {14, 14}}</string>
<reference key="NSSuperview" ref="123272820"/>
<string key="NSReuseIdentifierKey">_NS:2165</string>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="743222304">
<int key="NSCellFlags">-2080112384</int>
<int key="NSCellFlags2">131072</int>
<object class="NSMutableString" key="NSContents">
<object class="NSImageCell" key="NSCell" id="653708454">
<int key="NSCellFlags">524288</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">window-resize</string>
</object>
<string key="NSCellIdentifier">_NS:2165</string>
<int key="NSAlign">0</int>
<int key="NSScale">2</int>
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSButton" id="870873343">
<reference key="NSNextResponder" ref="123272820"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{327, 6}, {29, 23}}</string>
<reference key="NSSuperview" ref="123272820"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="521044114">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport" id="448182480">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">10</double>
<int key="NSfFlags">2832</int>
</object>
<reference key="NSControlView" ref="870873343"/>
<int key="NSButtonFlags">-931921920</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">fullscreen-double-buttons</string>
</object>
<object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">fullscreen-double-buttons-pressed</string>
</object>
<string key="NSAlternateContents"/>
<object class="NSMutableString" key="NSKeyEquivalent">
<characters key="NS.bytes"/>
</object>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="832170804">
<reference key="NSNextResponder" ref="123272820"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{269, 11}, {55, 13}}</string>
<reference key="NSSuperview" ref="123272820"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="94968110">
<int key="NSCellFlags">-2079326144</int>
<int key="NSCellFlags2">138413056</int>
<string key="NSContents">00:00</string>
<reference key="NSSupport" ref="448182480"/>
<reference key="NSControlView" ref="832170804"/>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4yNQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="256837310">
<reference key="NSNextResponder" ref="123272820"/>
<int key="NSvFlags">260</int>
<string key="NSFrame">{{35, 6}, {27, 23}}</string>
<reference key="NSSuperview" ref="123272820"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="384334476">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport">
<string key="NSName">Helvetica</string>
<string key="NSName">LucidaGrande</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
<reference key="NSControlView" ref="737614494"/>
<double key="NSMaxValue">10000</double>
<double key="NSMinValue">0.0</double>
<double key="NSValue">3260.3068524096384</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
<bool key="NSVertical">NO</bool>
<reference key="NSControlView" ref="256837310"/>
<int key="NSButtonFlags">139722752</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">play</string>
</object>
<object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">play-pressed</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSProgressIndicator" id="242221086">
<reference key="NSNextResponder" ref="146519853"/>
<int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{0, 2}, {171, 12}}</string>
<reference key="NSSuperview" ref="146519853"/>
<int key="NSpiFlags">16650</int>
<double key="NSMaxValue">100</double>
</object>
<object class="NSCustomView" id="714132571">
<reference key="NSNextResponder" ref="146519853"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{171, 14}</string>
<reference key="NSSuperview" ref="146519853"/>
<string key="NSReuseIdentifierKey">_NS:1109</string>
<string key="NSClassName">VLCThreePartImageView</string>
</object>
</object>
<string key="NSFrame">{{96, 10}, {171, 14}}</string>
<reference key="NSSuperview" ref="113392663"/>
<string key="NSReuseIdentifierKey">_NS:1109</string>
<string key="NSClassName">VLCProgressView</string>
</object>
<object class="NSImageView" id="1034029023">
<reference key="NSNextResponder" ref="113392663"/>
<int key="NSvFlags">289</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">{{349, 0}, {14, 14}}</string>
<reference key="NSSuperview" ref="113392663"/>
<string key="NSReuseIdentifierKey">_NS:2165</string>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="653708454">
<int key="NSCellFlags">524288</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">window-resize</string>
</object>
<string key="NSCellIdentifier">_NS:2165</string>
<int key="NSAlign">0</int>
<int key="NSScale">2</int>
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSButton" id="870873343">
<reference key="NSNextResponder" ref="113392663"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{327, 6}, {29, 23}}</string>
<reference key="NSSuperview" ref="113392663"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="521044114">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport" id="448182480">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">10</double>
<int key="NSfFlags">2832</int>
</object>
<reference key="NSControlView" ref="870873343"/>
<int key="NSButtonFlags">-931921920</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">fullscreen-double-buttons</string>
</object>
<object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">fullscreen-double-buttons-pressed</string>
</object>
<string key="NSAlternateContents"/>
<object class="NSMutableString" key="NSKeyEquivalent">
<characters key="NS.bytes"/>
</object>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="832170804">
<reference key="NSNextResponder" ref="113392663"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{269, 11}, {55, 13}}</string>
<reference key="NSSuperview" ref="113392663"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="94968110">
<int key="NSCellFlags">-2079326144</int>
<int key="NSCellFlags2">138413056</int>
<string key="NSContents">00:00</string>
<reference key="NSSupport" ref="448182480"/>
<reference key="NSControlView" ref="832170804"/>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSButton" id="723500596">
<reference key="NSNextResponder" ref="123272820"/>
<int key="NSvFlags">260</int>
<string key="NSFrame">{{6, 6}, {29, 23}}</string>
<reference key="NSSuperview" ref="123272820"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="616810207">
<int key="NSCellFlags">604504064</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="448182480"/>
<reference key="NSControlView" ref="723500596"/>
<int key="NSButtonFlags">138674176</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">backward-3btns</string>
</object>
<object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">backward-3btns-pressed</string>
</object>
<string key="NSAlternateContents"/>
<object class="NSMutableString" key="NSKeyEquivalent">
<characters key="NS.bytes"/>
</object>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4yNQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
<object class="NSButton" id="865782191">
<reference key="NSNextResponder" ref="123272820"/>
<int key="NSvFlags">260</int>
<string key="NSFrame">{{62, 6}, {29, 23}}</string>
<reference key="NSSuperview" ref="123272820"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1002406855">
<int key="NSCellFlags">604504064</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="448182480"/>
<reference key="NSControlView" ref="865782191"/>
<int key="NSButtonFlags">138674176</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">forward-3btns</string>
</object>
<object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">forward-3btns-pressed</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="256837310">
<reference key="NSNextResponder" ref="113392663"/>
<int key="NSvFlags">260</int>
<string key="NSFrame">{{35, 6}, {27, 23}}</string>
<reference key="NSSuperview" ref="113392663"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="384334476">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
<reference key="NSControlView" ref="256837310"/>
<int key="NSButtonFlags">139722752</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">play</string>
</object>
<object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">play-pressed</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="723500596">
<reference key="NSNextResponder" ref="113392663"/>
<int key="NSvFlags">260</int>
<string key="NSFrame">{{6, 6}, {29, 23}}</string>
<reference key="NSSuperview" ref="113392663"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="616810207">
<int key="NSCellFlags">604504064</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="448182480"/>
<reference key="NSControlView" ref="723500596"/>
<int key="NSButtonFlags">138674176</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">backward-3btns</string>
</object>
<object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">backward-3btns-pressed</string>
</object>
<string key="NSAlternateContents"/>
<object class="NSMutableString" key="NSKeyEquivalent">
<characters key="NS.bytes"/>
</object>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="865782191">
<reference key="NSNextResponder" ref="113392663"/>
<int key="NSvFlags">260</int>
<string key="NSFrame">{{62, 6}, {29, 23}}</string>
<string key="NSFrameSize">{363, 36}</string>
<reference key="NSSuperview" ref="113392663"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1002406855">
<int key="NSCellFlags">604504064</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="448182480"/>
<reference key="NSControlView" ref="865782191"/>
<int key="NSButtonFlags">138674176</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">forward-3btns</string>
</object>
<object class="NSCustomResource" key="NSAlternateImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">forward-3btns-pressed</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<string key="NSReuseIdentifierKey">_NS:1109</string>
<string key="NSClassName">VLCDragDropView</string>
</object>
</object>
<string key="NSFrameSize">{363, 36}</string>
<reference key="NSSuperview" ref="708382085"/>
<string key="NSReuseIdentifierKey">_NS:1109</string>
<string key="NSClassName">VLCThreePartDropView</string>
<string key="NSClassName">VLCThreePartImageView</string>
</object>
<object class="NSCustomView" id="178676337">
<reference key="NSNextResponder" ref="708382085"/>
......@@ -725,6 +736,14 @@
</object>
<int key="connectionID">64</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_drop_view</string>
<reference key="source" ref="839119909"/>
<reference key="destination" ref="123272820"/>
</object>
<int key="connectionID">66</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -800,70 +819,97 @@
<reference key="object" ref="113392663"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="146519853"/>
<reference ref="1034029023"/>
<reference ref="870873343"/>
<reference ref="832170804"/>
<reference ref="256837310"/>
<reference ref="723500596"/>
<reference ref="865782191"/>
<reference ref="123272820"/>
</object>
<reference key="parent" ref="708382085"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="146519853"/>
<int key="objectID">24</int>
<reference key="object" ref="101032218"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="147134085"/>
<reference ref="737614494"/>
<reference ref="242221086"/>
<reference ref="714132571"/>
<reference ref="597554768"/>
</object>
<reference key="parent" ref="113392663"/>
<reference key="parent" ref="669633479"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">7</int>
<reference key="object" ref="1034029023"/>
<int key="objectID">25</int>
<reference key="object" ref="207102644"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="653708454"/>
<reference ref="637045118"/>
</object>
<reference key="parent" ref="113392663"/>
<reference key="parent" ref="669633479"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">8</int>
<reference key="object" ref="870873343"/>
<int key="objectID">26</int>
<reference key="object" ref="505211502"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="521044114"/>
<reference ref="856613968"/>
</object>
<reference key="parent" ref="113392663"/>
<reference key="parent" ref="669633479"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="832170804"/>
<int key="objectID">27</int>
<reference key="object" ref="176506004"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="94968110"/>
<reference ref="744071623"/>
</object>
<reference key="parent" ref="113392663"/>
<reference key="parent" ref="669633479"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
<reference key="object" ref="256837310"/>
<int key="objectID">28</int>
<reference key="object" ref="686161087"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="384334476"/>
<reference ref="300915789"/>
</object>
<reference key="parent" ref="113392663"/>
<reference key="parent" ref="669633479"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
<reference key="object" ref="723500596"/>
<int key="objectID">29</int>
<reference key="object" ref="300915789"/>
<reference key="parent" ref="686161087"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">30</int>
<reference key="object" ref="744071623"/>
<reference key="parent" ref="176506004"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">31</int>
<reference key="object" ref="856613968"/>
<reference key="parent" ref="505211502"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">32</int>
<reference key="object" ref="637045118"/>
<reference key="parent" ref="207102644"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">33</int>
<reference key="object" ref="597554768"/>
<reference key="parent" ref="101032218"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">63</int>
<reference key="object" ref="178676337"/>
<reference key="parent" ref="708382085"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">65</int>
<reference key="object" ref="123272820"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="616810207"/>
<reference ref="146519853"/>
<reference ref="1034029023"/>
<reference ref="870873343"/>
<reference ref="832170804"/>
<reference ref="256837310"/>
<reference ref="723500596"/>
<reference ref="865782191"/>
</object>
<reference key="parent" ref="113392663"/>
</object>
......@@ -874,141 +920,123 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1002406855"/>
</object>
<reference key="parent" ref="113392663"/>
<reference key="parent" ref="123272820"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">13</int>
<reference key="object" ref="1002406855"/>
<reference key="parent" ref="865782191"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
<reference key="object" ref="723500596"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="616810207"/>
</object>
<reference key="parent" ref="123272820"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">14</int>
<reference key="object" ref="616810207"/>
<reference key="parent" ref="723500596"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
<reference key="object" ref="256837310"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="384334476"/>
</object>
<reference key="parent" ref="123272820"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">15</int>
<reference key="object" ref="384334476"/>
<reference key="parent" ref="256837310"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">16</int>
<reference key="object" ref="94968110"/>
<reference key="parent" ref="832170804"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="521044114"/>
<reference key="parent" ref="870873343"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">18</int>
<reference key="object" ref="653708454"/>
<reference key="parent" ref="1034029023"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">19</int>
<reference key="object" ref="147134085"/>
<reference key="parent" ref="146519853"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">20</int>
<reference key="object" ref="737614494"/>
<int key="objectID">9</int>
<reference key="object" ref="832170804"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="743222304"/>
<reference ref="94968110"/>
</object>
<reference key="parent" ref="146519853"/>
<reference key="parent" ref="123272820"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">21</int>
<reference key="object" ref="242221086"/>
<reference key="parent" ref="146519853"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">22</int>
<reference key="object" ref="714132571"/>
<reference key="parent" ref="146519853"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">23</int>
<reference key="object" ref="743222304"/>
<reference key="parent" ref="737614494"/>
<int key="objectID">16</int>
<reference key="object" ref="94968110"/>
<reference key="parent" ref="832170804"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">24</int>
<reference key="object" ref="101032218"/>
<int key="objectID">8</int>
<reference key="object" ref="870873343"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="597554768"/>
<reference ref="521044114"/>
</object>
<reference key="parent" ref="669633479"/>
<reference key="parent" ref="123272820"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">25</int>
<reference key="object" ref="207102644"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="637045118"/>
</object>
<reference key="parent" ref="669633479"/>
<int key="objectID">17</int>
<reference key="object" ref="521044114"/>
<reference key="parent" ref="870873343"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">26</int>
<reference key="object" ref="505211502"/>
<int key="objectID">7</int>
<reference key="object" ref="1034029023"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="856613968"/>
<reference ref="653708454"/>
</object>
<reference key="parent" ref="669633479"/>
<reference key="parent" ref="123272820"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">27</int>
<reference key="object" ref="176506004"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="744071623"/>
</object>
<reference key="parent" ref="669633479"/>
<int key="objectID">18</int>
<reference key="object" ref="653708454"/>
<reference key="parent" ref="1034029023"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">28</int>
<reference key="object" ref="686161087"/>
<int key="objectID">6</int>
<reference key="object" ref="146519853"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="300915789"/>
<reference ref="714132571"/>
<reference ref="242221086"/>
<reference ref="737614494"/>
<reference ref="147134085"/>
</object>
<reference key="parent" ref="669633479"/>
<reference key="parent" ref="123272820"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">29</int>
<reference key="object" ref="300915789"/>
<reference key="parent" ref="686161087"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">30</int>
<reference key="object" ref="744071623"/>
<reference key="parent" ref="176506004"/>
<int key="objectID">22</int>
<reference key="object" ref="714132571"/>
<reference key="parent" ref="146519853"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">31</int>
<reference key="object" ref="856613968"/>
<reference key="parent" ref="505211502"/>
<int key="objectID">21</int>
<reference key="object" ref="242221086"/>
<reference key="parent" ref="146519853"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">32</int>
<reference key="object" ref="637045118"/>
<reference key="parent" ref="207102644"/>
<int key="objectID">20</int>
<reference key="object" ref="737614494"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="743222304"/>
</object>
<reference key="parent" ref="146519853"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">33</int>
<reference key="object" ref="597554768"/>
<reference key="parent" ref="101032218"/>
<int key="objectID">19</int>
<reference key="object" ref="147134085"/>
<reference key="parent" ref="146519853"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">63</int>
<reference key="object" ref="178676337"/>
<reference key="parent" ref="708382085"/>
<int key="objectID">23</int>
<reference key="object" ref="743222304"/>
<reference key="parent" ref="737614494"/>
</object>
</object>
</object>
......@@ -1079,10 +1107,13 @@
<string>5.IBPluginDependency</string>
<string>5.IBViewBoundsToFrameTransform</string>
<string>6.IBPluginDependency</string>
<string>6.IBViewBoundsToFrameTransform</string>
<string>63.IBPluginDependency</string>
<string>63.IBViewBoundsToFrameTransform</string>
<string>65.IBPluginDependency</string>
<string>7.CustomClassName</string>
<string>7.IBPluginDependency</string>
<string>7.IBViewBoundsToFrameTransform</string>
<string>8.IBPluginDependency</string>
<string>8.IBViewBoundsToFrameTransform</string>
<string>8.ImportedFromIB2</string>
......@@ -1098,17 +1129,17 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABB2AAAwgQAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABCDAAAwdgAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBUAAAw5gAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABAwAAAwdgAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCpgAAw5gAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABCeAAAwdgAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -1182,21 +1213,28 @@
<bytes key="NSTransformStruct">AUKkAABCDAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AULAAABBIAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUJwAABDDwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>VLCResizeControl</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUOugAAAAAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDq4AAwjQAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDo4AAwdgAAA</bytes>
</object>
<boolean value="YES"/>
<string>VLCTimeField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDiwAAwbgAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDhoAAwbAAAA</bytes>
</object>
<boolean value="YES"/>
</object>
......@@ -1217,7 +1255,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">64</int>
<int key="maxID">66</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -1257,6 +1295,13 @@
<string key="minorKey">../../../modules/gui/macosx/SPMediaKeyTap.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="101440213">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../../modules/gui/macosx/misc.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSWindow</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
......@@ -1267,10 +1312,7 @@
<object class="IBPartialClassDescription">
<string key="className">TimeLineSlider</string>
<string key="superclassName">NSSlider</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="101440213">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">../../../modules/gui/macosx/misc.h</string>
</object>
<reference key="sourceIdentifier" ref="101440213"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">TimeLineSlider</string>
......@@ -1342,6 +1384,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>o_bottombar_view</string>
<string>o_bwd_btn</string>
<string>o_drop_view</string>
<string>o_fullscreen_btn</string>
<string>o_fwd_btn</string>
<string>o_play_btn</string>
......@@ -1357,6 +1400,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>VLCDragDropView</string>
<string>id</string>
<string>id</string>
<string>id</string>
......@@ -1375,6 +1419,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>o_bottombar_view</string>
<string>o_bwd_btn</string>
<string>o_drop_view</string>
<string>o_fullscreen_btn</string>
<string>o_fwd_btn</string>
<string>o_play_btn</string>
......@@ -1396,6 +1441,10 @@
<string key="name">o_bwd_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_drop_view</string>
<string key="candidateClassName">VLCDragDropView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_fullscreen_btn</string>
<string key="candidateClassName">id</string>
......@@ -1535,6 +1584,11 @@
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCDragDropView</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="101440213"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCMainWindowTitleView</string>
<string key="superclassName">VLCThreePartImageView</string>
......@@ -1638,19 +1692,6 @@
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCThreePartDropView</string>
<string key="superclassName">VLCThreePartImageView</string>
<reference key="sourceIdentifier" ref="101440213"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCThreePartDropView</string>
<string key="superclassName">VLCThreePartImageView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCThreePartImageView</string>
<string key="superclassName">NSView</string>
......
extras/package/macosx/Resources/English.lproj/MainWindow.xib
View file @ 5f194336
This source diff could not be displayed because it is too large. You can view the blob instead.
modules/gui/macosx/ControlsBar.h
View file @ 5f194336
......@@ -37,6 +37,7 @@
@interface VLCControlsBarCommon : NSObject
{
IBOutlet id o_bottombar_view;
IBOutlet VLCDragDropView *o_drop_view;
IBOutlet id o_play_btn;
IBOutlet id o_bwd_btn;
......
modules/gui/macosx/ControlsBar.m
View file @ 5f194336
......@@ -50,6 +50,8 @@
b_nativeFullscreenMode = var_InheritBool(VLCIntf, "macosx-nativefullscreenmode");
#endif
[o_drop_view setDrawBorder: NO];
[o_play_btn setToolTip: _NS("Play/Pause")];
[[o_play_btn cell] accessibilitySetOverrideValue:_NS("Click to play or pause the current media.") forAttribute:NSAccessibilityDescriptionAttribute];
[[o_play_btn cell] accessibilitySetOverrideValue:[o_play_btn toolTip] forAttribute:NSAccessibilityTitleAttribute];
......
modules/gui/macosx/misc.h
View file @ 5f194336
......@@ -93,6 +93,8 @@
}
@property (nonatomic, assign) id dropHandler;
@property (nonatomic, assign) BOOL drawBorder;
- (void)enablePlaylistItems;
......@@ -212,12 +214,6 @@
- (void)setImagesLeft:(NSImage *)left middle: (NSImage *)middle right:(NSImage *)right;
@end
/*****************************************************************************
* VLCThreePartDropView interface
*****************************************************************************/
@interface VLCThreePartDropView : VLCThreePartImageView
@end
/*****************************************************************************
* PositionFormatter interface
......
modules/gui/macosx/misc.m
View file @ 5f194336
......@@ -320,6 +320,18 @@ static bool b_old_spaces_style = YES;
@implementation VLCDragDropView
@synthesize dropHandler=_dropHandler;
@synthesize drawBorder;
- (id)initWithFrame:(NSRect)frame
{
self = [super initWithFrame:frame];
if (self) {
// default value
[self setDrawBorder:YES];
}
return self;
}
- (void)enablePlaylistItems
{
......@@ -391,8 +403,7 @@ static bool b_old_spaces_style = YES;
- (void)drawRect:(NSRect)dirtyRect
{
if (b_activeDragAndDrop) {
if ([self drawBorder] && b_activeDragAndDrop) {
NSRect frameRect = [self bounds];
[[NSColor selectedControlColor] set];
......@@ -866,52 +877,6 @@ void _drawFrameInRect(NSRect frameRect)
@end
@implementation VLCThreePartDropView
- (BOOL)mouseDownCanMoveWindow
{
return YES;
}
- (void)dealloc
{
[self unregisterDraggedTypes];
[super dealloc];
}
- (void)awakeFromNib
{
[self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
}
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
{
if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) == NSDragOperationGeneric)
return NSDragOperationGeneric;
return NSDragOperationNone;
}
- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
{
return YES;
}
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
{
BOOL b_returned;
b_returned = [[VLCCoreInteraction sharedInstance] performDragOperation: sender];
[self setNeedsDisplay:YES];
return YES;
}
- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
{
[self setNeedsDisplay:YES];
}
@end
@implementation PositionFormatter
......@@ -957,7 +922,6 @@ void _drawFrameInRect(NSRect frameRect)
}
}
@end
@implementation NSView (EnableSubviews)
......
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