[vlc-devel] commit: macosx: Removed the non-existing font-effect option ( quartztext only) ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Aug  6 02:06:27 2008 +0200| [dcfd3f4aad477a85aaa68e226d747e211403a9ec] | committer: Felix Paul Kühne 

macosx: Removed the non-existing font-effect option (quartztext only)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dcfd3f4aad477a85aaa68e226d747e211403a9ec
---

 .../English.lproj/Preferences.nib/classes.nib      |    2 --
 .../English.lproj/Preferences.nib/info.nib         |   13 +++++++------
 .../English.lproj/Preferences.nib/keyedobjects.nib |  Bin 94782 -> 93176 bytes
 modules/gui/macosx/simple_prefs.h                  |    2 --
 modules/gui/macosx/simple_prefs.m                  |    5 +----
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
index 8705ae9..fc63378 100644
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
@@ -124,8 +124,6 @@
                 "o_osd_font_btn" = id;
                 "o_osd_font_color_pop" = id;
                 "o_osd_font_color_txt" = id;
-                "o_osd_font_effect_pop" = id;
-                "o_osd_font_effect_txt" = id;
                 "o_osd_font_fld" = id;
                 "o_osd_font_size_pop" = id;
                 "o_osd_font_size_txt" = id;
diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
index c80c450..f5aa4b4 100644
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
@@ -13,7 +13,7 @@
 		<key>2440</key>
 		<string>345 307 590 389 0 0 1280 778 </string>
 		<key>2523</key>
-		<string>345 319 590 373 0 0 1280 778 </string>
+		<string>345 348 590 343 0 0 1280 778 </string>
 		<key>2562</key>
 		<string>345 219 590 505 0 0 1280 778 </string>
 		<key>2668</key>
@@ -27,13 +27,14 @@
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>2562</integer>
-		<integer>2311</integer>
-		<integer>2265</integer>
-		<integer>1530</integer>
+		<integer>2677</integer>
 		<integer>2330</integer>
 		<integer>2668</integer>
-		<integer>2677</integer>
+		<integer>2523</integer>
+		<integer>1530</integer>
+		<integer>2562</integer>
+		<integer>2265</integer>
+		<integer>2311</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>9E17</string>
diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
index 42e1208..dfbfb5c 100644
Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 06d7f66..d02ebae 100644
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -102,8 +102,6 @@
     IBOutlet id o_osd_font_btn;
     IBOutlet id o_osd_font_color_pop;
     IBOutlet id o_osd_font_color_txt;
-    IBOutlet id o_osd_font_effect_pop;
-    IBOutlet id o_osd_font_effect_txt;
     IBOutlet id o_osd_font_fld;
     IBOutlet id o_osd_font_size_pop;
     IBOutlet id o_osd_font_size_txt;
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 174e6c3..1a2c914 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -88,7 +88,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     if( base )
         [o_temp_str appendString: [NSString stringWithUTF8String: base]];
     else
-        o_temp_str = @"Unset";
+        o_temp_str = _NS("Not Set");
     return o_temp_str;
 }
 
@@ -266,7 +266,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     [o_osd_font_box setTitle: _NS("Display Settings")];
     [o_osd_font_btn setTitle: _NS("Browse...")];
     [o_osd_font_color_txt setStringValue: _NS("Font Color")];
-    [o_osd_font_effect_txt setStringValue: _NS("Effect")];
     [o_osd_font_size_txt setStringValue: _NS("Font Size")];
     [o_osd_font_txt setStringValue: _NS("Font")];
     [o_osd_lang_box setTitle: _NS("Subtitle Languages")];
@@ -570,7 +569,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
     [self setupButton: o_osd_font_color_pop forIntList: "quartztext-color"];
     [self setupButton: o_osd_font_size_pop forIntList: "quartztext-rel-fontsize"];
-    //[self setupButton: o_osd_font_effect_pop forIntList: "quartztext-effect"];
 
     /********************
      * hotkeys settings *
@@ -912,7 +910,6 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
 
         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 );