[Libreoffice-commits] core.git: vcl/inc vcl/source

[Khaled Hosny]

 vcl/inc/svids.hrc        |    3 +++
 vcl/source/app/svapp.cxx |    8 ++++++++
 vcl/source/src/app.src   |   15 +++++++++++++++
 3 files changed, 26 insertions(+)

New commits:
commit f351b3624de79b5806a066202a3a0d6fa59c8469
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Oct 29 16:23:45 2016 +0200

    Add layout engine info to the About dialog
    
    Change-Id: I6a87efa5e1072bac3588226df0e1351aa51c4d0d
    Reviewed-on: https://gerrit.libreoffice.org/30108
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>
    Tested-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 891fe57..fa27f8b 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -180,6 +180,9 @@
 #define SV_APP_GL                                   10803
 #define SV_APP_DEFAULT                              10804
 #define SV_APP_VCLBACKEND                           10805
+#define SV_APP_LAYOUT_ENGINE                        10806
+#define SV_APP_LAYOUT_NEW                           10807
+#define SV_APP_LAYOUT_OLD                           10808
 
 #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 61e0072..b5026c8 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -57,6 +57,7 @@
 
 #include "salinst.hxx"
 #include "salframe.hxx"
+#include "sallayout.hxx"
 #include "salsys.hxx"
 #include "svdata.hxx"
 #include "salimestatus.hxx"
@@ -1218,6 +1219,13 @@ OUString Application::GetHWOSConfInfo()
     aDetails.append( "; " );
 #endif
 
+    aDetails.append( VclResId(SV_APP_LAYOUT_ENGINE).toString() );
+    if (SalLayout::UseCommonLayout())
+        aDetails.append( VclResId(SV_APP_LAYOUT_NEW).toString() );
+    else
+        aDetails.append( VclResId(SV_APP_LAYOUT_OLD).toString() );
+    aDetails.append( "; " );
+
     return aDetails.makeStringAndClear();
 }
 
diff --git a/vcl/source/src/app.src b/vcl/source/src/app.src
index b36686d..0197d98 100644
--- a/vcl/source/src/app.src
+++ b/vcl/source/src/app.src
@@ -39,4 +39,19 @@ String SV_APP_VCLBACKEND
     Text [ en-US ] = "VCL: ";
 };
 
+String SV_APP_LAYOUT_ENGINE
+{
+    Text [ en-US ] = "Layout Engine: ";
+};
+
+String SV_APP_LAYOUT_NEW
+{
+    Text [ en-US ] = "new";
+};
+
+String SV_APP_LAYOUT_OLD
+{
+    Text [ en-US ] = "old";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */