ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#151002 Add type and position gtklabels in Text flow tab of Table properties

Browse Source 
Change-Id: I3dbe240c9ef5e9d0d5930bf5ccccf25a809887d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210257
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Jenkins
This commit is contained in:
Aleksi Kallio
2026-09-04 09:26:55 +02:00
committed by Heiko Tietze
parent ef182d04d5
commit 5593616d2e
3 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/source/ui/table/tabledlg.cxx
+10
View File
@@ -1260,6 +1260,8 @@ SwTextFlowPage::SwTextFlowPage(weld::Container* pPage, weld::DialogController* p
, m_xColBrkRB(m_xBuilder->weld_radio_button(u"column"_ustr))
, m_xPgBrkBeforeRB(m_xBuilder->weld_radio_button(u"before"_ustr))
, m_xPgBrkAfterRB(m_xBuilder->weld_radio_button(u"after"_ustr))
, m_xPgBrkTypeFT(m_xBuilder->weld_label(u"breaktype"_ustr))
, m_xPgBrkPositionFT(m_xBuilder->weld_label(u"breakposition"_ustr))
, m_xPageCollCB(m_xBuilder->weld_check_button(u"pagestyle"_ustr))
, m_xPageCollLB(m_xBuilder->weld_combo_box(u"pagestylelb"_ustr))
, m_xPageNoCB(m_xBuilder->weld_check_button(u"pagenoft"_ustr))
@@ -1571,6 +1573,8 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet )
m_xColBrkRB->set_sensitive(false);
m_xPgBrkBeforeRB->set_sensitive(false);
m_xPgBrkAfterRB->set_sensitive(false);
m_xPgBrkTypeFT->set_sensitive(false);
m_xPgBrkPositionFT->set_sensitive(false);
m_xKeepCB->set_sensitive(false);
m_xSplitCB->set_sensitive(false);
m_xPgBrkCB->set_sensitive(false);
@@ -1640,6 +1644,8 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl, weld::Toggleable&, void)
m_xColBrkRB->set_sensitive(true);
m_xPgBrkBeforeRB->set_sensitive(true);
m_xPgBrkAfterRB->set_sensitive(true);
m_xPgBrkTypeFT->set_sensitive(true);
m_xPgBrkPositionFT->set_sensitive(true);
if (m_xPgBrkRB->get_active() && m_xPgBrkBeforeRB->get_active())
{
@@ -1665,6 +1671,8 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl, weld::Toggleable&, void)
m_xColBrkRB->set_sensitive(false);
m_xPgBrkBeforeRB->set_sensitive(false);
m_xPgBrkAfterRB->set_sensitive(false);
m_xPgBrkTypeFT->set_sensitive(false);
m_xPgBrkPositionFT->set_sensitive(false);
}
}
@@ -1753,6 +1761,8 @@ void SwTextFlowPage::DisablePageBreak()
m_xColBrkRB->set_sensitive(false);
m_xPgBrkBeforeRB->set_sensitive(false);
m_xPgBrkAfterRB->set_sensitive(false);
m_xPgBrkTypeFT->set_sensitive(false);
m_xPgBrkPositionFT->set_sensitive(false);
m_xPageCollCB->set_sensitive(false);
m_xPageCollLB->set_sensitive(false);
m_xPageNoCB->set_sensitive(false);
sw/source/uibase/table/tablepg.hxx
+2
View File
@@ -162,6 +162,8 @@ class SwTextFlowPage : public SfxTabPage
std::unique_ptr<weld::RadioButton> m_xColBrkRB;
std::unique_ptr<weld::RadioButton> m_xPgBrkBeforeRB;
std::unique_ptr<weld::RadioButton> m_xPgBrkAfterRB;
std::unique_ptr<weld::Label> m_xPgBrkTypeFT;
std::unique_ptr<weld::Label> m_xPgBrkPositionFT;
std::unique_ptr<weld::CheckButton> m_xPageCollCB;
std::unique_ptr<weld::ComboBox> m_xPageCollLB;
std::unique_ptr<weld::CheckButton> m_xPageNoCB;
sw/uiconfig/swriter/ui/tabletextflowpage.ui
+43 -22
View File
@@ -38,13 +38,13 @@
<property name="hexpand">True</property>
<property name="row-spacing">12</property>
<child>
<!-- n-columns=3 n-rows=2 -->
<!-- n-columns=3 n-rows=3 -->
<object class="GtkGrid" id="grid20">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="halign">start</property>
<property name="row-spacing">6</property>
<property name="column-spacing">5</property>
<property name="column-spacing">6</property>
<property name="column-homogeneous">True</property>
<child>
<object class="GtkCheckButton" id="break">
@@ -54,12 +54,6 @@
<property name="receives-default">False</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
<accessibility>
<relation type="label-for" target="page"/>
<relation type="label-for" target="column"/>
<relation type="label-for" target="before"/>
<relation type="label-for" target="after"/>
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="break-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|break">Select this check box, and then select the type of break that you want to associate with the table.</property>
@@ -71,6 +65,36 @@
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="breakposition">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes" context="tabletextflowpage|breakpositition">Position:</property>
<accessibility>
<relation type="label-for" target="before"/>
</accessibility>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="breaktype">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes" context="tabletextflowpage|breaktype">Type:</property>
<accessibility>
<relation type="label-for" target="page"/>
</accessibility>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="page">
<property name="label" translatable="yes" context="tabletextflowpage|page">_Page</property>
@@ -81,7 +105,7 @@
<property name="active">True</property>
<property name="draw-indicator">True</property>
<accessibility>
<relation type="labelled-by" target="break"/>
<relation type="labelled-by" target="breaktype"/>
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="page-atkobject">
@@ -91,7 +115,7 @@
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
@@ -103,9 +127,6 @@
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
<property name="group">page</property>
<accessibility>
<relation type="labelled-by" target="break"/>
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="column-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|column">Inserts a column break before or after the table on a multi-column page.</property>
@@ -113,8 +134,8 @@
</child>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">0</property>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
@@ -127,7 +148,7 @@
<property name="active">True</property>
<property name="draw-indicator">True</property>
<accessibility>
<relation type="labelled-by" target="break"/>
<relation type="labelled-by" target="breakposition"/>
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="before-atkobject">
@@ -136,7 +157,7 @@
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="left-attach">2</property>
<property name="top-attach">1</property>
</packing>
</child>
@@ -149,9 +170,6 @@
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
<property name="group">before</property>
<accessibility>
<relation type="labelled-by" target="break"/>
</accessibility>
<child internal-child="accessible">
<object class="AtkObject" id="after-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="tabletextflowpage|extended_tip|after">Inserts a page or column break after the table.</property>
@@ -160,12 +178,15 @@
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="left-attach">0</property>