Actually disabled Groolite by default due to upcoming changes in Growl.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4571 127b21dd-08f5-0310-b4b7-95ae10353056

src/Cocoa/Groolite.h

@@ -30,7 +30,6 @@ MA 02110-1301, USA.
 */
 
 #import <Cocoa/Cocoa.h>
-#import <Growl/Growl.h>
 
 @class GameController;
 
@@ -60,3 +59,12 @@ enum
 + (BOOL) isEnabled;
 
 @end
+
+
+/*
+	If 1, Groolite is enabled by default and visible in the settings UI.
+	
+	Turned off in beta 1.75.3 because Growl’s communications protocol will be
+	changing in the near future.
+*/
+#define GROOLITE_VISIBLE		0

src/Cocoa/Groolite.m

@@ -28,6 +28,7 @@ MA 02110-1301, USA.
 #import "GuiDisplayGen.h"
 #import "Universe.h"
 #import "PlayerEntityLegacyScriptEngine.h"
+#import "OOCollectionExtractors.h"
 
 static NSString * const kOOLogGrooliteError	= @"growl.error";
 static NSString * const kOOLogGrooliteDebug	= @"growl.debug";
@@ -258,7 +259,7 @@ static NSString * const kOOLogGrooliteDebug	= @"growl.debug";
 
 + (BOOL) isEnabled
 {
-	return ![[NSUserDefaults standardUserDefaults] oo_boolForKey:@"groolite-disable" defaultValue:NO];
+	return ![[NSUserDefaults standardUserDefaults] oo_boolForKey:@"groolite-disable" defaultValue:!GROOLITE_VISIBLE];
 }
 
 @end

src/Core/Entities/PlayerEntity.h

@@ -32,6 +32,11 @@ MA 02110-1301, USA.
 #import "OOTypes.h"
 #import "OOJSPropID.h"
 
+#if OOLITE_MAC_OS_X
+#import "Groolite.h"	// Needed for GROOLITE_VISIBLE.
+#endif
+
+
 @class GuiDisplayGen, OOTrumble, MyOpenGLView, HeadUpDisplay, ShipEntity;
 @class OOSound, OOSoundSource, OOSoundReferencePoint;
 @class OOJoystickManager, OOTexture, OOCamera;
@@ -109,7 +114,7 @@ enum
 	GUI_ROW_GAMEOPTIONS_AUTOSAVE,
 	GUI_ROW_GAMEOPTIONS_SPACER1,
 	GUI_ROW_GAMEOPTIONS_VOLUME,
-#if OOLITE_MAC_OS_X
+#if OOLITE_MAC_OS_X && GROOLITE_VISIBLE
 	GUI_ROW_GAMEOPTIONS_GROWL,
 #endif
 #if OOLITE_SPEECH_SYNTH

src/Core/Entities/PlayerEntity.m

@@ -5730,7 +5730,7 @@ static bool minShieldLevelPercentageInitialised = false;
 			[gui setColor:[OOColor grayColor] forRow:GUI_ROW(GAME,VOLUME)];
 		}
 		
-#if OOLITE_MAC_OS_X
+#if OOLITE_MAC_OS_X && GROOLITE_VISIBLE
 		// Growl priority control
 		{
 			if ([Groolite isEnabled])

src/Core/Entities/PlayerEntityControls.m

@@ -2389,7 +2389,7 @@ static NSTimeInterval	time_last_frame;
 	else
 		volumeControlPressed = NO;
 	
-#if OOLITE_MAC_OS_X
+#if OOLITE_MAC_OS_X && GROOLITE_VISIBLE
 	if ((guiSelectedRow == GUI_ROW(GAME,GROWL))&&([gameView isDown:gvArrowKeyRight]||[gameView isDown:gvArrowKeyLeft]))
 	{
 		if ([Groolite isEnabled] && (!leftRightKeyPressed || script_time > timeLastKeyPress + KEY_REPEAT_INTERVAL))

tools/fonttexgen/FontTextureView.m

@@ -134,7 +134,8 @@ static inline NSRect ScaleRect(NSRect rect, NSPoint scale)
 	// Originally hard-coded at 512x512 pixels, scale is used to transform magic numbers as appropriate.
 	NSPoint scale = { self.bounds.size.width / 512, self.bounds.size.height / 512 };
 	
-	NSFont *font = [NSFont fontWithName:@"Helvetica Bold" size:25.0 * scale.y];
+//	NSFont *font = [NSFont fontWithName:@"Helvetica Bold" size:25.0 * scale.y];
+	NSFont *font = [NSFont fontWithName:@"Play-Bold" size:25.0 * scale.y];
 	if (font == nil)  NSLog(@"Failed to find font!");
 	NSDictionary *attrs = [NSDictionary dictionaryWithObjectsAndKeys:font, NSFontAttributeName, [NSColor whiteColor], NSForegroundColorAttributeName, nil];
 	

tools/fonttexgen/fonttexgen.xcodeproj/project.pbxproj

@@ -159,7 +159,14 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "fonttexgen" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* fonttexgen */;
 			projectDirPath = "";
 			projectRoot = "";