From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Tue, 4 Aug 2009 16:38:24 +0000 (+0200)
Subject: macosx: minor ui changes
X-Git-Tag: 1.1.0-ff~4573
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0a88e0ece209603389a20733b5a8163612733b1d;p=vlc

macosx: minor ui changes
---

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
index c07a401f5c..daebc633ac 100644
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
@@ -8,11 +8,11 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="4375"/>
 			<integer value="235"/>
 			<integer value="3568"/>
-			<integer value="283"/>
 			<integer value="2199"/>
+			<integer value="4375"/>
+			<integer value="283"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -833,15 +833,6 @@
 									<reference key="NSOnImage" ref="464614658"/>
 									<reference key="NSMixedImage" ref="724706907"/>
 								</object>
-								<object class="NSMenuItem" id="229481215">
-									<reference key="NSMenu" ref="816567345"/>
-									<string key="NSTitle">Shuffle</string>
-									<string key="NSKeyEquiv">z</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="464614658"/>
-									<reference key="NSMixedImage" ref="724706907"/>
-								</object>
 								<object class="NSMenuItem" id="963561211">
 									<reference key="NSMenu" ref="816567345"/>
 									<bool key="NSIsDisabled">YES</bool>
@@ -852,6 +843,15 @@
 									<reference key="NSOnImage" ref="464614658"/>
 									<reference key="NSMixedImage" ref="724706907"/>
 								</object>
+								<object class="NSMenuItem" id="229481215">
+									<reference key="NSMenu" ref="816567345"/>
+									<string key="NSTitle">Shuffle</string>
+									<string key="NSKeyEquiv">z</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="464614658"/>
+									<reference key="NSMixedImage" ref="724706907"/>
+								</object>
 								<object class="NSMenuItem" id="1056015920">
 									<reference key="NSMenu" ref="816567345"/>
 									<string key="NSTitle">Repeat Item</string>
@@ -14010,7 +14010,7 @@ LCAuLi4</string>
 					<reference ref="5"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="5"/>
-					<string>{{358, 293}, {255, 393}}</string>
+					<string>{{487, 293}, {255, 393}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="5"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -14170,7 +14170,7 @@ LCAuLi4</string>
 					<reference ref="5"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="5"/>
-					<string>{{214, 686}, {468, 20}}</string>
+					<string>{{343, 686}, {468, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="5"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
index 5190d2bf5f..67a00ecf4c 100644
Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 02d3b66a30..bcb05d9263 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -501,10 +501,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
 - (IBAction)inputSlaveAction:(id)sender
 {
     if( sender == o_file_slave_ckbox )
-    {
         [o_file_slave_select_btn setEnabled: [o_file_slave_ckbox state]];
-        [o_file_slave_filename_txt setStringValue: @""];
-    }
     else
     {
         NSOpenPanel *o_open_panel;
@@ -517,13 +514,17 @@ static VLCOpen *_o_sharedMainInstance = nil;
                 [o_file_slave_path release];
             o_file_slave_path = [[o_open_panel filenames] objectAtIndex: 0];
             [o_file_slave_path retain];
-            NSFileWrapper *o_file_wrapper;
-            o_file_wrapper = [[NSFileWrapper alloc] initWithPath: [[o_open_panel filenames] objectAtIndex: 0]];
-            [o_file_slave_filename_txt setStringValue: [NSString stringWithFormat: @"\"%@\"", [o_file_wrapper preferredFilename]]];
         }
         else
             [o_file_slave_filename_txt setStringValue: @""];
     }
+    if( o_file_slave_path )
+    {
+        NSFileWrapper *o_file_wrapper;
+        o_file_wrapper = [[NSFileWrapper alloc] initWithPath: o_file_slave_path];
+        [o_file_slave_filename_txt setStringValue: [NSString stringWithFormat: @"\"%@\"", [o_file_wrapper preferredFilename]]];
+        [o_file_wrapper release];
+    }
 }
 
 - (void)openFileGeneric