[vlc-commits] macosx: fixed progress bar position (refs #5742)

[Felix Paul Kühne]

vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Dec 30 20:46:16 2011 +0100| [3f94b00d1cd4b4c976f988a9fa5b463b9017b6d0] | committer: Jean-Baptiste Kempf

macosx: fixed progress bar position (refs #5742)
(cherry picked from commit 0af518010617f407761b25933d78b56783e5d072)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=3f94b00d1cd4b4c976f988a9fa5b463b9017b6d0
---

 .../macosx/Resources/English.lproj/MainMenu.xib    |   30 ++++++++++----------
 modules/gui/macosx/MainWindow.m                    |    3 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
index b0ea3d4..fa9e65f 100644
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
@@ -21,14 +21,14 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="21"/>
-      <integer value="29"/>
-      <integer value="4722"/>
-      <integer value="4596"/>
+      <integer value="4895"/>
       <integer value="1617"/>
+      <integer value="4596"/>
+      <integer value="4756"/>
       <integer value="2730"/>
-      <integer value="4895"/>
+      <integer value="4722"/>
       <integer value="915"/>
+      <integer value="29"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -622,6 +622,16 @@
               <int key="NSvFlags">290</int>
               <object class="NSMutableArray" key="NSSubviews">
                 <bool key="EncodedWithXMLCoder">YES</bool>
+                <object class="NSProgressIndicator" id="664576649">
+                  <reference key="NSNextResponder" ref="129808516"/>
+                  <int key="NSvFlags">-2147482334</int>
+                  <object class="NSPSMatrix" key="NSDrawMatrix"/>
+                  <string key="NSFrame">{{217, 13}, {185, 12}}</string>
+                  <reference key="NSSuperview" ref="129808516"/>
+                  <int key="NSViewLayerContentsRedrawPolicy">2</int>
+                  <int key="NSpiFlags">16650</int>
+                  <double key="NSMaxValue">100</double>
+                </object>
                 <object class="NSImageView" id="884724451">
                   <reference key="NSNextResponder" ref="129808516"/>
                   <int key="NSvFlags">289</int>
@@ -1059,16 +1069,6 @@
                   </object>
                   <bool key="NSEditable">YES</bool>
                 </object>
-                <object class="NSProgressIndicator" id="664576649">
-                  <reference key="NSNextResponder" ref="129808516"/>
-                  <int key="NSvFlags">-2147482334</int>
-                  <object class="NSPSMatrix" key="NSDrawMatrix"/>
-                  <string key="NSFrame">{{219, 12}, {180, 12}}</string>
-                  <reference key="NSSuperview" ref="129808516"/>
-                  <int key="NSViewLayerContentsRedrawPolicy">2</int>
-                  <int key="NSpiFlags">16650</int>
-                  <double key="NSMaxValue">100</double>
-                </object>
                 <object class="NSButton" id="809192538">
                   <reference key="NSNextResponder" ref="129808516"/>
                   <int key="NSvFlags">260</int>
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 8a2da1a..de69241 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -263,7 +263,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
         moveItem( o_volume_track_view );
         moveItem( o_volume_down_btn );
         moveItem( o_time_fld );
-        moveItem( o_time_sld_background );
         #undef moveItem
 
         #define enlargeItem( item ) \
@@ -522,11 +521,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
         if ([o_video_view isHidden] && [o_playlist_btn isEnabled]) {
             [o_split_view setHidden: YES];
             [o_video_view setHidden: NO];
+            NSLog( @"showing pl" );
         }
         else
         {
             [o_video_view setHidden: YES];
             [o_split_view setHidden: NO];
+            NSLog( @"show vout" );
         }
     }
     else