cui/source/dialogs/hldocntp.cxx | 5 cui/source/dialogs/hldoctp.cxx | 5 cui/source/dialogs/hlinettp.cxx | 5 cui/source/dialogs/hlmailtp.cxx | 5 cui/source/dialogs/hltpbase.cxx | 46 ++++- cui/source/inc/hldocntp.hxx | 3 cui/source/inc/hldoctp.hxx | 3 cui/source/inc/hlinettp.hxx | 3 cui/source/inc/hlmailtp.hxx | 3 cui/source/inc/hltpbase.hxx | 8 cui/uiconfig/ui/hyperlinkdocpage.ui | 65 +++++-- cui/uiconfig/ui/hyperlinkinternetpage.ui | 74 ++++++-- cui/uiconfig/ui/hyperlinkmailpage.ui | 225 +++++++++++++++----------- cui/uiconfig/ui/hyperlinknewdocpage.ui | 263 +++++++++++++++++-------------- 14 files changed, 443 insertions(+), 270 deletions(-)
New commits: commit a2ed9aa09ad8d2601cf6198c8cd8647c08f09c16 Author: Ilmari Lauhakangas <[email protected]> AuthorDate: Wed Oct 1 13:03:54 2025 +0300 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Thu Oct 2 10:42:56 2025 +0200 Revert "tdf#151551 Remove frame target option from Hyperlink dialog" This reverts commit 74147823a7c933c796239b00cd9bf89edb899eb3. The terminology in the dialog confused the reporter and implementers and a useful feature was accidentally removed. The feature may be simplified later, but let's first revert cleanly. Change-Id: I9eb567bda59e3ad88ddfa370d04d5d8e1f944aab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191741 Reviewed-by: Mike Kaganski <[email protected]> Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Ilmari Lauhakangas <[email protected]> Tested-by: Jenkins diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 3ec45a97bbc7..6fcc0ac9d7c6 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -199,7 +199,8 @@ void SvxHyperlinkNewDocTp::FillDocumentList() |************************************************************************/ void SvxHyperlinkNewDocTp::GetCurrentItemData ( OUString& rStrURL, OUString& aStrName, - OUString& aStrIntName, SvxLinkInsertMode& eMode ) + OUString& aStrIntName, OUString& aStrFrame, + SvxLinkInsertMode& eMode ) { // get data from dialog-controls rStrURL = m_xCbbPath->get_active_text(); @@ -209,7 +210,7 @@ void SvxHyperlinkNewDocTp::GetCurrentItemData ( OUString& rStrURL, OUString& aSt rStrURL = aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } - GetDataFromCommonFields( aStrName, aStrIntName, eMode ); + GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode ); } /************************************************************************* diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index cc3e3090eeff..2c522952d77f 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -140,7 +140,8 @@ OUString SvxHyperlinkDocTp::GetCurrentURL () const |* |************************************************************************/ void SvxHyperlinkDocTp::GetCurrentItemData ( OUString& rStrURL, OUString& aStrName, - OUString& aStrIntName, SvxLinkInsertMode& eMode ) + OUString& aStrIntName, OUString& aStrFrame, + SvxLinkInsertMode& eMode ) { // get data from standard-fields rStrURL = GetCurrentURL(); @@ -148,7 +149,7 @@ void SvxHyperlinkDocTp::GetCurrentItemData ( OUString& rStrURL, OUString& aStrNa if( rStrURL.equalsIgnoreAsciiCase( INET_FILE_SCHEME ) ) rStrURL.clear(); - GetDataFromCommonFields( aStrName, aStrIntName, eMode ); + GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode ); } /************************************************************************* diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 596243b9bfbc..ef7675c26047 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -125,10 +125,11 @@ void SvxHyperlinkInternetTp::FillDlgFields(const OUString& rStrURL) |************************************************************************/ void SvxHyperlinkInternetTp::GetCurrentItemData ( OUString& rStrURL, OUString& aStrName, - OUString& aStrIntName, SvxLinkInsertMode& eMode ) + OUString& aStrIntName, OUString& aStrFrame, + SvxLinkInsertMode& eMode ) { rStrURL = CreateAbsoluteURL(); - GetDataFromCommonFields( aStrName, aStrIntName, eMode ); + GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode ); } OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index cd105821fa20..3f27aaa70f4c 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -108,10 +108,11 @@ void SvxHyperlinkMailTp::FillDlgFields(const OUString& rStrURL) |* |************************************************************************/ void SvxHyperlinkMailTp::GetCurrentItemData ( OUString& rStrURL, OUString& aStrName, - OUString& aStrIntName, SvxLinkInsertMode& eMode ) + OUString& aStrIntName, OUString& aStrFrame, + SvxLinkInsertMode& eMode ) { rStrURL = CreateAbsoluteURL(); - GetDataFromCommonFields( aStrName, aStrIntName, eMode ); + GetDataFromCommonFields( aStrName, aStrIntName, aStrFrame, eMode ); } OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 569a65dd21ad..8a4d623cc2de 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -24,6 +24,8 @@ #include <osl/file.hxx> #include <sfx2/app.hxx> #include <sfx2/event.hxx> +#include <sfx2/frame.hxx> +#include <sfx2/viewfrm.hxx> #include <sot/formats.hxx> #include <sfx2/sfxsids.hrc> #include <svl/macitem.hxx> @@ -102,11 +104,13 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase(weld::Container* pParent, const OUString& rID, const SfxItemSet* pItemSet) : IconChoicePage(pParent, rUIXMLDescription, rID, pItemSet) + , mxCbbFrame(xBuilder->weld_combo_box(u"frame"_ustr)) , mxLbForm(xBuilder->weld_combo_box(u"form"_ustr)) , mxEdIndication(xBuilder->weld_entry(u"indication"_ustr)) , mxEdText(xBuilder->weld_entry(u"name"_ustr)) , mxBtScript(xBuilder->weld_button(u"script"_ustr)) , mxFormLabel(xBuilder->weld_label(u"form_label"_ustr)) + , mxFrameLabel(xBuilder->weld_label(u"frame_label"_ustr)) , mxNameLabel(xBuilder->weld_label(u"name_label"_ustr)) , mxIndicationLabel(xBuilder->weld_label(u"indication_label"_ustr)) , mxTabLabel(xBuilder->weld_label(u"label2"_ustr)) @@ -135,7 +139,26 @@ void SvxHyperlinkTabPageBase::InitStdControls () { if ( !mbStdControlsInit ) { + SfxDispatcher* pDispatch = GetDispatcher(); + SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : nullptr; + SfxFrame* pFrame = pViewFrame ? &pViewFrame->GetFrame() : nullptr; + if ( pFrame ) + { + TargetList aList; + SfxFrame::GetDefaultTargetList(aList); + if( !aList.empty() ) + { + size_t nCount = aList.size(); + size_t i; + for ( i = 0; i < nCount; i++ ) + { + mxCbbFrame->append_text( aList.at( i ) ); + } + } + } + mxBtScript->set_from_icon_name(RID_SVXBMP_SCRIPT); + mxBtScript->connect_clicked ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) ); } @@ -218,6 +241,11 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields ( const SvxHyperlinkItem* pH if (!comphelper::LibreOfficeKit::isActive()) { + // Frame + sal_Int32 nPos = mxCbbFrame->find_text(pHyperlinkItem->GetTargetFrame()); + if (nPos != -1) + mxCbbFrame->set_active(nPos); + if( pHyperlinkItem->GetInsertMode() & HLINK_HTMLMODE ) { mxLbForm->clear(); @@ -234,9 +262,10 @@ void SvxHyperlinkTabPageBase::FillStandardDlgFields ( const SvxHyperlinkItem* pH } else { + mxCbbFrame->hide(); mxLbForm->hide(); mxFormLabel->hide(); - + mxFrameLabel->hide(); mxTabLabel->hide(); mxFurtherSettings->hide(); @@ -407,11 +436,12 @@ OUString SvxHyperlinkTabPageBase::GetSchemeFromURL( const OUString& rStrURL ) } void SvxHyperlinkTabPageBase::GetDataFromCommonFields( OUString& aStrName, - OUString& aStrIntName, + OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ) { aStrIntName = mxEdText->get_text(); aStrName = mxEdIndication->get_text(); + aStrFrame = mxCbbFrame->get_active_text(); sal_Int32 nPos = mxLbForm->get_active(); if (nPos == -1) @@ -450,17 +480,17 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet ) // Fill output-ItemSet bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet* rOut) { - OUString aStrURL, aStrName, aStrIntName; + OUString aStrURL, aStrName, aStrIntName, aStrFrame; SvxLinkInsertMode eMode; - GetCurrentItemData ( aStrURL, aStrName, aStrIntName, eMode); + GetCurrentItemData ( aStrURL, aStrName, aStrIntName, aStrFrame, eMode); if ( aStrName.isEmpty() ) //automatically create a visible name if the link is created without name aStrName = CreateUiNameFromURL(aStrURL); HyperDialogEvent nEvents = GetMacroEvents(); SvxMacroTableDtor* pTable = GetMacroTable(); - SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK, aStrName, aStrURL, OUString(), + SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK, aStrName, aStrURL, aStrFrame, aStrIntName, eMode, nEvents, pTable, m_showName, m_showText ); rOut->Put (aItem); @@ -493,17 +523,17 @@ DeactivateRC SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) HideMarkWnd (); // retrieve data of dialog - OUString aStrURL, aStrName, aStrIntName; + OUString aStrURL, aStrName, aStrIntName, aStrFrame; SvxLinkInsertMode eMode; - GetCurrentItemData ( aStrURL, aStrName, aStrIntName, eMode); + GetCurrentItemData ( aStrURL, aStrName, aStrIntName, aStrFrame, eMode); HyperDialogEvent nEvents = GetMacroEvents(); SvxMacroTableDtor* pTable = GetMacroTable(); if( _pSet ) { - SvxHyperlinkItem aItem( SID_HYPERLINK_GETLINK, aStrName, aStrURL, OUString(), + SvxHyperlinkItem aItem( SID_HYPERLINK_GETLINK, aStrName, aStrURL, aStrFrame, aStrIntName, eMode, nEvents, pTable, m_showName, m_showText ); _pSet->Put( aItem ); } diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index e4e921929ddf..68bce1650a00 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -43,7 +43,8 @@ private: protected: void FillDlgFields(const OUString& rStrURL) override; void GetCurrentItemData ( OUString& rStrURL, OUString& aStrName, - OUString& aStrIntName, SvxLinkInsertMode& eMode ) override; + OUString& aStrIntName, OUString& aStrFrame, + SvxLinkInsertMode& eMode ) override; public: SvxHyperlinkNewDocTp(weld::Container* pParent, SvxHpLinkDlg* pDlg, const SfxItemSet* pItemSet); diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 15c7c3672ab3..61005a42d635 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -53,7 +53,8 @@ private: void FillDlgFields(const OUString& rStrURL) override; void GetCurrentItemData ( OUString& rStrURL, OUString& aStrName, - OUString& aStrIntName, SvxLinkInsertMode& eMode ) override; + OUString& aStrIntName, OUString& aStrFrame, + SvxLinkInsertMode& eMode ) override; virtual bool ShouldOpenMarkWnd () override {return m_bMarkWndOpen;} virtual void SetMarkWndShouldOpen (bool bOpen) override {m_bMarkWndOpen=bOpen;} OUString GetCurrentURL() const; diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 4f8c3da1099c..366d8243a8b6 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -56,7 +56,8 @@ private: protected: virtual void FillDlgFields(const OUString& rStrURL) override; virtual void GetCurrentItemData ( OUString& rStrURL, OUString& aStrName, - OUString& aStrIntName, SvxLinkInsertMode& eMode ) override; + OUString& aStrIntName, OUString& aStrFrame, + SvxLinkInsertMode& eMode ) override; virtual bool ShouldOpenMarkWnd () override { return false; } virtual void SetMarkWndShouldOpen (bool bOpen) override {m_bMarkWndOpen=bOpen;} diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 2a920bd26199..b7c76c52cb18 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -45,7 +45,8 @@ private: protected: virtual void FillDlgFields(const OUString& rStrURL) override; virtual void GetCurrentItemData ( OUString& rStrURL, OUString& aStrName, - OUString& aStrIntName, SvxLinkInsertMode& eMode ) override; + OUString& aStrIntName, OUString& aStrFrame, + SvxLinkInsertMode& eMode ) override; public: SvxHyperlinkMailTp(weld::Container* pParent, SvxHpLinkDlg* pDlg, const SfxItemSet* pItemSet); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 89279f3f6654..dc87df1cbb15 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -45,11 +45,13 @@ public: class SvxHyperlinkTabPageBase : public IconChoicePage { private: + std::unique_ptr<weld::ComboBox> mxCbbFrame; std::unique_ptr<weld::ComboBox> mxLbForm; std::unique_ptr<weld::Entry> mxEdIndication; std::unique_ptr<weld::Entry> mxEdText; std::unique_ptr<weld::Button> mxBtScript; std::unique_ptr<weld::Label> mxFormLabel; + std::unique_ptr<weld::Label> mxFrameLabel; std::unique_ptr<weld::Label> mxNameLabel; std::unique_ptr<weld::Label> mxIndicationLabel; std::unique_ptr<weld::Label> mxTabLabel; @@ -80,10 +82,12 @@ protected: void FillStandardDlgFields ( const SvxHyperlinkItem* pHyperlinkItem ); virtual void FillDlgFields(const OUString& rStrURL) = 0; virtual void GetCurrentItemData ( OUString& rStrURL, OUString& aStrName, - OUString& aStrIntName, SvxLinkInsertMode& eMode ) = 0; + OUString& aStrIntName, OUString& aStrFrame, + SvxLinkInsertMode& eMode ) = 0; void GetDataFromCommonFields( OUString& aStrName, - OUString& aStrIntName, SvxLinkInsertMode& eMode ); + OUString& aStrIntName, OUString& aStrFrame, + SvxLinkInsertMode& eMode ); DECL_LINK (ClickScriptHdl_Impl, weld::Button&, void ); ///< Button : Script diff --git a/cui/uiconfig/ui/hyperlinkdocpage.ui b/cui/uiconfig/ui/hyperlinkdocpage.ui index 27a6d4f3e6ce..74f7eb409c5c 100644 --- a/cui/uiconfig/ui/hyperlinkdocpage.ui +++ b/cui/uiconfig/ui/hyperlinkdocpage.ui @@ -247,6 +247,21 @@ <property name="margin-top">6</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> + <child> + <object class="GtkLabel" id="frame_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="hyperlinkdocpage|frame_label">F_rame:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">frame</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="indication_label"> <property name="visible">True</property> @@ -312,13 +327,27 @@ </packing> </child> <child> - <!-- n-columns=2 n-rows=1 --> + <!-- n-columns=4 n-rows=1 --> <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> + <child> + <object class="GtkLabel" id="form_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="hyperlinkdocpage|form_label">F_orm:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">form</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> <child> <object class="GtkComboBoxText" id="form"> <property name="visible">True</property> @@ -331,7 +360,7 @@ </child> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">2</property> <property name="top-attach">0</property> </packing> </child> @@ -348,7 +377,23 @@ </child> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">3</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="frame"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="frame-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkdocpage|extended_tip|frame">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> @@ -358,20 +403,6 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkLabel" id="form_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="hyperlinkdocpage|form_label">F_orm:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">form</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> </object> </child> <child type="label"> diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui b/cui/uiconfig/ui/hyperlinkinternetpage.ui index 1ee8956f4dca..f8da048893dc 100644 --- a/cui/uiconfig/ui/hyperlinkinternetpage.ui +++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui @@ -132,6 +132,21 @@ <property name="margin-top">6</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> + <child> + <object class="GtkLabel" id="frame_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="hyperlinkinternetpage|frame_label">F_rame:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">frame</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="name_label"> <property name="visible">True</property> @@ -165,13 +180,27 @@ </packing> </child> <child> - <!-- n-columns=2 n-rows=1 --> + <!-- n-columns=4 n-rows=1 --> <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> + <child> + <object class="GtkLabel" id="form_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="hyperlinkinternetpage|form_label">F_orm:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">form</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> <child> <object class="GtkComboBoxText" id="form"> <property name="visible">True</property> @@ -184,7 +213,7 @@ </child> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">2</property> <property name="top-attach">0</property> </packing> </child> @@ -201,7 +230,23 @@ </child> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">3</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="frame"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="frame-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkinternetpage|extended_tip|frame">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> @@ -211,20 +256,6 @@ <property name="top-attach">0</property> </packing> </child> - <child> - <object class="GtkLabel" id="form_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="hyperlinkinternetpage|form_label">F_orm:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">form</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> </object> </child> <child type="label"> @@ -250,5 +281,12 @@ </object> </child> </object> - <object class="GtkSizeGroup" id="sizegroup1"/> + <object class="GtkSizeGroup" id="sizegroup1"> + <widgets> + <widget name="target_label"/> + <widget name="frame_label"/> + <widget name="indication_label"/> + <widget name="name_label"/> + </widgets> + </object> </interface> diff --git a/cui/uiconfig/ui/hyperlinkmailpage.ui b/cui/uiconfig/ui/hyperlinkmailpage.ui index 6d893825cf2e..f76d74aaf6f9 100644 --- a/cui/uiconfig/ui/hyperlinkmailpage.ui +++ b/cui/uiconfig/ui/hyperlinkmailpage.ui @@ -1,58 +1,58 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.40.0 --> +<!-- Generated with glade 3.36.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">res/adrbook.png</property> + <property name="can_focus">False</property> + <property name="icon_name">res/adrbook.png</property> </object> <object class="GtkBox" id="HyperlinkMailPage"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border-width">6</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <!-- n-columns=3 n-rows=3 --> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> <object class="GtkLabel" id="receiver_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="hyperlinkmailpage|receiver_label">Re_cipient:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">receiver</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">receiver</property> <property name="xalign">0</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkButton" id="addressbook"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="hyperlinkmailpage|addressbook|tooltip_text">Data Sources...</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="hyperlinkmailpage|addressbook|tooltip_text">Data Sources...</property> <property name="image">image1</property> <property name="always-show-image">True</property> <child internal-child="accessible"> @@ -62,31 +62,31 @@ </child> </object> <packing> - <property name="left-attach">2</property> - <property name="top-attach">1</property> + <property name="left_attach">2</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="subject_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="hyperlinkmailpage|subject_label">_Subject:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">subject</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">subject</property> <property name="xalign">0</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> <object class="GtkEntry" id="subject"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="activates-default">True</property> + <property name="activates_default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="subject-atkobject"> @@ -95,21 +95,21 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> <object class="GtkComboBoxText" id="receiver"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="has-entry">True</property> + <property name="has_entry">True</property> <child internal-child="entry"> <object class="GtkEntry"> - <property name="can-focus">True</property> - <property name="activates-default">True</property> + <property name="can_focus">True</property> <property name="truncate-multiline">True</property> + <property name="activates_default">True</property> </object> </child> <child internal-child="accessible"> @@ -119,8 +119,8 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> @@ -140,7 +140,7 @@ <child type="label"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label" translatable="yes" context="hyperlinkmailpage|label2">Mail</property> <attributes> <attribute name="weight" value="bold"/> @@ -157,56 +157,71 @@ <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="valign">end</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <!-- n-columns=2 n-rows=3 --> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <property name="margin-start">12</property> <property name="margin-top">6</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> + <child> + <object class="GtkLabel" id="frame_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="hyperlinkmailpage|frame_label">F_rame:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">frame</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="indication_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="hyperlinkmailpage|indication_label">Te_xt:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">indication</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">indication</property> <property name="xalign">0</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="name_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="hyperlinkmailpage|name_label">N_ame:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">name</property> <property name="xalign">0</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> <object class="GtkEntry" id="indication"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="indication-atkobject"> @@ -215,15 +230,15 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkEntry" id="name"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="name-atkobject"> @@ -232,24 +247,54 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> - <!-- n-columns=2 n-rows=1 --> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid4"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="form_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="hyperlinkmailpage|form_label">F_orm:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">form</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="form"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="form-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|form">Specifies whether the hyperlink is inserted as text or as a button.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <object class="GtkButton" id="script"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="hyperlinkmailpage|script|tooltip_text">Events</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="hyperlinkmailpage|script|tooltip_text">Events</property> <child internal-child="accessible"> <object class="AtkObject" id="script-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|script">Opens the Assign Macro dialog, in which you can give events such as "mouse over object" or "trigger hyperlink" their own program codes.</property> @@ -257,44 +302,30 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="left_attach">3</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="form"> + <object class="GtkComboBoxText" id="frame"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="form-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|form">Specifies whether the hyperlink is inserted as text or as a button.</property> + <object class="AtkObject" id="frame-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|frame">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</property> </object> </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="form_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="hyperlinkmailpage|form_label">F_orm:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">form</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> @@ -302,7 +333,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label" translatable="yes" context="hyperlinkmailpage|label1">Further Settings</property> <attributes> <attribute name="weight" value="bold"/> diff --git a/cui/uiconfig/ui/hyperlinknewdocpage.ui b/cui/uiconfig/ui/hyperlinknewdocpage.ui index 353e9da005d1..a087c403b344 100644 --- a/cui/uiconfig/ui/hyperlinknewdocpage.ui +++ b/cui/uiconfig/ui/hyperlinknewdocpage.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.40.0 --> +<!-- Generated with glade 3.36.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">cmd/sc_adddirect.png</property> + <property name="can_focus">False</property> + <property name="icon_name">cmd/sc_adddirect.png</property> </object> <object class="GtkTreeStore" id="liststore1"> <columns> @@ -17,47 +17,47 @@ </object> <object class="GtkBox" id="HyperlinkNewDocPage"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border-width">6</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="vexpand">True</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <!-- n-columns=3 n-rows=3 --> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <child> - <!-- n-columns=2 n-rows=1 --> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="editnow"> <property name="label" translatable="yes" context="hyperlinknewdocpage|editnow">Edit _now</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> <property name="active">True</property> - <property name="draw-indicator">True</property> + <property name="draw_indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="editnow-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinknewdocpage|extended_tip|editnow">Specifies that the new document is created and immediately opened for editing.</property> @@ -65,18 +65,18 @@ </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkRadioButton" id="editlater"> <property name="label" translatable="yes" context="hyperlinknewdocpage|editlater">Edit _later</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="use-underline">True</property> - <property name="draw-indicator">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> <property name="group">editnow</property> <child internal-child="accessible"> <object class="AtkObject" id="editlater-atkobject"> @@ -85,37 +85,37 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="file_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="hyperlinknewdocpage|file_label">_File:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">path</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">path</property> <property name="xalign">0</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkButton" id="create"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="hyperlinknewdocpage|create|tooltip_text">Select Path</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="hyperlinknewdocpage|create|tooltip_text">Select Path</property> <property name="image">image1</property> <property name="always-show-image">True</property> <child internal-child="accessible"> @@ -125,37 +125,37 @@ </child> </object> <packing> - <property name="left-attach">2</property> - <property name="top-attach">1</property> + <property name="left_attach">2</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="types_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="hyperlinknewdocpage|types_label">File _type:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">types</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">types</property> <property name="xalign">0</property> <property name="yalign">0</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> <object class="GtkComboBoxText" id="path"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="has-entry">True</property> + <property name="has_entry">True</property> <child internal-child="entry"> <object class="GtkEntry"> - <property name="can-focus">True</property> - <property name="activates-default">True</property> + <property name="can_focus">True</property> <property name="truncate-multiline">True</property> + <property name="activates_default">True</property> </object> </child> <child internal-child="accessible"> @@ -165,26 +165,26 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can_focus">True</property> <property name="vexpand">False</property> - <property name="shadow-type">in</property> + <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="types"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can_focus">True</property> <property name="vexpand">True</property> <property name="model">liststore1</property> - <property name="headers-visible">False</property> - <property name="headers-clickable">False</property> - <property name="search-column">0</property> - <property name="show-expanders">False</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> @@ -207,8 +207,8 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -225,7 +225,7 @@ <child type="label"> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label" translatable="yes" context="hyperlinknewdocpage|label2">New Document</property> <attributes> <attribute name="weight" value="bold"/> @@ -242,56 +242,71 @@ <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="valign">end</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <!-- n-columns=2 n-rows=3 --> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <property name="margin-start">12</property> <property name="margin-top">6</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> + <child> + <object class="GtkLabel" id="frame_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="hyperlinknewdocpage|frame_label">F_rame:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">frame</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="indication_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="hyperlinknewdocpage|indication_label">Te_xt:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">indication</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">indication</property> <property name="xalign">0</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="name_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes" context="hyperlinknewdocpage|name_label">N_ame:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">name</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">name</property> <property name="xalign">0</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> <object class="GtkEntry" id="indication"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="indication-atkobject"> @@ -300,15 +315,15 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkEntry" id="name"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activates-default">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="name-atkobject"> @@ -317,22 +332,35 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> - <!-- n-columns=2 n-rows=1 --> + <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="grid4"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="row-spacing">6</property> - <property name="column-spacing">12</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="form_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="hyperlinknewdocpage|form_label">F_orm:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">form</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> <child> <object class="GtkComboBoxText" id="form"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <child internal-child="accessible"> <object class="AtkObject" id="form-atkobject"> @@ -341,16 +369,16 @@ </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">2</property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkButton" id="script"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="hyperlinknewdocpage|script|tooltip_text">Events</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="hyperlinknewdocpage|script|tooltip_text">Events</property> <child internal-child="accessible"> <object class="AtkObject" id="script-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinknewdocpage|extended_tip|script">Opens the Assign Macro dialog, in which you can give events such as "mouse over object" or "trigger hyperlink" their own program codes.</property> @@ -358,27 +386,30 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="frame"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="frame-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinknewdocpage|extended_tip|frame">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list. If you leave this box blank, the linked file opens in the current browser window.</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="form_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="hyperlinknewdocpage|form_label">F_orm:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">form</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> @@ -386,7 +417,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label" translatable="yes" context="hyperlinknewdocpage|label1">Further Settings</property> <attributes> <attribute name="weight" value="bold"/>
