From e3a5fec0ead2d0ac5319265c19b4988cf241d81d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 9 Dec 2013 20:23:16 +0000 Subject: convert 3dview dialog to .ui Change-Id: I790d8cccedeac70f5430cfb75e03914472b9c3d6 --- chart2/AllLangResTarget_chartcontroller.mk | 1 - chart2/UIConfig_chart2.mk | 1 + chart2/source/controller/dialogs/ResourceIds.hrc | 1 - chart2/source/controller/dialogs/dlg_View3D.cxx | 31 +- chart2/source/controller/dialogs/dlg_View3D.hrc | 34 -- chart2/source/controller/dialogs/dlg_View3D.src | 41 -- chart2/source/controller/inc/HelpIds.hrc | 1 - chart2/source/controller/inc/dlg_View3D.hxx | 7 +- chart2/uiconfig/ui/3dviewdialog.ui | 91 +++++ chart2/uiconfig/ui/tp_3D_SceneIllumination.ui | 467 +++++++++++++---------- 10 files changed, 371 insertions(+), 304 deletions(-) delete mode 100644 chart2/source/controller/dialogs/dlg_View3D.hrc delete mode 100644 chart2/source/controller/dialogs/dlg_View3D.src create mode 100644 chart2/uiconfig/ui/3dviewdialog.ui diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index a3affa32b52b..9342cc7d8932 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -37,7 +37,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\ chart2/source/controller/dialogs/dlg_InsertLegend.src \ chart2/source/controller/dialogs/dlg_ShapeFont.src \ chart2/source/controller/dialogs/dlg_ShapeParagraph.src \ - chart2/source/controller/dialogs/dlg_View3D.src \ chart2/source/controller/dialogs/res_BarGeometry.src \ chart2/source/controller/dialogs/res_TextSeparator.src \ chart2/source/controller/dialogs/Strings_AdditionalControls.src \ diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk index a146bf93bcc4..41a5fa906149 100644 --- a/chart2/UIConfig_chart2.mk +++ b/chart2/UIConfig_chart2.mk @@ -30,6 +30,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/schart,\ )) $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\ + chart2/uiconfig/ui/3dviewdialog \ chart2/uiconfig/ui/attributedialog \ chart2/uiconfig/ui/insertaxisdlg \ chart2/uiconfig/ui/insertgriddlg \ diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index fa61cce5a16b..10effe188762 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -30,7 +30,6 @@ #define DLG_DATA_SOURCE 901 #define DLG_DATA_DESCR 836 #define DLG_LEGEND 835 -#define DLG_3D_VIEW 752 #define DLG_SPLINE_PROPERTIES 904 #define DLG_DATA_YERRORBAR 842 #define DLG_SHAPE_FONT 921 diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 7eda837d5382..61f382668247 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -18,7 +18,6 @@ */ #include "dlg_View3D.hxx" -#include "dlg_View3D.hrc" #include "Strings.hrc" #include "TabPages.hrc" #include "ResId.hxx" @@ -42,32 +41,28 @@ using namespace ::com::sun::star::chart2; sal_uInt16 View3DDialog::m_nLastPageId = 0; View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, const XColorListRef &pColorTable ) - : TabDialog(pParent,SchResId(DLG_3D_VIEW)) - , m_aTabControl(this,SchResId(TABCTRL)) - , m_aBtnOK(this,SchResId(BTN_OK)) - , m_aBtnCancel(this,SchResId(BTN_CANCEL)) - , m_aBtnHelp(this,SchResId(BTN_HELP)) + : TabDialog(pParent, "3DViewDialog", "modules/schart/ui/3dviewdialog.ui") , m_pGeometry(0) , m_pAppearance(0) , m_pIllumination(0) , m_aControllerLocker(xChartModel) { - FreeResource(); + get(m_pTabControl, "tabcontrol"); uno::Reference< beans::XPropertySet > xSceneProperties( ChartModelHelper::findDiagram( xChartModel ), uno::UNO_QUERY ); - m_pGeometry = new ThreeD_SceneGeometry_TabPage(&m_aTabControl,xSceneProperties,m_aControllerLocker); - m_pAppearance = new ThreeD_SceneAppearance_TabPage(&m_aTabControl,xChartModel,m_aControllerLocker); - m_pIllumination = new ThreeD_SceneIllumination_TabPage(&m_aTabControl,xSceneProperties,xChartModel,pColorTable); + m_pGeometry = new ThreeD_SceneGeometry_TabPage(m_pTabControl,xSceneProperties,m_aControllerLocker); + m_pAppearance = new ThreeD_SceneAppearance_TabPage(m_pTabControl,xChartModel,m_aControllerLocker); + m_pIllumination = new ThreeD_SceneIllumination_TabPage(m_pTabControl,xSceneProperties,xChartModel,pColorTable); - m_aTabControl.InsertPage( TP_3D_SCENEGEOMETRY, SCH_RESSTR(STR_PAGE_PERSPECTIVE) ); - m_aTabControl.InsertPage( TP_3D_SCENEAPPEARANCE, SCH_RESSTR(STR_PAGE_APPEARANCE) ); - m_aTabControl.InsertPage( TP_3D_SCENEILLUMINATION, SCH_RESSTR(STR_PAGE_ILLUMINATION) ); + m_pTabControl->InsertPage( TP_3D_SCENEGEOMETRY, SCH_RESSTR(STR_PAGE_PERSPECTIVE) ); + m_pTabControl->InsertPage( TP_3D_SCENEAPPEARANCE, SCH_RESSTR(STR_PAGE_APPEARANCE) ); + m_pTabControl->InsertPage( TP_3D_SCENEILLUMINATION, SCH_RESSTR(STR_PAGE_ILLUMINATION) ); - m_aTabControl.SetTabPage( TP_3D_SCENEGEOMETRY, m_pGeometry ); - m_aTabControl.SetTabPage( TP_3D_SCENEAPPEARANCE, m_pAppearance ); - m_aTabControl.SetTabPage( TP_3D_SCENEILLUMINATION, m_pIllumination ); + m_pTabControl->SetTabPage( TP_3D_SCENEGEOMETRY, m_pGeometry ); + m_pTabControl->SetTabPage( TP_3D_SCENEAPPEARANCE, m_pAppearance ); + m_pTabControl->SetTabPage( TP_3D_SCENEILLUMINATION, m_pIllumination ); - m_aTabControl.SelectTabPage( m_nLastPageId ); + m_pTabControl->SelectTabPage( m_nLastPageId ); } View3DDialog::~View3DDialog() @@ -76,7 +71,7 @@ View3DDialog::~View3DDialog() delete m_pAppearance; delete m_pIllumination; - m_nLastPageId = m_aTabControl.GetCurPageId(); + m_nLastPageId = m_pTabControl->GetCurPageId(); } short View3DDialog::Execute() diff --git a/chart2/source/controller/dialogs/dlg_View3D.hrc b/chart2/source/controller/dialogs/dlg_View3D.hrc deleted file mode 100644 index 3e4269f25215..000000000000 --- a/chart2/source/controller/dialogs/dlg_View3D.hrc +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- 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" - -//position and size defines: -#define VIEW3D_PAGE_WIDTH 160 -#define VIEW3D_PAGE_HEIGHT 110 - -//resource ids: - -#define TABCTRL 1 - -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP 3 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/dlg_View3D.src b/chart2/source/controller/dialogs/dlg_View3D.src deleted file mode 100644 index dc74fb37ede4..000000000000 --- a/chart2/source/controller/dialogs/dlg_View3D.src +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- 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 "dlg_View3D.hrc" -#include "CommonResources.hrc" -#include "HelpIds.hrc" - -TabDialog DLG_3D_VIEW -{ - HelpID = HID_3D_VIEW ; - OutputSize = TRUE ; - SVLook = TRUE ; - Moveable = TRUE ; - Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT+40 ) ; - Text [ en-US ] = "3D View" ; - TabControl TABCTRL - { - OutputSize = TRUE ; - Pos = MAP_APPFONT ( 3 , 3 ) ; - Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ; - }; - BUTTONS_OK_CANCEL_HELP_STACKED(VIEW3D_PAGE_HEIGHT+3) -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index 2d0a4f32cba7..2c853445a7e7 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -102,7 +102,6 @@ #define HID_SCH_STATISTIK_SHOW_NEGATIVE "CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE" #define HID_DIAGRAM_TYPE "CHART2_HID_DIAGRAM_TYPE" -#define HID_3D_VIEW "CHART2_HID_3D_VIEW" #define HID_DIAGRAM_DATA "CHART2_HID_DIAGRAM_DATA" #define HID_INSERT_STATISTICS "CHART2_HID_INSERT_STATISTICS" #define HID_INSERT_CHART_LEGEND "CHART2_HID_INSERT_CHART_LEGEND" diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index bfd6b12e5c5c..f4a13a9e0a62 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -26,8 +26,6 @@ #include // header for class TabControl #include -// header for class OKButton -#include // header for class XColorList #include @@ -51,10 +49,7 @@ public: virtual short Execute(); private: - TabControl m_aTabControl; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; - HelpButton m_aBtnHelp; + TabControl* m_pTabControl; ThreeD_SceneGeometry_TabPage* m_pGeometry; ThreeD_SceneAppearance_TabPage* m_pAppearance; diff --git a/chart2/uiconfig/ui/3dviewdialog.ui b/chart2/uiconfig/ui/3dviewdialog.ui new file mode 100644 index 000000000000..e32c1be9b72b --- /dev/null +++ b/chart2/uiconfig/ui/3dviewdialog.ui @@ -0,0 +1,91 @@ + + + + + False + 6 + 3D View + dialog + + + False + vertical + 12 + + + False + end + + + gtk-ok + True + True + True + True + True + True + + + False + True + 0 + + + + + gtk-cancel + True + True + True + True + + + False + True + 1 + + + + + gtk-help + True + True + True + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + True + True + True + + + False + True + 1 + + + + + + ok + cancel + help + + + diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui index 429a7896be46..6addfed914d4 100644 --- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui +++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui @@ -70,242 +70,303 @@ True False vertical - 6 + 12 - + True False - 0 - _Light source - True - BTN_LIGHT_1 - - - False - True - 0 - - - - - True - False - 6 - 12 + 0 + none - + True False - True - Light source 1 - IMG_LIGHT_1 + 6 + 12 + + + True + False + vertical + 6 + + + True + False + 6 + 12 + + + True + True + True + True + Light source 1 + Light source 1 + IMG_LIGHT_1 + + + 0 + 0 + 1 + 1 + + + + + True + True + True + True + Light source 2 + Light source 2 + IMG_LIGHT_2 + + + 1 + 0 + 1 + 1 + + + + + True + True + True + True + Light source 3 + Light source 3 + IMG_LIGHT_3 + + + 2 + 0 + 1 + 1 + + + + + True + True + True + True + Light source 4 + Light source 4 + IMG_LIGHT_4 + + + 3 + 0 + 1 + 1 + + + + + True + True + True + True + Light source 5 + Light source 5 + IMG_LIGHT_5 + + + 0 + 1 + 1 + 1 + + + + + True + True + True + True + Light source 6 + Light source 6 + IMG_LIGHT_6 + + + 1 + 1 + 1 + 1 + + + + + True + True + True + True + Light source 7 + Light source 7 + IMG_LIGHT_7 + + + 2 + 1 + 1 + 1 + + + + + True + True + True + True + Light source 8 + Light source 8 + IMG_LIGHT_8 + + + 3 + 1 + 1 + 1 + + + + + False + True + 0 + + + + + True + False + 12 + + + True + False + + + False + True + 0 + + + + + True + True + True + True + Select a color using the color dialog + Select a color using the color dialog + IMG_LIGHTSOURCE_COLOR + + + False + True + 1 + + + + + False + True + 1 + + + + - - 0 - 0 - 1 - 1 - - - + + True False - True - Light source 2 - IMG_LIGHT_2 + 0 + _Light source + True + BTN_LIGHT_1 + + + - - 1 - 0 - 1 - 1 - - - - True - False - True - Light source 3 - IMG_LIGHT_3 - - - 2 - 0 - 1 - 1 - - - - - True - False - True - Light source 4 - IMG_LIGHT_4 - - - 3 - 0 - 1 - 1 - - - - - True - False - True - Light source 5 - IMG_LIGHT_5 - - - 0 - 1 - 1 - 1 - - - - - True - False - True - Light source 6 - IMG_LIGHT_6 - - - 1 - 1 - 1 - 1 - - - - - True - False - True - Light source 7 - IMG_LIGHT_7 - - - 2 - 1 - 1 - 1 - - - - - True - False - True - Light source 8 - IMG_LIGHT_8 - - - 3 - 1 - 1 - 1 - - - - - False - True - 1 - - - - - True - False - 12 - - - True - False - - - False - True - 0 - - - - - True - False - True - Select a color using the color dialog - IMG_LIGHTSOURCE_COLOR - - - False - True - 1 - - - - - False - True - 2 - - - - - True - False - 0 - _Ambient light - True - LB_AMBIENTLIGHT False True - 3 + 0 - + True False - 12 + 0 + none - + True False + 6 + 12 + + + True + False + 12 + + + True + False + + + False + True + 0 + + + + + True + True + True + True + Select a color using the color dialog + Select a color using the color dialog + IMG_AMBIENT_COLOR + + + False + True + 1 + + + + - - False - True - 0 - - - + + True False - True - Select a color using the color dialog - IMG_AMBIENT_COLOR + 0 + _Ambient light + True + LB_AMBIENTLIGHT + + + - - False - True - 1 - False True - 4 + 1 @@ -320,6 +381,8 @@ True False Light Preview + True + True False -- cgit