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

GUI2: Remove Generate Name option from the --new-widget unit-create dialog

Browse source 
It's useless now that units get names by default.
This commit is contained in:
Ignacio R. Morelle 2010-11-29 20:12:47 +00:00
parent d2e8a145d7
commit 0166cc06e3
4 changed files with 0 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
data/gui/default/window/unit_create.cfg
View file

@ -85,21 +85,6 @@
[/column] [/column]
[/row] [/row]
[row]
grow_factor = 0
[column]
horizontal_alignment = "right"
[toggle_button]
id = "namegen_toggle"
definition = "default"
label= _ "Generate name"
[/toggle_button]
[/column]
[/row]
[row] [row]
grow_factor = 0 grow_factor = 0

9
src/gui/dialogs/unit_create.cpp
View file

@ -32,7 +32,6 @@
namespace { namespace {
static std::string last_chosen_type_id = ""; static std::string last_chosen_type_id = "";
static bool last_generate_names_value = true;
static unit_race::GENDER last_gender = unit_race::MALE; static unit_race::GENDER last_gender = unit_race::MALE;
/** /**
@ -56,7 +55,6 @@ REGISTER_WINDOW(unit_create)
tunit_create::tunit_create() tunit_create::tunit_create()
: gender_(last_gender) : gender_(last_gender)
, generate_name_(last_generate_names_value)
, choice_(last_chosen_type_id) , choice_(last_chosen_type_id)
, type_ids_() , type_ids_()
{ {
@ -68,8 +66,6 @@ void tunit_create::pre_show(CVideo& /*video*/, twindow& window)
&window, "male_toggle", false); &window, "male_toggle", false);
ttoggle_button& female_toggle = find_widget<ttoggle_button>( ttoggle_button& female_toggle = find_widget<ttoggle_button>(
&window, "female_toggle", false); &window, "female_toggle", false);
ttoggle_button& namegen_toggle = find_widget<ttoggle_button>(
&window, "namegen_toggle", false);
tlistbox& list = find_widget<tlistbox>(&window, "unit_type_list", false); tlistbox& list = find_widget<tlistbox>(&window, "unit_type_list", false);
male_toggle.set_callback_state_change( male_toggle.set_callback_state_change(
@ -79,7 +75,6 @@ void tunit_create::pre_show(CVideo& /*video*/, twindow& window)
dialog_callback<tunit_create, &tunit_create::gender_toggle_callback> dialog_callback<tunit_create, &tunit_create::gender_toggle_callback>
); );
update_male_female_toggles(male_toggle, female_toggle, gender_); update_male_female_toggles(male_toggle, female_toggle, gender_);
namegen_toggle.set_value(generate_name_);
list.clear(); list.clear();
// We use this container to "map" unit_type ids to list subscripts // We use this container to "map" unit_type ids to list subscripts
@ -126,8 +121,6 @@ void tunit_create::post_show(twindow& window)
{ {
ttoggle_button& female_toggle = find_widget<ttoggle_button>( ttoggle_button& female_toggle = find_widget<ttoggle_button>(
&window, "female_toggle", false); &window, "female_toggle", false);
ttoggle_button& namegen_toggle = find_widget<ttoggle_button>(
&window, "namegen_toggle", false);
tlistbox& list = find_widget<tlistbox>(&window, "unit_type_list", false); tlistbox& list = find_widget<tlistbox>(&window, "unit_type_list", false);
choice_ = ""; choice_ = "";
@ -150,8 +143,6 @@ void tunit_create::post_show(twindow& window)
type_ids_[static_cast<size_t>(selected_row)]; type_ids_[static_cast<size_t>(selected_row)];
last_gender = gender_ = last_gender = gender_ =
female_toggle.get_value() ? unit_race::FEMALE : unit_race::MALE; female_toggle.get_value() ? unit_race::FEMALE : unit_race::MALE;
last_generate_names_value = generate_name_ =
namegen_toggle.get_value();
} }
void tunit_create::gender_toggle_callback(twindow& window) void tunit_create::gender_toggle_callback(twindow& window)

4
src/gui/dialogs/unit_create.hpp
View file

@ -35,15 +35,11 @@ public:
/** Whether the user actually chose a unit type or not. */ /** Whether the user actually chose a unit type or not. */
bool no_choice() const { return choice_.empty(); } bool no_choice() const { return choice_.empty(); }
/** User's choice whether to create a unit with a random name. */
bool generate_name() const { return generate_name_; }
/** Gender choice from the user. */ /** Gender choice from the user. */
unit_race::GENDER gender() { return gender_; } unit_race::GENDER gender() { return gender_; }
private: private:
unit_race::GENDER gender_; unit_race::GENDER gender_;
bool generate_name_;
std::string choice_; std::string choice_;
std::vector<std::string> type_ids_; std::vector<std::string> type_ids_;

5
src/menu_events.cpp
View file

@ -1463,7 +1463,6 @@ void menu_handler::create_unit_2(mouse_handler& mousehandler)
const unit_type &ut = *utp; const unit_type &ut = *utp;
unit_race::GENDER gender = create_dlg.gender(); unit_race::GENDER gender = create_dlg.gender();
const bool generate_name = create_dlg.generate_name();
// Do not try to set bad genders, may mess up l10n // Do not try to set bad genders, may mess up l10n
// FIXME: is this actually necessary? // FIXME: is this actually necessary?
@ -1474,10 +1473,6 @@ void menu_handler::create_unit_2(mouse_handler& mousehandler)
unit chosen(&ut, 1, true, gender); unit chosen(&ut, 1, true, gender);
chosen.new_turn(); chosen.new_turn();
//FIXME: the generate name option seems useless now, remove it
if(!generate_name)
chosen.set_name("");
const map_location& loc = mousehandler.get_last_hex(); const map_location& loc = mousehandler.get_last_hex();
units_.replace(loc, chosen); units_.replace(loc, chosen);