Typo

[vlc] / modules / gui / macosx / simple_prefs.m

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index fa6532af87ef15f90bf384921ed4d30c2f16d2b7..3f014dbb95acbbf26368b2d33c7805131ef9b7df 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -24,6 +24,7 @@
 #import "simple_prefs.h"
 #import "prefs.h"
 #import <vlc_keys.h>
+#import <vlc_interface.h>
 #import "misc.h"
 
 static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
@@ -176,7 +177,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     }
     else if( [o_itemIdent isEqual: VLCOSDSettingToolbarIdentifier] )
     {
-        CreateToolbarItem( _NS("Subtitles & OSD"), _NS("Subtitles & OSD Settings"), @"spref_cone_Subtitles_64", showOSDSettings );
+        CreateToolbarItem( _NS("Subtitles & OSD"), _NS("Subtitles & On Screen Display Settings"), @"spref_cone_Subtitles_64", showOSDSettings );
     }
     else if( [o_itemIdent isEqual: VLCInputSettingToolbarIdentifier] )
     {
@@ -293,7 +294,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
     [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
     [o_sprefs_cancel_btn setTitle: _NS("Cancel")];
-    [o_sprefs_reset_btn setTitle: _NS("Reset Preferences")];
+    [o_sprefs_reset_btn setTitle: _NS("Reset All")];
     [o_sprefs_save_btn setTitle: _NS("Save")];
     [o_sprefs_win setTitle: _NS("Preferences")];
 }
@@ -314,7 +315,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         if( p_item->ppsz_list_text[i] != NULL) \
             [object addItemWithTitle: _NS( p_item->ppsz_list_text[i] )]; \
         else \
-            [object addItemWithTitle: [NSString stringWithUTF8String: p_item->ppsz_list[i]]]; \
+            [object addItemWithTitle: [NSString stringWithUTF8String: p_item->ppsz_list[i] ?: ""]]; \
     } \
     if( p_item->value.i < [object numberOfItems] ) \
         [object selectItemAtIndex: p_item->value.i]; \
@@ -346,7 +347,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         \
         if( module_IsCapable( p_parser, p_item->psz_type ) ) \
         { \
-            [object addItemWithTitle: [NSString stringWithUTF8String: module_GetLongName( p_parser )]]; \
+            [object addItemWithTitle: [NSString stringWithUTF8String: module_GetLongName( p_parser ) ?: ""]]; \
             \
             if( p_item->value.psz && !strcmp( p_item->value.psz, module_GetObjName( p_parser ) ) ) \
                 [object selectItem: [object lastItem]]; \
@@ -378,7 +379,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
     SetupIntList( o_audio_dolby_pop, "force-dolby-surround" );
 
-    [o_audio_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "audio-language" )]];
+    [o_audio_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "audio-language" ) ?: ""]];
 
     [o_audio_headphone_ckb setState: config_GetInt( p_intf, "headphone-dolby" )];
     
@@ -392,8 +393,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     /* Last.FM is optional */
     if( module_Exists( p_intf, "audioscrobbler" ) )
     {
-        [o_audio_lastuser_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-username" )]];
-        [o_audio_lastpwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-password" )]];
+        [o_audio_lastuser_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-username" ) ?: ""]];
+        [o_audio_lastpwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-password" ) ?: ""]];
 
         if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
         {
@@ -439,15 +440,14 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     [o_video_device_pop selectItemAtIndex: 0];
     [o_video_device_pop selectItemWithTag: config_GetInt( p_intf, "macosx-vdev" )];
 
-    if( config_GetPsz( p_intf, "snapshot-path" ) != NULL )
-        [o_video_snap_folder_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-path" )]];
-    [o_video_snap_prefix_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-prefix" )]];
+    [o_video_snap_folder_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-path" ) ?: ""]];
+    [o_video_snap_prefix_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "snapshot-prefix" ) ?: ""]];
     [o_video_snap_seqnum_ckb setState: config_GetInt( p_intf, "snapshot-sequential" )];
     
     p_item = config_FindConfig( VLC_OBJECT(p_intf), "snapshot-format" );
     for( i = 0; p_item->ppsz_list[i] != nil; i++ )
     {
-        [o_video_snap_format_pop addItemWithTitle: [NSString stringWithUTF8String: p_item->ppsz_list[i]]];
+        [o_video_snap_format_pop addItemWithTitle: [NSString stringWithUTF8String: p_item->ppsz_list[i] ?: ""]];
         if( p_item->value.psz && !strcmp( p_item->value.psz, p_item->ppsz_list[i] ) )
             y = i;
     }
@@ -458,9 +458,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
      ***************************/
     [o_input_serverport_fld setIntValue: config_GetInt( p_intf, "server-port" )];
     if( config_GetPsz( p_intf, "http-proxy" ) != NULL )
-        [o_input_httpproxy_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy" )]];
+        [o_input_httpproxy_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy" ) ?: ""]];
     if( config_GetPsz( p_intf, "http-proxy" ) != NULL )
-        [o_input_httpproxypwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy-pwd" )]];
+        [o_input_httpproxypwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy-pwd" ) ?: ""]];
     [o_input_postproc_fld setIntValue: config_GetInt( p_intf, "ffmpeg-pp-q" )];
 
     SetupIntList( o_input_avi_pop, "avi-index" );
@@ -546,13 +546,13 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     }
     [o_osd_encoding_pop selectItemAtIndex: y];
     
-    [o_osd_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "sub-language" )]];
-    if( config_GetPsz( p_intf, "freetype-font" ) != NULL )
-        [o_osd_font_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "freetype-font" )]];
+    [o_osd_lang_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "sub-language" ) ?: ""]];
+    if( config_GetPsz( p_intf, "quartztext-font" ) != NULL )
+        [o_osd_font_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "quartztext-font" ) ?: ""]];
 
-    SetupIntList( o_osd_font_color_pop, "freetype-color" );
-    SetupIntList( o_osd_font_size_pop, "freetype-rel-fontsize" );
-    SetupIntList( o_osd_font_effect_pop, "freetype-effect" );
+    SetupIntList( o_osd_font_color_pop, "quartztext-color" );
+    SetupIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" );
+    //SetupIntList( o_osd_font_effect_pop, "quartztext-effect" );
 
     /********************
      * hotkeys settings *
@@ -616,7 +616,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         [[[VLCMain sharedInstance] getPreferences] showPrefs];
     }
     else
-        msg_Err( p_intf, "unknown buttonAction sender" );
+        msg_Warn( p_intf, "unknown buttonAction sender" );
 }
 
 - (void)sheetDidEnd:(NSWindow *)o_sheet 
@@ -692,6 +692,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the Interface settings using SimplePrefs (%i)", i );
+            intf_UserFatal( p_intf, false, _("Interface Settings not saved"),
+                        _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             i = 0;
         }
 
@@ -755,6 +757,9 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the Audio settings using SimplePrefs (%i)", i );
+            intf_UserFatal( p_intf, false, _("Audio Settings not saved"),
+                        _("An error occured while saving your settings via SimplePrefs (%i)."), i );
+            
             i = 0;
         }
         b_audioSettingChanged = NO;
@@ -787,6 +792,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the Video settings using SimplePrefs (%i)", i );
+            intf_UserFatal( p_intf, false, _("Video Settings not saved"),
+                        _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             i = 0;
         }
         b_videoSettingChanged = NO;
@@ -808,7 +815,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
         #define CaCi( name, int ) config_PutInt( p_intf, name, int * [[o_input_cachelevel_pop selectedItem] tag] )
         #define CaC( name ) CaCi( name, 1 )
-        msg_Dbg( p_intf, "Adjusting all cache values at: %i", [[o_input_cachelevel_pop selectedItem] tag] );
+        msg_Dbg( p_intf, "Adjusting all cache values to: %i", [[o_input_cachelevel_pop selectedItem] tag] );
         CaC( "udp-caching" );
         if( module_Exists (p_intf, "dvdread" ) )
         {
@@ -869,6 +876,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the Input settings using SimplePrefs (%i)", i );
+            intf_UserFatal( p_intf, false, _("Input Settings not saved"),
+                        _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             i = 0;
         }
         b_inputSettingChanged = NO;
@@ -885,17 +894,19 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
             config_PutPsz( p_intf, "subsdec-encoding", [[[o_osd_encoding_pop selectedItem] title] UTF8String] );
 
         config_PutPsz( p_intf, "sub-language", [[o_osd_lang_fld stringValue] UTF8String] );
-        config_PutPsz( p_intf, "freetype-font", [[o_osd_font_fld stringValue] UTF8String] );
+        config_PutPsz( p_intf, "quartztext-font", [[o_osd_font_fld stringValue] UTF8String] );
 
-        SaveIntList( o_osd_font_color_pop, "freetype-color" );
-        SaveIntList( o_osd_font_size_pop, "freetype-rel-fontsize" );
-        SaveIntList( o_osd_font_effect_pop, "freetype-effect" );
+        SaveIntList( o_osd_font_color_pop, "quartztext-color" );
+        SaveIntList( o_osd_font_size_pop, "quartztext-rel-fontsize" );
+        //SaveIntList( o_osd_font_effect_pop, "freetype-effect" );
 
         i = config_SaveConfigFile( p_intf, NULL );
 
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the OSD/Subtitle settings using SimplePrefs (%i)", i );
+            intf_UserFatal( p_intf, false, _("On Screen Display/Subtitle Settings not saved"),
+                        _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             i = 0;
         }
         b_osdSettingChanged = NO;
@@ -919,6 +930,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
         if( i != 0 )
         {
             msg_Err( p_intf, "An error occurred while saving the Hotkey settings using SimplePrefs (%i)", i );
+            intf_UserFatal( p_intf, false, _("Hotkeys not saved"),
+                        _("An error occured while saving your settings via SimplePrefs (%i)."), i );
             i = 0;
         }
         b_hotkeyChanged = NO;
@@ -968,7 +981,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
 - (void)showInterfaceSettings
 {
-    msg_Dbg( p_intf, "showing interface settings" );
     [self showSettingsForCategory: o_intf_view];
 }
 
@@ -999,7 +1011,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
 - (void)showAudioSettings
 {
-    msg_Dbg( p_intf, "showing audio settings" );
     [self showSettingsForCategory: o_audio_view];
 }
 
@@ -1045,7 +1056,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
 - (void)showVideoSettings
 {
-    msg_Dbg( p_intf, "showing video settings" );
     [self showSettingsForCategory: o_video_view];
 }
 
@@ -1073,7 +1083,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
 - (void)showOSDSettings
 {
-    msg_Dbg( p_intf, "showing OSD settings" );
     [self showSettingsForCategory: o_osd_view];
 }
 
@@ -1092,7 +1101,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
 - (void)showInputSettings
 {
-    msg_Dbg( p_intf, "showing Input Settings" );
     [self showSettingsForCategory: o_input_view];
 }
 
@@ -1147,7 +1155,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
 - (void)showHotkeySettings
 {
-    msg_Dbg( p_intf, "showing HotKey Settings" );
     [self showSettingsForCategory: o_hotkeys_view];
 }