Commit 66162d97 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: show the localized, intended to be user-facing encoding names instead...

macosx: show the localized, intended to be user-facing encoding names instead of the variable values to the user.

This way, s/he is never presented an empty menu item for the default value.

This also closes #7539 by preventing stringWithUTF8String calls with empty strings.
(cherry picked from commit d7246593be4f2484d13adaaf5bd8cbd4c8e5b812)

Conflicts:
	modules/gui/macosx/open.m
parent c2b7fa23
...@@ -323,14 +323,15 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -323,14 +323,15 @@ static VLCOpen *_o_sharedMainInstance = nil;
if( p_item ) if( p_item )
{ {
for( i_index = 0; p_item->ppsz_list && p_item->ppsz_list[i_index]; for (int i = 0; i < p_item->list_count; i++) {
i_index++ ) [o_file_sub_encoding_pop addItemWithTitle: _NS(p_item->list_text[i])];
{ [[o_file_sub_encoding_pop lastItem] setRepresentedObject:[NSString stringWithFormat:@"%s", p_item->list.psz[i]]];
[o_file_sub_encoding_pop addItemWithTitle: if (p_item->value.psz && !strcmp(p_item->value.psz, p_item->list.psz[i]))
[NSString stringWithUTF8String: p_item->ppsz_list[i_index]]]; [o_file_sub_encoding_pop selectItem: [o_file_sub_encoding_pop lastItem]];
} }
[o_file_sub_encoding_pop selectItemWithTitle:
[NSString stringWithUTF8String: p_item->value.psz]]; if ([o_file_sub_encoding_pop indexOfSelectedItem] < 0)
[o_file_sub_encoding_pop selectItemAtIndex:0];
} }
p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-align" ); p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-align" );
...@@ -389,8 +390,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -389,8 +390,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_options addObject: [NSString stringWithFormat: @"sub-fps=%f", [o_file_sub_fps floatValue]]]; [o_options addObject: [NSString stringWithFormat: @"sub-fps=%f", [o_file_sub_fps floatValue]]];
} }
[o_options addObject: [NSString stringWithFormat: [o_options addObject: [NSString stringWithFormat:
@"subsdec-encoding=%@", @"subsdec-encoding=%@", [[o_file_sub_encoding_pop selectedItem] representedObject]]];
[o_file_sub_encoding_pop titleOfSelectedItem]]];
[o_options addObject: [NSString stringWithFormat: [o_options addObject: [NSString stringWithFormat:
@"subsdec-align=%li", @"subsdec-align=%li",
[o_file_sub_align_pop indexOfSelectedItem]]]; [o_file_sub_align_pop indexOfSelectedItem]]];
......
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