aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstantin Wenger <constantin.wenger@googlemail.com>2011-07-21 16:44:43 +0200
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-07-22 07:25:40 +0200
commit5c66664aef852c01c8ec8f79856ba081cf01446b (patch)
treeb342e45279ade01d81b08315c90fcbdb248ef9e1
parentfc95d00b2f9929d3fdb93fff9a971d26115c12f4 (diff)
downloadminetest-5c66664aef852c01c8ec8f79856ba081cf01446b.tar.gz
minetest-5c66664aef852c01c8ec8f79856ba081cf01446b.tar.bz2
minetest-5c66664aef852c01c8ec8f79856ba081cf01446b.zip
changed some lines to fit the 80chars limit
-rw-r--r--src/guiMainMenu.cpp26
-rw-r--r--src/guiMessageMenu.cpp3
-rw-r--r--src/guiPasswordChange.cpp13
-rw-r--r--src/guiPauseMenu.cpp12
-rw-r--r--src/guiTextInputMenu.cpp3
5 files changed, 38 insertions, 19 deletions
diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index 707a96e3b..1d7f224f6 100644
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -177,7 +177,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, 50+6);
- Environment->addStaticText(chartowchar_t(gettext("Name/Password")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("Name/Password")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 230, 30);
@@ -199,7 +200,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, 100+6);
- Environment->addStaticText(chartowchar_t(gettext("Address/Port")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("Address/Port")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 230, 30);
@@ -218,13 +220,14 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
{
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.")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("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")));
+ chartowchar_t(gettext("Fancy trees")));
}
{
core::rect<s32> rect(0, 0, 250, 30);
@@ -237,7 +240,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 180, 30);
//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")));
+ Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
+ chartowchar_t(gettext("Start Game / Connect")));
}
// Key change button
@@ -245,7 +249,8 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 100, 30);
//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")));
+ Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
+ chartowchar_t(gettext("Change keys")));
}
/*
Server section
@@ -267,19 +272,22 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 250, 30);
rect += topleft_server + v2s32(35, 30);
- Environment->addCheckBox(creative_mode, rect, this, GUI_ID_CREATIVE_CB, chartowchar_t(gettext("Creative Mode")));
+ Environment->addCheckBox(creative_mode, rect, this, GUI_ID_CREATIVE_CB,
+ chartowchar_t(gettext("Creative Mode")));
}
{
core::rect<s32> rect(0, 0, 250, 30);
rect += topleft_server + v2s32(35, 60);
- Environment->addCheckBox(enable_damage, rect, this, GUI_ID_DAMAGE_CB, chartowchar_t(gettext("Enable Damage")));
+ Environment->addCheckBox(enable_damage, rect, this, GUI_ID_DAMAGE_CB,
+ chartowchar_t(gettext("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);
- Environment->addButton(rect, this, GUI_ID_DELETE_MAP_BUTTON, chartowchar_t(gettext("Delete map")));
+ Environment->addButton(rect, this, GUI_ID_DELETE_MAP_BUTTON,
+ chartowchar_t(gettext("Delete map")));
}
}
diff --git a/src/guiMessageMenu.cpp b/src/guiMessageMenu.cpp
index e4e582ab1..155be6029 100644
--- a/src/guiMessageMenu.cpp
+++ b/src/guiMessageMenu.cpp
@@ -89,7 +89,8 @@ void GUIMessageMenu::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 140, 30);
rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
gui::IGUIElement *e =
- Environment->addButton(rect, this, 257, chartowchar_t(gettext("Proceed")));
+ Environment->addButton(rect, this, 257,
+ chartowchar_t(gettext("Proceed")));
Environment->setFocus(e);
}
}
diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index 79601a99f..fabe75110 100644
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -99,7 +99,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
- Environment->addStaticText(chartowchar_t(gettext("Old Password")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("Old Password")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 230, 30);
@@ -113,7 +114,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
- Environment->addStaticText(chartowchar_t(gettext("New Password")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("New Password")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 230, 30);
@@ -126,7 +128,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 110, 20);
rect += topleft_client + v2s32(35, ypos+6);
- Environment->addStaticText(chartowchar_t(gettext("Confirm Password")), rect, false, true, this, -1);
+ Environment->addStaticText(chartowchar_t(gettext("Confirm Password")),
+ rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 230, 30);
@@ -148,7 +151,9 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 300, 20);
rect += topleft_client + v2s32(35, ypos);
IGUIElement *e =
- Environment->addStaticText(chartowchar_t(gettext("Passwords do not match!")), rect, false, true, this, ID_message);
+ Environment->addStaticText(
+ chartowchar_t(gettext("Passwords do not match!")),
+ rect, false, true, this, ID_message);
e->setVisible(false);
}
diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index 5f40a4820..61485518c 100644
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -106,25 +106,29 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 140, btn_height);
rect = rect + v2s32(size.X/2-140/2, btn_y);
- Environment->addButton(rect, this, 256, chartowchar_t(gettext("Continue")));
+ Environment->addButton(rect, this, 256,
+ chartowchar_t(gettext("Continue")));
}
btn_y += btn_height + btn_gap;
{
core::rect<s32> rect(0, 0, 140, btn_height);
rect = rect + v2s32(size.X/2-140/2, btn_y);
- Environment->addButton(rect, this, 261, chartowchar_t(gettext("Change Password")));
+ Environment->addButton(rect, this, 261,
+ chartowchar_t(gettext("Change Password")));
}
btn_y += btn_height + btn_gap;
{
core::rect<s32> rect(0, 0, 140, btn_height);
rect = rect + v2s32(size.X/2-140/2, btn_y);
- Environment->addButton(rect, this, 260, chartowchar_t(gettext("Disconnect")));
+ Environment->addButton(rect, this, 260,
+ chartowchar_t(gettext("Disconnect")));
}
btn_y += btn_height + btn_gap;
{
core::rect<s32> rect(0, 0, 140, btn_height);
rect = rect + v2s32(size.X/2-140/2, btn_y);
- Environment->addButton(rect, this, 257, chartowchar_t(gettext("Exit to OS")));
+ Environment->addButton(rect, this, 257,
+ chartowchar_t(gettext("Exit to OS")));
}
{
diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index b15f8bc07..252e452f5 100644
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -107,7 +107,8 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
{
core::rect<s32> rect(0, 0, 140, 30);
rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+25);
- Environment->addButton(rect, this, 257, chartowchar_t(gettext("Proceed")));
+ Environment->addButton(rect, this, 257,
+ chartowchar_t(gettext("Proceed")));
}
}