mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-04 11:21:36 +02:00
Code Issues Projects Releases Wiki Activity

keysetup menu more readable and better fit to other options tabs

Browse Source
This commit is contained in:
filux
2015-02-06 01:20:00 +01:00
parent aca1f1f918
commit e3d968257d
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source/glest_game/menu/menu_state_keysetup.cpp
View File

@@ -39,6 +39,14 @@ MenuStateKeysetup::MenuStateKeysetup(Program *program, MainMenu *mainMenu,
MenuState(program, mainMenu, "config") MenuState(program, mainMenu, "config")
{ {
try { try {
keyButtonsLineHeight=30;
keyButtonsHeight=25;
keyButtonsWidth=400;
keyButtonsXBase=200;
keyButtonsYBase=200+400-keyButtonsLineHeight;
keyButtonsToRender=400/keyButtonsLineHeight;
int labelWidth=100;
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__);
containerName = "KeySetup"; containerName = "KeySetup";
@@ -48,7 +56,8 @@ MenuStateKeysetup::MenuStateKeysetup(Program *program, MainMenu *mainMenu,
hotkeyChar = SDLK_UNKNOWN; hotkeyChar = SDLK_UNKNOWN;
Lang &lang= Lang::getInstance(); Lang &lang= Lang::getInstance();
int buttonRowPos=80; int buttonStartPos=170;
int buttonRowPos=50;
if(this->parentUI==NULL){ if(this->parentUI==NULL){
int tabButtonWidth=200; int tabButtonWidth=200;
int tabButtonHeight=30; int tabButtonHeight=30;
@@ -87,21 +96,23 @@ MenuStateKeysetup::MenuStateKeysetup(Program *program, MainMenu *mainMenu,
} }
// header // header
labelTitle.registerGraphicComponent(containerName,"labelTitle"); labelTitle.registerGraphicComponent(containerName,"labelTitle");
labelTitle.init(360,670); labelTitle.init(375,650);
labelTitle.setFont(CoreData::getInstance().getMenuFontBig()); labelTitle.setFont(CoreData::getInstance().getMenuFontVeryBig());
labelTitle.setFont3D(CoreData::getInstance().getMenuFontBig3D()); labelTitle.setFont3D(CoreData::getInstance().getMenuFontVeryBig3D());
labelTitle.setText(lang.getString("Keyboardsetup")); labelTitle.setText(lang.getString("KeyboardsetupL"));
labelTestTitle.registerGraphicComponent(containerName,"labelTestTitle"); labelTestTitle.registerGraphicComponent(containerName,"labelTestTitle");
labelTestTitle.init(50,170); labelTestTitle.init(keyButtonsXBase,155);
labelTestTitle.setFont(CoreData::getInstance().getMenuFontBig()); labelTestTitle.setFont(CoreData::getInstance().getMenuFontNormal());
labelTestTitle.setFont3D(CoreData::getInstance().getMenuFontBig3D()); labelTestTitle.setFont3D(CoreData::getInstance().getMenuFontNormal3D());
labelTestTitle.setText(lang.getString("KeyboardsetupTest")); labelTestTitle.setText(lang.getString("KeyboardsetupTest"));
labelTestValue.registerGraphicComponent(containerName,"labelTestValue"); labelTestValue.registerGraphicComponent(containerName,"labelTestValue");
labelTestValue.init(50,140); labelTestValue.init(keyButtonsXBase,155-28);
labelTestValue.setFont(CoreData::getInstance().getMenuFontBig()); labelTestValue.setFont(CoreData::getInstance().getMenuFontBig());
labelTestValue.setFont3D(CoreData::getInstance().getMenuFontBig3D()); labelTestValue.setFont3D(CoreData::getInstance().getMenuFontBig3D());
labelTestValue.setRenderBackground(true);
labelTestValue.setMaxEditRenderWidth(keyButtonsWidth);
labelTestValue.setText(""); labelTestValue.setText("");
// mainMassegeBox // mainMassegeBox
@@ -116,27 +127,18 @@ MenuStateKeysetup::MenuStateKeysetup(Program *program, MainMenu *mainMenu,
keyScrollBar.setVisibleSize(keyButtonsToRender); keyScrollBar.setVisibleSize(keyButtonsToRender);
keyScrollBar.setVisibleStart(0); keyScrollBar.setVisibleStart(0);
// buttons // buttons
buttonOk.registerGraphicComponent(containerName,"buttonOk"); buttonOk.registerGraphicComponent(containerName,"buttonOk");
buttonOk.init(200, buttonRowPos, 100); buttonOk.init(buttonStartPos, buttonRowPos, 100);
buttonOk.setText(lang.getString("Save")); buttonOk.setText(lang.getString("Save"));
buttonDefaults.registerGraphicComponent(containerName,"buttonDefaults");
buttonDefaults.init(310, buttonRowPos, 100);
buttonDefaults.setText(lang.getString("Defaults"));
buttonReturn.registerGraphicComponent(containerName,"buttonReturn"); buttonReturn.registerGraphicComponent(containerName,"buttonReturn");
buttonReturn.init(420, buttonRowPos, 100); buttonReturn.init(buttonStartPos+110, buttonRowPos, 100);
buttonReturn.setText(lang.getString("Return")); buttonReturn.setText(lang.getString("Return"));
keyButtonsLineHeight=30; buttonDefaults.registerGraphicComponent(containerName,"buttonDefaults");
keyButtonsHeight=25; buttonDefaults.init(buttonStartPos+230, buttonRowPos, 125);
keyButtonsWidth=400; buttonDefaults.setText(lang.getString("Defaults"));
keyButtonsXBase=200;
keyButtonsYBase=200+400-keyButtonsLineHeight;
keyButtonsToRender=400/keyButtonsLineHeight;
int labelWidth=100;
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__);
@@ -177,8 +179,10 @@ MenuStateKeysetup::MenuStateKeysetup(Program *program, MainMenu *mainMenu,
button->setText(mergedProperties[i].first); button->setText(mergedProperties[i].first);
keyButtons.push_back(button); keyButtons.push_back(button);
GraphicLabel *label=new GraphicLabel(); GraphicLabel *label=new GraphicLabel();
label->init(keyButtonsXBase+keyButtonsWidth+10,keyButtonsYBase,labelWidth,20); label->init(keyButtonsXBase+keyButtonsWidth+5,keyButtonsYBase,labelWidth,20);
label->setText(keyName); label->setRenderBackground(true);
label->setMaxEditRenderWidth(105);
label->setText(" " + keyName);
labels.push_back(label); labels.push_back(label);
} }
@@ -207,7 +211,7 @@ void MenuStateKeysetup::reloadUI() {
console.resetFonts(); console.resetFonts();
labelTitle.setFont(CoreData::getInstance().getMenuFontBig()); labelTitle.setFont(CoreData::getInstance().getMenuFontBig());
labelTitle.setFont3D(CoreData::getInstance().getMenuFontBig3D()); labelTitle.setFont3D(CoreData::getInstance().getMenuFontBig3D());
labelTitle.setText(lang.getString("Keyboardsetup")); labelTitle.setText(lang.getString("KeyboardsetupL"));
labelTestTitle.setFont(CoreData::getInstance().getMenuFontBig()); labelTestTitle.setFont(CoreData::getInstance().getMenuFontBig());
labelTestTitle.setFont3D(CoreData::getInstance().getMenuFontBig3D()); labelTestTitle.setFont3D(CoreData::getInstance().getMenuFontBig3D());
@@ -518,7 +522,7 @@ void MenuStateKeysetup::keyDown(SDL_KeyboardEvent key) {
char *utfStr = ConvertToUTF8(&szCharText[0]); char *utfStr = ConvertToUTF8(&szCharText[0]);
char szBuf[8096] = ""; char szBuf[8096] = "";
snprintf(szBuf,8096,"%s [%s][%d][%d][%d][%d]",keyName.c_str(),utfStr,key.keysym.sym,hotkeyChar,key.keysym.unicode,key.keysym.mod); snprintf(szBuf,8096," %s [%s][%d][%d][%d][%d]",keyName.c_str(),utfStr,key.keysym.sym,hotkeyChar,key.keysym.unicode,key.keysym.mod);
labelTestValue.setText(szBuf); labelTestValue.setText(szBuf);
delete [] utfStr; delete [] utfStr;