Skip to content

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

macosx: minor ui changes

parent bb830b76
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 19 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
View file @ 0a88e0ec
......@@ -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>
......
modules/gui/macosx/open.m
View file @ 0a88e0ec
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment