diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-12-12 11:41:56 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-12-12 11:43:40 +0000 |
| commit | 079a57802576eb84cc0d26b1d708a727c6b18a2a (patch) | |
| tree | 365ebabca6e0a3e0ed6b5b1362cf557dda498a07 /cui | |
| parent | 01afbf12788b070b90eb306d86ea2870857a1328 (diff) | |
Revert "tdf#103654: Make git hash clickable in the About dialog"
This reverts commit cc02097495f95967f8f06c364dfa6a8949132868.
Need to improve the solution here a little I think.
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/about.cxx | 1 | ||||
| -rw-r--r-- | cui/source/inc/about.hxx | 3 | ||||
| -rw-r--r-- | cui/uiconfig/ui/aboutdialog.ui | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index fb1e15e4f5b8..336951b3a7f3 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -77,7 +77,6 @@ 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 bdeef6585afc..80fda68b6552 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -22,7 +22,6 @@ #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> @@ -35,7 +34,7 @@ private: BitmapEx aBackgroundBitmap; BitmapEx aLogoBitmap; - VclPtr<FixedHyperlink> m_pVersion; + VclPtr<VclMultiLineEdit> 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 8e887ebd8ed3..d313cac4ef73 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -2,6 +2,9 @@ <!-- 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> @@ -144,7 +147,7 @@ </packing> </child> <child> - <object class="GtkLinkButton" id="version"> + <object class="GtkTextView" id="version"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> @@ -152,7 +155,7 @@ <property name="wrap_mode">word</property> <property name="justification">center</property> <property name="cursor_visible">False</property> - <property name="label" translatable="yes">Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX</property> + <property name="buffer">textbuffer1</property> </object> <packing> <property name="left_attach">0</property> |