Correct tooltip_append_itemstring terminology (#6421)

diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 5af146895f8bb6879a7b657523fd4f90b0bfb8c1..57fb98a45b1ad2612643cb3048fc7a2d60815f08 100644 (file)
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -710,8 +710,8 @@ gui_scaling_filter_txr2img (GUI scaling filter txr2img) bool true
 #    Delay showing tooltips, stated in milliseconds.
 tooltip_show_delay (Tooltip delay) int 400
 
-#    Append itemstring to tooltip
-tooltip_append_itemstring (Append itemstring) bool false
+#    Append item name to tooltip.
+tooltip_append_itemname (Append item name) bool false
 
 #    Whether freetype fonts are used, requires freetype support to be compiled in.
 freetype (Freetype fonts) bool true

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 5f3c97e9d955049edc4d98837fcec957b13e4d2e..59a13883416ca6b842b52e716f0669bf299458ca 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -143,7 +143,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("3d_mode", "none");
        settings->setDefault("3d_paralax_strength", "0.025");
        settings->setDefault("tooltip_show_delay", "400");
-       settings->setDefault("tooltip_append_itemstring", "false");
+       settings->setDefault("tooltip_append_itemname", "false");
        settings->setDefault("zoom_fov", "15");
        settings->setDefault("fps_max", "60");
        settings->setDefault("pause_fps_max", "20");

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index ef26374002562f4d9b34f0bc14fe37599c219603..9d97821f02ea1569311d06757ab1e5562e026be8 100644 (file)
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -112,7 +112,7 @@ GUIFormSpecMenu::GUIFormSpecMenu(JoystickController *joystick,
        m_doubleclickdetect[1].pos = v2s32(0, 0);
 
        m_tooltip_show_delay = (u32)g_settings->getS32("tooltip_show_delay");
-       m_tooltip_append_itemstring = g_settings->getBool("tooltip_append_itemstring");
+       m_tooltip_append_itemname = g_settings->getBool("tooltip_append_itemname");
 }
 
 GUIFormSpecMenu::~GUIFormSpecMenu()
@@ -2393,7 +2393,7 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase,
                                if (!item.name.empty()) {
                                        if (tooltip_text.empty())
                                                tooltip_text = utf8_to_wide(item.name);
-                                       if (m_tooltip_append_itemstring)
+                                       if (m_tooltip_append_itemname)
                                                tooltip_text += utf8_to_wide(" [" + item.name + "]");
                                }
                        }

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 902f86ce180a10a585313eb2d6cc1ac4500ac464..7c283dcc03e717c03e191aa606868a44ea798184 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -407,7 +407,7 @@ protected:
        gui::IGUIStaticText *m_tooltip_element = nullptr;
 
        u64 m_tooltip_show_delay;
-       bool m_tooltip_append_itemstring;
+       bool m_tooltip_append_itemname;
        u64 m_hovered_time = 0;
        s32 m_old_tooltip_id = -1;