Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- moved return button and progress bar to try to avoid console message overlap

This commit is contained in:
Mark Vejvoda 2011-04-20 05:48:33 +00:00
parent a12e9787e1
commit 257689ba07
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/glest_game/menu/menu_state_mods.cpp
View File

@ -137,9 +137,12 @@ MenuStateMods::MenuStateMods(Program *program, MainMenu *mainMenu) :
modDescrLabel.setText("description is empty"); modDescrLabel.setText("description is empty");
buttonReturn.registerGraphicComponent(containerName,"buttonReturn"); buttonReturn.registerGraphicComponent(containerName,"buttonReturn");
buttonReturn.init(450, returnLineY - 40, 125); buttonReturn.init(800, returnLineY - 30, 125);
buttonReturn.setText(lang.get("Return")); buttonReturn.setText(lang.get("Return"));
lineVerticalReturn.init(buttonReturn.getX() - 10, returnLineY-80, 5, 81);
lineVerticalReturn.setHorizontal(false);
buttonInstallTech.registerGraphicComponent(containerName,"buttonInstallTech"); buttonInstallTech.registerGraphicComponent(containerName,"buttonInstallTech");
buttonInstallTech.init(techInfoXPos + 40, installButtonYPos, 125); buttonInstallTech.init(techInfoXPos + 40, installButtonYPos, 125);
buttonInstallTech.setText(lang.get("Install")); buttonInstallTech.setText(lang.get("Install"));
@ -1753,6 +1756,7 @@ void MenuStateMods::render() {
renderer.renderLine(&lineHorizontal); renderer.renderLine(&lineHorizontal);
renderer.renderLine(&lineVertical); renderer.renderLine(&lineVertical);
renderer.renderLine(&lineReturn); renderer.renderLine(&lineReturn);
renderer.renderLine(&lineVerticalReturn);
renderer.renderButton(&buttonReturn); renderer.renderButton(&buttonReturn);
renderer.renderButton(&buttonInstallTech); renderer.renderButton(&buttonInstallTech);
@ -1888,12 +1892,12 @@ void MenuStateMods::render() {
if(ftpClientThread != NULL && ftpClientThread->getProgressMutex() != NULL) ftpClientThread->getProgressMutex()->setOwnerId(mutexOwnerId); if(ftpClientThread != NULL && ftpClientThread->getProgressMutex() != NULL) ftpClientThread->getProgressMutex()->setOwnerId(mutexOwnerId);
if(fileFTPProgressList.size() > 0) { if(fileFTPProgressList.size() > 0) {
Lang &lang= Lang::getInstance(); Lang &lang= Lang::getInstance();
int xLocation = buttonReturn.getX() + buttonReturn.getW() + 20; int xLocation = buttonReturn.getX();
int yLocation = buttonReturn.getY(); int yLocation = buttonReturn.getY() - 12;
for(std::map<string,pair<int,string> >::iterator iterMap = fileFTPProgressList.begin(); for(std::map<string,pair<int,string> >::iterator iterMap = fileFTPProgressList.begin();
iterMap != fileFTPProgressList.end(); ++iterMap) { iterMap != fileFTPProgressList.end(); ++iterMap) {
string progressLabelPrefix = lang.get("ModDownloading") + " " + iterMap->first + " "; string progressLabelPrefix = lang.get("ModDownloading") + " " + extractFileFromDirectoryPath(iterMap->first) + " ";
//if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\nRendering file progress with the following prefix [%s]\n",progressLabelPrefix.c_str()); //if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\nRendering file progress with the following prefix [%s]\n",progressLabelPrefix.c_str());
renderer.renderProgressBar( renderer.renderProgressBar(
@ -1903,7 +1907,7 @@ void MenuStateMods::render() {
xLocation, xLocation,
yLocation, yLocation,
CoreData::getInstance().getDisplayFontSmall(), CoreData::getInstance().getDisplayFontSmall(),
350,progressLabelPrefix,false); 185,progressLabelPrefix,false);
yLocation -= 10; yLocation -= 10;
} }

1
source/glest_game/menu/menu_state_mods.h
View File

@ -75,6 +75,7 @@ private:
GraphicLine lineHorizontal; GraphicLine lineHorizontal;
GraphicLine lineVertical; GraphicLine lineVertical;
GraphicLine lineReturn; GraphicLine lineReturn;
GraphicLine lineVerticalReturn;
GraphicMessageBox mainMessageBox; GraphicMessageBox mainMessageBox;
FTPMessageType mainMessageBoxState; FTPMessageType mainMessageBoxState;