Full viewing range key message clarified

[dragonfireclient.git] / src / guiVolumeChange.cpp

diff --git a/src/guiVolumeChange.cpp b/src/guiVolumeChange.cpp
index c272b132dc3e7f80a47ce4f8ad839da5a3cddb95..c7868ad3554ce473aab57a8aff8eb35e6fbb00f7 100644 (file)
--- a/src/guiVolumeChange.cpp
+++ b/src/guiVolumeChange.cpp
@@ -26,22 +26,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <IGUIScrollBar.h>
 #include <IGUIStaticText.h>
 #include <IGUIFont.h>
-#include "main.h"
+#include "settings.h"
 
 #include "gettext.h"
 
-const int ID_soundText1 = 263;
-const int ID_soundText2 = 264;
-const int ID_soundExitButton = 265;
-const int ID_soundSlider = 266;
+const int ID_soundText = 263;
+const int ID_soundExitButton = 264;
+const int ID_soundSlider = 265;
 
 GUIVolumeChange::GUIVolumeChange(gui::IGUIEnvironment* env,
                gui::IGUIElement* parent, s32 id,
-               IMenuManager *menumgr,
-               Client* client
+               IMenuManager *menumgr
 ):
-       GUIModalMenu(env, parent, id, menumgr),
-       m_client(client)
+       GUIModalMenu(env, parent, id, menumgr)
 {
 }
 
@@ -52,26 +49,14 @@ GUIVolumeChange::~GUIVolumeChange()
 
 void GUIVolumeChange::removeChildren()
 {
-       {
-               gui::IGUIElement *e = getElementFromId(ID_soundText1);
-               if(e != NULL)
-                       e->remove();
-       }
-       {
-               gui::IGUIElement *e = getElementFromId(ID_soundText2);
-               if(e != NULL)
-                       e->remove();
-       }
-       {
-               gui::IGUIElement *e = getElementFromId(ID_soundExitButton);
-               if(e != NULL)
-                       e->remove();
-       }
-       {
-               gui::IGUIElement *e = getElementFromId(ID_soundSlider);
-               if(e != NULL)
-                       e->remove();
-       }
+       if (gui::IGUIElement *e = getElementFromId(ID_soundText))
+               e->remove();
+
+       if (gui::IGUIElement *e = getElementFromId(ID_soundExitButton))
+               e->remove();
+
+       if (gui::IGUIElement *e = getElementFromId(ID_soundSlider))
+               e->remove();
 }
 
 void GUIVolumeChange::regenerateGui(v2u32 screensize)
@@ -80,45 +65,40 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
                Remove stuff
        */
        removeChildren();
-       
+
        /*
                Calculate new sizes and positions
        */
-       core::rect<s32> rect(
-                       screensize.X/2 - 380/2,
-                       screensize.Y/2 - 200/2,
-                       screensize.X/2 + 380/2,
-                       screensize.Y/2 + 200/2
+       DesiredRect = core::rect<s32>(
+               screensize.X/2 - 380/2,
+               screensize.Y/2 - 200/2,
+               screensize.X/2 + 380/2,
+               screensize.Y/2 + 200/2
        );
-       
-       DesiredRect = rect;
        recalculateAbsolutePosition(false);
 
-       v2s32 size = rect.getSize();
-       v2s32 topleft_client(40, 0);
-       int volume=(int)(g_settings->getFloat("sound_volume")*100);
+       v2s32 size = DesiredRect.getSize();
+       int volume = (int)(g_settings->getFloat("sound_volume") * 100);
+
        /*
                Add stuff
        */
-       changeCtype("");
-       {
-               core::rect<s32> rect(0, 0, 120, 20);
-               rect = rect + v2s32(size.X/2-60, size.Y/2-35);
-               wchar_t* text = wgettext("Sound Volume: ");
-               Environment->addStaticText(text, rect, false,
-                               true, this, ID_soundText1);
-               delete[] text;
-       }
        {
-               core::rect<s32> rect(0, 0, 30, 20);
-               rect = rect + v2s32(size.X/2+40, size.Y/2-35);
-               Environment->addStaticText(core::stringw(volume).c_str(), rect, false,
-                               true, this, ID_soundText2);
+               core::rect<s32> rect(0, 0, 160, 20);
+               rect = rect + v2s32(size.X / 2 - 80, size.Y / 2 - 35);
+
+               const wchar_t *text = wgettext("Sound Volume: ");
+               core::stringw volume_text = text;
+               delete [] text;
+
+               volume_text += core::stringw(volume) + core::stringw("%");
+               Environment->addStaticText(volume_text.c_str(), rect, false,
+                               true, this, ID_soundText);
        }
        {
                core::rect<s32> rect(0, 0, 80, 30);
                rect = rect + v2s32(size.X/2-80/2, size.Y/2+55);
-               wchar_t* text = wgettext("Exit");
+               const wchar_t *text = wgettext("Exit");
                Environment->addButton(rect, this, ID_soundExitButton,
                        text);
                delete[] text;
@@ -131,7 +111,6 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
                e->setMax(100);
                e->setPos(volume);
        }
-       changeCtype("");
 }
 
 void GUIVolumeChange::drawMenu()
@@ -140,45 +119,48 @@ void GUIVolumeChange::drawMenu()
        if (!skin)
                return;
        video::IVideoDriver* driver = Environment->getVideoDriver();
-       video::SColor bgcolor(140,0,0,0);
+       video::SColor bgcolor(140, 0, 0, 0);
        driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect);
        gui::IGUIElement::draw();
 }
 
 bool GUIVolumeChange::OnEvent(const SEvent& event)
 {
-       if(event.EventType==EET_KEY_INPUT_EVENT)
-       {
-               if(event.KeyInput.Key==KEY_ESCAPE && event.KeyInput.PressedDown)
-               {
+       if (event.EventType == EET_KEY_INPUT_EVENT) {
+               if (event.KeyInput.Key == KEY_ESCAPE && event.KeyInput.PressedDown) {
                        quitMenu();
                        return true;
                }
-               if(event.KeyInput.Key==KEY_RETURN && event.KeyInput.PressedDown)
-               {
+
+               if (event.KeyInput.Key == KEY_RETURN && event.KeyInput.PressedDown) {
                        quitMenu();
                        return true;
                }
        }
-       if(event.GUIEvent.EventType==gui::EGET_BUTTON_CLICKED)
-               {
-                       if (event.GUIEvent.Caller->getID() == ID_soundExitButton)
-                               {
-                                       quitMenu();
-                                       return true;
-                               }
+
+       if (event.GUIEvent.EventType == gui::EGET_BUTTON_CLICKED) {
+               if (event.GUIEvent.Caller->getID() == ID_soundExitButton) {
+                       quitMenu();
+                       return true;
                }
-       if(event.GUIEvent.EventType==gui::EGET_SCROLL_BAR_CHANGED)
-               {
-               if (event.GUIEvent.Caller->getID() == ID_soundSlider)
-                       {
-                               s32 pos = ((gui::IGUIScrollBar*)event.GUIEvent.Caller)->getPos();
-                               g_settings->setFloat("sound_volume",(float)pos/100);
-                               gui::IGUIElement *e = getElementFromId(ID_soundText2);
-                               e->setText( core::stringw(pos).c_str() );
-                               return true;
-                       }
+       }
+
+       if (event.GUIEvent.EventType == gui::EGET_SCROLL_BAR_CHANGED) {
+               if (event.GUIEvent.Caller->getID() == ID_soundSlider) {
+                       s32 pos = ((gui::IGUIScrollBar*)event.GUIEvent.Caller)->getPos();
+                       g_settings->setFloat("sound_volume", (float) pos / 100);
+
+                       gui::IGUIElement *e = getElementFromId(ID_soundText);
+                       const wchar_t *text = wgettext("Sound Volume: ");
+                       core::stringw volume_text = text;
+                       delete [] text;
+
+                       volume_text += core::stringw(pos) + core::stringw("%");
+                       e->setText(volume_text.c_str());
+                       return true;
                }
+       }
+
        return Parent ? Parent->OnEvent(event) : false;
 }