sw/uiconfig/swriter/ui/outlinenumberingpage.ui | 531 ++++++++++++-------------
vcl/unx/gtk3/customcellrenderer.cxx | 1
2 files changed, 272 insertions(+), 260 deletions(-)
New commits:
commit 21f3aebd6ea00d9cc344b46049b8097ad988401b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Oct 6 14:31:20 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Oct 6 17:43:50 2022 +0200
gtk4: need a SolarMutexGuard here
Change-Id: Ia63e1d9f0c53df37f76a4125639084753b5e010c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141020
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/customcellrenderer.cxx
b/vcl/unx/gtk3/customcellrenderer.cxx
index ac786541f004..c7c6661ed912 100644
--- a/vcl/unx/gtk3/customcellrenderer.cxx
+++ b/vcl/unx/gtk3/customcellrenderer.cxx
@@ -215,6 +215,7 @@ bool
custom_cell_renderer_get_preferred_size(GtkCellRenderer* cell, GtkOrientati
gpointer pWidget = g_value_get_pointer(&value);
if (pWidget)
{
+ SolarMutexGuard aGuard;
custom_cell_renderer_ensure_device(cellsurface, pWidget);
aSize = custom_cell_renderer_get_size(*cellsurface->device, sId,
pWidget);
}
commit 7c9bebb868cfe82dfec54f1edee199f6b4339b8f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Oct 6 11:12:33 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Oct 6 17:43:32 2022 +0200
Resolves: tdf#132309 adjust ui to get better tab ordering
Change-Id: Ia9d6e8f57924ce1e89e54a29f559fafabfd7bb7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141011
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index dff631b9617f..80f6ee298c67 100644
--- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -22,7 +22,7 @@
<column type="gchararray"/>
</columns>
</object>
- <!-- n-columns=3 n-rows=2 -->
+ <!-- n-columns=3 n-rows=1 -->
<object class="GtkGrid" id="OutlineNumberingPage">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -89,198 +89,6 @@
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
- <property name="height">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label-xalign">0</property>
- <property name="shadow-type">none</property>
- <child>
- <!-- n-columns=2 n-rows=5 -->
- <object class="GtkGrid" id="grid2">
- <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>
- <property name="column-spacing">12</property>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="outlinenumberingpage|label3">Paragraph style:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">style</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="style">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="style-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|style">Select the
paragraph style that you want to assign to the selected chapter and outline
level.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="outlinenumberingpage|label4">Number:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">numbering</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="outlinenumberingpage|label5">Character style:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">charstyle</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="sublevelsft">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="outlinenumberingpage|sublevelsft">Show sublevels:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">sublevelsnf</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="numbering">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="numbering-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|numbering">Select
the numbering scheme that you want to apply to the selected outline
level.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="charstyle">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="charstyle-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|charstyle">Select
the character style of the numbering character.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="sublevelsnf">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates-default">True</property>
- <property name="truncate-multiline">True</property>
- <property name="adjustment">adjustment2</property>
- <property name="value">1</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="sublevelsnf-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="outlinenumberingpage|extended_tip|sublevelsnf">Select the number of
outline levels to include in the chapter numbering. For example, select "3" to
display three levels of chapter numbering: 1.1.1</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="outlinenumberingpage|label10">Start at:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">startat</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="startat">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">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="startat-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|startat">Enter
the number that you want to restart the chapter numbering at.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="outlinenumberingpage|label2">Numbering</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>
@@ -329,105 +137,308 @@
<packing>
<property name="left-attach">2</property>
<property name="top-attach">0</property>
- <property name="height">2</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame4">
+ <!-- n-columns=1 n-rows=2 -->
+ <object class="GtkGrid">
<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="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
- <!-- n-columns=2 n-rows=2 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkFrame" id="frame2">
<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>
- <property name="column-spacing">12</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkEntry" id="prefix">
+ <!-- n-columns=2 n-rows=5 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates-default">True</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="prefix-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|prefix">Enter the
text that you want to display before the chapter number.</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>
+ <property name="column-spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="outlinenumberingpage|label3">Paragraph style:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">style</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="style">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="style-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|style">Select the
paragraph style that you want to assign to the selected chapter and outline
level.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="outlinenumberingpage|label4">Number:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">numbering</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="outlinenumberingpage|label5">Character style:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">charstyle</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="sublevelsft">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="outlinenumberingpage|sublevelsft">Show sublevels:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">sublevelsnf</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="numbering">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="numbering-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|numbering">Select
the numbering scheme that you want to apply to the selected outline
level.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="charstyle">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="charstyle-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|charstyle">Select
the character style of the numbering character.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="sublevelsnf">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="value">1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="sublevelsnf-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="outlinenumberingpage|extended_tip|sublevelsnf">Select the number of
outline levels to include in the chapter numbering. For example, select "3" to
display three levels of chapter numbering: 1.1.1</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="outlinenumberingpage|label10">Start at:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">startat</property>
+ <property name="xalign">0</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="startat">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">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="startat-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|startat">Enter
the number that you want to restart the chapter numbering at.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="suffix">
+ <child type="label">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates-default">True</property>
- <property name="truncate-multiline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="suffix-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|suffix">Enter the
text that you want to display after the chapter number.</property>
- </object>
- </child>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="outlinenumberingpage|label2">Numbering</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
- <packing>
- <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>
+ </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>
<child>
- <object class="GtkLabel" id="label8">
+ <!-- n-columns=2 n-rows=2 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="outlinenumberingpage|label8">Before:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">prefix</property>
- <property name="xalign">0</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="prefix">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="prefix-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|prefix">Enter the
text that you want to display before the chapter number.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="suffix">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="suffix-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="outlinenumberingpage|extended_tip|suffix">Enter the
text that you want to display after the chapter number.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="outlinenumberingpage|label8">Before:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">prefix</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="outlinenumberingpage|label9">After:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">suffix</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <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">0</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="label9">
+ <child type="label">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="outlinenumberingpage|label9">After:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">suffix</property>
+ <property name="label" translatable="yes"
context="outlinenumberingpage|label7">Separator</property>
<property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</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="label6">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes"
context="outlinenumberingpage|label7">Separator</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
</child>
</object>
<packing>
<property name="left-attach">1</property>
- <property name="top-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
