Revert "Convert Scenario Status/Settings dialog pair to GUI2"

This reverts commit bb49be8.
wesnoth · Aug 10, 2016 · 8a9a466 · 8a9a466
1 parent bb49be8
commit 8a9a466
Show file tree

Hide file tree

Showing 9 changed files with 236 additions and 1,146 deletions.
diff --git a/data/gui/window/game_stats.cfg b/data/gui/window/game_stats.cfg
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -556,8 +556,6 @@
 		<Unit filename="../../src/gui/dialogs/game_load.hpp" />
 		<Unit filename="../../src/gui/dialogs/game_save.cpp" />
 		<Unit filename="../../src/gui/dialogs/game_save.hpp" />
-		<Unit filename="../../src/gui/dialogs/game_stats.cpp" />
-		<Unit filename="../../src/gui/dialogs/game_stats.hpp" />
 		<Unit filename="../../src/gui/dialogs/game_version.cpp" />
 		<Unit filename="../../src/gui/dialogs/game_version.hpp" />
 		<Unit filename="../../src/gui/dialogs/gamestate_inspector.cpp" />

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -808,7 +808,6 @@ set(wesnoth-main_SRC
 	gui/dialogs/game_delete.cpp
 	gui/dialogs/game_load.cpp
 	gui/dialogs/game_save.cpp
-	gui/dialogs/game_stats.cpp
 	gui/dialogs/game_version.cpp
 	gui/dialogs/gamestate_inspector.cpp
 	gui/dialogs/label_settings.cpp

diff --git a/src/SConscript b/src/SConscript
@@ -385,7 +385,6 @@ wesnoth_sources = Split("""
     gui/dialogs/game_delete.cpp
     gui/dialogs/game_load.cpp
     gui/dialogs/game_save.cpp
-    gui/dialogs/game_stats.cpp
     gui/dialogs/game_version.cpp
     gui/dialogs/gamestate_inspector.cpp
     gui/dialogs/label_settings.cpp

diff --git a/src/gui/dialogs/game_stats.cpp b/src/gui/dialogs/game_stats.cpp
diff --git a/src/gui/dialogs/game_stats.hpp → src/gui/dialogs/unit_advance.hpp b/src/gui/dialogs/game_stats.hpp → src/gui/dialogs/unit_advance.hpp
@@ -11,59 +11,42 @@
    See the COPYING file for more details.
 */
 
-#ifndef GUI_DIALOGS_GAME_STATS_HPP_INCLUDED
-#define GUI_DIALOGS_GAME_STATS_HPP_INCLUDED
+#ifndef GUI_DIALOGS_UNIT_RECRUIT_HPP_INCLUDED
+#define GUI_DIALOGS_UNIT_RECRUIT_HPP_INCLUDED
 
 #include "gui/dialogs/dialog.hpp"
-#include "map/location.hpp"
 #include "units/ptr.hpp"
 
-#include <memory>
-#include <string>
-#include <vector>
+namespace gui2 {
 
-class display;
-class game_board;
-class team;
-class team_data;
-
-namespace gui2
-{
-
-class ttext_;
-
-class tgame_stats : public tdialog
+class tunit_advance : public tdialog
 {
+	typedef std::vector<unit_const_ptr> unit_ptr_vector;
 public:
-	tgame_stats(game_board& board, const int viewing_team);
+	tunit_advance(const unit_ptr_vector& samples, size_t real);
 
 	int get_selected_index() const
 	{
 		return selected_index_;
 	}
 
 private:
-	// TODO: don't like having this
-	game_board& board_;
-
-	const team& viewing_team_;
-
-	std::vector<team_data> team_data_;
-
-	int selected_index_;
-
-	void on_tab_select(twindow& window);
-
 	/** Inherited from tdialog, implemented by REGISTER_DIALOG. */
 	virtual const std::string& window_id() const;
 
 	/** Inherited from tdialog. */
 	void pre_show(twindow& window);
-
-	/** Inherited from tdialog. */
 	void post_show(twindow& window);
+
+	void list_item_clicked(twindow& window);
+
+	void show_help(twindow& window);
+
+	const unit_ptr_vector& previews_;
+
+	size_t selected_index_, real_;
 };
 
 } // namespace gui2
 
-#endif /* ! GUI_DIALOGS_GAME_STATS_HPP_INCLUDED */
+#endif /* ! GUI_DIALOGS_UNIT_RECRUIT_HPP_INCLUDED */