Skip to content

V
vlc
Commit 2be3a2dc authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: added a 'Drop Zone' view, which is displayed when the playlist is empty 

preliminary graphics..
parent 5fe636f6
Show whitespace changes
Inline Side-by-side
Showing with 751 additions and 18 deletions
Makefile.am
View file @ 2be3a2dc
......@@ -199,6 +199,8 @@ EXTRA_DIST += \
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/dropzone-background.png \
extras/package/macosx/Resources/mainwindow/dropzone.png \
extras/package/macosx/Resources/mainwindow/effects-double-buttons-blue.png \
extras/package/macosx/Resources/mainwindow/effects-double-buttons-pressed.png \
extras/package/macosx/Resources/mainwindow/effects-double-buttons.png \
......
extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
View file @ 2be3a2dc
......@@ -21,13 +21,14 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="915"/>
<integer value="21"/>
<integer value="283"/>
<integer value="4596"/>
<integer value="1617"/>
<integer value="4682"/>
<integer value="4722"/>
<integer value="2730"/>
<integer value="4596"/>
<integer value="915"/>
<integer value="24"/>
<integer value="1617"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -59,7 +60,7 @@
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSWindowContentMinSize">{400, 200}</string>
<string key="NSWindowContentMinSize">{400, 288}</string>
<object class="NSView" key="NSWindowView" id="429932428">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
......@@ -744,7 +745,6 @@
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="1064884668"/>
</object>
</object>
......@@ -774,7 +774,7 @@
</object>
</object>
<double key="NSRowHeight">20</double>
<int key="NSTvFlags">-633339904</int>
<int key="NSTvFlags">1111490560</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
<int key="NSColumnAutoresizingStyle">4</int>
......@@ -806,7 +806,7 @@
<object class="NSScroller" id="11557666">
<reference key="NSNextResponder" ref="979766179"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 556}, {212, 15}}</string>
<string key="NSFrame">{{-100, -100}, {212, 15}}</string>
<reference key="NSSuperview" ref="979766179"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="979766179"/>
......@@ -817,7 +817,7 @@
<string key="NSFrame">{{-1, 0}, {123, 274}}</string>
<reference key="NSSuperview" ref="824340487"/>
<reference key="NSNextKeyView" ref="18556274"/>
<int key="NSsFlags">133682</int>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="252983915"/>
<reference key="NSHScroller" ref="11557666"/>
<reference key="NSContentView" ref="18556274"/>
......@@ -1118,7 +1118,7 @@
<int key="NScvFlags">4</int>
</object>
</object>
<string key="NSFrame">{{-1, 0}, {482, 254}}</string>
<string key="NSFrameSize">{482, 254}</string>
<reference key="NSSuperview" ref="440594360"/>
<reference key="NSNextKeyView" ref="343242432"/>
<int key="NSsFlags">133682</int>
......@@ -1184,7 +1184,7 @@
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{400, 222}</string>
<string key="NSMinSize">{400, 310}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSFrameAutosaveName">vlc-10thanniversary</string>
<bool key="NSWindowIsRestorable">YES</bool>
......@@ -3051,7 +3051,7 @@
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="500944643">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -3060,6 +3060,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{-3, 79}, {240, 17}}</string>
<reference key="NSSuperview" ref="500944643"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="255325351">
<int key="NSCellFlags">67239424</int>
......@@ -3080,6 +3081,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{20, 52}, {159, 19}}</string>
<reference key="NSSuperview" ref="500944643"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="14047052">
<int key="NSCellFlags">-1804468671</int>
......@@ -3102,6 +3104,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{150, 13}, {84, 28}}</string>
<reference key="NSSuperview" ref="500944643"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="96901269">
<int key="NSCellFlags">67239424</int>
......@@ -3123,6 +3126,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{185, 50}, {15, 22}}</string>
<reference key="NSSuperview" ref="500944643"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="789174514">
<int key="NSCellFlags">917024</int>
......@@ -3139,6 +3143,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{68, 13}, {84, 28}}</string>
<reference key="NSSuperview" ref="500944643"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="20272293">
<int key="NSCellFlags">67239424</int>
......@@ -3160,6 +3165,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{203, 54}, {34, 14}}</string>
<reference key="NSSuperview" ref="500944643"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="621474557">
<int key="NSCellFlags">67239424</int>
......@@ -3172,7 +3178,9 @@
</object>
</object>
</object>
<string key="NSFrame">{{1, 9}, {249, 103}}</string>
<string key="NSFrameSize">{249, 103}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
......@@ -4266,6 +4274,166 @@ LCAuLi4</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="256817023">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSBox" id="83235998">
<reference key="NSNextResponder" ref="256817023"/>
<int key="NSvFlags">45</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSView" id="457727486">
<reference key="NSNextResponder" ref="83235998"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="551534796">
<reference key="NSNextResponder" ref="457727486"/>
<int key="NSvFlags">301</int>
<string key="NSFrame">{{16, 69}, {202, 22}}</string>
<reference key="NSSuperview" ref="457727486"/>
<string key="NSReuseIdentifierKey">_NS:4068</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1042867331">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">138413056</int>
<string key="NSContents">Drop Media here</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">18</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSCellIdentifier">_NS:4068</string>
<reference key="NSControlView" ref="551534796"/>
<reference key="NSBackgroundColor" ref="3414043"/>
<reference key="NSTextColor" ref="1018329413"/>
</object>
</object>
<object class="NSImageView" id="684815277">
<reference key="NSNextResponder" ref="457727486"/>
<int key="NSvFlags">301</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">{{64, 108}, {108, 108}}</string>
<reference key="NSSuperview" ref="457727486"/>
<string key="NSReuseIdentifierKey">_NS:2165</string>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="360507424">
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">dropzone</string>
</object>
<string key="NSCellIdentifier">_NS:2165</string>
<int key="NSAlign">0</int>
<int key="NSScale">0</int>
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSButton" id="959811945">
<reference key="NSNextResponder" ref="457727486"/>
<int key="NSvFlags">301</int>
<string key="NSFrame">{{41, 7}, {153, 32}}</string>
<reference key="NSSuperview" ref="457727486"/>
<string key="NSReuseIdentifierKey">_NS:610</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="869331277">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Open media...</string>
<reference key="NSSupport" ref="841513812"/>
<string key="NSCellIdentifier">_NS:610</string>
<reference key="NSControlView" ref="959811945"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
<string key="NSFrameSize">{234, 229}</string>
<reference key="NSSuperview" ref="83235998"/>
<string key="NSReuseIdentifierKey">_NS:21</string>
</object>
</object>
<string key="NSFrame">{{123, 12}, {234, 229}}</string>
<reference key="NSSuperview" ref="256817023"/>
<string key="NSReuseIdentifierKey">_NS:18</string>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSBackgroundColor" ref="166084101"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
</object>
</object>
<reference key="NSContentView" ref="457727486"/>
<int key="NSBorderType">0</int>
<int key="NSBoxType">0</int>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
</object>
<object class="NSImageView" id="619354303">
<reference key="NSNextResponder" ref="256817023"/>
<int key="NSvFlags">306</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="NSFrameSize">{482, 254}</string>
<reference key="NSSuperview" ref="256817023"/>
<string key="NSReuseIdentifierKey">_NS:2165</string>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="1064809555">
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">dropzone-background</string>
</object>
<string key="NSCellIdentifier">_NS:2165</string>
<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>
<string key="NSFrameSize">{482, 254}</string>
<reference key="NSSuperview"/>
<string key="NSReuseIdentifierKey">_NS:1109</string>
<string key="NSClassName">NSView</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
......@@ -6934,6 +7102,46 @@ LCAuLi4</string>
</object>
<int key="connectionID">4721</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_dropzone_view</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="256817023"/>
</object>
<int key="connectionID">4733</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_dropzone_lbl</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="551534796"/>
</object>
<int key="connectionID">4734</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_dropzone_btn</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="959811945"/>
</object>
<int key="connectionID">4735</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">dropzoneButtonAction:</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="959811945"/>
</object>
<int key="connectionID">4737</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_right_split_view</string>
<reference key="source" ref="498338108"/>
<reference key="destination" ref="440594360"/>
</object>
<int key="connectionID">4738</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -9545,6 +9753,84 @@ LCAuLi4</string>
<reference key="object" ref="1022116109"/>
<reference key="parent" ref="291003631"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4722</int>
<reference key="object" ref="256817023"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="619354303"/>
<reference ref="83235998"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Dropzone</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">4731</int>
<reference key="object" ref="619354303"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1064809555"/>
</object>
<reference key="parent" ref="256817023"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4732</int>
<reference key="object" ref="1064809555"/>
<reference key="parent" ref="619354303"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4739</int>
<reference key="object" ref="83235998"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="551534796"/>
<reference ref="684815277"/>
<reference ref="959811945"/>
</object>
<reference key="parent" ref="256817023"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4727</int>
<reference key="object" ref="551534796"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1042867331"/>
</object>
<reference key="parent" ref="83235998"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4728</int>
<reference key="object" ref="1042867331"/>
<reference key="parent" ref="551534796"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4725</int>
<reference key="object" ref="684815277"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="360507424"/>
</object>
<reference key="parent" ref="83235998"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4726</int>
<reference key="object" ref="360507424"/>
<reference key="parent" ref="684815277"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4729</int>
<reference key="object" ref="959811945"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="869331277"/>
</object>
<reference key="parent" ref="83235998"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4730</int>
<reference key="object" ref="869331277"/>
<reference key="parent" ref="959811945"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
......@@ -9821,7 +10107,9 @@ LCAuLi4</string>
<string>245.ImportedFromIB2</string>
<string>2457.IBPluginDependency</string>
<string>2457.ImportedFromIB2</string>
<string>2460.IBEditorWindowLastContentRect</string>
<string>2460.IBPluginDependency</string>
<string>2460.IBWindowTemplateEditedContentRect</string>
<string>2460.ImportedFromIB2</string>
<string>2461.IBPluginDependency</string>
<string>2461.ImportedFromIB2</string>
......@@ -10225,6 +10513,21 @@ LCAuLi4</string>
<string>4716.IBPluginDependency</string>
<string>4717.IBPluginDependency</string>
<string>4718.IBPluginDependency</string>
<string>4722.IBEditorWindowLastContentRect</string>
<string>4722.IBPluginDependency</string>
<string>4725.CustomClassName</string>
<string>4725.IBPluginDependency</string>
<string>4725.IBViewBoundsToFrameTransform</string>
<string>4726.IBPluginDependency</string>
<string>4727.IBPluginDependency</string>
<string>4727.IBViewBoundsToFrameTransform</string>
<string>4728.IBPluginDependency</string>
<string>4729.IBPluginDependency</string>
<string>4729.IBViewBoundsToFrameTransform</string>
<string>4730.IBPluginDependency</string>
<string>4731.CustomClassName</string>
<string>4731.IBPluginDependency</string>
<string>4732.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string>
<string>56.IBPluginDependency</string>
......@@ -10468,7 +10771,7 @@ LCAuLi4</string>
<boolean value="YES"/>
<boolean value="NO"/>
<boolean value="YES"/>
<string>{400, 200}</string>
<string>{400, 288}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{816, 490}, {64, 6}}</string>
......@@ -10548,7 +10851,9 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{330, 619}, {249, 103}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{330, 619}, {249, 103}}</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
......@@ -10856,7 +11161,7 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAAC/gAAAw3wAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABCsAAAw3cAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -11012,6 +11317,27 @@ LCAuLi4</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{330, 491}, {482, 254}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>VLBrushedMetalImageView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUNLAABCzAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDCwAAwtwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDJsYAwpIAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>VLBrushedMetalImageView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -11078,7 +11404,7 @@ LCAuLi4</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">4721</int>
<int key="maxID">4740</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -13832,23 +14158,373 @@ LCAuLi4</string>
</object>
<reference key="sourceIdentifier" ref="647024034"/>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">NSActionCell</string>
<string key="superclassName">NSCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
<string key="className">VLCMainWindow</string>
<string key="superclassName">NSWindow</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>bwd:</string>
<string>dropzoneButtonAction:</string>
<string>effects:</string>
<string>fullscreen:</string>
<string>fwd:</string>
<string>play:</string>
<string>repeat:</string>
<string>shuffle:</string>
<string>stop:</string>
<string>timeSliderAction:</string>
<string>togglePlaylist:</string>
<string>volumeAction:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<string key="superclassName">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="677106478">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>bwd:</string>
<string>dropzoneButtonAction:</string>
<string>effects:</string>
<string>fullscreen:</string>
<string>fwd:</string>
<string>play:</string>
<string>repeat:</string>
<string>shuffle:</string>
<string>stop:</string>
<string>timeSliderAction:</string>
<string>togglePlaylist:</string>
<string>volumeAction:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">bwd:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">dropzoneButtonAction:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">effects:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">fullscreen:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">fwd:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">play:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">repeat:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">shuffle:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">stop:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">timeSliderAction:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">togglePlaylist:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">volumeAction:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>o_bottombar_view</string>
<string>o_bwd_btn</string>
<string>o_chosen_category_lbl</string>
<string>o_dropzone_btn</string>
<string>o_dropzone_lbl</string>
<string>o_dropzone_view</string>
<string>o_effects_btn</string>
<string>o_fullscreen_btn</string>
<string>o_fwd_btn</string>
<string>o_play_btn</string>
<string>o_playlist_btn</string>
<string>o_playlist_table</string>
<string>o_progress_bar</string>
<string>o_repeat_btn</string>
<string>o_right_split_view</string>
<string>o_search_fld</string>
<string>o_shuffle_btn</string>
<string>o_sidebar_view</string>
<string>o_split_view</string>
<string>o_stop_btn</string>
<string>o_time_fld</string>
<string>o_time_sld</string>
<string>o_time_sld_fancygradient_view</string>
<string>o_time_sld_left_view</string>
<string>o_time_sld_middle_view</string>
<string>o_time_sld_right_view</string>
<string>o_video_view</string>
<string>o_volume_down_btn</string>
<string>o_volume_sld</string>
<string>o_volume_track_view</string>
<string>o_volume_up_btn</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>o_bottombar_view</string>
<string>o_bwd_btn</string>
<string>o_chosen_category_lbl</string>
<string>o_dropzone_btn</string>
<string>o_dropzone_lbl</string>
<string>o_dropzone_view</string>
<string>o_effects_btn</string>
<string>o_fullscreen_btn</string>
<string>o_fwd_btn</string>
<string>o_play_btn</string>
<string>o_playlist_btn</string>
<string>o_playlist_table</string>
<string>o_progress_bar</string>
<string>o_repeat_btn</string>
<string>o_right_split_view</string>
<string>o_search_fld</string>
<string>o_shuffle_btn</string>
<string>o_sidebar_view</string>
<string>o_split_view</string>
<string>o_stop_btn</string>
<string>o_time_fld</string>
<string>o_time_sld</string>
<string>o_time_sld_fancygradient_view</string>
<string>o_time_sld_left_view</string>
<string>o_time_sld_middle_view</string>
<string>o_time_sld_right_view</string>
<string>o_video_view</string>
<string>o_volume_down_btn</string>
<string>o_volume_sld</string>
<string>o_volume_track_view</string>
<string>o_volume_up_btn</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">o_bottombar_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_bwd_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_chosen_category_lbl</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_dropzone_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_dropzone_lbl</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_dropzone_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_effects_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_fullscreen_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_fwd_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_play_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_playlist_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_playlist_table</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_progress_bar</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_repeat_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_right_split_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_search_fld</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_shuffle_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_sidebar_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_split_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_stop_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_time_fld</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_time_sld</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_time_sld_fancygradient_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_time_sld_left_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_time_sld_middle_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_time_sld_right_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_video_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_volume_down_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_volume_sld</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_volume_track_view</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">o_volume_up_btn</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="736371707">
<string key="majorKey">IBDocumentRelativeSource</string>
<string key="minorKey">../../../../../modules/gui/macosx/MainWindow.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCProgressBarGradientEffect</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="736371707"/>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">NSActionCell</string>
<string key="superclassName">NSCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<string key="superclassName">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="677106478">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
......@@ -14775,6 +15451,8 @@ LCAuLi4</string>
<string>back</string>
<string>back-pressed</string>
<string>bottom-background</string>
<string>dropzone</string>
<string>dropzone-background</string>
<string>effects-double-buttons</string>
<string>effects-double-buttons-pressed</string>
<string>forward</string>
......@@ -14818,6 +15496,8 @@ LCAuLi4</string>
<string>{35, 23}</string>
<string>{35, 23}</string>
<string>{6, 36}</string>
<string>{128, 128}</string>
<string>{128, 128}</string>
<string>{29, 23}</string>
<string>{29, 23}</string>
<string>{35, 23}</string>
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ 2be3a2dc
......@@ -188,6 +188,7 @@
CC402F440E00ABBB006A4BA4 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC962E2C0CC7992800A56695 /* WebKit.framework */; };
CC426FD11020D44F00A32659 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC426FD01020D44F00A32659 /* Sparkle.framework */; };
CC426FD71020D47100A32659 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = CC426FD01020D44F00A32659 /* Sparkle.framework */; };
CC4EFC2D13E96BD00091D19A /* dropzone.png in Resources */ = {isa = PBXBuildFile; fileRef = CC4EFC2C13E96BD00091D19A /* dropzone.png */; };
CC5560281365CE4800D54038 /* AudioEffects.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC5560261365CE4800D54038 /* AudioEffects.nib */; };
CC707EC8137474A50003010A /* SyncTracks.nib in Resources */ = {isa = PBXBuildFile; fileRef = CC707EC6137474A50003010A /* SyncTracks.nib */; };
CC78DA4413DE056700E9603C /* topbar_background.png in Resources */ = {isa = PBXBuildFile; fileRef = CC78DA4313DE056700E9603C /* topbar_background.png */; };
......@@ -198,6 +199,7 @@
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 */; };
CCDB535D13E97D3500A1782F /* dropzone-background.png in Resources */ = {isa = PBXBuildFile; fileRef = CCDB535C13E97D3500A1782F /* dropzone-background.png */; };
CCE6439413E8CC170061B5F2 /* document-music-playlist.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE6438E13E8CC170061B5F2 /* document-music-playlist.png */; };
CCE6439513E8CC170061B5F2 /* film-cast.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE6438F13E8CC170061B5F2 /* film-cast.png */; };
CCE6439613E8CC170061B5F2 /* film.png in Resources */ = {isa = PBXBuildFile; fileRef = CCE6439013E8CC170061B5F2 /* film.png */; };
......@@ -438,6 +440,7 @@
CC4ED9AD0ABE07C800CA4CC5 /* add_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_embedded.png; path = Resources/add_embedded.png; sourceTree = "<group>"; };
CC4ED9AF0ABE07C800CA4CC5 /* repeat_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = repeat_embedded.png; path = Resources/repeat_embedded.png; sourceTree = "<group>"; };
CC4ED9B20ABE07C800CA4CC5 /* shuffle_embedded.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = shuffle_embedded.png; path = Resources/shuffle_embedded.png; sourceTree = "<group>"; };
CC4EFC2C13E96BD00091D19A /* dropzone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dropzone.png; path = Resources/mainwindow/dropzone.png; sourceTree = "<group>"; };
CC5560231365CDC700D54038 /* AudioEffects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioEffects.h; path = ../../../modules/gui/macosx/AudioEffects.h; sourceTree = "<group>"; };
CC5560241365CDC800D54038 /* AudioEffects.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AudioEffects.m; path = ../../../modules/gui/macosx/AudioEffects.m; sourceTree = "<group>"; };
CC5560271365CE4800D54038 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/AudioEffects.nib; sourceTree = "<group>"; };
......@@ -486,6 +489,7 @@
CCD590F110E5B73200D39094 /* dialogProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = dialogProvider.m; path = ../../../modules/gui/macosx_dialog_provider/dialogProvider.m; sourceTree = SOURCE_ROOT; };
CCD590F210E5B76300D39094 /* VLCLoginPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLoginPanel.h; path = ../../../modules/gui/macosx_dialog_provider/VLCLoginPanel.h; sourceTree = SOURCE_ROOT; };
CCD590F310E5B76300D39094 /* VLCLoginPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCLoginPanel.m; path = ../../../modules/gui/macosx_dialog_provider/VLCLoginPanel.m; sourceTree = SOURCE_ROOT; };
CCDB535C13E97D3500A1782F /* dropzone-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dropzone-background.png"; path = "Resources/mainwindow/dropzone-background.png"; sourceTree = "<group>"; };
CCDBA3B313D32E200006127B /* macosx.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = macosx.m; path = ../../../modules/video_output/macosx.m; sourceTree = "<group>"; };
CCE6438E13E8CC170061B5F2 /* document-music-playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "document-music-playlist.png"; path = "Resources/sidebar-icons/document-music-playlist.png"; sourceTree = "<group>"; };
CCE6438F13E8CC170061B5F2 /* film-cast.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "film-cast.png"; path = "Resources/sidebar-icons/film-cast.png"; sourceTree = "<group>"; };
......@@ -697,6 +701,8 @@
CC0430EE13B2461A00D7D52E /* 10th anniversary ui */ = {
isa = PBXGroup;
children = (
CC4EFC2C13E96BD00091D19A /* dropzone.png */,
CCDB535C13E97D3500A1782F /* dropzone-background.png */,
CC78DA4313DE056700E9603C /* topbar_background.png */,
CCE6438C13E8CC040061B5F2 /* sidebar */,
CC0432C213B2479E00D7D52E /* bright variant */,
......@@ -1234,6 +1240,8 @@
CCE6439713E8CC170061B5F2 /* music-beam.png in Resources */,
CCE6439813E8CC170061B5F2 /* network-cloud.png in Resources */,
CCE6439913E8CC170061B5F2 /* picture.png in Resources */,
CC4EFC2D13E96BD00091D19A /* dropzone.png in Resources */,
CCDB535D13E97D3500A1782F /* dropzone-background.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
modules/gui/macosx/MainWindow.h
View file @ 2be3a2dc
......@@ -56,9 +56,14 @@
IBOutlet id o_playlist_table;
IBOutlet id o_video_view;
IBOutlet id o_split_view;
IBOutlet id o_right_split_view;
IBOutlet id o_sidebar_view;
IBOutlet id o_chosen_category_lbl;
IBOutlet id o_dropzone_view;
IBOutlet id o_dropzone_btn;
IBOutlet id o_dropzone_lbl;
BOOL b_dark_interface;
BOOL b_video_playback_enabled;
int i_lastShownVolume;
......@@ -99,9 +104,12 @@
- (IBAction)volumeAction:(id)sender;
- (IBAction)effects:(id)sender;
- (IBAction)fullscreen:(id)sender;
- (IBAction)dropzoneButtonAction:(id)sender;
- (id)videoView;
- (void)setVideoplayEnabled;
- (void)showDropZone;
- (void)hideDropZone;
- (void)updateTimeSlider;
- (void)updateVolumeSlider;
- (void)updateWindow;
......
modules/gui/macosx/MainWindow.m
View file @ 2be3a2dc
......@@ -29,6 +29,7 @@
#import "CoreInteraction.h"
#import "AudioEffects.h"
#import "MainMenu.h"
#import "open.h"
#import "controls.h" // TODO: remove me
#import "SideBarItem.h"
#import <vlc_playlist.h>
......@@ -118,6 +119,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_volume_down_btn setToolTip: _NS("Mute")];
[o_volume_up_btn setToolTip: _NS("Full Volume")];
[o_time_sld setToolTip: _NS("Position")];
[o_dropzone_btn setTitle: _NS("Open media...")];
[o_dropzone_lbl setStringValue: _NS("Drop media here")];
if (!b_dark_interface) {
[o_bottombar_view setImage: [NSImage imageNamed:@"bottom-background"]];
......@@ -206,7 +209,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
[self setDelegate: self];
[self setExcludedFromWindowsMenu: YES];
// Set that here as IB seems to be buggy
[self setContentMinSize:NSMakeSize(500., 200.)];
[self setContentMinSize:NSMakeSize(400., 288.)];
[self setTitle: _NS("VLC media player")];
[o_playlist_btn setEnabled:NO];
......@@ -308,6 +311,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_sidebaritems addObject: internetItem];
[o_sidebar_view reloadData];
[o_sidebar_view selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:YES];
playlist_t *p_playlist = pl_Get( VLCIntf );
PL_LOCK;
if( playlist_CurrentSize( p_playlist ) < 1 )
[self showDropZone];
PL_UNLOCK;
}
#pragma mark -
......@@ -549,8 +559,26 @@ static VLCMainWindow *_o_sharedInstance = nil;
[[VLCCoreInteraction sharedInstance] toggleFullscreen];
}
- (IBAction)dropzoneButtonAction:(id)sender
{
[[[VLCMain sharedInstance] open] openFileGeneric];
}
#pragma mark -
#pragma mark Update interface and respond to foreign events
- (void)showDropZone
{
[o_playlist_table setHidden:YES];
[o_dropzone_view setFrame: [o_playlist_table frame]];
[o_right_split_view addSubview: o_dropzone_view];
}
- (void)hideDropZone
{
[o_playlist_table setHidden: NO];
[o_dropzone_view removeFromSuperview];
}
- (void)updateTimeSlider
{
input_thread_t * p_input;
......@@ -727,10 +755,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_bwd_btn setEnabled: (b_seekable || b_plmul || b_chapters)];
[[VLCMainMenu sharedInstance] setRateControlsEnabled: b_control];
[o_time_sld setEnabled: b_seekable];
[self updateTimeSlider];
[[[[VLCMain sharedInstance] controls] fspanel] setSeekable: b_seekable];
PL_LOCK;
if (playlist_CurrentSize( p_playlist ) >= 1)
[self hideDropZone];
else
[self showDropZone];
PL_UNLOCK;
}
- (void)setPause
......
modules/gui/macosx/intf.m
View file @ 2be3a2dc
......@@ -1277,6 +1277,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
{
[self playbackStatusUpdated];
[o_playlist playlistUpdated];
[o_mainwindow updateWindow];
}
- (void)updateInfoandMetaPanel
......
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