From 332700fd643d237e2ea7db8c6ab0a94d9bab3503 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 10 Jul 2021 20:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E9=9F=B3=E4=B9=90=E5=AE=A4=E4=B8=89=E4=B8=AA=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/language/lang_en.lua     |  5 -----
 parts/language/lang_fr.lua     |  3 ---
 parts/language/lang_symbol.lua |  3 ---
 parts/language/lang_zh.lua     |  5 -----
 parts/scenes/dict.lua          | 14 +++++++-------
 parts/scenes/music.lua         |  8 ++++----
 6 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua
index 716a4635..c5baa9a8 100644
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -546,8 +546,6 @@ return{
 		dict={
 			title="TetroDictionary",
 			link="Open URL",
-			up="↑",down="↓",
-			pageup="↑↑",pagedown="↓↓",
 		},
 		stat={
 			path="Open Data Folder",
@@ -559,9 +557,6 @@ return{
 			now="Now Playing:",
 
 			bgm="BGM",
-			up="↑",
-			play="Play",
-			down="↓",
 			sound="SFXs",
 		},
 		sound={
diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua
index aca51392..9991df48 100644
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -515,9 +515,6 @@ return{
 			now="En train de jouer :",
 
 			bgm="Musique",
-			up="↑",
-			play="Jouer",
-			down="↓",
 			-- sound="SFXs",
 		},
 		sound={
diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua
index 3e8357dc..b4d71f3e 100644
--- a/parts/language/lang_symbol.lua
+++ b/parts/language/lang_symbol.lua
@@ -371,9 +371,6 @@ return{
 			now="~:",
 
 			bgm="#~#",
-			up="↑",
-			play="!!!",
-			down="↓",
 			sound="=><=",
 		},
 		sound={
diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua
index 69b5cae6..37715112 100644
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -543,9 +543,6 @@ return{
 			now="正在播放:",
 
 			bgm="BGM",
-			up="↑",
-			play="播放",
-			down="↓",
 			sound="音效",
 		},
 		sound={
@@ -623,8 +620,6 @@ return{
 		dict={
 			title="小Z方块词典",
 			link="打开链接",
-			up="↑",down="↓",
-			pageup="↑↑",pagedown="↓↓",
 		},
 		stat={
 			path="打开存储目录",
diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua
index 8ca0be6c..fa6862c7 100644
--- a/parts/scenes/dict.lua
+++ b/parts/scenes/dict.lua
@@ -183,14 +183,14 @@ function scene.draw()
 end
 
 scene.widgetList={
-	WIDGET.newText{name="title",	x=20,	y=5,font=70,align='L'},
+	WIDGET.newText{name="title",	x=20,y=5,font=70,align='L'},
 	inputBox,
-	WIDGET.newKey{name="link",		x=1150,	y=655,w=200,h=80,font=35,code=pressKey"link",hideF=function()return not url end},
-	WIDGET.newKey{name="up",		x=1130,	y=460,w=60,h=90,font=35,code=pressKey"up",hide=not MOBILE},
-	WIDGET.newKey{name="down",		x=1130,	y=560,w=60,h=90,font=35,code=pressKey"down",hide=not MOBILE},
-	WIDGET.newKey{name="pageup",	x=1210,	y=460,w=80,h=90,font=35,code=pressKey"pageup",hide=not MOBILE},
-	WIDGET.newKey{name="pagedown",	x=1210,	y=560,w=80,h=90,font=35,code=pressKey"pagedown",hide=not MOBILE},
-	WIDGET.newButton{name="back",	x=1165,	y=60,w=170,h=80,fText=TEXTURE.back,code=backScene},
+	WIDGET.newKey{name="link",		x=1150,y=655,w=200,h=80,font=35,code=pressKey"link",hideF=function()return not url end},
+	WIDGET.newKey{name="up",		x=1130,y=460,w=60,h=90,font=35,fText="↑",code=pressKey"up",hide=not MOBILE},
+	WIDGET.newKey{name="down",		x=1130,y=560,w=60,h=90,font=35,fText="↓",code=pressKey"down",hide=not MOBILE},
+	WIDGET.newKey{name="pageup",	x=1210,y=460,w=80,h=90,font=35,fText="↑↑",code=pressKey"pageup",hide=not MOBILE},
+	WIDGET.newKey{name="pagedown",	x=1210,y=560,w=80,h=90,font=35,fText="↓↓",code=pressKey"pagedown",hide=not MOBILE},
+	WIDGET.newButton{name="back",	x=1165,y=60,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }
 
 return scene
\ No newline at end of file
diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua
index baa3a630..d36e63b9 100644
--- a/parts/scenes/music.lua
+++ b/parts/scenes/music.lua
@@ -99,10 +99,10 @@ scene.widgetList={
 	WIDGET.newText{name="title",	x=30,	y=30,font=80,align='L'},
 	WIDGET.newText{name="arrow",	x=270,	y=360,font=45,align='L'},
 	WIDGET.newText{name="now",		x=700,	y=500,font=50,align='R',hideF=function()return not BGM.nowPlay end},
-	WIDGET.newSlider{name="bgm",	x=760,	y=80,w=400,		font=35,disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end},
-	WIDGET.newButton{name="up",		x=200,	y=250,w=120,	font=55,code=pressKey"up",hideF=function()return selected==1 end},
-	WIDGET.newButton{name="play",	x=200,	y=390,w=120,	font=35,code=pressKey"space"},
-	WIDGET.newButton{name="down",	x=200,	y=530,w=120,	font=55,code=pressKey"down",hideF=function()return selected==#bgmList end},
+	WIDGET.newSlider{name="bgm",	x=760,	y=80,w=400,disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end},
+	WIDGET.newButton{name="up",		x=200,	y=250,w=120,code=pressKey"up",hideF=function()return selected==1 end,fText=DOGC{32,32,{'setLW',4},{'line',2,28,16,4,30,28}}},
+	WIDGET.newButton{name="play",	x=200,	y=390,w=120,code=pressKey"space",fText=DOGC{64,64,{'fPoly',14+3,10,14+3,54,55+3,32}}},
+	WIDGET.newButton{name="down",	x=200,	y=530,w=120,code=pressKey"down",hideF=function()return selected==#bgmList end,fText=DOGC{32,32,{'setLW',4},{'line',2,4,16,28,30,4}}},
 	WIDGET.newButton{name="sound",	x=1140,	y=540,w=170,h=80,font=40,code=pressKey"tab"},
 	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }