Revert "[Feature] Skin engine Themes grab text from a file %ft(file, line) WIP"

This reverts commit 62b5dfd81d.

This was accidentally merged, and wasn't up-to-date anyway.

Change-Id: I4fcceb8dc4f86762701daab72498202cabd8295a
This commit is contained in:
Solomon Peachy 2024-12-07 13:47:49 -05:00
parent 3b78daed14
commit e6851a55ed
32 changed files with 50 additions and 144 deletions

View file

@ -50,6 +50,6 @@
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>>
%V(0,48,-,8,-)
%pc%ar%pr

View file

@ -49,7 +49,7 @@
#
# Next Track Info
%V(3,73,122,12,-)
%s%t(300)%ac%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?It<%It|%Fn>
#
# Time Elapsed/Remaining
%V(3,95,122,12,1)

View file

@ -49,7 +49,7 @@
#
# Next Track Info
%V(3,70,122,12,-)
%s%t(300)%ac%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?It<%It|%Fn>
#
# Time Elapsed/Remaining
%V(3,96,122,12,-)

View file

@ -55,7 +55,7 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%s%acNext Track:
%s%ac%?It<%It|%Fn>
#Time and Playlist Info

View file

@ -59,4 +59,4 @@
#
# Next Track Info
%V(0,42,128,8,1)
%ac%t(300)%s%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%ac%s%Sx(Next:) %?It<%It|%Fn>

View file

@ -49,7 +49,7 @@
#
# Next Track Info
%V(3,56,122,12,-)
%s%t(300)%ac%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?It<%It|%Fn>
#
# Time Elapsed/Remaining
%V(3,73,122,12,1)

View file

@ -53,4 +53,4 @@
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%Sx(Next:) %ac%It;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%Sx(Next:) %ac%It

View file

@ -57,11 +57,11 @@
%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next:) %?It<%It|%Fn>;%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next:) %?It<%It|%Fn>
#
# Track Info - No Album Art
%Vl(b,0,10,-,48,1)
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%ac%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?It<%It|%Fn>

View file

@ -61,7 +61,7 @@
%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
#
# Track Info - No Album Art
@ -69,5 +69,5 @@
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%ac%Sx(Next Track:);%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

View file

@ -55,5 +55,5 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

View file

@ -62,7 +62,7 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%t(300)%Sx(Next Track:);%t(1)%ft(.rockbox/playername.txt)
%Sx(Next Track:)
%s%?It<%It|%Fn>
#
# Track Info - No Album Art
@ -71,5 +71,5 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

View file

@ -62,7 +62,7 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
#
# Track Info - No Album Art
@ -71,5 +71,5 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

View file

@ -62,7 +62,7 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
#
# Track Info - No Album Art
@ -71,5 +71,5 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

View file

@ -69,6 +69,6 @@
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%ac%?iy<%iy|>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%?IA<%IA>>

View file

@ -62,7 +62,7 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
#
# Track Info - No Album Art
@ -71,5 +71,5 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

View file

@ -28,9 +28,9 @@
%?C<|>
%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
%?C<%s%ac%?it<%it|%fn>|>
%t(300)%?C<%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>>
%?C<|%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>>
%t(300)%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr

View file

@ -61,7 +61,7 @@
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
#
# Track Info - No Album Art
%Vl(b,0,45,-,198,1)
@ -73,7 +73,7 @@
%ac%?ig<%ig|>
%ac%?fv<%(vbr%) |>%fb kbit/s %fc
%ac%t(300)%Sx(Next:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next:)
%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>
%ac%s%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>

View file

@ -23,9 +23,9 @@
%?C<|>
%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
%?C<%s%ac%?it<%it|%fn>|>
%t(300)%?C<%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>|%ac%Sx(Next Track:)>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>|%ac%Sx(Next Track:)>
%?C<|%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>>
%t(300)%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr

View file

@ -35,7 +35,7 @@
%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
#%s%al%iy
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
%s%al%?Ia<%Ia|%IA>
@ -45,7 +45,7 @@
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%ac%iy
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%IA>

View file

@ -63,7 +63,7 @@
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%al%?iy<%iy>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
%s%al%?Ia<%Ia|%?IA<%IA>>
#
@ -74,6 +74,6 @@
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%ac%?iy<%iy>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%?IA<%IA>>

View file

@ -35,7 +35,7 @@
%ac%?ig<%ig|>
%ac%?fv<%(vbr%) |>%fb kbit/s %fc
%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%ac%s%?It<%It|%Fn>
#
# album art viewport
@ -53,7 +53,7 @@
# next track info - AA
%Vl(d,0,338,-,-120,-)
%t(300)%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
# playtime
%V(15,398,290,30,-)

View file

@ -62,7 +62,7 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
#
# Track Info - No Album Art
%Vl(b,0,56,-,247,1)
@ -75,7 +75,7 @@
%ac%?fv<%(vbr%) |>%fb kbit/s %fc
%ac%t(300)%Sx(Next:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next:)
%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>
%ac%s%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>

View file

@ -63,7 +63,7 @@
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%al%?iy<%iy>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
%s%al%?Ia<%Ia|%?IA<%IA>>
#
@ -74,6 +74,6 @@
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%ac%?iy<%iy>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%?IA<%IA>>

View file

@ -36,7 +36,7 @@
%ac%?ig<%ig|>
%ac%?fv<%(vbr%) |>%fb kbit/s %fc
%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%ac%s%?It<%It|%Fn>
#
# album art viewport
@ -54,7 +54,7 @@
# next track info - AA
%Vl(d,0,550,-,-200,-)
%t(300)%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
# playtime
%V(20,660,440,36,-)

View file

@ -21,7 +21,7 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
#
@ -38,7 +38,7 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
# playtime

View file

@ -49,7 +49,7 @@
#
# Next Track Info
%V(2,56,92,8,1)
%s%t(300)%ac%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?It<%It|%Fn>
#
# Time Elapsed/Remaining
%V(2,73,92,8,1)