0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MP Game Set Password: removed unused dialog

Browse source 
This functionality was integrated into the new GUI2 MP Create screen, sans dialog prompt.
This commit is contained in:
Charles Dang 2016-11-20 00:50:41 +11:00
parent c7646bbcdf
commit 32d69b9c2c
6 changed files with 0 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
projectfiles/CodeBlocks/wesnoth.cbp
View file

@ -616,8 +616,6 @@
<Unit filename="../../src/gui/dialogs/multiplayer/mp_connect.hpp" />
<Unit filename="../../src/gui/dialogs/multiplayer/mp_create_game.cpp" />
<Unit filename="../../src/gui/dialogs/multiplayer/mp_create_game.hpp" />
<Unit filename="../../src/gui/dialogs/multiplayer/mp_create_game_set_password.cpp" />
<Unit filename="../../src/gui/dialogs/multiplayer/mp_create_game_set_password.hpp" />
<Unit filename="../../src/gui/dialogs/multiplayer/mp_host_game_prompt.cpp" />
<Unit filename="../../src/gui/dialogs/multiplayer/mp_host_game_prompt.hpp" />
<Unit filename="../../src/gui/dialogs/multiplayer/mp_join_game.cpp" />

1
src/CMakeLists.txt
View file

@ -798,7 +798,6 @@ set(wesnoth-main_SRC
gui/dialogs/multiplayer/mp_cmd_wrapper.cpp
gui/dialogs/multiplayer/mp_connect.cpp
gui/dialogs/multiplayer/mp_create_game.cpp
gui/dialogs/multiplayer/mp_create_game_set_password.cpp
gui/dialogs/multiplayer/mp_host_game_prompt.cpp
gui/dialogs/multiplayer/mp_join_game.cpp
gui/dialogs/multiplayer/mp_join_game_password_prompt.cpp

1
src/SConscript
View file

@ -396,7 +396,6 @@ wesnoth_sources = Split("""
gui/dialogs/multiplayer/mp_change_control.cpp
gui/dialogs/multiplayer/mp_cmd_wrapper.cpp
gui/dialogs/multiplayer/mp_connect.cpp
gui/dialogs/multiplayer/mp_create_game_set_password.cpp
gui/dialogs/multiplayer/mp_create_game.cpp
gui/dialogs/multiplayer/mp_host_game_prompt.cpp
gui/dialogs/multiplayer/mp_join_game.cpp

52
src/gui/dialogs/multiplayer/mp_create_game_set_password.cpp
View file

@ -1,52 +0,0 @@
/*
Copyright (C) 2010 - 2016 by Ignacio Riquelme Morelle <shadowm2006@gmail.com>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
See the COPYING file for more details.
*/
#define GETTEXT_DOMAIN "wesnoth-lib"
#include "gui/dialogs/multiplayer/mp_create_game_set_password.hpp"
//#include "gui/dialogs/field.hpp"
#include "gui/widgets/settings.hpp"
namespace gui2
{
namespace dialogs
{
/*WIKI
* @page = GUIWindowDefinitionWML
* @order = 2_mp_create_game_set_password
*
* == Create Game: Set Password ==
*
* Dialog for setting a join password for MP games.
*
* @begin{table}{dialog_widgets}
*
* password & & text_box & m &
* Input field for the game password. $
*
* @end{table}
*/
REGISTER_DIALOG(mp_create_game_set_password)
mp_create_game_set_password::mp_create_game_set_password(
std::string& password)
{
register_text("password", true, password, true);
}
} // namespace dialogs
} // namespace gui2

53
src/gui/dialogs/multiplayer/mp_create_game_set_password.hpp
View file

@ -1,53 +0,0 @@
/*
Copyright (C) 2010 - 2016 by Ignacio Riquelme Morelle <shadowm2006@gmail.com>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
See the COPYING file for more details.
*/
#ifndef GUI_DIALOGS_MP_CREATE_GAME_SET_PASSWORD_HPP_INCLUDED
#define GUI_DIALOGS_MP_CREATE_GAME_SET_PASSWORD_HPP_INCLUDED
#include "gui/dialogs/dialog.hpp"
namespace gui2
{
namespace dialogs
{
class mp_create_game_set_password : public modal_dialog
{
public:
/**
* Constructor.
*
* @param [in, out] password The parameter's usage is:
* - Input: The initial value for the password.
* - Output: The password selected by the user
* if the dialog returns @ref window::OK
* undefined otherwise.
*/
explicit mp_create_game_set_password(std::string& password);
/** The excute function see @ref modal_dialog for more information. */
static bool execute(std::string& password, CVideo& video)
{
return mp_create_game_set_password(password).show(video);
}
private:
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const;
};
} // namespace dialogs
} // namespace gui2
#endif /* ! GUI_DIALOGS_MP_CREATE_GAME_SET_PASSWORD_HPP_INCLUDED */

12
src/tests/gui/test_gui2.cpp
View file

@ -75,7 +75,6 @@
#include "gui/dialogs/multiplayer/mp_cmd_wrapper.hpp"
#include "gui/dialogs/multiplayer/mp_connect.hpp"
#include "gui/dialogs/multiplayer/mp_create_game.hpp"
#include "gui/dialogs/multiplayer/mp_create_game_set_password.hpp"
#include "gui/dialogs/multiplayer/mp_join_game.hpp"
#include "gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp"
#include "gui/dialogs/multiplayer/mp_staging.hpp"
@ -429,7 +428,6 @@ BOOST_AUTO_TEST_CASE(test_gui2)
test<mp_cmd_wrapper>();
test<mp_connect>();
//test<mp_create_game>();
test<mp_create_game_set_password>();
//test<mp_join_game>();
test<mp_join_game_password_prompt>();
test<mp_login>();
@ -883,16 +881,6 @@ struct dialog_tester<mp_create_game>
}
};
template<>
struct dialog_tester<mp_create_game_set_password>
{
std::string password;
mp_create_game_set_password* create()
{
return new mp_create_game_set_password(password);
}
};
template<>
struct dialog_tester<mp_join_game_password_prompt>
{