cui/source/dialogs/about.cxx | 1 + cui/source/inc/about.hxx | 3 ++- cui/uiconfig/ui/aboutdialog.ui | 7 ++----- 3 files changed, 5 insertions(+), 6 deletions(-)
New commits: commit cc02097495f95967f8f06c364dfa6a8949132868 Author: Arnold Dumas <arn...@dumas.at> Date: Fri Dec 9 19:05:01 2016 +0100 tdf#103654: Make git hash clickable in the About dialog This will help the QA team and make it easier to quickly see what is in a build. Change-Id: Ibaa96ee7eac7c60781dddb88981e76afbc71d23f Reviewed-on: https://gerrit.libreoffice.org/31808 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Meeks <michael.me...@collabora.com> diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 336951b..fb1e15e 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -77,6 +77,7 @@ AboutDialog::AboutDialog(vcl::Window* pParent) m_aLocaleStr = get<FixedText>("locale")->GetText(); m_pVersion->SetText(GetVersionString()); + m_pVersion->SetURL("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=" + GetBuildId()); OUString aCopyrightString = GetCopyrightString(); m_pCopyrightText->SetText( aCopyrightString ); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 80fda68..bdeef65 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -22,6 +22,7 @@ #include <vcl/accel.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> +#include <vcl/fixedhyper.hxx> #include <vcl/vclmedit.hxx> #include <sfx2/basedlgs.hxx> #include <vector> @@ -34,7 +35,7 @@ private: BitmapEx aBackgroundBitmap; BitmapEx aLogoBitmap; - VclPtr<VclMultiLineEdit> m_pVersion; + VclPtr<FixedHyperlink> m_pVersion; VclPtr<FixedText> m_pDescriptionText; VclPtr<FixedText> m_pCopyrightText; VclPtr<FixedImage> m_pLogoImage; diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index d313cac..8e887eb 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -2,9 +2,6 @@ <!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.0"/> - <object class="GtkTextBuffer" id="textbuffer1"> - <property name="text" translatable="yes">Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX</property> - </object> <object class="GtkDialog" id="AboutDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -147,7 +144,7 @@ </packing> </child> <child> - <object class="GtkTextView" id="version"> + <object class="GtkLinkButton" id="version"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> @@ -155,7 +152,7 @@ <property name="wrap_mode">word</property> <property name="justification">center</property> <property name="cursor_visible">False</property> - <property name="buffer">textbuffer1</property> + <property name="label" translatable="yes">Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX</property> </object> <packing> <property name="left_attach">0</property> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits