diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg index 118ff7bc0e..518d88efd5 100644 --- a/binaries/data/config/default.cfg +++ b/binaries/data/config/default.cfg @@ -418,6 +418,10 @@ rewind = "Shift+Backspace" ; If timewarp mode enabled, go back to earlier next = "Tab", "Alt+S" ; Show the next tab prev = "Shift+Tab", "Alt+W" ; Show the previous tab +[hotkey.item] +next = "RightArrow" ; Show the next item of a list +prev = "LeftArrow" ; Show the previous item of a list + [hotkey.text] ; > GUI TEXTBOX HOTKEYS delete.left = "Ctrl+Backspace" ; Delete word to the left of cursor delete.right = "Ctrl+Del" ; Delete word to the right of cursor diff --git a/binaries/data/mods/public/art/textures/ui/tipdisplay/bullet-point.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/bullet-point.png new file mode 100644 index 0000000000..066aad6a76 --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/tipdisplay/bullet-point.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eea1fcf91b908608b324d3cbc338f910e6bad9be3a61e8d2c13cacad2c9e5df3 +size 314 diff --git a/binaries/data/mods/public/art/textures/ui/tipdisplay/button-decoration_back.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-decoration_back.png new file mode 100644 index 0000000000..dfd9fc3e40 --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-decoration_back.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a793864d24ddc596dce3c5de6e94d4e6bf19bbc7b954f6488890daae9f737c24 +size 594 diff --git a/binaries/data/mods/public/art/textures/ui/tipdisplay/button-decoration_front.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-decoration_front.png new file mode 100644 index 0000000000..06f9e5b5f8 --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-decoration_front.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edd1ab1182a46fad152667c4333c03f87d286536b3428d48858b2069cb2b78bd +size 366 diff --git a/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_base.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_base.png new file mode 100644 index 0000000000..8d3584d51a --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_base.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ef224f97dca446a41f1e1acf7c364f899d6b86b1a8a62bbd4a9312beb2be7bb +size 10377 diff --git a/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_disabled.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_disabled.png new file mode 100644 index 0000000000..b9d14cf7ad --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_disabled.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c63813b9c16756aa1c24419c8bb3a8ee6f5095af94101805f2c073651f60745 +size 5823 diff --git a/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_over.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_over.png new file mode 100644 index 0000000000..1e4acfb31e --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_over.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1ddec0078002e7aff588914ef9c18ee9b08a618ba74120964a45f5c92b79345 +size 8278 diff --git a/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_pressed.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_pressed.png new file mode 100644 index 0000000000..92aa921b99 --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/tipdisplay/button-highlight_pressed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8963642a740556a2438742dd17dd71eb2576d3e6afa3a38bebd185b6a9257a79 +size 8167 diff --git a/binaries/data/mods/public/art/textures/ui/tipdisplay/button_mask_left.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/button_mask_left.png new file mode 100644 index 0000000000..225d12ac52 --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/tipdisplay/button_mask_left.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:040ba034064c326ecdecd5b04ba78bc83f54c8559134ca83cc8742286582e896 +size 1728 diff --git a/binaries/data/mods/public/art/textures/ui/tipdisplay/button_mask_right.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/button_mask_right.png new file mode 100644 index 0000000000..c39dab9f49 --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/tipdisplay/button_mask_right.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df06f74a12049d725be4fe46e45cce0bb3f68c3acc151a967865df28248968ef +size 1351 diff --git a/binaries/data/mods/public/art/textures/ui/loading/parchment.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/parchment.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/parchment.png rename to binaries/data/mods/public/art/textures/ui/tipdisplay/parchment.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/gradient_tips.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/tip-image-gradient.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/gradient_tips.png rename to binaries/data/mods/public/art/textures/ui/tipdisplay/tip-image-gradient.png diff --git a/binaries/data/mods/public/art/textures/ui/tipdisplay/title-ornament.png b/binaries/data/mods/public/art/textures/ui/tipdisplay/title-ornament.png new file mode 100644 index 0000000000..8d4133b87a --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/tipdisplay/title-ornament.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dff510f39d80d4b23497c8f1f59b443fd0bc3ce636d12719014e90a94960b78e +size 321 diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/army_camp.png b/binaries/data/mods/public/art/textures/ui/tips/army_camp.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/army_camp.png rename to binaries/data/mods/public/art/textures/ui/tips/army_camp.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/arrow_ship.png b/binaries/data/mods/public/art/textures/ui/tips/arrow_ship.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/arrow_ship.png rename to binaries/data/mods/public/art/textures/ui/tips/arrow_ship.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/autoqueue.png b/binaries/data/mods/public/art/textures/ui/tips/autoqueue.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/autoqueue.png rename to binaries/data/mods/public/art/textures/ui/tips/autoqueue.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/barracks.png b/binaries/data/mods/public/art/textures/ui/tips/barracks.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/barracks.png rename to binaries/data/mods/public/art/textures/ui/tips/barracks.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/barter.png b/binaries/data/mods/public/art/textures/ui/tips/barter.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/barter.png rename to binaries/data/mods/public/art/textures/ui/tips/barter.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/biomes.png b/binaries/data/mods/public/art/textures/ui/tips/biomes.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/biomes.png rename to binaries/data/mods/public/art/textures/ui/tips/biomes.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/briton_war_dog.png b/binaries/data/mods/public/art/textures/ui/tips/briton_war_dog.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/briton_war_dog.png rename to binaries/data/mods/public/art/textures/ui/tips/briton_war_dog.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/carth_sacred_band.png b/binaries/data/mods/public/art/textures/ui/tips/carth_sacred_band.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/carth_sacred_band.png rename to binaries/data/mods/public/art/textures/ui/tips/carth_sacred_band.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/carth_shipyard.png b/binaries/data/mods/public/art/textures/ui/tips/carth_shipyard.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/carth_shipyard.png rename to binaries/data/mods/public/art/textures/ui/tips/carth_shipyard.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/catapults.png b/binaries/data/mods/public/art/textures/ui/tips/catapults.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/catapults.png rename to binaries/data/mods/public/art/textures/ui/tips/catapults.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/cavalry_stable.png b/binaries/data/mods/public/art/textures/ui/tips/cavalry_stable.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/cavalry_stable.png rename to binaries/data/mods/public/art/textures/ui/tips/cavalry_stable.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/celtic_war_barge.png b/binaries/data/mods/public/art/textures/ui/tips/celtic_war_barge.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/celtic_war_barge.png rename to binaries/data/mods/public/art/textures/ui/tips/celtic_war_barge.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/city_walls.png b/binaries/data/mods/public/art/textures/ui/tips/city_walls.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/city_walls.png rename to binaries/data/mods/public/art/textures/ui/tips/city_walls.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/civic_center.png b/binaries/data/mods/public/art/textures/ui/tips/civic_center.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/civic_center.png rename to binaries/data/mods/public/art/textures/ui/tips/civic_center.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/control_groups.png b/binaries/data/mods/public/art/textures/ui/tips/control_groups.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/control_groups.png rename to binaries/data/mods/public/art/textures/ui/tips/control_groups.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/default_formation.png b/binaries/data/mods/public/art/textures/ui/tips/default_formation.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/default_formation.png rename to binaries/data/mods/public/art/textures/ui/tips/default_formation.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/defense_tower.png b/binaries/data/mods/public/art/textures/ui/tips/defense_tower.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/defense_tower.png rename to binaries/data/mods/public/art/textures/ui/tips/defense_tower.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/dock.png b/binaries/data/mods/public/art/textures/ui/tips/dock.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/dock.png rename to binaries/data/mods/public/art/textures/ui/tips/dock.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/elephant_stable.png b/binaries/data/mods/public/art/textures/ui/tips/elephant_stable.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/elephant_stable.png rename to binaries/data/mods/public/art/textures/ui/tips/elephant_stable.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/embassies.png b/binaries/data/mods/public/art/textures/ui/tips/embassies.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/embassies.png rename to binaries/data/mods/public/art/textures/ui/tips/embassies.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/fire_ship.png b/binaries/data/mods/public/art/textures/ui/tips/fire_ship.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/fire_ship.png rename to binaries/data/mods/public/art/textures/ui/tips/fire_ship.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/fishing.png b/binaries/data/mods/public/art/textures/ui/tips/fishing.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/fishing.png rename to binaries/data/mods/public/art/textures/ui/tips/fishing.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/forge.png b/binaries/data/mods/public/art/textures/ui/tips/forge.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/forge.png rename to binaries/data/mods/public/art/textures/ui/tips/forge.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/formations.png b/binaries/data/mods/public/art/textures/ui/tips/formations.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/formations.png rename to binaries/data/mods/public/art/textures/ui/tips/formations.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/fortress.png b/binaries/data/mods/public/art/textures/ui/tips/fortress.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/fortress.png rename to binaries/data/mods/public/art/textures/ui/tips/fortress.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/freehand_position.png b/binaries/data/mods/public/art/textures/ui/tips/freehand_position.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/freehand_position.png rename to binaries/data/mods/public/art/textures/ui/tips/freehand_position.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/gathering.png b/binaries/data/mods/public/art/textures/ui/tips/gathering.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/gathering.png rename to binaries/data/mods/public/art/textures/ui/tips/gathering.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/heroes.png b/binaries/data/mods/public/art/textures/ui/tips/heroes.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/heroes.png rename to binaries/data/mods/public/art/textures/ui/tips/heroes.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/lighthouse.png b/binaries/data/mods/public/art/textures/ui/tips/lighthouse.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/lighthouse.png rename to binaries/data/mods/public/art/textures/ui/tips/lighthouse.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/loot.png b/binaries/data/mods/public/art/textures/ui/tips/loot.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/loot.png rename to binaries/data/mods/public/art/textures/ui/tips/loot.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/map_flare.png b/binaries/data/mods/public/art/textures/ui/tips/map_flare.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/map_flare.png rename to binaries/data/mods/public/art/textures/ui/tips/map_flare.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/mauryan_worker_elephant.png b/binaries/data/mods/public/art/textures/ui/tips/mauryan_worker_elephant.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/mauryan_worker_elephant.png rename to binaries/data/mods/public/art/textures/ui/tips/mauryan_worker_elephant.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/meroe_pyramids.png b/binaries/data/mods/public/art/textures/ui/tips/meroe_pyramids.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/meroe_pyramids.png rename to binaries/data/mods/public/art/textures/ui/tips/meroe_pyramids.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/nomad_mode.png b/binaries/data/mods/public/art/textures/ui/tips/nomad_mode.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/nomad_mode.png rename to binaries/data/mods/public/art/textures/ui/tips/nomad_mode.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/order_one_unit.png b/binaries/data/mods/public/art/textures/ui/tips/order_one_unit.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/order_one_unit.png rename to binaries/data/mods/public/art/textures/ui/tips/order_one_unit.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/outposts.png b/binaries/data/mods/public/art/textures/ui/tips/outposts.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/outposts.png rename to binaries/data/mods/public/art/textures/ui/tips/outposts.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/palisades.png b/binaries/data/mods/public/art/textures/ui/tips/palisades.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/palisades.png rename to binaries/data/mods/public/art/textures/ui/tips/palisades.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/persian_architecture.png b/binaries/data/mods/public/art/textures/ui/tips/persian_architecture.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/persian_architecture.png rename to binaries/data/mods/public/art/textures/ui/tips/persian_architecture.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/pikemen.png b/binaries/data/mods/public/art/textures/ui/tips/pikemen.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/pikemen.png rename to binaries/data/mods/public/art/textures/ui/tips/pikemen.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/queue_orders.png b/binaries/data/mods/public/art/textures/ui/tips/queue_orders.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/queue_orders.png rename to binaries/data/mods/public/art/textures/ui/tips/queue_orders.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/ramming_ship.png b/binaries/data/mods/public/art/textures/ui/tips/ramming_ship.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/ramming_ship.png rename to binaries/data/mods/public/art/textures/ui/tips/ramming_ship.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/resource_counter.png b/binaries/data/mods/public/art/textures/ui/tips/resource_counter.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/resource_counter.png rename to binaries/data/mods/public/art/textures/ui/tips/resource_counter.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/savanna_biome.png b/binaries/data/mods/public/art/textures/ui/tips/savanna_biome.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/savanna_biome.png rename to binaries/data/mods/public/art/textures/ui/tips/savanna_biome.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/select_wounded_units.png b/binaries/data/mods/public/art/textures/ui/tips/select_wounded_units.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/select_wounded_units.png rename to binaries/data/mods/public/art/textures/ui/tips/select_wounded_units.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/shrine.png b/binaries/data/mods/public/art/textures/ui/tips/shrine.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/shrine.png rename to binaries/data/mods/public/art/textures/ui/tips/shrine.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/siege_ship.png b/binaries/data/mods/public/art/textures/ui/tips/siege_ship.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/siege_ship.png rename to binaries/data/mods/public/art/textures/ui/tips/siege_ship.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/snapping.png b/binaries/data/mods/public/art/textures/ui/tips/snapping.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/snapping.png rename to binaries/data/mods/public/art/textures/ui/tips/snapping.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/spartan_hoplites.png b/binaries/data/mods/public/art/textures/ui/tips/spartan_hoplites.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/spartan_hoplites.png rename to binaries/data/mods/public/art/textures/ui/tips/spartan_hoplites.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/spearmen.png b/binaries/data/mods/public/art/textures/ui/tips/spearmen.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/spearmen.png rename to binaries/data/mods/public/art/textures/ui/tips/spearmen.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/storehouse.png b/binaries/data/mods/public/art/textures/ui/tips/storehouse.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/storehouse.png rename to binaries/data/mods/public/art/textures/ui/tips/storehouse.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/syntagma.png b/binaries/data/mods/public/art/textures/ui/tips/syntagma.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/syntagma.png rename to binaries/data/mods/public/art/textures/ui/tips/syntagma.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/temple.png b/binaries/data/mods/public/art/textures/ui/tips/temple.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/temple.png rename to binaries/data/mods/public/art/textures/ui/tips/temple.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/territory_decay.png b/binaries/data/mods/public/art/textures/ui/tips/territory_decay.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/territory_decay.png rename to binaries/data/mods/public/art/textures/ui/tips/territory_decay.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/theater.png b/binaries/data/mods/public/art/textures/ui/tips/theater.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/theater.png rename to binaries/data/mods/public/art/textures/ui/tips/theater.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/trading.png b/binaries/data/mods/public/art/textures/ui/tips/trading.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/trading.png rename to binaries/data/mods/public/art/textures/ui/tips/trading.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/treasure.png b/binaries/data/mods/public/art/textures/ui/tips/treasure.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/treasure.png rename to binaries/data/mods/public/art/textures/ui/tips/treasure.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/war_elephants.png b/binaries/data/mods/public/art/textures/ui/tips/war_elephants.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/war_elephants.png rename to binaries/data/mods/public/art/textures/ui/tips/war_elephants.png diff --git a/binaries/data/mods/public/art/textures/ui/loading/tips/whales.png b/binaries/data/mods/public/art/textures/ui/tips/whales.png similarity index 100% rename from binaries/data/mods/public/art/textures/ui/loading/tips/whales.png rename to binaries/data/mods/public/art/textures/ui/tips/whales.png diff --git a/binaries/data/mods/public/gui/hotkeys/spec/engine.json b/binaries/data/mods/public/gui/hotkeys/spec/engine.json index 2cd9aeb3c7..20b29ccf9d 100644 --- a/binaries/data/mods/public/gui/hotkeys/spec/engine.json +++ b/binaries/data/mods/public/gui/hotkeys/spec/engine.json @@ -79,6 +79,14 @@ "name": "Previous tab", "desc": "Show the previous tab." }, + "item.next": { + "name": "Next item", + "desc": "Show the next item." + }, + "item.prev": { + "name": "Previous item", + "desc": "Show the previous item." + }, "text.delete.left": { "name": "Delete before cursor", "desc": "Delete word to the left of cursor." diff --git a/binaries/data/mods/public/gui/loading/TipDisplay.js b/binaries/data/mods/public/gui/loading/TipDisplay.js index fd2c288c28..e69de29bb2 100644 --- a/binaries/data/mods/public/gui/loading/TipDisplay.js +++ b/binaries/data/mods/public/gui/loading/TipDisplay.js @@ -1,62 +0,0 @@ -/** - * This class is concerned with chosing and displaying hints about how to play the game. - * This includes a text and an image. - */ -class TipDisplay -{ - constructor() - { - this.tipImage = Engine.GetGUIObjectByName("tipImage"); - this.tipTitle = Engine.GetGUIObjectByName("tipTitle"); - this.tipText = Engine.GetGUIObjectByName("tipText"); - - this.tipFiles = listFiles(this.TextPath, ".txt", false); - this.displayRandomTip(); - } - - displayRandomTip() - { - let tipFile = pickRandom(this.tipFiles); - if (tipFile) - this.displayTip(tipFile); - else - error("Failed to find any matching tips for the loading screen."); - } - - displayTip(tipFile) - { - this.tipImage.sprite = - "stretched:" + this.ImagePath + tipFile + ".png"; - - let tipText = Engine.TranslateLines(Engine.ReadFile( - this.TextPath + tipFile + ".txt")).split("\n"); - - this.tipTitle.caption = tipText.shift(); - - // Change the height of the title and the text to fit the full title. - const margin = 10; - const titleSize = this.tipTitle.size; - titleSize.bottom = titleSize.top + this.tipTitle.getTextSize().height + margin; - this.tipTitle.size = titleSize; - - const textSize = this.tipText.size; - textSize.top = titleSize.bottom; - this.tipText.size = textSize; - - this.tipText.caption = tipText.map(text => - text && sprintf(this.BulletFormat, { "tiptext": text })).join("\n\n"); - } -} - -/** - * Directory storing txt files containing the gameplay tips. - */ -TipDisplay.prototype.TextPath = "gui/text/tips/"; - -/** - * Directory storing the PNG images with filenames corresponding to the tip text files. - */ -TipDisplay.prototype.ImagePath = "loading/tips/"; - -// Translation: A bullet point used before every item of list of tips displayed on loading screen -TipDisplay.prototype.BulletFormat = translate("• %(tiptext)s"); diff --git a/binaries/data/mods/public/gui/loading/TipDisplay.xml b/binaries/data/mods/public/gui/loading/TipDisplay.xml deleted file mode 100644 index 83f93939c4..0000000000 --- a/binaries/data/mods/public/gui/loading/TipDisplay.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/binaries/data/mods/public/gui/loading/loading.js b/binaries/data/mods/public/gui/loading/loading.js index 1744fd4996..ff4b8ee79c 100644 --- a/binaries/data/mods/public/gui/loading/loading.js +++ b/binaries/data/mods/public/gui/loading/loading.js @@ -6,7 +6,7 @@ function init(data) "initData": data, "progressBar": new ProgressBar(), "quoteDisplay": new QuoteDisplay(), - "tipDisplay": new TipDisplay(), + "tipDisplay": new TipDisplay({ "tipScrolling": false }), "titleDisplay": new TitleDisplay(data) }; diff --git a/binaries/data/mods/public/gui/loading/loading.xml b/binaries/data/mods/public/gui/loading/loading.xml index 66908d0ca5..9d923e6247 100644 --- a/binaries/data/mods/public/gui/loading/loading.xml +++ b/binaries/data/mods/public/gui/loading/loading.xml @@ -15,7 +15,7 @@ - + diff --git a/binaries/data/mods/public/gui/loading/sprites.xml b/binaries/data/mods/public/gui/loading/sprites.xml index 89aacd6bef..51b1fcec84 100644 --- a/binaries/data/mods/public/gui/loading/sprites.xml +++ b/binaries/data/mods/public/gui/loading/sprites.xml @@ -40,68 +40,4 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/binaries/data/mods/public/gui/loading/styles.xml b/binaries/data/mods/public/gui/loading/styles.xml index 208100e5d0..1651cb34dc 100644 --- a/binaries/data/mods/public/gui/loading/styles.xml +++ b/binaries/data/mods/public/gui/loading/styles.xml @@ -30,19 +30,6 @@ text_valign="top" /> -