diff --git a/src/Gui/AboutApplication.ui b/src/Gui/AboutApplication.ui index 352e62c00c..d3f530546c 100644 --- a/src/Gui/AboutApplication.ui +++ b/src/Gui/AboutApplication.ui @@ -115,14 +115,14 @@ 6 - + Platform - + <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Unknown</span></p></body></html> @@ -171,34 +171,48 @@ - + Branch - + <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Unknown</span></p></body></html> - + <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Unknown</span></p></body></html> - + Hash + + + + Operating system + + + + + + + <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"><span style=" font-weight:600;">Unknown</span></p></body></html> + + + diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp index 46f1183e96..bf207b38ea 100644 --- a/src/Gui/Splashscreen.cpp +++ b/src/Gui/Splashscreen.cpp @@ -235,7 +235,7 @@ AboutDialog::~AboutDialog() delete ui; } -static QString getPlatform() +static QString getOperatingSystem() { #if defined (Q_OS_WIN32) switch(QSysInfo::windowsVersion()) @@ -309,9 +309,13 @@ void AboutDialog::setupLabels() date.replace(QString::fromAscii("Unknown"), disda); ui->labelBuildDate->setText(date); + QString os = ui->labelBuildOS->text(); + os.replace(QString::fromAscii("Unknown"), getOperatingSystem()); + ui->labelBuildOS->setText(os); + QString platform = ui->labelBuildPlatform->text(); platform.replace(QString::fromAscii("Unknown"), - QString::fromAscii("%1 (%2-bit)").arg(getPlatform()).arg(QSysInfo::WordSize)); + QString::fromAscii("%1-bit").arg(QSysInfo::WordSize)); ui->labelBuildPlatform->setText(platform); // branch name @@ -399,7 +403,8 @@ void AboutDialog::on_copyButton_clicked() QString major = QString::fromAscii(config["BuildVersionMajor"].c_str()); QString minor = QString::fromAscii(config["BuildVersionMinor"].c_str()); QString build = QString::fromAscii(config["BuildRevision"].c_str()); - str << "Platform: " << getPlatform() << " (" << QSysInfo::WordSize << "-bit)" << endl; + str << "OS: " << getOperatingSystem() << endl; + str << "Platform: " << QSysInfo::WordSize << "-bit" << endl; str << "Version: " << major << "." << minor << "." << build << endl; it = config.find("BuildRevisionBranch"); if (it != config.end())