diff --git a/data/gui/window/campaign_settings.cfg b/data/gui/window/campaign_settings.cfg deleted file mode 100644 index 586ac7faedc7..000000000000 --- a/data/gui/window/campaign_settings.cfg +++ /dev/null @@ -1,333 +0,0 @@ -#textdomain wesnoth-lib - -[window] - id = "campaign_settings" - description = "Singleplayer advanced settings dialog." - - [resolution] - definition = "default" - - maximum_width = 800 - - automatic_placement = true - vertical_placement = "center" - horizontal_placement = "center" - - [linked_group] - id = "era" - fixed_width = true - [/linked_group] - - [linked_group] - id = "mod" - fixed_width = true - [/linked_group] - - [tooltip] - id = "tooltip" - [/tooltip] - - [helptip] - id = "tooltip" - [/helptip] - - [grid] - - [row] - grow_factor = 0 - - [column] - grow_factor = 1 - - border = "all" - border_size = 5 - horizontal_alignment = "left" - [label] - definition = "title" - - label = _ "Advanced Settings" - [/label] - - [/column] - - [column] - - horizontal_grow = true - vertical_grow = true - - [spacer] - [/spacer] - - [/column] - - [/row] - - [row] - - [column] - grow_factor = 1 - - border = "all" - border_size = 5 - horizontal_alignment = "left" - - [label] - definition = "default" - - label = _ "Additional dialogs:" - [/label] - - [/column] - - [column] - - [spacer] - [/spacer] - - [/column] - - [/row] - - [row] - - [column] - grow_factor = 1 - - border = "all" - border_size = 5 - horizontal_alignment = "left" - - [spacer] - [/spacer] - - [/column] - - [column] - grow_factor = 1 - - border = "all" - border_size = 5 - horizontal_alignment = "left" - - [toggle_button] - definition = "default" - id = "mp_connect" - - label = _ "Configure sides" - [/toggle_button] - - [/column] - - [/row] - - [row] - [column] - [spacer] - height = 5 - [/spacer] - [/column] - [column] - [spacer] - height = 5 - [/spacer] - [/column] - [/row] - - [row] - - [column] - - horizontal_grow = true - vertical_grow = true - - [grid] - - [row] - grow_factor = 0 - - [column] - border = "all" - border_size = 5 - horizontal_grow = true - - [label] - definition = "default" - id = "era_label" - - label = _ "Era:" - [/label] - - [/column] - - [/row] - - [row] - grow_factor = 1 - - [column] - border = "all" - border_size = 5 - - horizontal_grow = true - vertical_grow = true - - [listbox] - id = "era_list" - definition = "default" - - [list_definition] - - [row] - - [column] - horizontal_grow = true - vertical_grow = true - - [toggle_panel] - definition = "default" - - [grid] - - [row] - - [column] - horizontal_grow = true - vertical_grow = true - border = "all" - border_size = 5 - - [label] - id = "era" - linked_group = "era" - definition = "default" - [/label] - - [/column] - - [/row] - - [/grid] - - [/toggle_panel] - - [/column] - - [/row] - - [/list_definition] - - [/listbox] - - [/column] - - [/row] - - [/grid] - - [/column] - - [column] - horizontal_grow = true - vertical_grow = true - - [grid] - - [row] - - [column] - border = "all" - border_size = 5 - horizontal_grow = true - - [label] - definition = "default" - id = "mod_label" - - label = _ "Modifications:" - [/label] - - [/column] - - [/row] - - [row] - - [column] - border = "all" - border_size = 5 - - horizontal_grow = true - vertical_grow = true - - [listbox] - id = "modification_list" - definition = "default" - has_minimum = false - has_maximum = false - - [list_definition] - - [row] - - [column] - horizontal_grow = true - vertical_grow = true - border = "all" - border_size = 5 - - [toggle_button] - id = "mod" - linked_group = "mod" - definition = "default" - [/toggle_button] - - [/column] - - [/row] - - [/list_definition] - - [/listbox] - - [/column] - - [/row] - - [/grid] - - [/column] - - [/row] - - [row] - grow_factor = 0 - - [column] - - [spacer] - [/spacer] - - [/column] - - [column] - border = "all" - border_size = 5 - - horizontal_alignment = "right" - - [button] - id = "ok" - definition = "default" - - label = _ "OK" - [/button] - - [/column] - - [/row] - - [/grid] - - [/resolution] - -[/window] diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp index 786123fc3a0d..0af01f38a3b0 100644 --- a/projectfiles/CodeBlocks/wesnoth.cbp +++ b/projectfiles/CodeBlocks/wesnoth.cbp @@ -532,8 +532,6 @@ - - diff --git a/source_lists/wesnoth b/source_lists/wesnoth index 50ca444aa1eb..5f0c81ecbd83 100644 --- a/source_lists/wesnoth +++ b/source_lists/wesnoth @@ -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 diff --git a/src/gui/dialogs/campaign_selection.cpp b/src/gui/dialogs/campaign_selection.cpp index edf80c06538e..1d77894f1471 100644 --- a/src/gui/dialogs/campaign_selection.cpp +++ b/src/gui/dialogs/campaign_selection.cpp @@ -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 @@ -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. *****/ @@ -189,14 +183,6 @@ void campaign_selection::pre_show(window& window) } campaign_selected(window); - - /***** Setup advanced settings button *****/ - button* advanced_settings_button = - find_widget