[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - vcl/inc vcl/source

[Ashod Nakashian]

 vcl/inc/svids.hrc        |    1 +
 vcl/source/app/svapp.cxx |    7 +++++++
 vcl/source/src/app.src   |    5 +++++
 3 files changed, 13 insertions(+)

New commits:
commit de31257b4b5c26f5a9403b22a953043d49613885
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Oct 13 15:52:32 2016 -0400

    tdf#103185: Add VCL backend being used to About dialog
    
    The VCL backend is now shown on the About dialog.
    
    Reviewed-on: https://gerrit.libreoffice.org/29798
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    Tested-by: Yousuf Philips <philipz85 at hotmail.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 6b5b773488a4ab77b5c18d82e663e68692f14b33)
    
    Change-Id: I331960ec5352d8a7274870713a554c3fe4044db4
    Reviewed-on: https://gerrit.libreoffice.org/30273
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 04ecc94..f17a504 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -182,6 +182,7 @@
 #define SV_APP_UIRENDER                             10802
 #define SV_APP_GL                                   10803
 #define SV_APP_DEFAULT                              10804
+#define SV_APP_VCLBACKEND                           10805
 
 #define SV_ICON_SIZE48_START                20000
 #define SV_ICON_SIZE32_START                21000
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index a5a01a1..90de97f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1229,6 +1229,13 @@ OUString Application::GetHWOSConfInfo()
         aDetails.append( VclResId(SV_APP_DEFAULT).toString() );
     aDetails.append( "; " );
 
+#ifdef LINUX
+    // Only linux has different backends, so don't show blank for others.
+    aDetails.append( VclResId(SV_APP_VCLBACKEND).toString() );
+    aDetails.append( GetToolkitName() );
+    aDetails.append( "; " );
+#endif
+
     return aDetails.makeStringAndClear();
 }
 
diff --git a/vcl/source/src/app.src b/vcl/source/src/app.src
index 91d9df1..b36686d 100644
--- a/vcl/source/src/app.src
+++ b/vcl/source/src/app.src
@@ -34,4 +34,9 @@ String SV_APP_DEFAULT
     Text [ en-US ] = "default";
 };
 
+String SV_APP_VCLBACKEND
+{
+    Text [ en-US ] = "VCL: ";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */