Index: src/lang/english.txt =================================================================== --- src/lang/english.txt (revision 24121) +++ src/lang/english.txt (working copy) @@ -1013,7 +1013,7 @@ ############ range for difficulty levels ends STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON :{BLACK}Show hi-score chart -STR_DIFFICULTY_LEVEL_SAVE :{BLACK}Save +STR_DIFFICULTY_LEVEL_SAVE :{BLACK}Apply changes ############ range for difficulty settings starts STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS :{LTBLUE}Maximum no. competitors: {ORANGE}{COMMA} @@ -3557,10 +3557,9 @@ STR_AI_LIST_VERSION :{BLACK}Version: {NUM} STR_AI_LIST_URL :{BLACK}URL: {RAW_STRING} -STR_AI_LIST_ACCEPT :{BLACK}Accept +STR_AI_LIST_ACCEPT :{BLACK}Select STR_AI_LIST_ACCEPT_TOOLTIP :{BLACK}Select highlighted script STR_AI_LIST_CANCEL :{BLACK}Cancel -STR_AI_LIST_CANCEL_TOOLTIP :{BLACK}Don't change the script # AI Parameters STR_AI_SETTINGS_CAPTION :{WHITE}{STRING} Parameters Index: src/settings_gui.cpp =================================================================== --- src/settings_gui.cpp (revision 24121) +++ src/settings_gui.cpp (working copy) @@ -825,10 +825,6 @@ if (_game_mode == GM_EDITOR) StartupEconomy(); break; } - - case WID_GD_CANCEL: // Cancel button - close window, abandon changes - delete this; - break; } } @@ -909,7 +905,10 @@ /** Widget definition for the game difficulty settings window */ static const NWidgetPart _nested_game_difficulty_widgets[] = { - NWidget(WWT_CAPTION, COLOUR_MAUVE), SetDataTip(STR_DIFFICULTY_LEVEL_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(NWID_HORIZONTAL), + NWidget(WWT_CLOSEBOX, COLOUR_MAUVE), + NWidget(WWT_CAPTION, COLOUR_MAUVE), SetDataTip(STR_DIFFICULTY_LEVEL_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + EndContainer(), NWidget(WWT_PANEL, COLOUR_MAUVE), NWidget(NWID_VERTICAL), SetPIP(2, 0, 2), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 0, 10), @@ -935,7 +934,6 @@ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 0, 10), NWidget(NWID_SPACER), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GD_ACCEPT), SetDataTip(STR_DIFFICULTY_LEVEL_SAVE, STR_NULL), SetFill(1, 0), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_GD_CANCEL), SetDataTip(STR_BUTTON_CANCEL, STR_NULL), SetFill(1, 0), NWidget(NWID_SPACER), SetFill(1, 0), EndContainer(), EndContainer(), Index: src/widgets/ai_widget.h =================================================================== --- src/widgets/ai_widget.h (revision 24121) +++ src/widgets/ai_widget.h (working copy) @@ -22,7 +22,6 @@ WID_AIL_SCROLLBAR, ///< Scrollbar next to the AI list. WID_AIL_INFO_BG, ///< Panel to draw some AI information on. WID_AIL_ACCEPT, ///< Accept button. - WID_AIL_CANCEL, ///< Cancel button. }; /** Widgets of the #AISettingsWindow class. */ @@ -47,7 +46,6 @@ WID_AIC_MOVE_DOWN, ///< Move down button. WID_AIC_CHANGE, ///< Select another AI button. WID_AIC_CONFIGURE, ///< Change AI settings button. - WID_AIC_CLOSE, ///< Close window button. WID_AIC_TEXTFILE, ///< Open AI readme, changelog (+1) or license (+2). WID_AIC_CONTENT_DOWNLOAD = WID_AIC_TEXTFILE + TFT_END, ///< Download content button. }; Index: src/widgets/settings_widget.h =================================================================== --- src/widgets/settings_widget.h (revision 24121) +++ src/widgets/settings_widget.h (working copy) @@ -45,7 +45,6 @@ WID_GD_LVL_CUSTOM, ///< Custom level button. WID_GD_HIGHSCORE, ///< Highscore button. WID_GD_ACCEPT, ///< Accept button. - WID_GD_CANCEL, ///< Cancel button. WID_GD_OPTIONS_START, ///< Start of the options. }; Index: src/ai/ai_gui.cpp =================================================================== --- src/ai/ai_gui.cpp (revision 24121) +++ src/ai/ai_gui.cpp (working copy) @@ -196,10 +196,6 @@ delete this; break; } - - case WID_AIL_CANCEL: - delete this; - break; } } @@ -246,7 +242,6 @@ NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_AIL_ACCEPT), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_AI_LIST_ACCEPT, STR_AI_LIST_ACCEPT_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, WID_AIL_CANCEL), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_AI_LIST_CANCEL, STR_AI_LIST_CANCEL_TOOLTIP), EndContainer(), NWidget(WWT_RESIZEBOX, COLOUR_MAUVE), EndContainer(), @@ -600,7 +595,7 @@ NWidget(WWT_CLOSEBOX, COLOUR_MAUVE), NWidget(WWT_CAPTION, COLOUR_MAUVE), SetDataTip(STR_AI_CONFIG_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), - NWidget(WWT_PANEL, COLOUR_MAUVE, WID_AIC_BACKGROUND), + NWidget(WWT_PANEL, COLOUR_MAUVE, WID_AIC_BACKGROUND), SetPIP(0, 0, 7), NWidget(NWID_VERTICAL), SetPIP(4, 4, 4), NWidget(NWID_HORIZONTAL), SetPIP(7, 0, 7), NWidget(WWT_PUSHARROWBTN, COLOUR_YELLOW, WID_AIC_DECREASE), SetFill(0, 1), SetDataTip(AWV_DECREASE, STR_NULL), @@ -626,14 +621,13 @@ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7), NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CHANGE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CHANGE, STR_AI_CONFIG_CHANGE_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONFIGURE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CONFIGURE, STR_AI_CONFIG_CONFIGURE_TOOLTIP), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CLOSE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_SETTINGS_CLOSE, STR_NULL), + NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONTENT_DOWNLOAD), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT), EndContainer(), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7), NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_README, STR_NULL), NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_NULL), NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_LICENCE, STR_NULL), EndContainer(), - NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONTENT_DOWNLOAD), SetFill(1, 0), SetMinimalSize(279, 12), SetPadding(0, 7, 9, 7), SetDataTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT), EndContainer(), }; @@ -829,10 +823,6 @@ ShowAISettingsWindow((CompanyID)this->selected_slot); break; - case WID_AIC_CLOSE: - delete this; - break; - case WID_AIC_CONTENT_DOWNLOAD: if (!_network_available) { ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR); Index: src/script/api/game/game_window.hpp.sq =================================================================== --- src/script/api/game/game_window.hpp.sq (revision 24121) +++ src/script/api/game/game_window.hpp.sq (working copy) @@ -162,7 +162,6 @@ SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIL_SCROLLBAR, "WID_AIL_SCROLLBAR"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIL_INFO_BG, "WID_AIL_INFO_BG"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIL_ACCEPT, "WID_AIL_ACCEPT"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIL_CANCEL, "WID_AIL_CANCEL"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIS_CAPTION, "WID_AIS_CAPTION"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIS_BACKGROUND, "WID_AIS_BACKGROUND"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIS_SCROLLBAR, "WID_AIS_SCROLLBAR"); @@ -179,7 +178,6 @@ SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIC_MOVE_DOWN, "WID_AIC_MOVE_DOWN"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIC_CHANGE, "WID_AIC_CHANGE"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIC_CONFIGURE, "WID_AIC_CONFIGURE"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIC_CLOSE, "WID_AIC_CLOSE"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIC_TEXTFILE, "WID_AIC_TEXTFILE"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AIC_CONTENT_DOWNLOAD, "WID_AIC_CONTENT_DOWNLOAD"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_AID_VIEW, "WID_AID_VIEW"); @@ -985,7 +983,6 @@ SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GD_LVL_CUSTOM, "WID_GD_LVL_CUSTOM"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GD_HIGHSCORE, "WID_GD_HIGHSCORE"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GD_ACCEPT, "WID_GD_ACCEPT"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GD_CANCEL, "WID_GD_CANCEL"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GD_OPTIONS_START, "WID_GD_OPTIONS_START"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GS_OPTIONSPANEL, "WID_GS_OPTIONSPANEL"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_GS_SCROLLBAR, "WID_GS_SCROLLBAR"); Index: src/script/api/script_window.hpp =================================================================== --- src/script/api/script_window.hpp (revision 24121) +++ src/script/api/script_window.hpp (working copy) @@ -817,7 +817,6 @@ WID_AIL_SCROLLBAR = ::WID_AIL_SCROLLBAR, ///< Scrollbar next to the AI list. WID_AIL_INFO_BG = ::WID_AIL_INFO_BG, ///< Panel to draw some AI information on. WID_AIL_ACCEPT = ::WID_AIL_ACCEPT, ///< Accept button. - WID_AIL_CANCEL = ::WID_AIL_CANCEL, ///< Cancel button. }; /** Widgets of the #AISettingsWindow class. */ @@ -842,7 +841,6 @@ WID_AIC_MOVE_DOWN = ::WID_AIC_MOVE_DOWN, ///< Move down button. WID_AIC_CHANGE = ::WID_AIC_CHANGE, ///< Select another AI button. WID_AIC_CONFIGURE = ::WID_AIC_CONFIGURE, ///< Change AI settings button. - WID_AIC_CLOSE = ::WID_AIC_CLOSE, ///< Close window button. WID_AIC_TEXTFILE = ::WID_AIC_TEXTFILE, ///< Open Script readme, changelog (+1) or license (+2). WID_AIC_CONTENT_DOWNLOAD = ::WID_AIC_CONTENT_DOWNLOAD, ///< Download content button. }; @@ -1980,7 +1978,6 @@ WID_GD_LVL_CUSTOM = ::WID_GD_LVL_CUSTOM, ///< Custom level button. WID_GD_HIGHSCORE = ::WID_GD_HIGHSCORE, ///< Highscore button. WID_GD_ACCEPT = ::WID_GD_ACCEPT, ///< Accept button. - WID_GD_CANCEL = ::WID_GD_CANCEL, ///< Cancel button. WID_GD_OPTIONS_START = ::WID_GD_OPTIONS_START, ///< Start of the options. };