]> git.sesse.net Git - vlc/commitdiff
projects / vlc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b1946d4)
macosx: implement simpler and generic drop view for all drag / drop operations
authorDavid Fuhrmann <david.fuhrmann@googlemail.com>
Thu, 28 Nov 2013 12:08:11 +0000 (13:08 +0100)
committerDavid Fuhrmann <david.fuhrmann@googlemail.com>
Thu, 28 Nov 2013 12:16:25 +0000 (13:16 +0100)
- Use the new VLCDragDropView for both CAS and main window drop zone.
  This implements a drop highlight border the same way as in playlist view.
- Remove Brushed Metal Image view and its own drop implementation.
  When having a image view inside a drop zone, you need to use
  VLCDropDisabledImageView which disables the own drop handling of NSImageView.
- Removed more unneeded drop implementations for subviews from CAS

extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib patch | blob | history
extras/package/macosx/Resources/English.lproj/MainWindow.xib patch | blob | history
modules/gui/macosx/ConvertAndSave.h patch | blob | history
modules/gui/macosx/ConvertAndSave.m patch | blob | history
modules/gui/macosx/CoreInteraction.m patch | blob | history
modules/gui/macosx/misc.h patch | blob | history
modules/gui/macosx/misc.m patch | blob | history

diff --git a/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib b/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
index 9abc8d3b42993d4c296e4c2724e8b6138abb5cba..795d5978a01cfbd373918f42097133eb5e503766 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
+++ b/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
@@ -12,8 +12,10 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="132"/>
       <integer value="387"/>
+      <integer value="3"/>
+      <integer value="132"/>
+      <integer value="25"/>
       <integer value="309"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -47,7 +49,7 @@
         <string key="NSWindowContentMaxSize">{663, 490}</string>
         <string key="NSWindowContentMinSize">{663, 490}</string>
         <object class="NSView" key="NSWindowView" id="1006">
-          <nil key="NSNextResponder"/>
+          <reference key="NSNextResponder"/>
           <int key="NSvFlags">256</int>
           <object class="NSMutableArray" key="NSSubviews">
             <bool key="EncodedWithXMLCoder">YES</bool>
@@ -61,103 +63,114 @@
                   <int key="NSvFlags">274</int>
                   <object class="NSMutableArray" key="NSSubviews">
                     <bool key="EncodedWithXMLCoder">YES</bool>
-                    <object class="NSImageView" id="57114548">
+                    <object class="NSCustomView" id="595691694">
                       <reference key="NSNextResponder" ref="370005935"/>
-                      <int key="NSvFlags">268</int>
-                      <object class="NSMutableSet" key="NSDragTypes">
+                      <int key="NSvFlags">274</int>
+                      <object class="NSMutableArray" key="NSSubviews">
                         <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">{{256, 63}, {112, 112}}</string>
-                      <reference key="NSSuperview" ref="370005935"/>
-                      <string key="NSReuseIdentifierKey">_NS:2165</string>
-                      <bool key="NSEnabled">YES</bool>
-                      <object class="NSImageCell" key="NSCell" id="624480290">
-                        <int key="NSCellFlags">0</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="NSAllowsLogicalLayoutDirection">NO</bool>
-                      <bool key="NSEditable">YES</bool>
-                    </object>
-                    <object class="NSTextField" id="807070215">
-                      <reference key="NSNextResponder" ref="370005935"/>
-                      <int key="NSvFlags">303</int>
-                      <string key="NSFrame">{{15, 181}, {597, 22}}</string>
-                      <reference key="NSSuperview" ref="370005935"/>
-                      <bool key="NSEnabled">YES</bool>
-                      <object class="NSTextFieldCell" key="NSCell" id="425578110">
-                        <int key="NSCellFlags">68157504</int>
-                        <int key="NSCellFlags2">4195328</int>
-                        <string key="NSContents">Drop Media here</string>
-                        <object class="NSFont" key="NSSupport" id="439159890">
-                          <string key="NSName">LucidaGrande</string>
-                          <double key="NSSize">18</double>
-                          <int key="NSfFlags">16</int>
+                        <object class="NSButton" id="775178384">
+                          <reference key="NSNextResponder" ref="595691694"/>
+                          <int key="NSvFlags">301</int>
+                          <string key="NSFrame">{{231.13671875, 15.53515625}, {153, 32}}</string>
+                          <reference key="NSSuperview" ref="595691694"/>
+                          <bool key="NSEnabled">YES</bool>
+                          <object class="NSButtonCell" key="NSCell" id="963202121">
+                            <int key="NSCellFlags">67108864</int>
+                            <int key="NSCellFlags2">134217728</int>
+                            <string key="NSContents">Open media...</string>
+                            <object class="NSFont" key="NSSupport" id="1024428774">
+                              <string key="NSName">LucidaGrande</string>
+                              <double key="NSSize">13</double>
+                              <int key="NSfFlags">1040</int>
+                            </object>
+                            <reference key="NSControlView" ref="775178384"/>
+                            <int key="NSButtonFlags">-2038284288</int>
+                            <int key="NSButtonFlags2">129</int>
+                            <reference key="NSAlternateImage" ref="1024428774"/>
+                            <string key="NSAlternateContents"/>
+                            <string key="NSKeyEquivalent"/>
+                            <int key="NSPeriodicDelay">200</int>
+                            <int key="NSPeriodicInterval">25</int>
+                          </object>
+                          <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                         </object>
-                        <reference key="NSControlView" ref="807070215"/>
-                        <object class="NSColor" key="NSBackgroundColor" id="382902660">
-                          <int key="NSColorSpace">6</int>
-                          <string key="NSCatalogName">System</string>
-                          <string key="NSColorName">controlColor</string>
-                          <object class="NSColor" key="NSColor">
-                            <int key="NSColorSpace">3</int>
-                            <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+                        <object class="NSTextField" id="807070215">
+                          <reference key="NSNextResponder" ref="595691694"/>
+                          <int key="NSvFlags">303</int>
+                          <string key="NSFrame">{{10.13671875, 176.53515625}, {597, 22}}</string>
+                          <reference key="NSSuperview" ref="595691694"/>
+                          <bool key="NSEnabled">YES</bool>
+                          <object class="NSTextFieldCell" key="NSCell" id="425578110">
+                            <int key="NSCellFlags">68157504</int>
+                            <int key="NSCellFlags2">4195328</int>
+                            <string key="NSContents">Drop Media here</string>
+                            <object class="NSFont" key="NSSupport" id="439159890">
+                              <string key="NSName">LucidaGrande</string>
+                              <double key="NSSize">18</double>
+                              <int key="NSfFlags">16</int>
+                            </object>
+                            <reference key="NSControlView" ref="807070215"/>
+                            <object class="NSColor" key="NSBackgroundColor" id="382902660">
+                              <int key="NSColorSpace">6</int>
+                              <string key="NSCatalogName">System</string>
+                              <string key="NSColorName">controlColor</string>
+                              <object class="NSColor" key="NSColor">
+                                <int key="NSColorSpace">3</int>
+                                <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+                              </object>
+                            </object>
+                            <object class="NSColor" key="NSTextColor" id="954313256">
+                              <int key="NSColorSpace">6</int>
+                              <string key="NSCatalogName">System</string>
+                              <string key="NSColorName">headerColor</string>
+                              <object class="NSColor" key="NSColor" id="1031268248">
+                                <int key="NSColorSpace">3</int>
+                                <bytes key="NSWhite">MQA</bytes>
+                              </object>
+                            </object>
                           </object>
+                          <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                         </object>
-                        <object class="NSColor" key="NSTextColor" id="954313256">
-                          <int key="NSColorSpace">6</int>
-                          <string key="NSCatalogName">System</string>
-                          <string key="NSColorName">headerColor</string>
-                          <object class="NSColor" key="NSColor" id="1031268248">
-                            <int key="NSColorSpace">3</int>
-                            <bytes key="NSWhite">MQA</bytes>
+                        <object class="NSImageView" id="57114548">
+                          <reference key="NSNextResponder" ref="595691694"/>
+                          <int key="NSvFlags">268</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">{{251.13671875, 58.53515625}, {112, 112}}</string>
+                          <reference key="NSSuperview" ref="595691694"/>
+                          <string key="NSReuseIdentifierKey">_NS:2165</string>
+                          <bool key="NSEnabled">YES</bool>
+                          <object class="NSImageCell" key="NSCell" id="624480290">
+                            <int key="NSCellFlags">0</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="NSAllowsLogicalLayoutDirection">NO</bool>
+                          <bool key="NSEditable">YES</bool>
                         </object>
                       </object>
-                      <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-                    </object>
-                    <object class="NSButton" id="775178384">
-                      <reference key="NSNextResponder" ref="370005935"/>
-                      <int key="NSvFlags">301</int>
-                      <string key="NSFrame">{{236, 20}, {153, 32}}</string>
+                      <string key="NSFrame">{{4.86328125, 4.46484375}, {617.3515625, 207.67578125}}</string>
                       <reference key="NSSuperview" ref="370005935"/>
-                      <bool key="NSEnabled">YES</bool>
-                      <object class="NSButtonCell" key="NSCell" id="963202121">
-                        <int key="NSCellFlags">67108864</int>
-                        <int key="NSCellFlags2">134217728</int>
-                        <string key="NSContents">Open media...</string>
-                        <object class="NSFont" key="NSSupport" id="1024428774">
-                          <string key="NSName">LucidaGrande</string>
-                          <double key="NSSize">13</double>
-                          <int key="NSfFlags">1040</int>
-                        </object>
-                        <reference key="NSControlView" ref="775178384"/>
-                        <int key="NSButtonFlags">-2038284288</int>
-                        <int key="NSButtonFlags2">129</int>
-                        <reference key="NSAlternateImage" ref="1024428774"/>
-                        <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="NSFrame">{{1, 1}, {627, 215}}</string>
@@ -493,6 +506,7 @@
             </object>
           </object>
           <string key="NSFrameSize">{663, 490}</string>
+          <reference key="NSSuperview"/>
         </object>
         <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
         <string key="NSMinSize">{663, 512}</string>
@@ -500,7 +514,7 @@
         <bool key="NSWindowIsRestorable">YES</bool>
       </object>
       <object class="NSCustomView" id="494472580">
-        <nil key="NSNextResponder"/>
+        <reference key="NSNextResponder"/>
         <int key="NSvFlags">268</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -564,6 +578,7 @@
           </object>
         </object>
         <string key="NSFrameSize">{478, 129}</string>
+        <reference key="NSSuperview"/>
         <string key="NSReuseIdentifierKey">_NS:1109</string>
         <string key="NSClassName">NSView</string>
       </object>
@@ -3382,14 +3397,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">109</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">_drop_box</string>
-            <reference key="source" ref="203744709"/>
-            <reference key="destination" ref="90126139"/>
-          </object>
-          <int key="connectionID">110</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">_drop_btn</string>
@@ -4358,6 +4365,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">536</int>
         </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">_drop_box</string>
+            <reference key="source" ref="203744709"/>
+            <reference key="destination" ref="595691694"/>
+          </object>
+          <int key="connectionID">538</int>
+        </object>
       </object>
       <object class="IBMutableOrderedSet" key="objectRecords">
         <object class="NSArray" key="orderedObjects">
@@ -4413,54 +4428,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <reference key="object" ref="90126139"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="807070215"/>
-              <reference ref="775178384"/>
-              <reference ref="57114548"/>
+              <reference ref="595691694"/>
             </object>
             <reference key="parent" ref="1006"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4</int>
-            <reference key="object" ref="57114548"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="624480290"/>
-            </object>
-            <reference key="parent" ref="90126139"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">5</int>
-            <reference key="object" ref="624480290"/>
-            <reference key="parent" ref="57114548"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">6</int>
-            <reference key="object" ref="807070215"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="425578110"/>
-            </object>
-            <reference key="parent" ref="90126139"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">7</int>
-            <reference key="object" ref="775178384"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="963202121"/>
-            </object>
-            <reference key="parent" ref="90126139"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">8</int>
-            <reference key="object" ref="963202121"/>
-            <reference key="parent" ref="775178384"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">9</int>
-            <reference key="object" ref="425578110"/>
-            <reference key="parent" ref="807070215"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">10</int>
             <reference key="object" ref="1053913655"/>
@@ -6161,6 +6132,59 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <reference key="object" ref="365227636"/>
             <reference key="parent" ref="606173151"/>
           </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">537</int>
+            <reference key="object" ref="595691694"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="775178384"/>
+              <reference ref="807070215"/>
+              <reference ref="57114548"/>
+            </object>
+            <reference key="parent" ref="90126139"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">4</int>
+            <reference key="object" ref="57114548"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="624480290"/>
+            </object>
+            <reference key="parent" ref="595691694"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">5</int>
+            <reference key="object" ref="624480290"/>
+            <reference key="parent" ref="57114548"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">6</int>
+            <reference key="object" ref="807070215"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="425578110"/>
+            </object>
+            <reference key="parent" ref="595691694"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">9</int>
+            <reference key="object" ref="425578110"/>
+            <reference key="parent" ref="807070215"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">7</int>
+            <reference key="object" ref="775178384"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="963202121"/>
+            </object>
+            <reference key="parent" ref="595691694"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">8</int>
+            <reference key="object" ref="963202121"/>
+            <reference key="parent" ref="775178384"/>
+          </object>
         </object>
       </object>
       <object class="NSMutableDictionary" key="flattenedProperties">
@@ -6351,6 +6375,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>25.IBEditorWindowLastContentRect</string>
           <string>25.IBPluginDependency</string>
           <string>25.IBViewBoundsToFrameTransform</string>
+          <string>26.CustomClassName</string>
           <string>26.IBPluginDependency</string>
           <string>26.IBViewBoundsToFrameTransform</string>
           <string>27.IBPluginDependency</string>
@@ -6367,7 +6392,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>294.IBPluginDependency</string>
           <string>294.IBViewBoundsToFrameTransform</string>
           <string>295.IBPluginDependency</string>
-          <string>3.CustomClassName</string>
           <string>3.IBPluginDependency</string>
           <string>3.IBViewBoundsToFrameTransform</string>
           <string>300.IBPluginDependency</string>
@@ -6513,10 +6537,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>532.IBPluginDependency</string>
           <string>532.IBViewBoundsToFrameTransform</string>
           <string>533.IBPluginDependency</string>
+          <string>537.IBPluginDependency</string>
           <string>54.IBPluginDependency</string>
           <string>6.IBPluginDependency</string>
           <string>6.IBViewBoundsToFrameTransform</string>
-          <string>7.CustomClassName</string>
           <string>7.IBPluginDependency</string>
           <string>7.IBViewBoundsToFrameTransform</string>
           <string>8.IBPluginDependency</string>
@@ -6787,9 +6811,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <bytes key="NSTransformStruct">P4AAAL+AAABBYAAAw4GAAA</bytes>
           </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{810, 1072}, {478, 129}}</string>
+          <string>{{591, 680}, {478, 129}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform"/>
+          <string>VLCDropDisabledImageView</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform">
             <bytes key="NSTransformStruct">AUNfAABCNAAAA</bytes>
@@ -6814,7 +6839,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwigAAA</bytes>
           </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>VLCDropEnabledBox</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform">
             <bytes key="NSTransformStruct">AUGIAABDkigAA</bytes>
@@ -6966,10 +6990,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <bytes key="NSTransformStruct">P4AAAL+AAABDbAAAwlAAAA</bytes>
           </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>VLCDropEnabledImageView</string>
+          <string>VLCDropDisabledImageView</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform">
-            <bytes key="NSTransformStruct">AUOAgABCogAAA</bytes>
+            <bytes key="NSTransformStruct">AUOAAABCfAAAA</bytes>
           </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform">
@@ -7038,10 +7062,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform">
             <bytes key="NSTransformStruct">P4AAAL+AAABBcAAAw0kAAA</bytes>
           </object>
-          <string>VLCDropEnabledButton</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform">
             <bytes key="NSTransformStruct">P4AAAL+AAABDbAAAwkgAAA</bytes>
@@ -7066,7 +7090,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">536</int>
+      <int key="maxID">538</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -7108,7 +7132,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
         </object>
         <object class="IBPartialClassDescription">
           <string key="className">NSView</string>
-          <object class="IBClassDescriptionSource" key="sourceIdentifier">
+          <object class="IBClassDescriptionSource" key="sourceIdentifier" id="387002814">
             <string key="majorKey">IBProjectSource</string>
             <string key="minorKey">../../../modules/gui/macosx/misc.h</string>
           </object>
@@ -7335,6 +7359,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               <string>_stream_address_fld</string>
               <string>_stream_address_lbl</string>
               <string>_stream_announcement_lbl</string>
+              <string>_stream_cancel_btn</string>
               <string>_stream_channel_fld</string>
               <string>_stream_destination_lbl</string>
               <string>_stream_ok_btn</string>
@@ -7434,6 +7459,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               <string>id</string>
               <string>id</string>
               <string>id</string>
+              <string>id</string>
             </object>
           </object>
           <object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -7504,6 +7530,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               <string>_stream_address_fld</string>
               <string>_stream_address_lbl</string>
               <string>_stream_announcement_lbl</string>
+              <string>_stream_cancel_btn</string>
               <string>_stream_channel_fld</string>
               <string>_stream_destination_lbl</string>
               <string>_stream_ok_btn</string>
@@ -7779,6 +7806,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                 <string key="name">_stream_announcement_lbl</string>
                 <string key="candidateClassName">id</string>
               </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">_stream_cancel_btn</string>
+                <string key="candidateClassName">id</string>
+              </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">_stream_channel_fld</string>
                 <string key="candidateClassName">id</string>
@@ -7845,780 +7876,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               </object>
             </object>
           </object>
-          <object class="IBClassDescriptionSource" key="sourceIdentifier" id="327021570">
+          <object class="IBClassDescriptionSource" key="sourceIdentifier">
             <string key="majorKey">IBProjectSource</string>
             <string key="minorKey">../../../modules/gui/macosx/ConvertAndSave.h</string>
           </object>
         </object>
         <object class="IBPartialClassDescription">
-          <string key="className">VLCDropEnabledBox</string>
-          <string key="superclassName">NSBox</string>
-          <reference key="sourceIdentifier" ref="327021570"/>
-        </object>
-        <object class="IBPartialClassDescription">
-          <string key="className">VLCDropEnabledButton</string>
-          <string key="superclassName">NSButton</string>
-          <reference key="sourceIdentifier" ref="327021570"/>
-        </object>
-        <object class="IBPartialClassDescription">
-          <string key="className">VLCDropEnabledImageView</string>
-          <string key="superclassName">NSImageView</string>
-          <reference key="sourceIdentifier" ref="327021570"/>
-        </object>
-      </object>
-      <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
-        <bool key="EncodedWithXMLCoder">YES</bool>
-        <object class="IBPartialClassDescription">
-          <string key="className">VLCConvertAndSave</string>
-          <string key="superclassName">NSObject</string>
-          <object class="NSMutableDictionary" key="actions">
-            <bool key="EncodedWithXMLCoder">YES</bool>
-            <object class="NSArray" key="dict.sortedKeys">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <string>audioSettingsChanged:</string>
-              <string>browseFileDestination:</string>
-              <string>cancelDestination:</string>
-              <string>closeCustomizationSheet:</string>
-              <string>closeStreamPanel:</string>
-              <string>customizeProfile:</string>
-              <string>finalizePanel:</string>
-              <string>iWantAFile:</string>
-              <string>iWantAStream:</string>
-              <string>newProfileAction:</string>
-              <string>openMedia:</string>
-              <string>sdpFileLocationSelector:</string>
-              <string>showStreamPanel:</string>
-              <string>streamAnnouncementToggle:</string>
-              <string>streamTypeToggle:</string>
-              <string>subSettingsChanged:</string>
-              <string>switchProfile:</string>
-              <string>videoSettingsChanged:</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>
-            </object>
-          </object>
-          <object class="NSMutableDictionary" key="actionInfosByName">
-            <bool key="EncodedWithXMLCoder">YES</bool>
-            <object class="NSArray" key="dict.sortedKeys">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <string>audioSettingsChanged:</string>
-              <string>browseFileDestination:</string>
-              <string>cancelDestination:</string>
-              <string>closeCustomizationSheet:</string>
-              <string>closeStreamPanel:</string>
-              <string>customizeProfile:</string>
-              <string>finalizePanel:</string>
-              <string>iWantAFile:</string>
-              <string>iWantAStream:</string>
-              <string>newProfileAction:</string>
-              <string>openMedia:</string>
-              <string>sdpFileLocationSelector:</string>
-              <string>showStreamPanel:</string>
-              <string>streamAnnouncementToggle:</string>
-              <string>streamTypeToggle:</string>
-              <string>subSettingsChanged:</string>
-              <string>switchProfile:</string>
-              <string>videoSettingsChanged:</string>
-            </object>
-            <object class="NSMutableArray" key="dict.values">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <object class="IBActionInfo">
-                <string key="name">audioSettingsChanged:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">browseFileDestination:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">cancelDestination:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">closeCustomizationSheet:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">closeStreamPanel:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">customizeProfile:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">finalizePanel:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">iWantAFile:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">iWantAStream:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">newProfileAction:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">openMedia:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">sdpFileLocationSelector:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">showStreamPanel:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">streamAnnouncementToggle:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">streamTypeToggle:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">subSettingsChanged:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">switchProfile:</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBActionInfo">
-                <string key="name">videoSettingsChanged:</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>_customize_aud_bitrate_fld</string>
-              <string>_customize_aud_bitrate_lbl</string>
-              <string>_customize_aud_channels_fld</string>
-              <string>_customize_aud_channels_lbl</string>
-              <string>_customize_aud_ckb</string>
-              <string>_customize_aud_codec_lbl</string>
-              <string>_customize_aud_codec_pop</string>
-              <string>_customize_aud_keep_ckb</string>
-              <string>_customize_aud_samplerate_lbl</string>
-              <string>_customize_aud_samplerate_pop</string>
-              <string>_customize_aud_settings_box</string>
-              <string>_customize_cancel_btn</string>
-              <string>_customize_encap_matrix</string>
-              <string>_customize_newProfile_btn</string>
-              <string>_customize_ok_btn</string>
-              <string>_customize_panel</string>
-              <string>_customize_subs_ckb</string>
-              <string>_customize_subs_overlay_ckb</string>
-              <string>_customize_subs_pop</string>
-              <string>_customize_tabview</string>
-              <string>_customize_vid_bitrate_fld</string>
-              <string>_customize_vid_bitrate_lbl</string>
-              <string>_customize_vid_ckb</string>
-              <string>_customize_vid_codec_lbl</string>
-              <string>_customize_vid_codec_pop</string>
-              <string>_customize_vid_framerate_fld</string>
-              <string>_customize_vid_framerate_lbl</string>
-              <string>_customize_vid_height_fld</string>
-              <string>_customize_vid_height_lbl</string>
-              <string>_customize_vid_keep_ckb</string>
-              <string>_customize_vid_res_box</string>
-              <string>_customize_vid_res_lbl</string>
-              <string>_customize_vid_scale_lbl</string>
-              <string>_customize_vid_scale_pop</string>
-              <string>_customize_vid_settings_box</string>
-              <string>_customize_vid_width_fld</string>
-              <string>_customize_vid_width_lbl</string>
-              <string>_destination_box</string>
-              <string>_destination_browse_btn</string>
-              <string>_destination_cancel_btn</string>
-              <string>_destination_filename_lbl</string>
-              <string>_destination_filename_stub_lbl</string>
-              <string>_destination_icon_view</string>
-              <string>_destination_itwantafile_btn</string>
-              <string>_destination_itwantafile_view</string>
-              <string>_destination_itwantastream_btn</string>
-              <string>_destination_itwantastream_view</string>
-              <string>_destination_lbl</string>
-              <string>_destination_stream_btn</string>
-              <string>_destination_stream_lbl</string>
-              <string>_drop_box</string>
-              <string>_drop_btn</string>
-              <string>_drop_image_view</string>
-              <string>_drop_lbl</string>
-              <string>_dropin_icon_view</string>
-              <string>_dropin_media_lbl</string>
-              <string>_dropin_view</string>
-              <string>_ok_btn</string>
-              <string>_profile_btn</string>
-              <string>_profile_lbl</string>
-              <string>_profile_pop</string>
-              <string>_stream_address_fld</string>
-              <string>_stream_address_lbl</string>
-              <string>_stream_announcement_lbl</string>
-              <string>_stream_cancel_btn</string>
-              <string>_stream_channel_fld</string>
-              <string>_stream_destination_lbl</string>
-              <string>_stream_ok_btn</string>
-              <string>_stream_panel</string>
-              <string>_stream_port_fld</string>
-              <string>_stream_port_lbl</string>
-              <string>_stream_sap_ckb</string>
-              <string>_stream_sdp_browsefile_btn</string>
-              <string>_stream_sdp_fld</string>
-              <string>_stream_sdp_matrix</string>
-              <string>_stream_ttl_fld</string>
-              <string>_stream_ttl_lbl</string>
-              <string>_stream_ttl_stepper</string>
-              <string>_stream_type_lbl</string>
-              <string>_stream_type_pop</string>
-              <string>_window</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>
-              <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>
-              <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>_customize_aud_bitrate_fld</string>
-              <string>_customize_aud_bitrate_lbl</string>
-              <string>_customize_aud_channels_fld</string>
-              <string>_customize_aud_channels_lbl</string>
-              <string>_customize_aud_ckb</string>
-              <string>_customize_aud_codec_lbl</string>
-              <string>_customize_aud_codec_pop</string>
-              <string>_customize_aud_keep_ckb</string>
-              <string>_customize_aud_samplerate_lbl</string>
-              <string>_customize_aud_samplerate_pop</string>
-              <string>_customize_aud_settings_box</string>
-              <string>_customize_cancel_btn</string>
-              <string>_customize_encap_matrix</string>
-              <string>_customize_newProfile_btn</string>
-              <string>_customize_ok_btn</string>
-              <string>_customize_panel</string>
-              <string>_customize_subs_ckb</string>
-              <string>_customize_subs_overlay_ckb</string>
-              <string>_customize_subs_pop</string>
-              <string>_customize_tabview</string>
-              <string>_customize_vid_bitrate_fld</string>
-              <string>_customize_vid_bitrate_lbl</string>
-              <string>_customize_vid_ckb</string>
-              <string>_customize_vid_codec_lbl</string>
-              <string>_customize_vid_codec_pop</string>
-              <string>_customize_vid_framerate_fld</string>
-              <string>_customize_vid_framerate_lbl</string>
-              <string>_customize_vid_height_fld</string>
-              <string>_customize_vid_height_lbl</string>
-              <string>_customize_vid_keep_ckb</string>
-              <string>_customize_vid_res_box</string>
-              <string>_customize_vid_res_lbl</string>
-              <string>_customize_vid_scale_lbl</string>
-              <string>_customize_vid_scale_pop</string>
-              <string>_customize_vid_settings_box</string>
-              <string>_customize_vid_width_fld</string>
-              <string>_customize_vid_width_lbl</string>
-              <string>_destination_box</string>
-              <string>_destination_browse_btn</string>
-              <string>_destination_cancel_btn</string>
-              <string>_destination_filename_lbl</string>
-              <string>_destination_filename_stub_lbl</string>
-              <string>_destination_icon_view</string>
-              <string>_destination_itwantafile_btn</string>
-              <string>_destination_itwantafile_view</string>
-              <string>_destination_itwantastream_btn</string>
-              <string>_destination_itwantastream_view</string>
-              <string>_destination_lbl</string>
-              <string>_destination_stream_btn</string>
-              <string>_destination_stream_lbl</string>
-              <string>_drop_box</string>
-              <string>_drop_btn</string>
-              <string>_drop_image_view</string>
-              <string>_drop_lbl</string>
-              <string>_dropin_icon_view</string>
-              <string>_dropin_media_lbl</string>
-              <string>_dropin_view</string>
-              <string>_ok_btn</string>
-              <string>_profile_btn</string>
-              <string>_profile_lbl</string>
-              <string>_profile_pop</string>
-              <string>_stream_address_fld</string>
-              <string>_stream_address_lbl</string>
-              <string>_stream_announcement_lbl</string>
-              <string>_stream_cancel_btn</string>
-              <string>_stream_channel_fld</string>
-              <string>_stream_destination_lbl</string>
-              <string>_stream_ok_btn</string>
-              <string>_stream_panel</string>
-              <string>_stream_port_fld</string>
-              <string>_stream_port_lbl</string>
-              <string>_stream_sap_ckb</string>
-              <string>_stream_sdp_browsefile_btn</string>
-              <string>_stream_sdp_fld</string>
-              <string>_stream_sdp_matrix</string>
-              <string>_stream_ttl_fld</string>
-              <string>_stream_ttl_lbl</string>
-              <string>_stream_ttl_stepper</string>
-              <string>_stream_type_lbl</string>
-              <string>_stream_type_pop</string>
-              <string>_window</string>
-            </object>
-            <object class="NSMutableArray" key="dict.values">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_bitrate_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_bitrate_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_channels_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_channels_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_ckb</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_codec_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_codec_pop</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_keep_ckb</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_samplerate_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_samplerate_pop</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_aud_settings_box</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_cancel_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_encap_matrix</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_newProfile_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_ok_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_panel</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_subs_ckb</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_subs_overlay_ckb</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_subs_pop</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_tabview</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_bitrate_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_bitrate_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_ckb</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_codec_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_codec_pop</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_framerate_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_framerate_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_height_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_height_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_keep_ckb</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_res_box</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_res_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_scale_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_scale_pop</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_settings_box</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_width_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_customize_vid_width_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_box</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_browse_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_cancel_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_filename_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_filename_stub_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_icon_view</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_itwantafile_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_itwantafile_view</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_itwantastream_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_itwantastream_view</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_stream_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_destination_stream_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_drop_box</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_drop_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_drop_image_view</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_drop_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_dropin_icon_view</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_dropin_media_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_dropin_view</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_ok_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_profile_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_profile_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_profile_pop</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_address_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_address_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_announcement_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_cancel_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_channel_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_destination_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_ok_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_panel</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_port_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_port_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_sap_ckb</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_sdp_browsefile_btn</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_sdp_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_sdp_matrix</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_ttl_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_ttl_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_ttl_stepper</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_type_lbl</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_stream_type_pop</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">_window</string>
-                <string key="candidateClassName">id</string>
-              </object>
-            </object>
-          </object>
-          <object class="IBClassDescriptionSource" key="sourceIdentifier" id="498396924">
-            <string key="majorKey">IBDocumentRelativeSource</string>
-            <string key="minorKey">../../../../../modules/gui/macosx/ConvertAndSave.h</string>
-          </object>
-        </object>
-        <object class="IBPartialClassDescription">
-          <string key="className">VLCDropEnabledBox</string>
-          <string key="superclassName">NSBox</string>
-          <reference key="sourceIdentifier" ref="498396924"/>
-        </object>
-        <object class="IBPartialClassDescription">
-          <string key="className">VLCDropEnabledButton</string>
-          <string key="superclassName">NSButton</string>
-          <reference key="sourceIdentifier" ref="498396924"/>
+          <string key="className">VLCDragDropView</string>
+          <string key="superclassName">NSView</string>
+          <reference key="sourceIdentifier" ref="387002814"/>
         </object>
         <object class="IBPartialClassDescription">
-          <string key="className">VLCDropEnabledImageView</string>
+          <string key="className">VLCDropDisabledImageView</string>
           <string key="superclassName">NSImageView</string>
-          <reference key="sourceIdentifier" ref="498396924"/>
+          <reference key="sourceIdentifier" ref="387002814"/>
         </object>
       </object>
       <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
diff --git a/extras/package/macosx/Resources/English.lproj/MainWindow.xib b/extras/package/macosx/Resources/English.lproj/MainWindow.xib
index dfff966058571397efb3f788a209f49bd4192810..ea2e7f47254827a11d4a596434817d84d2672742 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MainWindow.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainWindow.xib
@@ -21,10 +21,10 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="4756"/>
+      <integer value="4372"/>
+      <integer value="5260"/>
       <integer value="4722"/>
       <integer value="4850"/>
-      <integer value="5260"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -384,7 +384,7 @@
                             <object class="NSOutlineView" id="23448837">
                               <reference key="NSNextResponder" ref="343242432"/>
                               <int key="NSvFlags">4370</int>
-                              <string key="NSFrameSize">{402, 236}</string>
+                              <string key="NSFrameSize">{401, 236}</string>
                               <reference key="NSSuperview" ref="343242432"/>
                               <bool key="NSEnabled">YES</bool>
                               <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -392,7 +392,7 @@
                               <object class="NSTableHeaderView" key="NSHeaderView" id="823165105">
                                 <reference key="NSNextResponder" ref="576307303"/>
                                 <int key="NSvFlags">256</int>
-                                <string key="NSFrameSize">{402, 17}</string>
+                                <string key="NSFrameSize">{401, 17}</string>
                                 <reference key="NSSuperview" ref="576307303"/>
                                 <reference key="NSTableView" ref="23448837"/>
                               </object>
@@ -441,7 +441,7 @@
                               <reference key="NSBackgroundColor" ref="885475112"/>
                               <reference key="NSGridColor" ref="756174976"/>
                               <double key="NSRowHeight">15</double>
-                              <int key="NSTvFlags">-88080384</int>
+                              <int key="NSTvFlags">-90177536</int>
                               <reference key="NSDelegate"/>
                               <reference key="NSDataSource"/>
                               <int key="NSGridStyleMask">1</int>
@@ -453,7 +453,7 @@
                               <int key="NSTableViewGroupRowStyle">1</int>
                             </object>
                           </object>
-                          <string key="NSFrame">{{1, 17}, {402, 236}}</string>
+                          <string key="NSFrame">{{1, 17}, {401, 236}}</string>
                           <reference key="NSSuperview" ref="915491793"/>
                           <reference key="NSNextKeyView" ref="23448837"/>
                           <reference key="NSDocView" ref="23448837"/>
@@ -488,7 +488,7 @@
                             <bool key="EncodedWithXMLCoder">YES</bool>
                             <reference ref="823165105"/>
                           </object>
-                          <string key="NSFrame">{{1, 0}, {402, 17}}</string>
+                          <string key="NSFrame">{{1, 0}, {401, 17}}</string>
                           <reference key="NSSuperview" ref="915491793"/>
                           <reference key="NSNextKeyView" ref="823165105"/>
                           <reference key="NSDocView" ref="823165105"/>
@@ -496,7 +496,7 @@
                           <int key="NScvFlags">4</int>
                         </object>
                       </object>
-                      <string key="NSFrameSize">{404, 254}</string>
+                      <string key="NSFrameSize">{403, 254}</string>
                       <reference key="NSSuperview" ref="440594360"/>
                       <reference key="NSNextKeyView" ref="343242432"/>
                       <int key="NSsFlags">133682</int>
@@ -1212,116 +1212,127 @@
         <int key="NSvFlags">274</int>
         <object class="NSMutableArray" key="NSSubviews">
           <bool key="EncodedWithXMLCoder">YES</bool>
-          <object class="NSBox" id="83235998">
+          <object class="NSCustomView" id="108902636">
             <reference key="NSNextResponder" ref="256817023"/>
-            <int key="NSvFlags">45</int>
+            <int key="NSvFlags">274</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="NSBox" id="83235998">
+                <reference key="NSNextResponder" ref="108902636"/>
+                <int key="NSvFlags">45</int>
                 <object class="NSMutableArray" key="NSSubviews">
                   <bool key="EncodedWithXMLCoder">YES</bool>
-                  <object class="NSTextField" id="551534796">
-                    <reference key="NSNextResponder" ref="457727486"/>
-                    <int key="NSvFlags">303</int>
-                    <string key="NSFrame">{{16, 69}, {370, 22}}</string>
-                    <reference key="NSSuperview" ref="457727486"/>
-                    <bool key="NSEnabled">YES</bool>
-                    <object class="NSTextFieldCell" key="NSCell" id="1042867331">
-                      <int key="NSCellFlags">68157504</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>
-                      <reference key="NSControlView" ref="551534796"/>
-                      <reference key="NSBackgroundColor" ref="3414043"/>
-                      <reference key="NSTextColor" ref="1018329413"/>
-                    </object>
-                    <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-                  </object>
-                  <object class="NSImageView" id="684815277">
-                    <reference key="NSNextResponder" ref="457727486"/>
-                    <int key="NSvFlags">301</int>
-                    <object class="NSMutableSet" key="NSDragTypes">
+                  <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="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 class="NSTextField" id="551534796">
+                        <reference key="NSNextResponder" ref="457727486"/>
+                        <int key="NSvFlags">303</int>
+                        <string key="NSFrame">{{12, 69}, {276, 22}}</string>
+                        <reference key="NSSuperview" ref="457727486"/>
+                        <bool key="NSEnabled">YES</bool>
+                        <object class="NSTextFieldCell" key="NSCell" id="1042867331">
+                          <int key="NSCellFlags">68157504</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>
+                          <reference key="NSControlView" ref="551534796"/>
+                          <reference key="NSBackgroundColor" ref="3414043"/>
+                          <reference key="NSTextColor" ref="1018329413"/>
+                        </object>
+                        <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                       </object>
-                    </object>
-                    <string key="NSFrame">{{147, 108}, {108, 108}}</string>
-                    <reference key="NSSuperview" ref="457727486"/>
-                    <bool key="NSEnabled">YES</bool>
-                    <object class="NSImageCell" key="NSCell" id="360507424">
-                      <int key="NSCellFlags">0</int>
-                      <int key="NSCellFlags2">33554432</int>
-                      <object class="NSCustomResource" key="NSContents">
-                        <string key="NSClassName">NSImage</string>
-                        <string key="NSResourceName">dropzone</string>
+                      <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">{{96, 109}, {108, 108}}</string>
+                        <reference key="NSSuperview" ref="457727486"/>
+                        <bool key="NSEnabled">YES</bool>
+                        <object class="NSImageCell" key="NSCell" id="360507424">
+                          <int key="NSCellFlags">0</int>
+                          <int key="NSCellFlags2">33554432</int>
+                          <object class="NSCustomResource" key="NSContents">
+                            <string key="NSClassName">NSImage</string>
+                            <string key="NSResourceName">dropzone</string>
+                          </object>
+                          <int key="NSAlign">0</int>
+                          <int key="NSScale">0</int>
+                          <int key="NSStyle">0</int>
+                          <bool key="NSAnimates">YES</bool>
+                        </object>
+                        <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+                        <bool key="NSEditable">YES</bool>
+                      </object>
+                      <object class="NSButton" id="959811945">
+                        <reference key="NSNextResponder" ref="457727486"/>
+                        <int key="NSvFlags">301</int>
+                        <string key="NSFrame">{{73, 14}, {153, 25}}</string>
+                        <reference key="NSSuperview" ref="457727486"/>
+                        <bool key="NSEnabled">YES</bool>
+                        <object class="NSButtonCell" key="NSCell" id="869331277">
+                          <int key="NSCellFlags">67108864</int>
+                          <int key="NSCellFlags2">134217728</int>
+                          <string key="NSContents">Open media...</string>
+                          <reference key="NSSupport" ref="841513812"/>
+                          <reference key="NSControlView" ref="959811945"/>
+                          <int key="NSButtonFlags">-2038284288</int>
+                          <int key="NSButtonFlags2">163</int>
+                          <string key="NSAlternateContents"/>
+                          <string key="NSKeyEquivalent"/>
+                          <int key="NSPeriodicDelay">200</int>
+                          <int key="NSPeriodicInterval">25</int>
+                        </object>
+                        <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                       </object>
-                      <int key="NSAlign">0</int>
-                      <int key="NSScale">0</int>
-                      <int key="NSStyle">0</int>
-                      <bool key="NSAnimates">YES</bool>
                     </object>
-                    <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-                    <bool key="NSEditable">YES</bool>
+                    <string key="NSFrameSize">{300, 230}</string>
+                    <reference key="NSSuperview" ref="83235998"/>
                   </object>
-                  <object class="NSButton" id="959811945">
-                    <reference key="NSNextResponder" ref="457727486"/>
-                    <int key="NSvFlags">301</int>
-                    <string key="NSFrame">{{124, 14}, {153, 25}}</string>
-                    <reference key="NSSuperview" ref="457727486"/>
-                    <bool key="NSEnabled">YES</bool>
-                    <object class="NSButtonCell" key="NSCell" id="869331277">
-                      <int key="NSCellFlags">67108864</int>
-                      <int key="NSCellFlags2">134217728</int>
-                      <string key="NSContents">Open media...</string>
-                      <reference key="NSSupport" ref="841513812"/>
-                      <reference key="NSControlView" ref="959811945"/>
-                      <int key="NSButtonFlags">-2038284288</int>
-                      <int key="NSButtonFlags2">163</int>
-                      <string key="NSAlternateContents"/>
-                      <string key="NSKeyEquivalent"/>
-                      <int key="NSPeriodicDelay">200</int>
-                      <int key="NSPeriodicInterval">25</int>
-                    </object>
-                    <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+                </object>
+                <string key="NSFrame">{{50, 35}, {300, 230}}</string>
+                <reference key="NSSuperview" ref="108902636"/>
+                <string key="NSOffsets">{0, 0}</string>
+                <object class="NSTextFieldCell" key="NSTitleCell">
+                  <int key="NSCellFlags">67108864</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>
-                <string key="NSFrameSize">{402, 229}</string>
-                <reference key="NSSuperview" ref="83235998"/>
+                <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>
+                <bool key="NSFullyTransparent">YES</bool>
               </object>
             </object>
-            <string key="NSFrame">{{0, 10}, {402, 229}}</string>
+            <string key="NSFrameSize">{400, 300}</string>
             <reference key="NSSuperview" ref="256817023"/>
-            <string key="NSOffsets">{0, 0}</string>
-            <object class="NSTextFieldCell" key="NSTitleCell">
-              <int key="NSCellFlags">67108864</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>
-            <bool key="NSFullyTransparent">YES</bool>
+            <string key="NSReuseIdentifierKey">_NS:1109</string>
+            <string key="NSClassName">VLCDragDropView</string>
           </object>
           <object class="NSImageView" id="619354303">
             <reference key="NSNextResponder" ref="256817023"/>
@@ -1338,7 +1349,7 @@
                 <string>NeXT TIFF v4.0 pasteboard type</string>
               </object>
             </object>
-            <string key="NSFrame">{{0, -2}, {482, 254}}</string>
+            <string key="NSFrame">{{0, -2}, {400, 300}}</string>
             <reference key="NSSuperview" ref="256817023"/>
             <bool key="NSEnabled">YES</bool>
             <object class="NSImageCell" key="NSCell" id="1064809555">
@@ -1357,12 +1368,12 @@
             <bool key="NSEditable">YES</bool>
           </object>
         </object>
-        <string key="NSFrameSize">{402, 252}</string>
+        <string key="NSFrameSize">{400, 300}</string>
         <reference key="NSSuperview"/>
         <object class="CIDarkenBlendMode" key="NSViewCompositeFilter">
           <bool key="CIEnabled">YES</bool>
         </object>
-        <string key="NSClassName">VLCMainWindowTitleView</string>
+        <string key="NSClassName">NSView</string>
       </object>
       <object class="NSCustomView" id="115834448">
         <reference key="NSNextResponder"/>
@@ -2728,7 +2739,7 @@
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <reference ref="619354303"/>
-              <reference ref="83235998"/>
+              <reference ref="108902636"/>
             </object>
             <reference key="parent" ref="0"/>
             <string key="objectName">Dropzone</string>
@@ -2747,59 +2758,6 @@
             <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 class="IBObjectRecord">
             <int key="objectID">4756</int>
             <reference key="object" ref="129808516"/>
@@ -3433,6 +3391,68 @@
             <reference key="object" ref="878580547"/>
             <reference key="parent" ref="0"/>
           </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">5605</int>
+            <reference key="object" ref="108902636"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="83235998"/>
+            </object>
+            <reference key="parent" ref="256817023"/>
+          </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="959811945"/>
+              <reference ref="684815277"/>
+              <reference ref="551534796"/>
+            </object>
+            <reference key="parent" ref="108902636"/>
+          </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">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">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">4726</int>
+            <reference key="object" ref="360507424"/>
+            <reference key="parent" ref="684815277"/>
+          </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">
@@ -3581,6 +3601,7 @@
           <string>4731.CustomClassName</string>
           <string>4731.IBPluginDependency</string>
           <string>4732.IBPluginDependency</string>
+          <string>4739.IBViewBoundsToFrameTransform</string>
           <string>4756.IBViewBoundsToFrameTransform</string>
           <string>4839.CustomClassName</string>
           <string>4839.IBPluginDependency</string>
@@ -3691,6 +3712,9 @@
           <string>5335.IBPluginDependency</string>
           <string>5335.IBViewBoundsToFrameTransform</string>
           <string>5339.IBPluginDependency</string>
+          <string>5605.IBEditorWindowLastContentRect</string>
+          <string>5605.IBPluginDependency</string>
+          <string>5605.IBViewBoundsToFrameTransform</string>
         </object>
         <object class="NSMutableArray" key="dict.values">
           <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3870,10 +3894,10 @@
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{566, 424}, {402, 252}}</string>
+          <string>{{566, 376}, {400, 300}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform"/>
-          <string>VLBrushedMetalImageView</string>
+          <string>VLCDropDisabledImageView</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform">
             <bytes key="NSTransformStruct">AUNLAABCzAAAA</bytes>
@@ -3889,9 +3913,12 @@
             <bytes key="NSTransformStruct">P4AAAL+AAABCJAAAwhQAAA</bytes>
           </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>VLBrushedMetalImageView</string>
+          <string>VLCDropDisabledImageView</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <object class="NSAffineTransform">
+            <bytes key="NSTransformStruct">AQAAAABBuAAAA</bytes>
+          </object>
           <object class="NSAffineTransform">
             <bytes key="NSTransformStruct">Ab+AAAAAAAAAA</bytes>
           </object>
@@ -4046,6 +4073,9 @@
             <bytes key="NSTransformStruct">AUNdAABBIAAAA</bytes>
           </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>{{329, 899}, {163, 96}}</string>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <object class="NSAffineTransform"/>
         </object>
       </object>
       <object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -4064,7 +4094,7 @@
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">5604</int>
+      <int key="maxID">5607</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -4136,11 +4166,6 @@
           <string key="superclassName">NSSlider</string>
           <reference key="sourceIdentifier" ref="532238455"/>
         </object>
-        <object class="IBPartialClassDescription">
-          <string key="className">VLBrushedMetalImageView</string>
-          <string key="superclassName">NSImageView</string>
-          <reference key="sourceIdentifier" ref="532238455"/>
-        </object>
         <object class="IBPartialClassDescription">
           <string key="className">VLCControls</string>
           <string key="superclassName">NSObject</string>
@@ -4558,6 +4583,16 @@
           <string key="superclassName">VLCCustomWindowButtonPrototype</string>
           <reference key="sourceIdentifier" ref="244491861"/>
         </object>
+        <object class="IBPartialClassDescription">
+          <string key="className">VLCDragDropView</string>
+          <string key="superclassName">NSView</string>
+          <reference key="sourceIdentifier" ref="532238455"/>
+        </object>
+        <object class="IBPartialClassDescription">
+          <string key="className">VLCDropDisabledImageView</string>
+          <string key="superclassName">NSImageView</string>
+          <reference key="sourceIdentifier" ref="532238455"/>
+        </object>
         <object class="IBPartialClassDescription">
           <string key="className">VLCMain</string>
           <string key="superclassName">NSObject</string>
diff --git a/modules/gui/macosx/ConvertAndSave.h b/modules/gui/macosx/ConvertAndSave.h
index 09007d8b07b325c96a586ab2b899e14cc93c3fe5..9e8a8a92c514640dfa6a57bc394d6a6d2092faac 100644 (file)
--- a/modules/gui/macosx/ConvertAndSave.h
+++ b/modules/gui/macosx/ConvertAndSave.h
@@ -171,18 +171,3 @@
 - (void)updateDropView;
 
 @end
-
-@interface VLCDropEnabledBox : NSBox
-{
-    BOOL b_activeDragAndDrop;
-}
-
-@end
-
-@interface VLCDropEnabledImageView : NSImageView
-
-@end
-
-@interface VLCDropEnabledButton : NSButton
-
-@end
diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m
index 1e514f8e5a0dbab8c5f0ecb7eff2862bce30719a..2f5d9b0758b8789b5b0199726709d9469c40f25d 100644 (file)
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -261,6 +261,10 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
 
     [_ok_btn setEnabled: NO];
 
+    // setup drop view
+    [_drop_box enablePlaylistItems];
+    [_drop_box setDropHandler: self];
+
     [self resetCustomizationSheetBasedOnProfile:[self.profileValueList objectAtIndex:0]];
 }
 
@@ -1057,130 +1061,3 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
 }
 
 @end
-
-# pragma mark -
-# pragma mark Drag and drop handling
-
-@implementation VLCDropEnabledBox
-
-- (void)awakeFromNib
-{
-    [self registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]];
-}
-
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
-    b_activeDragAndDrop = YES;
-    [self setNeedsDisplay:YES];
-
-    [[NSCursor dragCopyCursor] set];
-
-    if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) == NSDragOperationGeneric)
-        return NSDragOperationGeneric;
-
-    return NSDragOperationNone;
-}
-
-- (void)draggingEnded:(id < NSDraggingInfo >)sender
-{
-    [[NSCursor arrowCursor] set];
-    b_activeDragAndDrop = NO;
-    [self setNeedsDisplay:YES];
-}
-
-- (void)draggingExited:(id < NSDraggingInfo >)sender
-{
-    [[NSCursor arrowCursor] set];
-    b_activeDragAndDrop = NO;
-    [self setNeedsDisplay:YES];
-}
-
-- (void)drawRect:(NSRect)dirtyRect
-{
-    if (b_activeDragAndDrop) {
-        [[NSColor colorWithCalibratedRed:(.154/.255) green:(.154/.255) blue:(.154/.255) alpha:1.] setFill];
-        NSRect frameRect = [[self contentView] bounds];
-        frameRect.origin.x += 10;
-        frameRect.origin.y += 10;
-        frameRect.size.width -= 17;
-        frameRect.size.height -= 17;
-        NSFrameRectWithWidthUsingOperation(frameRect, 4., NSCompositeHighlight);
-    }
-
-    [super drawRect:dirtyRect];
-}
-
-- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
-{
-    return YES;
-}
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-{
-    return [[VLCConvertAndSave sharedInstance] performDragOperation: sender];
-}
-
-- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
-{
-    [self setNeedsDisplay:YES];
-}
-
-@end
-
-@implementation VLCDropEnabledImageView
-
-- (void)awakeFromNib
-{
-    [self registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]];
-}
-
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
-    return [[[self superview] superview] draggingEntered:sender];
-}
-
-- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
-{
-    return YES;
-}
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-{
-    return [[VLCConvertAndSave sharedInstance] performDragOperation: sender];
-}
-
-- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
-{
-    [self setNeedsDisplay:YES];
-}
-
-@end
-
-@implementation VLCDropEnabledButton
-
-- (void)awakeFromNib
-{
-    [self registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]];
-}
-
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
-{
-    return [[[self superview] superview] draggingEntered:sender];
-}
-
-- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
-{
-    return YES;
-}
-
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
-{
-    return [[VLCConvertAndSave sharedInstance] performDragOperation: sender];
-}
-
-- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
-{
-    [self setNeedsDisplay:YES];
-}
-
-@end
diff --git a/modules/gui/macosx/CoreInteraction.m b/modules/gui/macosx/CoreInteraction.m
index d885a80b0ceef89b0f4441ab9bb4ca6be7741372..782fe4e7111e51f19f5c1af0d5333b2b25cf6844 100644 (file)
--- a/modules/gui/macosx/CoreInteraction.m
+++ b/modules/gui/macosx/CoreInteraction.m
@@ -557,7 +557,7 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
 }
 
 #pragma mark -
-#pragma mark drag and drop support for VLCVoutView, VLBrushedMetalImageView and VLCThreePartDropView
+#pragma mark drag and drop support for VLCVoutView, VLCDragDropView and VLCThreePartDropView
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 {
     NSPasteboard *o_paste = [sender draggingPasteboard];
diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h
index 42f65fb95b6d8e0e32163ba9d63ffef3144807be..dd2b440e9b041b59c7c9b7cf5c9c96449785eec9 100644 (file)
--- a/modules/gui/macosx/misc.h
+++ b/modules/gui/macosx/misc.h
@@ -70,12 +70,32 @@
 - (void)setNonFullscreenPresentationOptions;
 @end
 
+/*****************************************************************************
+ * VLCDragDropView
+ *
+ * Disables default drag / drop behaviour of an NSImageView.
+ * set it for all sub image views withing an VLCDragDropView.
+ *****************************************************************************/
+
+
+@interface VLCDropDisabledImageView : NSImageView
+
+@end
 
 /*****************************************************************************
- * VLBrushedMetalImageView
+ * VLCDragDropView
  *****************************************************************************/
 
-@interface VLBrushedMetalImageView : NSImageView
+@interface VLCDragDropView : NSView
+{
+    bool b_activeDragAndDrop;
+
+    id _dropHandler;
+}
+
+@property (nonatomic, assign) id dropHandler;
+
+- (void)enablePlaylistItems;
 
 @end
 
diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index e02d2a9134935ffe94f4662c152429c2ab716e3e..b9eb7d90b1188a69a5dc6e51d9dd582c2a0a4014 100644 (file)
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -300,10 +300,30 @@ static bool b_old_spaces_style = YES;
 @end
 
 /*****************************************************************************
- * VLBrushedMetalImageView
+ * VLCDragDropView
  *****************************************************************************/
 
-@implementation VLBrushedMetalImageView
+@implementation VLCDropDisabledImageView
+
+- (void)awakeFromNib
+{
+    [self unregisterDraggedTypes];
+}
+
+@end
+
+/*****************************************************************************
+ * VLCDragDropView
+ *****************************************************************************/
+
+@implementation VLCDragDropView
+
+@synthesize dropHandler=_dropHandler;
+
+- (void)enablePlaylistItems
+{
+    [self registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]];
+}
 
 - (BOOL)mouseDownCanMoveWindow
 {
@@ -319,19 +339,32 @@ static bool b_old_spaces_style = YES;
 - (void)awakeFromNib
 {
     [self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
-    [self setImageScaling: NSScaleToFit];
-    [self setImageFrameStyle: NSImageFrameNone];
-    [self setImageAlignment: NSImageAlignCenter];
 }
 
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
 {
-    if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) == NSDragOperationGeneric)
-        return NSDragOperationGeneric;
+    if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) == NSDragOperationGeneric) {
+        b_activeDragAndDrop = YES;
+        [self setNeedsDisplay:YES];
+
+        return NSDragOperationCopy;
+    }
 
     return NSDragOperationNone;
 }
 
+- (void)draggingEnded:(id < NSDraggingInfo >)sender
+{
+    b_activeDragAndDrop = NO;
+    [self setNeedsDisplay:YES];
+}
+
+- (void)draggingExited:(id < NSDraggingInfo >)sender
+{
+    b_activeDragAndDrop = NO;
+    [self setNeedsDisplay:YES];
+}
+
 - (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
 {
     return YES;
@@ -340,7 +373,11 @@ static bool b_old_spaces_style = YES;
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
 {
     BOOL b_returned;
-    b_returned = [[VLCCoreInteraction sharedInstance] performDragOperation: sender];
+
+    if (_dropHandler && [_dropHandler respondsToSelector:@selector(performDragOperation:)])
+        b_returned = [_dropHandler performDragOperation: sender];
+    else // default
+        b_returned = [[VLCCoreInteraction sharedInstance] performDragOperation: sender];
 
     [self setNeedsDisplay:YES];
     return b_returned;
@@ -351,6 +388,19 @@ static bool b_old_spaces_style = YES;
     [self setNeedsDisplay:YES];
 }
 
+- (void)drawRect:(NSRect)dirtyRect
+{
+
+    if (b_activeDragAndDrop) {
+        NSRect frameRect = [self bounds];
+
+        [[NSColor selectedControlColor] set];
+        NSFrameRectWithWidthUsingOperation(frameRect, 2., NSCompositeHighlight);
+    }
+
+    [super drawRect:dirtyRect];
+}
+
 @end
 
 
Unnamed repository; edit this file 'description' to name the repository.