From 4c9c10f46015f8697fd21d8f9de26d18779de4d6 Mon Sep 17 00:00:00 2001
From: Titus Tscharntke <titi_ger@users.sourceforge.net>
Date: Sat, 3 Apr 2010 17:17:15 +0000
Subject: [PATCH] size 16 font fix ( more a hack ) server port is displayed in
 join/options ConsoleTimeout in ini raised to 20

---
 mk/linux/glest.ini                            |  2 +-
 source/glest_game/global/core_data.cpp        |  9 +--
 .../glest_game/menu/menu_state_join_game.cpp  | 29 ++++++--
 source/glest_game/menu/menu_state_join_game.h |  3 +
 source/glest_game/menu/menu_state_options.cpp | 72 +++++++++++--------
 source/glest_game/menu/menu_state_options.h   |  4 ++
 6 files changed, 77 insertions(+), 42 deletions(-)

diff --git a/mk/linux/glest.ini b/mk/linux/glest.ini
index 428770dc8..902a7f4e1 100644
--- a/mk/linux/glest.ini
+++ b/mk/linux/glest.ini
@@ -11,7 +11,7 @@ AutoTest=false
 CheckGlCaps=true
 ColorBits=32
 ConsoleMaxLines=10
-ConsoleTimeout=10
+ConsoleTimeout=20
 DayTime=1000
 DebugLogFile=debug.log
 DebugMode=false
diff --git a/source/glest_game/global/core_data.cpp b/source/glest_game/global/core_data.cpp
index 95ea0fd6c..94e24b576 100644
--- a/source/glest_game/global/core_data.cpp
+++ b/source/glest_game/global/core_data.cpp
@@ -89,12 +89,6 @@ void CoreData::load(){
 	displayFont->setType(displayFontName);
 	displayFont->setSize(displayFontSize);
 
-	menuFontSmall=displayFont;
-	menuFontNormal=displayFont;
-	menuFontBig=displayFont;
-	menuFontVeryBig=displayFont;
-	consoleFont=displayFont;
-
 	//menu fonts
 	string menuFontNameSmallPrefix= config.getString("FontMenuNormalPrefix");
 	string menuFontNameSmallPostfix= config.getString("FontMenuNormalPostfix");
@@ -134,7 +128,7 @@ void CoreData::load(){
 	//console font
 	string consoleFontNamePrefix= config.getString("FontConsolePrefix");
 	string consoleFontNamePostfix= config.getString("FontConsolePostfix");
-	int consoleFontNameSize=computeFontSize(16);
+	int consoleFontNameSize=computeFontSize(12);
 	string consoleFontName= consoleFontNamePrefix+intToStr(consoleFontNameSize)+consoleFontNamePostfix;
 	consoleFont= renderer.newFont(rsGlobal);
 	consoleFont->setType(consoleFontName);
@@ -163,6 +157,7 @@ int CoreData::computeFontSize(int size){
 		rs= 12;
 	}
 	SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fontsize orginal %d      calculated:%d   \n",__FILE__,__FUNCTION__,__LINE__,size,rs);
+	if(rs==16) rs=15; // 16 is invisible in linux, nobody knows why!?!
 	return rs;
 }
 
diff --git a/source/glest_game/menu/menu_state_join_game.cpp b/source/glest_game/menu/menu_state_join_game.cpp
index c524f9739..473e32208 100644
--- a/source/glest_game/menu/menu_state_join_game.cpp
+++ b/source/glest_game/menu/menu_state_join_game.cpp
@@ -62,27 +62,42 @@ MenuStateJoinGame::MenuStateJoinGame(Program *program, MainMenu *mainMenu, bool
 	buttonAutoFindServers.setText(lang.get("FindLANGames"));
 
 	//server type label
-	labelServerType.init(330, 460);
+	labelServerType.init(330, 490);
 	labelServerType.setText(lang.get("ServerType") + ":");
 
 	//server type list box
-	listBoxServerType.init(465, 460);
+	listBoxServerType.init(465, 490);
 	listBoxServerType.pushBackItem(lang.get("ServerTypeNew"));
 	listBoxServerType.pushBackItem(lang.get("ServerTypePrevious"));
 
 	//server label
-	labelServer.init(330, 430);
+	labelServer.init(330, 460);
 	labelServer.setText(lang.get("Server") + ": ");
 
 	//server listbox
-	listBoxServers.init(465, 430);
-
+	listBoxServers.init(465, 460);
 	for(int i= 0; i<servers.getPropertyCount(); ++i){
 		listBoxServers.pushBackItem(servers.getKey(i));
 	}
 
 	//server ip
-	labelServerIp.init(465, 430);
+	labelServerIp.init(465, 460);
+
+
+	// server port
+	labelServerPortLabel.init(330,430);
+	labelServerPortLabel.setText(lang.get("ServerPort"));
+	labelServerPort.init(465,430);
+	string port=intToStr(config.getInt("ServerPort"));
+	if(port!="61357"){
+		port=port +" ("+lang.get("NonStandardPort")+")";
+	}
+	else{
+		port=port +" ("+lang.get("StandardPort")+")";
+	}	
+	labelServerPort.setText(port);
+
+
 
 	labelStatus.init(330, 400);
 	labelStatus.setText("");
@@ -234,6 +249,8 @@ void MenuStateJoinGame::render(){
 	renderer.renderLabel(&labelServerType);
 	renderer.renderLabel(&labelStatus);
 	renderer.renderLabel(&labelInfo);
+	renderer.renderLabel(&labelServerPort);
+	renderer.renderLabel(&labelServerPortLabel);
 	renderer.renderButton(&buttonConnect);
 	renderer.renderButton(&buttonAutoFindServers);
 	renderer.renderListBox(&listBoxServerType);
diff --git a/source/glest_game/menu/menu_state_join_game.h b/source/glest_game/menu/menu_state_join_game.h
index e9565f991..5a523a8fa 100644
--- a/source/glest_game/menu/menu_state_join_game.h
+++ b/source/glest_game/menu/menu_state_join_game.h
@@ -44,6 +44,9 @@ private:
 	GraphicLabel labelInfo;
 	GraphicListBox listBoxServerType;
 	GraphicListBox listBoxServers;
+	GraphicLabel labelServerPort;
+	GraphicLabel labelServerPortLabel;
+
 
 	bool connected;
 	int playerIndex;
diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp
index 6c4b92b27..ab3222344 100644
--- a/source/glest_game/menu/menu_state_options.cpp
+++ b/source/glest_game/menu/menu_state_options.cpp
@@ -107,6 +107,20 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
 	labelPlayerName.init(leftColumnStart,leftline);
 	labelPlayerName.setText(config.getString("NetPlayerName",Socket::getHostName().c_str()));
 	leftline-=30;
+	
+	// server port
+	labelServerPortLabel.init(leftLabelStart,leftline);
+	labelServerPortLabel.setText(lang.get("ServerPort"));
+	labelServerPort.init(leftColumnStart,leftline);
+	string port=intToStr(config.getInt("ServerPort"));
+	if(port!="61357"){
+		port=port +" ("+lang.get("NonStandardPort")+")";
+	}
+	else{
+		port=port +" ("+lang.get("StandardPort")+")";
+	}
+	
+	labelServerPort.setText(port);
 
 	leftline-=30;
 	labelVideoSection.init(leftLabelStart+captionOffset, leftline);
@@ -324,34 +338,36 @@ void MenuStateOptions::render(){
 	}
 	else
 	{
-	renderer.renderButton(&buttonOk);
-	renderer.renderButton(&buttonAbort);
-	renderer.renderButton(&buttonAutoConfig);
-	renderer.renderListBox(&listBoxLang);
-	renderer.renderListBox(&listBoxShadows);
-	renderer.renderListBox(&listBoxTextures3D);
-	renderer.renderListBox(&listBoxUnitParticles);
-	renderer.renderListBox(&listBoxLights);
-	renderer.renderListBox(&listBoxFilter);
-	renderer.renderListBox(&listBoxVolumeFx);
-	renderer.renderListBox(&listBoxVolumeAmbient);
-	renderer.renderListBox(&listBoxVolumeMusic);
-	renderer.renderLabel(&labelLang);
-	renderer.renderLabel(&labelPlayerNameLabel);
-	renderer.renderLabel(&labelPlayerName);
-	renderer.renderLabel(&labelShadows);
-	renderer.renderLabel(&labelTextures3D);
-	renderer.renderLabel(&labelUnitParticles);
-	renderer.renderLabel(&labelLights);
-	renderer.renderLabel(&labelFilter);
-	renderer.renderLabel(&labelVolumeFx);
-	renderer.renderLabel(&labelVolumeAmbient);
-	renderer.renderLabel(&labelVolumeMusic);
-	renderer.renderLabel(&labelVideoSection);
-	renderer.renderLabel(&labelAudioSection);
-	renderer.renderLabel(&labelMiscSection);
-	renderer.renderLabel(&labelScreenModes);
-	renderer.renderListBox(&listBoxScreenModes);
+		renderer.renderButton(&buttonOk);
+		renderer.renderButton(&buttonAbort);
+		renderer.renderButton(&buttonAutoConfig);
+		renderer.renderListBox(&listBoxLang);
+		renderer.renderListBox(&listBoxShadows);
+		renderer.renderListBox(&listBoxTextures3D);
+		renderer.renderListBox(&listBoxUnitParticles);
+		renderer.renderListBox(&listBoxLights);
+		renderer.renderListBox(&listBoxFilter);
+		renderer.renderListBox(&listBoxVolumeFx);
+		renderer.renderListBox(&listBoxVolumeAmbient);
+		renderer.renderListBox(&listBoxVolumeMusic);
+		renderer.renderLabel(&labelLang);
+		renderer.renderLabel(&labelPlayerNameLabel);
+		renderer.renderLabel(&labelPlayerName);
+		renderer.renderLabel(&labelShadows);
+		renderer.renderLabel(&labelTextures3D);
+		renderer.renderLabel(&labelUnitParticles);
+		renderer.renderLabel(&labelLights);
+		renderer.renderLabel(&labelFilter);
+		renderer.renderLabel(&labelVolumeFx);
+		renderer.renderLabel(&labelVolumeAmbient);
+		renderer.renderLabel(&labelVolumeMusic);
+		renderer.renderLabel(&labelVideoSection);
+		renderer.renderLabel(&labelAudioSection);
+		renderer.renderLabel(&labelMiscSection);
+		renderer.renderLabel(&labelScreenModes);
+		renderer.renderListBox(&listBoxScreenModes);
+		renderer.renderLabel(&labelServerPortLabel);
+		renderer.renderLabel(&labelServerPort);
 	}
 }
 
diff --git a/source/glest_game/menu/menu_state_options.h b/source/glest_game/menu/menu_state_options.h
index f51ec8861..e9bb7273b 100644
--- a/source/glest_game/menu/menu_state_options.h
+++ b/source/glest_game/menu/menu_state_options.h
@@ -47,6 +47,9 @@ private:
 	GraphicLabel labelPlayerName;
 	GraphicLabel labelPlayerNameLabel;
 	GraphicLabel *activeInputLabel;
+	GraphicLabel labelServerPort;
+	GraphicLabel labelServerPortLabel;
+	
 	
 	GraphicLabel labelScreenModes;
 	GraphicListBox listBoxScreenModes;
@@ -56,6 +59,7 @@ private:
 	GraphicLabel labelAudioSection;
 	GraphicLabel labelMiscSection;
 	
+	
 	GraphicMessageBox mainMessageBox;
 	int mainMessageBoxState;