summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYousuf Philips <philipz85@hotmail.com>2015-12-11 15:21:39 +0400
committerjan iversen <jani@documentfoundation.org>2015-12-18 07:33:27 +0000
commit1ea4a61dc0b71892f19d961a4b678c10965b69a2 (patch)
treefc42191d42392a155cde360b4dbede6ca6e69654
parentab28a0803a61850b0f874fa4c98f6bd0d7861df6 (diff)
Update hardware/OS info in About dialog
Change-Id: I2c70e88cfa2663d0b3db48c309d7cf1630bbddbd Reviewed-on: https://gerrit.libreoffice.org/20632 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 52856b6ea7b6b01e8a8455ed657dc16b79de6790) Reviewed-on: https://gerrit.libreoffice.org/20635 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
-rw-r--r--cui/source/dialogs/about.cxx1
-rw-r--r--vcl/source/app/svapp.cxx6
2 files changed, 3 insertions, 4 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 07615cdcef6a..ab23cf8c4a81 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -296,7 +296,6 @@ OUString AboutDialog::GetVersionString()
sVersion += "\n";
sVersion += Application::GetHWOSConfInfo();
- sVersion += "\n";
if (EXTRA_BUILDID[0] != '\0')
{
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e9c4b01a0c27..0f5780801b76 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1189,7 +1189,7 @@ OUString Application::GetHWOSConfInfo()
ImplSVData* pSVData = ImplGetSVData();
OUStringBuffer aDetails;
- aDetails.append( "Threads " );
+ aDetails.append( "CPU Threads: " );
aDetails.append( (sal_Int32)
std::thread::hardware_concurrency() );
aDetails.append( "; " );
@@ -1200,11 +1200,11 @@ OUString Application::GetHWOSConfInfo()
else
aVersion = "-";
- aDetails.append( "Ver: " );
+ aDetails.append( "OS Version: " );
aDetails.append( aVersion );
aDetails.append( "; " );
- aDetails.append( "Render: " );
+ aDetails.append( "UI Render: " );
if ( OpenGLWrapper::isVCLOpenGLEnabled() )
aDetails.append( "GL" );
else