summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/settings_list.c4
-rw-r--r--wps/WPSLIST2
-rw-r--r--wps/cabbiev2.240x320x16.wps8
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 5fd7e0459b..699afb92fd 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -240,8 +240,10 @@ static const char graphic_numeric[] = "graphic,numeric";
240 #define DEFAULT_FONTNAME "08-Rockfont" 240 #define DEFAULT_FONTNAME "08-Rockfont"
241#elif LCD_HEIGHT <= 220 241#elif LCD_HEIGHT <= 220
242 #define DEFAULT_FONT_HEIGHT 12 242 #define DEFAULT_FONT_HEIGHT 12
243#elif LCD_HEIGHT <= 320 243#elif LCD_HEIGHT <= 240
244 #define DEFAULT_FONT_HEIGHT 15 244 #define DEFAULT_FONT_HEIGHT 15
245#elif LCD_HEIGHT <= 320
246 #define DEFAULT_FONT_HEIGHT 18
245#elif defined(SHANLING_Q1) 247#elif defined(SHANLING_Q1)
246 /* 16pt font looks pretty aliased & ugly */ 248 /* 16pt font looks pretty aliased & ugly */
247 #define DEFAULT_FONT_HEIGHT 18 249 #define DEFAULT_FONT_HEIGHT 18
diff --git a/wps/WPSLIST b/wps/WPSLIST
index efb1030585..596f548747 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -116,7 +116,7 @@ Font.360x400x16: 18-Adobe-Helvetica.fnt
116Font.320x480x(16|24): 27-Adobe-Helvetica.fnt 116Font.320x480x(16|24): 27-Adobe-Helvetica.fnt
117Font.320x240x(16|24): 15-Adobe-Helvetica.fnt 117Font.320x240x(16|24): 15-Adobe-Helvetica.fnt
118Font.240x400x(16|24): 16-Adobe-Helvetica.fnt 118Font.240x400x(16|24): 16-Adobe-Helvetica.fnt
119Font.240x320x(16|24|32): 15-Adobe-Helvetica.fnt 119Font.240x320x(16|24|32): 18-Adobe-Helvetica.fnt
120Font.220x176x(16|24): 12-Adobe-Helvetica.fnt 120Font.220x176x(16|24): 12-Adobe-Helvetica.fnt
121Font.176x220x(16|24): 12-Adobe-Helvetica.fnt 121Font.176x220x(16|24): 12-Adobe-Helvetica.fnt
122Font.176x132x(16|24): 12-Adobe-Helvetica.fnt 122Font.176x132x(16|24): 12-Adobe-Helvetica.fnt
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index ab6ca535fd..95a056b123 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -52,16 +52,15 @@
52%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr 52%al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr
53# 53#
54# Album Art 54# Album Art
55%ax%Vl(a,55,30,130,130,-) 55%ax%Vl(a,47,30,140,140,-)
56%Cl(0,0,130,130,c,c) 56%Cl(0,0,140,140,c,c)
57%Cd 57%Cd
58# 58#
59# Track Info - Album Art 59# Track Info - Album Art
60%ax%Vl(a,0,165,-,78,1) 60%ax%Vl(a,0,175,-,72,1)
61%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>> 61%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
62%s%ac%?it<%it|%fn> 62%s%ac%?it<%it|%fn>
63%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>> 63%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
64
65%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn> 64%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
66# 65#
67# Track Info - No Album Art 66# Track Info - No Album Art
@@ -74,7 +73,6 @@
74%ac%?ig<%ig|> 73%ac%?ig<%ig|>
75%ac%?fv<%(vbr%) |>%fb kbit/s %fc 74%ac%?fv<%(vbr%) |>%fb kbit/s %fc
76 75
77
78%ac%Sx(Next:) 76%ac%Sx(Next:)
79%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>> 77%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>
80%ac%s%?It<%It|%Fn> 78%ac%s%?It<%It|%Fn>