Merge 3c56c0fe2e into 13759e9f23

portuguese: 1 change by jcteotonio
polish: 6 changes by pAter-exe

src/game/game_gui.cpp

@@ -325,7 +325,7 @@ struct GSConfigWindow : public Window {
 					}
 				} else if (!bool_item && !config_item.complete_labels) {
 					/* Display a query box so users can enter a custom value. */
-					ShowQueryString(GetString(STR_JUST_INT, old_val), STR_CONFIG_SETTING_QUERY_CAPTION, INT32_DIGITS_WITH_SIGN_AND_TERMINATION, this, CS_NUMERAL_SIGNED, {});
+					ShowQueryString(GetString(STR_JUST_INT, old_val), STR_CONFIG_SETTING_QUERY_CAPTION, INT32_DIGITS_WITH_SIGN_AND_TERMINATION, this, CS_NUMERAL_SIGNED, QueryStringFlag::EnableDefault);
 				}
 				this->SetDirty();
 				break;
@@ -347,10 +347,17 @@ struct GSConfigWindow : public Window {
 
 	void OnQueryTextFinished(std::optional<std::string> str) override
 	{
+		/* The user pressed cancel */
 		if (!str.has_value()) return;
-		auto value = ParseInteger<int32_t>(*str, 10, true);
-		if (!value.has_value()) return;
-		this->SetValue(*value);
+
+		if (!str->empty()) {
+			auto value = ParseInteger<int32_t>(*str, 10, true);
+			if (!value.has_value()) return;
+
+			this->SetValue(*value);
+		} else {
+			this->SetDefaultValue();
+		}
 	}
 
 	void OnDropdownSelect(WidgetID widget, int index, int) override
@@ -419,6 +426,14 @@ private:
 		this->gs_config->SetSetting(config_item.name, value);
 		this->SetDirty();
 	}
+
+	void SetDefaultValue()
+	{
+		const ScriptConfigItem &config_item = *this->visible_settings[this->clicked_row];
+		if (_game_mode == GM_NORMAL && !config_item.flags.Test(ScriptConfigFlag::InGame)) return;
+		this->gs_config->ResetSetting(config_item.name);
+		this->SetDirty();
+	}
 };
 
 /** Open the GS config window. */

src/lang/polish.txt

@@ -1010,11 +1010,14 @@ STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLA
 STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}Żaden
 STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Wyświetl wszystkie ładunki na wykresie stawek za ładunek
 STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}Ukryj wszystkie ładunki na wykresie stawek za ładunek
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Przełącz ukrywanie/wyświetlanie wykresu danego typu ładunku
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Przełącz ukrywanie/wyświetlanie wykresu ładunku danego typu
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINY_FONT}{BLACK}{STRING}
 
+STR_GRAPH_INDUSTRY_CAPTION                                      :{WHITE}{INDUSTRY} - Historia Ładunków
 STR_GRAPH_INDUSTRY_RANGE_PRODUCED                               :Wyprodukowano
 STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED                            :Przetransportowano
+STR_GRAPH_INDUSTRY_RANGE_DELIVERED                              :Dostarczono
+STR_GRAPH_INDUSTRY_RANGE_WAITING                                :Oczekujący
 
 STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Pokaż szczegóły oceny wydajności
 
@@ -4403,6 +4406,8 @@ STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Wyproduk
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE                  :{BLACK}Wyprodukowano w poprzedniej minucie:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% przetransportowano)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Wyśrodkuj widok główny na lokalizacji przedsiębiorstwa. Użyj Ctrl, aby otworzyć nowy podgląd na jego lokalizację
+STR_INDUSTRY_VIEW_CARGO_GRAPH                                   :{BLACK}Wykres Produkcji
+STR_INDUSTRY_VIEW_CARGO_GRAPH_TOOLTIP                           :{BLACK}Wyświetl na wykresie historię stanu ładunków w tym przedsiębiorstwie
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Poziom produkcji: {YELLOW}{COMMA}%
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}Przedsiębiorstwo ogłosiło likwidację!
 

src/lang/portuguese.txt

@@ -20,7 +20,7 @@
 ##id 0x0000
 STR_NULL                                                        :
 STR_EMPTY                                                       :
-STR_UNDEFINED                                                   :(frase indefinida)
+STR_UNDEFINED                                                   :(cadeia de caracteres indefinida)
 STR_JUST_NOTHING                                                :Nada
 
 # Cargo related strings

src/newgrf/newgrf_act0_globalvar.cpp

@@ -59,7 +59,7 @@ static ChangeInfoResult LoadTranslationTable(uint first, uint last, ByteReader &
 	GRFFile *grf_override = GetCurrentGRFOverride();
 	if (grf_override != nullptr) {
 		/* GRF override is present, copy the translation table to the overridden GRF as well. */
-		GrfMsg(1, "LoadTranslationTable: Copying {} translation table to override GRFID '{}'", name, std::byteswap(grf_override->grfid));
+		GrfMsg(1, "LoadTranslationTable: Copying {} translation table to override GRFID {:08X}", name, std::byteswap(grf_override->grfid));
 		std::vector<T> &override_table = gettable(*grf_override);
 		override_table = translation_table;
 	}

src/script/script_config.cpp

@@ -106,6 +106,16 @@ void ScriptConfig::ResetSettings()
 	this->settings.clear();
 }
 
+void ScriptConfig::ResetSetting(std::string_view name)
+{
+	if (this->info == nullptr) return;
+
+	const ScriptConfigItem *config_item = this->info->GetConfigItem(name);
+	if (config_item == nullptr) return;
+
+	this->settings.erase(std::string{name});
+}
+
 void ScriptConfig::ResetEditableSettings(bool yet_to_start)
 {
 	if (this->info == nullptr) return ResetSettings();

src/script/script_config.hpp

@@ -129,6 +129,11 @@ public:
 	 */
 	void ResetSettings();
 
+	/**
+	 * Reset a setting to its default value.
+	 */
+	void ResetSetting(std::string_view name);
+
 	/**
 	 * Reset only editable and visible settings to their default value.
 	 */

src/script/script_gui.cpp

@@ -470,7 +470,7 @@ struct ScriptSettingsWindow : public Window {
 					}
 				} else if (!bool_item && !config_item.complete_labels) {
 					/* Display a query box so users can enter a custom value. */
-					ShowQueryString(GetString(STR_JUST_INT, old_val), STR_CONFIG_SETTING_QUERY_CAPTION, INT32_DIGITS_WITH_SIGN_AND_TERMINATION, this, CS_NUMERAL_SIGNED, {});
+					ShowQueryString(GetString(STR_JUST_INT, old_val), STR_CONFIG_SETTING_QUERY_CAPTION, INT32_DIGITS_WITH_SIGN_AND_TERMINATION, this, CS_NUMERAL_SIGNED, QueryStringFlag::EnableDefault);
 				}
 				this->SetDirty();
 				break;
@@ -485,10 +485,17 @@ struct ScriptSettingsWindow : public Window {
 
 	void OnQueryTextFinished(std::optional<std::string> str) override
 	{
+		/* The user pressed cancel */
 		if (!str.has_value()) return;
-		auto value = ParseInteger<int32_t>(*str, 10, true);
-		if (!value.has_value()) return;
-		this->SetValue(*value);
+
+		if (!str->empty()) {
+			auto value = ParseInteger<int32_t>(*str, 10, true);
+			if (!value.has_value()) return;
+
+			this->SetValue(*value);
+		} else {
+			this->SetDefaultValue();
+		}
 	}
 
 	void OnDropdownSelect(WidgetID widget, int index, int) override
@@ -552,6 +559,14 @@ private:
 		this->script_config->SetSetting(config_item.name, value);
 		this->SetDirty();
 	}
+
+	void SetDefaultValue()
+	{
+		const ScriptConfigItem &config_item = *this->visible_settings[this->clicked_row];
+		if (_game_mode == GM_NORMAL && ((this->slot == OWNER_DEITY) || Company::IsValidID(this->slot)) && !config_item.flags.Test(ScriptConfigFlag::InGame)) return;
+		this->script_config->ResetSetting(config_item.name);
+		this->SetDirty();
+	}
 };
 
 /** Widgets for the Script settings window. */