officecfg/registry/schema/org/openoffice/Office/Math.xcs | 6 starmath/inc/cfgitem.hxx | 2 starmath/inc/dialog.hxx | 1 starmath/inc/starmath.hrc | 1 starmath/source/cfgitem.cxx | 35 +++ starmath/source/dialog.cxx | 3 starmath/source/document.cxx | 3 starmath/source/smmod.cxx | 3 starmath/source/unomodel.cxx | 3 starmath/source/view.cxx | 2 starmath/uiconfig/smath/ui/smathsettings.ui | 159 ++++++++------- 11 files changed, 142 insertions(+), 76 deletions(-)
New commits: commit 2d47c824cd31294899fa24989b3d7bd4f98dcdee Author: Khaled Hosny <kha...@libreoffice.org> AuthorDate: Sun Sep 3 18:46:37 2023 +0300 Commit: خالد حسني <kha...@libreoffice.org> CommitDate: Sun Sep 3 23:25:59 2023 +0200 starmath: Graduate inline (visual) editing from experimental features It has been experimental for as long as LibreOffice existed, lets make it non-experimental but add an option to disable it. If it turns to be a disaster, we can flip the option and disable it by default. Change-Id: I63672c054d1ead269863079e7f9c118a44b3ba19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156486 Tested-by: Jenkins Reviewed-by: خالد حسني <kha...@libreoffice.org> diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs index c4466e0da278..7c052633bad0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs @@ -297,6 +297,12 @@ <info> <desc>Contains miscellaneous settings.</desc> </info> + <prop oor:name="InlineEditEnable" oor:type="xs:boolean" oor:nillable="false"> + <info> + <desc>Enables inline (visual) editing mode.</desc> + </info> + <value>true</value> + </prop> <prop oor:name="IgnoreSpacesRight" oor:type="xs:boolean" oor:nillable="false"> <info> <desc>Ignores spacing symbols at the end of a line.</desc> diff --git a/starmath/inc/cfgitem.hxx b/starmath/inc/cfgitem.hxx index c81e9d086aed..1dfbd3ef9dd4 100644 --- a/starmath/inc/cfgitem.hxx +++ b/starmath/inc/cfgitem.hxx @@ -186,6 +186,8 @@ public: void SetSaveOnlyUsedSymbols(bool bVal); bool IsAutoCloseBrackets() const; void SetAutoCloseBrackets(bool bVal); + bool IsInlineEditEnable() const; + void SetInlineEditEnable(bool bVal); bool IsIgnoreSpacesRight() const; void SetIgnoreSpacesRight(bool bVal); bool IsAutoRedraw() const; diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index ad283920a0d7..bed55f9ddabf 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -46,6 +46,7 @@ class SmPrintOptionsTabPage final : public SfxTabPage std::unique_ptr<weld::RadioButton> m_xSizeScaled; std::unique_ptr<weld::RadioButton> m_xSizeZoomed; std::unique_ptr<weld::MetricSpinButton> m_xZoom; + std::unique_ptr<weld::CheckButton> m_xEnableInlineEdit; std::unique_ptr<weld::CheckButton> m_xNoRightSpaces; std::unique_ptr<weld::CheckButton> m_xSaveOnlyUsedSymbols; std::unique_ptr<weld::CheckButton> m_xAutoCloseBrackets; diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 378aca8bc838..1127e6660cbd 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -73,5 +73,6 @@ class SfxUInt16Item; #define SID_AUTO_CLOSE_BRACKETS TypedWhichId<SfxBoolItem>(SID_SMA_START + 127) #define SID_SMEDITWINDOWZOOM TypedWhichId<SfxUInt16Item>(SID_SMA_START + 129) #define SID_DEFAULT_SM_SYNTAX_VERSION TypedWhichId<SfxUInt16Item>(SID_SMA_START + 130) +#define SID_INLINE_EDIT_ENABLE TypedWhichId<SfxBoolItem>(SID_SMA_START + 131) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 3bf170c0afe4..2146c366cd1e 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -73,6 +73,7 @@ static Sequence<OUString> lcl_GetOtherPropertyNames() "Misc/AutoCloseBrackets", "Misc/DefaultSmSyntaxVersion", "Misc/IgnoreSpacesRight", + "Misc/InlineEditEnable", "Misc/SmEditWindowZoomFactor", "Print/FormulaText", "Print/Frame", @@ -144,6 +145,7 @@ struct SmCfgOther bool bPrintFrame; bool bIsSaveOnlyUsedSymbols; bool bIsAutoCloseBrackets; + bool bInlineEditEnable; bool bIgnoreSpacesRight; bool bToolboxVisible; bool bAutoRedraw; @@ -165,6 +167,7 @@ SmCfgOther::SmCfgOther() , bPrintFrame(true) , bIsSaveOnlyUsedSymbols(true) , bIsAutoCloseBrackets(true) + , bInlineEditEnable(true) , bIgnoreSpacesRight(true) , bToolboxVisible(true) , bAutoRedraw(true) @@ -793,6 +796,10 @@ void SmMathConfig::LoadOther() if (sal_Int16 nTmp; pVal->hasValue() && (*pVal >>= nTmp)) pOther->nSmSyntaxVersion = nTmp; ++pVal; + // Misc/InlineEditEnable + if (bool bTmp; pVal->hasValue() && (*pVal >>= bTmp)) + pOther->bInlineEditEnable = bTmp; + ++pVal; // Misc/IgnoreSpacesRight if (bool bTmp; pVal->hasValue() && (*pVal >>= bTmp)) pOther->bIgnoreSpacesRight = bTmp; @@ -856,6 +863,8 @@ void SmMathConfig::SaveOther() *pVal++ <<= pOther->bIsAutoCloseBrackets; // Misc/DefaultSmSyntaxVersion *pVal++ <<= pOther->nSmSyntaxVersion; + // Misc/InlineEditEnable + *pVal++ <<= pOther->bInlineEditEnable; // Misc/IgnoreSpacesRight *pVal++ <<= pOther->bIgnoreSpacesRight; // Misc/SmEditWindowZoomFactor @@ -1293,6 +1302,27 @@ void SmMathConfig::SetDefaultSmSyntaxVersion( sal_uInt16 nVal ) } } +bool SmMathConfig::IsInlineEditEnable() const +{ + if (utl::ConfigManager::IsFuzzing()) + return false; + if (!pOther) + const_cast<SmMathConfig*>(this)->LoadOther(); + return pOther->bInlineEditEnable; +} + + +void SmMathConfig::SetInlineEditEnable( bool bVal ) +{ + if (!pOther) + LoadOther(); + if (SetOtherIfNotEqual( pOther->bInlineEditEnable, bVal )) + { + // reformat (displayed) formulas accordingly + Broadcast(SfxHint(SfxHintId::MathFormatChanged)); + } +} + bool SmMathConfig::IsIgnoreSpacesRight() const { if (utl::ConfigManager::IsFuzzing()) @@ -1389,6 +1419,10 @@ void SmMathConfig::ItemSetToConfig(const SfxItemSet &rSet) { bVal = pRedrawItem->GetValue(); SetAutoRedraw( bVal ); } + if (const SfxBoolItem* pSpacesItem = rSet.GetItemIfSet(SID_INLINE_EDIT_ENABLE)) + { bVal = pSpacesItem->GetValue(); + SetInlineEditEnable( bVal ); + } if (const SfxBoolItem* pSpacesItem = rSet.GetItemIfSet(SID_NO_RIGHT_SPACES)) { bVal = pSpacesItem->GetValue(); SetIgnoreSpacesRight( bVal ); @@ -1425,6 +1459,7 @@ void SmMathConfig::ConfigToItemSet(SfxItemSet &rSet) const rSet.Put(SfxBoolItem(SID_PRINTTEXT, IsPrintFormulaText())); rSet.Put(SfxBoolItem(SID_PRINTFRAME, IsPrintFrame())); rSet.Put(SfxBoolItem(SID_AUTOREDRAW, IsAutoRedraw())); + rSet.Put(SfxBoolItem(SID_INLINE_EDIT_ENABLE, IsInlineEditEnable())); rSet.Put(SfxBoolItem(SID_NO_RIGHT_SPACES, IsIgnoreSpacesRight())); rSet.Put(SfxBoolItem(SID_SAVE_ONLY_USED_SYMBOLS, IsSaveOnlyUsedSymbols())); rSet.Put(SfxBoolItem(SID_AUTO_CLOSE_BRACKETS, IsAutoCloseBrackets())); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index a377e59a27b1..8625072c90e8 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -167,6 +167,7 @@ SmPrintOptionsTabPage::SmPrintOptionsTabPage(weld::Container* pPage, weld::Dialo , m_xSizeScaled(m_xBuilder->weld_radio_button("sizescaled")) , m_xSizeZoomed(m_xBuilder->weld_radio_button("sizezoomed")) , m_xZoom(m_xBuilder->weld_metric_spin_button("zoom", FieldUnit::PERCENT)) + , m_xEnableInlineEdit(m_xBuilder->weld_check_button("enableinlineedit")) , m_xNoRightSpaces(m_xBuilder->weld_check_button("norightspaces")) , m_xSaveOnlyUsedSymbols(m_xBuilder->weld_check_button("saveonlyusedsymbols")) , m_xAutoCloseBrackets(m_xBuilder->weld_check_button("autoclosebrackets")) @@ -223,6 +224,7 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet) rSet->Put(SfxBoolItem(SID_PRINTTITLE, m_xTitle->get_active())); rSet->Put(SfxBoolItem(SID_PRINTTEXT, m_xText->get_active())); rSet->Put(SfxBoolItem(SID_PRINTFRAME, m_xFrame->get_active())); + rSet->Put(SfxBoolItem(SID_INLINE_EDIT_ENABLE, m_xEnableInlineEdit->get_active())); rSet->Put(SfxBoolItem(SID_NO_RIGHT_SPACES, m_xNoRightSpaces->get_active())); rSet->Put(SfxBoolItem(SID_SAVE_ONLY_USED_SYMBOLS, m_xSaveOnlyUsedSymbols->get_active())); rSet->Put(SfxBoolItem(SID_AUTO_CLOSE_BRACKETS, m_xAutoCloseBrackets->get_active())); @@ -251,6 +253,7 @@ void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet) m_xSmZoom->set_value(rSet->Get(SID_SMEDITWINDOWZOOM).GetValue(), FieldUnit::PERCENT); m_xTitle->set_active(rSet->Get(SID_PRINTTITLE).GetValue()); + m_xEnableInlineEdit->set_active(rSet->Get(SID_INLINE_EDIT_ENABLE).GetValue()); m_xNoRightSpaces->set_active(rSet->Get(SID_NO_RIGHT_SPACES).GetValue()); m_xSaveOnlyUsedSymbols->set_active(rSet->Get(SID_SAVE_ONLY_USED_SYMBOLS).GetValue()); m_xAutoCloseBrackets->set_active(rSet->Get(SID_AUTO_CLOSE_BRACKETS).GetValue()); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index cafd291fe14e..5c09cf40d3c0 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -476,7 +476,8 @@ Printer* SmDocShell::GetPrt() auto pOptions = std::make_unique<SfxItemSetFixed< SID_PRINTTITLE, SID_PRINTZOOM, SID_NO_RIGHT_SPACES, SID_SAVE_ONLY_USED_SYMBOLS, - SID_AUTO_CLOSE_BRACKETS, SID_SMEDITWINDOWZOOM>>(GetPool()); + SID_AUTO_CLOSE_BRACKETS, SID_SMEDITWINDOWZOOM, + SID_INLINE_EDIT_ENABLE, SID_INLINE_EDIT_ENABLE>>(GetPool()); SmModule *pp = SM_MOD(); pp->GetConfig()->ConfigToItemSet(*pOptions); mpPrinter = VclPtr<SfxPrinter>::Create(std::move(pOptions)); diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 934e6090eaf1..5e8886ebdc3c 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -211,7 +211,8 @@ std::optional<SfxItemSet> SmModule::CreateItemSet( sal_uInt16 nId ) svl::Items< //TP_SMPRINT SID_PRINTTITLE, SID_PRINTZOOM, SID_NO_RIGHT_SPACES, SID_SAVE_ONLY_USED_SYMBOLS, - SID_AUTO_CLOSE_BRACKETS, SID_SMEDITWINDOWZOOM>); + SID_AUTO_CLOSE_BRACKETS, SID_SMEDITWINDOWZOOM, + SID_INLINE_EDIT_ENABLE, SID_INLINE_EDIT_ENABLE>); GetConfig()->ConfigToItemSet(*pRet); } diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index a75dfe68799c..c3a5bc1ff02d 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -600,7 +600,8 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* SID_PRINTZOOM, SID_PRINTZOOM, SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES, SID_SAVE_ONLY_USED_SYMBOLS, SID_SAVE_ONLY_USED_SYMBOLS, - SID_AUTO_CLOSE_BRACKETS, SID_SMEDITWINDOWZOOM>> ( SmDocShell::GetPool() ); + SID_AUTO_CLOSE_BRACKETS, SID_SMEDITWINDOWZOOM, + SID_INLINE_EDIT_ENABLE, SID_INLINE_EDIT_ENABLE>> ( SmDocShell::GetPool() ); SmModule *pp = SM_MOD(); pp->GetConfig()->ConfigToItemSet(*pItemSet); VclPtr<SfxPrinter> pPrinter = SfxPrinter::Create ( aStream, std::move(pItemSet) ); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 1a1a236deca5..3e1e4909ea1d 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -2334,7 +2334,7 @@ void SmViewShell::Notify( SfxBroadcaster& , const SfxHint& rHint ) bool SmViewShell::IsInlineEditEnabled() { return comphelper::LibreOfficeKit::isActive() - || officecfg::Office::Common::Misc::ExperimentalMode::get(); + || SM_MOD()->GetConfig()->IsInlineEditEnable(); } void SmViewShell::StartMainHelp() diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui b/starmath/uiconfig/smath/ui/smathsettings.ui index d3908d751450..ae9adb655e93 100644 --- a/starmath/uiconfig/smath/ui/smathsettings.ui +++ b/starmath/uiconfig/smath/ui/smathsettings.ui @@ -252,6 +252,21 @@ <property name="margin-top">6</property> <property name="orientation">vertical</property> <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="enableinlineedit"> + <property name="label" translatable="yes" context="smathsettings|enableinlineedit">Enable visual editing</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkCheckButton" id="norightspaces"> <property name="label" translatable="yes" context="smathsettings|norightspaces">Ig_nore ~~ and ' at the end of the line</property> @@ -269,7 +284,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -289,7 +304,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -304,7 +319,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> commit 0fd5465b80063fcfc9d1230bc88627d2f69f9b51 Author: Khaled Hosny <kha...@libreoffice.org> AuthorDate: Sun Sep 3 17:23:49 2023 +0300 Commit: خالد حسني <kha...@libreoffice.org> CommitDate: Sun Sep 3 23:25:49 2023 +0200 starmath: Re-save smathsettings.ui with newer glade Change-Id: I2a2802eafa0d77e1a35131dbe7bd9ca003aa3c03 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156485 Tested-by: Jenkins Reviewed-by: خالد حسني <kha...@libreoffice.org> diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui b/starmath/uiconfig/smath/ui/smathsettings.ui index 1c47c872f32f..d3908d751450 100644 --- a/starmath/uiconfig/smath/ui/smathsettings.ui +++ b/starmath/uiconfig/smath/ui/smathsettings.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sm"> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">10</property> <property name="upper">400</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="adjustment2"> <property name="lower">10</property> @@ -16,34 +16,34 @@ </object> <object class="GtkBox" id="SmathSettings"> <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="contents"> <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="GtkBox" id="box2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="title"> <property name="label" translatable="yes" context="smathsettings|title">_Title row</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> <child internal-child="accessible"> <object class="AtkObject" id="title-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|title">Specifies whether you want the name of the document to be included in the printout.</property> @@ -60,10 +60,10 @@ <object class="GtkCheckButton" id="text"> <property name="label" translatable="yes" context="smathsettings|text">_Formula text</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> <child internal-child="accessible"> <object class="AtkObject" id="text-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|text">Specifies whether to include the contents of the Commands window at the bottom of the printout.</property> @@ -80,10 +80,10 @@ <object class="GtkCheckButton" id="frame"> <property name="label" translatable="yes" context="smathsettings|frame">B_order</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> <child internal-child="accessible"> <object class="AtkObject" id="frame-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|frame">Applies a thin border to the formula area in the printout.</property> @@ -101,7 +101,7 @@ <child type="label"> <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="smathsettings|label4">Print Options</property> <attributes> <attribute name="weight" value="bold"/> @@ -118,27 +118,27 @@ <child> <object class="GtkFrame" id="size"> <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="GtkBox" id="box1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <property name="homogeneous">True</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> <child> <object class="GtkRadioButton" id="sizenormal"> <property name="label" translatable="yes" context="smathsettings|sizenormal">O_riginal size</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="sizenormal-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|sizenormal">Prints the formula without adjusting the current font size.</property> @@ -155,10 +155,10 @@ <object class="GtkRadioButton" id="sizescaled"> <property name="label" translatable="yes" context="smathsettings|sizescaled">Fit to _page</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">sizenormal</property> <child internal-child="accessible"> <object class="AtkObject" id="sizescaled-atkobject"> @@ -175,16 +175,16 @@ <child> <object class="GtkBox" id="box3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <child> <object class="GtkRadioButton" id="sizezoomed"> <property name="label" translatable="yes" context="smathsettings|sizezoomed">_Scaling:</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">sizenormal</property> </object> <packing> @@ -196,10 +196,10 @@ <child> <object class="GtkSpinButton" id="zoom"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="adjustment">adjustment1</property> <child internal-child="accessible"> <object class="AtkObject" id="zoom-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|zoom">Reduces or enlarges the size of the printed formula by a specified enlargement factor.</property> @@ -224,7 +224,7 @@ <child type="label"> <object class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="smathsettings|label5">Print Format</property> <attributes> <attribute name="weight" value="bold"/> @@ -241,25 +241,25 @@ <child> <object class="GtkFrame" id="contents1"> <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="GtkBox" id="box4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="norightspaces"> <property name="label" translatable="yes" context="smathsettings|norightspaces">Ig_nore ~~ and ' at the end of the line</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> <child internal-child="accessible"> <object class="AtkObject" id="norightspaces-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|norightspaces">Specifies that these space wildcards will be removed if they are at the end of a line.</property> @@ -276,10 +276,10 @@ <object class="GtkCheckButton" id="saveonlyusedsymbols"> <property name="label" translatable="yes" context="smathsettings|saveonlyusedsymbols">Embed only used symbols (smaller file size)</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> <child internal-child="accessible"> <object class="AtkObject" id="saveonlyusedsymbols-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|saveonlyusedsymbols">Saves only those symbols with each formula that are used in that formula.</property> @@ -296,10 +296,10 @@ <object class="GtkCheckButton" id="autoclosebrackets"> <property name="label" translatable="yes" context="smathsettings|autoclosebrackets">Auto close brackets, parentheses and braces</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> </object> <packing> <property name="expand">False</property> @@ -316,9 +316,9 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="mnemonic-widget">smzoom</property> - <property name="use-underline">True</property> <property name="label" translatable="yes" context="smathsettings|smzoom">Scaling code input window:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">smzoom</property> </object> <packing> <property name="expand">False</property> @@ -330,11 +330,11 @@ <object class="GtkSpinButton" id="smzoom"> <property name="visible">True</property> <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes" context="extended_tip|smzoom">Reduces or enlarges the size of the formula code by a specified enlargement factor.</property> <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <property name="adjustment">adjustment2</property> <property name="value">100</property> - <property name="tooltip-text" translatable="yes" context="extended_tip|smzoom">Reduces or enlarges the size of the formula code by a specified enlargement factor.</property> <child internal-child="accessible"> <object class="AtkObject" id="smzoom-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|smzoom">Reduces or enlarges the size of the formula code by a specified enlargement factor.</property> @@ -359,7 +359,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="smathsettings|label1">Miscellaneous Options</property> <attributes> <attribute name="weight" value="bold"/>