Mercurial > minori
diff src/gui/dialog/about.cc @ 202:71832ffe425a
animia: re-add kvm fd source
this is all being merged from my wildly out-of-date laptop. SORRY!
in other news, I edited the CI file to install the wayland client
as well, so the linux CI build might finally get wayland stuff.
| author | Paper <paper@paper.us.eu.org> |
|---|---|
| date | Tue, 02 Jan 2024 06:05:06 -0500 |
| parents | 649786bae914 |
| children | 53211cb1e7f5 |
line wrap: on
line diff
--- a/src/gui/dialog/about.cc Sun Nov 19 19:13:28 2023 -0500 +++ b/src/gui/dialog/about.cc Tue Jan 02 06:05:06 2024 -0500 @@ -21,10 +21,6 @@ return N; } -/* used for JSON for Modern C++ */ -#define CONCAT_VERSION_NX(major, minor, patch) "v" #major "." #minor "." #patch -#define CONCAT_VERSION(major, minor, patch) CONCAT_VERSION_NX(major, minor, patch) - /* Ahhh, my dumb little hack to get this to be constexpr :) */ static constexpr const char pugixml_version[] = { PUGIXML_VERSION / 1000 % 10 + '0', /* Major */ @@ -50,9 +46,9 @@ QHBoxLayout* layout = new QHBoxLayout(this); /* we have to generate this on-the-fly for localization purposes */ - static const QString html = QString( + const QString html = QString( "<body>" - " <h2 style=\"font-weight: normal;\"><strong>Minori</strong> " MINORI_VERSION "</h2>" + " <h2 style=\"font-weight: normal;\"><strong>Minori</strong> " + QString::fromUtf8(MINORI_VERSION.data(), MINORI_VERSION.size()) + "</h2>" " <p>" " <strong>" + QCoreApplication::tr("Author:") + "</strong><br>" " Paper (@mrpapersonic)" @@ -65,9 +61,9 @@ ", " "<a href=\"https://github.com/erengy/anitomy\">Anitomy</a>" ", " - "<a href=\"https://github.com/nlohmann/json\">JSON for Modern C++ " CONCAT_VERSION(NLOHMANN_JSON_VERSION_MAJOR, - NLOHMANN_JSON_VERSION_MINOR, - NLOHMANN_JSON_VERSION_PATCH) "</a>" + "<a href=\"https://github.com/nlohmann/json\">JSON for Modern C++ v" + QString::number(NLOHMANN_JSON_VERSION_MAJOR) + "." + + QString::number(NLOHMANN_JSON_VERSION_MINOR) + "." + + QString::number(NLOHMANN_JSON_VERSION_PATCH) + "</a>" ", " "<a href=\"https://pugixml.org/\">pugixml v" + pugixml_version + "</a>" ", "