Merge branch 'master' into jgrpp
# Conflicts: # cmake/SourceList.cmake # src/build_vehicle_gui.cpp # src/company_gui.cpp # src/console_cmds.cpp # src/depot_base.h # src/elrail.cpp # src/network/core/udp.cpp # src/network/network_admin.cpp # src/network/network_chat_gui.cpp # src/network/network_gui.cpp # src/network/network_server.cpp # src/newgrf.cpp # src/newgrf_engine.cpp # src/newgrf_railtype.cpp # src/newgrf_railtype.h # src/newgrf_storage.h # src/os/unix/crashlog_unix.cpp # src/rail.h # src/rail_cmd.cpp # src/rail_gui.cpp # src/road_cmd.cpp # src/road_map.h # src/saveload/labelmaps_sl.cpp # src/settings_gui.cpp # src/settings_type.h # src/sl/oldloader_sl.cpp # src/station_cmd.cpp # src/station_gui.cpp # src/table/settings/world_settings.ini # src/tests/test_script_admin.cpp # src/textfile_gui.cpp # src/toolbar_gui.cpp # src/train_cmd.cpp # src/tunnelbridge_cmd.cpp # src/vehicle_gui.cpp # src/widget.cpp # src/window.cpp # src/window_gui.h # src/window_type.h
This commit is contained in:
@@ -25,6 +25,7 @@ add_files(
|
||||
goal_widget.h
|
||||
graph_widget.h
|
||||
group_widget.h
|
||||
help_widget.h
|
||||
highscore_widget.h
|
||||
industry_widget.h
|
||||
intro_widget.h
|
||||
|
@@ -103,7 +103,7 @@ static WindowDesc _dropdown_desc(
|
||||
WDP_MANUAL, nullptr, 0, 0,
|
||||
WC_DROPDOWN_MENU, WC_NONE,
|
||||
WDF_NO_FOCUS,
|
||||
_nested_dropdown_menu_widgets, lengthof(_nested_dropdown_menu_widgets)
|
||||
std::begin(_nested_dropdown_menu_widgets), std::end(_nested_dropdown_menu_widgets)
|
||||
);
|
||||
|
||||
/** Drop-down menu window */
|
||||
|
25
src/widgets/help_widget.h
Normal file
25
src/widgets/help_widget.h
Normal file
@@ -0,0 +1,25 @@
|
||||
/*
|
||||
* This file is part of OpenTTD.
|
||||
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
||||
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/** @file help_widget.h Types related to the help window widgets. */
|
||||
|
||||
#ifndef WIDGETS_HELP_WIDGET_H
|
||||
#define WIDGETS_HELP_WIDGET_H
|
||||
|
||||
/** Widgets of the #HelpWindow class. */
|
||||
enum HelpWindowWidgets {
|
||||
WID_HW_README,
|
||||
WID_HW_CHANGELOG,
|
||||
WID_HW_KNOWN_BUGS,
|
||||
WID_HW_LICENSE,
|
||||
WID_HW_WEBSITE,
|
||||
WID_HW_WIKI,
|
||||
WID_HW_BUGTRACKER,
|
||||
WID_HW_COMMUNITY,
|
||||
};
|
||||
|
||||
#endif /* WIDGETS_HELP_WIDGET_H */
|
@@ -28,6 +28,7 @@ enum SelectGameIntroWidgets {
|
||||
WID_SGI_TRANSLATION, ///< Translation errors.
|
||||
WID_SGI_OPTIONS, ///< Options button.
|
||||
WID_SGI_HIGHSCORE, ///< Highscore button.
|
||||
WID_SGI_HELP, ///< Help and manuals button.
|
||||
WID_SGI_SETTINGS_OPTIONS, ///< Settings button.
|
||||
WID_SGI_GRF_SETTINGS, ///< NewGRF button.
|
||||
WID_SGI_CONTENT_DOWNLOAD, ///< Content Download button.
|
||||
|
@@ -50,11 +50,15 @@ enum QueryWidgets {
|
||||
|
||||
/** Widgets of the #TextfileWindow class. */
|
||||
enum TextfileWidgets {
|
||||
WID_TF_CAPTION, ///< The caption of the window.
|
||||
WID_TF_WRAPTEXT, ///< Whether or not to wrap the text.
|
||||
WID_TF_BACKGROUND, ///< Panel to draw the textfile on.
|
||||
WID_TF_VSCROLLBAR, ///< Vertical scrollbar to scroll through the textfile up-and-down.
|
||||
WID_TF_HSCROLLBAR, ///< Horizontal scrollbar to scroll through the textfile left-to-right.
|
||||
WID_TF_CAPTION, ///< The caption of the window.
|
||||
WID_TF_NAVBACK, ///< Navigate back button.
|
||||
WID_TF_NAVFORWARD, ///< Navigate forward button.
|
||||
WID_TF_WRAPTEXT, ///< Whether or not to wrap the text.
|
||||
WID_TF_JUMPLIST, ///< List to jump around the file.
|
||||
WID_TF_SEL_JUMPLIST, ///< Selection to display the jump list or not.
|
||||
WID_TF_BACKGROUND, ///< Panel to draw the textfile on.
|
||||
WID_TF_VSCROLLBAR, ///< Vertical scrollbar to scroll through the textfile up-and-down.
|
||||
WID_TF_HSCROLLBAR, ///< Horizontal scrollbar to scroll through the textfile left-to-right.
|
||||
};
|
||||
|
||||
/** Widgets of the #TextfileWindow class. */
|
||||
|
Reference in New Issue
Block a user