GUI2: added display and execute wrappers for a bunch more dialogs

Made use of them where applicable. There are a whole bunch of cases where the dialog object only exists to check its return value, but I'll update those separately.
wesnoth · Oct 19, 2019 · c15cb06 · c15cb06
1 parent 8587a14
commit c15cb06
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 27 deletions.
diff --git a/src/addon/client.cpp b/src/addon/client.cpp
@@ -390,9 +390,7 @@ addons_client::install_result addons_client::do_resolve_addon_dependencies(const
 			options[dep] = addons.at(dep);
 		}
 
-		gui2::dialogs::install_dependencies dlg(options);
-		bool cont = dlg.show();
-		if(!cont) {
+		if(!gui2::dialogs::install_dependencies::execute(options)) {
 			return result; // the user has chosen to continue without installing anything.
 		}
 	}

diff --git a/src/formula/debugger.cpp b/src/formula/debugger.cpp
@@ -157,8 +157,7 @@ void formula_debugger::show_gui()
 		return;
 	}
 	if (game_config::debug) {
-		gui2::dialogs::formula_debugger debug_dialog(*this);
-		debug_dialog.show();
+		gui2::dialogs::formula_debugger::display(*this);
 	} else {
 		WRN_FDB << "do not showing debug window due to disabled --new-widgets"<< std::endl;
 	}

diff --git a/src/game_initialization/depcheck.cpp b/src/game_initialization/depcheck.cpp
@@ -440,8 +440,7 @@ bool manager::enable_mods_dialog(const std::vector<std::string>& mods, const std
 		items.push_back(depinfo_.find_child("modification", "id", mod)["name"]);
 	}
 
-	gui2::dialogs::depcheck_confirm_change dialog(true, items, requester);
-	return dialog.show();
+	return gui2::dialogs::depcheck_confirm_change::execute(true, items, requester);
 }
 
 bool manager::disable_mods_dialog(const std::vector<std::string>& mods, const std::string& requester)
@@ -451,8 +450,7 @@ bool manager::disable_mods_dialog(const std::vector<std::string>& mods, const st
 		items.push_back(depinfo_.find_child("modification", "id", mod)["name"]);
 	}
 
-	gui2::dialogs::depcheck_confirm_change dialog(false, items, requester);
-	return dialog.show();
+	return gui2::dialogs::depcheck_confirm_change::execute(false, items, requester);
 }
 
 std::string manager::change_era_dialog(const std::vector<std::string>& eras)

diff --git a/src/game_initialization/multiplayer.cpp b/src/game_initialization/multiplayer.cpp
@@ -651,8 +651,7 @@ bool goto_mp_connect(ng::connect_engine& engine, wesnothd_connection* connection
 {
 	lobby_info li({});
 
-	gui2::dialogs::mp_staging dlg(engine, li, connection);
-	return dlg.show();
+	return gui2::dialogs::mp_staging::execute(engine, li, connection);
 }
 
 bool goto_mp_wait(saved_game& state, wesnothd_connection* connection, bool observe)

diff --git a/src/gui/dialogs/addon/install_dependencies.hpp b/src/gui/dialogs/addon/install_dependencies.hpp
@@ -30,6 +30,8 @@ class install_dependencies : public modal_dialog
 		: addons_(addons)
 	{}
 
+	DEFINE_SIMPLE_EXECUTE_WRAPPER(install_dependencies)
+
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
 	virtual const std::string& window_id() const override;

diff --git a/src/gui/dialogs/chat_log.hpp b/src/gui/dialogs/chat_log.hpp
@@ -32,6 +32,8 @@ class chat_log : public modal_dialog
 	class controller;
 	chat_log(const vconfig& cfg, const replay& replay);
 
+	DEFINE_SIMPLE_DISPLAY_WRAPPER(chat_log)
+
 	/** Inherited from modal_dialog. */
 	virtual void pre_show(window& window) override;
 

diff --git a/src/gui/dialogs/depcheck_confirm_change.hpp b/src/gui/dialogs/depcheck_confirm_change.hpp
@@ -39,6 +39,8 @@ class depcheck_confirm_change : public modal_dialog
 								const std::vector<std::string>& mods,
 								const std::string& requester);
 
+	DEFINE_SIMPLE_EXECUTE_WRAPPER(depcheck_confirm_change)
+
 protected:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
 	virtual const std::string& window_id() const override;

diff --git a/src/gui/dialogs/formula_debugger.hpp b/src/gui/dialogs/formula_debugger.hpp
@@ -33,6 +33,8 @@ class formula_debugger : public modal_dialog
 	{
 	}
 
+	DEFINE_SIMPLE_DISPLAY_WRAPPER(formula_debugger)
+
 private:
 	/** Inherited from modal_dialog. */
 	virtual void pre_show(window& window) override;

diff --git a/src/gui/dialogs/game_save.hpp b/src/gui/dialogs/game_save.hpp
@@ -26,11 +26,7 @@ class game_save : public modal_dialog
 public:
 	game_save(std::string& filename, const std::string& title);
 
-	static bool
-	execute(std::string& filename, const std::string& title)
-	{
-		return game_save(filename, title).show();
-	}
+	DEFINE_SIMPLE_EXECUTE_WRAPPER(game_save)
 
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */

diff --git a/src/gui/dialogs/gamestate_inspector.hpp b/src/gui/dialogs/gamestate_inspector.hpp
@@ -33,6 +33,8 @@ class gamestate_inspector : public modal_dialog
 	class controller;
 	gamestate_inspector(const config& vars, const game_events::manager& events, const display_context& dc, const std::string& title = "");
 
+	DEFINE_SIMPLE_DISPLAY_WRAPPER(gamestate_inspector);
+
 private:
 	/** Inherited from modal_dialog. */
 	virtual void pre_show(window& window) override;

diff --git a/src/gui/dialogs/multiplayer/mp_change_control.hpp b/src/gui/dialogs/multiplayer/mp_change_control.hpp
@@ -34,6 +34,8 @@ class mp_change_control : public modal_dialog
 public:
 	explicit mp_change_control(events::menu_handler& mh);
 
+	DEFINE_SIMPLE_DISPLAY_WRAPPER(mp_change_control)
+
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
 	virtual const std::string& window_id() const override;

diff --git a/src/gui/dialogs/multiplayer/mp_staging.hpp b/src/gui/dialogs/multiplayer/mp_staging.hpp
@@ -45,6 +45,8 @@ class mp_staging : public modal_dialog, private plugin_executor
 
 	~mp_staging();
 
+	DEFINE_SIMPLE_EXECUTE_WRAPPER(mp_staging)
+
 private:
 	/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
 	virtual const std::string& window_id() const override;

diff --git a/src/gui/dialogs/multiplayer/synced_choice_wait.hpp b/src/gui/dialogs/multiplayer/synced_choice_wait.hpp
@@ -28,6 +28,9 @@ class synched_choice_wait : public modal_dialog, public events::observer
 public:
 	explicit synched_choice_wait(user_choice_manager& mgr);
 	~synched_choice_wait();
+
+	DEFINE_SIMPLE_DISPLAY_WRAPPER(synched_choice_wait)
+
 private:
 	user_choice_manager& mgr_;
 	label* message_;

diff --git a/src/gui/dialogs/transient_message.hpp b/src/gui/dialogs/transient_message.hpp
@@ -31,6 +31,8 @@ class transient_message : public modal_dialog
 					   const bool message_use_markup,
 					   const std::string& image);
 
+	DEFINE_SIMPLE_DISPLAY_WRAPPER(transient_message)
+
 private:
 	bool hide_title_;
 	bool hide_image_;

diff --git a/src/menu_events.cpp b/src/menu_events.cpp
@@ -205,8 +205,7 @@ void menu_handler::show_chat_log()
 {
 	config c;
 	c["name"] = "prototype of chat log";
-	gui2::dialogs::chat_log chat_log_dialog(vconfig(c), *resources::recorder);
-	chat_log_dialog.show();
+	gui2::dialogs::chat_log::display(vconfig(c), *resources::recorder);
 	// std::string text = resources::recorder->build_chat_log();
 	// gui::show_dialog(*gui_,nullptr,_("Chat Log"),"",gui::CLOSE_ONLY,nullptr,nullptr,"",&text);
 }
@@ -1923,15 +1922,13 @@ void console_handler::do_show_var()
 void console_handler::do_inspect()
 {
 	vconfig cfg = vconfig::empty_vconfig();
-	gui2::dialogs::gamestate_inspector inspect_dialog(
-			resources::gamedata->get_variables(), *resources::game_events, *resources::gameboard);
-	inspect_dialog.show();
+	gui2::dialogs::gamestate_inspector::display(
+		resources::gamedata->get_variables(), *resources::game_events, *resources::gameboard);
 }
 
 void console_handler::do_control_dialog()
 {
-	gui2::dialogs::mp_change_control mp_change_control(menu_handler_);
-	mp_change_control.show();
+	gui2::dialogs::mp_change_control::display(menu_handler_);
 }
 
 void console_handler::do_unit()

diff --git a/src/scripting/lua_gui2.cpp b/src/scripting/lua_gui2.cpp
@@ -917,8 +917,7 @@ int show_lua_console(lua_State* /*L*/, lua_kernel_base* lk)
 
 int show_gamestate_inspector(const vconfig& cfg, const game_data& data, const game_state& state)
 {
-	gui2::dialogs::gamestate_inspector inspect_dialog(data.get_variables(), *state.events_manager_, state.board_, cfg["name"]);
-	inspect_dialog.show();
+	gui2::dialogs::gamestate_inspector::display(data.get_variables(), *state.events_manager_, state.board_, cfg["name"]);
 	return 0;
 }
 

diff --git a/src/synced_user_choice.cpp b/src/synced_user_choice.cpp
@@ -400,8 +400,7 @@ static void wait_ingame(user_choice_manager& man)
 
 static void wait_prestart(user_choice_manager& man)
 {
-	gui2::dialogs::synched_choice_wait scw(man);
-	scw.show();
+	gui2::dialogs::synched_choice_wait::display(man);
 }
 
 std::map<int, config> user_choice_manager::get_user_choice_internal(const std::string &name, const mp_sync::user_choice &uch, const std::set<int>& sides)