mirror of
https://github.com/mt-mods/mail.git
synced 2025-07-13 01:41:57 -04:00
Ui improvements & fixes
Move events code (if fields.x then) to events.lua (instead of inbox.lua), fix tab selection when going backward
This commit is contained in:
Athozus
parent
48fa4b04f8
commit
9af7aa38f7
3 changed files with 117 additions and 118 deletions
1
init.lua
1
init.lua
|
|
@ -44,6 +44,7 @@ dofile(MP .. "/ui/mail.lua")
|
||||||
dofile(MP .. "/ui/inbox.lua")
|
dofile(MP .. "/ui/inbox.lua")
|
||||||
dofile(MP .. "/ui/outbox.lua")
|
dofile(MP .. "/ui/outbox.lua")
|
||||||
dofile(MP .. "/ui/message.lua")
|
dofile(MP .. "/ui/message.lua")
|
||||||
|
dofile(MP .. "/ui/events.lua")
|
||||||
dofile(MP .. "/ui/contacts.lua")
|
dofile(MP .. "/ui/contacts.lua")
|
||||||
dofile(MP .. "/ui/edit_contact.lua")
|
dofile(MP .. "/ui/edit_contact.lua")
|
||||||
dofile(MP .. "/ui/select_contact.lua")
|
dofile(MP .. "/ui/select_contact.lua")
|
||||||
|
|
|
||||||
116
ui/events.lua
Normal file
116
ui/events.lua
Normal file
|
|
@ -0,0 +1,116 @@
|
||||||
|
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
|
if formname ~= "mail:inbox" and formname ~= "mail:sent" then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local name = player:get_player_name()
|
||||||
|
|
||||||
|
-- split inbox and sent msgs for different tests
|
||||||
|
local entry = mail.get_storage_entry(name)
|
||||||
|
|
||||||
|
local messagesInbox = entry.inbox
|
||||||
|
local messagesSent = entry.outbox
|
||||||
|
|
||||||
|
if fields.inbox then -- inbox table
|
||||||
|
local evt = minetest.explode_table_event(fields.inbox)
|
||||||
|
mail.selected_idxs.inbox[name] = evt.row - 1
|
||||||
|
if evt.type == "DCL" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||||
|
mail.show_message(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
||||||
|
end
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
if fields.sent then -- sent table
|
||||||
|
local evt = minetest.explode_table_event(fields.sent)
|
||||||
|
mail.selected_idxs.sent[name] = evt.row - 1
|
||||||
|
if evt.type == "DCL" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||||
|
mail.show_message(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
||||||
|
end
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
if fields.boxtab == "1" then
|
||||||
|
mail.selected_idxs.boxtab[name] = 1
|
||||||
|
mail.show_inbox(name)
|
||||||
|
|
||||||
|
elseif fields.boxtab == "2" then
|
||||||
|
mail.selected_idxs.boxtab[name] = 2
|
||||||
|
mail.show_sent(name)
|
||||||
|
|
||||||
|
elseif fields.read then
|
||||||
|
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then -- inbox table
|
||||||
|
mail.show_message(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
||||||
|
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then -- sent table
|
||||||
|
mail.show_message(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
||||||
|
end
|
||||||
|
|
||||||
|
elseif fields.delete then
|
||||||
|
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then -- inbox table
|
||||||
|
mail.delete_mail(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
||||||
|
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then -- sent table
|
||||||
|
mail.delete_mail(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
||||||
|
end
|
||||||
|
|
||||||
|
mail.show_mail_menu(name)
|
||||||
|
|
||||||
|
elseif fields.reply then
|
||||||
|
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||||
|
local message = messagesInbox[mail.selected_idxs.inbox[name]]
|
||||||
|
mail.reply(name, message)
|
||||||
|
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||||
|
local message = messagesSent[mail.selected_idxs.sent[name]]
|
||||||
|
mail.reply(name, message)
|
||||||
|
end
|
||||||
|
|
||||||
|
elseif fields.replyall then
|
||||||
|
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||||
|
local message = messagesInbox[mail.selected_idxs.inbox[name]]
|
||||||
|
mail.replyall(name, message)
|
||||||
|
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||||
|
local message = messagesSent[mail.selected_idxs.sent[name]]
|
||||||
|
mail.replyall(name, message)
|
||||||
|
end
|
||||||
|
|
||||||
|
elseif fields.forward then
|
||||||
|
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||||
|
local message = messagesInbox[mail.selected_idxs.inbox[name]]
|
||||||
|
mail.forward(name, message)
|
||||||
|
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||||
|
local message = messagesSent[mail.selected_idxs.sent[name]]
|
||||||
|
mail.forward(name, message)
|
||||||
|
end
|
||||||
|
|
||||||
|
elseif fields.markread then
|
||||||
|
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||||
|
mail.mark_read(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
||||||
|
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||||
|
mail.mark_read(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
||||||
|
end
|
||||||
|
|
||||||
|
mail.show_mail_menu(name)
|
||||||
|
|
||||||
|
elseif fields.markunread then
|
||||||
|
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||||
|
mail.mark_unread(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
||||||
|
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||||
|
mail.mark_unread(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
||||||
|
end
|
||||||
|
|
||||||
|
mail.show_mail_menu(name)
|
||||||
|
|
||||||
|
elseif fields.new then
|
||||||
|
mail.show_compose(name)
|
||||||
|
|
||||||
|
elseif fields.contacts then
|
||||||
|
mail.show_contacts(name)
|
||||||
|
|
||||||
|
elseif fields.maillists then
|
||||||
|
mail.show_maillists(name)
|
||||||
|
|
||||||
|
elseif fields.about then
|
||||||
|
mail.show_about(name)
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
return true
|
||||||
|
end)
|
||||||
118
ui/inbox.lua
118
ui/inbox.lua
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
local inbox_formspec = "size[8,10;]" .. mail.theme .. [[
|
local inbox_formspec = "size[8,10;]" .. mail.theme .. [[
|
||||||
tabheader[0.3,1;boxtab;Inbox,Sent messages;1;false;false]
|
tabheader[0.3,1;boxtab;Inbox,Sent messages;1;false;false]
|
||||||
|
|
||||||
|
|
@ -65,120 +64,3 @@ function mail.show_inbox(name)
|
||||||
end
|
end
|
||||||
minetest.show_formspec(name, "mail:inbox", table.concat(formspec, ""))
|
minetest.show_formspec(name, "mail:inbox", table.concat(formspec, ""))
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
|
||||||
if formname ~= "mail:inbox" and formname ~= "mail:sent" then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local name = player:get_player_name()
|
|
||||||
|
|
||||||
-- split inbox and sent msgs for different tests
|
|
||||||
local entry = mail.get_storage_entry(name)
|
|
||||||
|
|
||||||
local messagesInbox = entry.inbox
|
|
||||||
local messagesSent = entry.outbox
|
|
||||||
|
|
||||||
if fields.inbox then -- inbox table
|
|
||||||
local evt = minetest.explode_table_event(fields.inbox)
|
|
||||||
mail.selected_idxs.inbox[name] = evt.row - 1
|
|
||||||
if evt.type == "DCL" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
|
||||||
mail.show_message(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
|
||||||
end
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
if fields.sent then -- sent table
|
|
||||||
local evt = minetest.explode_table_event(fields.sent)
|
|
||||||
mail.selected_idxs.sent[name] = evt.row - 1
|
|
||||||
if evt.type == "DCL" and messagesSent[mail.selected_idxs.sent[name]] then
|
|
||||||
mail.show_message(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
|
||||||
end
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
if fields.boxtab == "1" then
|
|
||||||
mail.selected_idxs.boxtab[name] = 1
|
|
||||||
mail.show_inbox(name)
|
|
||||||
|
|
||||||
elseif fields.boxtab == "2" then
|
|
||||||
mail.selected_idxs.boxtab[name] = 1
|
|
||||||
mail.show_sent(name)
|
|
||||||
|
|
||||||
elseif fields.read then
|
|
||||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then -- inbox table
|
|
||||||
mail.show_message(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
|
||||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then -- sent table
|
|
||||||
mail.show_message(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif fields.delete then
|
|
||||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then -- inbox table
|
|
||||||
mail.delete_mail(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
|
||||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then -- sent table
|
|
||||||
mail.delete_mail(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
|
||||||
end
|
|
||||||
|
|
||||||
mail.show_mail_menu(name)
|
|
||||||
|
|
||||||
elseif fields.reply then
|
|
||||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
|
||||||
local message = messagesInbox[mail.selected_idxs.inbox[name]]
|
|
||||||
mail.reply(name, message)
|
|
||||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
|
||||||
local message = messagesSent[mail.selected_idxs.sent[name]]
|
|
||||||
mail.reply(name, message)
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif fields.replyall then
|
|
||||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
|
||||||
local message = messagesInbox[mail.selected_idxs.inbox[name]]
|
|
||||||
mail.replyall(name, message)
|
|
||||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
|
||||||
local message = messagesSent[mail.selected_idxs.sent[name]]
|
|
||||||
mail.replyall(name, message)
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif fields.forward then
|
|
||||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
|
||||||
local message = messagesInbox[mail.selected_idxs.inbox[name]]
|
|
||||||
mail.forward(name, message)
|
|
||||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
|
||||||
local message = messagesSent[mail.selected_idxs.sent[name]]
|
|
||||||
mail.forward(name, message)
|
|
||||||
end
|
|
||||||
|
|
||||||
elseif fields.markread then
|
|
||||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
|
||||||
mail.mark_read(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
|
||||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
|
||||||
mail.mark_read(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
|
||||||
end
|
|
||||||
|
|
||||||
mail.show_mail_menu(name)
|
|
||||||
|
|
||||||
elseif fields.markunread then
|
|
||||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
|
||||||
mail.mark_unread(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
|
||||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
|
||||||
mail.mark_unread(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
|
||||||
end
|
|
||||||
|
|
||||||
mail.show_mail_menu(name)
|
|
||||||
|
|
||||||
elseif fields.new then
|
|
||||||
mail.show_compose(name)
|
|
||||||
|
|
||||||
elseif fields.contacts then
|
|
||||||
mail.show_contacts(name)
|
|
||||||
|
|
||||||
elseif fields.maillists then
|
|
||||||
mail.show_maillists(name)
|
|
||||||
|
|
||||||
elseif fields.about then
|
|
||||||
mail.show_about(name)
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
return true
|
|
||||||
end)
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue