chart2/uiconfig/ui/dlg_DataLabel.ui | 186 ++++++++++----------- chart2/uiconfig/ui/dlg_InsertErrorBars.ui | 261 ++++++++++++++---------------- vcl/qt5/QtInstanceBuilder.cxx | 1 3 files changed, 223 insertions(+), 225 deletions(-)
New commits: commit e06ca4c3ab8b754499fb311b8212b6cc949202fe Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 10:07:29 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 18:14:17 2026 +0100 chart: Resave dlg_InsertErrorBars.ui with glade 3.40 The dialog can e.g. be triggered like this: * start Writer * "Insert" -> "Chart" * "Insert" -> "X Error Bars..." Change-Id: I7b0b857cf7a84d0c9e0a6ae824248be68b2a5d41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199130 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui index f199d8a923ac..5b5867fc24de 100644 --- a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui +++ b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui @@ -1,52 +1,52 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="chart"> <requires lib="gtk+" version="3.24"/> <object class="GtkAdjustment" id="adjustmentNEG"> <property name="upper">100</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="adjustmentPOS"> <property name="upper">100</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="GtkImage" id="imageRANGE_SELECT_NEG"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">chart2/res/selectrange.png</property> + <property name="can-focus">False</property> + <property name="icon-name">chart2/res/selectrange.png</property> </object> <object class="GtkImage" id="imageRANGE_SELECT_POSITIVE"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">chart2/res/selectrange.png</property> + <property name="can-focus">False</property> + <property name="icon-name">chart2/res/selectrange.png</property> </object> <object class="GtkDialog" id="dlg_InsertErrorBars"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="dlg_InsertErrorBars|dlg_InsertErrorBars">Legend</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> + <property name="default-width">0</property> + <property name="default-height">0</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -59,8 +59,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -73,8 +73,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -88,46 +88,46 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkBox" id="tp_ErrorBars"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <property name="homogeneous">True</property> <child> <object class="GtkFrame" id="FL_ERROR"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkBox" id="box3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="RB_NONE"> <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NONE">_None</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="active">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="RB_NONE-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_NONE">Does not show any error bars.</property> @@ -144,10 +144,10 @@ <object class="GtkRadioButton" id="RB_CONST"> <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_CONST">_Constant Value</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">RB_NONE</property> <child internal-child="accessible"> <object class="AtkObject" id="RB_CONST-atkobject"> @@ -165,10 +165,10 @@ <object class="GtkRadioButton" id="RB_PERCENT"> <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_PERCENT">_Percentage</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">RB_NONE</property> <child internal-child="accessible"> <object class="AtkObject" id="RB_PERCENT-atkobject"> @@ -185,15 +185,15 @@ <child> <object class="GtkBox" id="box4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="RB_FUNCTION"> <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">RB_NONE</property> <child internal-child="accessible"> <object class="AtkObject" id="RB_FUNCTION-atkobject"> @@ -210,7 +210,7 @@ <child> <object class="GtkComboBoxText" id="LB_FUNCTION"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <items> <item id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Error</item> <item id="1" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Deviation</item> @@ -240,10 +240,10 @@ <object class="GtkRadioButton" id="RB_RANGE"> <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_RANGE">Cell _Range</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">RB_NONE</property> <child internal-child="accessible"> <object class="AtkObject" id="RB_RANGE-atkobject"> @@ -262,7 +262,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="dlg_InsertErrorBars|label1">Error Category</property> <attributes> <attribute name="weight" value="bold"/> @@ -279,27 +279,27 @@ <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> + <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=2 n-rows=3 --> <object class="GtkGrid" id="grid1"> <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="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="GtkRadioButton" id="RB_BOTH"> <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_BOTH">Positive _and Negative</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="active">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="RB_BOTH-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_BOTH">Shows positive and negative error bars.</property> @@ -307,18 +307,18 @@ </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="GtkRadioButton" id="RB_POSITIVE"> <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_POSITIVE">Pos_itive</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">RB_BOTH</property> <child internal-child="accessible"> <object class="AtkObject" id="RB_POSITIVE-atkobject"> @@ -327,18 +327,18 @@ </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> <child> <object class="GtkRadioButton" id="RB_NEGATIVE"> <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NEGATIVE">Ne_gative</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">RB_BOTH</property> <child internal-child="accessible"> <object class="AtkObject" id="RB_NEGATIVE-atkobject"> @@ -347,41 +347,41 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkImage" id="FI_BOTH"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="icon-name">missing-image</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="GtkImage" id="FI_POSITIVE"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="icon-name">missing-image</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="GtkImage" id="FI_NEGATIVE"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="icon-name">missing-image</property> </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> @@ -389,7 +389,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="dlg_InsertErrorBars|label2">Error Indicator</property> <property name="xalign">0</property> <attributes> @@ -414,29 +414,29 @@ <child> <object class="GtkFrame" id="framePARAMETERS"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkBox" id="box5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkBox" id="boxPOSITIVE"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="FT_POSITIVE"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_POSITIVE">P_ositive (+)</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">MF_POSITIVE</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">MF_POSITIVE</property> </object> <packing> <property name="expand">False</property> @@ -447,10 +447,10 @@ <child> <object class="GtkSpinButton" id="MF_POSITIVE"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustmentPOS</property> <property name="digits">2</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="MF_POSITIVE-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|MF_POSITIVE">Enter the value to add to the displayed value as the positive error value.</property> @@ -466,9 +466,9 @@ <child> <object class="GtkEntry" id="ED_RANGE_POSITIVE"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="activates_default">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="ED_RANGE_POSITIVE-atkobject"> @@ -485,9 +485,9 @@ <child> <object class="GtkButton" id="IB_RANGE_POSITIVE"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_POSITIVE|tooltip_text">Select data range</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_POSITIVE|tooltip_text">Select data range</property> <property name="image">imageRANGE_SELECT_POSITIVE</property> <property name="always-show-image">True</property> <child internal-child="accessible"> @@ -512,15 +512,15 @@ <child> <object class="GtkBox" id="boxNEGATIVE"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="FT_NEGATIVE"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_NEGATIVE">_Negative (-)</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">MF_NEGATIVE</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">MF_NEGATIVE</property> </object> <packing> <property name="expand">False</property> @@ -531,10 +531,10 @@ <child> <object class="GtkSpinButton" id="MF_NEGATIVE"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> + <property name="truncate-multiline">True</property> <property name="adjustment">adjustmentNEG</property> <property name="digits">2</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="MF_NEGATIVE-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|MF_NEGATIVE">Enter the value to subtract from the displayed value as the negative error value.</property> @@ -550,9 +550,9 @@ <child> <object class="GtkEntry" id="ED_RANGE_NEGATIVE"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="activates_default">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="ED_RANGE_NEGATIVE-atkobject"> @@ -569,9 +569,9 @@ <child> <object class="GtkButton" id="IB_RANGE_NEGATIVE"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_NEGATIVE|tooltip_text">Select data range</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_NEGATIVE|tooltip_text">Select data range</property> <property name="image">imageRANGE_SELECT_NEG</property> <property name="always-show-image">True</property> <child internal-child="accessible"> @@ -597,10 +597,10 @@ <object class="GtkCheckButton" id="CB_SYN_POS_NEG"> <property name="label" translatable="yes" context="dlg_InsertErrorBars|CB_SYN_POS_NEG">Same value for both</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="CB_SYN_POS_NEG-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|CB_SYN_POS_NEG">Enable to use the positive error values also as negative error values. You can only change the value of the "Positive (+)" box. That value gets copied to the "Negative (-)" box automatically.</property> @@ -618,7 +618,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="dlg_InsertErrorBars|label3">Parameters</property> <property name="xalign">0</property> <attributes> @@ -635,7 +635,7 @@ </child> <child> <object class="GtkLabel" id="STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="dlg_InsertErrorBars|STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS">Select Range for Positive Error Bars</property> </object> <packing> @@ -646,7 +646,7 @@ </child> <child> <object class="GtkLabel" id="STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="dlg_InsertErrorBars|STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS">Select Range for Negative Error Bars</property> </object> <packing> @@ -657,7 +657,7 @@ </child> <child> <object class="GtkLabel" id="STR_CONTROLTEXT_ERROR_BARS_FROM_DATA"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="dlg_InsertErrorBars|STR_CONTROLTEXT_ERROR_BARS_FROM_DATA">From Data Table</property> </object> <packing> @@ -680,9 +680,6 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> </object> <object class="GtkSizeGroup" id="sizegroup1"> <widgets> commit 81c8909595732707ea19bf04a0afdffa8d5104b4 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 09:57:15 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 18:14:11 2026 +0100 tdf#130857 Define widgets in "Data Labels" dialog in order 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 02692566ad9fc7c3484f8581ffa0004cd4e43987 Author: Michael Weghorn <[email protected]> Date: Thu Oct 24 17:43:35 2024 +0200 tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order for more background. The dialog can be triggered like this: * start Writer * "Insert" -> "Chart" * "Insert" -> "Data Labels..." Change-Id: Iebcfd35ed75719831cad445d25c9dbebc1a7fb4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199129 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui index 2c500a9a2be4..635e7d27c95a 100644 --- a/chart2/uiconfig/ui/dlg_DataLabel.ui +++ b/chart2/uiconfig/ui/dlg_DataLabel.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="chart"> <requires lib="gtk+" version="3.24"/> <object class="GtkAdjustment" id="adjustmentDEGREE"> @@ -122,112 +122,108 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE"> - <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_PERCENTAGE">Value as _percentage</property> + <object class="GtkButton" id="PB_NUMBERFORMAT"> + <property name="label" translatable="yes" context="dlg_DataLabel|PB_NUMBERFORMAT">Number _format...</property> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="receives-default">True</property> + <property name="valign">center</property> <property name="use-underline">True</property> - <property name="draw-indicator">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="CB_VALUE_AS_PERCENTAGE-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_VALUE_AS_PERCENTAGE">Displays the percentage of the data points in each column.</property> + <object class="AtkObject" id="PB_NUMBERFORMAT-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_NUMBERFORMAT">Opens a dialog to select the number format.</property> </object> </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="GtkCheckButton" id="CB_CATEGORY"> - <property name="label" translatable="yes" context="dlg_DataLabel|CB_CATEGORY">_Category</property> + <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE"> + <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_PERCENTAGE">Value as _percentage</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="CB_CATEGORY-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_CATEGORY">Shows the data point text labels.</property> + <object class="AtkObject" id="CB_VALUE_AS_PERCENTAGE-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_VALUE_AS_PERCENTAGE">Displays the percentage of the data points in each column.</property> </object> </child> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="CB_SYMBOL"> - <property name="label" translatable="yes" context="dlg_DataLabel|CB_SYMBOL">_Legend key</property> + <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT"> + <property name="label" translatable="yes" context="dlg_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">False</property> + <property name="receives-default">True</property> + <property name="valign">center</property> <property name="use-underline">True</property> - <property name="draw-indicator">True</property> <child internal-child="accessible"> - <object class="AtkObject" id="CB_SYMBOL-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_SYMBOL">Displays the legend icons next to each data point label.</property> + <object class="AtkObject" id="PB_PERCENT_NUMBERFORMAT-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_PERCENT_NUMBERFORMAT">Opens a dialog to select the percentage format.</property> </object> </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="CB_WRAP_TEXT"> - <property name="label" translatable="yes" context="dlg_DataLabel|CB_WRAP_TEXT">Auto text _wrap</property> + <object class="GtkCheckButton" id="CB_CATEGORY"> + <property name="label" translatable="yes" context="dlg_DataLabel|CB_CATEGORY">_Category</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="CB_CATEGORY-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_CATEGORY">Shows the data point text labels.</property> + </object> + </child> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">5</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkButton" id="PB_NUMBERFORMAT"> - <property name="label" translatable="yes" context="dlg_DataLabel|PB_NUMBERFORMAT">Number _format...</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="valign">center</property> - <property name="use-underline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="PB_NUMBERFORMAT-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_NUMBERFORMAT">Opens a dialog to select the number format.</property> - </object> - </child> + <object class="GtkLabel" id="STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE"> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="dlg_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">Number Format for Percentage Value</property> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT"> - <property name="label" translatable="yes" context="dlg_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property> + <object class="GtkCheckButton" id="CB_DATA_SERIES_NAME"> + <property name="label" translatable="yes" context="dlg_DataLabel|CB_DATA_SERIES_NAME">_Series name</property> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="valign">center</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="PB_PERCENT_NUMBERFORMAT-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_PERCENT_NUMBERFORMAT">Opens a dialog to select the percentage format.</property> + <object class="AtkObject" id="CB_DATA_SERIES_NAME-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_DATA_SERIES_NAME">Shows the data series name in the label.</property> </object> </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> @@ -245,32 +241,36 @@ </packing> </child> <child> - <object class="GtkLabel" id="STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE"> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="dlg_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">Number Format for Percentage Value</property> + <object class="GtkCheckButton" id="CB_SYMBOL"> + <property name="label" translatable="yes" context="dlg_DataLabel|CB_SYMBOL">_Legend key</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="CB_SYMBOL-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_SYMBOL">Displays the legend icons next to each data point label.</property> + </object> + </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> - <object class="GtkCheckButton" id="CB_DATA_SERIES_NAME"> - <property name="label" translatable="yes" context="dlg_DataLabel|CB_DATA_SERIES_NAME">_Series name</property> + <object class="GtkCheckButton" id="CB_WRAP_TEXT"> + <property name="label" translatable="yes" context="dlg_DataLabel|CB_WRAP_TEXT">Auto text _wrap</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="CB_DATA_SERIES_NAME-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_DATA_SERIES_NAME">Shows the data series name in the label.</property> - </object> - </child> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">3</property> + <property name="top-attach">5</property> </packing> </child> <child> @@ -316,85 +316,85 @@ <property name="column-spacing">12</property> <property name="row-homogeneous">True</property> <child> - <object class="GtkLabel" id="FT_LABEL_PLACEMENT"> + <object class="GtkLabel" id="FT_TEXT_SEPARATOR"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property> + <property name="label" translatable="yes" context="dlg_DataLabel|FT_TEXT_SEPARATOR">_Separator</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">LB_LABEL_PLACEMENT</property> + <property name="mnemonic-widget">LB_TEXT_SEPARATOR</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="LB_LABEL_PLACEMENT"> + <object class="GtkComboBoxText" id="LB_TEXT_SEPARATOR"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <items> - <item id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Best fit</item> - <item id="1" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Center</item> - <item id="2" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Above</item> - <item id="3" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top left</item> - <item id="4" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Left</item> - <item id="5" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom left</item> - <item id="6" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Below</item> - <item id="7" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom right</item> - <item id="8" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Right</item> - <item id="9" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top right</item> - <item id="10" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Inside</item> - <item id="11" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Outside</item> - <item id="12" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Near origin</item> + <item id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Space</item> + <item id="1" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Comma</item> + <item id="2" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Semicolon</item> + <item id="3" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">New line</item> + <item id="4" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Period</item> </items> <child internal-child="accessible"> - <object class="AtkObject" id="LB_LABEL_PLACEMENT-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_LABEL_PLACEMENT">Selects the placement of data labels relative to the objects.</property> + <object class="AtkObject" id="LB_TEXT_SEPARATOR-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_TEXT_SEPARATOR">Selects the separator between multiple text strings for the same object.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="FT_TEXT_SEPARATOR"> + <object class="GtkLabel" id="FT_LABEL_PLACEMENT"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="dlg_DataLabel|FT_TEXT_SEPARATOR">_Separator</property> + <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">LB_TEXT_SEPARATOR</property> + <property name="mnemonic-widget">LB_LABEL_PLACEMENT</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="LB_TEXT_SEPARATOR"> + <object class="GtkComboBoxText" id="LB_LABEL_PLACEMENT"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <items> - <item id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Space</item> - <item id="1" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Comma</item> - <item id="2" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Semicolon</item> - <item id="3" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">New line</item> - <item id="4" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Period</item> + <item id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Best fit</item> + <item id="1" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Center</item> + <item id="2" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Above</item> + <item id="3" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top left</item> + <item id="4" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Left</item> + <item id="5" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom left</item> + <item id="6" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Below</item> + <item id="7" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom right</item> + <item id="8" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Right</item> + <item id="9" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top right</item> + <item id="10" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Inside</item> + <item id="11" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Outside</item> + <item id="12" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Near origin</item> </items> <child internal-child="accessible"> - <object class="AtkObject" id="LB_TEXT_SEPARATOR-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_TEXT_SEPARATOR">Selects the separator between multiple text strings for the same object.</property> + <object class="AtkObject" id="LB_LABEL_PLACEMENT-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_LABEL_PLACEMENT">Selects the placement of data labels relative to the objects.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> commit 191a6dd5808b75c35b7c280c2a710b2ab86a7bfd Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 09:50:31 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 18:14:04 2026 +0100 tdf#130857 qt weld: Support chart "Data Labels" dialog This means that native Qt widgets are used for that dialog now when using the qt5 or qt6 VCL plugin and starting LO with environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set. The dialog can be triggered like this: * start Writer * "Insert" -> "Chart" * "Insert" -> "Data Labels..." Change-Id: Ibfa8dcb931f8357a07da35f03d1782f9281aa5ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199128 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 8e6f3032bfdc..4bbbc7fbf552 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -166,6 +166,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/scalc/ui/ttestdialog.ui", u"modules/scalc/ui/ztestdialog.ui", u"modules/schart/ui/charttypedialog.ui", + u"modules/schart/ui/dlg_DataLabel.ui", u"modules/schart/ui/dlg_InsertDataTable.ui", u"modules/schart/ui/dlg_InsertLegend.ui", u"modules/schart/ui/insertaxisdlg.ui",
