[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
Olivier Hallot
olivier.hallot at edx.srv.br
Thu Nov 28 07:03:04 PST 2013
chart2/AllLangResTarget_chartcontroller.mk | 1
chart2/UIConfig_chart2.mk | 1
chart2/source/controller/dialogs/Strings_AdditionalControls.src | 13
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 118 ++++----
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc | 31 --
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx | 14
chart2/source/controller/dialogs/tp_3D_SceneAppearance.src | 94 ------
chart2/uiconfig/ui/tp_3D_SceneAppearance.ui | 143 ++++++++++
8 files changed, 207 insertions(+), 208 deletions(-)
New commits:
commit 1a404132d94af93d99b2ab65185d2c1b3efd78d4
Author: Olivier Hallot <olivier.hallot at edx.srv.br>
Date: Thu Nov 28 00:52:20 2013 -0200
Convert chart 3D scene appearance tabpage to .ui
Change-Id: I4b420b0abf0142837e525a5b35e5af882269b370
Reviewed-on: https://gerrit.libreoffice.org/6841
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index 15ada53..be89120 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
chart2/source/controller/dialogs/Strings_Scale.src \
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_SceneIllumination.src \
chart2/source/controller/dialogs/tp_AxisLabel.src \
chart2/source/controller/dialogs/tp_ChartType.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index adb5748..1481b20 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/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_SceneAppearance \
chart2/uiconfig/ui/tp_3D_SceneGeometry \
chart2/uiconfig/ui/tp_axisLabel \
chart2/uiconfig/ui/tp_AxisPositions \
diff --git a/chart2/source/controller/dialogs/Strings_AdditionalControls.src b/chart2/source/controller/dialogs/Strings_AdditionalControls.src
index 1f6f7a1..71c007c 100644
--- a/chart2/source/controller/dialogs/Strings_AdditionalControls.src
+++ b/chart2/source/controller/dialogs/Strings_AdditionalControls.src
@@ -18,19 +18,6 @@
*/
#include "Strings.hrc"
-String STR_3DSCHEME_SIMPLE
-{
- Text [ en-US ] = "Simple";
-};
-String STR_3DSCHEME_REALISTIC
-{
- Text [ en-US ] = "Realistic";
-};
-String STR_3DSCHEME_CUSTOM
-{
- Text [ en-US ] = "Custom";
-};
-
String STR_BAR_GEOMETRY
{
Text [ en-US ] = "Shape";
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index dc74f71..f051b5f 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -18,9 +18,6 @@
*/
#include "tp_3D_SceneAppearance.hxx"
-#include "tp_3D_SceneAppearance.hrc"
-#include "ResId.hxx"
-#include "Strings.hrc"
#include "ChartModelHelper.hxx"
#include "ThreeDHelper.hxx"
#include "macros.hxx"
@@ -91,32 +88,33 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(
Window* pWindow
, const uno::Reference< frame::XModel > & xChartModel
, ControllerLockHelper & rControllerLockHelper )
- : TabPage ( pWindow, SchResId( TP_3D_SCENEAPPEARANCE ) )
+ : TabPage ( pWindow
+ , "tp_3D_SceneAppearance"
+ , "modules/schart/ui/tp_3D_SceneAppearance.ui")
, m_xChartModel ( xChartModel )
- , m_aFT_Scheme ( this, SchResId( FT_SCHEME ) )
- , m_aLB_Scheme ( this, SchResId( LB_SCHEME ) )
- , m_aFL_Separator ( this, SchResId( FL_SEPARATOR ) )
- , m_aCB_Shading ( this, SchResId( CB_SHADING ) )
- , m_aCB_ObjectLines ( this, SchResId( CB_OBJECTLINES ) )
- , m_aCB_RoundedEdge ( this, SchResId( CB_ROUNDEDEDGE ) )
, m_bUpdateOtherControls( true )
, m_bCommitToModel( true )
, m_rControllerLockHelper( rControllerLockHelper )
{
- FreeResource();
- m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_SIMPLE),POS_3DSCHEME_SIMPLE);
- m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_REALISTIC),POS_3DSCHEME_REALISTIC);
- m_aLB_Scheme.SetDropDownLineCount(2);
- m_aLB_Scheme.SetSelectHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectSchemeHdl ) );
+ get(m_pLB_Scheme, "LB_SCHEME");
+ get(m_pCB_Shading, "CB_SHADING");
+ get(m_pCB_ObjectLines, "CB_OBJECTLINES");
+ get(m_pCB_RoundedEdge, "CB_ROUNDEDEDGE");
- m_aCB_RoundedEdge.SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines ) );
- m_aCB_Shading.SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectShading ) );
- m_aCB_ObjectLines.SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines ) );
+ m_aCustom = m_pLB_Scheme->GetEntry(POS_3DSCHEME_CUSTOM);
+ m_pLB_Scheme->RemoveEntry(POS_3DSCHEME_CUSTOM);
+ m_pLB_Scheme->SetDropDownLineCount(2);
- m_aCB_RoundedEdge.EnableTriState( sal_True );
- m_aCB_Shading.EnableTriState( sal_True );
- m_aCB_ObjectLines.EnableTriState( sal_True );
+ m_pLB_Scheme->SetSelectHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectSchemeHdl ) );
+
+ m_pCB_RoundedEdge->SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines ) );
+ m_pCB_Shading->SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectShading ) );
+ m_pCB_ObjectLines->SetToggleHdl( LINK( this, ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines ) );
+
+ m_pCB_RoundedEdge->EnableTriState( sal_True );
+ m_pCB_Shading->EnableTriState( sal_True );
+ m_pCB_ObjectLines->EnableTriState( sal_True );
initControlsFromModel();
}
@@ -140,7 +138,7 @@ void ThreeD_SceneAppearance_TabPage::applyRoundedEdgeAndObjectLinesToModel()
sal_Int32 nObjectLines = -1;
- switch( m_aCB_ObjectLines.GetState())
+ switch( m_pCB_ObjectLines->GetState())
{
case STATE_NOCHECK:
nObjectLines = 0;
@@ -154,7 +152,7 @@ void ThreeD_SceneAppearance_TabPage::applyRoundedEdgeAndObjectLinesToModel()
}
sal_Int32 nCurrentRoundedEdges = -1;
- switch( m_aCB_RoundedEdge.GetState() )
+ switch( m_pCB_RoundedEdge->GetState() )
{
case STATE_NOCHECK:
nCurrentRoundedEdges = 0;
@@ -180,7 +178,7 @@ void ThreeD_SceneAppearance_TabPage::applyShadeModeToModel()
drawing::ShadeMode aShadeMode = drawing::ShadeMode_PHONG;
- switch( m_aCB_Shading.GetState())
+ switch( m_pCB_Shading->GetState())
{
case STATE_NOCHECK:
aShadeMode = drawing::ShadeMode_FLAT;
@@ -205,52 +203,52 @@ void ThreeD_SceneAppearance_TabPage::initControlsFromModel()
if(aProps.m_aShadeMode == drawing::ShadeMode_FLAT)
{
- m_aCB_Shading.EnableTriState( sal_False );
- m_aCB_Shading.Check(sal_False);
+ m_pCB_Shading->EnableTriState( sal_False );
+ m_pCB_Shading->Check(sal_False);
}
else if(aProps.m_aShadeMode == drawing::ShadeMode_SMOOTH)
{
- m_aCB_Shading.EnableTriState( sal_False );
- m_aCB_Shading.Check(sal_True);
+ m_pCB_Shading->EnableTriState( sal_False );
+ m_pCB_Shading->Check(sal_True);
}
else
{
- m_aCB_Shading.EnableTriState( sal_True );
- m_aCB_Shading.SetState( STATE_DONTKNOW );
+ m_pCB_Shading->EnableTriState( sal_True );
+ m_pCB_Shading->SetState( STATE_DONTKNOW );
}
if(aProps.m_nObjectLines == 0)
{
- m_aCB_ObjectLines.EnableTriState( sal_False );
- m_aCB_ObjectLines.Check(sal_False);
+ m_pCB_ObjectLines->EnableTriState( sal_False );
+ m_pCB_ObjectLines->Check(sal_False);
}
else if(aProps.m_nObjectLines==1)
{
- m_aCB_ObjectLines.EnableTriState( sal_False );
- m_aCB_ObjectLines.Check(sal_True);
+ m_pCB_ObjectLines->EnableTriState( sal_False );
+ m_pCB_ObjectLines->Check(sal_True);
}
else
{
- m_aCB_ObjectLines.EnableTriState( sal_True );
- m_aCB_ObjectLines.SetState( STATE_DONTKNOW );
+ m_pCB_ObjectLines->EnableTriState( sal_True );
+ m_pCB_ObjectLines->SetState( STATE_DONTKNOW );
}
if(aProps.m_nRoundedEdges >= 5)
{
- m_aCB_RoundedEdge.EnableTriState( sal_False );
- m_aCB_RoundedEdge.Check(sal_True);
+ m_pCB_RoundedEdge->EnableTriState( sal_False );
+ m_pCB_RoundedEdge->Check(sal_True);
}
else if(aProps.m_nRoundedEdges<0)
{
- m_aCB_RoundedEdge.EnableTriState( sal_False );
- m_aCB_RoundedEdge.SetState( STATE_DONTKNOW );
+ m_pCB_RoundedEdge->EnableTriState( sal_False );
+ m_pCB_RoundedEdge->SetState( STATE_DONTKNOW );
}
else
{
- m_aCB_RoundedEdge.EnableTriState( sal_True );
- m_aCB_RoundedEdge.Check(sal_False);
+ m_pCB_RoundedEdge->EnableTriState( sal_True );
+ m_pCB_RoundedEdge->Check(sal_False);
}
- m_aCB_RoundedEdge.Enable( !m_aCB_ObjectLines.IsChecked() );
+ m_pCB_RoundedEdge->Enable( !m_pCB_ObjectLines->IsChecked() );
updateScheme();
@@ -262,24 +260,24 @@ void ThreeD_SceneAppearance_TabPage::updateScheme()
{
lcl_ModelProperties aProps( lcl_getPropertiesFromModel( m_xChartModel ));
- if( m_aLB_Scheme.GetEntryCount() == (POS_3DSCHEME_CUSTOM+1) )
+ if( m_pLB_Scheme->GetEntryCount() == (POS_3DSCHEME_CUSTOM+1) )
{
- m_aLB_Scheme.RemoveEntry(POS_3DSCHEME_CUSTOM);
- m_aLB_Scheme.SetDropDownLineCount(2);
+ m_pLB_Scheme->RemoveEntry(POS_3DSCHEME_CUSTOM);
+ m_pLB_Scheme->SetDropDownLineCount(2);
}
switch( aProps.m_eScheme )
{
case ThreeDLookScheme_Simple:
- m_aLB_Scheme.SelectEntryPos( POS_3DSCHEME_SIMPLE );
+ m_pLB_Scheme->SelectEntryPos( POS_3DSCHEME_SIMPLE );
break;
case ThreeDLookScheme_Realistic:
- m_aLB_Scheme.SelectEntryPos( POS_3DSCHEME_REALISTIC );
+ m_pLB_Scheme->SelectEntryPos( POS_3DSCHEME_REALISTIC );
break;
case ThreeDLookScheme_Unknown:
{
- m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_CUSTOM),POS_3DSCHEME_CUSTOM);
- m_aLB_Scheme.SelectEntryPos( POS_3DSCHEME_CUSTOM );
- m_aLB_Scheme.SetDropDownLineCount(3);
+ m_pLB_Scheme->InsertEntry(m_aCustom,POS_3DSCHEME_CUSTOM);
+ m_pLB_Scheme->SelectEntryPos( POS_3DSCHEME_CUSTOM );
+ m_pLB_Scheme->SetDropDownLineCount(3);
}
break;
}
@@ -296,9 +294,9 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl)
uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( m_xChartModel ) );
- if( m_aLB_Scheme.GetSelectEntryPos() == POS_3DSCHEME_REALISTIC )
+ if( m_pLB_Scheme->GetSelectEntryPos() == POS_3DSCHEME_REALISTIC )
ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic );
- else if( m_aLB_Scheme.GetSelectEntryPos() == POS_3DSCHEME_SIMPLE )
+ else if( m_pLB_Scheme->GetSelectEntryPos() == POS_3DSCHEME_SIMPLE )
ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Simple );
else
{
@@ -316,7 +314,7 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading)
if( !m_bUpdateOtherControls )
return 0;
- m_aCB_Shading.EnableTriState( sal_False );
+ m_pCB_Shading->EnableTriState( sal_False );
applyShadeModeToModel();
updateScheme();
return 0;
@@ -326,17 +324,17 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, Check
if( !m_bUpdateOtherControls )
return 0;
- if( pCheckBox == &m_aCB_ObjectLines )
+ if( pCheckBox == m_pCB_ObjectLines )
{
- m_aCB_ObjectLines.EnableTriState( sal_False );
+ m_pCB_ObjectLines->EnableTriState( sal_False );
m_bUpdateOtherControls = false;
- m_aCB_RoundedEdge.Enable( !m_aCB_ObjectLines.IsChecked() );
- if(!m_aCB_RoundedEdge.IsEnabled())
- m_aCB_RoundedEdge.Check(sal_False);
+ m_pCB_RoundedEdge->Enable( !m_pCB_ObjectLines->IsChecked() );
+ if(!m_pCB_RoundedEdge->IsEnabled())
+ m_pCB_RoundedEdge->Check(sal_False);
m_bUpdateOtherControls = true;
}
else
- m_aCB_RoundedEdge.EnableTriState( sal_False );
+ m_pCB_RoundedEdge->EnableTriState( sal_False );
applyRoundedEdgeAndObjectLinesToModel();
updateScheme();
return 0;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc
deleted file mode 100644
index 66fc1d2..0000000
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc
+++ /dev/null
@@ -1,31 +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"
-
-#define FT_SCHEME 1
-
-#define CB_OBJECTLINES 1
-#define CB_SHADING 2
-#define CB_ROUNDEDEDGE 3
-
-#define FL_SEPARATOR 1
-
-#define LB_SCHEME 2
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index 33e863e..344e3c1 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -21,8 +21,6 @@
// header for class TabPage
#include <vcl/tabpage.hxx>
-// header for class FixedLine
-#include <vcl/fixed.hxx>
// header for class MetricField
#include <vcl/field.hxx>
// header for class CheckBox
@@ -65,17 +63,15 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
m_xChartModel;
- FixedText m_aFT_Scheme;
- ListBox m_aLB_Scheme;
+ ListBox* m_pLB_Scheme;
- FixedLine m_aFL_Separator;
-
- CheckBox m_aCB_Shading;
- CheckBox m_aCB_ObjectLines;
- CheckBox m_aCB_RoundedEdge;
+ CheckBox* m_pCB_Shading;
+ CheckBox* m_pCB_ObjectLines;
+ CheckBox* m_pCB_RoundedEdge;
bool m_bUpdateOtherControls;
bool m_bCommitToModel;
+ OUString m_aCustom;
ControllerLockHelper & m_rControllerLockHelper;
};
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
deleted file mode 100644
index 5e51ae9..0000000
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src
+++ /dev/null
@@ -1,94 +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 "tp_3D_SceneAppearance.hrc"
-#include "dlg_View3D.hrc"
-
-#define WIDTH_FL 108
-#define WIDTH_LB 57
-#define WIDTH_FT 41
-
-#define HEIGHT_FL 8
-#define HEIGHT_LB 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_SCHEME 8
-#define POS_Y_SEPARATOR (POS_Y_SCHEME+13)
-
-#define POS_Y_SHADING (POS_Y_SEPARATOR+16)
-#define POS_Y_OBJECTLINES (POS_Y_SHADING+16)
-#define POS_Y_ROUNDEDEDGE (POS_Y_OBJECTLINES+16)
-
-
-TabPage TP_3D_SCENEAPPEARANCE
-{
- HelpID = "chart2:TabPage:TP_3D_SCENEAPPEARANCE";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( VIEW3D_PAGE_WIDTH , VIEW3D_PAGE_HEIGHT ) ;
-
- FixedText FT_SCHEME
- {
- Pos = MAP_APPFONT ( POS_X_1 , POS_Y_SCHEME ) ;
- Size = MAP_APPFONT ( WIDTH_FT , HEIGHT_FT ) ;
- Text [ en-US ] = "Sche~me" ;
- };
- ListBox LB_SCHEME
- {
- HelpID = "chart2:ListBox:TP_3D_SCENEAPPEARANCE:LB_SCHEME";
- Border = TRUE;
- TabStop = TRUE;
- DropDown = TRUE;
- Pos = MAP_APPFONT ( POS_X_2 , POS_Y_SCHEME-2 ) ;
- Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ;
- };
- FixedLine FL_SEPARATOR
- {
- Pos = MAP_APPFONT ( POS_X_0 , POS_Y_SEPARATOR ) ;
- Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_FL ) ;
- };
-
- CheckBox CB_SHADING
- {
- HelpID = "chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_SHADING";
- Pos = MAP_APPFONT ( POS_X_1 , POS_Y_SHADING ) ;
- Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_LB ) ;
- Text [ en-US ] = "~Shading" ;
- };
- CheckBox CB_OBJECTLINES
- {
- HelpID = "chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_OBJECTLINES";
- Pos = MAP_APPFONT ( POS_X_1 , POS_Y_OBJECTLINES ) ;
- Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_LB ) ;
- Text [ en-US ] = "~Object borders" ;
- };
- Checkbox CB_ROUNDEDEDGE
- {
- Pos = MAP_APPFONT ( POS_X_1 , POS_Y_ROUNDEDEDGE ) ;
- Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_LB ) ;
- Text [ en-US ] = "~Rounded edges" ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
new file mode 100644
index 0000000..987f438
--- /dev/null
+++ b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkListStore" id="liststoreSCHEME">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name guint1 -->
+ <column type="guint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Simple</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Realistic</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Custom</col>
+ <col id="1">2</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkBox" id="tp_3D_SceneAppearance">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_SCHEME">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Sche_me</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="LB_SCHEME">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">liststoreSCHEME</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkSeparator" id="separator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_SHADING">
+ <property name="label" translatable="yes">_Shading</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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_OBJECTLINES">
+ <property name="label" translatable="yes">_Object borders</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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_ROUNDEDEDGE">
+ <property name="label" translatable="yes">_Rounded edges</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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list