From f4118a4fdebe5c8a4a467afe5b3f49a0bd74c37a Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Tue, 30 Mar 2021 21:49:15 +0200 Subject: Consistent title bar + render information in mainmenu (#10764) --- builtin/mainmenu/init.lua | 4 +- builtin/mainmenu/tab_about.lua | 145 +++++++++++++++++++++++++++++++++++++++ builtin/mainmenu/tab_credits.lua | 140 ------------------------------------- 3 files changed, 147 insertions(+), 142 deletions(-) create mode 100644 builtin/mainmenu/tab_about.lua delete mode 100644 builtin/mainmenu/tab_credits.lua (limited to 'builtin') 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_about.lua b/builtin/mainmenu/tab_about.lua new file mode 100644 index 000000000..a1a7d4bfb --- /dev/null +++ b/builtin/mainmenu/tab_about.lua @@ -0,0 +1,145 @@ +--Minetest +--Copyright (C) 2013 sapier +-- +--This program is free software; you can redistribute it and/or modify +--it under the terms of the GNU Lesser General Public License as published by +--the Free Software Foundation; either version 2.1 of the License, or +--(at your option) any later version. +-- +--This program is distributed in the hope that it will be useful, +--but WITHOUT ANY WARRANTY; without even the implied warranty of +--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +--GNU Lesser General Public License for more details. +-- +--You should have received a copy of the GNU Lesser General Public License along +--with this program; if not, write to the Free Software Foundation, Inc., +--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-------------------------------------------------------------------------------- + +local core_developers = { + "Perttu Ahola (celeron55) ", + "sfan5 ", + "Nathanaël Courant (Nore/Ekdohibs) ", + "Loic Blot (nerzhul/nrz) ", + "paramat", + "Andrew Ward (rubenwardy) ", + "Krock/SmallJoker ", + "Lars Hofhansl ", + "Pierre-Yves Rollo ", + "v-rob ", +} + +-- For updating active/previous contributors, see the script in ./util/gather_git_credits.py + +local active_contributors = { + "Wuzzy [devtest game, visual corrections]", + "Zughy [Visual improvements, various fixes]", + "Maksim (MoNTE48) [Android]", + "numzero [Graphics and rendering]", + "appgurueu [Various internal fixes]", + "Desour [Formspec and vector API changes]", + "HybridDog [Rendering fixes and documentation]", + "Hugues Ross [Graphics-related improvements]", + "ANAND (ClobberXD) [Mouse buttons rebinding]", + "luk3yx [Fixes]", + "hecks [Audiovisuals, Lua API]", + "LoneWolfHT [Object crosshair, documentation fixes]", + "Lejo [Server-related improvements]", + "EvidenceB [Compass HUD element]", + "Paul Ouellette (pauloue) [Lua API, documentation]", + "TheTermos [Collision detection, physics]", + "David CARLIER [Unix & Haiku build fixes]", + "dcbrwn [Object shading]", + "Elias Fleckenstein [API features/fixes]", + "Jean-Patrick Guerrero (kilbith) [model element, visual fixes]", + "k.h.lai [Memory leak fixes, documentation]", +} + +local previous_core_developers = { + "BlockMen", + "Maciej Kasatkin (RealBadAngel) [RIP]", + "Lisa Milne (darkrose) ", + "proller", + "Ilya Zhuravlev (xyz) ", + "PilzAdam ", + "est31 ", + "kahrl ", + "Ryan Kwolek (kwolekr) ", + "sapier", + "Zeno", + "ShadowNinja ", + "Auke Kok (sofar) ", +} + +local previous_contributors = { + "Nils Dagsson Moskopp (erlehmann) [Minetest Logo]", + "red-001 ", + "Giuseppe Bilotta", + "Dániel Juhász (juhdanad) ", + "MirceaKitsune ", + "Constantin Wenger (SpeedProg)", + "Ciaran Gultnieks (CiaranG)", + "stujones11 [Android UX improvements]", + "Rogier [Fixes]", + "Gregory Currie (gregorycu) [optimisation]", + "srifqi [Fixes]", + "JacobF", + "Jeija [HTTP, particles]", +} + +local function buildCreditList(source) + local ret = {} + for i = 1, #source do + ret[i] = core.formspec_escape(source[i]) + end + return table.concat(ret, ",,") +end + +return { + name = "about", + caption = fgettext("About"), + cbf_formspec = function(tabview, name, tabdata) + local logofile = defaulttexturedir .. "logo.png" + local version = core.get_version() + local fs = "image[0.75,0.5;2.2,2.2;" .. core.formspec_escape(logofile) .. "]" .. + "style[label_button;border=false]" .. + "button[0.5,2;2.5,2;label_button;" .. version.project .. " " .. version.string .. "]" .. + "button[0.75,2.75;2,2;homepage;minetest.net]" .. + "tablecolumns[color;text]" .. + "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. + "table[3.5,-0.25;8.5,6.05;list_credits;" .. + "#FFFF00," .. fgettext("Core Developers") .. ",," .. + buildCreditList(core_developers) .. ",,," .. + "#FFFF00," .. fgettext("Active Contributors") .. ",," .. + buildCreditList(active_contributors) .. ",,," .. + "#FFFF00," .. fgettext("Previous Core Developers") ..",," .. + buildCreditList(previous_core_developers) .. ",,," .. + "#FFFF00," .. fgettext("Previous Contributors") .. ",," .. + 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;3.5,1;userdata;" .. fgettext("Open User Data Directory") .. "]" + end + + return fs + end, + cbf_button_handler = function(this, fields, name, tabdata) + if fields.homepage then + core.open_url("https://www.minetest.net") + end + + if fields.userdata then + core.open_dir(core.get_user_path()) + end + end, +} diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua deleted file mode 100644 index a34dd58bb..000000000 --- a/builtin/mainmenu/tab_credits.lua +++ /dev/null @@ -1,140 +0,0 @@ ---Minetest ---Copyright (C) 2013 sapier --- ---This program is free software; you can redistribute it and/or modify ---it under the terms of the GNU Lesser General Public License as published by ---the Free Software Foundation; either version 2.1 of the License, or ---(at your option) any later version. --- ---This program is distributed in the hope that it will be useful, ---but WITHOUT ANY WARRANTY; without even the implied warranty of ---MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ---GNU Lesser General Public License for more details. --- ---You should have received a copy of the GNU Lesser General Public License along ---with this program; if not, write to the Free Software Foundation, Inc., ---51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - --------------------------------------------------------------------------------- - -local core_developers = { - "Perttu Ahola (celeron55) ", - "sfan5 ", - "Nathanaël Courant (Nore/Ekdohibs) ", - "Loic Blot (nerzhul/nrz) ", - "paramat", - "Andrew Ward (rubenwardy) ", - "Krock/SmallJoker ", - "Lars Hofhansl ", - "Pierre-Yves Rollo ", - "v-rob ", -} - --- For updating active/previous contributors, see the script in ./util/gather_git_credits.py - -local active_contributors = { - "Wuzzy [devtest game, visual corrections]", - "Zughy [Visual improvements, various fixes]", - "Maksim (MoNTE48) [Android]", - "numzero [Graphics and rendering]", - "appgurueu [Various internal fixes]", - "Desour [Formspec and vector API changes]", - "HybridDog [Rendering fixes and documentation]", - "Hugues Ross [Graphics-related improvements]", - "ANAND (ClobberXD) [Mouse buttons rebinding]", - "luk3yx [Fixes]", - "hecks [Audiovisuals, Lua API]", - "LoneWolfHT [Object crosshair, documentation fixes]", - "Lejo [Server-related improvements]", - "EvidenceB [Compass HUD element]", - "Paul Ouellette (pauloue) [Lua API, documentation]", - "TheTermos [Collision detection, physics]", - "David CARLIER [Unix & Haiku build fixes]", - "dcbrwn [Object shading]", - "Elias Fleckenstein [API features/fixes]", - "Jean-Patrick Guerrero (kilbith) [model element, visual fixes]", - "k.h.lai [Memory leak fixes, documentation]", -} - -local previous_core_developers = { - "BlockMen", - "Maciej Kasatkin (RealBadAngel) [RIP]", - "Lisa Milne (darkrose) ", - "proller", - "Ilya Zhuravlev (xyz) ", - "PilzAdam ", - "est31 ", - "kahrl ", - "Ryan Kwolek (kwolekr) ", - "sapier", - "Zeno", - "ShadowNinja ", - "Auke Kok (sofar) ", -} - -local previous_contributors = { - "Nils Dagsson Moskopp (erlehmann) [Minetest Logo]", - "red-001 ", - "Giuseppe Bilotta", - "Dániel Juhász (juhdanad) ", - "MirceaKitsune ", - "Constantin Wenger (SpeedProg)", - "Ciaran Gultnieks (CiaranG)", - "stujones11 [Android UX improvements]", - "Rogier [Fixes]", - "Gregory Currie (gregorycu) [optimisation]", - "srifqi [Fixes]", - "JacobF", - "Jeija [HTTP, particles]", -} - -local function buildCreditList(source) - local ret = {} - for i = 1, #source do - ret[i] = core.formspec_escape(source[i]) - end - return table.concat(ret, ",,") -end - -return { - name = "credits", - caption = fgettext("Credits"), - cbf_formspec = function(tabview, name, tabdata) - local logofile = defaulttexturedir .. "logo.png" - local version = core.get_version() - local fs = "image[0.75,0.5;2.2,2.2;" .. core.formspec_escape(logofile) .. "]" .. - "style[label_button;border=false]" .. - "button[0.5,2;2.5,2;label_button;" .. version.project .. " " .. version.string .. "]" .. - "button[0.75,2.75;2,2;homepage;minetest.net]" .. - "tablecolumns[color;text]" .. - "tableoptions[background=#00000000;highlight=#00000000;border=false]" .. - "table[3.5,-0.25;8.5,6.05;list_credits;" .. - "#FFFF00," .. fgettext("Core Developers") .. ",," .. - buildCreditList(core_developers) .. ",,," .. - "#FFFF00," .. fgettext("Active Contributors") .. ",," .. - buildCreditList(active_contributors) .. ",,," .. - "#FFFF00," .. fgettext("Previous Core Developers") ..",," .. - buildCreditList(previous_core_developers) .. ",,," .. - "#FFFF00," .. fgettext("Previous Contributors") .. ",," .. - buildCreditList(previous_contributors) .. "," .. - ";1]" - - 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") .. "]" - end - - return fs - end, - cbf_button_handler = function(this, fields, name, tabdata) - if fields.homepage then - core.open_url("https://www.minetest.net") - end - - if fields.userdata then - core.open_dir(core.get_user_path()) - end - end, -} -- cgit v1.2.3