From 9c9905128e15dd397a7008df7f119df57bc6117b Mon Sep 17 00:00:00 2001 From: 0penBrain Date: Tue, 19 Mar 2019 20:48:08 +0100 Subject: [PATCH] Add information about Linux GFX environnement in FC info --- src/Gui/Splashscreen.cpp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp index 1509b5cbb5..53f103505a 100644 --- a/src/Gui/Splashscreen.cpp +++ b/src/Gui/Splashscreen.cpp @@ -33,6 +33,7 @@ # include # include # include +# include # include # include # include @@ -738,7 +739,26 @@ void AboutDialog::on_copyButton_clicked() QString major = QString::fromLatin1(config["BuildVersionMajor"].c_str()); QString minor = QString::fromLatin1(config["BuildVersionMinor"].c_str()); QString build = QString::fromLatin1(config["BuildRevision"].c_str()); - str << "OS: " << SystemInfo::getOperatingSystem() << endl; + + 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(""); + + if (!(deskEnv == QString::fromLatin1("") && deskSess == QString::fromLatin1(""))) + { + if (deskEnv == QString::fromLatin1("") || deskSess == QString::fromLatin1("")) + { + deskInfo = QString::fromLatin1(" (") + deskEnv + deskSess + QString::fromLatin1(")"); + + } + else + { + deskInfo = QString::fromLatin1(" (") + deskEnv + QString::fromLatin1("/") + deskSess + QString::fromLatin1(")"); + } + } + + str << "OS: " << SystemInfo::getOperatingSystem() << deskInfo << endl; + int wordSize = SystemInfo::getWordSizeOfOS(); if (wordSize > 0) { str << "Word size of OS: " << wordSize << "-bit" << endl;