Clean up log messages everywhere

[oweals/minetest.git] / src / guiMainMenu.cpp

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index 2d5bd151acadd87fcb84f0f436e076fb2a1f90b1..5c6104ca37063f8a6257bd8505af1fc7f1744829 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -22,7 +22,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #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"
@@ -76,6 +80,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        bool enable_damage;
        bool fancy_trees;
        bool smooth_lighting;
+       bool clouds_3d;
+       bool opaque_water;
        
        // Client options
        {
@@ -113,6 +119,20 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                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
        {
@@ -165,15 +185,23 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        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);
@@ -196,6 +224,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                gui::IGUIEditBox *e =
                Environment->addEditBox(L"", rect, true, this, 264);
                e->setPasswordBox(true);
+               if(text_name != L"" && text_address != L"")
+                       Environment->setFocus(e);
 
        }
        changeCtype("");
@@ -212,7 +242,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                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);
        }
        {
@@ -236,10 +266,22 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        }
        {
                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,
                                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
        {
                core::rect<s32> rect(0, 0, 180, 30);
@@ -261,28 +303,28 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
                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,
                        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,
                        wgettext("Enable Damage"));
        }
@@ -290,7 +332,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
        {
                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,
                          wgettext("Delete map"));
        }
@@ -310,13 +352,13 @@ 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);
        }
@@ -356,15 +398,25 @@ void GUIMainMenu::acceptInput()
                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;