Skip to content

Commit

Permalink
GUI2: removed unused Campaign Settings dialog
Browse files Browse the repository at this point in the history
This was a dialog used early in 1.13 during the SP/MP codepath unification to configure certain options.
The modification selection is now built into the Selection dialog, and we decided not to enable other options
like Era selection in SP. The only option we might look to restoring in the future is the "show_connect"
option, but that requires some additional code elsewhere and probably won't be used anyway.
  • Loading branch information
Vultraz committed Apr 30, 2017
1 parent 804c7d6 commit b0f91e7
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 623 deletions.
333 changes: 0 additions & 333 deletions data/gui/window/campaign_settings.cfg

This file was deleted.

2 changes: 0 additions & 2 deletions projectfiles/CodeBlocks/wesnoth.cbp
Expand Up @@ -532,8 +532,6 @@
<Unit filename="../../src/gui/dialogs/campaign_difficulty.hpp" />
<Unit filename="../../src/gui/dialogs/campaign_selection.cpp" />
<Unit filename="../../src/gui/dialogs/campaign_selection.hpp" />
<Unit filename="../../src/gui/dialogs/campaign_settings.cpp" />
<Unit filename="../../src/gui/dialogs/campaign_settings.hpp" />
<Unit filename="../../src/gui/dialogs/chat_log.cpp" />
<Unit filename="../../src/gui/dialogs/chat_log.hpp" />
<Unit filename="../../src/gui/dialogs/core_selection.cpp" />
Expand Down
1 change: 0 additions & 1 deletion source_lists/wesnoth
Expand Up @@ -170,7 +170,6 @@ gui/dialogs/advanced_graphics_options.cpp
gui/dialogs/attack_predictions.cpp
gui/dialogs/campaign_difficulty.cpp
gui/dialogs/campaign_selection.cpp
gui/dialogs/campaign_settings.cpp
gui/dialogs/chat_log.cpp
gui/dialogs/core_selection.cpp
gui/dialogs/debug_clock.cpp
Expand Down
14 changes: 0 additions & 14 deletions src/gui/dialogs/campaign_selection.cpp
Expand Up @@ -20,7 +20,6 @@
#include "game_preferences.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
#include "gui/dialogs/campaign_settings.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/image.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
Expand Down Expand Up @@ -106,11 +105,6 @@ void campaign_selection::campaign_selected(window& window)

}

void campaign_selection::show_settings(CVideo& video) {
campaign_settings settings_dlg(engine_);
settings_dlg.show(video);
}

void campaign_selection::pre_show(window& window)
{
/***** Setup campaign tree. *****/
Expand Down Expand Up @@ -189,14 +183,6 @@ void campaign_selection::pre_show(window& window)
}

campaign_selected(window);

/***** Setup advanced settings button *****/
button* advanced_settings_button =
find_widget<button>(&window, "advanced_settings", false, false);
if(advanced_settings_button) {
advanced_settings_button->connect_click_handler(
std::bind(&campaign_selection::show_settings, this, std::ref(window.video())));
}
}

void campaign_selection::post_show(window& window)
Expand Down
2 changes: 0 additions & 2 deletions src/gui/dialogs/campaign_selection.hpp
Expand Up @@ -57,8 +57,6 @@ class campaign_selection : public modal_dialog
/** Inherited from modal_dialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;

void show_settings(CVideo& video);

/** Inherited from modal_dialog. */
virtual void pre_show(window& window) override;

Expand Down

0 comments on commit b0f91e7

Please sign in to comment.