mirror of
https://github.com/minetest/minetest.git
synced 2024-11-22 23:53:44 +01:00
Main menu: Player list for public servers (#15425)
This commit is contained in:
parent
946b3a4222
commit
b6eaf7b5a4
@ -63,6 +63,7 @@ Zughy:
|
|||||||
textures/base/pack/settings_btn.png
|
textures/base/pack/settings_btn.png
|
||||||
textures/base/pack/settings_info.png
|
textures/base/pack/settings_info.png
|
||||||
textures/base/pack/settings_reset.png
|
textures/base/pack/settings_reset.png
|
||||||
|
textures/base/pack/server_view_clients.png
|
||||||
|
|
||||||
appgurueu:
|
appgurueu:
|
||||||
textures/base/pack/server_incompatible.png
|
textures/base/pack/server_incompatible.png
|
||||||
|
49
builtin/mainmenu/dlg_clients_list.lua
Normal file
49
builtin/mainmenu/dlg_clients_list.lua
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
-- Luanti
|
||||||
|
-- Copyright (C) 2024 siliconsniffer
|
||||||
|
-- SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
|
|
||||||
|
|
||||||
|
local function clients_list_formspec(dialogdata)
|
||||||
|
local TOUCH_GUI = core.settings:get_bool("touch_gui")
|
||||||
|
local clients_list = dialogdata.server.clients_list
|
||||||
|
local servername = dialogdata.server.name
|
||||||
|
|
||||||
|
local function fmt_formspec_list(clients_list)
|
||||||
|
local escaped = {}
|
||||||
|
for i, str in ipairs(clients_list) do
|
||||||
|
escaped[i] = core.formspec_escape(str)
|
||||||
|
end
|
||||||
|
return table.concat(escaped, ",")
|
||||||
|
end
|
||||||
|
|
||||||
|
local formspec = {
|
||||||
|
"formspec_version[8]",
|
||||||
|
"size[6,9.5]",
|
||||||
|
TOUCH_GUI and "padding[0.01,0.01]" or "",
|
||||||
|
"hypertext[0,0;6,1.5;;<global margin=5 halign=center valign=middle>",
|
||||||
|
fgettext("This is the list of clients connected to\n$1",
|
||||||
|
"<b>" .. core.hypertext_escape(servername) .. "</b>") .. "]",
|
||||||
|
"textlist[0.5,1.5;5,6.8;;" .. fmt_formspec_list(clients_list) .. "]",
|
||||||
|
"button[1.5,8.5;3,0.8;quit;OK]"
|
||||||
|
}
|
||||||
|
return table.concat(formspec, "")
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
local function clients_list_buttonhandler(this, fields)
|
||||||
|
if fields.quit then
|
||||||
|
this:delete()
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
function create_clientslist_dialog(server)
|
||||||
|
local retval = dialog_create("dlg_clients_list",
|
||||||
|
clients_list_formspec,
|
||||||
|
clients_list_buttonhandler,
|
||||||
|
nil)
|
||||||
|
retval.data.server = server
|
||||||
|
return retval
|
||||||
|
end
|
@ -55,6 +55,7 @@ dofile(menupath .. DIR_DELIM .. "dlg_register.lua")
|
|||||||
dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_rename_modpack.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_version_info.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_version_info.lua")
|
||||||
dofile(menupath .. DIR_DELIM .. "dlg_reinstall_mtg.lua")
|
dofile(menupath .. DIR_DELIM .. "dlg_reinstall_mtg.lua")
|
||||||
|
dofile(menupath .. DIR_DELIM .. "dlg_clients_list.lua")
|
||||||
|
|
||||||
local tabs = {
|
local tabs = {
|
||||||
content = dofile(menupath .. DIR_DELIM .. "tab_content.lua"),
|
content = dofile(menupath .. DIR_DELIM .. "tab_content.lua"),
|
||||||
|
@ -108,16 +108,38 @@ local function get_formspec(tabview, name, tabdata)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if tabdata.selected then
|
if tabdata.selected then
|
||||||
if gamedata.fav then
|
|
||||||
retval = retval .. "tooltip[btn_delete_favorite;" .. fgettext("Remove favorite") .. "]"
|
|
||||||
retval = retval .. "style[btn_delete_favorite;padding=6]"
|
|
||||||
retval = retval .. "image_button[5,1.3;0.5,0.5;" .. core.formspec_escape(defaulttexturedir ..
|
|
||||||
"server_favorite_delete.png") .. ";btn_delete_favorite;]"
|
|
||||||
end
|
|
||||||
if gamedata.serverdescription then
|
if gamedata.serverdescription then
|
||||||
retval = retval .. "textarea[0.25,1.85;5.25,2.7;;;" ..
|
retval = retval .. "textarea[0.25,1.85;5.25,2.7;;;" ..
|
||||||
core.formspec_escape(gamedata.serverdescription) .. "]"
|
core.formspec_escape(gamedata.serverdescription) .. "]"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local server = tabdata.lookup[tabdata.selected]
|
||||||
|
|
||||||
|
local clients_list = server and server.clients_list
|
||||||
|
local can_view_clients_list = clients_list and #clients_list > 0
|
||||||
|
if can_view_clients_list then
|
||||||
|
table.sort(clients_list, function(a, b)
|
||||||
|
return a:lower() < b:lower()
|
||||||
|
end)
|
||||||
|
local max_clients = 5
|
||||||
|
if #clients_list > max_clients then
|
||||||
|
retval = retval .. "tooltip[btn_view_clients;" ..
|
||||||
|
fgettext("Clients:\n$1", table.concat(clients_list, "\n", 1, max_clients)) .. "\n..." .. "]"
|
||||||
|
else
|
||||||
|
retval = retval .. "tooltip[btn_view_clients;" ..
|
||||||
|
fgettext("Clients:\n$1", table.concat(clients_list, "\n")) .. "]"
|
||||||
|
end
|
||||||
|
retval = retval .. "style[btn_view_clients;padding=6]"
|
||||||
|
retval = retval .. "image_button[5,1.3;0.5,0.5;" .. core.formspec_escape(defaulttexturedir ..
|
||||||
|
"server_view_clients.png") .. ";btn_view_clients;]"
|
||||||
|
end
|
||||||
|
|
||||||
|
if gamedata.fav then
|
||||||
|
retval = retval .. "tooltip[btn_delete_favorite;" .. fgettext("Remove favorite") .. "]"
|
||||||
|
retval = retval .. "style[btn_delete_favorite;padding=6]"
|
||||||
|
retval = retval .. "image_button[" .. (can_view_clients_list and "4.5" or "5") .. ",1.3;0.5,0.5;" ..
|
||||||
|
core.formspec_escape(defaulttexturedir .. "server_favorite_delete.png") .. ";btn_delete_favorite;]"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
retval = retval .. "container_end[]"
|
retval = retval .. "container_end[]"
|
||||||
@ -315,6 +337,14 @@ local function main_button_handler(tabview, fields, name, tabdata)
|
|||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if fields.btn_view_clients then
|
||||||
|
local dlg = create_clientslist_dialog(tabdata.lookup[tabdata.selected])
|
||||||
|
dlg:set_parent(tabview)
|
||||||
|
tabview:hide()
|
||||||
|
dlg:show()
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
if fields.btn_mp_clear then
|
if fields.btn_mp_clear then
|
||||||
tabdata.search_for = ""
|
tabdata.search_for = ""
|
||||||
menudata.search_result = nil
|
menudata.search_result = nil
|
||||||
|
BIN
textures/base/pack/server_view_clients.png
Normal file
BIN
textures/base/pack/server_view_clients.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 218 B |
Loading…
Reference in New Issue
Block a user