- update fonts for console when language is toggled

source/glest_game/game/console.cpp

@@ -43,6 +43,11 @@ Console::Console() {
 	stringToHighlight="";
 }
 
+void Console::resetFonts() {
+	font=CoreData::getInstance().getConsoleFont();
+	font3D=CoreData::getInstance().getConsoleFont3D();
+}
+
 void Console::addStdMessage(const string &s) {
 	addLine(Lang::getInstance().get(s));
 }

source/glest_game/game/console.h

@@ -88,7 +88,7 @@ public:
 	void setFont3D(Font3D *font)	{this->font3D= font;}
     string getStringToHighlight() const { return stringToHighlight;}
     void setStringToHighlight(string stringToHighlight) { this->stringToHighlight = stringToHighlight;}
-
+    void resetFonts();
 
 	
 	string getLine(int i) const;

source/glest_game/main/battle_end.cpp

@@ -67,6 +67,8 @@ BattleEnd::BattleEnd(Program *program, const Stats *stats,ProgramState *originSt
 
 void BattleEnd::reloadUI() {
 	Lang &lang= Lang::getInstance();
+
+	console.resetFonts();
 	buttonExit.setText(lang.get("Exit"));
 	mainMessageBox.init(lang.get("Yes"), lang.get("No"));
 

source/glest_game/menu/main_menu.cpp

@@ -264,4 +264,8 @@ void MenuState::consoleAddLine(string line) {
 	console.addLine(line);
 }
 
+void MenuState::reloadUI() {
+	console.resetFonts();
+}
+
 }}//end namespace

source/glest_game/menu/main_menu.h

@@ -122,7 +122,7 @@ public:
 
 	virtual bool isInSpecialKeyCaptureEvent() { return false; }
 	virtual void consoleAddLine(string line);
-	virtual void reloadUI() {};
+	virtual void reloadUI();
 };
 
 }}//end namespace

source/glest_game/menu/menu_state_connected_game.cpp

@@ -528,6 +528,7 @@ void MenuStateConnectedGame::reloadUI() {
 	Config &config = Config::getInstance();
 	Lang &lang= Lang::getInstance();
 
+	console.resetFonts();
 	mainMessageBox.init(lang.get("Ok"));
 	ftpMessageBox.init(lang.get("Yes"),lang.get("No"));
 

source/glest_game/menu/menu_state_custom_game.cpp

@@ -635,6 +635,8 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
 void MenuStateCustomGame::reloadUI() {
 	Lang &lang= Lang::getInstance();
     Config &config = Config::getInstance();
+
+    console.resetFonts();
 	mainMessageBox.init(lang.get("Ok"));
 
 	vector<string> teamItems, controlItems, results , rMultiplier;

source/glest_game/menu/menu_state_graphic_info.cpp

@@ -80,6 +80,7 @@ MenuStateGraphicInfo::MenuStateGraphicInfo(Program *program, MainMenu *mainMenu)
 void MenuStateGraphicInfo::reloadUI() {
 	Lang &lang= Lang::getInstance();
 
+	console.resetFonts();
 	buttonReturn.setText(lang.get("Return"));
 
 	labelMoreInfo.setFont(CoreData::getInstance().getDisplayFontSmall());

source/glest_game/menu/menu_state_join_game.cpp

@@ -162,9 +162,10 @@ MenuStateJoinGame::MenuStateJoinGame(Program *program, MainMenu *mainMenu, bool
 
 void MenuStateJoinGame::reloadUI() {
 	Lang &lang= Lang::getInstance();
-
 	Config &config= Config::getInstance();
 
+	console.resetFonts();
+
 	buttonReturn.setText(lang.get("Return"));
 	buttonConnect.setText(lang.get("Connect"));
 	buttonCreateGame.setText(lang.get("HostGame"));

source/glest_game/menu/menu_state_keysetup.cpp

@@ -162,6 +162,7 @@ MenuStateKeysetup::MenuStateKeysetup(Program *program, MainMenu *mainMenu,
 void MenuStateKeysetup::reloadUI() {
 	Lang &lang= Lang::getInstance();
 
+	console.resetFonts();
 	labelTitle.setFont(CoreData::getInstance().getMenuFontBig());
 	labelTitle.setFont3D(CoreData::getInstance().getMenuFontBig3D());
 	labelTitle.setText(lang.get("Keyboardsetup"));

source/glest_game/menu/menu_state_masterserver.cpp

@@ -315,6 +315,7 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen
 void MenuStateMasterserver::reloadUI() {
 	Lang &lang= Lang::getInstance();
 
+	console.resetFonts();
 	consoleIRC.setFont(CoreData::getInstance().getMenuFontNormal());
 	consoleIRC.setFont3D(CoreData::getInstance().getMenuFontNormal3D());
 

source/glest_game/menu/menu_state_mods.cpp

@@ -307,6 +307,7 @@ MenuStateMods::MenuStateMods(Program *program, MainMenu *mainMenu) :
 void MenuStateMods::reloadUI() {
 	Lang &lang= Lang::getInstance();
 
+	console.resetFonts();
 	keyTechScrollBarTitle1.setText(lang.get("TechTitle1"));
 	keyTechScrollBarTitle1.setFont(CoreData::getInstance().getMenuFontBig());
 	keyTechScrollBarTitle1.setFont3D(CoreData::getInstance().getMenuFontBig3D());

source/glest_game/menu/menu_state_options.cpp

@@ -523,6 +523,7 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu):
 void MenuStateOptions::reloadUI() {
 	Lang &lang= Lang::getInstance();
 
+	console.resetFonts();
 	mainMessageBox.init(lang.get("Ok"));
 
 	labelAudioSection.setFont(CoreData::getInstance().getMenuFontVeryBig());

source/glest_game/menu/menu_state_root.cpp

@@ -94,6 +94,9 @@ MenuStateRoot::MenuStateRoot(Program *program, MainMenu *mainMenu):
 
 void MenuStateRoot::reloadUI() {
 	Lang &lang= Lang::getInstance();
+
+	console.resetFonts();
+
 	if(EndsWith(glestVersionString, "-dev") == false){
 		labelVersion.setText(glestVersionString);
 	}
@@ -108,6 +111,7 @@ void MenuStateRoot::reloadUI() {
 	buttonExit.setText(lang.get("Exit"));
 
 	mainMessageBox.init(lang.get("Yes"), lang.get("No"));
+	console.resetFonts();
 
 	GraphicComponent::reloadFontsForRegisterGraphicComponents(containerName);
 }

source/glest_game/menu/menu_state_scenario.cpp

@@ -113,6 +113,7 @@ MenuStateScenario::MenuStateScenario(Program *program, MainMenu *mainMenu, const
 void MenuStateScenario::reloadUI() {
 	Lang &lang= Lang::getInstance();
 
+	console.resetFonts();
 	mainMessageBox.init(lang.get("Ok"));
 	labelInfo.setFont(CoreData::getInstance().getMenuFontNormal());
 	labelInfo.setFont3D(CoreData::getInstance().getMenuFontNormal3D());