kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: Add dual info about FC + OS locale in full information

Browse Source 
+ clean some horrible old code
This commit is contained in:
0penBrain
2022-03-28 19:49:33 +02:00
committed by wwmayer
parent 7a74ae01d3
commit 3753a4b237
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Gui/Splashscreen.cpp
View File

@@ -683,15 +683,15 @@ void AboutDialog::on_copyButton_clicked()
QString minor = QString::fromLatin1(config["BuildVersionMinor"].c_str());
QString build = QString::fromLatin1(config["BuildRevision"].c_str());
QString deskEnv = QProcessEnvironment::systemEnvironment().value(QString::fromLatin1("XDG_CURRENT_DESKTOP"),QString::fromLatin1(""));
QString deskSess = QProcessEnvironment::systemEnvironment().value(QString::fromLatin1("DESKTOP_SESSION"),QString::fromLatin1(""));
QString deskInfo = QString::fromLatin1("");
QString deskEnv = QProcessEnvironment::systemEnvironment().value(QStringLiteral("XDG_CURRENT_DESKTOP"),QStringLiteral(""));
QString deskSess = QProcessEnvironment::systemEnvironment().value(QStringLiteral("DESKTOP_SESSION"),QStringLiteral(""));
QString deskInfo = QStringLiteral("");
if (!(deskEnv == QString::fromLatin1("") && deskSess == QString::fromLatin1(""))) {
if (deskEnv == QString::fromLatin1("") || deskSess == QString::fromLatin1(""))
deskInfo = QString::fromLatin1(" (") + deskEnv + deskSess + QString::fromLatin1(")");
if ( !(deskEnv.isEmpty() && deskSess.isEmpty()) ) {
if ( deskEnv.isEmpty() || deskSess.isEmpty() )
deskInfo = QLatin1String(" (") + deskEnv + deskSess + QLatin1String(")");
else
deskInfo = QString::fromLatin1(" (") + deskEnv + QString::fromLatin1("/") + deskSess + QString::fromLatin1(")");
deskInfo = QLatin1String(" (") + deskEnv + QLatin1String("/") + deskSess + QLatin1String(")");
}
str << "[code]\n";
@@ -735,7 +735,14 @@ void AboutDialog::on_copyButton_clicked()
QLocale loc;
str << "Locale: " << loc.languageToString(loc.language()) << "/"
<< loc.countryToString(loc.country())
<< " (" << loc.name() << ")\n";
<< " (" << loc.name() << ")";
if (loc != QLocale::system()) {
loc = QLocale::system();
str << " [ OS: " << loc.languageToString(loc.language()) << "/"
<< loc.countryToString(loc.country())
<< " (" << loc.name() << ") ]";
}
str << "\n";
// Add installed module information:
auto modDir = fs::path(App::Application::getUserAppDataDir()) / "Mod";