svx/uiconfig/ui/dockingfontwork.ui |  959 ++++++++++++++++++++-----------------
 1 file changed, 541 insertions(+), 418 deletions(-)

New commits:
commit 4ed91fc7214b08112bc73844db3bdaab69f73564
Author:     Olivier Hallot <[email protected]>
AuthorDate: Sun Jan 14 16:31:41 2024 -0300
Commit:     Olivier Hallot <[email protected]>
CommitDate: Fri Mar 1 12:43:44 2024 +0100

    tdf#94535 Improvements in Text along Path dialog
    
    Added labels to indicate the purpose of the toolbars.
    The dialog needs Close and Help buttons and will be considered later.
    
    Change-Id: I1926c05ebc386877007163bdea0809efe0442103
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162056
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <[email protected]>

diff --git a/svx/uiconfig/ui/dockingfontwork.ui 
b/svx/uiconfig/ui/dockingfontwork.ui
index 797bf9527036..a70b72a15b6c 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.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="svx">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -31,115 +31,139 @@
     <property name="can-focus">False</property>
     <property name="orientation">vertical</property>
     <child>
-      <!-- n-columns=1 n-rows=8 -->
-      <object class="GtkGrid">
+      <!-- n-columns=1 n-rows=6 -->
+      <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="row-spacing">12</property>
         <child>
-          <object class="GtkToolbar" id="style">
+          <object class="GtkFrame">
             <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="show-arrow">False</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <object class="GtkRadioToolButton" id="off">
+              <object class="GtkToolbar" id="style">
                 <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|off|tooltip_text">Baseline Off</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw01.png</property>
-                <property name="active">True</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="off-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|off">Removes baseline 
formatting.</property>
+                <property name="can-focus">True</property>
+                <property name="margin-top">6</property>
+                <property name="show-arrow">False</property>
+                <child>
+                  <object class="GtkRadioToolButton" id="off">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|off|tooltip_text">Baseline Off</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw01.png</property>
+                    <property name="active">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="off-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|off">Removes baseline 
formatting.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton1">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioToolButton" id="rotate">
-                <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|rotate|tooltip_text">Rotate</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw02.png</property>
-                <property name="group">off</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="rotate-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|rotate">Uses the top 
or the bottom edge of the selected object as the text baseline.</property>
+                <child>
+                  <object class="GtkSeparatorToolItem" id="toolbutton1">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioToolButton" id="upright">
-                <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|upright|tooltip_text">Upright</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw03.png</property>
-                <property name="group">off</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="upright-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|upright">Uses the top 
or the bottom edge of the selected object as the text baseline and preserves 
the original vertical alignment of the individual characters.</property>
+                <child>
+                  <object class="GtkRadioToolButton" id="rotate">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|rotate|tooltip_text">Rotate</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw02.png</property>
+                    <property name="group">off</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="rotate-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|rotate">Uses the top 
or the bottom edge of the selected object as the text baseline.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioToolButton" id="hori">
-                <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|hori|tooltip_text">Slant Horizontal</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw04.png</property>
-                <property name="group">off</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="hori-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|hori">Horizontally 
slants the characters in the text object.</property>
+                <child>
+                  <object class="GtkRadioToolButton" id="upright">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|upright|tooltip_text">Upright</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw03.png</property>
+                    <property name="group">off</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="upright-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|upright">Uses the top 
or the bottom edge of the selected object as the text baseline and preserves 
the original vertical alignment of the individual characters.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioToolButton" id="hori">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|hori|tooltip_text">Slant Horizontal</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw04.png</property>
+                    <property name="group">off</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="hori-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|hori">Horizontally 
slants the characters in the text object.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioToolButton" id="vert">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|vert|tooltip_text">Slant Vertical</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw05.png</property>
+                    <property name="group">off</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="vert-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|vert">Vertically 
slants the characters in the text object.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
-            <child>
-              <object class="GtkRadioToolButton" id="vert">
+            <child type="label">
+              <object class="GtkLabel" id="frameStyle">
                 <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|vert|tooltip_text">Slant Vertical</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw05.png</property>
-                <property name="group">off</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="vert-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|vert">Vertically 
slants the characters in the text object.</property>
-                  </object>
-                </child>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="dockingforntwork|frameStyle">Style</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
           </object>
           <packing>
@@ -148,108 +172,132 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolbar" id="adjust">
+          <object class="GtkFrame">
             <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="show-arrow">False</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <object class="GtkToggleToolButton" id="orientation">
+              <object class="GtkToolbar" id="adjust">
                 <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|orientation|tooltip_text">Orientation</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw06.png</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="orientation-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|orientation">Reverses 
the text flow direction, and flips the text horizontally or vertically. To use 
this command, you must first apply a different baseline to the text.</property>
+                <property name="can-focus">True</property>
+                <property name="margin-top">6</property>
+                <property name="show-arrow">False</property>
+                <child>
+                  <object class="GtkToggleToolButton" id="orientation">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|orientation|tooltip_text">Orientation</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw06.png</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="orientation-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|orientation">Reverses 
the text flow direction, and flips the text horizontally or vertically. To use 
this command, you must first apply a different baseline to the text.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton2">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioToolButton" id="left">
-                <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|left|tooltip_text">Align Left</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw07.png</property>
-                <property name="group">autosize</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="left-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|left">Aligns the text 
to the left end of the text baseline.</property>
+                <child>
+                  <object class="GtkSeparatorToolItem" id="toolbutton2">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioToolButton" id="center">
-                <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|center|tooltip_text">Align Center</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw08.png</property>
-                <property name="group">autosize</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="center-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|center">Centers the 
text on the text baseline.</property>
+                <child>
+                  <object class="GtkRadioToolButton" id="left">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|left|tooltip_text">Align Left</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw07.png</property>
+                    <property name="group">autosize</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="left-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|left">Aligns the text 
to the left end of the text baseline.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioToolButton" id="right">
-                <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|right|tooltip_text">Align Right</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw09.png</property>
-                <property name="group">autosize</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="right-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|right">Aligns the text 
to the right end of the text baseline.</property>
+                <child>
+                  <object class="GtkRadioToolButton" id="center">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|center|tooltip_text">Align Center</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw08.png</property>
+                    <property name="group">autosize</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="center-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|center">Centers the 
text on the text baseline.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioToolButton" id="right">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|right|tooltip_text">Align Right</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw09.png</property>
+                    <property name="group">autosize</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="right-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|right">Aligns the text 
to the right end of the text baseline.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioToolButton" id="autosize">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|autosize|tooltip_text">AutoSize Text</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw010.png</property>
+                    <property name="active">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="autosize-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|autosize">Resizes the 
text to fit the length of the text baseline.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
-            <child>
-              <object class="GtkRadioToolButton" id="autosize">
+            <child type="label">
+              <object class="GtkLabel" id="frameAdjust">
                 <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|autosize|tooltip_text">AutoSize Text</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw010.png</property>
-                <property name="active">True</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="autosize-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|autosize">Resizes the 
text to fit the length of the text baseline.</property>
-                  </object>
-                </child>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="dockingforntwork|frameAdjust">Adjust</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
           </object>
           <packing>
@@ -258,196 +306,279 @@
           </packing>
         </child>
         <child>
-          <!-- n-columns=2 n-rows=1 -->
-          <object class="GtkGrid" id="grid2">
+          <object class="GtkFrame">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="halign">end</property>
-            <property name="column-spacing">12</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="valign">center</property>
-                <property name="icon-name">svx/res/fw020.png</property>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="distance">
+              <object class="GtkToolbar" id="shadow">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|distance|tooltip_text">Distance</property>
-                <property name="truncate-multiline">True</property>
-                <property name="adjustment">adjustment1</property>
-                <property name="digits">2</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="distance-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|distance">Enter the 
amount of space that you want to leave between the text baseline and the base 
of the individual characters.</property>
+                <property name="margin-top">6</property>
+                <property name="show-arrow">False</property>
+                <child>
+                  <object class="GtkToggleToolButton" id="contour">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|contour|tooltip_text">Contour</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw011.png</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="contour-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|contour">Shows or 
hides the text baseline, or the edges of the selected object.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToggleToolButton" id="textcontour">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|textcontour|tooltip_text">Text Contour</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw012.png</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="textcontour-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|textcontour">Shows or 
hides the borders of the individual characters in the text.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSeparatorToolItem" id="toolbutton3">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioToolButton" id="noshadow">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|noshadow|tooltip_text">No Text Shadow</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw013.png</property>
+                    <property name="active">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="noshadow-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|noshadow">Removes the 
shadow effects that you applied to the text.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
                 </child>
+                <child>
+                  <object class="GtkRadioToolButton" id="vertical">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|vertical|tooltip_text">Add Text Shadow</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw014.png</property>
+                    <property name="group">noshadow</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="vertical-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|vertical">Adds a 
shadow to the text in the selected object. Click this button, and then enter 
the dimensions of the shadow in the Distance X and the Distance Y 
boxes.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioToolButton" id="slant">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|slant|tooltip_text">Slant Text Shadow</property>
+                    <property name="use-underline">True</property>
+                    <property name="icon-name">svx/res/fw015.png</property>
+                    <property name="group">noshadow</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="slant-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|slant">Adds a slant 
shadow to the text in the selected object. Click this button, and then enter 
the dimensions of the shadow in the Distance X and the Distance Y 
boxes.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="frameShadow">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="dockingforntwork|frameShadow">Shadow</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
           </object>
           <packing>
             <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
         <child>
-          <!-- n-columns=2 n-rows=1 -->
-          <object class="GtkGrid" id="grid3">
+          <object class="GtkFrame">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="halign">end</property>
-            <property name="column-spacing">12</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <object class="GtkImage" id="image2">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="valign">center</property>
-                <property name="icon-name">svx/res/fw021.png</property>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="indent">
+              <object class="GtkMenuButton" id="color">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|indent|tooltip_text">Indent</property>
-                <property name="text">0.00</property>
-                <property name="truncate-multiline">True</property>
-                <property name="adjustment">adjustment2</property>
-                <property name="digits">2</property>
+                <property name="receives-default">False</property>
+                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|color|tooltip_text">Shadow Color</property>
+                <property name="margin-top">6</property>
+                <property name="hexpand">True</property>
+                <property name="xalign">0</property>
+                <property name="draw-indicator">True</property>
+                <child>
+                  <placeholder/>
+                </child>
                 <child internal-child="accessible">
-                  <object class="AtkObject" id="indent-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|indent">Enter the 
amount of space to leave between the beginning of the text baseline, and the 
beginning of the text.</property>
+                  <object class="AtkObject" id="color-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|color">Select a color 
for the text shadow.</property>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="frameColor">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="dockingforntwork|frameColor">Shadow Color</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </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>
-          <object class="GtkToolbar" id="shadow">
+          <object class="GtkFrame">
             <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="show-arrow">False</property>
+            <property name="can-focus">False</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <object class="GtkToggleToolButton" id="contour">
+              <!-- n-columns=2 n-rows=2 -->
+              <object class="GtkGrid" id="grid4">
                 <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|contour|tooltip_text">Contour</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw011.png</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="contour-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|contour">Shows or 
hides the text baseline, or the edges of the selected object.</property>
+                <property name="can-focus">False</property>
+                <property name="halign">end</property>
+                <property name="margin-top">6</property>
+                <property name="column-spacing">12</property>
+                <child>
+                  <object class="GtkImage" id="shadowx">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="valign">center</property>
+                    <property name="icon-name">svx/res/fw018.png</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="shadowx-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|shadowx">Enter the 
horizontal distance between the text characters and the edge of the shadow or 
the angle of the shadow slant from vertical.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton" id="textcontour">
-                <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|textcontour|tooltip_text">Text Contour</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw012.png</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="textcontour-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|textcontour">Shows or 
hides the borders of the individual characters in the text.</property>
+                <child>
+                  <object class="GtkSpinButton" id="distancex">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|distancex|tooltip_text">Distance X</property>
+                    <property name="text">0.00</property>
+                    <property name="truncate-multiline">True</property>
+                    <property name="adjustment">adjustment3</property>
+                    <property name="digits">2</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="distancex-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|distancex">Enter the 
horizontal distance between the text characters and the edge of the shadow or 
the angle of the shadow slant from vertical.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparatorToolItem" id="toolbutton3">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioToolButton" id="noshadow">
-                <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|noshadow|tooltip_text">No Text Shadow</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw013.png</property>
-                <property name="active">True</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="noshadow-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|noshadow">Removes the 
shadow effects that you applied to the text.</property>
+                <child>
+                  <object class="GtkImage" id="shadowy">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="valign">center</property>
+                    <property name="icon-name">svx/res/fw019.png</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="shadowy-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|shadowy">Enter the 
vertical distance between the text characters and the edge of the shadow, or 
the size of the shadow in percent values of the character size.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioToolButton" id="vertical">
-                <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|vertical|tooltip_text">Add Text Shadow</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw014.png</property>
-                <property name="group">noshadow</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="vertical-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|vertical">Adds a 
shadow to the text in the selected object. Click this button, and then enter 
the dimensions of the shadow in the Distance X and the Distance Y 
boxes.</property>
+                <child>
+                  <object class="GtkSpinButton" id="distancey">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|distancey|tooltip_text">Distance Y</property>
+                    <property name="text">0.00</property>
+                    <property name="truncate-multiline">True</property>
+                    <property name="adjustment">adjustment4</property>
+                    <property name="digits">2</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="distancey-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|distancey">Enter the 
vertical distance between the text characters and the edge of the shadow, or 
the size of the shadow in percent values of the character size.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
+                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
-            <child>
-              <object class="GtkRadioToolButton" id="slant">
+            <child type="label">
+              <object class="GtkLabel" id="framShadowOffset">
                 <property name="visible">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|slant|tooltip_text">Slant Text Shadow</property>
-                <property name="use-underline">True</property>
-                <property name="icon-name">svx/res/fw015.png</property>
-                <property name="group">noshadow</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="slant-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|slant">Adds a slant 
shadow to the text in the selected object. Click this button, and then enter 
the dimensions of the shadow in the Distance X and the Distance Y 
boxes.</property>
-                  </object>
-                </child>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="dockingforntwork|frameShadowOffset">Shadow Offset</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
             </child>
           </object>
           <packing>
@@ -456,116 +587,108 @@
           </packing>
         </child>
         <child>
-          <!-- n-columns=2 n-rows=1 -->
-          <object class="GtkGrid" id="grid4">
+          <object class="GtkFrame">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="halign">end</property>
-            <property name="column-spacing">12</property>
+            <property name="label-xalign">0</property>
+            <property name="shadow-type">none</property>
             <child>
-              <object class="GtkImage" id="shadowx">
+              <!-- n-columns=2 n-rows=2 -->
+              <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="valign">center</property>
-                <property name="icon-name">svx/res/fw018.png</property>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="distancex">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|distancex|tooltip_text">Distance X</property>
-                <property name="text">0.00</property>
-                <property name="truncate-multiline">True</property>
-                <property name="adjustment">adjustment3</property>
-                <property name="digits">2</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="distancex-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|distancex">Enter the 
horizontal distance between the text characters and the edge of the shadow or 
the angle of the shadow slant from vertical.</property>
+                <property name="halign">end</property>
+                <property name="margin-top">6</property>
+                <property name="column-spacing">12</property>
+                <child>
+                  <object class="GtkImage" id="image1">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="valign">center</property>
+                    <property name="icon-name">svx/res/fw020.png</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="image1-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|distance">Enter the 
amount of space that you want to leave between the text baseline and the base 
of the individual characters.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">5</property>
-          </packing>
-        </child>
-        <child>
-          <!-- n-columns=2 n-rows=1 -->
-          <object class="GtkGrid" id="grid5">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="halign">end</property>
-            <property name="column-spacing">12</property>
-            <child>
-              <object class="GtkImage" id="shadowy">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="valign">center</property>
-                <property name="icon-name">svx/res/fw019.png</property>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="distancey">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|distancey|tooltip_text">Distance Y</property>
-                <property name="text">0.00</property>
-                <property name="truncate-multiline">True</property>
-                <property name="adjustment">adjustment4</property>
-                <property name="digits">2</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="distancey-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|distancey">Enter the 
vertical distance between the text characters and the edge of the shadow, or 
the size of the shadow in percent values of the character size.</property>
+                <child>
+                  <object class="GtkSpinButton" id="distance">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|distance|tooltip_text">Distance</property>
+                    <property name="truncate-multiline">True</property>
+                    <property name="adjustment">adjustment1</property>
+                    <property name="digits">2</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="distance-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|distance">Enter the 
amount of space that you want to leave between the text baseline and the base 
of the individual characters.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="image2">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="valign">center</property>
+                    <property name="icon-name">svx/res/fw021.png</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="image2-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|indent">Enter the 
amount of space to leave between the beginning of the text baseline, and the 
beginning of the text.</property>
+                      </object>
+                    </child>
                   </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="indent">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|indent|tooltip_text">Indent</property>
+                    <property name="text">0.00</property>
+                    <property name="truncate-multiline">True</property>
+                    <property name="adjustment">adjustment2</property>
+                    <property name="digits">2</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="indent-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|indent">Enter the 
amount of space to leave between the beginning of the text baseline, and the 
beginning of the text.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
+                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">6</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkMenuButton" id="color">
-            <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="receives-default">False</property>
-            <property name="tooltip-text" translatable="yes" 
context="dockingfontwork|color|tooltip_text">Shadow Color</property>
-            <property name="hexpand">True</property>
-            <property name="xalign">0</property>
-            <property name="draw-indicator">True</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="color-atkobject">
-                <property name="AtkObject::accessible-description" 
translatable="yes" context="dockingfontwork|extended_tip|color">Select a color 
for the text shadow.</property>
+            <child type="label">
+              <object class="GtkLabel" id="framePosition">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes" 
context="dockingforntwork|framePosition">Position and Indent</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
             </child>
           </object>
           <packing>
             <property name="left-attach">0</property>
-            <property name="top-attach">7</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
       </object>
@@ -583,10 +706,10 @@
   </object>
   <object class="GtkSizeGroup" id="sizegroup1">
     <widgets>
-      <widget name="distance"/>
-      <widget name="indent"/>
       <widget name="distancex"/>
       <widget name="distancey"/>
+      <widget name="distance"/>
+      <widget name="indent"/>
     </widgets>
   </object>
 </interface>

Reply via email to