[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - cui/source cui/uiconfig
Serge Krot
Serge.Krot at cib.de
Tue Nov 14 16:44:46 UTC 2017
cui/source/dialogs/linkdlg.cxx | 1 +
cui/source/inc/linkdlg.hxx | 3 ++-
cui/uiconfig/ui/baselinksdialog.ui | 26 ++++++++++++++++++++++++--
3 files changed, 27 insertions(+), 3 deletions(-)
New commits:
commit 8f26c68a96d34684a8377adb3ac17ffb81fe313e
Author: Serge Krot <Serge.Krot at cib.de>
Date: Mon Nov 13 17:35:48 2017 +0100
tdf#113807 Enable clicking on pathfile-names in "Links" dialog
Improved:
* Very long pathfilename now do not overwrite its label on the dialog
* Full pathfilename could be clicked to show attachment/image
with default viewer.
Change-Id: I6e5398ed2a2013aae0d9b51a719e694b3206dcce
Reviewed-on: https://gerrit.libreoffice.org/44689
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/44726
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 011f09173c33..108dbb6ab985 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -245,6 +245,7 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox,
sfx2::LinkManager::GetDisplayNames( pLink, &sType, &aFileName, pLinkNm, pFilter );
aFileName = INetURLObject::decode(aFileName, INetURLObject::DECODE_UNAMBIGUOUS);
m_pFtFullFileName->SetText( aFileName );
+ m_pFtFullFileName->SetURL( aFileName );
m_pFtFullSourceName->SetText( sLink );
m_pFtFullTypeName->SetText( sType );
}
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 1bc2f1cc4181..18809c129580 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -26,6 +26,7 @@
#include <vcl/edit.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/idle.hxx>
+#include <vcl/fixedhyper.hxx>
#include <svtools/svmedit.hxx>
#include <svtools/svtabbx.hxx>
@@ -45,7 +46,7 @@ class SvBaseLinksDlg : public ModalDialog
using Window::SetType;
VclPtr<SvTabListBox> m_pTbLinks;
- VclPtr<FixedText> m_pFtFullFileName;
+ VclPtr<FixedHyperlink> m_pFtFullFileName;
VclPtr<FixedText> m_pFtFullSourceName;
VclPtr<FixedText> m_pFtFullTypeName;
VclPtr<RadioButton> m_pRbAutomatic;
diff --git a/cui/uiconfig/ui/baselinksdialog.ui b/cui/uiconfig/ui/baselinksdialog.ui
index 1d77a0a68c54..a8fb9069dfef 100644
--- a/cui/uiconfig/ui/baselinksdialog.ui
+++ b/cui/uiconfig/ui/baselinksdialog.ui
@@ -297,16 +297,38 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="FULL_FILE_NAME">
+ <object class="GtkBox" id="box_hexpand">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLinkButton" id="FULL_FILE_NAME">
+ <property name="label"></property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">none</property>
+ <property name="focus_on_click">False</property>
+ <property name="xalign">0</property>
+ <property name="uri"></property>
+ </object>
+ <packing>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
More information about the Libreoffice-commits
mailing list