[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/inc vcl/source
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Fri Nov 25 09:11:32 UTC 2016
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 ec0475d2124b5270fc1a2a8ccfaa354e931193bc
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.
Change-Id: Ib4e6b33e9c2b3ec2fca229fed8f4533227a67ac6
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)
Reviewed-on: https://gerrit.libreoffice.org/30039
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index e23fdc5..7174966 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -183,6 +183,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 be670e0..57d7c75 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1233,6 +1233,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: */
More information about the Libreoffice-commits
mailing list