#include "gettext.h"
#include "utility.h"
#include "tile.h" // getTexturePath
+#include "filesys.h"
struct CreateWorldDestMainMenu : public CreateWorldDest
{
struct ConfirmDestDeleteWorld : public ConfirmDest
{
- ConfirmDestDeleteWorld(WorldSpec spec, GUIMainMenu *menu):
+ ConfirmDestDeleteWorld(WorldSpec spec, GUIMainMenu *menu,
+ const std::vector<std::string> &paths):
m_spec(spec),
- m_menu(menu)
+ m_menu(menu),
+ m_paths(paths)
{}
void answer(bool answer)
{
if(answer == false)
return;
- m_menu->deleteWorld(m_spec);
+ m_menu->deleteWorld(m_paths);
}
WorldSpec m_spec;
GUIMainMenu *m_menu;
+ std::vector<std::string> m_paths;
};
enum
TAB_SINGLEPLAYER=0,
TAB_MULTIPLAYER,
TAB_ADVANCED,
+ TAB_SETTINGS,
TAB_CREDITS
};
changeCtype("");
// Version
- if(m_data->selected_tab != TAB_CREDITS)
+ //if(m_data->selected_tab != TAB_CREDITS)
{
core::rect<s32> rect(0, 0, size.X, 40);
rect += v2s32(4, 0);
m_topleft_client = c800 + v2s32(90, 70+50+30);
m_size_client = v2s32(620, 270);
- m_topleft_server = c800 + v2s32(90, 70+30+50+290);
m_size_server = v2s32(620, 140);
-
+
if(m_data->selected_tab == TAB_ADVANCED)
{
- m_topleft_client = c800 + v2s32(90, 20+50+30);
- m_size_client = v2s32(620, 270);
+ m_topleft_client = c800 + v2s32(90, 70+50+30);
+ m_size_client = v2s32(620, 200);
- m_topleft_server = c800 + v2s32(90, 20+30+50+290);
m_size_server = v2s32(620, 140);
}
+ m_topleft_server = m_topleft_client + v2s32(0, m_size_client.Y+20);
+
// Tabs
#if 1
{
e->addTab(L"Singleplayer");
e->addTab(L"Multiplayer");
e->addTab(L"Advanced");
+ e->addTab(L"Settings");
e->addTab(L"Credits");
e->setActiveTab(m_data->selected_tab);
}
{
// HYBRID
{
- /*core::rect<s32> rect(0, 0, 20, 125);
- rect += m_topleft_client + v2s32(15, 80);
- const wchar_t *text = L"H\nY\nB\nR\nI\nD";*/
- core::rect<s32> rect(0, 0, 20, 300);
- rect += m_topleft_client + v2s32(15, 15);
+ core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+ rect += m_topleft_client + v2s32(15, 0);
+ //const wchar_t *text = L"H\nY\nB\nR\nI\nD";
const wchar_t *text = L"T\nA\nP\nE\n\nA\nN\nD\n\nG\nL\nU\nE";
- //gui::IGUIStaticText *t =
- Environment->addStaticText(text, rect, false, true, this, -1);
- //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+ gui::IGUIStaticText *t =
+ Environment->addStaticText(text, rect, false, false, this, -1);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
u32 bs = 5;
// World selection listbox
}
// Start game button
{
- /*core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-120-30,
- m_size_client.Y-30-20-30-5);*/
/*core::rect<s32> rect(0, 0, world_button_w, 30);
rect += m_topleft_client + v2s32(world_sel_x+(world_button_w+bs)*3,
world_sel_y+world_sel_h+0);*/
u32 bw = 160;
+ /*core::rect<s32> rect(0, 0, bw, 30);
+ rect += m_topleft_client + v2s32(m_size_client.X-bw-30,
+ m_size_client.Y-30-15);*/
core::rect<s32> rect(0, 0, bw, 30);
rect += m_topleft_client + v2s32(world_sel_x+world_sel_w-bw,
world_sel_y+world_sel_h+30+bs);
GUI_ID_JOIN_GAME_BUTTON, wgettext("Play"));
}
// Options
- //s32 option_x = 450;
s32 option_x = 50;
+ //s32 option_x = 50+world_sel_w+20;
s32 option_y = 30;
+ u32 option_w = 150;
{
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y);
- Environment->addCheckBox(m_data->fancy_trees, rect, this,
- GUI_ID_FANCYTREE_CB, wgettext("Fancy trees"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y+20);
- Environment->addCheckBox(m_data->smooth_lighting, rect, this,
- GUI_ID_SMOOTH_LIGHTING_CB, wgettext("Smooth Lighting"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y+20*2);
- Environment->addCheckBox(m_data->clouds_3d, rect, this,
- GUI_ID_3D_CLOUDS_CB, wgettext("3D Clouds"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y+20*3);
- Environment->addCheckBox(m_data->opaque_water, rect, this,
- GUI_ID_OPAQUE_WATER_CB, wgettext("Opaque water"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y+20*4);
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y+20*0);
Environment->addCheckBox(m_data->creative_mode, rect, this,
GUI_ID_CREATIVE_CB, wgettext("Creative Mode"));
}
{
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(option_x, option_y+20*5);
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y+20*1);
Environment->addCheckBox(m_data->enable_damage, rect, this,
GUI_ID_DAMAGE_CB, wgettext("Enable Damage"));
}
- // Key change button
- {
- core::rect<s32> rect(0, 0, 120, 30);
- /*rect += m_topleft_client + v2s32(m_size_client.X-120-30,
- m_size_client.Y-30-20);*/
- rect += m_topleft_client + v2s32(option_x, option_y+20*6+20);
- Environment->addButton(rect, this,
- GUI_ID_CHANGE_KEYS_BUTTON, wgettext("Change keys"));
- }
changeCtype("C");
}
else if(m_data->selected_tab == TAB_MULTIPLAYER)
changeCtype("");
// CLIENT
{
- core::rect<s32> rect(0, 0, 20, 125);
- rect += m_topleft_client + v2s32(15, 80);
+ core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+ rect += m_topleft_client + v2s32(15, 0);
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);
+ gui::IGUIStaticText *t =
+ Environment->addStaticText(text, rect, false, false, this, -1);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
// Nickname + password
{
this, GUI_ID_PORT_INPUT);
}
changeCtype("");
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150);
- Environment->addCheckBox(m_data->fancy_trees, rect, this, GUI_ID_FANCYTREE_CB,
- wgettext("Fancy trees"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+20);
- Environment->addCheckBox(m_data->smooth_lighting, rect, this, GUI_ID_SMOOTH_LIGHTING_CB,
- wgettext("Smooth Lighting"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+40);
- Environment->addCheckBox(m_data->clouds_3d, rect, this, GUI_ID_3D_CLOUDS_CB,
- wgettext("3D Clouds"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+60);
- Environment->addCheckBox(m_data->opaque_water, rect, this, GUI_ID_OPAQUE_WATER_CB,
- wgettext("Opaque water"));
- }
- // Key change button
- {
- core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-180-30-120-20,
- m_size_client.Y-30-20);
- Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
- wgettext("Change keys"));
- }
// Start game button
{
core::rect<s32> rect(0, 0, 180, 30);
rect += m_topleft_client + v2s32(m_size_client.X-180-30,
- m_size_client.Y-30-20);
+ m_size_client.Y-30-15);
Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
wgettext("Start Game / Connect"));
}
changeCtype("");
// CLIENT
{
- core::rect<s32> rect(0, 0, 20, 125);
- rect += m_topleft_client + v2s32(15, 80);
+ core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+ rect += m_topleft_client + v2s32(15, 0);
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);
+ gui::IGUIStaticText *t =
+ Environment->addStaticText(text, rect, false, false, this, -1);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
// Nickname + password
{
core::rect<s32> rect(0, 0, 110, 20);
- rect += m_topleft_client + v2s32(35+30, 50+6);
+ rect += m_topleft_client + v2s32(35+30, 35+6);
Environment->addStaticText(wgettext("Name/Password"),
rect, false, true, this, -1);
}
changeCtype("C");
{
core::rect<s32> rect(0, 0, 230, 30);
- rect += m_topleft_client + v2s32(160+30, 50);
+ rect += m_topleft_client + v2s32(160+30, 35);
gui::IGUIElement *e =
Environment->addEditBox(m_data->name.c_str(), rect, true, this, GUI_ID_NAME_INPUT);
if(m_data->name == L"")
}
{
core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-60-100, 50);
+ rect += m_topleft_client + v2s32(m_size_client.X-60-100, 35);
gui::IGUIEditBox *e =
Environment->addEditBox(L"", rect, true, this, 264);
e->setPasswordBox(true);
// Address + port
{
core::rect<s32> rect(0, 0, 110, 20);
- rect += m_topleft_client + v2s32(35+30, 100+6);
+ rect += m_topleft_client + v2s32(35+30, 75+6);
Environment->addStaticText(wgettext("Address/Port"),
rect, false, true, this, -1);
}
changeCtype("C");
{
core::rect<s32> rect(0, 0, 230, 30);
- rect += m_topleft_client + v2s32(160+30, 100);
+ rect += m_topleft_client + v2s32(160+30, 75);
gui::IGUIElement *e =
Environment->addEditBox(m_data->address.c_str(), rect, true,
this, GUI_ID_ADDRESS_INPUT);
}
{
core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-60-100, 100);
+ rect += m_topleft_client + v2s32(m_size_client.X-60-100, 75);
Environment->addEditBox(m_data->port.c_str(), rect, true,
this, GUI_ID_PORT_INPUT);
}
changeCtype("");
{
core::rect<s32> rect(0, 0, 400, 20);
- rect += m_topleft_client + v2s32(160+30, 100+35);
+ rect += m_topleft_client + v2s32(160+30, 75+35);
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 += m_topleft_client + v2s32(35+30, 150);
- Environment->addCheckBox(m_data->fancy_trees, rect, this, GUI_ID_FANCYTREE_CB,
- wgettext("Fancy trees"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+20);
- Environment->addCheckBox(m_data->smooth_lighting, rect, this, GUI_ID_SMOOTH_LIGHTING_CB,
- wgettext("Smooth Lighting"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+40);
- Environment->addCheckBox(m_data->clouds_3d, rect, this, GUI_ID_3D_CLOUDS_CB,
- wgettext("3D Clouds"));
- }
- {
- core::rect<s32> rect(0, 0, 250, 30);
- rect += m_topleft_client + v2s32(35+30, 150+60);
- Environment->addCheckBox(m_data->opaque_water, rect, this, GUI_ID_OPAQUE_WATER_CB,
- wgettext("Opaque water"));
- }
- // Key change button
- {
- core::rect<s32> rect(0, 0, 120, 30);
- rect += m_topleft_client + v2s32(m_size_client.X-180-30-120-20,
- m_size_client.Y-30-20);
- Environment->addButton(rect, this, GUI_ID_CHANGE_KEYS_BUTTON,
- wgettext("Change keys"));
- }
// Start game button
{
core::rect<s32> rect(0, 0, 180, 30);
*/
// SERVER
{
- core::rect<s32> rect(0, 0, 20, 125);
- rect += m_topleft_server + v2s32(15, 15);
+ core::rect<s32> rect(0, 0, 10, m_size_server.Y);
+ rect += m_topleft_server + v2s32(15, 0);
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);
+ gui::IGUIStaticText *t =
+ Environment->addStaticText(text, rect, false, false, this, -1);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
// Server parameters
{
}
changeCtype("C");
}
+ else if(m_data->selected_tab == TAB_SETTINGS)
+ {
+ {
+ core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+ rect += m_topleft_client + v2s32(15, 0);
+ const wchar_t *text = L"S\nE\nT\nT\nI\nN\nG\nS";
+ gui::IGUIStaticText *t =
+ Environment->addStaticText(text, rect, false, false, this, -1);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
+ }
+ s32 option_x = 70;
+ s32 option_y = 50;
+ u32 option_w = 150;
+ {
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y);
+ Environment->addCheckBox(m_data->fancy_trees, rect, this,
+ GUI_ID_FANCYTREE_CB, wgettext("Fancy trees"));
+ }
+ {
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y+20);
+ Environment->addCheckBox(m_data->smooth_lighting, rect, this,
+ GUI_ID_SMOOTH_LIGHTING_CB, wgettext("Smooth Lighting"));
+ }
+ {
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y+20*2);
+ Environment->addCheckBox(m_data->clouds_3d, rect, this,
+ GUI_ID_3D_CLOUDS_CB, wgettext("3D Clouds"));
+ }
+ {
+ core::rect<s32> rect(0, 0, option_w, 30);
+ rect += m_topleft_client + v2s32(option_x, option_y+20*3);
+ Environment->addCheckBox(m_data->opaque_water, rect, this,
+ GUI_ID_OPAQUE_WATER_CB, wgettext("Opaque water"));
+ }
+ // Key change button
+ {
+ core::rect<s32> rect(0, 0, 120, 30);
+ /*rect += m_topleft_client + v2s32(m_size_client.X-120-30,
+ m_size_client.Y-30-20);*/
+ rect += m_topleft_client + v2s32(option_x, option_y+120);
+ Environment->addButton(rect, this,
+ GUI_ID_CHANGE_KEYS_BUTTON, wgettext("Change keys"));
+ }
+ changeCtype("C");
+ }
else if(m_data->selected_tab == TAB_CREDITS)
{
// CREDITS
{
- core::rect<s32> rect(0, 0, 20, 200);
- rect += m_topleft_client + v2s32(15, 60);
+ core::rect<s32> rect(0, 0, 10, m_size_client.Y);
+ rect += m_topleft_client + v2s32(15, 0);
const wchar_t *text = L"C\nR\nE\nD\nI\nT\nS";
- //gui::IGUIStaticText *t =
- Environment->addStaticText(text, rect, false, true, this, -1);
- //t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT);
+ gui::IGUIStaticText *t =
+ Environment->addStaticText(text, rect, false, false, this, -1);
+ t->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER);
}
{
core::rect<s32> rect(0, 0, 620, 250);
- rect += m_topleft_client + v2s32(150+14, 50+35);
+ rect += m_topleft_client + v2s32(130+14, 50+35);
Environment->addStaticText(narrow_to_wide(
"Minetest-c55 " VERSION_STRING "\n"
"http://c55.me/minetest/\n"
driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
}
}
+ else if(getTab() == TAB_SETTINGS)
+ {
+ {
+ core::rect<s32> rect(0, 0, m_size_client.X, m_size_client.Y);
+ rect += AbsoluteRect.UpperLeftCorner + m_topleft_client;
+ driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect);
+ }
+ }
else if(getTab() == TAB_CREDITS)
{
{
logosize *= 2;
core::rect<s32> rect(0,0,logosize.X,logosize.Y);
rect += AbsoluteRect.UpperLeftCorner + m_topleft_client;
- rect += v2s32(150, 50);
+ rect += v2s32(130, 50);
driver->draw2DImage(logotexture, rect,
core::rect<s32>(core::position2d<s32>(0,0),
core::dimension2di(logotexture->getSize())),
if(e != NULL && e->getType() == gui::EGUIET_TAB_CONTROL)
dst->selected_tab = ((gui::IGUITabControl*)e)->getActiveTab();
}
- if(getTab() == TAB_SINGLEPLAYER)
+ if(dst->selected_tab == TAB_SINGLEPLAYER)
{
- dst->name = L"singleplayer";
- dst->password = L"";
- dst->address = L"";
- dst->port = 30000;
+ dst->simple_singleplayer_mode = true;
}
else
{
+ dst->simple_singleplayer_mode = false;
{
gui::IGUIElement *e = getElementFromId(GUI_ID_NAME_INPUT);
if(e != NULL)
)->drop();
} else {
WorldSpec spec = m_data->worlds[cur.selected_world];
+ // Get files and directories involved
+ std::vector<std::string> paths;
+ paths.push_back(spec.path);
+ fs::GetRecursiveSubPaths(spec.path, paths);
+ // Launch confirmation dialog
ConfirmDestDeleteWorld *dest = new
- ConfirmDestDeleteWorld(spec, this);
+ ConfirmDestDeleteWorld(spec, this, paths);
+ std::wstring text = wgettext("Delete world");
+ text += L" \"";
+ text += narrow_to_wide(spec.name);
+ text += L"\"?\n\n";
+ text += wgettext("Files to be deleted");
+ text += L":\n";
+ for(u32 i=0; i<paths.size(); i++){
+ if(i == 3){ text += L"..."; break; }
+ text += narrow_to_wide(paths[i]) + L"\n";
+ }
(new GUIConfirmMenu(env, parent, -1, menumgr, dest,
- (std::wstring(wgettext("Delete world "))
- +L"\""+narrow_to_wide(spec.name)+L"\"?").c_str()
- ))->drop();
+ text.c_str()))->drop();
}
return true;
}
{
switch(event.GUIEvent.Caller->getID())
{
- case GUI_ID_WORLD_LISTBOX:
+ case GUI_ID_WORLD_LISTBOX:
acceptInput();
- m_data->address = L""; // Force local game
+ if(getTab() != TAB_SINGLEPLAYER)
+ m_data->address = L""; // Force local game
quitMenu();
return true;
}
quitMenu();
}
-void GUIMainMenu::deleteWorld(WorldSpec spec)
+void GUIMainMenu::deleteWorld(const std::vector<std::string> &paths)
{
- if(!spec.isValid())
- return;
+ // Delete files
+ bool did = fs::DeletePaths(paths);
+ if(!did){
+ GUIMessageMenu *menu = new GUIMessageMenu(env, parent,
+ -1, menumgr, wgettext("Failed to delete all world files"));
+ menu->drop();
+ }
+ // Quit menu to refresh it
acceptInput();
- m_data->delete_world_spec = spec;
+ m_data->only_refresh = true;
quitMenu();
}
projects / oweals / minetest.git / blobdiff