cui/source/dialogs/about.cxx | 1 -
cui/source/inc/about.hxx | 3 +--
cui/uiconfig/ui/aboutdialog.ui | 7 +++++--
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 079a57802576eb84cc0d26b1d708a727c6b18a2a
Author: Michael Meeks <michael.me...@collabora.com>
Date: Mon Dec 12 11:41:56 2016 +0000
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.
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index fb1e15e..336951b 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 bdeef65..80fda68 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 8e887eb..d313cac 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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
