cui/uiconfig/ui/numberingformatpage.ui | 454 ++++++++++++++++----------------- dbaccess/uiconfig/ui/fielddialog.ui | 113 ++------ 2 files changed, 257 insertions(+), 310 deletions(-)
New commits: commit 1a4854d2ae3cb44edd52adc2dabdd02882fe2ce4 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 22 18:11:45 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 23 10:40:16 2026 +0100 tdf#130857 cui: Move widgets out of frame they don't belong to So far, the "Source format" check button and the preview were inside of the GtkFrame for locale settings. However, they do not semantically belong there, as they are treated separately in SvxNumberFormatTabPage where currently the frame's label ("localeft") and the "localelb" combo box are manually disabled while the other two widgets in that "Locale" frame remain enabled/sensitive as they are not actually directly related to the locale. Change this to only leave the combo box to select the locale inside of the "Locale" frame, in preparation of disabling the whole frame instead of the single widgets in an upcoming commit. (This prepares for stopping to access the frame's internal label child directly, which doesn't exist as a separate widget for the native Qt implementation of weld::Frame.) (`git show --ignore-space-change` helps to see the "actual change" more easily.) Sample steps to trigger the tab page using the logic: * start Writer * "Insert" -> "Chart" * double-click on the y axis of the chart to open the "Y Axis" dialog * switch to the "Numbers" tab page Change-Id: I17fea4cd41dfd5cd62457913d073130dc40bdfa9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197875 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui index 5e1bd0fc1be9..da1f33708bfd 100644 --- a/cui/uiconfig/ui/numberingformatpage.ui +++ b/cui/uiconfig/ui/numberingformatpage.ui @@ -605,21 +605,18 @@ </packing> </child> <child> - <object class="GtkFrame" id="localeframe"> - <property name="height-request">0</property> + <!-- n-columns=1 n-rows=3 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="vexpand">True</property> - <property name="label-xalign">0</property> - <property name="shadow-type">none</property> + <property name="row-spacing">6</property> <child> - <!-- n-columns=1 n-rows=3 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkFrame" id="localeframe"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-top">6</property> - <property name="vexpand">True</property> - <property name="row-spacing">6</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkComboBoxText" id="localelb"> <property name="visible">True</property> @@ -631,74 +628,75 @@ </object> </child> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="sourceformat"> - <property name="label" translatable="yes" context="numberingformatpage|sourceformat">So_urce format</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="no-show-all">True</property> + <child type="label"> + <object class="GtkLabel" id="localeft"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">6</property> + <property name="label" translatable="yes" context="numberingformatpage|localeft">_Locale</property> <property name="use-underline">True</property> - <property name="draw-indicator">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="sourceformat-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="numberingformatpage|extended_tip|sourceformat">Uses the same number format as the cells containing the data for the chart.</property> - </object> - </child> + <property name="mnemonic-widget">localelb</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="sourceformat"> + <property name="label" translatable="yes" context="numberingformatpage|sourceformat">So_urce format</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="sourceformat-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="numberingformatpage|extended_tip|sourceformat">Uses the same number format as the cells containing the data for the chart.</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">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="valign">end</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow-type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="valign">end</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow-type">in</property> + <property name="can-focus">False</property> <child> - <object class="GtkViewport"> + <object class="GtkDrawingArea" id="preview"> <property name="visible">True</property> <property name="can-focus">False</property> - <child> - <object class="GtkDrawingArea" id="preview"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="preview-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes" context="numberingformatpage|preview-atkobject">Preview</property> - </object> - </child> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="numberingformatpage|preview-atkobject">Preview</property> </object> </child> </object> </child> </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> </child> </object> - </child> - <child type="label"> - <object class="GtkLabel" id="localeft"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="numberingformatpage|localeft">_Locale</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">localelb</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> </child> </object> <packing> commit e1a50f31b298f8d704a863736b9363e33a8c7d4e Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 22 14:55:59 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 23 10:40:09 2026 +0100 dbaccess: Resave fielddialog.ui with glade 3.40 This is used by the "Field Format" dialog in Base, which can be triggered like this: * start Base, create any new database * with "Tables" selected in the sidebar on the left, choose "Create Table in Design View..." * enter any field name and field type * at the bottom of the window, press the "Format field" button next to "Format example" Change-Id: Ib0daaee80f3c3440322cd6b05d3a0c4fe5986e47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197874 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/dbaccess/uiconfig/ui/fielddialog.ui b/dbaccess/uiconfig/ui/fielddialog.ui index 89178edd201c..75f5a73b0414 100644 --- a/dbaccess/uiconfig/ui/fielddialog.ui +++ b/dbaccess/uiconfig/ui/fielddialog.ui @@ -1,35 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="dba"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="FieldDialog"> <property name="name">-1</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="title" translatable="yes" context="fielddialog|FieldDialog">Field Format</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <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="reset"> <property name="label" translatable="yes" context="stock">_Reset</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> @@ -42,10 +39,10 @@ <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> @@ -58,8 +55,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> @@ -72,8 +69,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> @@ -87,52 +84,28 @@ <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="box1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="scrollable">True</property> - <property name="enable_popup">True</property> + <property name="enable-popup">True</property> <child> <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="can-focus">False</property> <child> <placeholder/> </child> @@ -141,42 +114,18 @@ <child type="tab"> <object class="GtkLabel" id="format"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="fielddialog|format">Format</property> </object> <packing> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> + <property name="can-focus">False</property> <child> <placeholder/> </child> @@ -188,13 +137,13 @@ <child type="tab"> <object class="GtkLabel" id="alignment"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="fielddialog|alignment">Alignment</property> <property name="xalign">0.5</property> </object> <packing> <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> </object> @@ -206,8 +155,8 @@ </child> <child> <object class="GtkLabel" id="alttitle"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="label" translatable="yes" context="fielddialog|alttitle">Table Format</property> </object> <packing> commit 0b0ea66d2c89146977961349dcf3fa7f640f6664 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 22 14:52:27 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 23 10:40:02 2026 +0100 cui: Resave numberingformatpage.ui with glade 3.40 This is used e.g. by the "Field Format" dialog in Base, which can be triggered like this: * start Base, create any new database * with "Tables" selected in the sidebar on the left, choose "Create Table in Design View..." * enter any field name and field type * at the bottom of the window, press the "Format field" button next to "Format example" Change-Id: I999179d274dfe078e53481166330b60d2c4cd57e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197873 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui index 9338443ba1ff..5e1bd0fc1be9 100644 --- a/cui/uiconfig/ui/numberingformatpage.ui +++ b/cui/uiconfig/ui/numberingformatpage.ui @@ -1,36 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.24"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">20</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="adjustment2"> <property name="upper">8</property> - <property name="step_increment">1</property> - <property name="page_increment">1</property> + <property name="step-increment">1</property> + <property name="page-increment">1</property> </object> <object class="GtkAdjustment" id="adjustment3"> <property name="upper">20</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="image1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/nu02.png</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/nu02.png</property> </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/nu01.png</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/nu01.png</property> </object> <object class="GtkImage" id="image3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/nu03.png</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/nu03.png</property> </object> <object class="GtkTreeStore" id="liststore1"> <columns> @@ -50,37 +50,37 @@ <column type="GdkRGBA"/> </columns> </object> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="NumberingFormatPage"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">6</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="border-width">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkFrame" id="formatcode"> <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=4 n-rows=3 --> <object class="GtkGrid" id="grid7"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">6</property> <child> <object class="GtkEntry" id="formatted"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="valign">center</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="formatted-atkobject"> @@ -89,16 +89,16 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkButton" id="add"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="numberingformatpage|add|tooltip_text">Add</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="numberingformatpage|add|tooltip_text">Add</property> <property name="valign">center</property> <property name="image">image2</property> <property name="always-show-image">True</property> @@ -109,16 +109,16 @@ </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="GtkButton" id="edit"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="numberingformatpage|edit|tooltip_text">Edit Comment</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="numberingformatpage|edit|tooltip_text">Edit Comment</property> <property name="valign">center</property> <property name="image">image3</property> <property name="always-show-image">True</property> @@ -129,16 +129,16 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkButton" id="delete"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="numberingformatpage|delete|tooltip_text">Remove</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="numberingformatpage|delete|tooltip_text">Remove</property> <property name="valign">center</property> <property name="image">image1</property> <property name="always-show-image">True</property> @@ -149,27 +149,27 @@ </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> + <property name="left-attach">3</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="commentft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="xalign">0</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> <property name="width">4</property> </packing> </child> <child> <object class="GtkEntry" id="commented"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes" context="numberingformatpage|commented|tooltip_text">Comment</property> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes" context="numberingformatpage|commented|tooltip_text">Comment</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="commented-atkobject"> @@ -178,8 +178,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> <property name="width">4</property> </packing> </child> @@ -188,10 +188,10 @@ <child type="label"> <object class="GtkLabel" id="formatf"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="numberingformatpage|formatf">_Format Code</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">formatted</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">formatted</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -199,38 +199,38 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkFrame" id="options"> <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=3 n-rows=2 --> <object class="GtkGrid" id="grid5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="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="GtkBox" id="box2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">0</property> + <property name="can-focus">False</property> + <property name="border-width">0</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkSpinButton" id="decimalsed"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment1</property> + <property name="can-focus">True</property> <property name="truncate-multiline">True</property> + <property name="adjustment">adjustment1</property> <child internal-child="accessible"> <object class="AtkObject" id="decimalsed-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="numberingformatpage|extended_tip|decimalsed">Enter the number of decimal places that you want to display.</property> @@ -246,9 +246,9 @@ <child> <object class="GtkSpinButton" id="denominatored"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment2</property> + <property name="can-focus">True</property> <property name="truncate-multiline">True</property> + <property name="adjustment">adjustment2</property> <child internal-child="accessible"> <object class="AtkObject" id="denominatored-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="numberingformatpage|extended_tip|denominatored">With fraction format, enter the number of places for the denominator that you want to display.</property> @@ -263,16 +263,16 @@ </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="GtkSpinButton" id="leadzerosed"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment3</property> + <property name="can-focus">True</property> <property name="truncate-multiline">True</property> + <property name="adjustment">adjustment3</property> <child internal-child="accessible"> <object class="AtkObject" id="leadzerosed-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="numberingformatpage|extended_tip|leadzerosed">Enter the maximum number of zeroes to display in front of the decimal point.</property> @@ -280,25 +280,25 @@ </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="GtkBox" id="box3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">center</property> - <property name="border_width">0</property> + <property name="border-width">0</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="decimalsft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="numberingformatpage|decimalsft">_Decimal places:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">decimalsed</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">decimalsed</property> <property name="xalign">1</property> </object> <packing> @@ -309,10 +309,10 @@ </child> <child> <object class="GtkLabel" id="denominatorft"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="numberingformatpage|denominatorft">Den_ominator places:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">denominatored</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">denominatored</property> <property name="xalign">1</property> </object> <packing> @@ -323,32 +323,32 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="leadzerosft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="numberingformatpage|leadzerosft">Leading _zeroes:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">leadzerosed</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">leadzerosed</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="negnumred"> <property name="label" translatable="yes" context="numberingformatpage|negnumred">_Negative numbers red</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="negnumred-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="numberingformatpage|extended_tip|negnumred">Changes the font color of negative numbers to red.</property> @@ -356,24 +356,24 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">0</property> + <property name="can-focus">False</property> + <property name="border-width">0</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="engineering"> <property name="label" translatable="yes" context="numberingformatpage|engineering">_Engineering notation</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="engineering-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="numberingformatpage|extended_tip|engineering">With scientific format, Engineering notation ensures that exponent is a multiple of 3.</property> @@ -390,10 +390,10 @@ <object class="GtkCheckButton" id="thousands"> <property name="label" translatable="yes" context="numberingformatpage|thousands">_Thousands separator</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="thousands-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="numberingformatpage|extended_tip|thousands">Inserts a separator between thousands. The type of separator that is used depends on your Languages and Locales settings.</property> @@ -408,8 +408,8 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> + <property name="left-attach">2</property> + <property name="top-attach">1</property> </packing> </child> </object> @@ -417,7 +417,7 @@ <child type="label"> <object class="GtkLabel" id="optionsft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="numberingformatpage|optionsft">Options</property> <attributes> <attribute name="weight" value="bold"/> @@ -426,44 +426,44 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=3 n-rows=1 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">12</property> - <property name="column_spacing">12</property> + <property name="row-spacing">12</property> + <property name="column-spacing">12</property> <child> <object class="GtkFrame" id="categoryframe"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> <property name="margin-top">6</property> + <property name="vexpand">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="categorylb"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> + <property name="can-focus">True</property> + <property name="has-focus">True</property> <property name="vexpand">True</property> <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> + <property name="headers-visible">False</property> + <property name="headers-clickable">False</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> @@ -489,10 +489,10 @@ <child type="label"> <object class="GtkLabel" id="categoryft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="numberingformatpage|categoryft">C_ategory</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">categorylb</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">categorylb</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -500,32 +500,32 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkFrame" id="formatframe"> - <property name="height_request">0</property> + <property name="height-request">0</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="margin-top">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="margin-top">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkComboBoxText" id="currencylb"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> <property name="hexpand">True</property> <items> @@ -538,26 +538,26 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="formatlb"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore3</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> + <property name="headers-visible">False</property> + <property name="headers-clickable">False</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection2"/> </child> @@ -581,8 +581,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> @@ -590,9 +590,9 @@ <child type="label"> <object class="GtkLabel" id="formatft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="numberingformatpage|formatft">Fo_rmat</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -600,30 +600,30 @@ </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="GtkFrame" id="localeframe"> - <property name="height_request">0</property> + <property name="height-request">0</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> + <property name="can-focus">False</property> <property name="margin-top">6</property> + <property name="vexpand">True</property> + <property name="row-spacing">6</property> <child> <object class="GtkComboBoxText" id="localelb"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> <child internal-child="accessible"> <object class="AtkObject" id="localelb-atkobject"> @@ -632,18 +632,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="sourceformat"> <property name="label" translatable="yes" context="numberingformatpage|sourceformat">So_urce format</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</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="no-show-all">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="sourceformat-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="numberingformatpage|extended_tip|sourceformat">Uses the same number format as the cells containing the data for the chart.</property> @@ -651,26 +651,26 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="valign">end</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkDrawingArea" id="preview"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child internal-child="accessible"> <object class="AtkObject" id="preview-atkobject"> <property name="AtkObject::accessible-name" translatable="yes" context="numberingformatpage|preview-atkobject">Preview</property> @@ -682,8 +682,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> </object> @@ -691,10 +691,10 @@ <child type="label"> <object class="GtkLabel" id="localeft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="numberingformatpage|localeft">_Locale</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">localelb</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">localelb</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -702,14 +702,14 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child internal-child="accessible"> @@ -720,7 +720,7 @@ </object> <object class="GtkSizeGroup" id="sizegroup1"> <property name="mode">both</property> - <property name="ignore_hidden">True</property> + <property name="ignore-hidden">True</property> <widgets> <widget name="categoryframe"/> <widget name="formatframe"/>
