mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "tdf#103654: Make git hash clickable in the About dialog"

Browse Source 
This reverts commit cc02097495.

Need to improve the solution here a little I think.
This commit is contained in:
Michael Meeks
2016-12-12 11:41:56 +00:00
parent 01afbf1278
commit 079a578025
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cui/source/dialogs/about.cxx
View File

@@ -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 );

3
cui/source/inc/about.hxx
View File

@@ -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;

7
cui/uiconfig/ui/aboutdialog.ui
View File

@@ -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>