From fdd07debf40c7b45c44231da5a9420c1b9cd84e1 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 15 Sep 2021 17:40:31 +0900 Subject: [PATCH] language config now in two columns --- .gitignore | 1 + assets/graphics/gui/inventory/category.tga | 4 +- assets/locales/bgBG/terrarum.json | 1 + assets/locales/csCZ/terrarum.json | 1 + assets/locales/daDK/terrarum.json | 1 + assets/locales/de/terrarum.json | 1 + assets/locales/elGR/terrarum.json | 1 + assets/locales/en/terrarum.json | 1 + assets/locales/es/terrarum.json | 1 + assets/locales/fiFI/terrarum.json | 1 + assets/locales/frFR/terrarum.json | 1 + assets/locales/huHU/terrarum.json | 1 + assets/locales/isIC/terrarum.json | 1 + assets/locales/it/terrarum.json | 1 + assets/locales/jaJP/terrarum.json | 4 +- assets/locales/jakanaJP/terrarum.json | 1 + assets/locales/koKR/terrarum.json | 1 + assets/locales/nlNL/terrarum.json | 1 + assets/locales/noNB/terrarum.json | 1 + assets/locales/plPL/terrarum.json | 1 + assets/locales/ptBR/terrarum.json | 1 + assets/locales/ptPT/terrarum.json | 1 + assets/locales/roRO/terrarum.json | 1 + assets/locales/ruRU/terrarum.json | 1 + assets/locales/svSE/terrarum.json | 1 + assets/locales/thTH/terrarum.json | 1 + assets/locales/trTR/terrarum.json | 1 + assets/locales/zhCN/terrarum.json | 3 +- assets/locales/zhTW/terrarum.json | 3 +- src/net/torvald/terrarum/langpack/Lang.kt | 5 ++ .../ui/UIKeyboardControlPanel.kt | 44 ++++++++++++++++ .../modulebasegame/ui/UITitleLanguage.kt | 50 ++++++++++++++----- .../modulebasegame/ui/UITitleRemoConYaml.kt | 7 ++- work_files/UI/key_set_ui_mockup3.kra | 3 ++ 34 files changed, 126 insertions(+), 22 deletions(-) create mode 100644 src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt create mode 100644 work_files/UI/key_set_ui_mockup3.kra diff --git a/.gitignore b/.gitignore index d5a73b6a3..17506fdb2 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ workspace.xml .tmp* tmp_* *.bak +*-autosave.kra ## Microsoft Office ~$* ## Generic temp files in Linux diff --git a/assets/graphics/gui/inventory/category.tga b/assets/graphics/gui/inventory/category.tga index d3d210cc3..718d5add7 100755 --- a/assets/graphics/gui/inventory/category.tga +++ b/assets/graphics/gui/inventory/category.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80bfdaa42b4fc0757495c8af95c56df0b142f6ee466bcac4c4c9617b8f0da648 -size 105644 +oid sha256:e487e48c2391680824d84bf6a1885bc4f2531c08a0456613b12be24ab2ed93f3 +size 240018 diff --git a/assets/locales/bgBG/terrarum.json b/assets/locales/bgBG/terrarum.json index ead1589d1..11a9a37e8 100644 --- a/assets/locales/bgBG/terrarum.json +++ b/assets/locales/bgBG/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Авторско право", "APP_WARNING_HEALTH_AND_SAFETY": "ВНИМАНИЕ-ЗДРАВЕ И БЕЗОПАСНОСТ", "MENU_LABEL_PRESS_START_SYMBOL": "атисни >", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Всички права запазени", diff --git a/assets/locales/csCZ/terrarum.json b/assets/locales/csCZ/terrarum.json index 54527347a..a2d3754c0 100644 --- a/assets/locales/csCZ/terrarum.json +++ b/assets/locales/csCZ/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Autorská práva", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Všechna práva vyhrazena", "COPYRIGHT_GNU_GPL_3": "Šířen pod licencí GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "POZOR-ZDRAVÍ A BEZPEČNOST", diff --git a/assets/locales/daDK/terrarum.json b/assets/locales/daDK/terrarum.json index f43a25de6..fa63db861 100644 --- a/assets/locales/daDK/terrarum.json +++ b/assets/locales/daDK/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Ophavsret", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle rettigheder forbeholdes", "COPYRIGHT_GNU_GPL_3": "Distribueret under GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-SUNDHED OG SIKKERHED", diff --git a/assets/locales/de/terrarum.json b/assets/locales/de/terrarum.json index fded47e7f..254c560e9 100644 --- a/assets/locales/de/terrarum.json +++ b/assets/locales/de/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Urheberrecht", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle Rechte vorbehalten", "COPYRIGHT_GNU_GPL_3": "Verteilt unter GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "WARNUNG-GESUNDHEIT UND SICHERHEIT", diff --git a/assets/locales/elGR/terrarum.json b/assets/locales/elGR/terrarum.json index b93455db3..0a4d19df0 100644 --- a/assets/locales/elGR/terrarum.json +++ b/assets/locales/elGR/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Πνευματικά δικαιώματα", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Όλα τα δικαιώματα διατηρούνται", "COPYRIGHT_GNU_GPL_3": "Διανέμεται υπό την GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ΠΡΟΣΟΧΗ-ΥΓΕΙΑ ΚΑΙ ΑΣΦΑΛΕΙΑ", diff --git a/assets/locales/en/terrarum.json b/assets/locales/en/terrarum.json index 26b73146e..f547916bf 100644 --- a/assets/locales/en/terrarum.json +++ b/assets/locales/en/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Copyright", "COPYRIGHT_ALL_RIGHTS_RESERVED": "All rights reserved", "COPYRIGHT_GNU_GPL_3": "Distributed under GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "WARNING-HEALTH AND SAFETY", diff --git a/assets/locales/es/terrarum.json b/assets/locales/es/terrarum.json index 6cca7941a..a2c85738b 100644 --- a/assets/locales/es/terrarum.json +++ b/assets/locales/es/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Copyright", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Todos los derechos reservados", "COPYRIGHT_GNU_GPL_3": "Distribuido bajo GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ADVERTENCIA-SALUD Y SEGURIDAD", diff --git a/assets/locales/fiFI/terrarum.json b/assets/locales/fiFI/terrarum.json index 99cbea793..e7faf0877 100644 --- a/assets/locales/fiFI/terrarum.json +++ b/assets/locales/fiFI/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Tekijänoikeus", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Kaikki oikeudet pidätetään", "COPYRIGHT_GNU_GPL_3": "Jaetaan GNU GPL 3:n mukaisesti", "APP_WARNING_HEALTH_AND_SAFETY": "VAROITUS-TERVEYS JA TURVALLISUUS", diff --git a/assets/locales/frFR/terrarum.json b/assets/locales/frFR/terrarum.json index 4680adebd..36e3f45a8 100644 --- a/assets/locales/frFR/terrarum.json +++ b/assets/locales/frFR/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Copyright", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Tous les droits sont réservés", "COPYRIGHT_GNU_GPL_3": "Distribué sous GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ATTENTION-SANTÉ ET SÉCURITÉ", diff --git a/assets/locales/huHU/terrarum.json b/assets/locales/huHU/terrarum.json index 96505137c..68740dee8 100644 --- a/assets/locales/huHU/terrarum.json +++ b/assets/locales/huHU/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Szerzői jog", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Minden jog fenntartva", "COPYRIGHT_GNU_GPL_3": "Elosztott GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "VIGYÁZAT-EGÉSZSÉGÜGYI ÉS BIZTONSÁGI", diff --git a/assets/locales/isIC/terrarum.json b/assets/locales/isIC/terrarum.json index deb8ca4ab..816a087d9 100644 --- a/assets/locales/isIC/terrarum.json +++ b/assets/locales/isIC/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Höfundarréttur", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Öll réttindi áskilinn", "COPYRIGHT_GNU_GPL_3": "Dreift samkvæmt GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "VIÐVÖRUN-HEILSA OG ÖRYGGI", diff --git a/assets/locales/it/terrarum.json b/assets/locales/it/terrarum.json index 48193bf84..4603ee2db 100644 --- a/assets/locales/it/terrarum.json +++ b/assets/locales/it/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Copyright", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Tutti i diritti riservati", "COPYRIGHT_GNU_GPL_3": "Distribuito sotto licenza GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ATTENZIONE-SALUTE E SICUREZZA", diff --git a/assets/locales/jaJP/terrarum.json b/assets/locales/jaJP/terrarum.json index 7fc964d12..47f10e367 100644 --- a/assets/locales/jaJP/terrarum.json +++ b/assets/locales/jaJP/terrarum.json @@ -1,4 +1,6 @@ -{ "COPYRIGHT_ALL_RIGHTS_RESERVED": "全著作権所有", +{ + "MENU_LABEL_COPYRIGHT": "著作権", + "COPYRIGHT_ALL_RIGHTS_RESERVED": "全著作権所有", "COPYRIGHT_GNU_GPL_3": "GNU GPL 3で配布", "APP_WARNING_HEALTH_AND_SAFETY": "警告ー健康と安全のために", "MENU_LABEL_PRESS_START_SYMBOL": "> ボタンを押す", diff --git a/assets/locales/jakanaJP/terrarum.json b/assets/locales/jakanaJP/terrarum.json index a05e31c2f..feab29680 100644 --- a/assets/locales/jakanaJP/terrarum.json +++ b/assets/locales/jakanaJP/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "ちょさくけん", "COPYRIGHT_ALL_RIGHTS_RESERVED": "ぜんちょさくけん しょゆう", "COPYRIGHT_GNU_GPL_3": "GNU GPL 3で はいふ", "APP_WARNING_HEALTH_AND_SAFETY": "けいこくーけんこうと あんぜんの ために", diff --git a/assets/locales/koKR/terrarum.json b/assets/locales/koKR/terrarum.json index 3de30add3..e83db8b7c 100644 --- a/assets/locales/koKR/terrarum.json +++ b/assets/locales/koKR/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "저작권", "COPYRIGHT_ALL_RIGHTS_RESERVED": "모든 권리 보유", "COPYRIGHT_GNU_GPL_3": "GNU GPL 3에 따라 배포됨", "APP_WARNING_HEALTH_AND_SAFETY": "경고—건강과 안전을 위하여", diff --git a/assets/locales/nlNL/terrarum.json b/assets/locales/nlNL/terrarum.json index 969316965..c6ec3cf9a 100644 --- a/assets/locales/nlNL/terrarum.json +++ b/assets/locales/nlNL/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Auteursrecht", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle rechten voorbehouden", "COPYRIGHT_GNU_GPL_3": "Gedistribueerd onder GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "WAARSCHUWING-GEZONDHEID EN VEILIGHEID", diff --git a/assets/locales/noNB/terrarum.json b/assets/locales/noNB/terrarum.json index fe7804ae6..280be9a80 100644 --- a/assets/locales/noNB/terrarum.json +++ b/assets/locales/noNB/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Opphavsrett", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle rettigheter reservert", "COPYRIGHT_GNU_GPL_3": "Distribuert under GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-HELSE OG SIKKERHET", diff --git a/assets/locales/plPL/terrarum.json b/assets/locales/plPL/terrarum.json index 55f21032d..465fd296b 100644 --- a/assets/locales/plPL/terrarum.json +++ b/assets/locales/plPL/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Prawa autorskie", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Wszelkie prawa zastrzeżone", "COPYRIGHT_GNU_GPL_3": "Rozpowszechniana w GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "UWAGA-ZDROWIE I BEZPIECZEŃSTWO", diff --git a/assets/locales/ptBR/terrarum.json b/assets/locales/ptBR/terrarum.json index 4d036a680..0bc4da3ab 100644 --- a/assets/locales/ptBR/terrarum.json +++ b/assets/locales/ptBR/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Direitos Autorais", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Todos os direitos reservados", "COPYRIGHT_GNU_GPL_3": "Distribuído sob GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ATENÇÃO-SAÚDE E SEGURANÇA", diff --git a/assets/locales/ptPT/terrarum.json b/assets/locales/ptPT/terrarum.json index 85b1e6487..d44a43e88 100644 --- a/assets/locales/ptPT/terrarum.json +++ b/assets/locales/ptPT/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Direitos de Autor", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Todos os direitos reservados", "COPYRIGHT_GNU_GPL_3": "Distribuído sob GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ATENÇÃO-SAÚDE E SEGURANÇA", diff --git a/assets/locales/roRO/terrarum.json b/assets/locales/roRO/terrarum.json index 3479c9253..a53ed4370 100644 --- a/assets/locales/roRO/terrarum.json +++ b/assets/locales/roRO/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Drept de autor", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Toate drepturile rezervate", "COPYRIGHT_GNU_GPL_3": "Distribuit sub GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ATENȚIONARE-SĂNĂTATE ȘI SIGURANȚĂ", diff --git a/assets/locales/ruRU/terrarum.json b/assets/locales/ruRU/terrarum.json index a876dddf3..dde88f5c0 100644 --- a/assets/locales/ruRU/terrarum.json +++ b/assets/locales/ruRU/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Авторские права", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Все права защищены", "COPYRIGHT_GNU_GPL_3": "Распространяется в соответствии с GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "ПРЕДУПРЕЖДЕНИЕ-ЗДОРОВЬЕ И БЕЗОПАСНОСТЬ", diff --git a/assets/locales/svSE/terrarum.json b/assets/locales/svSE/terrarum.json index 9d2e6eda2..2b614b3dc 100644 --- a/assets/locales/svSE/terrarum.json +++ b/assets/locales/svSE/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Upphovsrätt", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Alla rättigheter förbehållna", "COPYRIGHT_GNU_GPL_3": "Distribueras under GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "VARNING-HÄLSA OCH SÄKERHET", diff --git a/assets/locales/thTH/terrarum.json b/assets/locales/thTH/terrarum.json index 3e232f906..52427ff9a 100644 --- a/assets/locales/thTH/terrarum.json +++ b/assets/locales/thTH/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "ลิขสิทธิ์", "COPYRIGHT_ALL_RIGHTS_RESERVED": "สงวนลิขสิทธิ์", "COPYRIGHT_GNU_GPL_3": "เผยแพร่ภายใต้ GNU GPL 3", "APP_WARNING_HEALTH_AND_SAFETY": "คำเตือน-อนามัยและความปลอดภัย", diff --git a/assets/locales/trTR/terrarum.json b/assets/locales/trTR/terrarum.json index e98e9b7cd..e1beddaa7 100644 --- a/assets/locales/trTR/terrarum.json +++ b/assets/locales/trTR/terrarum.json @@ -1,4 +1,5 @@ { + "MENU_LABEL_COPYRIGHT": "Telif Hakkı", "COPYRIGHT_ALL_RIGHTS_RESERVED": "Her hakkı saklıdır", "COPYRIGHT_GNU_GPL_3": "GNU GPL 3 kapsamında dağıtılan", "APP_WARNING_HEALTH_AND_SAFETY": "UYARI-SAĞLIK VE GÜVENLİK", diff --git a/assets/locales/zhCN/terrarum.json b/assets/locales/zhCN/terrarum.json index 5c7048b4d..3da1bdf77 100644 --- a/assets/locales/zhCN/terrarum.json +++ b/assets/locales/zhCN/terrarum.json @@ -1,5 +1,6 @@ { - "COPYRIGHT_ALL_RIGHTS_RESERVED": "版权所有", + "MENU_LABEL_COPYRIGHT": "版权", + "COPYRIGHT_ALL_RIGHTS_RESERVED": "全版权所有", "COPYRIGHT_GNU_GPL_3": "分布在GNU GPL 3下", "APP_WARNING_HEALTH_AND_SAFETY": "健康游戏忠告", "APP_CHINESE_HEALTHY_GAME_MSG_1": "抵制不良游戏　拒绝盗版游戏", diff --git a/assets/locales/zhTW/terrarum.json b/assets/locales/zhTW/terrarum.json index 89a1c43d6..998690670 100644 --- a/assets/locales/zhTW/terrarum.json +++ b/assets/locales/zhTW/terrarum.json @@ -1,5 +1,6 @@ { - "COPYRIGHT_ALL_RIGHTS_RESERVED": "版權所有", + "MENU_LABEL_COPYRIGHT": "版權", + "COPYRIGHT_ALL_RIGHTS_RESERVED": "全版權所有", "COPYRIGHT_GNU_GPL_3": "分佈在GNU GPL 3下", "APP_WARNING_HEALTH_AND_SAFETY": "警告ー健康和安全", "MENU_LABEL_PRESS_START_SYMBOL": "按下 >", diff --git a/src/net/torvald/terrarum/langpack/Lang.kt b/src/net/torvald/terrarum/langpack/Lang.kt index f0eb4edc3..958b0800f 100644 --- a/src/net/torvald/terrarum/langpack/Lang.kt +++ b/src/net/torvald/terrarum/langpack/Lang.kt @@ -47,6 +47,7 @@ object Lang { load("./assets/locales/") } + @JvmStatic operator fun invoke() { /* dummy method for manual initialisation */ } fun load(localesDir: String) { @@ -57,6 +58,10 @@ object Lang { // get all of the languages installed localesDir.listFiles().filter { it.isDirectory }.forEach { languageList.add(it.name) } + // temporary filter + languageList.remove("isIC") + languageList.remove("jakanaJP") + for (lang in languageList) { val langFileListFiles = File("$localesDir/$lang/").listFiles() langFileListFiles.forEach { diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt new file mode 100644 index 000000000..f05801fb9 --- /dev/null +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt @@ -0,0 +1,44 @@ +package net.torvald.terrarum.modulebasegame.ui + +import com.badlogic.gdx.graphics.Camera +import com.badlogic.gdx.graphics.g2d.SpriteBatch +import net.torvald.terrarum.Second +import net.torvald.terrarum.ui.UICanvas + +/** + * Created by minjaesong on 2021-09-15. + */ +class UIKeyboardControlPanel : UICanvas() { + + override var width = 600 + override var height = 600 + override var openCloseTime = 0f + + override fun updateUI(delta: Float) { + TODO("Not yet implemented") + } + + override fun renderUI(batch: SpriteBatch, camera: Camera) { + TODO("Not yet implemented") + } + + override fun doOpening(delta: Float) { + TODO("Not yet implemented") + } + + override fun doClosing(delta: Float) { + TODO("Not yet implemented") + } + + override fun endOpening(delta: Float) { + TODO("Not yet implemented") + } + + override fun endClosing(delta: Float) { + TODO("Not yet implemented") + } + + override fun dispose() { + TODO("Not yet implemented") + } +} \ No newline at end of file diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITitleLanguage.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITitleLanguage.kt index 25759f37a..d3e91fc25 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UITitleLanguage.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UITitleLanguage.kt @@ -8,6 +8,7 @@ import net.torvald.terrarum.Second import net.torvald.terrarum.langpack.Lang import net.torvald.terrarum.ui.UICanvas import net.torvald.terrarum.ui.UIItemTextButtonList +import kotlin.math.roundToInt class UITitleLanguage : UICanvas() { @@ -19,17 +20,34 @@ class UITitleLanguage : UICanvas() { override var openCloseTime: Second = 0f - private val textAreaHMargin = 48 - override var width = (App.scr.width * 0.75).toInt() - override var height = App.scr.height - textAreaHMargin * 2 + private val textButtonLineHeight = 32 private val localeList = Lang.languageList.toList().sorted() - private val textArea = UIItemTextButtonList(this, - 24, - localeList.map { Lang.langpack["MENU_LANGUAGE_THIS_$it"] ?: "!ERR: $it" }.toTypedArray(), - App.scr.width - width, textAreaHMargin, - width, height, - textAreaWidth = width, + private val localeFirstHalf = localeList.subList(0, localeList.size / 2) + private val localeSecondHalf = localeList.subList(localeList.size / 2, localeList.size) + + override var width = 480 + override var height = maxOf(localeFirstHalf.size, localeSecondHalf.size) * textButtonLineHeight + + private val textArea1 = UIItemTextButtonList(this, + textButtonLineHeight, + localeFirstHalf.map { Lang.langpack["MENU_LANGUAGE_THIS_$it"] ?: "!ERR: $it" }.toTypedArray(), + (App.scr.width - width) / 2, (App.scr.height - height) / 2, + width / 2, height, + textAreaWidth = width / 2, + readFromLang = false, + activeBackCol = Color(0), + highlightBackCol = Color(0), + backgroundCol = Color(0), + inactiveCol = Color.WHITE, + defaultSelection = null + ) + private val textArea2 = UIItemTextButtonList(this, + textButtonLineHeight, + localeSecondHalf.map { Lang.langpack["MENU_LANGUAGE_THIS_$it"] ?: "!ERR: $it" }.toTypedArray(), + (App.scr.width - width) / 2 + (width / 2), (App.scr.height - height) / 2, + width / 2, height, + textAreaWidth = width / 2, readFromLang = false, activeBackCol = Color(0), highlightBackCol = Color(0), @@ -50,15 +68,20 @@ class UITitleLanguage : UICanvas() { // attach listeners - textArea.selectionChangeListener = { _, newSelectionIndex -> + textArea1.selectionChangeListener = { _, newSelectionIndex -> App.GAME_LOCALE = localeList[newSelectionIndex] + textArea2.deselect() + } + textArea2.selectionChangeListener = { _, newSelectionIndex -> + App.GAME_LOCALE = localeList[newSelectionIndex + localeFirstHalf.size] + textArea1.deselect() } - } override fun updateUI(delta: Float) { - textArea.update(delta) + textArea1.update(delta) + textArea2.update(delta) //AppLoader.printdbg(this, "should be printing indefinitely") } @@ -66,7 +89,8 @@ class UITitleLanguage : UICanvas() { override fun renderUI(batch: SpriteBatch, camera: Camera) { batch.color = Color.WHITE - textArea.render(batch, camera) + textArea1.render(batch, camera) + textArea2.render(batch, camera) } override fun doOpening(delta: Float) { diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt index 41a9d147a..5a6c7e6a5 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UITitleRemoConYaml.kt @@ -15,15 +15,14 @@ object UITitleRemoConYaml { - MENU_OPTIONS - MENU_OPTIONS_GRAPHICS - MENU_OPTIONS_CONTROLS - - MENU_CONTROLS_KEYBOARD + - MENU_CONTROLS_KEYBOARD : net.torvald.terrarum.modulebasegame.ui.UIKeyboardControlPanel - MENU_CONTROLS_GAMEPAD - MENU_LABEL_RETURN - - MENU_OPTIONS_SOUND - MENU_LABEL_LANGUAGE : net.torvald.terrarum.modulebasegame.ui.UITitleLanguage - MENU_MODULES : net.torvald.terrarum.ModOptionsHost - MENU_LABEL_RETURN -- MENU_LABEL_CREDITS : net.torvald.terrarum.modulebasegame.ui.UITitleCredits - - MENU_LABEL_CREDITS : net.torvald.terrarum.modulebasegame.ui.UITitleCredits +- MENU_LABEL_CREDITS + - MENU_LABEL_COPYRIGHT : net.torvald.terrarum.modulebasegame.ui.UITitleCredits - MENU_CREDIT_GPL_DNT : net.torvald.terrarum.modulebasegame.ui.UITitleGPL3 - MENU_LABEL_RETURN - MENU_LABEL_QUIT diff --git a/work_files/UI/key_set_ui_mockup3.kra b/work_files/UI/key_set_ui_mockup3.kra new file mode 100644 index 000000000..2c06e830d --- /dev/null +++ b/work_files/UI/key_set_ui_mockup3.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2157abbc17f14b58aad82d08d691cb4cdced9bb9fa8b5fbb1c495848e5a84b9c +size 529380