"Browse online content" formspec improvement (#10756)

diff --git a/LICENSE.txt b/LICENSE.txt
index 9fbd237231c37973c1f7873a8c82c967b51aadc2..9b8ee851aba3f91d7802265621cee64d83fe483a 100644 (file)
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -11,6 +11,9 @@ http://creativecommons.org/licenses/by-sa/3.0/
 textures/base/pack/refresh.png is under the Apache 2 license
 https://www.apache.org/licenses/LICENSE-2.0.html
 
+Textures by Zughy are under CC BY-SA 4.0
+https://creativecommons.org/licenses/by-sa/4.0/
+
 Authors of media files
 -----------------------
 Everything not listed in here:
@@ -47,6 +50,14 @@ srifqi
   textures/base/pack/joystick_off.png
   textures/base/pack/minimap_btn.png
 
+Zughy:
+  textures/base/pack/cdb_add.png
+  textures/base/pack/cdb_clear.png
+  textures/base/pack/cdb_downloading.png
+  textures/base/pack/cdb_queued.png
+  textures/base/pack/cdb_update.png
+  textures/base/pack/cdb_viewonline.png
+
 License of Minetest source code
 -------------------------------
 

diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua
index 548bae67e7ba17917cd27b8c9fbe898a189c9f2f..7f6b4b7e446076c68730b5cdf9237cbd629ad2e3 100644 (file)
--- a/builtin/mainmenu/dlg_contentstore.lua
+++ b/builtin/mainmenu/dlg_contentstore.lua
@@ -631,7 +631,7 @@ function store.get_formspec(dlgdata)
                        "size[15.75,9.5]",
                        "position[0.5,0.55]",
 
-                       "style[status;border=false]",
+                       "style[status,downloading,queued;border=false]",
 
                        "container[0.375,0.375]",
                        "field[0,0;7.225,0.8;search_string;;", core.formspec_escape(search_string), "]",
@@ -658,7 +658,7 @@ function store.get_formspec(dlgdata)
                }
 
                if number_downloading > 0 then
-                       formspec[#formspec + 1] = "button[12.75,0.375;2.625,0.8;status;"
+                       formspec[#formspec + 1] = "button[12.75,0.375;2.625,0.8;downloading;"
                        if #download_queue > 0 then
                                formspec[#formspec + 1] = fgettext("$1 downloading,\n$2 queued", number_downloading, #download_queue)
                        else
@@ -702,11 +702,17 @@ function store.get_formspec(dlgdata)
                }
        end
 
+       -- download/queued tooltips always have the same message
+       local tooltip_colors = ";#dff6f5;#302c2e]"
+       formspec[#formspec + 1] = "tooltip[downloading;" .. fgettext("Downloading...") .. tooltip_colors
+       formspec[#formspec + 1] = "tooltip[queued;" .. fgettext("Queued") .. tooltip_colors
+
        local start_idx = (cur_page - 1) * num_per_page + 1
        for i=start_idx, math.min(#store.packages, start_idx+num_per_page-1) do
                local package = store.packages[i]
+               local container_y = (i - start_idx) * 1.375 + (2*0.375 + 0.8)
                formspec[#formspec + 1] = "container[0.375,"
-               formspec[#formspec + 1] = (i - start_idx) * 1.375 + (2*0.375 + 0.8)
+               formspec[#formspec + 1] = container_y
                formspec[#formspec + 1] = "]"
 
                -- image
@@ -722,52 +728,50 @@ function store.get_formspec(dlgdata)
                formspec[#formspec + 1] = "]"
 
                -- buttons
-               local description_width = W - 0.375*5 - 1 - 2*1.5
+               local left_base = "image_button[-1.55,0;0.7,0.7;" .. core.formspec_escape(defaulttexturedir)
                formspec[#formspec + 1] = "container["
                formspec[#formspec + 1] = W - 0.375*2
                formspec[#formspec + 1] = ",0.1]"
 
                if package.downloading then
-                       formspec[#formspec + 1] = "button[-3.5,0;2,0.8;status;"
-                       formspec[#formspec + 1] = fgettext("Downloading...")
-                       formspec[#formspec + 1] = "]"
+                       formspec[#formspec + 1] = "animated_image[-1.7,-0.15;1,1;downloading;"
+                       formspec[#formspec + 1] = core.formspec_escape(defaulttexturedir)
+                       formspec[#formspec + 1] = "cdb_downloading.png;3;400;]"
                elseif package.queued then
-                       formspec[#formspec + 1] = "button[-3.5,0;2,0.8;status;"
-                       formspec[#formspec + 1] = fgettext("Queued")
-                       formspec[#formspec + 1] = "]"
+                       formspec[#formspec + 1] = left_base
+                       formspec[#formspec + 1] = core.formspec_escape(defaulttexturedir)
+                       formspec[#formspec + 1] = "cdb_queued.png;queued]"
                elseif not package.path then
-                       formspec[#formspec + 1] = "button[-3,0;1.5,0.8;install_"
-                       formspec[#formspec + 1] = tostring(i)
-                       formspec[#formspec + 1] = ";"
-                       formspec[#formspec + 1] = fgettext("Install")
-                       formspec[#formspec + 1] = "]"
+                       local elem_name = "install_" .. i .. ";"
+                       formspec[#formspec + 1] = "style[" .. elem_name .. "bgcolor=#71aa34]"
+                       formspec[#formspec + 1] = left_base .. "cdb_add.png;" .. elem_name .. "]"
+                       formspec[#formspec + 1] = "tooltip[" .. elem_name .. fgettext("Install") .. tooltip_colors
                else
                        if package.installed_release < package.release then
-                               description_width = description_width - 1.5
 
                                -- The install_ action also handles updating
-                               formspec[#formspec + 1] = "button[-4.5,0;1.5,0.8;install_"
-                               formspec[#formspec + 1] = tostring(i)
-                               formspec[#formspec + 1] = ";"
-                               formspec[#formspec + 1] = fgettext("Update")
-                               formspec[#formspec + 1] = "]"
-                       end
+                               local elem_name = "install_" .. i .. ";"
+                               formspec[#formspec + 1] = "style[" .. elem_name .. "bgcolor=#28ccdf]"
+                               formspec[#formspec + 1] = left_base .. "cdb_update.png;" .. elem_name .. "]"
+                               formspec[#formspec + 1] = "tooltip[" .. elem_name .. fgettext("Update") .. tooltip_colors
+                       else
 
-                       formspec[#formspec + 1] = "button[-3,0;1.5,0.8;uninstall_"
-                       formspec[#formspec + 1] = tostring(i)
-                       formspec[#formspec + 1] = ";"
-                       formspec[#formspec + 1] = fgettext("Uninstall")
-                       formspec[#formspec + 1] = "]"
+                               local elem_name = "uninstall_" .. i .. ";"
+                               formspec[#formspec + 1] = "style[" .. elem_name .. "bgcolor=#a93b3b]"
+                               formspec[#formspec + 1] = left_base .. "cdb_clear.png;" .. elem_name .. "]"
+                               formspec[#formspec + 1] = "tooltip[" .. elem_name .. fgettext("Uninstall") .. tooltip_colors
+                       end
                end
 
-               formspec[#formspec + 1] = "button[-1.5,0;1.5,0.8;view_"
-               formspec[#formspec + 1] = tostring(i)
-               formspec[#formspec + 1] = ";"
-               formspec[#formspec + 1] = fgettext("View")
-               formspec[#formspec + 1] = "]"
+               local web_elem_name = "view_" .. i .. ";"
+               formspec[#formspec + 1] = "image_button[-0.7,0;0.7,0.7;" ..
+                       core.formspec_escape(defaulttexturedir) .. "cdb_viewonline.png;" .. web_elem_name .. "]"
+               formspec[#formspec + 1] = "tooltip[" .. web_elem_name ..
+                       fgettext("View more information in a web browser") .. tooltip_colors
                formspec[#formspec + 1] = "container_end[]"
 
                -- description
+               local description_width = W - 0.375*5 - 0.85 - 2*0.7
                formspec[#formspec + 1] = "textarea[1.855,0.3;"
                formspec[#formspec + 1] = tostring(description_width)
                formspec[#formspec + 1] = ",0.8;;;"

diff --git a/textures/base/pack/cdb_add.png b/textures/base/pack/cdb_add.png
new file mode 100644 (file)
index 0000000..3e3d067
Binary files /dev/null and b/textures/base/pack/cdb_add.png differ

diff --git a/textures/base/pack/cdb_clear.png b/textures/base/pack/cdb_clear.png
new file mode 100644 (file)
index 0000000..4490d41
Binary files /dev/null and b/textures/base/pack/cdb_clear.png differ

diff --git a/textures/base/pack/cdb_downloading.png b/textures/base/pack/cdb_downloading.png
new file mode 100644 (file)
index 0000000..8cba383
Binary files /dev/null and b/textures/base/pack/cdb_downloading.png differ

diff --git a/textures/base/pack/cdb_queued.png b/textures/base/pack/cdb_queued.png
new file mode 100644 (file)
index 0000000..6972f7f
Binary files /dev/null and b/textures/base/pack/cdb_queued.png differ

diff --git a/textures/base/pack/cdb_update.png b/textures/base/pack/cdb_update.png
new file mode 100644 (file)
index 0000000..262e42d
Binary files /dev/null and b/textures/base/pack/cdb_update.png differ

diff --git a/textures/base/pack/cdb_viewonline.png b/textures/base/pack/cdb_viewonline.png
new file mode 100644 (file)
index 0000000..ae2a146
Binary files /dev/null and b/textures/base/pack/cdb_viewonline.png differ