include/comphelper/configuration.hxx | 7 sw/source/ui/config/optload.cxx | 54 +++ sw/source/uibase/inc/optload.hxx | 11 sw/uiconfig/swriter/ui/optgeneralpage.ui | 497 +++++++++++++++++++------------ 4 files changed, 387 insertions(+), 182 deletions(-)
New commits: commit 0012f23ca0b59edbb38da055d3388b465146f7eb Author: Balazs Varga <[email protected]> AuthorDate: Thu Nov 9 20:52:42 2023 +0100 Commit: Balazs Varga <[email protected]> CommitDate: Fri Nov 10 08:08:01 2023 +0100 tdf#158007 - UI: Part 23 - Unify lockdown behavior of Options dialog for Writer - General Page. Change-Id: I2c679ee7f8e2d282a9f9ff19fc1743cb9bb6dbe1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159250 Tested-by: Jenkins Reviewed-by: Balazs Varga <[email protected]> diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx index 45228b700944..652e9afaa640 100644 --- a/include/comphelper/configuration.hxx +++ b/include/comphelper/configuration.hxx @@ -246,6 +246,13 @@ private: /// to access each given localized configuration property. template< typename T, typename U > struct ConfigurationLocalizedProperty { + /// Get the read-only status of the given (localized) configuration + /// property. + static bool isReadOnly() + { + return detail::ConfigurationWrapper::get().isReadOnly(T::path()); + } + /// Get the value of the given localized configuration property, for the /// locale currently set at the /// com.sun.star.configuration.theDefaultProvider. diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 92e754113aff..675a2d48e8d6 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -83,16 +83,27 @@ SwLoadOptPage::SwLoadOptPage(weld::Container* pPage, weld::DialogController* pCo , m_xAlwaysRB(m_xBuilder->weld_radio_button("always")) , m_xRequestRB(m_xBuilder->weld_radio_button("onrequest")) , m_xNeverRB(m_xBuilder->weld_radio_button("never")) + , m_xGridupdatelink(m_xBuilder->weld_widget("gridupdatelink")) + , m_xUpdateLinkImg(m_xBuilder->weld_widget("lockupdatelink")) , m_xAutoUpdateFields(m_xBuilder->weld_check_button("updatefields")) + , m_xAutoUpdateFieldsImg(m_xBuilder->weld_widget("lockupdatefields")) , m_xAutoUpdateCharts(m_xBuilder->weld_check_button("updatecharts")) + , m_xAutoUpdateChartsImg(m_xBuilder->weld_widget("lockupdatecharts")) , m_xMetricLB(m_xBuilder->weld_combo_box("metric")) + , m_xMetricImg(m_xBuilder->weld_widget("lockmetric")) , m_xTabFT(m_xBuilder->weld_label("tablabel")) , m_xTabMF(m_xBuilder->weld_metric_spin_button("tab", FieldUnit::CM)) + , m_xTabImg(m_xBuilder->weld_widget("locktab")) , m_xUseSquaredPageMode(m_xBuilder->weld_check_button("squaremode")) + , m_xUseSquaredPageModeImg(m_xBuilder->weld_widget("locksquaremode")) , m_xUseCharUnit(m_xBuilder->weld_check_button("usecharunit")) + , m_xUseCharUnitImg(m_xBuilder->weld_widget("lockusecharunit")) , m_xWordCountED(m_xBuilder->weld_entry("wordcount")) + , m_xWordCountImg(m_xBuilder->weld_widget("lockwordcount")) , m_xShowStandardizedPageCount(m_xBuilder->weld_check_button("standardizedpageshow")) + , m_xShowStandardizedPageCountImg(m_xBuilder->weld_widget("lockstandardizedpageshow")) , m_xStandardizedPageSizeNF(m_xBuilder->weld_spin_button("standardpagesize")) + , m_xStandardizedPageSizeImg(m_xBuilder->weld_widget("lockstandardpagesize")) { for (sal_uInt32 i = 0; i < SwFieldUnitTable::Count(); ++i) { @@ -362,16 +373,51 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet) } m_xUseCharUnit->save_state(); + bool bReadOnly = officecfg::Office::Writer::Content::Update::Link::isReadOnly(); + m_xGridupdatelink->set_sensitive(!bReadOnly); + m_xUpdateLinkImg->set_visible(bReadOnly); + + bReadOnly = officecfg::Office::Writer::Content::Update::Field::isReadOnly(); + m_xAutoUpdateFields->set_sensitive(!bReadOnly); + m_xAutoUpdateFieldsImg->set_visible(bReadOnly); + + bReadOnly = officecfg::Office::Writer::Content::Update::Chart::isReadOnly(); + m_xAutoUpdateCharts->set_sensitive(!bReadOnly); + m_xAutoUpdateChartsImg->set_visible(bReadOnly); + + bReadOnly = officecfg::Office::Writer::Layout::Other::MeasureUnit::isReadOnly(); + m_xMetricLB->set_sensitive(!bReadOnly); + m_xMetricImg->set_visible(bReadOnly); + + bReadOnly = officecfg::Office::Writer::Layout::Other::TabStop::isReadOnly(); + m_xTabMF->set_sensitive(!bReadOnly); + m_xTabImg->set_visible(bReadOnly); + + bReadOnly = officecfg::Office::Writer::Layout::Other::ApplyCharUnit::isReadOnly(); + m_xUseCharUnit->set_sensitive(!bReadOnly); + m_xUseCharUnitImg->set_visible(bReadOnly); + + bReadOnly = officecfg::Office::Writer::Layout::Other::IsSquaredPageMode::isReadOnly(); + m_xUseSquaredPageMode->set_sensitive(!bReadOnly); + m_xUseSquaredPageModeImg->set_visible(bReadOnly); + + bReadOnly = officecfg::Office::Writer::WordCount::AdditionalSeparators::isReadOnly(); m_xWordCountED->set_text(officecfg::Office::Writer::WordCount::AdditionalSeparators::get()); - m_xWordCountED->set_sensitive(!officecfg::Office::Writer::WordCount::AdditionalSeparators::isReadOnly()); + m_xWordCountED->set_sensitive(!bReadOnly); + m_xWordCountImg->set_visible(bReadOnly); m_xWordCountED->save_value(); + + bReadOnly = officecfg::Office::Writer::WordCount::ShowStandardizedPageCount::isReadOnly(); m_xShowStandardizedPageCount->set_active(officecfg::Office::Writer::WordCount::ShowStandardizedPageCount::get()); - m_xShowStandardizedPageCount->set_sensitive(!officecfg::Office::Writer::WordCount::ShowStandardizedPageCount::isReadOnly()); + m_xShowStandardizedPageCount->set_sensitive(!bReadOnly); + m_xShowStandardizedPageCountImg->set_visible(bReadOnly); m_xShowStandardizedPageCount->save_state(); + + bReadOnly = officecfg::Office::Writer::WordCount::StandardizedPageSize::isReadOnly(); m_xStandardizedPageSizeNF->set_value(officecfg::Office::Writer::WordCount::StandardizedPageSize::get()); - m_xStandardizedPageSizeNF->set_sensitive(!officecfg::Office::Writer::WordCount::StandardizedPageSize::isReadOnly()); + m_xStandardizedPageSizeNF->set_sensitive(!bReadOnly && m_xShowStandardizedPageCount->get_active()); + m_xStandardizedPageSizeImg->set_visible(bReadOnly); m_xStandardizedPageSizeNF->save_value(); - m_xStandardizedPageSizeNF->set_sensitive(m_xShowStandardizedPageCount->get_active()); } IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl, weld::ComboBox&, void) diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 2b582bf83e12..24ddd25ae434 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -65,18 +65,29 @@ private: std::unique_ptr<weld::RadioButton> m_xAlwaysRB; std::unique_ptr<weld::RadioButton> m_xRequestRB; std::unique_ptr<weld::RadioButton> m_xNeverRB; + std::unique_ptr<weld::Widget> m_xGridupdatelink; + std::unique_ptr<weld::Widget> m_xUpdateLinkImg; std::unique_ptr<weld::CheckButton> m_xAutoUpdateFields; + std::unique_ptr<weld::Widget> m_xAutoUpdateFieldsImg; std::unique_ptr<weld::CheckButton> m_xAutoUpdateCharts; + std::unique_ptr<weld::Widget> m_xAutoUpdateChartsImg; std::unique_ptr<weld::ComboBox> m_xMetricLB; + std::unique_ptr<weld::Widget> m_xMetricImg; std::unique_ptr<weld::Label> m_xTabFT; std::unique_ptr<weld::MetricSpinButton> m_xTabMF; + std::unique_ptr<weld::Widget> m_xTabImg; std::unique_ptr<weld::CheckButton> m_xUseSquaredPageMode; + std::unique_ptr<weld::Widget> m_xUseSquaredPageModeImg; std::unique_ptr<weld::CheckButton> m_xUseCharUnit; + std::unique_ptr<weld::Widget> m_xUseCharUnitImg; std::unique_ptr<weld::Entry> m_xWordCountED; + std::unique_ptr<weld::Widget> m_xWordCountImg; std::unique_ptr<weld::CheckButton> m_xShowStandardizedPageCount; + std::unique_ptr<weld::Widget> m_xShowStandardizedPageCountImg; std::unique_ptr<weld::SpinButton> m_xStandardizedPageSizeNF; + std::unique_ptr<weld::Widget> m_xStandardizedPageSizeImg; DECL_LINK(MetricHdl, weld::ComboBox&, void); DECL_LINK(StandardizedPageCountCheckHdl, weld::Toggleable&, void); diff --git a/sw/uiconfig/swriter/ui/optgeneralpage.ui b/sw/uiconfig/swriter/ui/optgeneralpage.ui index 86de9bfab250..b8999c264d38 100644 --- a/sw/uiconfig/swriter/ui/optgeneralpage.ui +++ b/sw/uiconfig/swriter/ui/optgeneralpage.ui @@ -31,7 +31,7 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=2 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -53,7 +53,7 @@ </child> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> @@ -71,6 +71,32 @@ </object> </child> </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="lockupdatefields"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="lockupdatecharts"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> <packing> <property name="left-attach">0</property> <property name="top-attach">1</property> @@ -103,71 +129,95 @@ <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=3 --> - <object class="GtkGrid" id="grid3"> + <!-- n-columns=2 n-rows=1 --> + <object class="GtkGrid"> <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="row-spacing">6</property> <child> - <object class="GtkRadioButton" id="always"> - <property name="label" translatable="yes" context="optgeneralpage|always">_Always</property> + <!-- n-columns=1 n-rows=3 --> + <object class="GtkGrid" id="gridupdatelink"> <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="active">True</property> - <property name="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="always-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|always">Always updates links while loading a document, and only if the document is in a trusted file location or the global security level is Low (Not recommended).</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <child> + <object class="GtkRadioButton" id="always"> + <property name="label" translatable="yes" context="optgeneralpage|always">_Always</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="active">True</property> + <property name="draw-indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="always-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|always">Always updates links while loading a document, and only if the document is in a trusted file location or the global security level is Low (Not recommended).</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">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="onrequest"> - <property name="label" translatable="yes" context="optgeneralpage|onrequest">_On request</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="group">always</property> - <child internal-child="accessible"> - <object class="AtkObject" id="onrequest-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|onrequest">Updates links only on request while loading a document.</property> + <child> + <object class="GtkRadioButton" id="onrequest"> + <property name="label" translatable="yes" context="optgeneralpage|onrequest">_On request</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="group">always</property> + <child internal-child="accessible"> + <object class="AtkObject" id="onrequest-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|onrequest">Updates links only on request while loading a document.</property> + </object> + </child> </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="never"> + <property name="label" translatable="yes" context="optgeneralpage|never">_Never</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="group">always</property> + <child internal-child="accessible"> + <object class="AtkObject" id="never-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|never">Links are never updated while loading a document.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkRadioButton" id="never"> - <property name="label" translatable="yes" context="optgeneralpage|never">_Never</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="group">always</property> - <child internal-child="accessible"> - <object class="AtkObject" id="never-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|never">Links are never updated while loading a document.</property> - </object> - </child> + <object class="GtkImage" id="lockupdatelink"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="top-attach">0</property> </packing> </child> </object> @@ -204,7 +254,7 @@ <property name="margin-top">6</property> <property name="row-spacing">6</property> <child> - <!-- n-columns=2 n-rows=2 --> + <!-- n-columns=3 n-rows=2 --> <object class="GtkGrid" id="grid7"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -220,7 +270,7 @@ <property name="xalign">1</property> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> @@ -237,7 +287,7 @@ </child> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">2</property> <property name="top-attach">0</property> </packing> </child> @@ -251,7 +301,7 @@ <property name="xalign">1</property> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">1</property> </packing> </child> @@ -273,7 +323,33 @@ </child> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">2</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="lockmetric"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="locktab"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> <property name="top-attach">1</property> </packing> </child> @@ -284,7 +360,7 @@ </packing> </child> <child> - <!-- n-columns=2 n-rows=1 --> + <!-- n-columns=4 n-rows=1 --> <object class="GtkGrid" id="grid8"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -305,7 +381,7 @@ </child> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> @@ -325,7 +401,33 @@ </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="GtkImage" id="lockusecharunit"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="locksquaremode"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">2</property> <property name="top-attach">0</property> </packing> </child> @@ -371,7 +473,7 @@ <property name="hexpand">True</property> <property name="row-spacing">6</property> <child> - <!-- n-columns=2 n-rows=1 --> + <!-- n-columns=3 n-rows=1 --> <object class="GtkGrid" id="grid9"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -388,7 +490,7 @@ <property name="xalign">1</property> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> @@ -400,7 +502,20 @@ <property name="truncate-multiline">True</property> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="lockwordcount"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> <property name="top-attach">0</property> </packing> </child> @@ -411,7 +526,7 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=2 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid10"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -426,7 +541,7 @@ <property name="draw-indicator">True</property> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">0</property> </packing> </child> @@ -468,6 +583,32 @@ </packing> </child> </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="lockstandardizedpageshow"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="lockstandardpagesize"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="icon-name">res/lock.png</property> + </object> <packing> <property name="left-attach">0</property> <property name="top-attach">1</property> commit 1b060fae845b1b1dfe0407fb576742b52b71942e Author: Balazs Varga <[email protected]> AuthorDate: Thu Nov 9 13:29:23 2023 +0100 Commit: Balazs Varga <[email protected]> CommitDate: Fri Nov 10 08:07:49 2023 +0100 resave with newer glade version Change-Id: Ie0796286fd5648e5df4397861ba1f9afcce881c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159229 Tested-by: Jenkins Reviewed-by: Balazs Varga <[email protected]> diff --git a/sw/uiconfig/swriter/ui/optgeneralpage.ui b/sw/uiconfig/swriter/ui/optgeneralpage.ui index bcbfb3145b5a..86de9bfab250 100644 --- a/sw/uiconfig/swriter/ui/optgeneralpage.ui +++ b/sw/uiconfig/swriter/ui/optgeneralpage.ui @@ -1,51 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.38.2 --> <interface domain="sw"> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment-sps"> <property name="lower">1</property> <property name="upper">100000</property> <property name="value">1800</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="adjustment1"> <property name="lower">0.5</property> <property name="upper">100</property> <property name="value">1.25</property> - <property name="step_increment">0.1</property> - <property name="page_increment">10</property> + <property name="step-increment">0.10</property> + <property name="page-increment">10</property> </object> <object class="GtkBox" id="OptGeneralPage"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">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="frame2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">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=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid4"> <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="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkCheckButton" id="updatefields"> <property name="label" translatable="yes" context="optgeneralpage|updatefields">_Fields</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="updatefields-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|updatefields">The contents of all fields are updated automatically whenever the screen contents are displayed as new. Even with this box unchecked, some fields are updated each time a special condition takes place.</property> @@ -53,18 +53,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="GtkCheckButton" id="updatecharts"> <property name="label" translatable="yes" context="optgeneralpage|updatecharts">_Charts</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="updatecharts-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|updatecharts">Specifies whether to automatically update charts. Whenever a Writer table cell value changes and the cursor leaves that cell, the chart that displays the cell value is updated automatically.</property> @@ -72,8 +72,8 @@ </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> </object> @@ -81,7 +81,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="optgeneralpage|label2">Automatically Update</property> <attributes> <attribute name="weight" value="bold"/> @@ -98,27 +98,27 @@ <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="hexpand">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=1 n-rows=1 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="grid3"> <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="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkRadioButton" id="always"> <property name="label" translatable="yes" context="optgeneralpage|always">_Always</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="always-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|always">Always updates links while loading a document, and only if the document is in a trusted file location or the global security level is Low (Not recommended).</property> @@ -126,18 +126,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="onrequest"> <property name="label" translatable="yes" context="optgeneralpage|onrequest">_On request</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">always</property> <child internal-child="accessible"> <object class="AtkObject" id="onrequest-atkobject"> @@ -146,18 +146,18 @@ </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="GtkRadioButton" id="never"> <property name="label" translatable="yes" context="optgeneralpage|never">_Never</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">always</property> <child internal-child="accessible"> <object class="AtkObject" id="never-atkobject"> @@ -166,8 +166,8 @@ </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> </object> @@ -175,7 +175,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="optgeneralpage|label1">Update Links when Loading</property> <attributes> <attribute name="weight" value="bold"/> @@ -192,42 +192,42 @@ <child> <object class="GtkFrame" id="frame3"> <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=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <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="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid7"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <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="optgeneralpage|label5">_Measurement unit:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">metric</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">metric</property> <property name="xalign">1</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> <child> <object class="GtkComboBoxText" id="metric"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="hexpand">True</property> <child internal-child="accessible"> @@ -237,35 +237,35 @@ </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="tablabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="optgeneralpage|tablabel">_Tab stops:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">tab</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">tab</property> <property name="xalign">1</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="GtkSpinButton" id="tab"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="halign">start</property> - <property name="activates_default">True</property> + <property name="activates-default">True</property> <property name="text">1.25</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustment1</property> <property name="digits">2</property> <property name="value">1.25</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="tab-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|tab">Specifies the spacing between the individual tab stops.</property> @@ -273,31 +273,31 @@ </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> </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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid8"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="column-spacing">12</property> <child> <object class="GtkCheckButton" id="usecharunit"> <property name="label" translatable="yes" context="optgeneralpage|usecharunit">_Enable char unit</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="hexpand">True</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="usecharunit-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|usecharunit">When this setting is enabled, the measurement units of indents and spacing on Format - Paragraph - Indents & Spacing tab will be character (ch) and line.</property> @@ -305,19 +305,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="squaremode"> <property name="label" translatable="yes" context="optgeneralpage|squaremode">_Use square page mode for text grid</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="hexpand">True</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="squaremode-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|squaremode">When this setting is enabled, the text grid will look like square page.</property> @@ -325,14 +325,14 @@ </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">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> @@ -340,7 +340,7 @@ <child type="label"> <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="optgeneralpage|label3">Settings</property> <attributes> <attribute name="weight" value="bold"/> @@ -357,126 +357,126 @@ <child> <object class="GtkFrame" id="frame4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">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=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid6"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="hexpand">True</property> + <property name="row-spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid9"> <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="label7"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="optgeneralpage|label7">_Additional separators:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">wordcount</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">wordcount</property> <property name="xalign">1</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> <child> <object class="GtkEntry" id="wordcount"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> - <property name="activates_default">True</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> </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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid10"> <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="standardizedpageshow"> <property name="label" translatable="yes" context="optgeneralpage|standardizedpageshow">Show standardized page count</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="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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid11"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="labelstandardpages"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="optgeneralpage|labelstandardpages">Characters per standardized page:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">standardpagesize</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">standardpagesize</property> <property name="xalign">1</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> <child> <object class="GtkSpinButton" id="standardpagesize"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="halign">start</property> - <property name="activates_default">True</property> + <property name="activates-default">True</property> <property name="text">1800</property> - <property name="adjustment">adjustment-sps</property> <property name="truncate-multiline">True</property> + <property name="adjustment">adjustment-sps</property> <property name="value">1800</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> </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> </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> </object> @@ -484,7 +484,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="optgeneralpage|label4">Word Count</property> <attributes> <attribute name="weight" value="bold"/>
