From a12e9787e1e56de0e98dce23fadef4b294d7f6e3 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Wed, 20 Apr 2011 05:24:11 +0000
Subject: [PATCH] - moved progress bar beside return button

---
 source/glest_game/graphics/renderer.cpp    | 13 +++++++++++--
 source/glest_game/graphics/renderer.h      |  2 +-
 source/glest_game/menu/menu_state_mods.cpp | 10 ++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp
index eff5caae..04a4537d 100644
--- a/source/glest_game/graphics/renderer.cpp
+++ b/source/glest_game/graphics/renderer.cpp
@@ -4648,7 +4648,8 @@ void Renderer::renderArrow(const Vec3f &pos1, const Vec3f &pos2,
 	glEnd();
 }
 
-void Renderer::renderProgressBar(int size, int x, int y, Font2D *font, int customWidth, string prefixLabel) {
+void Renderer::renderProgressBar(int size, int x, int y, Font2D *font, int customWidth,
+		string prefixLabel,bool centeredText) {
 
     int currentSize     = size;
     int maxSize         = maxProgressBar;
@@ -4658,6 +4659,9 @@ void Renderer::renderProgressBar(int size, int x, int y, Font2D *font, int custo
             currentSize     = (int)((double)customWidth * ((double)size / 100.0));
         }
         maxSize         = customWidth;
+        if(maxSize <= 0) {
+        	maxSize = maxProgressBar;
+        }
     }
     if(prefixLabel != "") {
         renderText = prefixLabel + renderText;
@@ -4688,7 +4692,12 @@ void Renderer::renderProgressBar(int size, int x, int y, Font2D *font, int custo
 	//text
 	glColor3fv(defColor.ptr());
 	textRenderer->begin(font);
-	textRenderer->render(renderText.c_str(), x + maxSize / 2, y, true);
+	if(centeredText == true) {
+		textRenderer->render(renderText.c_str(), x + maxSize / 2, y, centeredText);
+	}
+	else {
+		textRenderer->render(renderText.c_str(), x, y, centeredText);
+	}
 	textRenderer->end();
 }
 
diff --git a/source/glest_game/graphics/renderer.h b/source/glest_game/graphics/renderer.h
index 1f9e64da..cd564cb8 100644
--- a/source/glest_game/graphics/renderer.h
+++ b/source/glest_game/graphics/renderer.h
@@ -433,7 +433,7 @@ public:
 
 	Texture2D *saveScreenToTexture(int x, int y, int width, int height);
 
-	void renderProgressBar(int size, int x, int y, Font2D *font,int customWidth=-1, string prefixLabel="");
+	void renderProgressBar(int size, int x, int y, Font2D *font,int customWidth=-1, string prefixLabel="", bool centeredText=true);
 
 	static Texture2D * findFactionLogoTexture(string logoFilename);
 	static Texture2D * preloadTexture(string logoFilename);
diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/glest_game/menu/menu_state_mods.cpp
index b46c698a..d6a0b83a 100644
--- a/source/glest_game/menu/menu_state_mods.cpp
+++ b/source/glest_game/menu/menu_state_mods.cpp
@@ -1660,6 +1660,9 @@ void MenuStateMods::showDesription(const ModInfo *modInfo) {
 	if(modInfo->imageUrl != "") {
 		cleanupPreviewTexture();
 	    string tempImage  = getPreviewImageFileForMod(modInfo);
+
+	    if(SystemFlags::VERBOSE_MODE_ENABLED) printf("### tempImage [%s] exists [%d]\n",tempImage.c_str(),fileExists(tempImage));
+
 	    if(tempImage != "" && fileExists(tempImage) == false) {
 	    	if(ftpClientThread != NULL) ftpClientThread->addFileToRequests(tempImage,modInfo->imageUrl);
 
@@ -1885,6 +1888,7 @@ void MenuStateMods::render() {
 		if(ftpClientThread != NULL && ftpClientThread->getProgressMutex() != NULL) ftpClientThread->getProgressMutex()->setOwnerId(mutexOwnerId);
         if(fileFTPProgressList.size() > 0) {
         	Lang &lang= Lang::getInstance();
+        	int xLocation = buttonReturn.getX() + buttonReturn.getW() + 20;
             int yLocation = buttonReturn.getY();
             for(std::map<string,pair<int,string> >::iterator iterMap = fileFTPProgressList.begin();
                 iterMap != fileFTPProgressList.end(); ++iterMap) {
@@ -1894,10 +1898,12 @@ void MenuStateMods::render() {
 
                 renderer.renderProgressBar(
                     iterMap->second.first,
-                    10,
+                    //10,
+                    //yLocation,
+                    xLocation,
                     yLocation,
                     CoreData::getInstance().getDisplayFontSmall(),
-                    350,progressLabelPrefix);
+                    350,progressLabelPrefix,false);
 
                 yLocation -= 10;
             }