Merge branch 'master' into jgrpp

src/widgets/bootstrap_widget.h

@@ -15,6 +15,13 @@ enum BootstrapBackgroundWidgets {
 	WID_BB_BACKGROUND, ///< Background of the window.
 };
 
+/** Widgets of the #BootstrapErrmsgWindow class. */
+enum BootstrapErrorMessageWidgets {
+	WID_BEM_CAPTION, ///< Caption of the window.
+	WID_BEM_MESSAGE, ///< Error message.
+	WID_BEM_QUIT,    ///< Quit button.
+};
+
 /** Widgets of the #BootstrapContentDownloadStatusWindow class. */
 enum BootstrapAskForDownloadWidgets {
 	WID_BAFD_QUESTION, ///< The question whether to download.

src/widgets/dropdown_type.h

@@ -68,6 +68,7 @@ public:
 
 	StringID String() const override;
 	void SetParam(uint index, uint64 value) { decode_params[index] = value; }
+	void SetParamStr(uint index, const char *str) { this->SetParam(index, (uint64)(size_t)str); }
 };
 
 /**

src/widgets/goal_widget.h

@@ -13,9 +13,12 @@
 
 /** Widgets of the #GoalListWindow class. */
 enum GoalListWidgets {
-	WID_GOAL_CAPTION,   ///< Caption of the window.
-	WID_GOAL_LIST,      ///< Goal list.
-	WID_GOAL_SCROLLBAR, ///< Scrollbar of the goal list.
+	WID_GOAL_CAPTION,         ///< Caption of the window.
+	WID_GOAL_SELECT_BUTTONS,  ///< Selection widget for the title bar button.
+	WID_GOAL_GLOBAL_BUTTON,   ///< Button to show global goals.
+	WID_GOAL_COMPANY_BUTTON,  ///< Button to show company goals.
+	WID_GOAL_LIST,            ///< Goal list.
+	WID_GOAL_SCROLLBAR,       ///< Scrollbar of the goal list.
 };
 
 /** Widgets of the #GoalQuestionWindow class. */

src/widgets/rail_widget.h

@@ -63,6 +63,8 @@ enum BuildRailStationWidgets {
 	WID_BRAS_IMAGE,                ///< Panel used at each cell of the matrix.
 	WID_BRAS_MATRIX_SCROLL,        ///< Scrollbar of the matrix widget.
 
+	WID_BRAS_FILTER_CONTAINER,     ///< Container for the filter text box for the station class list.
+	WID_BRAS_FILTER_EDITBOX,       ///< Filter text box for the station class list.
 	WID_BRAS_SHOW_NEWST_DEFSIZE,   ///< Selection for default-size button for newstation.
 	WID_BRAS_SHOW_NEWST_ADDITIONS, ///< Selection for newstation class selection list.
 	WID_BRAS_SHOW_NEWST_MATRIX,    ///< Selection for newstation image matrix.

src/widgets/settings_widget.h

@@ -32,6 +32,8 @@ enum GameOptionsWidgets {
 	WID_GO_BASE_MUSIC_TEXTFILE,    ///< Open base music readme, changelog (+1) or license (+2).
 	WID_GO_BASE_MUSIC_DESCRIPTION = WID_GO_BASE_MUSIC_TEXTFILE + TFT_END, ///< Description of selected base music set.
 	WID_GO_FONT_ZOOM_DROPDOWN,     ///< Dropdown for the font zoom level.
+	WID_GO_VIDEO_ACCEL_BUTTON,     ///< Toggle for video acceleration.
+	WID_GO_REFRESH_RATE_DROPDOWN,  ///< Dropdown for all available refresh rates.
 };
 
 /** Widgets of the #GameSettingsWindow class. */