diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2021-03-30 21:49:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 21:49:15 +0200 |
| commit | f4118a4fdebe5c8a4a467afe5b3f49a0bd74c37a (patch) | |
| tree | f6eb56306a23b3e2c3d31dae5c3c9522bfb15b44 /builtin | |
| parent | f345d00a436b88e6583896065aab237ff12a9d3d (diff) | |
| download | hax-minetest-server-f4118a4fdebe5c8a4a467afe5b3f49a0bd74c37a.tar.gz hax-minetest-server-f4118a4fdebe5c8a4a467afe5b3f49a0bd74c37a.zip | |
Consistent title bar + render information in mainmenu (#10764)
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/mainmenu/init.lua | 4 | ||||
| -rw-r--r-- | builtin/mainmenu/tab_about.lua (renamed from builtin/mainmenu/tab_credits.lua) | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index 45089c7c9..0c8578cd6 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -49,7 +49,7 @@ local tabs = {} tabs.settings = dofile(menupath .. DIR_DELIM .. "tab_settings.lua") tabs.content = dofile(menupath .. DIR_DELIM .. "tab_content.lua") -tabs.credits = dofile(menupath .. DIR_DELIM .. "tab_credits.lua") +tabs.about = dofile(menupath .. DIR_DELIM .. "tab_about.lua") tabs.local_game = dofile(menupath .. DIR_DELIM .. "tab_local.lua") tabs.play_online = dofile(menupath .. DIR_DELIM .. "tab_online.lua") @@ -98,7 +98,7 @@ local function init_globals() tv_main:add(tabs.content) tv_main:add(tabs.settings) - tv_main:add(tabs.credits) + tv_main:add(tabs.about) tv_main:set_global_event_handler(main_event_handler) tv_main:set_fixed_size(false) diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_about.lua index a34dd58bb..a1a7d4bfb 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_about.lua @@ -97,8 +97,8 @@ local function buildCreditList(source) end return { - name = "credits", - caption = fgettext("Credits"), + name = "about", + caption = fgettext("About"), cbf_formspec = function(tabview, name, tabdata) local logofile = defaulttexturedir .. "logo.png" local version = core.get_version() @@ -119,11 +119,16 @@ return { buildCreditList(previous_contributors) .. "," .. ";1]" + -- Render information + fs = fs .. "label[0.75,4.9;" .. + fgettext("Active renderer:") .. "\n" .. + core.formspec_escape(core.get_screen_info().render_info) .. "]" + if PLATFORM ~= "Android" then fs = fs .. "tooltip[userdata;" .. fgettext("Opens the directory that contains user-provided worlds, games, mods,\n" .. "and texture packs in a file manager / explorer.") .. "]" - fs = fs .. "button[0,4.75;3.5,1;userdata;" .. fgettext("Open User Data Directory") .. "]" + fs = fs .. "button[0,4;3.5,1;userdata;" .. fgettext("Open User Data Directory") .. "]" end return fs |