From 8013319c14dc85870af4d6f6b29e83201f8aa826 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 24 Oct 2021 02:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AF=8D=E5=85=B8=E7=9A=84?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 1 + parts/language/lang_es.lua | 1 + parts/language/lang_fr.lua | 1 + parts/language/lang_pt.lua | 1 + parts/language/lang_symbol.lua | 1 + parts/language/lang_zh.lua | 1 + parts/language/lang_zh_grass.lua | 1 + parts/scenes/dict.lua | 10 ++++++++-- 8 files changed, 15 insertions(+), 2 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index dfac1fe8..1e67155a 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -65,6 +65,7 @@ return{ switchSpawnSFX="Please turn on the block spawn SFX!", needRestart="Restart to apply all changes", + copyDone="Copied!", saveDone="Data saved", saveError="Failed to save:", saveError_duplicate="Duplicated filename", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index e12072da..bd847dba 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -54,6 +54,7 @@ return{ switchSpawnSFX="Habilita los sonidos de aparición de las piezas ;)", needRestart="Reinicia Techmino para que los cambios tengan efecto.", + -- copyDone="Copied!", saveDone="Datos guardados", saveError="Error al guardar:", saveError_duplicate="Archivo ya existente", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index a8d4227f..1f8a826d 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -55,6 +55,7 @@ return{ switchSpawnSFX="Activez les effets sonores d'apparition des pièces pour jouer", needRestart="Fonctionnera dès la prochaine partie", + -- copyDone="Copied!", saveDone="Données sauvegardées", saveError="Sauvegarde échouée : ", -- saveError_duplicate="Duplicate filename", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 9d72ecd4..6272c11f 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -55,6 +55,7 @@ return{ switchSpawnSFX="Switch on spawn SFX to play", needRestart="Funciona após reiniciar", + -- copyDone="Copied!", saveDone="Data Salva", saveError="Falha ao salvar:", -- saveError_duplicate="Duplicate filename", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 4bc6abdd..67dca5de 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -40,6 +40,7 @@ return{ ai_mission="X!!!", needRestart="!!*#R#*!!", + -- copyDone="Copied!", saveDone="~~~", saveError="x!:", saveError_duplicate="X←→X ?", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index d92ad4f4..cd0e31aa 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -65,6 +65,7 @@ return{ switchSpawnSFX="请开启方块出生音效", needRestart="重新开始以生效", + copyDone="复制成功!", saveDone="保存成功!", saveError="保存失败:", saveError_duplicate="文件名重复", diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index 7df6941f..33b92cbd 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -66,6 +66,7 @@ return{ switchSpawnSFX="请打开繁殖特技效果", needRestart="请重试以使更改生效", + copyDone="收到了!", saveDone="保存的数据", saveError="未能保存:", saveError_duplicate="重复文件名", diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index b881a78a..356cf06c 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -1,6 +1,7 @@ local gc=love.graphics local inputBox=WIDGET.newInputBox{name="input",x=20,y=110,w=762,h=60,font=40,limit=32} +local copyButton=WIDGET.newKey{name="copy",x=940,y=655,w=200,h=80,font=35,code=pressKey"cC"} local int,abs=math.floor,math.abs local min,sin=math.min,math.sin local ins=table.insert @@ -35,6 +36,7 @@ local function _clearResult() TABLE.cut(result) selected,scrollPos=1,0 waiting,lastSearch=0,false + copyButton.hide=false end local function _search() local input=inputBox:getText():lower() @@ -82,6 +84,7 @@ function scene.keyDown(key) if selectedscrollPos+15 then scrollPos=selected-15 end + copyButton.hide=false end elseif key=="left"or key=="pageup"then for _=1,12 do scene.keyDown("up")end @@ -114,6 +118,8 @@ function scene.keyDown(key) local t=_getList()[selected] t=t[1]..":\n"..t[4]..(t[5]and"\n[ "..t[5].." ]\n"or"\n")..text.dictNote love.system.setClipboardText(t) + copyButton.hide=true + MES.new('info',text.copyDone) return else return @@ -180,7 +186,7 @@ function scene.draw() local r=TIME()*2 local R=int(r)%7+1 gc.setColor(1,1,1,1-abs(r%1*2-1)) - gc.draw(TEXTURE.miniBlock[R],785,140,TIME()*10%6.2832,15,15,DSCP[R][0][2]+.5,#BLOCKS[R][0]-DSCP[R][0][1]-.5) + gc.draw(TEXTURE.miniBlock[R],821,140,TIME()*10%6.2832,15,15,DSCP[R][0][2]+.5,#BLOCKS[R][0]-DSCP[R][0][1]-.5) end end @@ -188,7 +194,7 @@ scene.widgetList={ WIDGET.newText{name="book", x=20,y=15,font=70,align='L',fText=CHAR.icon.zBook}, WIDGET.newText{name="title", x=100,y=15,font=70,align='L'}, inputBox, - WIDGET.newKey{name="copy", x=1170,y=140,w=160,h=50,font=25,code=pressKey"cC"}, + copyButton, 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"}, WIDGET.newKey{name="down", x=1130,y=560,w=60,h=90,font=35,fText="↓",code=pressKey"down"},