svx/uiconfig/ui/textunderlinecontrol.ui | 212 ++++++++++++++++---------------- 1 file changed, 106 insertions(+), 106 deletions(-)
New commits: commit 3e6d1bfc645a3d97a7d9fac1db429cf8cc5c287e Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 19 16:38:25 2021 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 19 21:48:11 2021 +0200 gtk4: resave textunderlinecontrol.ui with latest glade to move unparented GtkImages to the top so they are where the gtk3to4 conversion can easily find them during parse so decide whether GtkPicture or GtkImage is the right choice. Change-Id: I03f95befcd347c0fa77b617aa9125a6708b0090c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123828 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/uiconfig/ui/textunderlinecontrol.ui b/svx/uiconfig/ui/textunderlinecontrol.ui index d0e0de55da8c..eef6a69adb68 100644 --- a/svx/uiconfig/ui/textunderlinecontrol.ui +++ b/svx/uiconfig/ui/textunderlinecontrol.ui @@ -1,15 +1,70 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.38.2 --> <interface domain="svx"> <requires lib="gtk+" version="3.20"/> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">9999</property> + <property name="step-increment">1</property> + <property name="page-increment">1</property> + </object> + <object class="GtkImage" id="image_spacing_1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/symphony/line1.png</property> + </object> + <object class="GtkImage" id="image_spacing_10"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/symphony/line10.png</property> + </object> + <object class="GtkImage" id="image_spacing_2"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/symphony/line2.png</property> + </object> + <object class="GtkImage" id="image_spacing_3"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/symphony/line3.png</property> + </object> + <object class="GtkImage" id="image_spacing_4"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/symphony/line4.png</property> + </object> + <object class="GtkImage" id="image_spacing_5"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/symphony/line5.png</property> + </object> + <object class="GtkImage" id="image_spacing_6"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/symphony/line6.png</property> + </object> + <object class="GtkImage" id="image_spacing_7"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/symphony/line7.png</property> + </object> + <object class="GtkImage" id="image_spacing_8"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/symphony/line8.png</property> + </object> + <object class="GtkImage" id="image_spacing_9"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">svx/res/symphony/line9.png</property> + </object> <object class="GtkPopover" id="TextUnderlineControl"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="border_width">4</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="border-width">4</property> <child> <object class="GtkBox" id="container"> <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="orientation">vertical</property> @@ -18,11 +73,11 @@ <object class="GtkButton" id="none"> <property name="label" translatable="yes" context="textunderlinecontrol|none">(Without)</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="relief">none</property> + <property name="use-underline">True</property> <property name="xalign">0</property> - <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -33,13 +88,13 @@ <child> <object class="GtkButton" id="single"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|single|tooltip_text">Single</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="textunderlinecontrol|single|tooltip_text">Single</property> <property name="image">image_spacing_1</property> <property name="relief">none</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -50,13 +105,13 @@ <child> <object class="GtkButton" id="double"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|double|tooltip_text">Double</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="textunderlinecontrol|double|tooltip_text">Double</property> <property name="image">image_spacing_2</property> <property name="relief">none</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -67,13 +122,13 @@ <child> <object class="GtkButton" id="bold"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|bold|tooltip_text">Bold</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="textunderlinecontrol|bold|tooltip_text">Bold</property> <property name="image">image_spacing_3</property> <property name="relief">none</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -84,13 +139,13 @@ <child> <object class="GtkButton" id="dot"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dot|tooltip_text">Dotted</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="textunderlinecontrol|dot|tooltip_text">Dotted</property> <property name="image">image_spacing_4</property> <property name="relief">none</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -101,13 +156,13 @@ <child> <object class="GtkButton" id="dotbold"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dotbold|tooltip_text">Dotted (Bold)</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="textunderlinecontrol|dotbold|tooltip_text">Dotted (Bold)</property> <property name="image">image_spacing_5</property> <property name="relief">none</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -118,13 +173,13 @@ <child> <object class="GtkButton" id="dash"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dash|tooltip_text">Dash</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="textunderlinecontrol|dash|tooltip_text">Dash</property> <property name="image">image_spacing_6</property> <property name="relief">none</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -135,13 +190,13 @@ <child> <object class="GtkButton" id="dashlong"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dashlong|tooltip_text">Long Dash</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="textunderlinecontrol|dashlong|tooltip_text">Long Dash</property> <property name="image">image_spacing_7</property> <property name="relief">none</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -152,13 +207,13 @@ <child> <object class="GtkButton" id="dashdot"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dashdot|tooltip_text">Dot Dash</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="textunderlinecontrol|dashdot|tooltip_text">Dot Dash</property> <property name="image">image_spacing_8</property> <property name="relief">none</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -169,13 +224,13 @@ <child> <object class="GtkButton" id="dashdotdot"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|dashdotdot|tooltip_text">Dot Dot Dash</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="textunderlinecontrol|dashdotdot|tooltip_text">Dot Dot Dash</property> <property name="image">image_spacing_9</property> <property name="relief">none</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -186,13 +241,13 @@ <child> <object class="GtkButton" id="wave"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="textunderlinecontrol|wave|tooltip_text">Wave</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="textunderlinecontrol|wave|tooltip_text">Wave</property> <property name="image">image_spacing_10</property> <property name="relief">none</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -204,9 +259,9 @@ <object class="GtkButton" id="moreoptions"> <property name="label" translatable="yes" context="textunderlinecontrol|moreoptions">_More Options...</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -217,59 +272,4 @@ </object> </child> </object> - <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">9999</property> - <property name="step_increment">1</property> - <property name="page_increment">1</property> - </object> - <object class="GtkImage" id="image_spacing_1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/symphony/line1.png</property> - </object> - <object class="GtkImage" id="image_spacing_10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/symphony/line10.png</property> - </object> - <object class="GtkImage" id="image_spacing_2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/symphony/line2.png</property> - </object> - <object class="GtkImage" id="image_spacing_3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/symphony/line3.png</property> - </object> - <object class="GtkImage" id="image_spacing_4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/symphony/line4.png</property> - </object> - <object class="GtkImage" id="image_spacing_5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/symphony/line5.png</property> - </object> - <object class="GtkImage" id="image_spacing_6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/symphony/line6.png</property> - </object> - <object class="GtkImage" id="image_spacing_7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/symphony/line7.png</property> - </object> - <object class="GtkImage" id="image_spacing_8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/symphony/line8.png</property> - </object> - <object class="GtkImage" id="image_spacing_9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">svx/res/symphony/line9.png</property> - </object> </interface>
