Skip to content

C
core
Kaydet (Commit) e3a5fec0 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert 3dview dialog to .ui 

Change-Id: I790d8cccedeac70f5430cfb75e03914472b9c3d6
üst 10583b74
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 102 deletions
chart2/AllLangResTarget_chartcontroller.mk
Dosyayı görüntüle @ e3a5fec0
......@@ -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 \
......
chart2/UIConfig_chart2.mk
Dosyayı görüntüle @ e3a5fec0
......@@ -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 \
......
chart2/source/controller/dialogs/ResourceIds.hrc
Dosyayı görüntüle @ e3a5fec0
......@@ -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
......
chart2/source/controller/dialogs/dlg_View3D.cxx
Dosyayı görüntüle @ e3a5fec0
......@@ -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()
......
chart2/source/controller/dialogs/dlg_View3D.hrc deleted 100644 → 0
Dosyayı görüntüle @ 10583b74
/* -*- 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: */
chart2/source/controller/dialogs/dlg_View3D.src deleted 100644 → 0
Dosyayı görüntüle @ 10583b74
/* -*- 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: */
chart2/source/controller/inc/HelpIds.hrc
Dosyayı görüntüle @ e3a5fec0
......@@ -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"
......
chart2/source/controller/inc/dlg_View3D.hxx
Dosyayı görüntüle @ e3a5fec0
......@@ -26,8 +26,6 @@
#include <vcl/tabdlg.hxx>
// header for class TabControl
#include <vcl/tabctrl.hxx>
// header for class OKButton
#include <vcl/button.hxx>
// header for class XColorList
#include <svx/xtable.hxx>
......@@ -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;
......
chart2/uiconfig/ui/3dviewdialog.ui 0 → 100644
Dosyayı görüntüle @ e3a5fec0
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="3DViewDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">3D View</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">ok</action-widget>
<action-widget response="0">cancel</action-widget>
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment