mirror of
https://github.com/mt-mods/mail.git
synced 2025-07-05 14:10:31 -04:00
Add multiple selection (#60)
* Add multiple selection * Fix wrong messages issues * Update translations * Mix colors for unread/cc in inbox with selected green * Fix duplicates when clicking on select all with already one selected, and add the number of selected items * Fixes * Remove old translations files * Fix filter priority
This commit is contained in:
parent
67bda9a788
commit
191e511a05
10 changed files with 293 additions and 148 deletions
|
@ -5,7 +5,8 @@ local S = minetest.get_translator("mail")
|
|||
function mail.show_sent(name, sortfieldindex, sortdirection, filter)
|
||||
sortfieldindex = tonumber(sortfieldindex or mail.selected_idxs.sortfield[name]) or 3
|
||||
sortdirection = sortdirection or mail.selected_idxs.sortdirection[name] or "1"
|
||||
filter = filter or ""
|
||||
filter = filter or mail.selected_idxs.filter[name] or ""
|
||||
mail.selected_idxs.sent[name] = mail.selected_idxs.sent[name] or {}
|
||||
|
||||
local sent_formspec = "size[8.5,10;]" .. mail.theme .. [[
|
||||
tabheader[0.3,1;boxtab;]] .. S("Inbox") .. "," .. S("Sent messages").. "," .. S("Drafts") .. [[;2;false;false]
|
||||
|
@ -21,15 +22,20 @@ function mail.show_sent(name, sortfieldindex, sortdirection, filter)
|
|||
button[6,8.7;2.5,0.5;about;]] .. S("About") .. [[]
|
||||
button_exit[6,9.5;2.5,0.5;quit;]] .. S("Close") .. [[]
|
||||
|
||||
dropdown[0,9.4;2,0.5;sortfield;]]
|
||||
.. S("To") .. "," .. S("Subject") .. "," .. S("Date") .. [[;]] .. sortfieldindex .. [[;1]
|
||||
dropdown[2.0,9.4;2,0.5;sortdirection;]]
|
||||
.. S("Ascending") .. "," .. S("Descending") .. [[;]] .. sortdirection .. [[;1]
|
||||
field[4.25,9.85;1.4,0.5;filter;]].. S("Filter") .. [[:;]] .. filter .. [[]
|
||||
button[5.14,9.52;0.85,0.5;search;Q]
|
||||
dropdown[0,8.4;2,0.5;sortfield;]] ..
|
||||
S("To") .. "," .. S("Subject") .. "," .. S("Date") .. [[;]] .. sortfieldindex .. [[;true]
|
||||
dropdown[2.0,8.4;2,0.5;sortdirection;]] ..
|
||||
S("Ascending") .. "," .. S("Descending") .. [[;]] .. sortdirection .. [[;true]
|
||||
field[4.25,8.85;1.4,0.5;filter;]] .. S("Filter") .. [[:;]] .. filter .. [[]
|
||||
button[5.14,8.52;0.85,0.5;search;Q]
|
||||
|
||||
checkbox[0,9.1;multipleselection;]] .. S("Allow multiple selection") .. [[;]] ..
|
||||
tostring(mail.selected_idxs.multipleselection[name]) .. [[]
|
||||
label[0,9.65;]] .. tostring(#mail.selected_idxs.sent[name]) .. " " .. S("selected") .. [[]
|
||||
button[3.5,9.5;2.5,0.5;selectall;]] .. S("(Un)select all") .. [[]
|
||||
|
||||
tablecolumns[color;text;text]
|
||||
table[0,0.7;5.75,8.35;sent;#999,]] .. S("To") .. "," .. S("Subject")
|
||||
table[0,0.7;5.75,7.35;sent;#999,]] .. S("To") .. "," .. S("Subject")
|
||||
local formspec = { sent_formspec }
|
||||
local entry = mail.get_storage_entry(name)
|
||||
local sortfield = ({"to","subject","time"})[sortfieldindex]
|
||||
|
@ -39,7 +45,21 @@ function mail.show_sent(name, sortfieldindex, sortdirection, filter)
|
|||
|
||||
if #messages > 0 then
|
||||
for _, message in ipairs(messages) do
|
||||
formspec[#formspec + 1] = ","
|
||||
local selected_id = 0
|
||||
-- check if message is in selection list and return its id
|
||||
if mail.selected_idxs.sent[name] and #mail.selected_idxs.sent[name] > 0 then
|
||||
for i, selected_msg in ipairs(mail.selected_idxs.sent[name]) do
|
||||
if message.id == selected_msg then
|
||||
selected_id = i
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
if selected_id > 0 then
|
||||
formspec[#formspec + 1] = ",#466432"
|
||||
else
|
||||
formspec[#formspec + 1] = ","
|
||||
end
|
||||
formspec[#formspec + 1] = ","
|
||||
formspec[#formspec + 1] = minetest.formspec_escape(message.to)
|
||||
formspec[#formspec + 1] = ","
|
||||
|
@ -54,10 +74,6 @@ function mail.show_sent(name, sortfieldindex, sortdirection, filter)
|
|||
formspec[#formspec + 1] = S("(No subject)")
|
||||
end
|
||||
end
|
||||
if mail.selected_idxs.sent[name] then
|
||||
formspec[#formspec + 1] = ";"
|
||||
formspec[#formspec + 1] = tostring(mail.selected_idxs.sent[name] + 1)
|
||||
end
|
||||
formspec[#formspec + 1] = "]"
|
||||
else
|
||||
formspec[#formspec + 1] = "]label[2.25,4.5;" .. S("No mail") .. "]"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue