cpp/openttd-patchpack/source Changeset - r28774:da9fc2859d5c

Changeset - r28774:da9fc2859d5c

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

Rubidium - 10 months ago 2024-02-08 20:45:20
rubidium@openttd.org

Feature: Fully user configurable number format and abbreviations

4 files changed with 37 insertions and 2 deletions:

src/settings_table.cpp

src/settings_type.h

src/strings.cpp

src/table/settings/gui_settings.ini

0 comments (0 inline, 0 general)

src/settings_table.cpp

➞

Show inline comments

@@ @@ -47,12 +47,13 @@ @@
 #include "roadveh_cmd.h"
 #include "vehicle_func.h"
 #include "viewport_func.h"
 #include "void_map.h"
 #include "station_func.h"
 #include "station_base.h"
 #include "language.h"
 #include "table/strings.h"
 #include "table/settings.h"
 #include "safeguards.h"

src/settings_type.h

➞

Show inline comments

@@ @@ -219,12 +219,14 @@ struct GUISettings { @@
 	uint8_t  settings_restriction_mode;        ///< selected restriction mode in adv. settings GUI. @see RestrictionMode
 	bool   newgrf_show_old_versions;         ///< whether to show old versions in the NewGRF list
 	uint8_t  newgrf_default_palette;           ///< default palette to use for NewGRFs without action 14 palette information
 	bool   scale_bevels;                     ///< bevels are scaled with GUI scale.
 	std::string number_format; ///< formatting string for numbers (like "thousands" grouping)
 	std::string number_abbreviations; ///< mapping to number formats for different powers of ten/thresholds
 	std::string digit_decimal_separator; ///< decimal separator
 	/**
 	 * Returns true when the user has sufficient privileges to edit newgrfs on a running game
 	 * @return whether the user has sufficient privileges to edit newgrfs in an existing game
 	 */

src/strings.cpp

➞

Show inline comments

@@ @@ -386,14 +386,27 @@ static const char *GetDecimalSeparator() @@
 	if (StrEmpty(decimal_separator)) decimal_separator = _langpack.langpack->digit_decimal_separator;
 	return decimal_separator;
+}
 void InitializeNumberFormats()
+{
 	ParseNumberFormatSeparators(_number_format_separators, _current_language->number_format);
 	ParseNumberAbbreviations(_number_abbreviations, _current_language->number_abbreviations);
 	bool loaded_number_format = false;
 	if (!_settings_client.gui.number_format.empty()) {
 		auto res = ParseNumberFormatSeparators(_number_format_separators, _settings_client.gui.number_format);
 		if (res.has_value()) UserError("The setting 'number_format' under 'gui' is invalid: {}", *res);
 		loaded_number_format = !res.has_value();
+	}
 	if (!loaded_number_format) ParseNumberFormatSeparators(_number_format_separators, _current_language->number_format);
 	bool loaded_number_abbreviations = false;
 	if (!_settings_client.gui.number_abbreviations.empty()) {
 		auto res = ParseNumberAbbreviations(_number_abbreviations, _settings_client.gui.number_abbreviations);
 		if (res.has_value()) UserError("The setting 'number_abbreviations' under 'gui' is invalid: {}", *res);
 		loaded_number_abbreviations = !res.has_value();
+	}
 	if (!loaded_number_abbreviations) ParseNumberAbbreviations(_number_abbreviations, _current_language->number_abbreviations);
 	_number_abbreviations.emplace_back(0, _number_format_separators);
+}
 /**
  * Format a number into a string.
  * @param builder The string builder to write to.

src/table/settings/gui_settings.ini

➞

Show inline comments

@@ @@ -13,12 +13,13 @@ static void v_PositionStatusbar(int32_t @@
 static void RedrawSmallmap(int32_t new_value);
 static void UpdateLinkgraphColours(int32_t new_value);
 static void InvalidateCompanyLiveryWindow(int32_t new_value);
 static void InvalidateNewGRFChangeWindows(int32_t new_value);
 static void ZoomMinMaxChanged(int32_t new_value);
 static void SpriteZoomMinChanged(int32_t new_value);
 void InitializeNumberFormats();
 static constexpr std::initializer_list<const char*> _osk_activation{"disabled", "double", "single", "immediately"};
 static constexpr std::initializer_list<const char*> _savegame_date{"long", "short", "iso"};
 static constexpr std::initializer_list<const char*> _right_click_close{"no", "yes", "except sticky"};
 static const SettingVariant _gui_settings_table[] = {
@@ @@ -902,11 +903,29 @@ flags = SF_NOT_IN_SAVE | SF_NO_NETWOR @@
 def      = true
 post_cb  = [](auto) { SetupWidgetDimensions(); ReInitAllWindows(true); }
 cat      = SC_BASIC
 startup  = true
 [SDTC_SSTR]
 var      = gui.number_format
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 type     = SLE_STRQ
 def      = nullptr
 pre_cb   = [](auto format) { NumberFormatSeparators separators; return !ParseNumberFormatSeparators(separators, format).has_value(); }
 post_cb  = [](auto) { InitializeNumberFormats(); MarkWholeScreenDirty(); }
 startup  = true
 [SDTC_SSTR]
 var      = gui.number_abbreviations
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 type     = SLE_STRQ
 def      = nullptr
 pre_cb   = [](auto format) { NumberAbbreviations abbreviations; return !ParseNumberAbbreviations(abbreviations, format).has_value(); }
 post_cb  = [](auto) { InitializeNumberFormats(); MarkWholeScreenDirty(); }
 startup  = true
 [SDTC_SSTR]
 var      = gui.digit_decimal_separator
 flags    = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
 type     = SLE_STRQ
 def      = nullptr
 post_cb  = [](auto) { MarkWholeScreenDirty(); }

0 comments (0 inline, 0 general)