#include "debug.h"
#include "serialization.h"
#include <string>
-
+#include <IGUICheckBox.h>
+#include <IGUIEditBox.h>
+#include <IGUIButton.h>
+#include <IGUIStaticText.h>
+#include <IGUIFont.h>
#include "gettext.h"
bool enable_damage;
bool fancy_trees;
bool smooth_lighting;
+ bool clouds_3d;
+ bool opaque_water;
// Client options
{
else
smooth_lighting = m_data->smooth_lighting;
}
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_3D_CLOUDS_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ clouds_3d = ((gui::IGUICheckBox*)e)->isChecked();
+ else
+ clouds_3d = m_data->clouds_3d;
+ }
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_OPAQUE_WATER_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ opaque_water = ((gui::IGUICheckBox*)e)->isChecked();
+ else
+ opaque_water = m_data->opaque_water;
+ }
// Server options
{
v2s32 topleft_client(40, 0);
v2s32 size_client = size - v2s32(40, 0);
+ changeCtype("");
+
+ // Version
+ {
+ core::rect<s32> rect(0, 0, 300, 30);
+ rect += topleft_client + v2s32(-36, 0);
+ Environment->addStaticText(narrow_to_wide(VERSION_STRING).c_str(),
+ rect, false, true, this, -1);
+ }
+ // CLIENT
{
core::rect<s32> rect(0, 0, 20, 125);
- rect += topleft_client + v2s32(-15, 60);
+ rect += topleft_client + v2s32(-15, 80);
const wchar_t *text = L"C\nL\nI\nE\nN\nT";
//gui::IGUIStaticText *t =
Environment->addStaticText(text, rect, false, true, this, -1);
//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
}
-
// Nickname + password
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, 50+6);
- Environment->addStaticText(chartowchar_t(gettext("Name/Password")),
+ Environment->addStaticText(wgettext("Name/Password"),
rect, false, true, this, -1);
}
+ changeCtype("C");
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, 50);
gui::IGUIEditBox *e =
Environment->addEditBox(L"", rect, true, this, 264);
e->setPasswordBox(true);
+ if(text_name != L"" && text_address != L"")
+ Environment->setFocus(e);
}
+ changeCtype("");
// Address + port
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, 100+6);
- Environment->addStaticText(chartowchar_t(gettext("Address/Port")),
+ Environment->addStaticText(wgettext("Address/Port"),
rect, false, true, this, -1);
}
+ changeCtype("C");
{
core::rect<s32> rect(0, 0, 230, 30);
rect += topleft_client + v2s32(160, 100);
gui::IGUIElement *e =
Environment->addEditBox(text_address.c_str(), rect, true, this, GUI_ID_ADDRESS_INPUT);
- if(text_name != L"")
+ if(text_name != L"" && text_address == L"")
Environment->setFocus(e);
}
{
rect += topleft_client + v2s32(size_client.X-60-100, 100);
Environment->addEditBox(text_port.c_str(), rect, true, this, GUI_ID_PORT_INPUT);
}
+ changeCtype("");
{
core::rect<s32> rect(0, 0, 400, 20);
rect += topleft_client + v2s32(160, 100+35);
- Environment->addStaticText(chartowchar_t(gettext("Leave address blank to start a local server.")),
+ Environment->addStaticText(wgettext("Leave address blank to start a local server."),
rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 250, 30);
rect += topleft_client + v2s32(35, 150);
Environment->addCheckBox(fancy_trees, rect, this, GUI_ID_FANCYTREE_CB,
- chartowchar_t(gettext("Fancy trees")));
+ wgettext("Fancy trees"));
}
{
core::rect<s32> rect(0, 0, 250, 30);
- rect += topleft_client + v2s32(35, 150+30);
+ rect += topleft_client + v2s32(35, 150+20);
Environment->addCheckBox(smooth_lighting, rect, this, GUI_ID_SMOOTH_LIGHTING_CB,
- chartowchar_t(gettext("Smooth Lighting")));
+ wgettext("Smooth Lighting"));
+ }
+ {
+ core::rect<s32> rect(0, 0, 250, 30);
+ rect += topleft_client + v2s32(35, 150+40);
+ Environment->addCheckBox(clouds_3d, rect, this, GUI_ID_3D_CLOUDS_CB,
+ wgettext("3D Clouds"));
+ }
+ {
+ core::rect<s32> rect(0, 0, 250, 30);
+ rect += topleft_client + v2s32(35, 150+60);
+ Environment->addCheckBox(opaque_water, rect, this, GUI_ID_OPAQUE_WATER_CB,
+ wgettext("Opaque water"));
}
// Start game button
{
//rect += topleft_client + v2s32(size_client.X/2-180/2, 225-30/2);
rect += topleft_client + v2s32(size_client.X-180-40, 150+25);
Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
- chartowchar_t(gettext("Start Game / Connect")));
+ wgettext("Start Game / Connect"));
}
// Key change button
//rect += topleft_client + v2s32(size_client.X/2-180/2, 225-30/2);
rect += topleft_client + v2s32(size_client.X-180-40-100-20, 150+25);
Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
- chartowchar_t(gettext("Change keys")));
+ wgettext("Change keys"));
}
/*
Server section
*/
- v2s32 topleft_server(40, 250);
+ v2s32 topleft_server(40, 290);
v2s32 size_server = size - v2s32(40, 0);
+ // SERVER
{
core::rect<s32> rect(0, 0, 20, 125);
- rect += topleft_server + v2s32(-15, 40);
+ rect += topleft_server + v2s32(-15, 15);
const wchar_t *text = L"S\nE\nR\nV\nE\nR";
//gui::IGUIStaticText *t =
Environment->addStaticText(text, rect, false, true, this, -1);
//t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
}
-
// Server parameters
{
core::rect<s32> rect(0, 0, 250, 30);
- rect += topleft_server + v2s32(35, 30);
+ rect += topleft_server + v2s32(35, 20);
Environment->addCheckBox(creative_mode, rect, this, GUI_ID_CREATIVE_CB,
- chartowchar_t(gettext("Creative Mode")));
+ wgettext("Creative Mode"));
}
{
core::rect<s32> rect(0, 0, 250, 30);
- rect += topleft_server + v2s32(35, 60);
+ rect += topleft_server + v2s32(35, 40);
Environment->addCheckBox(enable_damage, rect, this, GUI_ID_DAMAGE_CB,
- chartowchar_t(gettext("Enable Damage")));
+ wgettext("Enable Damage"));
}
// Map delete button
{
core::rect<s32> rect(0, 0, 130, 30);
//rect += topleft_server + v2s32(size_server.X-40-130, 100+25);
- rect += topleft_server + v2s32(40, 100+25);
+ rect += topleft_server + v2s32(40, 90);
Environment->addButton(rect, this, GUI_ID_DELETE_MAP_BUTTON,
- chartowchar_t(gettext("Delete map")));
+ wgettext("Delete map"));
}
+ changeCtype("C");
}
void GUIMainMenu::drawMenu()
video::SColor bgcolor(140,0,0,0);
{
- core::rect<s32> rect(0, 0, 620, 230);
+ core::rect<s32> rect(0, 0, 620, 270);
rect += AbsoluteRect.UpperLeftCorner;
driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
}
{
- core::rect<s32> rect(0, 250, 620, 430);
+ core::rect<s32> rect(0, 290, 620, 430);
rect += AbsoluteRect.UpperLeftCorner;
driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
}
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
m_data->enable_damage = ((gui::IGUICheckBox*)e)->isChecked();
}
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_FANCYTREE_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ m_data->fancy_trees = ((gui::IGUICheckBox*)e)->isChecked();
+ }
{
gui::IGUIElement *e = getElementFromId(GUI_ID_SMOOTH_LIGHTING_CB);
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
m_data->smooth_lighting = ((gui::IGUICheckBox*)e)->isChecked();
}
{
- gui::IGUIElement *e = getElementFromId(GUI_ID_FANCYTREE_CB);
+ gui::IGUIElement *e = getElementFromId(GUI_ID_3D_CLOUDS_CB);
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
- m_data->fancy_trees = ((gui::IGUICheckBox*)e)->isChecked();
+ m_data->clouds_3d = ((gui::IGUICheckBox*)e)->isChecked();
+ }
+ {
+ gui::IGUIElement *e = getElementFromId(GUI_ID_OPAQUE_WATER_CB);
+ if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
+ m_data->opaque_water = ((gui::IGUICheckBox*)e)->isChecked();
}
m_accepted = true;
projects / oweals / minetest.git / blobdiff