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

a bit more readable mods menu

This commit is contained in:
filux 2015-02-06 01:22:12 +01:00
parent e3d968257d
commit e139f1c9a9
3 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/glest_game/menu/menu_state_load_game.cpp
View File

@ -74,13 +74,13 @@ MenuStateLoadGame::MenuStateLoadGame(Program *program, MainMenu *mainMenu):
noSavedGamesLabel.setText(lang.getString("NoSavedGames")); noSavedGamesLabel.setText(lang.getString("NoSavedGames"));
savedGamesLabel.registerGraphicComponent(containerName,"savedGamesLabel"); savedGamesLabel.registerGraphicComponent(containerName,"savedGamesLabel");
savedGamesLabel.init(120, slotLinesYBase+slotsLineHeight+10); savedGamesLabel.init(150, slotLinesYBase+slotsLineHeight+10);
savedGamesLabel.setFont(CoreData::getInstance().getMenuFontBig()); savedGamesLabel.setFont(CoreData::getInstance().getMenuFontBig());
savedGamesLabel.setFont3D(CoreData::getInstance().getMenuFontBig3D()); savedGamesLabel.setFont3D(CoreData::getInstance().getMenuFontBig3D());
savedGamesLabel.setText(lang.getString("SavedGames")); savedGamesLabel.setText(lang.getString("SavedGames"));
infoHeaderLabel.registerGraphicComponent(containerName,"infoHeaderLabel"); infoHeaderLabel.registerGraphicComponent(containerName,"infoHeaderLabel");
infoHeaderLabel.init(650, slotLinesYBase+slotsLineHeight+10); infoHeaderLabel.init(600, slotLinesYBase+slotsLineHeight+10);
infoHeaderLabel.setFont(CoreData::getInstance().getMenuFontBig()); infoHeaderLabel.setFont(CoreData::getInstance().getMenuFontBig());
infoHeaderLabel.setFont3D(CoreData::getInstance().getMenuFontBig3D()); infoHeaderLabel.setFont3D(CoreData::getInstance().getMenuFontBig3D());
infoHeaderLabel.setText(lang.getString("SavegameInfo")); infoHeaderLabel.setText(lang.getString("SavegameInfo"));
@ -100,9 +100,9 @@ MenuStateLoadGame::MenuStateLoadGame(Program *program, MainMenu *mainMenu):
abortButton.setText(lang.getString("Abort")); abortButton.setText(lang.getString("Abort"));
xPos+=buttonWidth+xSpacing; xPos+=buttonWidth+xSpacing;
loadButton.registerGraphicComponent(containerName,"loadButton"); loadButton.registerGraphicComponent(containerName,"loadButton");
loadButton.init(xPos, yPos, buttonWidth); loadButton.init(xPos, yPos, buttonWidth+80);
loadButton.setText(lang.getString("LoadGame")); loadButton.setText(lang.getString("LoadGame"));
xPos+=buttonWidth+xSpacing; xPos+=buttonWidth+80+xSpacing;
deleteButton.registerGraphicComponent(containerName,"deleteButton"); deleteButton.registerGraphicComponent(containerName,"deleteButton");
deleteButton.init(xPos, yPos, buttonWidth); deleteButton.init(xPos, yPos, buttonWidth);
deleteButton.setText(lang.getString("Delete")); deleteButton.setText(lang.getString("Delete"));
@ -149,9 +149,9 @@ void MenuStateLoadGame::clearSlots() {
} }
void MenuStateLoadGame::listFiles() { void MenuStateLoadGame::listFiles() {
int keyButtonsXBase = 20; int keyButtonsXBase = 2;
int keyButtonsYBase = slotLinesYBase; int keyButtonsYBase = slotLinesYBase;
int keyButtonsWidth = 460; int keyButtonsWidth = 476;
int keyButtonsHeight = slotsLineHeight; int keyButtonsHeight = slotsLineHeight;
clearSlots(); clearSlots();

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

@ -78,6 +78,10 @@ MenuStateMods::MenuStateMods(Program *program, MainMenu *mainMenu) :
keyButtonsLineHeight = 20; keyButtonsLineHeight = 20;
keyButtonsHeight = 20; keyButtonsHeight = 20;
keyButtonsWidth = 200; keyButtonsWidth = 200;
keyButtonsWidthTech = keyButtonsWidth;
keyButtonsWidthMap = keyButtonsWidth + 15;
keyButtonsWidthTil = keyButtonsWidth - 5;
keyButtonsWidthScen = keyButtonsWidth + 20;
scrollListsYPos = 700; scrollListsYPos = 700;
listBoxLength = 200; listBoxLength = 200;
keyButtonsYBase = scrollListsYPos; keyButtonsYBase = scrollListsYPos;
@ -95,41 +99,41 @@ MenuStateMods::MenuStateMods(Program *program, MainMenu *mainMenu) :
mapPreviewTexture=NULL; mapPreviewTexture=NULL;
//create //create
techInfoXPos = 10; techInfoXPos = 5;
keyTechScrollBarTitle1.registerGraphicComponent(containerName,"keyTechScrollBarTitle1"); keyTechScrollBarTitle1.registerGraphicComponent(containerName,"keyTechScrollBarTitle1");
keyTechScrollBarTitle1.init(techInfoXPos,scrollListsYPos + 25,labelWidth,20); keyTechScrollBarTitle1.init(techInfoXPos + 5,scrollListsYPos + 30,labelWidth,20);
keyTechScrollBarTitle1.setText(lang.getString("TechTitle1")); keyTechScrollBarTitle1.setText(lang.getString("TechTitle1"));
keyTechScrollBarTitle1.setFont(CoreData::getInstance().getMenuFontBig()); keyTechScrollBarTitle1.setFont(CoreData::getInstance().getMenuFontBig());
keyTechScrollBarTitle1.setFont3D(CoreData::getInstance().getMenuFontBig3D()); keyTechScrollBarTitle1.setFont3D(CoreData::getInstance().getMenuFontBig3D());
keyTechScrollBarTitle2.registerGraphicComponent(containerName,"keyTechScrollBarTitle2"); keyTechScrollBarTitle2.registerGraphicComponent(containerName,"keyTechScrollBarTitle2");
keyTechScrollBarTitle2.init(techInfoXPos + 200,scrollListsYPos + 25,labelWidth,20); keyTechScrollBarTitle2.init(techInfoXPos - 10 + keyButtonsWidthTech,scrollListsYPos + 17,labelWidth,20);
keyTechScrollBarTitle2.setText(lang.getString("TechTitle2")); keyTechScrollBarTitle2.setText(lang.getString("TechTitle2"));
keyTechScrollBarTitle2.setFont(CoreData::getInstance().getMenuFontNormal()); keyTechScrollBarTitle2.setFont(CoreData::getInstance().getMenuFontNormal());
keyTechScrollBarTitle2.setFont3D(CoreData::getInstance().getMenuFontNormal3D()); keyTechScrollBarTitle2.setFont3D(CoreData::getInstance().getMenuFontNormal3D());
mapInfoXPos = 270; mapInfoXPos = 260;
keyMapScrollBarTitle1.registerGraphicComponent(containerName,"keyMapScrollBarTitle1"); keyMapScrollBarTitle1.registerGraphicComponent(containerName,"keyMapScrollBarTitle1");
keyMapScrollBarTitle1.init(mapInfoXPos,scrollListsYPos + 25,labelWidth,20); keyMapScrollBarTitle1.init(mapInfoXPos + 5,scrollListsYPos + 30,labelWidth,20);
keyMapScrollBarTitle1.setText(lang.getString("MapTitle1")); keyMapScrollBarTitle1.setText(lang.getString("MapTitle1"));
keyMapScrollBarTitle1.setFont(CoreData::getInstance().getMenuFontBig()); keyMapScrollBarTitle1.setFont(CoreData::getInstance().getMenuFontBig());
keyMapScrollBarTitle1.setFont3D(CoreData::getInstance().getMenuFontBig3D()); keyMapScrollBarTitle1.setFont3D(CoreData::getInstance().getMenuFontBig3D());
keyMapScrollBarTitle2.registerGraphicComponent(containerName,"keyMapScrollBarTitle2"); keyMapScrollBarTitle2.registerGraphicComponent(containerName,"keyMapScrollBarTitle2");
keyMapScrollBarTitle2.init(mapInfoXPos + 200,scrollListsYPos + 25,labelWidth,20); keyMapScrollBarTitle2.init(mapInfoXPos - 10 + keyButtonsWidthMap,scrollListsYPos + 17,labelWidth,20);
keyMapScrollBarTitle2.setText(lang.getString("MapTitle2")); keyMapScrollBarTitle2.setText(lang.getString("MapTitle2"));
keyMapScrollBarTitle2.setFont(CoreData::getInstance().getMenuFontNormal()); keyMapScrollBarTitle2.setFont(CoreData::getInstance().getMenuFontNormal());
keyMapScrollBarTitle2.setFont3D(CoreData::getInstance().getMenuFontNormal3D()); keyMapScrollBarTitle2.setFont3D(CoreData::getInstance().getMenuFontNormal3D());
tilesetInfoXPos = 530; tilesetInfoXPos = 530;
keyTilesetScrollBarTitle1.registerGraphicComponent(containerName,"keyTilesetScrollBarTitle1"); keyTilesetScrollBarTitle1.registerGraphicComponent(containerName,"keyTilesetScrollBarTitle1");
keyTilesetScrollBarTitle1.init(tilesetInfoXPos,scrollListsYPos + 25,labelWidth,20); keyTilesetScrollBarTitle1.init(tilesetInfoXPos + 5,scrollListsYPos + 30,labelWidth,20);
keyTilesetScrollBarTitle1.setText(lang.getString("TilesetTitle1")); keyTilesetScrollBarTitle1.setText(lang.getString("TilesetTitle1"));
keyTilesetScrollBarTitle1.setFont(CoreData::getInstance().getMenuFontBig()); keyTilesetScrollBarTitle1.setFont(CoreData::getInstance().getMenuFontBig());
keyTilesetScrollBarTitle1.setFont3D(CoreData::getInstance().getMenuFontBig3D()); keyTilesetScrollBarTitle1.setFont3D(CoreData::getInstance().getMenuFontBig3D());
scenarioInfoXPos = 760; scenarioInfoXPos = 755;
keyScenarioScrollBarTitle1.registerGraphicComponent(containerName,"keyScenarioScrollBarTitle1"); keyScenarioScrollBarTitle1.registerGraphicComponent(containerName,"keyScenarioScrollBarTitle1");
keyScenarioScrollBarTitle1.init(scenarioInfoXPos,scrollListsYPos + 25,labelWidth,20); keyScenarioScrollBarTitle1.init(scenarioInfoXPos,scrollListsYPos + 30,labelWidth,20);
keyScenarioScrollBarTitle1.setText(lang.getString("ScenarioTitle1")); keyScenarioScrollBarTitle1.setText(lang.getString("ScenarioTitle1"));
keyScenarioScrollBarTitle1.setFont(CoreData::getInstance().getMenuFontBig()); keyScenarioScrollBarTitle1.setFont(CoreData::getInstance().getMenuFontBig());
keyScenarioScrollBarTitle1.setFont3D(CoreData::getInstance().getMenuFontBig3D()); keyScenarioScrollBarTitle1.setFont3D(CoreData::getInstance().getMenuFontBig3D());
@ -145,7 +149,7 @@ MenuStateMods::MenuStateMods(Program *program, MainMenu *mainMenu) :
lineReturn.init(0, returnLineY); lineReturn.init(0, returnLineY);
modDescrLabel.registerGraphicComponent(containerName,"modDescrLabel"); modDescrLabel.registerGraphicComponent(containerName,"modDescrLabel");
modDescrLabel.init(50,installButtonYPos-60 - 20,450,20); modDescrLabel.init(15,installButtonYPos-60 - 20,450,20);
modDescrLabel.setWordWrap(true); modDescrLabel.setWordWrap(true);
modDescrLabel.setText("description is empty"); modDescrLabel.setText("description is empty");
@ -167,80 +171,80 @@ MenuStateMods::MenuStateMods(Program *program, MainMenu *mainMenu) :
int legendButtonY= buttonLineDownY-30; int legendButtonY= buttonLineDownY-30;
buttonInstalled.registerGraphicComponent(containerName,"buttonInstalled"); buttonInstalled.registerGraphicComponent(containerName,"buttonInstalled");
buttonInstalled.init(techInfoXPos, legendButtonY, 200); buttonInstalled.init(5, legendButtonY, 240);
buttonInstalled.setText(lang.getString("ModInstalled")); buttonInstalled.setText(" " + lang.getString("ModInstalled"));
buttonInstalled.setUseCustomTexture(true); buttonInstalled.setUseCustomTexture(true);
buttonInstalled.setCustomTexture(CoreData::getInstance().getOnServerInstalledTexture()); buttonInstalled.setCustomTexture(CoreData::getInstance().getOnServerInstalledTexture());
buttonInstalled.setEnabled(false); buttonInstalled.setEnabled(false);
buttonAvailable.registerGraphicComponent(containerName,"buttonAvailable"); buttonAvailable.registerGraphicComponent(containerName,"buttonAvailable");
buttonAvailable.init(tilesetInfoXPos, legendButtonY, 200); buttonAvailable.init(255, legendButtonY, 240);
buttonAvailable.setUseCustomTexture(true); buttonAvailable.setUseCustomTexture(true);
buttonAvailable.setCustomTexture(CoreData::getInstance().getOnServerTexture()); buttonAvailable.setCustomTexture(CoreData::getInstance().getOnServerTexture());
buttonAvailable.setText(lang.getString("ModAvailable")); buttonAvailable.setText(" " + lang.getString("ModAvailable"));
buttonOnlyLocal.registerGraphicComponent(containerName,"buttonOnlyLocal"); buttonOnlyLocal.registerGraphicComponent(containerName,"buttonOnlyLocal");
buttonOnlyLocal.init(mapInfoXPos, legendButtonY, 200); buttonOnlyLocal.init(505, legendButtonY, 240);
buttonOnlyLocal.setUseCustomTexture(true); buttonOnlyLocal.setUseCustomTexture(true);
buttonOnlyLocal.setCustomTexture(CoreData::getInstance().getNotOnServerTexture()); buttonOnlyLocal.setCustomTexture(CoreData::getInstance().getNotOnServerTexture());
buttonOnlyLocal.setText(lang.getString("ModOnlyLocal")); buttonOnlyLocal.setText(" " + lang.getString("ModOnlyLocal"));
buttonConflict.registerGraphicComponent(containerName,"buttonConflict"); buttonConflict.registerGraphicComponent(containerName,"buttonConflict");
buttonConflict.init(scenarioInfoXPos, legendButtonY, 200); buttonConflict.init(755, legendButtonY, 240);
buttonConflict.setUseCustomTexture(true); buttonConflict.setUseCustomTexture(true);
buttonConflict.setCustomTexture(CoreData::getInstance().getOnServerDifferentTexture()); buttonConflict.setCustomTexture(CoreData::getInstance().getOnServerDifferentTexture());
buttonConflict.setText(lang.getString("ModHasConflict")); buttonConflict.setText(" " + lang.getString("ModHasConflict"));
buttonInstallTech.registerGraphicComponent(containerName,"buttonInstallTech"); buttonInstallTech.registerGraphicComponent(containerName,"buttonInstallTech");
buttonInstallTech.init(techInfoXPos + 40, buttonLineUpY, 125); buttonInstallTech.init(techInfoXPos + 45, buttonLineUpY, 125);
buttonInstallTech.setText(lang.getString("Install")); buttonInstallTech.setText(lang.getString("Install"));
buttonRemoveTech.registerGraphicComponent(containerName,"buttonRemoveTech"); buttonRemoveTech.registerGraphicComponent(containerName,"buttonRemoveTech");
buttonRemoveTech.init(techInfoXPos + 40, buttonLineDownY, 125); buttonRemoveTech.init(techInfoXPos + 45, buttonLineDownY, 125);
buttonRemoveTech.setText(lang.getString("Remove")); buttonRemoveTech.setText(lang.getString("Remove"));
buttonInstallTileset.registerGraphicComponent(containerName,"buttonInstallTileset"); buttonInstallTileset.registerGraphicComponent(containerName,"buttonInstallTileset");
buttonInstallTileset.init(tilesetInfoXPos + 20, buttonLineUpY, 125); buttonInstallTileset.init(tilesetInfoXPos + 30, buttonLineUpY, 125);
buttonInstallTileset.setText(lang.getString("Install")); buttonInstallTileset.setText(lang.getString("Install"));
buttonRemoveTileset.registerGraphicComponent(containerName,"buttonRemoveTileset"); buttonRemoveTileset.registerGraphicComponent(containerName,"buttonRemoveTileset");
buttonRemoveTileset.init(tilesetInfoXPos + 20, buttonLineDownY, 125); buttonRemoveTileset.init(tilesetInfoXPos + 30, buttonLineDownY, 125);
buttonRemoveTileset.setText(lang.getString("Remove")); buttonRemoveTileset.setText(lang.getString("Remove"));
buttonInstallMap.registerGraphicComponent(containerName,"buttonInstallMap"); buttonInstallMap.registerGraphicComponent(containerName,"buttonInstallMap");
buttonInstallMap.init(mapInfoXPos + 40, buttonLineUpY, 125); buttonInstallMap.init(mapInfoXPos + 50, buttonLineUpY, 125);
buttonInstallMap.setText(lang.getString("Install")); buttonInstallMap.setText(lang.getString("Install"));
buttonRemoveMap.registerGraphicComponent(containerName,"buttonRemoveMap"); buttonRemoveMap.registerGraphicComponent(containerName,"buttonRemoveMap");
buttonRemoveMap.init(mapInfoXPos + 40, buttonLineDownY, 125); buttonRemoveMap.init(mapInfoXPos + 50, buttonLineDownY, 125);
buttonRemoveMap.setText(lang.getString("Remove")); buttonRemoveMap.setText(lang.getString("Remove"));
buttonInstallScenario.registerGraphicComponent(containerName,"buttonInstallScenario"); buttonInstallScenario.registerGraphicComponent(containerName,"buttonInstallScenario");
buttonInstallScenario.init(scenarioInfoXPos + 20, buttonLineUpY, 125); buttonInstallScenario.init(scenarioInfoXPos + 45, buttonLineUpY, 125);
buttonInstallScenario.setText(lang.getString("Install")); buttonInstallScenario.setText(lang.getString("Install"));
buttonRemoveScenario.registerGraphicComponent(containerName,"buttonRemoveScenario"); buttonRemoveScenario.registerGraphicComponent(containerName,"buttonRemoveScenario");
buttonRemoveScenario.init(scenarioInfoXPos + 20, buttonLineDownY, 125); buttonRemoveScenario.init(scenarioInfoXPos + 45, buttonLineDownY, 125);
buttonRemoveScenario.setText(lang.getString("Remove")); buttonRemoveScenario.setText(lang.getString("Remove"));
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
keyTilesetScrollBar.init(tilesetInfoXPos + keyButtonsWidth,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20); keyTilesetScrollBar.init(tilesetInfoXPos + keyButtonsWidthTil,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
keyTilesetScrollBar.setLength(listBoxLength); keyTilesetScrollBar.setLength(listBoxLength);
keyTilesetScrollBar.setElementCount(0); keyTilesetScrollBar.setElementCount(0);
keyTilesetScrollBar.setVisibleSize(keyButtonsToRender); keyTilesetScrollBar.setVisibleSize(keyButtonsToRender);
keyTilesetScrollBar.setVisibleStart(0); keyTilesetScrollBar.setVisibleStart(0);
keyTechScrollBar.init(techInfoXPos + keyButtonsWidth + labelWidth + 20,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20); keyTechScrollBar.init(techInfoXPos + keyButtonsWidthTech + labelWidth + 20,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
keyTechScrollBar.setLength(listBoxLength); keyTechScrollBar.setLength(listBoxLength);
keyTechScrollBar.setElementCount(0); keyTechScrollBar.setElementCount(0);
keyTechScrollBar.setVisibleSize(keyButtonsToRender); keyTechScrollBar.setVisibleSize(keyButtonsToRender);
keyTechScrollBar.setVisibleStart(0); keyTechScrollBar.setVisibleStart(0);
keyMapScrollBar.init(mapInfoXPos + keyButtonsWidth + labelWidth + 20,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20); keyMapScrollBar.init(mapInfoXPos + keyButtonsWidthMap + labelWidth + 20,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
keyMapScrollBar.setLength(listBoxLength); keyMapScrollBar.setLength(listBoxLength);
keyMapScrollBar.setElementCount(0); keyMapScrollBar.setElementCount(0);
keyMapScrollBar.setVisibleSize(keyButtonsToRender); keyMapScrollBar.setVisibleSize(keyButtonsToRender);
keyMapScrollBar.setVisibleStart(0); keyMapScrollBar.setVisibleStart(0);
keyScenarioScrollBar.init(scenarioInfoXPos + keyButtonsWidth,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20); keyScenarioScrollBar.init(scenarioInfoXPos + keyButtonsWidthScen,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
keyScenarioScrollBar.setLength(listBoxLength); keyScenarioScrollBar.setLength(listBoxLength);
keyScenarioScrollBar.setElementCount(0); keyScenarioScrollBar.setElementCount(0);
keyScenarioScrollBar.setVisibleSize(keyButtonsToRender); keyScenarioScrollBar.setVisibleSize(keyButtonsToRender);
@ -530,7 +534,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
ModInfo modinfo; ModInfo modinfo;
modinfo=tilesetCacheList[result]; modinfo=tilesetCacheList[result];
GraphicButton *button=new GraphicButton(); GraphicButton *button=new GraphicButton();
button->init(tilesetInfoXPos, keyButtonsYBase, keyButtonsWidth,keyButtonsHeight); button->init(tilesetInfoXPos, keyButtonsYBase, keyButtonsWidthTil,keyButtonsHeight);
button->setText(modinfo.name); button->setText(modinfo.name);
button->setUseCustomTexture(true); button->setUseCustomTexture(true);
button->setCustomTexture(CoreData::getInstance().getCustomTexture()); button->setCustomTexture(CoreData::getInstance().getCustomTexture());
@ -554,7 +558,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
bool alreadyHasTileset = (tilesetCacheList.find(tilesetName) != tilesetCacheList.end()); bool alreadyHasTileset = (tilesetCacheList.find(tilesetName) != tilesetCacheList.end());
if(alreadyHasTileset == false) { if(alreadyHasTileset == false) {
GraphicButton *button=new GraphicButton(); GraphicButton *button=new GraphicButton();
button->init(tilesetInfoXPos, keyButtonsYBase, keyButtonsWidth,keyButtonsHeight); button->init(tilesetInfoXPos, keyButtonsYBase, keyButtonsWidthTil,keyButtonsHeight);
button->setText(tilesetName); button->setText(tilesetName);
button->setUseCustomTexture(true); button->setUseCustomTexture(true);
button->setCustomTexture(CoreData::getInstance().getCustomTexture()); button->setCustomTexture(CoreData::getInstance().getCustomTexture());
@ -593,14 +597,14 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
modinfo=techCacheList[result]; modinfo=techCacheList[result];
GraphicButton *button=new GraphicButton(); GraphicButton *button=new GraphicButton();
button->init(techInfoXPos, keyButtonsYBase, keyButtonsWidth,keyButtonsHeight); button->init(techInfoXPos, keyButtonsYBase, keyButtonsWidthTech,keyButtonsHeight);
button->setText(modinfo.name); button->setText(modinfo.name);
button->setUseCustomTexture(true); button->setUseCustomTexture(true);
button->setCustomTexture(CoreData::getInstance().getCustomTexture()); button->setCustomTexture(CoreData::getInstance().getCustomTexture());
keyTechButtons.push_back(button); keyTechButtons.push_back(button);
GraphicLabel *label=new GraphicLabel(); GraphicLabel *label=new GraphicLabel();
label->init(techInfoXPos + keyButtonsWidth+10,keyButtonsYBase,labelWidth,20); label->init(techInfoXPos + keyButtonsWidthTech+10,keyButtonsYBase,labelWidth,20);
label->setText(modinfo.count); label->setText(modinfo.count);
labelsTech.push_back(label); labelsTech.push_back(label);
} }
@ -628,7 +632,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
findAll(techPath + techName + "/factions/*.", factions, false, false); findAll(techPath + techName + "/factions/*.", factions, false, false);
GraphicButton *button=new GraphicButton(); GraphicButton *button=new GraphicButton();
button->init(techInfoXPos, keyButtonsYBase, keyButtonsWidth,keyButtonsHeight); button->init(techInfoXPos, keyButtonsYBase, keyButtonsWidthTech,keyButtonsHeight);
button->setText(techName); button->setText(techName);
button->setUseCustomTexture(true); button->setUseCustomTexture(true);
button->setCustomTexture(CoreData::getInstance().getCustomTexture()); button->setCustomTexture(CoreData::getInstance().getCustomTexture());
@ -636,7 +640,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
int techFactionCount = (int)factions.size(); int techFactionCount = (int)factions.size();
GraphicLabel *label=new GraphicLabel(); GraphicLabel *label=new GraphicLabel();
label->init(techInfoXPos + keyButtonsWidth+10,keyButtonsYBase,labelWidth,20); label->init(techInfoXPos + keyButtonsWidthTech+10,keyButtonsYBase,labelWidth,20);
label->setText(intToStr(techFactionCount)); label->setText(intToStr(techFactionCount));
labelsTech.push_back(label); labelsTech.push_back(label);
} }
@ -668,14 +672,14 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
modinfo=mapCacheList[result]; modinfo=mapCacheList[result];
GraphicButton *button=new GraphicButton(); GraphicButton *button=new GraphicButton();
button->init(mapInfoXPos, keyButtonsYBase, keyButtonsWidth,keyButtonsHeight); button->init(mapInfoXPos, keyButtonsYBase, keyButtonsWidthMap,keyButtonsHeight);
button->setText(modinfo.name); button->setText(modinfo.name);
button->setUseCustomTexture(true); button->setUseCustomTexture(true);
button->setCustomTexture(CoreData::getInstance().getCustomTexture()); button->setCustomTexture(CoreData::getInstance().getCustomTexture());
keyMapButtons.push_back(button); keyMapButtons.push_back(button);
GraphicLabel *label=new GraphicLabel(); GraphicLabel *label=new GraphicLabel();
label->init(mapInfoXPos + keyButtonsWidth + 10,keyButtonsYBase,labelWidth,20); label->init(mapInfoXPos + keyButtonsWidthMap + 10,keyButtonsYBase,labelWidth,20);
label->setText(modinfo.count); label->setText(modinfo.count);
labelsMap.push_back(label); labelsMap.push_back(label);
} }
@ -703,7 +707,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
MapInfo mapInfo = loadMapInfo(mapPath); MapInfo mapInfo = loadMapInfo(mapPath);
GraphicButton *button=new GraphicButton(); GraphicButton *button=new GraphicButton();
button->init(mapInfoXPos, keyButtonsYBase, keyButtonsWidth,keyButtonsHeight); button->init(mapInfoXPos, keyButtonsYBase, keyButtonsWidthMap,keyButtonsHeight);
button->setText(mapName); button->setText(mapName);
button->setUseCustomTexture(true); button->setUseCustomTexture(true);
button->setCustomTexture(CoreData::getInstance().getCustomTexture()); button->setCustomTexture(CoreData::getInstance().getCustomTexture());
@ -711,7 +715,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
int mapPlayerCount = mapInfo.players; int mapPlayerCount = mapInfo.players;
GraphicLabel *label=new GraphicLabel(); GraphicLabel *label=new GraphicLabel();
label->init(mapInfoXPos + keyButtonsWidth + 10,keyButtonsYBase,labelWidth,20); label->init(mapInfoXPos + keyButtonsWidthMap + 10,keyButtonsYBase,labelWidth,20);
label->setText(intToStr(mapPlayerCount)); label->setText(intToStr(mapPlayerCount));
labelsMap.push_back(label); labelsMap.push_back(label);
} }
@ -742,7 +746,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
ModInfo modinfo; ModInfo modinfo;
modinfo=scenarioCacheList[result]; modinfo=scenarioCacheList[result];
GraphicButton *button=new GraphicButton(); GraphicButton *button=new GraphicButton();
button->init(scenarioInfoXPos, keyButtonsYBase, keyButtonsWidth,keyButtonsHeight); button->init(scenarioInfoXPos, keyButtonsYBase, keyButtonsWidthScen,keyButtonsHeight);
button->setText(modinfo.name); button->setText(modinfo.name);
button->setUseCustomTexture(true); button->setUseCustomTexture(true);
button->setCustomTexture(CoreData::getInstance().getCustomTexture()); button->setCustomTexture(CoreData::getInstance().getCustomTexture());
@ -771,7 +775,7 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
scenarioPath += scenarioName; scenarioPath += scenarioName;
GraphicButton *button=new GraphicButton(); GraphicButton *button=new GraphicButton();
button->init(scenarioInfoXPos, keyButtonsYBase, keyButtonsWidth,keyButtonsHeight); button->init(scenarioInfoXPos, keyButtonsYBase, keyButtonsWidthScen,keyButtonsHeight);
button->setText(scenarioName); button->setText(scenarioName);
button->setUseCustomTexture(true); button->setUseCustomTexture(true);
button->setCustomTexture(CoreData::getInstance().getCustomTexture()); button->setCustomTexture(CoreData::getInstance().getCustomTexture());
@ -787,25 +791,25 @@ void MenuStateMods::simpleTask(BaseThread *callingThread,void *userdata) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
keyTilesetScrollBar.init(tilesetInfoXPos + keyButtonsWidth,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20); keyTilesetScrollBar.init(tilesetInfoXPos + keyButtonsWidthTil,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
keyTilesetScrollBar.setLength(listBoxLength); keyTilesetScrollBar.setLength(listBoxLength);
keyTilesetScrollBar.setElementCount((int)keyTilesetButtons.size()); keyTilesetScrollBar.setElementCount((int)keyTilesetButtons.size());
keyTilesetScrollBar.setVisibleSize(keyButtonsToRender); keyTilesetScrollBar.setVisibleSize(keyButtonsToRender);
keyTilesetScrollBar.setVisibleStart(0); keyTilesetScrollBar.setVisibleStart(0);
keyTechScrollBar.init(techInfoXPos + keyButtonsWidth + labelWidth + 20,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20); keyTechScrollBar.init(techInfoXPos + keyButtonsWidthTech + labelWidth + 20,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
keyTechScrollBar.setLength(listBoxLength); keyTechScrollBar.setLength(listBoxLength);
keyTechScrollBar.setElementCount((int)keyTechButtons.size()); keyTechScrollBar.setElementCount((int)keyTechButtons.size());
keyTechScrollBar.setVisibleSize(keyButtonsToRender); keyTechScrollBar.setVisibleSize(keyButtonsToRender);
keyTechScrollBar.setVisibleStart(0); keyTechScrollBar.setVisibleStart(0);
keyMapScrollBar.init(mapInfoXPos + keyButtonsWidth + labelWidth + 20,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20); keyMapScrollBar.init(mapInfoXPos + keyButtonsWidthMap + labelWidth + 20,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
keyMapScrollBar.setLength(listBoxLength); keyMapScrollBar.setLength(listBoxLength);
keyMapScrollBar.setElementCount((int)keyMapButtons.size()); keyMapScrollBar.setElementCount((int)keyMapButtons.size());
keyMapScrollBar.setVisibleSize(keyButtonsToRender); keyMapScrollBar.setVisibleSize(keyButtonsToRender);
keyMapScrollBar.setVisibleStart(0); keyMapScrollBar.setVisibleStart(0);
keyScenarioScrollBar.init(scenarioInfoXPos + keyButtonsWidth,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20); keyScenarioScrollBar.init(scenarioInfoXPos + keyButtonsWidthScen,scrollListsYPos-listBoxLength+keyButtonsLineHeight,false,200,20);
keyScenarioScrollBar.setLength(listBoxLength); keyScenarioScrollBar.setLength(listBoxLength);
keyScenarioScrollBar.setElementCount((int)keyScenarioButtons.size()); keyScenarioScrollBar.setElementCount((int)keyScenarioButtons.size());
keyScenarioScrollBar.setVisibleSize(keyButtonsToRender); keyScenarioScrollBar.setVisibleSize(keyButtonsToRender);

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

@ -123,6 +123,10 @@ private:
int keyButtonsLineHeight; int keyButtonsLineHeight;
int keyButtonsHeight; int keyButtonsHeight;
int keyButtonsWidth; int keyButtonsWidth;
int keyButtonsWidthTech;
int keyButtonsWidthMap;
int keyButtonsWidthTil;
int keyButtonsWidthScen;
//Console console; //Console console;
bool showFullConsole; bool showFullConsole;