* add URL support to Label element and XML parsing

* refactor Label URL handling to use getter method in setURL

* implement URL opening confirmation dialog and platform-specific URL handling

* fix: fixed build errors

* remove: delete test link label from worlds.xml

* refactor: remove URL handling from Label class and XML parsing

* refactor: clean up Label class by removing unnecessary whitespace and improving code readability

* refactor: remove unused URL member from Label class

* refactor: remove unused URL attribute from XML UI documentation and related code

* refactor: improve code readability by adding whitespace and formatting adjustments in Label class

* refactor: improve whitespace consistency in Label class and add URL opening functionality in libcore
This commit is contained in:
GHOST11111100 2025-09-26 21:39:12 +03:00 committed by GitHub
parent 21725921e1
commit 240abb939f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 75 additions and 4 deletions

View File

@ -1,5 +1,4 @@
<panel size='400' color='0' interval='1' context='menu'>
<button onclick='menu.page="new_world"'>@New World</button>
<panel id='worlds' size='390,1' padding='5' color='#FFFFFF11' max-length='400'>

View File

@ -25,6 +25,7 @@ Grant %{0} pack modification permission?=Выдаць дазвол на мады
Error at line %{0}=Памылка ў радку %{0}
Run=Запусціць
Filter=Фільтр
Are you sure you want to open the link: =Ці вы ўпэўненыя, што хочаце адкрыць спасылку:
editor.info.tooltip=CTRL+S - Захаваць\nCTRL+R - Запусціць\nCTRL+Z - Скасаваць\nCTRL+Y - Паўтарыць
devtools.traceback=Стэк выклікаў (ад апошняга)

View File

@ -7,6 +7,7 @@ Back=Zurück
Continue=Weitermachen
Add=Hinzufügen
Converting world...=Weltkonvertierung im Gange...
Are you sure you want to open the link: =Sind Sie sicher, dass Sie den Link öffnen möchten:
error.pack-not-found=Paket konnte nicht gefunden werden
error.dependency-not-found=Die verwendete Abhängigkeit wurde nicht gefunden

View File

@ -19,6 +19,7 @@ Problems=Ongelmia
Monitor=Valvonta
Debug=Virheenkorjaus
File=Tiedosto
Are you sure you want to open the link: =Haluatko varmasti avata linkin:
devtools.traceback=Puhelupino (viimeisestä)
error.pack-not-found=Pakettia ei löytynyt!

View File

@ -7,6 +7,7 @@ Back=Powrót
Continue=Kontynuacja
Add=Dodać
Converting world...=Konwersja świata w toku...
Are you sure you want to open the link: =Czy na pewno chcesz otworzyć link:
error.pack-not-found=Nie udało się znaleźć pakietu

View File

@ -25,6 +25,7 @@ Grant %{0} pack modification permission?=Выдать разрешение на
Error at line %{0}=Ошибка на строке %{0}
Run=Запустить
Filter=Фильтр
Are you sure you want to open the link: =Вы уверены, что хотите открыть ссылку:
editor.info.tooltip=CTRL+S - Сохранить\nCTRL+R - Запустить\nCTRL+Z - Отменить\nCTRL+Y - Повторить
devtools.traceback=Стек вызовов (от последнего)

View File

@ -23,6 +23,7 @@ devtools.traceback=Стек викликів (від останнього)
error.pack-not-found=Не вдалося знайти пакет
error.dependency-not-found=Використовувана залежність не знайдена
pack.remove-confirm=Видалити весь контент, що постачається паком/паками зі світу (безповоротно)?
Are you sure you want to open the link: =Ви впевнені, що хочете відкрити посилання:
# Меню
menu.Apply=Застосувати

View File

@ -24,6 +24,7 @@ Save=Saqlash
Grant %{0} pack modification permission?=%{0} toplamini ozgartirish ruxsatini berilsinmi?
Error at line %{0}=%{0}-qatorida xatolik
Run=Ishga tushirish
Are you sure you want to open the link: =Haqiqatan ham havolani ochmoqchimisiz:
editor.info.tooltip=CTRL+S - Saqlash\nCTRL+R - Ishga tushirish\nCTRL+Z - Bekor qilish\nCTRL+Y - Qayta bajarish
devtools.traceback=Chaqiruvlar steki (so`nggisidan boshlab)

View File

@ -103,9 +103,14 @@ void guiutil::confirm(
panel->setGravity(Gravity::center_center);
container->add(panel);
panel->setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.5f));
panel->add(std::make_shared<Label>(gui, text));
auto label = std::make_shared<Label>(gui, text);
label->setSize(glm::vec2(600, 50));
label->setMultiline(true);
label->setTextWrapping(true);
panel->add(label);
auto subpanel = std::make_shared<Panel>(gui, glm::vec2(600, 53));
subpanel->setColor(glm::vec4(0));

View File

@ -20,6 +20,11 @@
#include "util/platform.hpp"
#include "world/Level.hpp"
#include "world/generator/WorldGenerator.hpp"
#include "util/platform.hpp"
#include "frontend/locale.hpp"
#include "graphics/ui/gui_util.hpp"
#include "graphics/ui/GUI.hpp"
#include "graphics/ui/elements/Menu.hpp"
using namespace scripting;
@ -229,6 +234,24 @@ static int l_open_folder(lua::State* L) {
return 0;
}
static int l_open_url(lua::State* L) {
auto url = lua::require_string(L, 1);
std::wstring msg = langs::get(L"Are you sure you want to open the link:") +
L"\n" + util::str2wstr_utf8(url) +
std::wstring(L"?");
auto menu = engine->getGUI().getMenu();
guiutil::confirm(*engine, msg, [url, menu]() {
platform::openURL(url);
if (!menu->back()) {
menu->reset();
}
});
return 0;
}
/// @brief Quit the game
static int l_quit(lua::State*) {
engine->quit();
@ -284,6 +307,7 @@ const luaL_Reg corelib[] = {
{"str_setting", lua::wrap<l_str_setting>},
{"get_setting_info", lua::wrap<l_get_setting_info>},
{"open_folder", lua::wrap<l_open_folder>},
{"open_url", lua::wrap<l_open_url>},
{"quit", lua::wrap<l_quit>},
{"capture_output", lua::wrap<l_capture_output>},
{NULL, NULL}

View File

@ -65,14 +65,31 @@ int platform::get_process_id() {
return GetCurrentProcessId();
}
bool platform::openURL(const std::string& url) {
if (url.empty()) return false;
// UTF-8 → UTF-16
int wlen = MultiByteToWideChar(CP_UTF8, 0, url.c_str(), -1, nullptr, 0);
if (wlen <= 0) return false;
std::wstring wurl(wlen, L'\0');
MultiByteToWideChar(CP_UTF8, 0, url.c_str(), -1, &wurl[0], wlen);
HINSTANCE result = ShellExecuteW(
nullptr, L"open", wurl.c_str(), nullptr, nullptr, SW_SHOWNORMAL
);
return reinterpret_cast<intptr_t>(result) > 32;
}
#else // _WIN32
#include <unistd.h>
#include <sys/wait.h>
#include "frontend/locale.hpp"
void platform::configure_encoding() {
}
std::string platform::detect_locale() {
const char* const programLocaleName = setlocale(LC_ALL, nullptr);
const char* const preferredLocaleName =
@ -92,6 +109,24 @@ void platform::sleep(size_t millis) {
int platform::get_process_id() {
return getpid();
}
bool platform::openURL(const std::string& url) {
if (url.empty()) return false;
pid_t pid = fork();
if (pid == 0) {
#ifdef __APPLE__
execlp("open", "open", url.c_str(), (char*)nullptr);
#else
execlp("xdg-open", "xdg-open", url.c_str(), (char*)nullptr);
#endif
_exit(127);
} else if (pid > 0) {
int status = 0;
waitpid(pid, &status, 0);
return WIFEXITED(status) && WEXITSTATUS(status) == 0;
}
return false;
}
#endif // _WIN32
void platform::open_folder(const std::filesystem::path& folder) {

View File

@ -13,4 +13,5 @@ namespace platform {
/// Makes the current thread sleep for the specified amount of milliseconds.
void sleep(size_t millis);
int get_process_id();
bool openURL(const std::string& url);
}