macosx: added a resize control to the main window (not in use when linking against...

diff --git a/Makefile.am b/Makefile.am
index 0dc04122e389833134eac308eec329bd32367077..f0030103b64f436d3c5c8a347fea8c9996d958e7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -288,6 +288,7 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/window-minimize-on.png \
        extras/package/macosx/Resources/mainwindow_dark/window-minimize-over.png \
        extras/package/macosx/Resources/mainwindow_dark/window-minimize.png \
+       extras/package/macosx/Resources/mainwindow_dark/window-resize.png \
        extras/package/macosx/Resources/mainwindow_dark/window-zoom-on.png \
        extras/package/macosx/Resources/mainwindow_dark/window-zoom-over.png \
        extras/package/macosx/Resources/mainwindow_dark/window-zoom.png \

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
index 36492eea1d76371233d40d6bec553c6d93fa9193..43864c3f2684cdcc6e2b6732807fc053b0f13416 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
@@ -26,7 +26,7 @@
       <integer value="4758"/>
       <integer value="1617"/>
       <integer value="2730"/>
-      <integer value="4824"/>
+      <integer value="29"/>
       <integer value="4722"/>
       <integer value="4596"/>
     </object>
@@ -88,7 +88,7 @@
                             <bool key="EncodedWithXMLCoder">YES</bool>
                             <object class="NSOutlineView" id="1064884668">
                               <reference key="NSNextResponder" ref="18556274"/>
-                              <int key="NSvFlags">4352</int>
+                              <int key="NSvFlags">4354</int>
                               <string key="NSFrameSize">{121, 272}</string>
                               <reference key="NSSuperview" ref="18556274"/>
                               <int key="NSViewLayerContentsRedrawPolicy">2</int>
@@ -622,6 +622,40 @@
               <int key="NSvFlags">290</int>
               <object class="NSMutableArray" key="NSSubviews">
                 <bool key="EncodedWithXMLCoder">YES</bool>
+                <object class="NSImageView" id="340797151">
+                  <reference key="NSNextResponder" ref="129808516"/>
+                  <int key="NSvFlags">289</int>
+                  <object class="NSMutableSet" key="NSDragTypes">
+                    <bool key="EncodedWithXMLCoder">YES</bool>
+                    <object class="NSArray" key="set.sortedObjects">
+                      <bool key="EncodedWithXMLCoder">YES</bool>
+                      <string>Apple PDF pasteboard type</string>
+                      <string>Apple PICT pasteboard type</string>
+                      <string>Apple PNG pasteboard type</string>
+                      <string>NSFilenamesPboardType</string>
+                      <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+                      <string>NeXT TIFF v4.0 pasteboard type</string>
+                    </object>
+                  </object>
+                  <string key="NSFrame">{{591, 0}, {14, 14}}</string>
+                  <reference key="NSSuperview" ref="129808516"/>
+                  <string key="NSReuseIdentifierKey">_NS:2165</string>
+                  <bool key="NSEnabled">YES</bool>
+                  <object class="NSImageCell" key="NSCell" id="233000537">
+                    <int key="NSCellFlags">654848</int>
+                    <int key="NSCellFlags2">33554432</int>
+                    <object class="NSCustomResource" key="NSContents">
+                      <string key="NSClassName">NSImage</string>
+                      <string key="NSResourceName">window-resize</string>
+                    </object>
+                    <string key="NSCellIdentifier">_NS:2165</string>
+                    <int key="NSAlign">0</int>
+                    <int key="NSScale">2</int>
+                    <int key="NSStyle">0</int>
+                    <bool key="NSAnimates">NO</bool>
+                  </object>
+                  <bool key="NSEditable">YES</bool>
+                </object>
                 <object class="NSCustomView" id="202538583">
                   <reference key="NSNextResponder" ref="129808516"/>
                   <int key="NSvFlags">292</int>
@@ -760,14 +794,14 @@
                     <bool key="NSVertical">NO</bool>
                   </object>
                 </object>
-                <object class="NSButton" id="340023688">
+                <object class="NSButton" id="714984330">
                   <reference key="NSNextResponder" ref="129808516"/>
                   <int key="NSvFlags">289</int>
-                  <string key="NSFrame">{{591, 0}, {14, 14}}</string>
+                  <string key="NSFrame">{{569, 7}, {29, 23}}</string>
                   <reference key="NSSuperview" ref="129808516"/>
                   <int key="NSViewLayerContentsRedrawPolicy">2</int>
                   <bool key="NSEnabled">YES</bool>
-                  <object class="NSButtonCell" key="NSCell" id="455992720">
+                  <object class="NSButtonCell" key="NSCell" id="317272906">
                     <int key="NSCellFlags">67239424</int>
                     <int key="NSCellFlags2">134217728</int>
                     <string key="NSContents"/>
@@ -776,34 +810,6 @@
                       <double key="NSSize">10</double>
                       <int key="NSfFlags">2832</int>
                     </object>
-                    <reference key="NSControlView" ref="340023688"/>
-                    <int key="NSButtonFlags">141820159</int>
-                    <int key="NSButtonFlags2">2</int>
-                    <object class="NSCustomResource" key="NSNormalImage" id="190365051">
-                      <string key="NSClassName">NSImage</string>
-                      <string key="NSResourceName">window-resize</string>
-                    </object>
-                    <reference key="NSAlternateImage" ref="190365051"/>
-                    <string key="NSAlternateContents"/>
-                    <object class="NSMutableString" key="NSKeyEquivalent">
-                      <characters key="NS.bytes"/>
-                    </object>
-                    <int key="NSPeriodicDelay">200</int>
-                    <int key="NSPeriodicInterval">25</int>
-                  </object>
-                </object>
-                <object class="NSButton" id="714984330">
-                  <reference key="NSNextResponder" ref="129808516"/>
-                  <int key="NSvFlags">289</int>
-                  <string key="NSFrame">{{569, 7}, {29, 23}}</string>
-                  <reference key="NSSuperview" ref="129808516"/>
-                  <int key="NSViewLayerContentsRedrawPolicy">2</int>
-                  <bool key="NSEnabled">YES</bool>
-                  <object class="NSButtonCell" key="NSCell" id="317272906">
-                    <int key="NSCellFlags">67239424</int>
-                    <int key="NSCellFlags2">134217728</int>
-                    <string key="NSContents"/>
-                    <reference key="NSSupport" ref="188716167"/>
                     <reference key="NSControlView" ref="714984330"/>
                     <int key="NSButtonFlags">-931921665</int>
                     <int key="NSButtonFlags2">2</int>
@@ -1592,112 +1598,6 @@
               </object>
             </object>
           </object>
-          <object class="NSMenuItem" id="573351300">
-            <reference key="NSMenu" ref="782168084"/>
-            <string key="NSTitle">File</string>
-            <string key="NSKeyEquiv"/>
-            <int key="NSMnemonicLoc">2147483647</int>
-            <reference key="NSOnImage" ref="447396056"/>
-            <reference key="NSMixedImage" ref="100133332"/>
-            <string key="NSAction">submenuAction:</string>
-            <object class="NSMenu" key="NSSubmenu" id="934868203">
-              <string key="NSTitle">File</string>
-              <object class="NSMutableArray" key="NSMenuItems">
-                <bool key="EncodedWithXMLCoder">YES</bool>
-                <object class="NSMenuItem" id="941707687">
-                  <reference key="NSMenu" ref="934868203"/>
-                  <string key="NSTitle">New</string>
-                  <string key="NSKeyEquiv">n</string>
-                  <int key="NSKeyEquivModMask">1048576</int>
-                  <int key="NSMnemonicLoc">2147483647</int>
-                  <reference key="NSOnImage" ref="447396056"/>
-                  <reference key="NSMixedImage" ref="100133332"/>
-                </object>
-                <object class="NSMenuItem" id="121176173">
-                  <reference key="NSMenu" ref="934868203"/>
-                  <string key="NSTitle">Open…</string>
-                  <string key="NSKeyEquiv">o</string>
-                  <int key="NSKeyEquivModMask">1048576</int>
-                  <int key="NSMnemonicLoc">2147483647</int>
-                  <reference key="NSOnImage" ref="447396056"/>
-                  <reference key="NSMixedImage" ref="100133332"/>
-                </object>
-                <object class="NSMenuItem" id="209966631">
-                  <reference key="NSMenu" ref="934868203"/>
-                  <bool key="NSIsDisabled">YES</bool>
-                  <bool key="NSIsSeparator">YES</bool>
-                  <string key="NSTitle"/>
-                  <string key="NSKeyEquiv"/>
-                  <int key="NSMnemonicLoc">2147483647</int>
-                  <reference key="NSOnImage" ref="447396056"/>
-                  <reference key="NSMixedImage" ref="100133332"/>
-                </object>
-                <object class="NSMenuItem" id="684252018">
-                  <reference key="NSMenu" ref="934868203"/>
-                  <string key="NSTitle">Close</string>
-                  <string key="NSKeyEquiv">w</string>
-                  <int key="NSKeyEquivModMask">1048576</int>
-                  <int key="NSMnemonicLoc">2147483647</int>
-                  <reference key="NSOnImage" ref="447396056"/>
-                  <reference key="NSMixedImage" ref="100133332"/>
-                </object>
-                <object class="NSMenuItem" id="565518714">
-                  <reference key="NSMenu" ref="934868203"/>
-                  <string key="NSTitle">Save</string>
-                  <string key="NSKeyEquiv">s</string>
-                  <int key="NSKeyEquivModMask">1048576</int>
-                  <int key="NSMnemonicLoc">2147483647</int>
-                  <reference key="NSOnImage" ref="447396056"/>
-                  <reference key="NSMixedImage" ref="100133332"/>
-                </object>
-                <object class="NSMenuItem" id="637375703">
-                  <reference key="NSMenu" ref="934868203"/>
-                  <string key="NSTitle">Save As…</string>
-                  <string key="NSKeyEquiv">S</string>
-                  <int key="NSKeyEquivModMask">1048576</int>
-                  <int key="NSMnemonicLoc">2147483647</int>
-                  <reference key="NSOnImage" ref="447396056"/>
-                  <reference key="NSMixedImage" ref="100133332"/>
-                </object>
-                <object class="NSMenuItem" id="964422047">
-                  <reference key="NSMenu" ref="934868203"/>
-                  <string key="NSTitle">Revert to Saved</string>
-                  <string key="NSKeyEquiv"/>
-                  <int key="NSMnemonicLoc">2147483647</int>
-                  <reference key="NSOnImage" ref="447396056"/>
-                  <reference key="NSMixedImage" ref="100133332"/>
-                </object>
-                <object class="NSMenuItem" id="680183792">
-                  <reference key="NSMenu" ref="934868203"/>
-                  <bool key="NSIsDisabled">YES</bool>
-                  <bool key="NSIsSeparator">YES</bool>
-                  <string key="NSTitle"/>
-                  <string key="NSKeyEquiv"/>
-                  <int key="NSMnemonicLoc">2147483647</int>
-                  <reference key="NSOnImage" ref="447396056"/>
-                  <reference key="NSMixedImage" ref="100133332"/>
-                </object>
-                <object class="NSMenuItem" id="518087256">
-                  <reference key="NSMenu" ref="934868203"/>
-                  <string key="NSTitle">Page Setup…</string>
-                  <string key="NSKeyEquiv">P</string>
-                  <int key="NSKeyEquivModMask">1048576</int>
-                  <int key="NSMnemonicLoc">2147483647</int>
-                  <reference key="NSOnImage" ref="447396056"/>
-                  <reference key="NSMixedImage" ref="100133332"/>
-                </object>
-                <object class="NSMenuItem" id="783946407">
-                  <reference key="NSMenu" ref="934868203"/>
-                  <string key="NSTitle">Print…</string>
-                  <string key="NSKeyEquiv">p</string>
-                  <int key="NSKeyEquivModMask">1048576</int>
-                  <int key="NSMnemonicLoc">2147483647</int>
-                  <reference key="NSOnImage" ref="447396056"/>
-                  <reference key="NSMixedImage" ref="100133332"/>
-                </object>
-              </object>
-            </object>
-          </object>
           <object class="NSMenuItem" id="987792194">
             <reference key="NSMenu" ref="782168084"/>
             <string key="NSTitle">Edit</string>
@@ -7490,54 +7390,6 @@ LCAuLi4</string>
           </object>
           <int key="connectionID">4781</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_resize_btn</string>
-            <reference key="source" ref="498338108"/>
-            <reference key="destination" ref="340023688"/>
-          </object>
-          <int key="connectionID">4785</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">resizeWindowAction:</string>
-            <reference key="source" ref="498338108"/>
-            <reference key="destination" ref="340023688"/>
-          </object>
-          <int key="connectionID">4786</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">print:</string>
-            <reference key="source" ref="936559509"/>
-            <reference key="destination" ref="783946407"/>
-          </object>
-          <int key="connectionID">4826</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">openDocument:</string>
-            <reference key="source" ref="936559509"/>
-            <reference key="destination" ref="121176173"/>
-          </object>
-          <int key="connectionID">4827</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">performClose:</string>
-            <reference key="source" ref="936559509"/>
-            <reference key="destination" ref="684252018"/>
-          </object>
-          <int key="connectionID">4828</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">newDocument:</string>
-            <reference key="source" ref="936559509"/>
-            <reference key="destination" ref="941707687"/>
-          </object>
-          <int key="connectionID">4829</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBActionConnection" key="connection">
             <string key="label">clearRecentDocuments:</string>
@@ -7546,38 +7398,6 @@ LCAuLi4</string>
           </object>
           <int key="connectionID">4830</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">saveDocumentAs:</string>
-            <reference key="source" ref="936559509"/>
-            <reference key="destination" ref="637375703"/>
-          </object>
-          <int key="connectionID">4831</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">runPageLayout:</string>
-            <reference key="source" ref="936559509"/>
-            <reference key="destination" ref="518087256"/>
-          </object>
-          <int key="connectionID">4832</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">saveDocument:</string>
-            <reference key="source" ref="936559509"/>
-            <reference key="destination" ref="565518714"/>
-          </object>
-          <int key="connectionID">4833</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">revertDocumentToSaved:</string>
-            <reference key="source" ref="936559509"/>
-            <reference key="destination" ref="964422047"/>
-          </object>
-          <int key="connectionID">4834</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">o_mi_open_recent</string>
@@ -7586,6 +7406,14 @@ LCAuLi4</string>
           </object>
           <int key="connectionID">4835</int>
         </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">o_resize_view</string>
+            <reference key="source" ref="498338108"/>
+            <reference key="destination" ref="340797151"/>
+          </object>
+          <int key="connectionID">4841</int>
+        </object>
       </object>
       <object class="IBMutableOrderedSet" key="objectRecords">
         <object class="NSArray" key="orderedObjects">
@@ -7644,7 +7472,6 @@ LCAuLi4</string>
               <reference ref="808348229"/>
               <reference ref="123410814"/>
               <reference ref="62885517"/>
-              <reference ref="573351300"/>
             </object>
             <reference key="parent" ref="0"/>
             <string key="objectName">MainMenu</string>
@@ -9964,173 +9791,154 @@ LCAuLi4</string>
             <reference key="parent" ref="1017583928"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4756</int>
-            <reference key="object" ref="129808516"/>
+            <int key="objectID">4758</int>
+            <reference key="object" ref="471121744"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="707945673"/>
-              <reference ref="354459361"/>
-              <reference ref="291209196"/>
-              <reference ref="714984330"/>
-              <reference ref="955174811"/>
-              <reference ref="1051664676"/>
-              <reference ref="1023610457"/>
-              <reference ref="788281303"/>
-              <reference ref="38046606"/>
-              <reference ref="202538583"/>
-              <reference ref="474770834"/>
-              <reference ref="533732100"/>
-              <reference ref="963106097"/>
-              <reference ref="784705424"/>
-              <reference ref="828712633"/>
-              <reference ref="664576649"/>
-              <reference ref="809192538"/>
-              <reference ref="828315098"/>
-              <reference ref="21901908"/>
-              <reference ref="704525034"/>
-              <reference ref="340023688"/>
+              <reference ref="912813065"/>
+              <reference ref="47797873"/>
+              <reference ref="145580725"/>
+              <reference ref="369193052"/>
+              <reference ref="659976200"/>
             </object>
-            <reference key="parent" ref="429932428"/>
+            <reference key="parent" ref="0"/>
+            <string key="objectName">MainWindowTitle</string>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">3571</int>
-            <reference key="object" ref="707945673"/>
+            <int key="objectID">4765</int>
+            <reference key="object" ref="912813065"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="826103597"/>
+              <reference ref="883426607"/>
             </object>
-            <reference key="parent" ref="129808516"/>
+            <reference key="parent" ref="471121744"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4348</int>
-            <reference key="object" ref="826103597"/>
-            <reference key="parent" ref="707945673"/>
+            <int key="objectID">4766</int>
+            <reference key="object" ref="883426607"/>
+            <reference key="parent" ref="912813065"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4434</int>
-            <reference key="object" ref="354459361"/>
+            <int key="objectID">4763</int>
+            <reference key="object" ref="47797873"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="187033403"/>
+              <reference ref="576041215"/>
             </object>
-            <reference key="parent" ref="129808516"/>
+            <reference key="parent" ref="471121744"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4435</int>
-            <reference key="object" ref="187033403"/>
-            <reference key="parent" ref="354459361"/>
+            <int key="objectID">4764</int>
+            <reference key="object" ref="576041215"/>
+            <reference key="parent" ref="47797873"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">2208</int>
-            <reference key="object" ref="291209196"/>
+            <int key="objectID">4761</int>
+            <reference key="object" ref="145580725"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="482976610"/>
+              <reference ref="887230843"/>
             </object>
-            <reference key="parent" ref="129808516"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4313</int>
-            <reference key="object" ref="482976610"/>
-            <reference key="parent" ref="291209196"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4422</int>
-            <reference key="object" ref="704525034"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="276068486"/>
-            </object>
-            <reference key="parent" ref="129808516"/>
+            <reference key="parent" ref="471121744"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4425</int>
-            <reference key="object" ref="276068486"/>
-            <reference key="parent" ref="704525034"/>
+            <int key="objectID">4762</int>
+            <reference key="object" ref="887230843"/>
+            <reference key="parent" ref="145580725"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4419</int>
-            <reference key="object" ref="714984330"/>
+            <int key="objectID">4759</int>
+            <reference key="object" ref="369193052"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="317272906"/>
+              <reference ref="1021277036"/>
             </object>
-            <reference key="parent" ref="129808516"/>
+            <reference key="parent" ref="471121744"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4420</int>
-            <reference key="object" ref="317272906"/>
-            <reference key="parent" ref="714984330"/>
+            <int key="objectID">4760</int>
+            <reference key="object" ref="1021277036"/>
+            <reference key="parent" ref="369193052"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4671</int>
-            <reference key="object" ref="955174811"/>
+            <int key="objectID">4777</int>
+            <reference key="object" ref="659976200"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="717770677"/>
+              <reference ref="434038964"/>
             </object>
-            <reference key="parent" ref="129808516"/>
+            <reference key="parent" ref="471121744"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4672</int>
-            <reference key="object" ref="717770677"/>
-            <reference key="parent" ref="955174811"/>
+            <int key="objectID">4778</int>
+            <reference key="object" ref="434038964"/>
+            <reference key="parent" ref="659976200"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">2789</int>
-            <reference key="object" ref="1051664676"/>
+            <int key="objectID">4815</int>
+            <reference key="object" ref="957503076"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="844988869"/>
+              <reference ref="616704520"/>
             </object>
-            <reference key="parent" ref="129808516"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4316</int>
-            <reference key="object" ref="844988869"/>
-            <reference key="parent" ref="1051664676"/>
+            <reference key="parent" ref="1050252183"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">3651</int>
-            <reference key="object" ref="1023610457"/>
+            <int key="objectID">4824</int>
+            <reference key="object" ref="616704520"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="618891975"/>
+              <reference ref="740178575"/>
             </object>
-            <reference key="parent" ref="129808516"/>
+            <reference key="parent" ref="957503076"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4278</int>
-            <reference key="object" ref="618891975"/>
-            <reference key="parent" ref="1023610457"/>
+            <int key="objectID">4825</int>
+            <reference key="object" ref="740178575"/>
+            <reference key="parent" ref="616704520"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">3649</int>
-            <reference key="object" ref="788281303"/>
+            <int key="objectID">4756</int>
+            <reference key="object" ref="129808516"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="180862414"/>
+              <reference ref="704525034"/>
+              <reference ref="21901908"/>
+              <reference ref="828315098"/>
+              <reference ref="809192538"/>
+              <reference ref="664576649"/>
+              <reference ref="828712633"/>
+              <reference ref="784705424"/>
+              <reference ref="963106097"/>
+              <reference ref="533732100"/>
+              <reference ref="474770834"/>
+              <reference ref="202538583"/>
+              <reference ref="38046606"/>
+              <reference ref="788281303"/>
+              <reference ref="1023610457"/>
+              <reference ref="1051664676"/>
+              <reference ref="955174811"/>
+              <reference ref="714984330"/>
+              <reference ref="291209196"/>
+              <reference ref="354459361"/>
+              <reference ref="707945673"/>
+              <reference ref="340797151"/>
             </object>
-            <reference key="parent" ref="129808516"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4276</int>
-            <reference key="object" ref="180862414"/>
-            <reference key="parent" ref="788281303"/>
+            <reference key="parent" ref="429932428"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">3654</int>
-            <reference key="object" ref="38046606"/>
+            <int key="objectID">4422</int>
+            <reference key="object" ref="704525034"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="424650866"/>
+              <reference ref="276068486"/>
             </object>
             <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4281</int>
-            <reference key="object" ref="424650866"/>
-            <reference key="parent" ref="38046606"/>
+            <int key="objectID">4425</int>
+            <reference key="object" ref="276068486"/>
+            <reference key="parent" ref="704525034"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">4438</int>
@@ -10147,51 +9955,51 @@ LCAuLi4</string>
             <reference key="parent" ref="21901908"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4701</int>
-            <reference key="object" ref="202538583"/>
-            <reference key="parent" ref="129808516"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3652</int>
-            <reference key="object" ref="474770834"/>
+            <int key="objectID">3648</int>
+            <reference key="object" ref="828315098"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="706599501"/>
+              <reference ref="577223856"/>
             </object>
             <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4279</int>
-            <reference key="object" ref="706599501"/>
-            <reference key="parent" ref="474770834"/>
+            <int key="objectID">4275</int>
+            <reference key="object" ref="577223856"/>
+            <reference key="parent" ref="828315098"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4423</int>
-            <reference key="object" ref="533732100"/>
+            <int key="objectID">3647</int>
+            <reference key="object" ref="809192538"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="896153998"/>
+              <reference ref="670927311"/>
             </object>
             <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4424</int>
-            <reference key="object" ref="896153998"/>
-            <reference key="parent" ref="533732100"/>
+            <int key="objectID">4274</int>
+            <reference key="object" ref="670927311"/>
+            <reference key="parent" ref="809192538"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">3653</int>
-            <reference key="object" ref="963106097"/>
+            <int key="objectID">3584</int>
+            <reference key="object" ref="664576649"/>
+            <reference key="parent" ref="129808516"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">4436</int>
+            <reference key="object" ref="828712633"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="587429705"/>
+              <reference ref="41671586"/>
             </object>
             <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4280</int>
-            <reference key="object" ref="587429705"/>
-            <reference key="parent" ref="963106097"/>
+            <int key="objectID">4437</int>
+            <reference key="object" ref="41671586"/>
+            <reference key="parent" ref="828712633"/>
           </object>
           <object class="IBObjectRecord">
             <int key="objectID">4417</int>
@@ -10208,249 +10016,194 @@ LCAuLi4</string>
             <reference key="parent" ref="784705424"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4436</int>
-            <reference key="object" ref="828712633"/>
+            <int key="objectID">3653</int>
+            <reference key="object" ref="963106097"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="41671586"/>
+              <reference ref="587429705"/>
             </object>
             <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4437</int>
-            <reference key="object" ref="41671586"/>
-            <reference key="parent" ref="828712633"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3584</int>
-            <reference key="object" ref="664576649"/>
-            <reference key="parent" ref="129808516"/>
+            <int key="objectID">4280</int>
+            <reference key="object" ref="587429705"/>
+            <reference key="parent" ref="963106097"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">3647</int>
-            <reference key="object" ref="809192538"/>
+            <int key="objectID">4423</int>
+            <reference key="object" ref="533732100"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="670927311"/>
+              <reference ref="896153998"/>
             </object>
             <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4274</int>
-            <reference key="object" ref="670927311"/>
-            <reference key="parent" ref="809192538"/>
+            <int key="objectID">4424</int>
+            <reference key="object" ref="896153998"/>
+            <reference key="parent" ref="533732100"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">3648</int>
-            <reference key="object" ref="828315098"/>
+            <int key="objectID">3652</int>
+            <reference key="object" ref="474770834"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="577223856"/>
+              <reference ref="706599501"/>
             </object>
             <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4275</int>
-            <reference key="object" ref="577223856"/>
-            <reference key="parent" ref="828315098"/>
+            <int key="objectID">4279</int>
+            <reference key="object" ref="706599501"/>
+            <reference key="parent" ref="474770834"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4758</int>
-            <reference key="object" ref="471121744"/>
+            <int key="objectID">4701</int>
+            <reference key="object" ref="202538583"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="912813065"/>
-              <reference ref="47797873"/>
-              <reference ref="145580725"/>
-              <reference ref="369193052"/>
-              <reference ref="659976200"/>
             </object>
-            <reference key="parent" ref="0"/>
-            <string key="objectName">MainWindowTitle</string>
+            <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4765</int>
-            <reference key="object" ref="912813065"/>
+            <int key="objectID">3654</int>
+            <reference key="object" ref="38046606"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="883426607"/>
+              <reference ref="424650866"/>
             </object>
-            <reference key="parent" ref="471121744"/>
+            <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4766</int>
-            <reference key="object" ref="883426607"/>
-            <reference key="parent" ref="912813065"/>
+            <int key="objectID">4281</int>
+            <reference key="object" ref="424650866"/>
+            <reference key="parent" ref="38046606"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4763</int>
-            <reference key="object" ref="47797873"/>
+            <int key="objectID">3649</int>
+            <reference key="object" ref="788281303"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="576041215"/>
+              <reference ref="180862414"/>
             </object>
-            <reference key="parent" ref="471121744"/>
+            <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4764</int>
-            <reference key="object" ref="576041215"/>
-            <reference key="parent" ref="47797873"/>
+            <int key="objectID">4276</int>
+            <reference key="object" ref="180862414"/>
+            <reference key="parent" ref="788281303"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4761</int>
-            <reference key="object" ref="145580725"/>
+            <int key="objectID">3651</int>
+            <reference key="object" ref="1023610457"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="887230843"/>
+              <reference ref="618891975"/>
             </object>
-            <reference key="parent" ref="471121744"/>
+            <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4762</int>
-            <reference key="object" ref="887230843"/>
-            <reference key="parent" ref="145580725"/>
+            <int key="objectID">4278</int>
+            <reference key="object" ref="618891975"/>
+            <reference key="parent" ref="1023610457"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4759</int>
-            <reference key="object" ref="369193052"/>
+            <int key="objectID">2789</int>
+            <reference key="object" ref="1051664676"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="1021277036"/>
+              <reference ref="844988869"/>
             </object>
-            <reference key="parent" ref="471121744"/>
+            <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4760</int>
-            <reference key="object" ref="1021277036"/>
-            <reference key="parent" ref="369193052"/>
+            <int key="objectID">4316</int>
+            <reference key="object" ref="844988869"/>
+            <reference key="parent" ref="1051664676"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4777</int>
-            <reference key="object" ref="659976200"/>
+            <int key="objectID">4671</int>
+            <reference key="object" ref="955174811"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="434038964"/>
+              <reference ref="717770677"/>
             </object>
-            <reference key="parent" ref="471121744"/>
+            <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4778</int>
-            <reference key="object" ref="434038964"/>
-            <reference key="parent" ref="659976200"/>
+            <int key="objectID">4672</int>
+            <reference key="object" ref="717770677"/>
+            <reference key="parent" ref="955174811"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4782</int>
-            <reference key="object" ref="340023688"/>
+            <int key="objectID">4419</int>
+            <reference key="object" ref="714984330"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="455992720"/>
+              <reference ref="317272906"/>
             </object>
             <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4783</int>
-            <reference key="object" ref="455992720"/>
-            <reference key="parent" ref="340023688"/>
+            <int key="objectID">4420</int>
+            <reference key="object" ref="317272906"/>
+            <reference key="parent" ref="714984330"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4811</int>
-            <reference key="object" ref="573351300"/>
+            <int key="objectID">2208</int>
+            <reference key="object" ref="291209196"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="934868203"/>
+              <reference ref="482976610"/>
             </object>
-            <reference key="parent" ref="782168084"/>
+            <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4812</int>
-            <reference key="object" ref="934868203"/>
+            <int key="objectID">4313</int>
+            <reference key="object" ref="482976610"/>
+            <reference key="parent" ref="291209196"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">4434</int>
+            <reference key="object" ref="354459361"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="941707687"/>
-              <reference ref="121176173"/>
-              <reference ref="209966631"/>
-              <reference ref="684252018"/>
-              <reference ref="565518714"/>
-              <reference ref="637375703"/>
-              <reference ref="964422047"/>
-              <reference ref="680183792"/>
-              <reference ref="518087256"/>
-              <reference ref="783946407"/>
+              <reference ref="187033403"/>
             </object>
-            <reference key="parent" ref="573351300"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4813</int>
-            <reference key="object" ref="941707687"/>
-            <reference key="parent" ref="934868203"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4814</int>
-            <reference key="object" ref="121176173"/>
-            <reference key="parent" ref="934868203"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4816</int>
-            <reference key="object" ref="209966631"/>
-            <reference key="parent" ref="934868203"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4817</int>
-            <reference key="object" ref="684252018"/>
-            <reference key="parent" ref="934868203"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4818</int>
-            <reference key="object" ref="565518714"/>
-            <reference key="parent" ref="934868203"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4819</int>
-            <reference key="object" ref="637375703"/>
-            <reference key="parent" ref="934868203"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4820</int>
-            <reference key="object" ref="964422047"/>
-            <reference key="parent" ref="934868203"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4821</int>
-            <reference key="object" ref="680183792"/>
-            <reference key="parent" ref="934868203"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">4822</int>
-            <reference key="object" ref="518087256"/>
-            <reference key="parent" ref="934868203"/>
+            <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4823</int>
-            <reference key="object" ref="783946407"/>
-            <reference key="parent" ref="934868203"/>
+            <int key="objectID">4435</int>
+            <reference key="object" ref="187033403"/>
+            <reference key="parent" ref="354459361"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4815</int>
-            <reference key="object" ref="957503076"/>
+            <int key="objectID">3571</int>
+            <reference key="object" ref="707945673"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="616704520"/>
+              <reference ref="826103597"/>
             </object>
-            <reference key="parent" ref="1050252183"/>
+            <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4824</int>
-            <reference key="object" ref="616704520"/>
+            <int key="objectID">4348</int>
+            <reference key="object" ref="826103597"/>
+            <reference key="parent" ref="707945673"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">4839</int>
+            <reference key="object" ref="340797151"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="740178575"/>
+              <reference ref="233000537"/>
             </object>
-            <reference key="parent" ref="957503076"/>
+            <reference key="parent" ref="129808516"/>
           </object>
           <object class="IBObjectRecord">
-            <int key="objectID">4825</int>
-            <reference key="object" ref="740178575"/>
-            <reference key="parent" ref="616704520"/>
+            <int key="objectID">4840</int>
+            <reference key="object" ref="233000537"/>
+            <reference key="parent" ref="340797151"/>
           </object>
         </object>
       </object>
@@ -11177,27 +10930,13 @@ LCAuLi4</string>
           <string>4766.IBPluginDependency</string>
           <string>4777.IBPluginDependency</string>
           <string>4778.IBPluginDependency</string>
-          <string>4782.IBPluginDependency</string>
-          <string>4782.IBViewBoundsToFrameTransform</string>
-          <string>4782.ImportedFromIB2</string>
-          <string>4783.IBPluginDependency</string>
-          <string>4811.IBPluginDependency</string>
-          <string>4812.IBEditorWindowLastContentRect</string>
-          <string>4812.IBPluginDependency</string>
-          <string>4813.IBPluginDependency</string>
-          <string>4814.IBPluginDependency</string>
           <string>4815.IBPluginDependency</string>
-          <string>4816.IBPluginDependency</string>
-          <string>4817.IBPluginDependency</string>
-          <string>4818.IBPluginDependency</string>
-          <string>4819.IBPluginDependency</string>
-          <string>4820.IBPluginDependency</string>
-          <string>4821.IBPluginDependency</string>
-          <string>4822.IBPluginDependency</string>
-          <string>4823.IBPluginDependency</string>
           <string>4824.IBEditorWindowLastContentRect</string>
           <string>4824.IBPluginDependency</string>
           <string>4825.IBPluginDependency</string>
+          <string>4839.CustomClassName</string>
+          <string>4839.IBPluginDependency</string>
+          <string>4840.IBPluginDependency</string>
           <string>5.IBPluginDependency</string>
           <string>5.ImportedFromIB2</string>
           <string>56.IBPluginDependency</string>
@@ -11482,7 +11221,7 @@ LCAuLi4</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{473, 299}, {222, 363}}</string>
+          <string>{{515, 299}, {222, 363}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11650,7 +11389,7 @@ LCAuLi4</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{329, 662}, {510, 20}}</string>
+          <string>{{329, 662}, {468, 20}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12040,26 +11779,10 @@ LCAuLi4</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+AAABDiwAAwmwAAA</bytes>
-          </object>
-          <boolean value="YES"/>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{429, 479}, {196, 183}}</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>{{684, 529}, {143, 23}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{684, 529}, {143, 23}}</string>
+          <string>VLCResizeControl</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12121,7 +11844,7 @@ LCAuLi4</string>
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">4835</int>
+      <int key="maxID">4841</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -16604,7 +16327,6 @@ LCAuLi4</string>
               <string>fwd:</string>
               <string>play:</string>
               <string>repeat:</string>
-              <string>resizeWindowAction:</string>
               <string>shuffle:</string>
               <string>stop:</string>
               <string>timeSliderAction:</string>
@@ -16626,7 +16348,6 @@ LCAuLi4</string>
               <string>id</string>
               <string>id</string>
               <string>id</string>
-              <string>id</string>
             </object>
           </object>
           <object class="NSMutableDictionary" key="actionInfosByName">
@@ -16641,7 +16362,6 @@ LCAuLi4</string>
               <string>fwd:</string>
               <string>play:</string>
               <string>repeat:</string>
-              <string>resizeWindowAction:</string>
               <string>shuffle:</string>
               <string>stop:</string>
               <string>timeSliderAction:</string>
@@ -16682,10 +16402,6 @@ LCAuLi4</string>
                 <string key="name">repeat:</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBActionInfo">
-                <string key="name">resizeWindowAction:</string>
-                <string key="candidateClassName">id</string>
-              </object>
               <object class="IBActionInfo">
                 <string key="name">shuffle:</string>
                 <string key="candidateClassName">id</string>
@@ -16728,7 +16444,7 @@ LCAuLi4</string>
               <string>o_playlist_table</string>
               <string>o_progress_bar</string>
               <string>o_repeat_btn</string>
-              <string>o_resize_btn</string>
+              <string>o_resize_view</string>
               <string>o_right_split_view</string>
               <string>o_search_fld</string>
               <string>o_shuffle_btn</string>
@@ -16807,7 +16523,7 @@ LCAuLi4</string>
               <string>o_playlist_table</string>
               <string>o_progress_bar</string>
               <string>o_repeat_btn</string>
-              <string>o_resize_btn</string>
+              <string>o_resize_view</string>
               <string>o_right_split_view</string>
               <string>o_search_fld</string>
               <string>o_shuffle_btn</string>
@@ -16894,7 +16610,7 @@ LCAuLi4</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBToOneOutletInfo">
-                <string key="name">o_resize_btn</string>
+                <string key="name">o_resize_view</string>
                 <string key="candidateClassName">id</string>
               </object>
               <object class="IBToOneOutletInfo">
@@ -17061,6 +16777,11 @@ LCAuLi4</string>
           <string key="superclassName">NSView</string>
           <reference key="sourceIdentifier" ref="919687584"/>
         </object>
+        <object class="IBPartialClassDescription">
+          <string key="className">VLCResizeControl</string>
+          <string key="superclassName">NSImageView</string>
+          <reference key="sourceIdentifier" ref="444352063"/>
+        </object>
         <object class="IBPartialClassDescription">
           <string key="className">VLCTimeField</string>
           <string key="superclassName">NSTextField</string>

diff --git a/extras/package/macosx/Resources/mainwindow_dark/window-resize.png b/extras/package/macosx/Resources/mainwindow_dark/window-resize.png
new file mode 100644 (file)
index 0000000..94a10af
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/window-resize.png differ

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 493d7698a5a256e0f6f0047f8976612fe867c89b..fcc0bf3b1c5faeef62aeec7ab6ef3ade7ecef4d0 100644 (file)
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -150,6 +150,7 @@
                CC0433D213B28C8C00D7D52E /* spref_cone_Interface_64.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0433CC13B28C8C00D7D52E /* spref_cone_Interface_64.png */; };
                CC0433D313B28C8C00D7D52E /* spref_cone_Subtitles_64.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0433CD13B28C8C00D7D52E /* spref_cone_Subtitles_64.png */; };
                CC0433D413B28C8C00D7D52E /* spref_cone_Video_64.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0433CE13B28C8C00D7D52E /* spref_cone_Video_64.png */; };
+               CC11373514A7921A005DF2F3 /* window-resize.png in Resources */ = {isa = PBXBuildFile; fileRef = CC11373414A7921A005DF2F3 /* window-resize.png */; };
                CC2DB09A14A7550D0050A055 /* window-close-on.png in Resources */ = {isa = PBXBuildFile; fileRef = CC2DB09114A7550D0050A055 /* window-close-on.png */; };
                CC2DB09B14A7550D0050A055 /* window-close-over.png in Resources */ = {isa = PBXBuildFile; fileRef = CC2DB09214A7550D0050A055 /* window-close-over.png */; };
                CC2DB09C14A7550D0050A055 /* window-close.png in Resources */ = {isa = PBXBuildFile; fileRef = CC2DB09314A7550D0050A055 /* window-close.png */; };
@@ -430,6 +431,7 @@
                CC0CD0E013DE0EAE00B0D90D /* PXSourceList.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PXSourceList.m; path = ../../../modules/gui/macosx/PXSourceList.m; sourceTree = "<group>"; };
                CC0CD0E113DE0EAE00B0D90D /* PXSourceListDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PXSourceListDataSource.h; path = ../../../modules/gui/macosx/PXSourceListDataSource.h; sourceTree = "<group>"; };
                CC0CD0E213DE0EAE00B0D90D /* PXSourceListDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PXSourceListDelegate.h; path = ../../../modules/gui/macosx/PXSourceListDelegate.h; sourceTree = "<group>"; };
+               CC11373414A7921A005DF2F3 /* window-resize.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "window-resize.png"; path = "Resources/mainwindow_dark/window-resize.png"; sourceTree = "<group>"; };
                CC1941240B9C1F8400635F6B /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; };
                CC1C41D00D9BAD7F002728FA /* noart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = noart.png; path = Resources/noart.png; sourceTree = "<group>"; };
                CC2DB09114A7550D0050A055 /* window-close-on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "window-close-on.png"; path = "Resources/mainwindow_dark/window-close-on.png"; sourceTree = "<group>"; };
@@ -826,6 +828,7 @@
                                CC2DB09414A7550D0050A055 /* window-minimize-on.png */,
                                CC2DB09514A7550D0050A055 /* window-minimize-over.png */,
                                CC2DB09614A7550D0050A055 /* window-minimize.png */,
+                               CC11373414A7921A005DF2F3 /* window-resize.png */,
                                CC2DB09714A7550D0050A055 /* window-zoom-on.png */,
                                CC2DB09814A7550D0050A055 /* window-zoom-over.png */,
                                CC2DB09914A7550D0050A055 /* window-zoom.png */,
@@ -1352,6 +1355,7 @@
                                CC6FA91914A78AE700353C5F /* window-fullscreen-on.png in Resources */,
                                CC6FA91A14A78AE700353C5F /* window-fullscreen-over.png in Resources */,
                                CC6FA91B14A78AE700353C5F /* window-fullscreen.png in Resources */,
+                               CC11373514A7921A005DF2F3 /* window-resize.png in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index 67ee648397cc896b439283ed99dd67e8d7c2f942..449fa4e51d8758ebcbe6e203c816df0e2a796c2d 100644 (file)
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -69,6 +69,7 @@
 
     IBOutlet VLCFSPanel *o_fspanel;
     IBOutlet id o_titlebar_view;
+    IBOutlet id o_resize_view;
 
     BOOL b_dark_interface;
     BOOL b_nativeFullscreenMode;

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 5c8cb399c619f85e80ae62d0d48178cf4a10051f..f8dd3db905819899a4c74d0aeccc150a6c918f78 100644 (file)
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -76,6 +76,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     {
 #ifdef MAC_OS_X_VERSION_10_7
         styleMask = NSBorderlessWindowMask | NSResizableWindowMask;
+        [o_resize_view removeFromSuperviewWithoutNeedingDisplay];
 #else
         styleMask = NSBorderlessWindowMask;
 #endif
@@ -239,7 +240,10 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [self setExcludedFromWindowsMenu: YES];
     [self setAcceptsMouseMovedEvents: YES];
     // Set that here as IB seems to be buggy
-    [self setContentMinSize:NSMakeSize(500., 288.)];
+    if (b_dark_interface)
+        [self setContentMinSize:NSMakeSize(500., (288. + [o_titlebar_view frame].size.height))];
+    else
+        [self setContentMinSize:NSMakeSize(500., 288.)];
     [self setTitle: _NS("VLC media player")];
     [o_playlist_btn setEnabled:NO];
     o_temp_view = [[NSView alloc] init];

diff --git a/modules/gui/macosx/MainWindowTitle.h b/modules/gui/macosx/MainWindowTitle.h
index 405ce429a6564619915a7cb3312e8ebbba09a6dc..125e882f405a54187610a28a9e74bd2dc0ce4c82 100644 (file)
--- a/modules/gui/macosx/MainWindowTitle.h
+++ b/modules/gui/macosx/MainWindowTitle.h
@@ -48,3 +48,9 @@
 {
 }
 @end
+
+@interface VLCResizeControl : NSImageView
+{
+}
+
+@end

diff --git a/modules/gui/macosx/MainWindowTitle.m b/modules/gui/macosx/MainWindowTitle.m
index 1b73cd7a884f9a82a4616337316f4158104d9b4f..ffcd9317e8d28529548bbe385fc7b9c9b3bd8ed2 100644 (file)
--- a/modules/gui/macosx/MainWindowTitle.m
+++ b/modules/gui/macosx/MainWindowTitle.m
@@ -132,3 +132,32 @@
 }
 
 @end
+
+@implementation VLCResizeControl
+
+- (void)mouseDragged:(NSEvent *)theEvent
+{
+    NSRect windowFrame = [[self window] frame];
+    CGFloat deltaX, deltaY, oldOriginY;
+    deltaX = [theEvent deltaX];
+    deltaY = [theEvent deltaY];
+    oldOriginY = windowFrame.origin.y;
+
+    windowFrame.origin.y = (oldOriginY + windowFrame.size.height) - (windowFrame.size.height + deltaY);
+    windowFrame.size.width += deltaX;
+    windowFrame.size.height += deltaY;
+
+    NSSize winMinSize = [self window].minSize;
+    if (windowFrame.size.width < winMinSize.width)
+        windowFrame.size.width = winMinSize.width;
+
+    if (windowFrame.size.height < winMinSize.height)
+    {
+        windowFrame.size.height = winMinSize.height;
+        windowFrame.origin.y = oldOriginY;
+    }
+
+    [[self window] setFrame: windowFrame display: YES animate: NO];
+}
+
+@end