weld View3DDialog

Change-Id: Ifd689c54574c08f026f6760efb39b5f927cb2625
Reviewed-on: https://gerrit.libreoffice.org/73604
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 158 insertions, 76 deletions

diff --git a/chart2/uiconfig/ui/3dviewdialog.ui b/chart2/uiconfig/ui/3dviewdialog.ui
index a6c138b645c2..1b6e51f674b6 100644
--- a/chart2/uiconfig/ui/3dviewdialog.ui
+++ b/chart2/uiconfig/ui/3dviewdialog.ui
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkDialog" id="3DViewDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="3dviewdialog|3DViewDialog">3D View</property>
+    <property name="modal">True</property>
+    <property name="default_width">0</property>
+    <property name="default_height">0</property>
     <property name="type_hint">dialog</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
diff --git a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
index a09bb40eec32..462ffa67713e 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkAdjustment" id="adjustmentPERSPECTIVE">
@@ -7,7 +7,19 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="adjustmentROTATION">
+  <object class="GtkAdjustment" id="adjustmentROTATION1">
+    <property name="lower">-180</property>
+    <property name="upper">180</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentROTATION2">
+    <property name="lower">-180</property>
+    <property name="upper">180</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentROTATION3">
     <property name="lower">-180</property>
     <property name="upper">180</property>
     <property name="step_increment">1</property>
@@ -41,7 +53,7 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="tp_3D_SceneGeometry|FT_X_ROTATION">_X rotation</property>
         <property name="use_underline">True</property>
-        <property name="mnemonic_widget">MTR_FLD_X_ROTATION:0degrees</property>
+        <property name="mnemonic_widget">MTR_FLD_X_ROTATION</property>
         <property name="xalign">0</property>
       </object>
       <packing>
@@ -55,7 +67,7 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="tp_3D_SceneGeometry|FT_Y_ROTATION">_Y rotation</property>
         <property name="use_underline">True</property>
-        <property name="mnemonic_widget">MTR_FLD_Y_ROTATION:0degrees</property>
+        <property name="mnemonic_widget">MTR_FLD_Y_ROTATION</property>
         <property name="xalign">0</property>
       </object>
       <packing>
@@ -69,7 +81,7 @@
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" context="tp_3D_SceneGeometry|FT_Z_ROTATION">_Z rotation</property>
         <property name="use_underline">True</property>
-        <property name="mnemonic_widget">MTR_FLD_Z_ROTATION:0degrees</property>
+        <property name="mnemonic_widget">MTR_FLD_Z_ROTATION</property>
         <property name="xalign">0</property>
       </object>
       <packing>
@@ -87,7 +99,7 @@
         <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
         <accessibility>
-          <relation type="label-for" target="MTR_FLD_PERSPECTIVE:0%"/>
+          <relation type="label-for" target="MTR_FLD_PERSPECTIVE"/>
         </accessibility>
       </object>
       <packing>
@@ -96,15 +108,16 @@
       </packing>
     </child>
     <child>
-      <object class="GtkSpinButton" id="MTR_FLD_PERSPECTIVE:0%">
+      <object class="GtkSpinButton" id="MTR_FLD_PERSPECTIVE">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can_focus">True</property>
+        <property name="activates_default">True</property>
         <property name="adjustment">adjustmentPERSPECTIVE</property>
         <accessibility>
           <relation type="labelled-by" target="CBX_PERSPECTIVE"/>
         </accessibility>
         <child internal-child="accessible">
-          <object class="AtkObject" id="MTR_FLD_PERSPECTIVE:0%-atkobject">
+          <object class="AtkObject" id="MTR_FLD_PERSPECTIVE-atkobject">
             <property name="AtkObject::accessible-name" translatable="yes" context="tp_3D_SceneGeometry|MTR_FLD_PERSPECTIVE-atkobject">Perspective</property>
           </object>
         </child>
@@ -115,11 +128,12 @@
       </packing>
     </child>
     <child>
-      <object class="GtkSpinButton" id="MTR_FLD_Z_ROTATION:0degrees">
+      <object class="GtkSpinButton" id="MTR_FLD_Z_ROTATION">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can_focus">True</property>
+        <property name="activates_default">True</property>
         <property name="input_purpose">alpha</property>
-        <property name="adjustment">adjustmentROTATION</property>
+        <property name="adjustment">adjustmentROTATION3</property>
         <property name="update_policy">if-valid</property>
       </object>
       <packing>
@@ -128,10 +142,11 @@
       </packing>
     </child>
     <child>
-      <object class="GtkSpinButton" id="MTR_FLD_Y_ROTATION:0degrees">
+      <object class="GtkSpinButton" id="MTR_FLD_Y_ROTATION">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="adjustment">adjustmentROTATION</property>
+        <property name="can_focus">True</property>
+        <property name="activates_default">True</property>
+        <property name="adjustment">adjustmentROTATION2</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -139,10 +154,11 @@
       </packing>
     </child>
     <child>
-      <object class="GtkSpinButton" id="MTR_FLD_X_ROTATION:0degrees">
+      <object class="GtkSpinButton" id="MTR_FLD_X_ROTATION">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="adjustment">adjustmentROTATION</property>
+        <property name="can_focus">True</property>
+        <property name="activates_default">True</property>
+        <property name="adjustment">adjustmentROTATION1</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
index e5496795c4b9..8e9cc07afee4 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
@@ -1,64 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkImage" id="IMG_AMBIENT_COLOR">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">svx/res/colordlg.png</property>
+    <property name="icon_name">svx/res/colordlg.png</property>
   </object>
   <object class="GtkImage" id="IMG_LIGHTSOURCE_COLOR">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">svx/res/colordlg.png</property>
+    <property name="icon_name">svx/res/colordlg.png</property>
   </object>
   <object class="GtkImage" id="IMG_LIGHT_1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">svx/res/lighton.png</property>
+    <property name="icon_name">svx/res/lighton.png</property>
   </object>
   <object class="GtkImage" id="IMG_LIGHT_2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">svx/res/lighton.png</property>
+    <property name="icon_name">svx/res/lighton.png</property>
   </object>
   <object class="GtkImage" id="IMG_LIGHT_3">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="yalign">0.44999998807907104</property>
-    <property name="pixbuf">svx/res/lighton.png</property>
+    <property name="icon_name">svx/res/lighton.png</property>
   </object>
   <object class="GtkImage" id="IMG_LIGHT_4">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="yalign">0.50999999046325684</property>
-    <property name="ypad">1</property>
-    <property name="pixbuf">svx/res/lighton.png</property>
+    <property name="icon_name">svx/res/lighton.png</property>
   </object>
   <object class="GtkImage" id="IMG_LIGHT_5">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="yalign">0.49000000953674316</property>
-    <property name="pixbuf">svx/res/lighton.png</property>
+    <property name="icon_name">svx/res/lighton.png</property>
   </object>
   <object class="GtkImage" id="IMG_LIGHT_6">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="yalign">0.50999999046325684</property>
-    <property name="pixbuf">svx/res/lighton.png</property>
+    <property name="icon_name">svx/res/lighton.png</property>
   </object>
   <object class="GtkImage" id="IMG_LIGHT_7">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="xalign">0.50999999046325684</property>
-    <property name="yalign">0.49000000953674316</property>
-    <property name="xpad">1</property>
-    <property name="pixbuf">svx/res/lighton.png</property>
+    <property name="icon_name">svx/res/lighton.png</property>
   </object>
   <object class="GtkImage" id="IMG_LIGHT_8">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">svx/res/lighton.png</property>
+    <property name="icon_name">svx/res/lighton.png</property>
   </object>
   <object class="GtkBox" id="tp_3D_SceneIllumination">
     <property name="visible">True</property>
@@ -96,131 +88,123 @@
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">12</property>
                         <child>
-                          <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_1">
+                          <object class="GtkToggleButton" id="BTN_LIGHT_1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_1|tooltip_text">Light source 1</property>
                             <property name="image">IMG_LIGHT_1</property>
+                            <property name="always_show_image">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_2">
+                          <object class="GtkToggleButton" id="BTN_LIGHT_2">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_2|tooltip_text">Light source 2</property>
                             <property name="image">IMG_LIGHT_2</property>
+                            <property name="always_show_image">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_3">
+                          <object class="GtkToggleButton" id="BTN_LIGHT_3">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_3|tooltip_text">Light source 3</property>
                             <property name="image">IMG_LIGHT_3</property>
+                            <property name="always_show_image">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_4">
+                          <object class="GtkToggleButton" id="BTN_LIGHT_4">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_4|tooltip_text">Light source 4</property>
                             <property name="image">IMG_LIGHT_4</property>
+                            <property name="always_show_image">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_5">
+                          <object class="GtkToggleButton" id="BTN_LIGHT_5">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_5|tooltip_text">Light source 5</property>
                             <property name="image">IMG_LIGHT_5</property>
+                            <property name="always_show_image">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_6">
+                          <object class="GtkToggleButton" id="BTN_LIGHT_6">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_6|tooltip_text">Light source 6</property>
                             <property name="image">IMG_LIGHT_6</property>
+                            <property name="always_show_image">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_7">
+                          <object class="GtkToggleButton" id="BTN_LIGHT_7">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_7|tooltip_text">Light source 7</property>
                             <property name="image">IMG_LIGHT_7</property>
+                            <property name="always_show_image">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="chartcontrollerlo-LightButton" id="BTN_LIGHT_8">
+                          <object class="GtkToggleButton" id="BTN_LIGHT_8">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_8|tooltip_text">Light source 8</property>
                             <property name="image">IMG_LIGHT_8</property>
+                            <property name="always_show_image">True</property>
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
@@ -236,9 +220,16 @@
                         <property name="can_focus">False</property>
                         <property name="spacing">12</property>
                         <child>
-                          <object class="svxcorelo-SvxColorListBox" id="LB_LIGHTSOURCE">
+                          <object class="GtkMenuButton" id="LB_LIGHTSOURCE">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="label" translatable="no"></property>
+                            <child>
+                              <placeholder/>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -247,7 +238,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="BTN_LIGHTSOURCE_COLOR">
+                          <object class="GtkToggleButton" id="BTN_LIGHTSOURCE_COLOR">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -276,10 +267,10 @@
               <object class="GtkLabel" id="FT_LIGHTSOURCE">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes" context="tp_3D_SceneIllumination|FT_LIGHTSOURCE">_Light source</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">BTN_LIGHT_1</property>
+                <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -310,9 +301,16 @@
                     <property name="can_focus">False</property>
                     <property name="spacing">12</property>
                     <child>
-                      <object class="svxcorelo-SvxColorListBox" id="LB_AMBIENTLIGHT">
+                      <object class="GtkMenuButton" id="LB_AMBIENTLIGHT">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="label" translatable="no"></property>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -321,7 +319,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="BTN_AMBIENT_COLOR">
+                      <object class="GtkToggleButton" id="BTN_AMBIENT_COLOR">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -343,10 +341,10 @@
               <object class="GtkLabel" id="FT_AMBIENTLIGHT">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
                 <property name="label" translatable="yes" context="tp_3D_SceneIllumination|FT_AMBIENTLIGHT">_Ambient light</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">LB_AMBIENTLIGHT</property>
+                <property name="xalign">0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -367,15 +365,77 @@
       </packing>
     </child>
     <child>
-      <object class="svxlo-SvxLightCtl3D" id="CTL_LIGHT_PREVIEW">
+      <object class="GtkScrolledWindow" id="scrolledwindow">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|CTL_LIGHT_PREVIEW|tooltip_text">Light Preview</property>
-        <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
+        <property name="can_focus">True</property>
+        <property name="hscrollbar_policy">never</property>
+        <property name="vscrollbar_policy">never</property>
+        <property name="shadow_type">in</property>
+        <child>
+          <object class="GtkViewport">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkDrawingArea" id="CTL_LIGHT_PREVIEW">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+                    <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|CTL_LIGHT_PREVIEW|tooltip_text">Light Preview</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="corner">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScale" id="hori">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="round_digits">1</property>
+                    <property name="draw_value">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScale" id="vert">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="round_digits">1</property>
+                    <property name="draw_value">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
       </object>
       <packing>
-        <property name="expand">False</property>
+        <property name="expand">True</property>
         <property name="fill">True</property>
         <property name="position">1</property>
       </packing>