ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#130857 Define widgets in "Callout" tab page in order

Browse Source 
Switch the order in which the widgets in the .ui file
are defined so that the order better matches the visual appearance
and logical order, which makes sure that tab focus order with the
Qt-based VCL plugins is correct as well when using native Qt
widgets (SAL_VCL_QT_USE_WELDED_WIDGETS=1), where
focus order is (by default) based on widget creation order.

See

    commit 02692566ad
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Thu Oct 24 17:43:35 2024 +0200

        tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order

for more background.

The tab page can be triggered like this:

* start Draw
* make sure the "Text" toolbar is enabled in
  "View" -> "Toolbars" -> "Text"
* in that "Text" toolbar, select the "Callouts" shape
  and insert it into the document
* right-click on the newly inserted shape to open the context menu
* activate the "Position and Size" menu entry
* switch to the "Callout" tab

The Python script mentioned in the commit message of

    commit 327679b2fb
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Wed Jul 8 15:50:59 2026 +0200

        tdf#130857 Define widgets in Calc "General" options page in order

was used to reorder the GtkGrid children automatically.

Change-Id: Ice8f6b318f57411bea553311faf45b40cb098b44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211883
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-10-07 17:49:27 +02:00
parent 373ff268bb
commit a0e94744f0
1 changed files with 197 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cui/uiconfig/ui/calloutpage.ui
+197 -197
View File
@@ -59,203 +59,6 @@
<property name="can-focus">False</property>
<property name="row-spacing">6</property>
<property name="column-spacing">18</property>
<child>
<!-- 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>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="calloutpage|label2">_Extension:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">extension</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="GtkComboBoxText" id="extension">
<property name="visible">True</property>
<property name="can-focus">False</property>
<items>
<item id="4" translatable="yes" context="calloutpage|liststore1">Optimal</item>
<item id="3" translatable="yes" context="calloutpage|liststore1">From top</item>
<item id="3" translatable="yes" context="calloutpage|liststore1">From left</item>
<item id="1" translatable="yes" context="calloutpage|liststore1">Horizontal</item>
<item id="2" translatable="yes" context="calloutpage|liststore1">Vertical</item>
</items>
<child internal-child="accessible">
<object class="AtkObject" id="extension-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|extension">Select where you want to extend the callout line from, in relation to the callout box.</property>
</object>
</child>
</object>
<packing>
<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>
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid" id="grid9">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="column-spacing">12</property>
<child>
<object class="GtkSpinButton" id="length">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="activates-default">True</property>
<property name="text">0.00</property>
<property name="truncate-multiline">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="length-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|length">Enter the length of the callout line segment that extends from the callout box to the inflection point of the line.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lengthft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="calloutpage|lengthft">_Length:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">length</property>
<property name="xalign">0</property>
</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">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="optimal">
<property name="label" translatable="yes" context="calloutpage|optimal">_Optimal</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>
<child internal-child="accessible">
<object class="AtkObject" id="optimal-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|optimal">Click here to display a single-angled line in an optimal way.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
<child>
<!-- n-columns=2 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="column-spacing">12</property>
<child>
<object class="GtkLabel" id="positionft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="calloutpage|positionft">_Position:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">position</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="byft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="calloutpage|byft">_By:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">by</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="GtkComboBoxText" id="position">
<property name="visible">True</property>
<property name="can-focus">False</property>
<items>
<item translatable="yes" context="calloutpage|position">Top</item>
<item translatable="yes" context="calloutpage|position">Middle</item>
<item translatable="yes" context="calloutpage|position">Bottom</item>
<item translatable="yes" context="calloutpage|position">Left</item>
<item translatable="yes" context="calloutpage|position">Center</item>
<item translatable="yes" context="calloutpage|position">Right</item>
</items>
<child internal-child="accessible">
<object class="AtkObject" id="position-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|position">Select where you want to extend the callout line from, in relation to the callout box.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="by">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="activates-default">True</property>
<property name="text">0.00</property>
<property name="truncate-multiline">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="by-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|by">Select where you want to extend the callout line from, in relation to the callout box.</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">1</property>
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid" id="grid7">
@@ -317,6 +120,203 @@
<property name="top-attach">0</property>
</packing>
</child>
<child>
<!-- 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>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="calloutpage|label2">_Extension:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">extension</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="GtkComboBoxText" id="extension">
<property name="visible">True</property>
<property name="can-focus">False</property>
<items>
<item id="4" translatable="yes" context="calloutpage|liststore1">Optimal</item>
<item id="3" translatable="yes" context="calloutpage|liststore1">From top</item>
<item id="3" translatable="yes" context="calloutpage|liststore1">From left</item>
<item id="1" translatable="yes" context="calloutpage|liststore1">Horizontal</item>
<item id="2" translatable="yes" context="calloutpage|liststore1">Vertical</item>
</items>
<child internal-child="accessible">
<object class="AtkObject" id="extension-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|extension">Select where you want to extend the callout line from, in relation to the callout box.</property>
</object>
</child>
</object>
<packing>
<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>
</packing>
</child>
<child>
<!-- n-columns=2 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="column-spacing">12</property>
<child>
<object class="GtkLabel" id="positionft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="calloutpage|positionft">_Position:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">position</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="GtkComboBoxText" id="position">
<property name="visible">True</property>
<property name="can-focus">False</property>
<items>
<item translatable="yes" context="calloutpage|position">Top</item>
<item translatable="yes" context="calloutpage|position">Middle</item>
<item translatable="yes" context="calloutpage|position">Bottom</item>
<item translatable="yes" context="calloutpage|position">Left</item>
<item translatable="yes" context="calloutpage|position">Center</item>
<item translatable="yes" context="calloutpage|position">Right</item>
</items>
<child internal-child="accessible">
<object class="AtkObject" id="position-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|position">Select where you want to extend the callout line from, in relation to the callout box.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="byft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="calloutpage|byft">_By:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">by</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="by">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="activates-default">True</property>
<property name="text">0.00</property>
<property name="truncate-multiline">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="by-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|by">Select where you want to extend the callout line from, in relation to the callout box.</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">1</property>
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid" id="grid9">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="lengthft">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="calloutpage|lengthft">_Length:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">length</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="GtkSpinButton" id="length">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="activates-default">True</property>
<property name="text">0.00</property>
<property name="truncate-multiline">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="length-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|length">Enter the length of the callout line segment that extends from the callout box to the inflection point of the line.</property>
</object>
</child>
</object>
<packing>
<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">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="optimal">
<property name="label" translatable="yes" context="calloutpage|optimal">_Optimal</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>
<child internal-child="accessible">
<object class="AtkObject" id="optimal-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="calloutpage|extended_tip|optimal">Click here to display a single-angled line in an optimal way.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>