Commit d4c99c42 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

Mac OS X gui: Fix tabs.

parent 85c5cbfd
...@@ -224,7 +224,7 @@ static VLCsFilters *_o_sharedInstance = nil; ...@@ -224,7 +224,7 @@ static VLCsFilters *_o_sharedInstance = nil;
- (void)showAsPanel - (void)showAsPanel
{ {
char * psz_temp; char * psz_temp;
/* called from intf.m */ /* called from intf.m */
[o_sfilter_win displayIfNeeded]; [o_sfilter_win displayIfNeeded];
...@@ -247,12 +247,12 @@ static VLCsFilters *_o_sharedInstance = nil; ...@@ -247,12 +247,12 @@ static VLCsFilters *_o_sharedInstance = nil;
} }
} }
[o_marq_color_pop selectItemAtIndex: x]; [o_marq_color_pop selectItemAtIndex: x];
if( psz_temp = config_GetPsz( p_intf, "time-format" ) ) if( psz_temp = config_GetPsz( p_intf, "time-format" ) )
[o_marq_marq_fld setStringValue: [NSString stringWithUTF8String: psz_temp]]; [o_marq_marq_fld setStringValue: [NSString stringWithUTF8String: psz_temp]];
else else
[o_marq_marq_fld setStringValue: _NS(@"Not Available")]; [o_marq_marq_fld setStringValue: _NS(@"Not Available")];
[o_marq_opaque_sld setIntValue: config_GetInt( p_intf, "marq-opacity")]; [o_marq_opaque_sld setIntValue: config_GetInt( p_intf, "marq-opacity")];
[o_marq_pos_radio selectCellWithTag: config_GetInt( p_intf, "marq-position" )]; [o_marq_pos_radio selectCellWithTag: config_GetInt( p_intf, "marq-position" )];
/* FIXME: the following line doesn't work with "-1", which is the default /* FIXME: the following line doesn't work with "-1", which is the default
* value */ * value */
...@@ -278,10 +278,10 @@ static VLCsFilters *_o_sharedInstance = nil; ...@@ -278,10 +278,10 @@ static VLCsFilters *_o_sharedInstance = nil;
} }
} }
[o_time_color_pop selectItemAtIndex: x]; [o_time_color_pop selectItemAtIndex: x];
if( psz_temp = config_GetPsz( p_intf, "time-format" ) ) if( psz_temp = config_GetPsz( p_intf, "time-format" ) )
[o_time_stamp_fld setStringValue: [NSString stringWithUTF8String: psz_temp]]; [o_time_stamp_fld setStringValue: [NSString stringWithUTF8String: psz_temp]];
else else
[o_time_stamp_fld setStringValue: _NS(@"Not Available")]; [o_time_stamp_fld setStringValue: _NS(@"Not Available")];
[o_time_opaque_sld setIntValue: config_GetInt( p_intf, "time-opacity")]; [o_time_opaque_sld setIntValue: config_GetInt( p_intf, "time-opacity")];
/* FIXME: the following line doesn't work with "-1", which is the default /* FIXME: the following line doesn't work with "-1", which is the default
...@@ -340,8 +340,8 @@ static VLCsFilters *_o_sharedInstance = nil; ...@@ -340,8 +340,8 @@ static VLCsFilters *_o_sharedInstance = nil;
if (returnCode == NSOKButton) if (returnCode == NSOKButton)
{ {
[o_logo_image_fld setStringValue: [sheet filename]]; [o_logo_image_fld setStringValue: [sheet filename]];
/* Make sure we notice that */ /* Make sure we notice that */
[self propertyChanged: o_logo_image_fld]; [self propertyChanged: o_logo_image_fld];
} }
} }
...@@ -509,15 +509,15 @@ static VLCsFilters *_o_sharedInstance = nil; ...@@ -509,15 +509,15 @@ static VLCsFilters *_o_sharedInstance = nil;
config_PutInt( p_intf, "logo-position", val.i_int ); config_PutInt( p_intf, "logo-position", val.i_int );
} }
else if ( sender == o_logo_image_fld ) else if ( sender == o_logo_image_fld )
{ {
val.psz_string = [[o_logo_image_fld stringValue] cString]; val.psz_string = [[o_logo_image_fld stringValue] cString];
if( p_input ) if( p_input )
var_Set( p_input->p_libvlc_global, "logo-file", val ); var_Set( p_input->p_libvlc_global, "logo-file", val );
config_PutPsz( p_intf, "logo-file", val.psz_string ); config_PutPsz( p_intf, "logo-file", val.psz_string );
} }
else else
{ {
/* just in case */ /* just in case */
msg_Err( p_intf, "couldn't find any action for sender" ); msg_Err( p_intf, "couldn't find any action for sender" );
......
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