cpp/openttd-patchpack/source Changeset - r14797:97e53e9208f2

Changeset - r14797:97e53e9208f2

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

terkhen - 14 years ago 2010-03-13 10:18:57
terkhen@openttd.org

(svn r19397) -Add: Enter the starting year at the scenario editor by clicking at the date panel.

2 files changed with 31 insertions and 2 deletions:

src/lang/english.txt

src/toolbar_gui.cpp

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

@@ @@ -323,6 +323,7 @@ STR_SCENEDIT_TOOLBAR_OPENTTD @@
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Scenario Editor
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Move the starting date backward 1 year
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Move the starting date forward 1 year
 STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE                           :{BLACK}Click to enter the starting year
 STR_SCENEDIT_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY         :{BLACK}Display map, town directory
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Landscape generation
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Town generation

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -43,6 +43,7 @@ @@
 #include "company_base.h"
 #include "smallmap_gui.h"
 #include "graph_gui.h"
 #include "textbuf_gui.h"
 #include "network/network.h"
 #include "network/network_gui.h"
@@ @@ -795,6 +796,16 @@ static void ToolbarSwitchClick(Window *w @@
 /* --- Scenario editor specific handlers. */
 /**
  * Called when clicking at the date panel of the scenario editor toolbar.
  */
 static void ToolbarScenDatePanel(Window *w)
+{
 	SetDParam(0, _settings_newgame.game_creation.starting_year);
 	ShowQueryString(STR_JUST_INT, STR_MAPGEN_START_DATE_QUERY_CAPT, 8, 100, w, CS_NUMERAL, QSF_ENABLE_DEFAULT);
 	_left_button_clicked = false;
+}
 static void ToolbarScenDateBackward(Window *w)
+{
 	/* don't allow too fast scrolling */
@@ @@ -1393,7 +1404,7 @@ static ToolbarButtonProc * const _scen_t @@
 	ToolbarOptionsClick,
 	ToolbarScenSaveOrLoad,
 	ToolbarBtn_NULL,
-	ToolbarBtn_NULL,
+	ToolbarScenDatePanel,
 	ToolbarScenDateBackward,
 	ToolbarScenDateForward,
 	ToolbarScenMapTownDir,
@@ @@ -1555,6 +1566,23 @@ public: @@
+	{
 		if (FindWindowById(WC_MAIN_WINDOW, 0) != NULL) HandleZoomMessage(this, FindWindowById(WC_MAIN_WINDOW, 0)->viewport, TBSE_ZOOMIN, TBSE_ZOOMOUT);
+	}
 	virtual void OnQueryTextFinished(char *str)
+	{
 		/* Was 'cancel' pressed? */
 		if (str == NULL) return;
 		int32 value;
 		if (!StrEmpty(str)) {
 			value = atoi(str);
 		} else {
 			/* An empty string means revert to the default */
 			value = DEF_START_YEAR;
+		}
 		_settings_game.game_creation.starting_year = Clamp(value, MIN_YEAR, MAX_YEAR);
 		this->SetDirty();
+	}
 };
 static const NWidgetPart _nested_toolb_scen_inner_widgets[] = {
@@ @@ -1568,7 +1596,7 @@ static const NWidgetPart _nested_toolb_s @@
 	NWidget(WWT_PANEL, COLOUR_GREY, TBSE_DATEPANEL_CONTAINER),
 		NWidget(NWID_HORIZONTAL), SetPIP(3, 2, 3),
 			NWidget(WWT_IMGBTN, COLOUR_GREY, TBSE_DATEBACKWARD), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD),
 			NWidget(WWT_EMPTY, COLOUR_GREY, TBSE_DATEPANEL),
+			NWidget(WWT_EMPTY, COLOUR_GREY, TBSE_DATEPANEL), SetDataTip(STR_NULL, STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE),
 			NWidget(WWT_IMGBTN, COLOUR_GREY, TBSE_DATEFORWARD), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD),
 		EndContainer(),
 	EndContainer(),

0 comments (0 inline, 0 general)