From 58d2637e9d95241849d6f953b8ec814ada9fb141 Mon Sep 17 00:00:00 2001 From: LumperBumper <130532332+callfishxt@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:16:32 +0500 Subject: [PATCH 1/5] worlds menu added --- res/layouts/pages/main.xml | 4 ++-- res/layouts/pages/worlds.xml | 6 ++++++ res/layouts/pages/worlds.xml.lua | 6 ++++++ res/texts/be_BY.txt | 2 ++ res/texts/de_DE.txt | 2 ++ res/texts/fi_FI.txt | 2 ++ res/texts/pl_PL.txt | 2 ++ res/texts/ru_RU.txt | 2 ++ res/texts/uk_UA.txt | 2 ++ res/texts/uz_UZ.txt | 2 ++ 10 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 res/layouts/pages/worlds.xml create mode 100644 res/layouts/pages/worlds.xml.lua diff --git a/res/layouts/pages/main.xml b/res/layouts/pages/main.xml index 11f53136..95f84237 100644 --- a/res/layouts/pages/main.xml +++ b/res/layouts/pages/main.xml @@ -1,7 +1,7 @@ + - - + diff --git a/res/layouts/pages/worlds.xml b/res/layouts/pages/worlds.xml new file mode 100644 index 00000000..cda3af8d --- /dev/null +++ b/res/layouts/pages/worlds.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/res/layouts/pages/worlds.xml.lua b/res/layouts/pages/worlds.xml.lua new file mode 100644 index 00000000..37c348a9 --- /dev/null +++ b/res/layouts/pages/worlds.xml.lua @@ -0,0 +1,6 @@ +function on_open() + local worlds = world.get_list() + for _, info in ipairs(worlds) do + document.worlds:add(gui.template("world", info)) + end +end diff --git a/res/texts/be_BY.txt b/res/texts/be_BY.txt index 9bbff6a9..4d325060 100644 --- a/res/texts/be_BY.txt +++ b/res/texts/be_BY.txt @@ -33,6 +33,8 @@ menu.Display=Дысплей menu.Graphics=Графіка menu.missing-content=Адсутнічае Кантэнт! menu.New World=Новы Свет +menu.Open worlds folder=Адкрыць папку з сусветамі +menu.Worlds=Сусветы menu.Page not found=Старонка не знойдзена menu.Quit=Выхад menu.Save and Quit to Menu=Захаваць і Выйсці ў Меню diff --git a/res/texts/de_DE.txt b/res/texts/de_DE.txt index 0251f395..8e125159 100644 --- a/res/texts/de_DE.txt +++ b/res/texts/de_DE.txt @@ -23,6 +23,8 @@ menu.Controls=Kontrolle menu.Create World=Erschaffe eine Welt menu.missing-content=Fehlender Inhalt! menu.New World=Neue Welt +menu.Worlds=Welten +menu.Open worlds folder=Weltenordner öffnen menu.Quit=Ausfahrt menu.Save and Quit to Menu=Speichern und zum Menü zurückkehren menu.Settings=Einstellungen diff --git a/res/texts/fi_FI.txt b/res/texts/fi_FI.txt index 6a84f24d..40c5dadc 100644 --- a/res/texts/fi_FI.txt +++ b/res/texts/fi_FI.txt @@ -23,6 +23,8 @@ menu.Controls=Ohjaus menu.Graphics=Grafiikka menu.missing-content=Sisältö Puuttuu! menu.New World=Uusi Maailma +menu.Worlds=Maailmat +menu.Open worlds folder=Avaa maailmat-kansio menu.Page not found=Sivu ei löytynyt! menu.Quit=Poistu menu.Save and Quit to Menu=Tallenna ja Takaisin Valikkoon diff --git a/res/texts/pl_PL.txt b/res/texts/pl_PL.txt index 39f1a1a7..caae775b 100644 --- a/res/texts/pl_PL.txt +++ b/res/texts/pl_PL.txt @@ -21,6 +21,8 @@ menu.Graphics=Grafika menu.Create World=Stwórz świat menu.missing-content=Brakująca treść! menu.New World=Nowy Świat +menu.Worlds=Światy +menu.Open worlds folder=Otwórz folder światów menu.Page not found=Strona nie znaleziona menu.Quit=Wyjście menu.Save and Quit to Menu=Zapisz i wyjdź do menu diff --git a/res/texts/ru_RU.txt b/res/texts/ru_RU.txt index 346c5993..ae591042 100644 --- a/res/texts/ru_RU.txt +++ b/res/texts/ru_RU.txt @@ -41,6 +41,8 @@ menu.Display=Дисплей menu.Graphics=Графика menu.missing-content=Отсутствует Контент! menu.New World=Новый Мир +menu.Open worlds folder=Открыть папку с мирами +menu.Worlds=Миры menu.Page not found=Страница не найдена menu.Quit=Выход menu.Save and Quit to Menu=Сохранить и Выйти в Меню diff --git a/res/texts/uk_UA.txt b/res/texts/uk_UA.txt index 175c172f..b5eab139 100644 --- a/res/texts/uk_UA.txt +++ b/res/texts/uk_UA.txt @@ -21,6 +21,8 @@ menu.Controls=Керування menu.Graphics=Графіка menu.missing-content=Відсутній Контент! menu.New World=Новий Світ +menu.Open worlds folder=Відкрити папку зі світами +menu.Worlds=Світи menu.Page not found=Сторінка не знайдена menu.Quit=Вихід menu.Save and Quit to Menu=Зберегти і Вийти в Меню diff --git a/res/texts/uz_UZ.txt b/res/texts/uz_UZ.txt index ae525503..0ad6ec37 100644 --- a/res/texts/uz_UZ.txt +++ b/res/texts/uz_UZ.txt @@ -33,6 +33,8 @@ menu.Display=Displey menu.Graphics=Grafika menu.missing-content=Kontent etishmayapti! menu.New World=Yangi Dunyo +menu.Worlds=Dunyo +menu.Open worlds folder=Dunyo papkasini ochish menu.Page not found=Sahifa topilmadi menu.Quit=Chiqish menu.Save and Quit to Menu=Saqlash va menyuga chiqish From bfab6c7ef1b0cb443b8a3bb4cd240616c8cd785d Mon Sep 17 00:00:00 2001 From: LumperBumper <130532332+callfishxt@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:17:45 +0500 Subject: [PATCH 2/5] Delete res/layouts/pages/main.xml.lua --- res/layouts/pages/main.xml.lua | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 res/layouts/pages/main.xml.lua diff --git a/res/layouts/pages/main.xml.lua b/res/layouts/pages/main.xml.lua deleted file mode 100644 index 37c348a9..00000000 --- a/res/layouts/pages/main.xml.lua +++ /dev/null @@ -1,6 +0,0 @@ -function on_open() - local worlds = world.get_list() - for _, info in ipairs(worlds) do - document.worlds:add(gui.template("world", info)) - end -end From 1dbb6354dc45ae6cc8712c057eb73b51650c4aa8 Mon Sep 17 00:00:00 2001 From: LumperBumper <130532332+callfishxt@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:40:06 +0500 Subject: [PATCH 3/5] main update --- res/layouts/pages/main.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/res/layouts/pages/main.xml b/res/layouts/pages/main.xml index 95f84237..bbdf5105 100644 --- a/res/layouts/pages/main.xml +++ b/res/layouts/pages/main.xml @@ -1,6 +1,5 @@ - From 374297d3a0d18acee127ee142bfabd32976bcb64 Mon Sep 17 00:00:00 2001 From: LumperBumper <130532332+callfishxt@users.noreply.github.com> Date: Tue, 19 Nov 2024 19:40:33 +0500 Subject: [PATCH 4/5] Update worlds.xml --- res/layouts/pages/worlds.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/res/layouts/pages/worlds.xml b/res/layouts/pages/worlds.xml index cda3af8d..dd323f82 100644 --- a/res/layouts/pages/worlds.xml +++ b/res/layouts/pages/worlds.xml @@ -1,6 +1,7 @@ + From 208282a156ceb3f4f7ad369388d1763849f7d22f Mon Sep 17 00:00:00 2001 From: LumperBumper <130532332+callfishxt@users.noreply.github.com> Date: Tue, 19 Nov 2024 20:03:18 +0500 Subject: [PATCH 5/5] Update worlds.xml --- res/layouts/pages/worlds.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/res/layouts/pages/worlds.xml b/res/layouts/pages/worlds.xml index dd323f82..13765930 100644 --- a/res/layouts/pages/worlds.xml +++ b/res/layouts/pages/worlds.xml @@ -1,7 +1,9 @@ + + + -