officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 25
sw/inc/viewopt.hxx | 10
sw/source/ui/config/optpage.cxx | 3
sw/source/uibase/config/cfgitems.cxx | 8
sw/source/uibase/config/usrpref.cxx | 22
sw/source/uibase/config/viewopt.cxx | 23
sw/source/uibase/frmdlg/frmmgr.cxx | 3
sw/source/uibase/inc/cfgitems.hxx | 1
sw/source/uibase/inc/optpage.hxx | 2
sw/uiconfig/swriter/ui/optformataidspage.ui | 517 +++++++------
10 files changed, 394 insertions(+), 220 deletions(-)
New commits:
commit c220d97e22001db116f6f8204922b25a9e61e26f
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Tue Dec 1 12:21:10 2020 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Wed Dec 9 08:50:45 2020 +0100
Resolves tdf#99646 - Make default type of anchoring optional
Option introduced at Tools > Options > Writer > Formatting Aids
Change-Id: I8d890f84107647821c39669114b991c301727788
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106970
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 069b68aac076..84125017318f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1087,6 +1087,31 @@
</info>
<value>false</value>
</prop>
+ <prop oor:name="DefaultAnchor" oor:type="xs:int" oor:nillable="false">
+ <!-- UIHints: Tools - Options - Writer - View - Default Anchor -->
+ <info>
+ <desc>Specifies the anchor of newly inserted images.</desc>
+ <label>Default Anchor</label>
+ </info>
+ <constraints>
+ <enumeration oor:value="0">
+ <info>
+ <desc>FLY_TO_PARA</desc>
+ </info>
+ </enumeration>
+ <enumeration oor:value="1">
+ <info>
+ <desc>FLY_TO_CHAR</desc>
+ </info>
+ </enumeration>
+ <enumeration oor:value="2">
+ <info>
+ <desc>FLY_AS_CHAR</desc>
+ </info>
+ </enumeration>
+ </constraints>
+ <value>1</value>
+ </prop>
</group>
<group oor:name="NonprintingCharacter">
<info>
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 21916ddb56bd..ebfab960d226 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -25,6 +25,7 @@
#include <tools/gen.hxx>
#include <tools/color.hxx>
+#include <svx/swframetypes.hxx>
#include <sfx2/zoomitem.hxx>
#include "swdllapi.h"
@@ -172,6 +173,7 @@ class SW_DLLPUBLIC SwViewOption
bool mbHideWhitespaceMode : 1; // Hide header, footer, and
pagebreak.
bool m_bShowPlaceHolderFields : 1; // Only used in printing!
mutable bool m_bIdle;
+ sal_Int32 m_nDefaultAnchor; // GetDefaultAnchorType() to convert
int to RndStdIds
// Scale
sal_uInt16 m_nZoom; // In percent.
@@ -663,6 +665,14 @@ public:
static void SetDocBoundaries(bool bSet)
{SetAppearanceFlag(ViewOptFlags::DocBoundaries, bSet);}
static void ApplyColorConfigValues(const svtools::ColorConfig&
rConfig);
+
+ // get/set default anchor (0..2); use GetDefaultAnchorType() to convert
into RndStdIds::FLY_*
+ sal_Int32 GetDefaultAnchor() const
+ { return m_nDefaultAnchor; }
+ void SetDefaultAnchor( const sal_Int32 aFlag )
+ { m_nDefaultAnchor = aFlag; }
+
+ RndStdIds GetDefaultAnchorType();
};
inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 69f873cdf2cd..5820f260886e 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1215,6 +1215,7 @@
SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, w
,
m_xDirectCursorFillMode(m_xBuilder->weld_combo_box("cxDirectCursorFillMode"))
, m_xCursorProtFrame(m_xBuilder->weld_frame("crsrprotframe"))
, m_xCursorInProtCB(m_xBuilder->weld_check_button("cursorinprot"))
+ , m_xDefaultAnchorType(m_xBuilder->weld_combo_box("cxDefaultAnchor"))
, m_xMathBaselineAlignmentCB(m_xBuilder->weld_check_button("mathbaseline"))
{
const SfxPoolItem* pItem = nullptr;
@@ -1305,6 +1306,7 @@ bool SwShdwCursorOptionsTabPage::FillItemSet( SfxItemSet*
rSet )
aDisp.m_bCharHiddenText = m_xCharHiddenCB->get_active();
aDisp.m_bBookmarks = m_xBookmarkCB->get_active();
aDisp.m_bManualBreak = m_xBreakCB->get_active();
+ aDisp.m_xDefaultAnchor = m_xDefaultAnchorType->get_active();
bRet |= (!pOldAttr || aDisp != *pOldAttr);
if(bRet)
@@ -1353,6 +1355,7 @@ void SwShdwCursorOptionsTabPage::Reset( const SfxItemSet*
rSet )
m_xCharHiddenCB->set_active( pDocDisplayAttr->m_bCharHiddenText );
m_xBookmarkCB->set_active(pDocDisplayAttr->m_bBookmarks);
m_xBreakCB->set_active( pDocDisplayAttr->m_bManualBreak );
+ m_xDefaultAnchorType->set_active( pDocDisplayAttr->m_xDefaultAnchor );
}
}
diff --git a/sw/source/uibase/config/cfgitems.cxx
b/sw/source/uibase/config/cfgitems.cxx
index fc163193547f..e7d1fc2a9a11 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -34,6 +34,7 @@ SwDocDisplayItem::SwDocDisplayItem() :
m_bCharHiddenText =
m_bBookmarks =
m_bManualBreak = true;
+ m_xDefaultAnchor = 1; //FLY_TO_CHAR
};
// Item for the Settings dialog, page document view
@@ -48,6 +49,7 @@ SwDocDisplayItem::SwDocDisplayItem(const SwViewOption& rVOpt
) :
m_bCharHiddenText = rVOpt.IsShowHiddenChar(true);
m_bBookmarks = rVOpt.IsShowBookmarks(true);
m_bManualBreak = rVOpt.IsLineBreak(true);
+ m_xDefaultAnchor = rVOpt.GetDefaultAnchor();
}
SwDocDisplayItem* SwDocDisplayItem::Clone( SfxItemPool* ) const
@@ -66,9 +68,10 @@ bool SwDocDisplayItem::operator==( const SfxPoolItem& rAttr
) const
m_bSpace == rItem.m_bSpace &&
m_bNonbreakingSpace == rItem.m_bNonbreakingSpace &&
m_bSoftHyphen == rItem.m_bSoftHyphen &&
- m_bCharHiddenText == rItem.m_bCharHiddenText &&
+ m_bCharHiddenText == rItem.m_bCharHiddenText &&
m_bBookmarks == rItem.m_bBookmarks &&
- m_bManualBreak == rItem.m_bManualBreak );
+ m_bManualBreak == rItem.m_bManualBreak &&
+ m_xDefaultAnchor == rItem.m_xDefaultAnchor);
}
void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt) const
@@ -81,6 +84,7 @@ void SwDocDisplayItem::FillViewOptions( SwViewOption& rVOpt)
const
rVOpt.SetShowHiddenChar(m_bCharHiddenText );
rVOpt.SetShowBookmarks(m_bBookmarks );
rVOpt.SetLineBreak (m_bManualBreak );
+ rVOpt.SetDefaultAnchor( m_xDefaultAnchor );
}
SwElemItem::SwElemItem() :
diff --git a/sw/source/uibase/config/usrpref.cxx
b/sw/source/uibase/config/usrpref.cxx
index 6a913b8c7b4f..e2d2336d76ac 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -76,6 +76,7 @@ SwMasterUsrPref::~SwMasterUsrPref()
}
const auto g_UpdateLinkIndex = 17;
+const auto g_DefaultAnchor = 24;
Sequence<OUString> SwContentViewConfig::GetPropertyNames() const
{
@@ -86,8 +87,8 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames()
const
"Display/DrawingControl", // 2
"Display/FieldCode", // 3
"Display/Note", // 4
- "Display/ShowContentTips", // 5
- "NonprintingCharacter/MetaCharacters", // 6
+ "Display/ShowContentTips", // 5
+ "NonprintingCharacter/MetaCharacters", // 6
"NonprintingCharacter/ParagraphEnd", // 7
"NonprintingCharacter/OptionalHyphen", // 8
"NonprintingCharacter/Space", // 9
@@ -104,7 +105,8 @@ Sequence<OUString> SwContentViewConfig::GetPropertyNames()
const
"Display/ShowInlineTooltips", // 20
"Display/UseHeaderFooterMenu", // 21
"Display/ShowOutlineContentVisibilityButton", // 22
- "Display/ShowChangesInMargin" // 23
+ "Display/ShowChangesInMargin", // 23
+ "Display/DefaultAnchor" // 24
};
#if defined(__GNUC__) && !defined(__clang__)
// clang 8.0.0 says strcmp isn't constexpr
@@ -174,8 +176,9 @@ void SwContentViewConfig::ImplCommit()
case 21: bVal = m_rParent.IsUseHeaderFooterMenu(); break;//
"Display/UseHeaderFooterMenu"
case 22: bVal = m_rParent.IsShowOutlineContentVisibilityButton();
break;// "Display/ShowOutlineContentVisibilityButton"
case 23: bVal = m_rParent.IsShowChangesInMargin(); break;//
"Display/ShowChangesInMargin"
+ case 24: pValues[nProp] <<= m_rParent.GetDefaultAnchor(); break;//
"Display/DefaultAnchor"
}
- if (nProp != g_UpdateLinkIndex)
+ if ((nProp != g_UpdateLinkIndex) && (nProp != g_DefaultAnchor))
pValues[nProp] <<= bVal;
}
PutProperties(aNames, aValues);
@@ -189,12 +192,12 @@ void SwContentViewConfig::Load()
OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties
failed");
if(aValues.getLength() != aNames.getLength())
return;
-
for(int nProp = 0; nProp < aNames.getLength(); nProp++)
{
if(pValues[nProp].hasValue())
{
- bool bSet = nProp != g_UpdateLinkIndex &&
*o3tl::doAccess<bool>(pValues[nProp]);
+ bool bSet = ((nProp != g_UpdateLinkIndex) && (nProp !=
g_DefaultAnchor))
+ && *o3tl::doAccess<bool>(pValues[nProp]);
switch(nProp)
{
case 0: m_rParent.SetGraphic(bSet); break;//
"Display/GraphicObject",
@@ -227,6 +230,13 @@ void SwContentViewConfig::Load()
case 21: m_rParent.SetUseHeaderFooterMenu(bSet); break;//
"Display/UseHeaderFooterMenu"
case 22:
m_rParent.SetShowOutlineContentVisibilityButton(bSet); break;//
"Display/ShowOutlineContententVisibilityButton"
case 23: m_rParent.SetShowChangesInMargin(bSet); break;//
"Display/ShowChangesInMargin"
+ case 24:
+ {
+ sal_Int32 nSet;
+ pValues[nProp] >>= nSet;
+ m_rParent.SetDefaultAnchor(nSet);
+ }
+ break; // "Display/DefaultAnchor"
}
}
}
diff --git a/sw/source/uibase/config/viewopt.cxx
b/sw/source/uibase/config/viewopt.cxx
index 07db7f778d77..3e534f1126d9 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -81,6 +81,7 @@ bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt )
const
&& mbHideWhitespaceMode == rOpt.mbHideWhitespaceMode
&& m_bShowPlaceHolderFields == rOpt.m_bShowPlaceHolderFields
&& m_bIdle == rOpt.m_bIdle
+ && m_nDefaultAnchor == rOpt.m_nDefaultAnchor
#ifdef DBG_UTIL
// correspond to the statements in ui/config/cfgvw.src
&& m_bTest1 == rOpt.IsTest1()
@@ -215,6 +216,8 @@ SwViewOption::SwViewOption() :
m_bIdle = true;
+ m_nDefaultAnchor = 1; //FLY_TO_CHAR
+
#ifdef DBG_UTIL
// correspond to the statements in ui/config/cfgvw.src
m_bTest1 = m_bTest2 = m_bTest3 = m_bTest4 =
@@ -253,6 +256,7 @@ SwViewOption::SwViewOption(const SwViewOption& rVOpt)
mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode;
m_bShowPlaceHolderFields = rVOpt.m_bShowPlaceHolderFields;
m_bIdle = rVOpt.m_bIdle;
+ m_nDefaultAnchor = rVOpt.m_nDefaultAnchor;
#ifdef DBG_UTIL
m_bTest1 = rVOpt.m_bTest1;
@@ -294,6 +298,7 @@ SwViewOption& SwViewOption::operator=( const SwViewOption
&rVOpt )
mbHideWhitespaceMode = rVOpt.mbHideWhitespaceMode;
m_bShowPlaceHolderFields = rVOpt.m_bShowPlaceHolderFields;
m_bIdle = rVOpt.m_bIdle;
+ m_nDefaultAnchor = rVOpt.m_nDefaultAnchor;
#ifdef DBG_UTIL
m_bTest1 = rVOpt.m_bTest1;
@@ -365,6 +370,24 @@ sal_uInt16 GetHtmlMode(const SwDocShell* pShell)
return nRet;
}
+RndStdIds SwViewOption::GetDefaultAnchorType()
+{
+ switch ( m_nDefaultAnchor )
+ {
+ case 0:
+ return RndStdIds::FLY_AT_PARA; //0
+ break;
+ case 1:
+ return RndStdIds::FLY_AT_CHAR; //4
+ break;
+ case 2:
+ return RndStdIds::FLY_AS_CHAR; //1
+ break;
+ default:
+ return RndStdIds::FLY_AT_CHAR; //4
+ }//switch
+}
+
Color& SwViewOption::GetDocColor()
{
return s_aDocColor;
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx
b/sw/source/uibase/frmdlg/frmmgr.cxx
index 35abd6baa560..3428c075c9c2 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -90,7 +90,8 @@ SwFlyFrameAttrMgr::SwFlyFrameAttrMgr( bool bNew, SwWrtShell*
pSh, Frmmgr_Type nT
if (!pName || *pName != SvGlobalName( SO3_SM_CLASSID ))
{
// Default anchor for new graphics and objects is at-char,
except for Math objects.
- m_aSet.Put(SwFormatAnchor(RndStdIds::FLY_AT_CHAR));
+ SwViewOption aViewOpt(*pSh->GetViewOptions());
+
m_aSet.Put(SwFormatAnchor(aViewOpt.GetDefaultAnchorType()));//RndStdIds::FLY_AT_CHAR
}
}
}
diff --git a/sw/source/uibase/inc/cfgitems.hxx
b/sw/source/uibase/inc/cfgitems.hxx
index 271fdf2a4715..a647c01f0925 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -51,6 +51,7 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem
bool m_bCharHiddenText :1;
bool m_bBookmarks :1;
bool m_bManualBreak :1;
+ sal_Int32 m_xDefaultAnchor;
public:
SwDocDisplayItem();
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 2889f5ea6ebf..2a35c1d843a8 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -241,6 +241,8 @@ class SwShdwCursorOptionsTabPage : public SfxTabPage
std::unique_ptr<weld::Frame> m_xCursorProtFrame;
std::unique_ptr<weld::CheckButton> m_xCursorInProtCB;
+ std::unique_ptr<weld::ComboBox> m_xDefaultAnchorType;
+
std::unique_ptr<weld::CheckButton> m_xMathBaselineAlignmentCB;
public:
diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui
b/sw/uiconfig/swriter/ui/optformataidspage.ui
index e074a1edb18f..66ac14988f87 100644
--- a/sw/uiconfig/swriter/ui/optformataidspage.ui
+++ b/sw/uiconfig/swriter/ui/optformataidspage.ui
@@ -1,47 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="OptFormatAidsPage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">6</property>
<property name="orientation">vertical</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=2 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">24</property>
+ <property name="can-focus">False</property>
+ <property name="row-spacing">12</property>
+ <property name="column-spacing">24</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>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="can-focus">False</property>
+ <property name="top-padding">6</property>
+ <property name="left-padding">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=8 -->
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="can-focus">False</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkCheckButton" id="paragraph">
<property name="label" translatable="yes"
context="optformataidspage|paragraph">Pa_ragraph end</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="paragraph-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|paragraph">Specifies whether paragraph
delimiters are displayed. The paragraph delimiters also contain paragraph
format information.</property>
@@ -49,19 +49,19 @@
</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="GtkCheckButton" id="hyphens">
<property name="label" translatable="yes"
context="optformataidspage|hyphens">Soft h_yphens</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="hyphens-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|hyphens">Specifies whether soft
hyphens (called also as optional or discretionary hyphens) are displayed. These
are hidden user-defined delimiters that you enter within a word by pressing
Ctrl+Hyphen(-). Words with soft hyphens are only separated at the end of a line
at the point where a soft hyphen has been inserted, irrespective of whether the
automatic hyphenation is activated or deactivated.</property>
@@ -69,19 +69,19 @@
</child>
</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="GtkCheckButton" id="spaces">
<property name="label" translatable="yes"
context="optformataidspage|spaces">Spac_es</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="spaces-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|spaces">Specifies whether to represent
every space in the text with a dot.</property>
@@ -89,19 +89,19 @@
</child>
</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="GtkCheckButton" id="nonbreak">
<property name="label" translatable="yes"
context="optformataidspage|nonbreak">Non-breaking s_paces</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="nonbreak-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|nonbreak">Specifies that non-breaking
spaces are shown as gray boxes. Non-breaking spaces are not broken at the end
of a line and are entered with the Ctrl+Shift+Spacebar shortcut keys.</property>
@@ -109,19 +109,19 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="tabs">
<property name="label" translatable="yes"
context="optformataidspage|tabs">Tabs</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="tabs-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|tabs">Specifies that tab stops are
displayed as small arrows.</property>
@@ -129,19 +129,19 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="break">
<property name="label" translatable="yes"
context="optformataidspage|break">Brea_ks</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="break-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|break">Displays all line breaks
inserted with the Shift+Enter shortcut. These breaks create a new line, but do
not start a new paragraph.</property>
@@ -149,19 +149,19 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="hiddentext">
<property name="label" translatable="yes"
context="optformataidspage|hiddentext">Hidden characters</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="hiddentext-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|hiddentext">Displays text that uses
the character format "hidden", when View - Formatting Marks is
enabled.</property>
@@ -169,91 +169,91 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="bookmarks">
<property name="label" translatable="yes"
context="optformataidspage|bookmarks">Bookmarks</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label">¶</property>
</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">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label">-</property>
</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="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label">·</property>
</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="GtkLabel" id="tabs_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label">→</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label">↵</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="bookmarks_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes"
context="optformataidspage|bookmarks_label|tooltip_text">| indicates a point
bookmark
+ <property name="can-focus">False</property>
+ <property name="tooltip-text" translatable="yes"
context="optformataidspage|bookmarks_label|tooltip_text">| indicates a point
bookmark
[ ] indicate the start and end of a bookmark on a text range</property>
<property name="label">| [ ]</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">7</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">7</property>
</packing>
</child>
<child>
@@ -269,7 +269,7 @@
<child type="label">
<object class="GtkLabel" id="displayfl">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="optformataidspage|displayfl">Display Formatting</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -278,41 +278,41 @@
</child>
</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="GtkFrame" id="frame4">
<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>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="can-focus">False</property>
+ <property name="top-padding">6</property>
+ <property name="left-padding">12</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="grid5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="can-focus">False</property>
+ <property name="row-spacing">6</property>
<child>
<object class="GtkCheckButton" id="mathbaseline">
<property name="label" translatable="yes"
context="optformataidspage|mathbaseline">Math baseline alignment</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
</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>
@@ -322,7 +322,7 @@
<child type="label">
<object class="GtkLabel" id="layoutopt">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="optformataidspage|layoutopt">Layout Assistance</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -331,176 +331,259 @@
</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="GtkFrame" id="directcrsrframe">
+ <object class="GtkFrame" id="crsrprotframe">
<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="valign">start</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="can-focus">False</property>
+ <property name="top-padding">6</property>
+ <property name="left-padding">12</property>
<child>
<!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid3">
+ <object class="GtkGrid" id="grid6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="can-focus">False</property>
+ <property name="row-spacing">6</property>
<child>
- <object class="GtkCheckButton" id="cursoronoff">
- <property name="label" translatable="yes"
context="optformataidspage|cursoronoff">_Direct cursor</property>
+ <object class="GtkCheckButton" id="cursorinprot">
+ <property name="label" translatable="yes"
context="optformataidspage|cursorinprot">Enable cursor</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="cursoronoff-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|cursoronoff">Activates the direct
cursor.</property>
+ <object class="AtkObject"
id="cursorinprot-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|cursorinprot">Specifies that you can
set the cursor in a protected area, but cannot make any changes.</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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="cursoropt">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="optformataidspage|cursoropt">Protected Areas</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkFrame" id="directcrsrframe">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="top-padding">6</property>
+ <property name="left-padding">12</property>
<child>
- <object class="GtkBox" id="bxFillMode">
+ <!-- n-columns=1 n-rows=2 -->
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">18</property>
- <property name="spacing">6</property>
+ <property name="can-focus">False</property>
+ <property name="row-spacing">6</property>
<child>
- <object class="GtkLabel" id="fillmode">
+ <object class="GtkCheckButton" id="cursoronoff">
+ <property name="label" translatable="yes"
context="optformataidspage|cursoronoff">_Direct cursor</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="optformataidspage|fillmode">Insert:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">cxDirectCursorFillMode</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
<property name="xalign">0</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject"
id="cursoronoff-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="extended_tip|cursoronoff">Activates the direct cursor.</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText"
id="cxDirectCursorFillMode">
+ <object class="GtkBox" id="bxFillMode">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="active_id">2</property>
- <items>
- <item id="0" translatable="yes"
context="optformataidspage|filltab">Tabs</item>
- <item id="1" translatable="yes"
context="optformataidspage|filltabandspace">Tabs and spaces</item>
- <item id="2" translatable="yes"
context="optformataidspage|fillspace">Spaces</item>
- <item id="3" translatable="yes"
context="optformataidspage|fillindent">Left paragraph margin</item>
- <item id="4" translatable="yes"
context="optformataidspage|fillmargin">Paragraph alignment</item>
- </items>
+ <property name="can-focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="fillmode">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="optformataidspage|fillmode">Insert:</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">cxDirectCursorFillMode</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText"
id="cxDirectCursorFillMode">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="active-id">2</property>
+ <items>
+ <item id="0" translatable="yes"
context="optformataidspage|filltab">Tabs</item>
+ <item id="1" translatable="yes"
context="optformataidspage|filltabandspace">Tabs and spaces</item>
+ <item id="2" translatable="yes"
context="optformataidspage|fillspace">Spaces</item>
+ <item id="3" translatable="yes"
context="optformataidspage|fillindent">Left paragraph margin</item>
+ <item id="4" translatable="yes"
context="optformataidspage|fillmargin">Paragraph alignment</item>
+ </items>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
</child>
+ <child type="label">
+ <object class="GtkLabel" id="cursorlabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="optformataidspage|cursorlabel">Direct Cursor</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="cursorlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="optformataidspage|cursorlabel">Direct Cursor</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="crsrprotframe">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkFrame" id="frmImage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="can-focus">False</property>
+ <property name="valign">start</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid6">
+ <object class="GtkAlignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="can-focus">False</property>
+ <property name="top-padding">6</property>
+ <property name="left-padding">12</property>
<child>
- <object class="GtkCheckButton" id="cursorinprot">
- <property name="label" translatable="yes"
context="optformataidspage|cursorinprot">Enable cursor</property>
+ <object class="GtkBox">
<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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="cursorinprot-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|cursorinprot">Specifies that you can
set the cursor in a protected area, but cannot make any changes.</property>
+ <property name="can-focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="lbDefaultAnchor">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="optformataidspage|anchor">_Anchor:</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">cxDefaultAnchor</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="cxDefaultAnchor">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="active-id">1</property>
+ <items>
+ <item id="0" translatable="yes"
context="optformataidspage|cxDefaultAnchor1">To Paragraph</item>
+ <item id="1" translatable="yes"
context="optformataidspage|cxDefaultAnchor2">To Character</item>
+ <item id="2" translatable="yes"
context="optformataidspage|cxDefaultAnchor3">As Character</item>
+ </items>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
</object>
</child>
+ <child type="label">
+ <object class="GtkLabel" id="lbImage">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="optformataidspage|lbImage">Image</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="cursoropt">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="optformataidspage|cursoropt">Protected Areas</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</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">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@@ -510,4 +593,16 @@
</object>
</child>
</object>
+ <object class="GtkSizeGroup" id="sgInsertAnchorBox">
+ <widgets>
+ <widget name="cxDirectCursorFillMode"/>
+ <widget name="cxDefaultAnchor"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sgInsertAnchorLabel">
+ <widgets>
+ <widget name="fillmode"/>
+ <widget name="lbDefaultAnchor"/>
+ </widgets>
+ </object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
