Dialog update: docking 3d effects

Change-Id: I258911b4e4ecf401723f4f7f424129bf0b9f430c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105772
Tested-by: Jenkins
Reviewed-by: Andreas Kainz <kainz.a@gmail.com>

1 files changed, 127 insertions, 128 deletions

diff --git a/svx/uiconfig/ui/docking3deffects.ui b/svx/uiconfig/ui/docking3deffects.ui
index 8a007cd73f29..adf422115d0d 100644
--- a/svx/uiconfig/ui/docking3deffects.ui
+++ b/svx/uiconfig/ui/docking3deffects.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.22.2 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -447,46 +447,16 @@
               <object class="GtkGrid" id="grid3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="column_spacing">24</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
                 <child>
-                  <object class="GtkGrid" id="grid4">
+                  <object class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="docking3deffects|label6">_Horizontal</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">hori</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="hori">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="text">0</property>
-                        <property name="adjustment">adjustment5</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="hori-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="docking3deffects|extended_tip|hori">Enter the number of horizontal segments to use in the selected 3D rotation object.</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
+                    <property name="label" translatable="yes" context="docking3deffects|label6">_Horizontal</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">hori</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -494,42 +464,46 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkGrid" id="grid5">
+                  <object class="GtkLabel" id="label7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="docking3deffects|label7">_Vertical</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">veri</property>
-                        <property name="xalign">0</property>
+                    <property name="label" translatable="yes" context="docking3deffects|label7">_Vertical</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">veri</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="veri">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="text">0</property>
+                    <property name="adjustment">adjustment9</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="veri-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="docking3deffects|extended_tip|veri">Enter the number of vertical segments to use in the selected 3D rotation object</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkSpinButton" id="veri">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="text">0</property>
-                        <property name="adjustment">adjustment9</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="veri-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="docking3deffects|extended_tip|veri">Enter the number of vertical segments to use in the selected 3D rotation object</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="hori">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="text">0</property>
+                    <property name="adjustment">adjustment5</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="hori-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="docking3deffects|extended_tip|hori">Enter the number of horizontal segments to use in the selected 3D rotation object.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -952,7 +926,6 @@
               <object class="GtkGrid" id="grid11">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
@@ -1029,21 +1002,6 @@
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
                 <child>
-                  <object class="GtkLabel" id="slantft">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">end</property>
-                    <property name="label" translatable="yes" context="docking3deffects|slantft">S_urface angle</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">slant</property>
-                    <property name="xalign">1</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkSpinButton" id="slant">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -1055,21 +1013,49 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
+                    <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToggleButton" id="shadow">
+                  <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes" context="docking3deffects|shadow|tooltip_text">3D Shadowing On/Off</property>
-                    <property name="image">image17</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="shadow-atkobject">
-                        <property name="AtkObject::accessible-description" translatable="yes" context="docking3deffects|extended_tip|shadow">Adds or removes a shadow from the selected 3D object.</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkToggleButton" id="shadow">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes" context="docking3deffects|shadow|tooltip_text">3D Shadowing On/Off</property>
+                        <property name="image">image17</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="shadow-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="docking3deffects|extended_tip|shadow">Adds or removes a shadow from the selected 3D object.</property>
+                          </object>
+                        </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="slantft">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">end</property>
+                        <property name="label" translatable="yes" context="docking3deffects|slantft">S_urface angle</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">slant</property>
+                        <property name="xalign">1</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -1220,6 +1206,7 @@
                   <object class="GtkLabel" id="label17">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="valign">start</property>
                     <property name="label" translatable="yes" context="docking3deffects|label17">_Light source</property>
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
@@ -1237,7 +1224,6 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
-                    <property name="width">3</property>
                   </packing>
                 </child>
                 <child>
@@ -1264,9 +1250,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
                     <property name="valign">center</property>
-                    <property name="hexpand">True</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="label" translatable="no"></property>
                     <child>
@@ -1487,8 +1472,8 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
@@ -1502,9 +1487,8 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes" context="docking3deffects|lightcolor1|tooltip_text">Light 1 color</property>
-                        <property name="xalign">0</property>
                         <property name="valign">start</property>
-                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="label" translatable="no"></property>
                         <child>
@@ -1527,9 +1511,8 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes" context="docking3deffects|lightcolor2|tooltip_text">Light 2 color</property>
-                        <property name="xalign">0</property>
                         <property name="valign">start</property>
-                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="label" translatable="no"></property>
                         <child>
@@ -1547,9 +1530,8 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes" context="docking3deffects|lightcolor3|tooltip_text">Light 3 color</property>
-                        <property name="xalign">0</property>
                         <property name="valign">start</property>
-                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="label" translatable="no"></property>
                         <child>
@@ -1567,9 +1549,8 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes" context="docking3deffects|lightcolor4|tooltip_text">Light 4 color</property>
-                        <property name="xalign">0</property>
                         <property name="valign">start</property>
-                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="label" translatable="no"></property>
                         <child>
@@ -1587,9 +1568,8 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes" context="docking3deffects|lightcolor5|tooltip_text">Light 5 color</property>
-                        <property name="xalign">0</property>
                         <property name="valign">start</property>
-                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="label" translatable="no"></property>
                         <child>
@@ -1607,9 +1587,8 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes" context="docking3deffects|lightcolor6|tooltip_text">Light 6 color</property>
-                        <property name="xalign">0</property>
                         <property name="valign">start</property>
-                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="label" translatable="no"></property>
                         <child>
@@ -1627,9 +1606,8 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes" context="docking3deffects|lightcolor7|tooltip_text">Light 7 color</property>
-                        <property name="xalign">0</property>
                         <property name="valign">start</property>
-                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="label" translatable="no"></property>
                         <child>
@@ -1647,9 +1625,8 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes" context="docking3deffects|lightcolor8|tooltip_text">Light 8 color</property>
-                        <property name="xalign">0</property>
                         <property name="valign">start</property>
-                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="label" translatable="no"></property>
                         <child>
@@ -1668,6 +1645,12 @@
                     <property name="top_attach">1</property>
                   </packing>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
             </child>
           </object>
@@ -2150,9 +2133,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
                     <property name="valign">center</property>
                     <property name="hexpand">True</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="label" translatable="no"></property>
                     <child>
@@ -2174,9 +2157,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
                     <property name="valign">center</property>
                     <property name="hexpand">True</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="label" translatable="no"></property>
                     <child>
@@ -2322,9 +2305,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
                     <property name="valign">center</property>
                     <property name="hexpand">True</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                     <property name="label" translatable="no"></property>
                     <child>
@@ -2531,7 +2514,7 @@
       </object>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup1">
+  <object class="GtkSizeGroup" id="sizegroupLabel">
     <widgets>
       <widget name="diagonalft"/>
       <widget name="scaleddepthft"/>
@@ -2539,17 +2522,17 @@
       <widget name="depthft"/>
       <widget name="label6"/>
       <widget name="label7"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup" id="sizegroup2">
-    <widgets>
       <widget name="label8"/>
-      <widget name="label15"/>
+      <widget name="box3"/>
       <widget name="label14"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup" id="sizegroup3">
-    <widgets>
+      <widget name="label15"/>
+      <widget name="label17"/>
+      <widget name="label18"/>
+      <widget name="label20"/>
+      <widget name="label22"/>
+      <widget name="label23"/>
+      <widget name="label24"/>
+      <widget name="label25"/>
       <widget name="label26"/>
       <widget name="label27"/>
       <widget name="label29"/>
@@ -2557,4 +2540,20 @@
       <widget name="label31"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup" id="sizegroupWidget">
+    <widgets>
+      <widget name="diagonal"/>
+      <widget name="scaleddepth"/>
+      <widget name="angle"/>
+      <widget name="depth"/>
+      <widget name="veri"/>
+      <widget name="hori"/>
+      <widget name="mode"/>
+      <widget name="slant"/>
+      <widget name="focal"/>
+      <widget name="distance"/>
+      <widget name="objcolor"/>
+      <widget name="illumcolor"/>
+    </widgets>
+  </object>
 </interface>