summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcheapie <no-email-for-you@example.com>2025-12-14 13:46:25 -0600
committercheapie <no-email-for-you@example.com>2025-12-14 13:46:25 -0600
commit1ee8d5827d50beff1823250e1397546be07f0d0b (patch)
tree77231a845b8905bf3edc5bc6d2af83135d4bbfc4
parent4e574d9cfdd9f24a396478965668a23dbd768de7 (diff)
downloadcelevator-1ee8d5827d50beff1823250e1397546be07f0d0b.tar
celevator-1ee8d5827d50beff1823250e1397546be07f0d0b.tar.gz
celevator-1ee8d5827d50beff1823250e1397546be07f0d0b.tar.bz2
celevator-1ee8d5827d50beff1823250e1397546be07f0d0b.tar.xz
celevator-1ee8d5827d50beff1823250e1397546be07f0d0b.zip
Assorted formspec/infotext changes to both clean things up and make localization work betterHEADmain
-rw-r--r--controllerfw.lua4
-rw-r--r--digilines.lua2
-rw-r--r--dispatcherfw.lua4
-rw-r--r--laptop.lua10
-rw-r--r--textures/celevator_menu_small_arrow.pngbin0 -> 231 bytes
5 files changed, 10 insertions, 10 deletions
diff --git a/controllerfw.lua b/controllerfw.lua
index ed92af9..75ecb4d 100644
--- a/controllerfw.lua
+++ b/controllerfw.lua
@@ -1382,9 +1382,9 @@ elseif mem.screenstate == "status" then
fs("box[13.12,2.5;0.05,9;#AAAAAAFF]")
fs("box[14.12,2.5;0.05,9;#AAAAAAFF]")
fs("box[15.25,2.5;0.1,9;#AAAAAAFF]")
- fs("label[12.4,2;^]")
+ fs("image[12.5,1.9;0.2,0.4;celevator_menu_small_arrow.png]")
fs("label[13.38,2;"..S("CAR").."]")
- fs("label[14.8,2;v]")
+ fs("image[14.6,1.9;0.2,0.4;celevator_menu_small_arrow.png^[transformFY]")
local maxfloor = #mem.params.floornames
local bottom = (mem.screenpage-1)*10+1
for i=0,9,1 do
diff --git a/digilines.lua b/digilines.lua
index d85e8ae..60fa469 100644
--- a/digilines.lua
+++ b/digilines.lua
@@ -249,7 +249,7 @@ core.register_node("celevator:digilines_io",{
end
meta:set_int("dispatcher",dmode and 1 or 0)
meta:set_string("channel",fields.channel)
- local infotext = "Car: "..carid
+ local infotext = S("ID: @1",carid)
meta:set_string("infotext",infotext)
end,
})
diff --git a/dispatcherfw.lua b/dispatcherfw.lua
index d54c4e1..4d6aa82 100644
--- a/dispatcherfw.lua
+++ b/dispatcherfw.lua
@@ -1054,8 +1054,8 @@ elseif mem.screenstate == "status" then
fs("label[1,1;"..S("GROUP DISPLAY").."]")
fs("box[1.5,1.5;0.1,10;#AAAAAAFF]")
fs("box[18.5,1.5;0.1,10;#AAAAAAFF]")
- fs("label[0.55,11.5;^]")
- fs("label[19.2,11.5;v]")
+ fs("image[0.45,11;0.2,0.4;celevator_menu_small_arrow.png]")
+ fs("image[19.4,11;0.2,0.4;celevator_menu_small_arrow.png^[transformFY]")
fs("button[15,0.5;2,1;menu;"..S("Menu").."]")
fs("style_type[image_button;font=mono;font_size=*0.75]")
for car=1,#mem.params.carids,1 do
diff --git a/laptop.lua b/laptop.lua
index f0fcb62..a44bf2b 100644
--- a/laptop.lua
+++ b/laptop.lua
@@ -80,8 +80,8 @@ laptop.register_app("celevator",{
fs = fs.."box[0.5,1;0.1,9;#AAAAAAFF]"
fs = fs.."box[14.25,1;0.1,9;#AAAAAAFF]"
fs = fs.."style_type[label;font_size=*0.75]"
- fs = fs.."label[0.05,10;^]"
- fs = fs.."label[14.35,10;v]"
+ fs = fs.."image[0.15,9.8;0.2,0.4;celevator_menu_small_arrow.png]"
+ fs = fs.."image[14.55,9.8;0.2,0.4;celevator_menu_small_arrow.png^[transformFY]"
fs = fs.."style_type[image_button;font=mono;font_size=*0.66]"
for car=1,#dmem.params.carids,1 do
local xp = (car-1)*0.75+1
@@ -245,14 +245,14 @@ laptop.register_app("celevator",{
fs = fs.."box[11.808,0.75;0.05,9;#AAAAAAFF]"
fs = fs.."box[12.708,0.75;0.05,9;#AAAAAAFF]"
fs = fs.."box[13.725,0.75;0.1,9;#AAAAAAFF]"
- fs = fs.."label[11.25,0.3;^]"
+ fs = fs.."image[11.2,0.3;0.2,0.4;celevator_menu_small_arrow.png]"
fs = fs.."label[12.042,0.3;"..S("CAR").."]"
- fs = fs.."label[12.825,0.3;v]"
+ fs = fs.."image[13.1,0.3;0.2,0.4;celevator_menu_small_arrow.png^[transformFY]"
if mem.scrollfollowscar then mem.screenpage = math.floor((carfloor-1)/10)+1 end
local maxfloor = #cmem.params.floornames
local bottom = (mem.screenpage-1)*10+1
if maxfloor > 10 then
- fs = fs..string.format("checkbox[8.4,1.5;scrollfollowscar;"..S("Follow Car")..";%s]",tostring(mem.scrollfollowscar))
+ fs = fs..string.format("checkbox[8.4,1.7;scrollfollowscar;"..S("Follow Car")..";%s]",tostring(mem.scrollfollowscar))
if bottom+9 < maxfloor then
fs = fs.."image_button[8.5,1;0.75,0.75;celevator_menu_arrow.png;scrollup;;false;false;celevator_menu_arrow.png]"
end
diff --git a/textures/celevator_menu_small_arrow.png b/textures/celevator_menu_small_arrow.png
new file mode 100644
index 0000000..5ab4761
--- /dev/null
+++ b/textures/celevator_menu_small_arrow.png
Binary files differ