Convert chart 3D scene geometry tabpage to widget

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

chart2/AllLangResTarget_chartcontroller.mk

@@ -47,7 +47,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
     chart2/source/controller/dialogs/Strings.src \
     chart2/source/controller/dialogs/Strings_Statistic.src \
     chart2/source/controller/dialogs/tp_3D_SceneAppearance.src \
-    chart2/source/controller/dialogs/tp_3D_SceneGeometry.src \
     chart2/source/controller/dialogs/tp_3D_SceneIllumination.src \
     chart2/source/controller/dialogs/tp_AxisLabel.src \
     chart2/source/controller/dialogs/tp_ChartType.src \

chart2/UIConfig_chart2.mk

@@ -36,6 +36,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
 	chart2/uiconfig/ui/smoothlinesdlg \
 	chart2/uiconfig/ui/steppedlinesdlg \
 	chart2/uiconfig/ui/titlerotationtabpage \
+	chart2/uiconfig/ui/tp_3D_SceneGeometry \
 	chart2/uiconfig/ui/tp_axisLabel \
 	chart2/uiconfig/ui/tp_AxisPositions \
 	chart2/uiconfig/ui/tp_LegendPosition \

chart2/source/controller/dialogs/tp_3D_SceneGeometry.hrc

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "ResourceIds.hrc"
-
-#define FT_X_ROTATION 1
-#define FT_Y_ROTATION 2
-#define FT_Z_ROTATION 3
-
-#define MTR_FLD_X_ROTATION 1
-#define MTR_FLD_Y_ROTATION 2
-#define MTR_FLD_Z_ROTATION 3
-#define MTR_FLD_PERSPECTIVE 4
-
-#define CBX_PERSPECTIVE 1
-#define CBX_RIGHT_ANGLED_AXES 2
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx

@@ -68,19 +68,17 @@ private:
     ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > m_xSceneProperties;
 
-    CheckBox        m_aCbxRightAngledAxes;
+    CheckBox*        m_pCbxRightAngledAxes;
 
-    FixedText       m_aFtXRotation;
-    MetricField     m_aMFXRotation;
+    MetricField*     m_pMFXRotation;
 
-    FixedText       m_aFtYRotation;
-    MetricField     m_aMFYRotation;
+    MetricField*     m_pMFYRotation;
 
-    FixedText       m_aFtZRotation;
-    MetricField     m_aMFZRotation;
+    FixedText*       m_pFtZRotation;
+    MetricField*     m_pMFZRotation;
 
-    CheckBox        m_aCbxPerspective;
-    MetricField     m_aMFPerspective;
+    CheckBox*        m_pCbxPerspective;
+    MetricField*     m_pMFPerspective;
 
     //to keep old values when switching to right angled axes
     sal_Int64       m_nXRotation;

chart2/source/controller/dialogs/tp_3D_SceneGeometry.src

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "tp_3D_SceneGeometry.hrc"
-#include "dlg_View3D.hrc"
-#include "HelpIds.hrc"
-#include <svtools/controldims.hrc>
-
-#define WIDTH_FL 108
-#define WIDTH_MF 57
-#define WIDTH_FT 50
-
-#define HEIGHT_FL 8
-#define HEIGHT_MF 12
-#define HEIGHT_FT 10
-
-#define POS_X_0 6
-#define POS_X_1 6
-#define POS_X_2 POS_X_1+WIDTH_FT+4
-
-#define POS_Y_0 (8)
-#define POS_Y_1 (POS_Y_0+RSC_CD_FIXEDTEXT_HEIGHT+10)
-#define POS_Y_2 (POS_Y_1+RSC_CD_FIXEDTEXT_HEIGHT+8)
-#define POS_Y_3 (POS_Y_2+RSC_CD_FIXEDTEXT_HEIGHT+8)
-#define POS_Y_4 (POS_Y_3+RSC_CD_FIXEDTEXT_HEIGHT+12)
-
-#define CUSTOMUNITTEXT_DEGREE \
-Border = TRUE ; \
-TabStop = TRUE ; \
-Repeat = TRUE ; \
-Spin = TRUE ; \
-Minimum = -180 ; \
-Maximum = 180 ; \
-StrictFormat = TRUE ; \
-DecimalDigits = 0 ; \
-First = -180 ; \
-Last = 180 ; \
-SpinSize = 1 ; \
-Unit = FUNIT_CUSTOM ; \
-CustomUnitText [ en-US ] = " degrees" ;
-
-TabPage TP_3D_SCENEGEOMETRY
-{
-    HelpID = HID_3D_VIEW ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Hide = TRUE ;
-    Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ;
-
-    CheckBox CBX_RIGHT_ANGLED_AXES
-    {
-        HelpID = "chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_RIGHT_ANGLED_AXES";
-        Pos = MAP_APPFONT ( POS_X_1 , POS_Y_0  ) ;
-        Size = MAP_APPFONT ( (WIDTH_FT+WIDTH_MF) , HEIGHT_FT ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Right-angled axes" ;
-    };
-    FixedText FT_X_ROTATION
-    {
-        Pos = MAP_APPFONT ( POS_X_1 , POS_Y_1  ) ;
-        Size = MAP_APPFONT ( WIDTH_FT , HEIGHT_FT ) ;
-        Text [ en-US ] = "~X rotation" ;
-    };
-    FixedText FT_Y_ROTATION
-    {
-        Pos = MAP_APPFONT ( POS_X_1 , POS_Y_2  ) ;
-        Size = MAP_APPFONT ( WIDTH_FT , HEIGHT_FT ) ;
-        Text [ en-US ] = "~Y rotation" ;
-    };
-    FixedText FT_Z_ROTATION
-    {
-        Pos = MAP_APPFONT ( POS_X_1 , POS_Y_3  ) ;
-        Size = MAP_APPFONT ( WIDTH_FT , HEIGHT_FT ) ;
-        Text [ en-US ] = "~Z rotation" ;
-    };
-    MetricField MTR_FLD_X_ROTATION
-    {
-        HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION";
-        Pos = MAP_APPFONT ( POS_X_2 , POS_Y_1-2  ) ;
-        Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ;
-        CUSTOMUNITTEXT_DEGREE
-    };
-    MetricField MTR_FLD_Y_ROTATION
-    {
-        HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Y_ROTATION";
-        Pos = MAP_APPFONT ( POS_X_2 , POS_Y_2-2  ) ;
-        Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ;
-        CUSTOMUNITTEXT_DEGREE
-    };
-    MetricField MTR_FLD_Z_ROTATION
-    {
-        HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Z_ROTATION";
-        Pos = MAP_APPFONT ( POS_X_2 , POS_Y_3-2 ) ;
-        Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ;
-        CUSTOMUNITTEXT_DEGREE
-    };
-
-    CheckBox CBX_PERSPECTIVE
-    {
-        HelpID = "chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_PERSPECTIVE";
-        Pos = MAP_APPFONT ( POS_X_1 , POS_Y_4  ) ;
-        Size = MAP_APPFONT ( WIDTH_FT , HEIGHT_FT ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Perspective" ;
-    };
-    MetricField MTR_FLD_PERSPECTIVE
-    {
-        HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_PERSPECTIVE";
-        Pos = MAP_APPFONT ( POS_X_2 , POS_Y_4-2  ) ;
-        Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 0 ;
-        First = 0 ;
-        Last = 100 ;
-        SpinSize = 5 ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText = "%" ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

chart2/uiconfig/ui/tp_3D_SceneGeometry.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustmentPERSPECTIVE">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentROTATION">
+    <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="GtkGrid" id="tp_3DSceneGeometry">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="row_spacing">6</property>
+    <property name="column_spacing">12</property>
+    <child>
+      <object class="GtkCheckButton" id="CBX_RIGHT_ANGLED_AXES">
+        <property name="label" translatable="yes">_Right-angled axes</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="receives_default">False</property>
+        <property name="use_underline">True</property>
+        <property name="xalign">0</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+        <property name="width">2</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="FT_X_ROTATION">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">_X rotation</property>
+        <property name="use_underline">True</property>
+        <property name="mnemonic_widget">MTR_FLD_X_ROTATION:0degrees</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="GtkLabel" id="FT_Y_ROTATION">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">_Y rotation</property>
+        <property name="use_underline">True</property>
+        <property name="mnemonic_widget">MTR_FLD_Y_ROTATION:0degrees</property>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">2</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="FT_Z_ROTATION">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="xalign">0</property>
+        <property name="label" translatable="yes">_Z rotation</property>
+        <property name="use_underline">True</property>
+        <property name="mnemonic_widget">MTR_FLD_Z_ROTATION:0degrees</property>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">3</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkCheckButton" id="CBX_PERSPECTIVE">
+        <property name="label" translatable="yes">_Perspective</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="receives_default">False</property>
+        <property name="use_underline">True</property>
+        <property name="xalign">0</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">4</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSpinButton" id="MTR_FLD_PERSPECTIVE:0%">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="invisible_char">•</property>
+        <property name="adjustment">adjustmentPERSPECTIVE</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">4</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSpinButton" id="MTR_FLD_Z_ROTATION:0degrees">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="invisible_char">•</property>
+        <property name="input_purpose">alpha</property>
+        <property name="adjustment">adjustmentROTATION</property>
+        <property name="update_policy">if-valid</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">3</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSpinButton" id="MTR_FLD_Y_ROTATION:0degrees">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="invisible_char">•</property>
+        <property name="adjustment">adjustmentROTATION</property>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">2</property>
+        <property name="width">1</property>
+        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSpinButton" id="MTR_FLD_X_ROTATION:0degrees">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="invisible_char">•</property>
+        <property name="adjustment">adjustmentROTATION</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>
+  </object>
+</interface>