[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/source vcl/source

[Yousuf Philips]

 cui/source/dialogs/about.cxx |    1 -
 vcl/source/app/svapp.cxx     |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 1ea4a61dc0b71892f19d961a4b678c10965b69a2
Author: Yousuf Philips <philip...@hotmail.com>
Date:   Fri Dec 11 15:21:39 2015 +0400

    Update hardware/OS info in About dialog
    
    Change-Id: I2c70e88cfa2663d0b3db48c309d7cf1630bbddbd
    Reviewed-on: https://gerrit.libreoffice.org/20632
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>
    Tested-by: Michael Meeks <michael.me...@collabora.com>
    (cherry picked from commit 52856b6ea7b6b01e8a8455ed657dc16b79de6790)
    Reviewed-on: https://gerrit.libreoffice.org/20635
    Reviewed-by: jan iversen <j...@documentfoundation.org>
    Tested-by: jan iversen <j...@documentfoundation.org>

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 07615cd..ab23cf8 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 e9c4b01..0f57808 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits