diff options
| -rw-r--r-- | extras/source/glade/libreoffice-catalog.xml.in | 3 | ||||
| -rw-r--r-- | include/svx/dialogs.hrc | 3 | ||||
| -rw-r--r-- | include/svx/dlgctl3d.hxx | 15 | ||||
| -rw-r--r-- | include/svx/float3d.hxx | 204 | ||||
| -rw-r--r-- | svx/UIConfig_svx.mk | 1 | ||||
| -rw-r--r-- | svx/source/dialog/dlgctl3d.cxx | 36 | ||||
| -rw-r--r-- | svx/source/engine3d/float3d.cxx | 2059 | ||||
| -rw-r--r-- | svx/source/engine3d/float3d.src | 1119 | ||||
| -rw-r--r-- | svx/uiconfig/ui/docking3deffects.ui | 2048 |
9 files changed, 3016 insertions, 2472 deletions
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index fff29911d0b7..d2f5aca4a287 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -337,6 +337,9 @@ <glade-widget-class title="Svx 3D Light Control" name="svxlo-SvxLightCtl3D" generic-name="3D Light Control" parent="GtkDrawingArea" icon-name="widget-gtk-drawingarea"/> + <glade-widget-class title="Svx 3D Preview Control" name="svxlo-Svx3DPreviewControl" + generic-name="3D Preview Control" parent="GtkDrawingArea" + icon-name="widget-gtk-drawingarea"/> <glade-widget-class title="Frame Selector" name="svxlo-SvxFrameSelector" generic-name="Frame Border Preview Window" parent="GtkDrawingArea" icon-name="widget-gtk-drawingarea"/> diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index fefec1a57385..0c02465916ef 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -140,13 +140,10 @@ #define RID_SVXIL_FRAME (RID_SVX_START + 65) #define RID_SVXIL_DATANAVI (RID_SVX_START + 66) -#define RID_SVXFLOAT_3D (RID_SVX_START + 209) - #define RID_SVXIMAGE_LIGHT_ON (RID_SVX_START + 210) #define RID_SVXIMAGE_LIGHT_OFF (RID_SVX_START + 211) #define RID_SVXIMAGE_COLORDLG (RID_SVX_START + 214) -#define RID_SVXFLOAT3D_COLOR_LIGHT_PRE (RID_SVX_START + 72) #define RID_SVXFLOAT3D_FAVORITE (RID_SVX_START + 73) #define RID_SVXFLOAT3D_FIX_X (RID_SVX_START + 74) #define RID_SVXFLOAT3D_FIX_Y (RID_SVX_START + 75) diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 8d3901bc3a5e..31796a24ab8a 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -27,21 +27,15 @@ #include <svx/svxdllapi.h> #include <basegfx/vector/b3dvector.hxx> - - class FmFormModel; class FmFormPage; class E3dView; class E3dPolyScene; class E3dObject; - - #define PREVIEW_OBJECTTYPE_SPHERE 0x0000 #define PREVIEW_OBJECTTYPE_CUBE 0x0001 - - class SVX_DLLPUBLIC Svx3DPreviewControl : public Control { protected: @@ -55,13 +49,13 @@ protected: void Construct(); public: - Svx3DPreviewControl(vcl::Window* pParent, const ResId& rResId); Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~Svx3DPreviewControl(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void Reset(); virtual void SetObjectType(sal_uInt16 nType); @@ -70,8 +64,6 @@ public: virtual void Set3DAttributes(const SfxItemSet& rAttr); }; - - class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl { // Callback for interactive changes @@ -149,8 +141,6 @@ public: basegfx::B3DVector GetLightDirection(sal_uInt32 nNum) const; }; - - class SVX_DLLPUBLIC SvxLightCtl3D : public Control { private: @@ -165,8 +155,7 @@ private: Link maUserSelectionChangeCallback; public: - SvxLightCtl3D( vcl::Window* pParent, const ResId& rResId); - SvxLightCtl3D( vcl::Window* pParent); + SvxLightCtl3D(vcl::Window* pParent); virtual ~SvxLightCtl3D(); // react to size changes diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 610ec06b896a..fcc6dce4f987 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -60,134 +60,114 @@ class SVX_DLLPUBLIC Svx3DWin : public SfxDockingWindow using Window::Update; private: - ImageButton aBtnGeo; - ImageButton aBtnRepresentation; - ImageButton aBtnLight; - ImageButton aBtnTexture; - ImageButton aBtnMaterial; - ImageButton aBtnUpdate; - ImageButton aBtnAssign; + PushButton* m_pBtnGeo; + PushButton* m_pBtnRepresentation; + PushButton* m_pBtnLight; + PushButton* m_pBtnTexture; + PushButton* m_pBtnMaterial; + PushButton* m_pBtnUpdate; + PushButton* m_pBtnAssign; // geometry - FixedLine aFLGeometrie; - FixedText aFtPercentDiagonal; - MetricField aMtrPercentDiagonal; - FixedText aFtBackscale; - MetricField aMtrBackscale; - FixedText aFtEndAngle; - MetricField aMtrEndAngle; - FixedText aFtDepth; - MetricField aMtrDepth; - FixedLine aFLSegments; - - FixedText aFtHorizontal; - NumericField aNumHorizontal; - FixedText aFtVertical; - NumericField aNumVertical; - FixedLine aFLNormals; - - ImageButton aBtnNormalsObj; - ImageButton aBtnNormalsFlat; - ImageButton aBtnNormalsSphere; - ImageButton aBtnNormalsInvert; - ImageButton aBtnTwoSidedLighting; - - ImageButton aBtnDoubleSided; - FixedLine aFLRepresentation; + VclContainer* m_pFLGeometrie; + FixedText* m_pFtPercentDiagonal; + MetricField* m_pMtrPercentDiagonal; + FixedText* m_pFtBackscale; + MetricField* m_pMtrBackscale; + FixedText* m_pFtEndAngle; + MetricField* m_pMtrEndAngle; + FixedText* m_pFtDepth; + MetricField* m_pMtrDepth; + + VclContainer* m_pFLSegments; + NumericField* m_pNumHorizontal; + NumericField* m_pNumVertical; + + VclContainer* m_pFLNormals; + PushButton* m_pBtnNormalsObj; + PushButton* m_pBtnNormalsFlat; + PushButton* m_pBtnNormalsSphere; + PushButton* m_pBtnNormalsInvert; + PushButton* m_pBtnTwoSidedLighting; + PushButton* m_pBtnDoubleSided; + // presentation - FixedText aFtShademode; - ListBox aLbShademode; - FixedLine aFLShadow; - ImageButton aBtnShadow3d; - FixedText aFtSlant; - MetricField aMtrSlant; - FixedText aFtDistance; - MetricField aMtrDistance; - FixedText aFtFocalLeng; - MetricField aMtrFocalLength; - FixedLine aFLCamera; - FixedLine aFLLight; + VclContainer* m_pFLRepresentation; + ListBox* m_pLbShademode; + + VclContainer* m_pFLShadow; + PushButton* m_pBtnShadow3d; + FixedText* m_pFtSlant; + MetricField* m_pMtrSlant; + + VclContainer* m_pFLCamera; + MetricField* m_pMtrDistance; + MetricField* m_pMtrFocalLength; // lighting - ImageButton aBtnLight1; - ImageButton aBtnLight2; - ImageButton aBtnLight3; - ImageButton aBtnLight4; - ImageButton aBtnLight5; - ImageButton aBtnLight6; - ImageButton aBtnLight7; - ImageButton aBtnLight8; - FixedText aFTLightsource; - ColorLB aLbLight1; - ColorLB aLbLight2; - ColorLB aLbLight3; - ColorLB aLbLight4; - ColorLB aLbLight5; - ColorLB aLbLight6; - ColorLB aLbLight7; - ColorLB aLbLight8; - - ImageButton aBtnLightColor; - - // #99694# Keyboard shortcuts activate the next control, so the - // order needed to be changed here - FixedText aFTAmbientlight; // Text label - ColorLB aLbAmbientlight; // ListBox - ImageButton aBtnAmbientColor; // color button - - FixedLine aFLTexture; + VclContainer* m_pFLLight; + PushButton* m_pBtnLight1; + PushButton* m_pBtnLight2; + PushButton* m_pBtnLight3; + PushButton* m_pBtnLight4; + PushButton* m_pBtnLight5; + PushButton* m_pBtnLight6; + PushButton* m_pBtnLight7; + PushButton* m_pBtnLight8; + ColorLB* m_pLbLight1; + ColorLB* m_pLbLight2; + ColorLB* m_pLbLight3; + ColorLB* m_pLbLight4; + ColorLB* m_pLbLight5; + ColorLB* m_pLbLight6; + ColorLB* m_pLbLight7; + ColorLB* m_pLbLight8; + PushButton* m_pBtnLightColor; + ColorLB* m_pLbAmbientlight; // ListBox + PushButton* m_pBtnAmbientColor; // color button // Textures - FixedText aFtTexKind; - ImageButton aBtnTexLuminance; - ImageButton aBtnTexColor; - FixedText aFtTexMode; - ImageButton aBtnTexReplace; - ImageButton aBtnTexModulate; - ImageButton aBtnTexBlend; - FixedText aFtTexProjectionX; - ImageButton aBtnTexObjectX; - ImageButton aBtnTexParallelX; - ImageButton aBtnTexCircleX; - FixedText aFtTexProjectionY; - ImageButton aBtnTexObjectY; - ImageButton aBtnTexParallelY; - ImageButton aBtnTexCircleY; - FixedText aFtTexFilter; - ImageButton aBtnTexFilter; + VclContainer* m_pFLTexture; + PushButton* m_pBtnTexLuminance; + PushButton* m_pBtnTexColor; + PushButton* m_pBtnTexReplace; + PushButton* m_pBtnTexModulate; + PushButton* m_pBtnTexBlend; + PushButton* m_pBtnTexObjectX; + PushButton* m_pBtnTexParallelX; + PushButton* m_pBtnTexCircleX; + PushButton* m_pBtnTexObjectY; + PushButton* m_pBtnTexParallelY; + PushButton* m_pBtnTexCircleY; + PushButton* m_pBtnTexFilter; // material // material editor - FixedLine aFLMaterial; - FixedText aFtMatFavorites; - ListBox aLbMatFavorites; - FixedText aFtMatColor; - ColorLB aLbMatColor; - ImageButton aBtnMatColor; - FixedText aFtMatEmission; - ColorLB aLbMatEmission; - ImageButton aBtnEmissionColor; - FixedLine aFLMatSpecular; - FixedText aFtMatSpecular; - ColorLB aLbMatSpecular; - ImageButton aBtnSpecularColor; - FixedText aFtMatSpecularIntensity; - MetricField aMtrMatSpecularIntensity; - - Svx3DPreviewControl aCtlPreview; - SvxLightCtl3D aCtlLightPreview; + VclContainer* m_pFLMaterial; + ListBox* m_pLbMatFavorites; + ColorLB* m_pLbMatColor; + PushButton* m_pBtnMatColor; + ColorLB* m_pLbMatEmission; + PushButton* m_pBtnEmissionColor; + + VclContainer* m_pFLMatSpecular; + ColorLB* m_pLbMatSpecular; + PushButton* m_pBtnSpecularColor; + MetricField* m_pMtrMatSpecularIntensity; + + Svx3DPreviewControl* m_pCtlPreview; + SvxLightCtl3D* m_pCtlLightPreview; // bottom part - ImageButton aBtnConvertTo3D; - ImageButton aBtnLatheObject; - ImageButton aBtnPerspective; + PushButton* m_pBtnConvertTo3D; + PushButton* m_pBtnLatheObject; + PushButton* m_pBtnPerspective; // the rest ... Image aImgLightOn; Image aImgLightOff; bool bUpdate; ViewType3D eViewType; - Size aSize; // Model, Page, View etc. for favourites FmFormModel* pModel; @@ -230,8 +210,8 @@ private: SVX_DLLPRIVATE sal_uInt16 GetLightSource( const PushButton* pBtn = NULL ); SVX_DLLPRIVATE ColorLB* GetLbByButton( const PushButton* pBtn = NULL ); - SVX_DLLPRIVATE bool GetUILightState( const ImageButton& rBtn ) const; - SVX_DLLPRIVATE void SetUILightState( ImageButton& aBtn, bool bState ); + SVX_DLLPRIVATE bool GetUILightState( const PushButton& rBtn ) const; + SVX_DLLPRIVATE void SetUILightState( PushButton& aBtn, bool bState ); protected: virtual void Resize() SAL_OVERRIDE; diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk index da79eb875dce..1cd6d8551144 100644 --- a/svx/UIConfig_svx.mk +++ b/svx/UIConfig_svx.mk @@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ svx/uiconfig/ui/datanavigator \ svx/uiconfig/ui/deleteheaderdialog \ svx/uiconfig/ui/deletefooterdialog \ + svx/uiconfig/ui/docking3deffects \ svx/uiconfig/ui/dockingcolorreplace \ svx/uiconfig/ui/docrecoverybrokendialog \ svx/uiconfig/ui/docrecoveryprogressdialog \ diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 4711b30e64bf..ce4358124f81 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -41,8 +41,8 @@ using namespace com::sun::star; -Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, const ResId& rResId) -: Control(pParent, rResId), +Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle) +: Control(pParent, nStyle), mpModel(0), mpFmPage(0), mp3DView(0), @@ -57,20 +57,14 @@ Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, const ResId& rRes SetBackground(); } -Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle) -: Control(pParent, nStyle), - mpModel(0), - mpFmPage(0), - mp3DView(0), - mpScene(0), - mp3DObj(0), - mnObjectType(PREVIEW_OBJECTTYPE_SPHERE) +Size Svx3DPreviewControl::GetOptimalSize() const { - Construct(); + return LogicToPixel(Size(80, 100), MAP_APPFONT); +} - // do not paint background self, DrawingLayer paints this buffered and as page - SetControlBackground(); - SetBackground(); +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvx3DPreviewControl(vcl::Window *pParent, VclBuilder::stringmap &) +{ + return new Svx3DPreviewControl(pParent); } Svx3DPreviewControl::~Svx3DPreviewControl() @@ -952,19 +946,6 @@ basegfx::B3DVector Svx3DLightControl::GetLightDirection(sal_uInt32 nNum) const return basegfx::B3DVector(); } - - -SvxLightCtl3D::SvxLightCtl3D( vcl::Window* pParent, const ResId& rResId) -: Control(pParent, rResId), - maLightControl(this, 0), - maHorScroller(this, WB_HORZ | WB_DRAG), - maVerScroller(this, WB_VERT | WB_DRAG), - maSwitcher(this, 0) -{ - // init members - Init(); -} - SvxLightCtl3D::SvxLightCtl3D( vcl::Window* pParent) : Control(pParent, WB_BORDER | WB_TABSTOP), maLightControl(this, 0), @@ -986,7 +967,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLightCtl3D(vcl::Win return new SvxLightCtl3D(pParent); } - void SvxLightCtl3D::Init() { // #i58240# set HelpIDs for scrollbars and switcher diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index b584e5d58219..e8fa22d3a88f 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -83,252 +83,223 @@ namespace { } } -Svx3DWin::Svx3DWin( SfxBindings* pInBindings, - SfxChildWindow *pCW, vcl::Window* pParent ) : - SfxDockingWindow ( pInBindings, pCW, pParent, - SVX_RES( RID_SVXFLOAT_3D ) ), - aBtnGeo ( this, SVX_RES( BTN_GEO ) ), - aBtnRepresentation ( this, SVX_RES( BTN_REPRESENTATION ) ), - aBtnLight ( this, SVX_RES( BTN_LIGHT ) ), - aBtnTexture ( this, SVX_RES( BTN_TEXTURE ) ), - aBtnMaterial ( this, SVX_RES( BTN_MATERIAL ) ), - aBtnUpdate ( this, SVX_RES( BTN_UPDATE ) ), - aBtnAssign ( this, SVX_RES( BTN_ASSIGN ) ), - aFLGeometrie ( this, SVX_RES( FL_GEOMETRIE ) ), - - // Geometry - aFtPercentDiagonal ( this, SVX_RES( FT_PERCENT_DIAGONAL ) ), - aMtrPercentDiagonal ( this, SVX_RES( MTR_PERCENT_DIAGONAL ) ), - aFtBackscale ( this, SVX_RES( FT_BACKSCALE ) ), - aMtrBackscale ( this, SVX_RES( MTR_BACKSCALE ) ), - aFtEndAngle ( this, SVX_RES( FT_END_ANGLE ) ), - aMtrEndAngle ( this, SVX_RES( MTR_END_ANGLE ) ), - aFtDepth ( this, SVX_RES( FT_DEPTH ) ), - aMtrDepth ( this, SVX_RES( MTR_DEPTH ) ), - aFLSegments ( this, SVX_RES( FL_SEGMENTS ) ), - - aFtHorizontal ( this, SVX_RES( FT_HORIZONTAL ) ), - aNumHorizontal ( this, SVX_RES( NUM_HORIZONTAL ) ), - aFtVertical ( this, SVX_RES( FT_VERTICAL ) ), - aNumVertical ( this, SVX_RES( NUM_VERTICAL ) ), - - aFLNormals ( this, SVX_RES( FL_NORMALS ) ), - aBtnNormalsObj ( this, SVX_RES( BTN_NORMALS_OBJ ) ), - aBtnNormalsFlat ( this, SVX_RES( BTN_NORMALS_FLAT ) ), - aBtnNormalsSphere ( this, SVX_RES( BTN_NORMALS_SPHERE ) ), - aBtnNormalsInvert ( this, SVX_RES( BTN_NORMALS_INVERT ) ), - aBtnTwoSidedLighting( this, SVX_RES( BTN_TWO_SIDED_LIGHTING ) ), - - aBtnDoubleSided ( this, SVX_RES( BTN_DOUBLE_SIDED ) ), - - // Representation - aFLRepresentation ( this, SVX_RES( FL_REPRESENTATION ) ), - aFtShademode ( this, SVX_RES( FT_SHADEMODE ) ), - aLbShademode ( this, SVX_RES( LB_SHADEMODE ) ), - aFLShadow ( this, SVX_RES( FL_SHADOW ) ), - aBtnShadow3d ( this, SVX_RES( BTN_SHADOW_3D ) ), - aFtSlant ( this, SVX_RES( FT_SLANT ) ), - aMtrSlant ( this, SVX_RES( MTR_SLANT ) ), - aFtDistance ( this, SVX_RES( FT_DISTANCE ) ), - aMtrDistance ( this, SVX_RES( MTR_DISTANCE ) ), - aFtFocalLeng ( this, SVX_RES( FT_FOCAL_LENGTH ) ), - aMtrFocalLength ( this, SVX_RES( MTR_FOCAL_LENGTH ) ), - aFLCamera ( this, SVX_RES( FL_CAMERA ) ), - aFLLight ( this, SVX_RES( FL_LIGHT ) ), - - // Lighting - aBtnLight1 ( this, SVX_RES( BTN_LIGHT_1 ) ), - aBtnLight2 ( this, SVX_RES( BTN_LIGHT_2 ) ), - aBtnLight3 ( this, SVX_RES( BTN_LIGHT_3 ) ), - aBtnLight4 ( this, SVX_RES( BTN_LIGHT_4 ) ), - aBtnLight5 ( this, SVX_RES( BTN_LIGHT_5 ) ), - aBtnLight6 ( this, SVX_RES( BTN_LIGHT_6 ) ), - aBtnLight7 ( this, SVX_RES( BTN_LIGHT_7 ) ), - aBtnLight8 ( this, SVX_RES( BTN_LIGHT_8 ) ), - aFTLightsource ( this, SVX_RES( FT_LIGHTSOURCE ) ), - aLbLight1 ( this, SVX_RES( LB_LIGHT_1 ) ), - aLbLight2 ( this, SVX_RES( LB_LIGHT_2 ) ), - aLbLight3 ( this, SVX_RES( LB_LIGHT_3 ) ), - aLbLight4 ( this, SVX_RES( LB_LIGHT_4 ) ), - aLbLight5 ( this, SVX_RES( LB_LIGHT_5 ) ), - aLbLight6 ( this, SVX_RES( LB_LIGHT_6 ) ), - aLbLight7 ( this, SVX_RES( LB_LIGHT_7 ) ), - aLbLight8 ( this, SVX_RES( LB_LIGHT_8 ) ), - - aBtnLightColor ( this, SVX_RES( BTN_LIGHT_COLOR ) ), - - // Keyboard shortcuts activate the next control, so the - // order needed to be changed here - aFTAmbientlight ( this, SVX_RES( FT_AMBIENTLIGHT ) ), // Text label - aLbAmbientlight ( this, SVX_RES( LB_AMBIENTLIGHT ) ), // ListBox - aBtnAmbientColor ( this, SVX_RES( BTN_AMBIENT_COLOR ) ), // color button - aFLTexture ( this, SVX_RES( FL_TEXTURE ) ), - - // Textures - aFtTexKind ( this, SVX_RES( FT_TEX_KIND ) ), - aBtnTexLuminance ( this, SVX_RES( BTN_TEX_LUMINANCE ) ), - aBtnTexColor ( this, SVX_RES( BTN_TEX_COLOR ) ), - aFtTexMode ( this, SVX_RES( FT_TEX_MODE ) ), - aBtnTexReplace ( this, SVX_RES( BTN_TEX_REPLACE ) ), - aBtnTexModulate ( this, SVX_RES( BTN_TEX_MODULATE ) ), - aBtnTexBlend ( this, SVX_RES( BTN_TEX_BLEND ) ), - aFtTexProjectionX ( this, SVX_RES( FT_TEX_PROJECTION_X ) ), - aBtnTexObjectX ( this, SVX_RES( BTN_TEX_OBJECT_X ) ), - aBtnTexParallelX ( this, SVX_RES( BTN_TEX_PARALLEL_X ) ), - aBtnTexCircleX ( this, SVX_RES( BTN_TEX_CIRCLE_X ) ), - aFtTexProjectionY ( this, SVX_RES( FT_TEX_PROJECTION_Y ) ), - aBtnTexObjectY ( this, SVX_RES( BTN_TEX_OBJECT_Y ) ), - aBtnTexParallelY ( this, SVX_RES( BTN_TEX_PARALLEL_Y ) ), - aBtnTexCircleY ( this, SVX_RES( BTN_TEX_CIRCLE_Y ) ), - aFtTexFilter ( this, SVX_RES( FT_TEX_FILTER ) ), - aBtnTexFilter ( this, SVX_RES( BTN_TEX_FILTER ) ), - aFLMaterial ( this, SVX_RES( FL_MATERIAL ) ), - - // Material - aFtMatFavorites ( this, SVX_RES( FT_MAT_FAVORITES ) ), - aLbMatFavorites ( this, SVX_RES( LB_MAT_FAVORITES ) ), - aFtMatColor ( this, SVX_RES( FT_MAT_COLOR ) ), - aLbMatColor ( this, SVX_RES( LB_MAT_COLOR ) ), - aBtnMatColor ( this, SVX_RES( BTN_MAT_COLOR ) ), - aFtMatEmission ( this, SVX_RES( FT_MAT_EMISSION ) ), - aLbMatEmission ( this, SVX_RES( LB_MAT_EMISSION ) ), - aBtnEmissionColor ( this, SVX_RES( BTN_EMISSION_COLOR ) ), - aFLMatSpecular ( this, SVX_RES( FL_MAT_SPECULAR ) ), - aFtMatSpecular ( this, SVX_RES( FT_MAT_SPECULAR ) ), - aLbMatSpecular ( this, SVX_RES( LB_MAT_SPECULAR ) ), - aBtnSpecularColor ( this, SVX_RES( BTN_SPECULAR_COLOR ) ), - aFtMatSpecularIntensity( this, SVX_RES( FT_MAT_SPECULAR_INTENSITY ) ), - aMtrMatSpecularIntensity( this, SVX_RES( MTR_MAT_SPECULAR_INTENSITY ) ), - aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ), - aCtlLightPreview ( this, SVX_RES( CTL_LIGHT_PREVIEW ) ), - - // Lower Range - aBtnConvertTo3D ( this, SVX_RES( BTN_CHANGE_TO_3D ) ), - aBtnLatheObject ( this, SVX_RES( BTN_LATHE_OBJ ) ), - aBtnPerspective ( this, SVX_RES( BTN_PERSPECTIVE ) ), - - aImgLightOn ( SVX_RES( RID_SVXIMAGE_LIGHT_ON ) ), - aImgLightOff ( SVX_RES( RID_SVXIMAGE_LIGHT_OFF ) ), - - bUpdate ( false ), - eViewType ( VIEWTYPE_GEO ), - - pModel ( NULL ), - pVDev ( NULL ), - p3DView ( NULL ), - - pBindings ( pInBindings ), - pControllerItem(0L), - pConvertTo3DItem(0L), - pConvertTo3DLatheItem(0L), - mpImpl ( new Svx3DWinImpl() ), - mpRemember2DAttributes(NULL), - bOnly3DChanged ( false ) +Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* pParent) + : SfxDockingWindow (pInBindings, pCW, pParent, + "Docking3DEffects", "svx/ui/docking3deffects.ui") + , aImgLightOn(SVX_RES(RID_SVXIMAGE_LIGHT_ON)) + , aImgLightOff(SVX_RES(RID_SVXIMAGE_LIGHT_OFF)) + , bUpdate(false) + , eViewType(VIEWTYPE_GEO) + , pModel(NULL) + , pVDev(NULL) + , p3DView(NULL) + , pBindings(pInBindings) + , pControllerItem(0) + , pConvertTo3DItem(0) + , pConvertTo3DLatheItem(0) + , mpImpl(new Svx3DWinImpl()) + , mpRemember2DAttributes(NULL) + , bOnly3DChanged(false) { - OUString accname(SVX_RESSTR(RID_SVXFLOAT3D_COLOR_LIGHT_PRE)); - aCtlLightPreview.SetAccessibleName(accname); - aCtlPreview.SetAccessibleName(accname); - aLbAmbientlight.SetAccessibleName(aFTAmbientlight.GetDisplayText()); + get(m_pBtnGeo, "geometry"); + get(m_pBtnRepresentation, "representation"); + get(m_pBtnLight, "light"); + get(m_pBtnTexture, "texture"); + get(m_pBtnMaterial, "material"); + get(m_pBtnUpdate, "update"); + get(m_pBtnAssign, "assign"); + + get(m_pFLGeometrie, "geoframe"); + get(m_pFtPercentDiagonal, "diagonalft"); + get(m_pMtrPercentDiagonal, "diagonal"); + get(m_pFtBackscale, "scaleddepthft"); + get(m_pMtrBackscale, "scaleddepth"); + get(m_pFtEndAngle, "angleft"); + get(m_pMtrEndAngle, "angle"); + get(m_pFtDepth, "depthft"); + get(m_pMtrDepth, "depth"); + + get(m_pFLSegments, "segmentsframe"); + get(m_pNumHorizontal, "hori"); + get(m_pNumVertical, "veri"); + + get(m_pFLNormals, "normals"); + get(m_pBtnNormalsObj, "objspecific"); + get(m_pBtnNormalsFlat, "flat"); + get(m_pBtnNormalsSphere, "spherical"); + get(m_pBtnNormalsInvert, "invertnormals"); + get(m_pBtnTwoSidedLighting, "doublesidedillum"); + get(m_pBtnDoubleSided, "doublesided"); + + get(m_pFLRepresentation, "shadingframe"); + get(m_pLbShademode, "mode"); + + get(m_pFLShadow, "shadowframe"); + get(m_pBtnShadow3d, "shadow"); + get(m_pFtSlant, "slantft"); + get(m_pMtrSlant, "slant"); + + get(m_pFLCamera, "cameraframe"); + get(m_pMtrDistance, "distance"); + get(m_pMtrFocalLength, "focal"); + + get(m_pFLLight, "illumframe"); + get(m_pBtnLight1, "light1"); + get(m_pBtnLight2, "light2"); + get(m_pBtnLight3, "light3"); + get(m_pBtnLight4, "light4"); + get(m_pBtnLight5, "light5"); + get(m_pBtnLight6, "light6"); + get(m_pBtnLight7, "light7"); + get(m_pBtnLight8, "light8"); + get(m_pLbLight1, "lightcolor1"); + get(m_pLbLight2, "lightcolor2"); + get(m_pLbLight3, "lightcolor3"); + get(m_pLbLight4, "lightcolor4"); + get(m_pLbLight5, "lightcolor5"); + get(m_pLbLight6, "lightcolor6"); + get(m_pLbLight7, "lightcolor7"); + get(m_pLbLight8, "lightcolor8"); + get(m_pBtnLightColor, "colorbutton1"); + get(m_pLbAmbientlight, "ambientcolor"); + get(m_pBtnAmbientColor, "colorbutton2"); + + get(m_pFLTexture, "textureframe"); + get(m_pBtnTexLuminance, "textype"); + get(m_pBtnTexColor, "texcolor"); + get(m_pBtnTexReplace, "texreplace"); + get(m_pBtnTexModulate, "texmodulate"); + get(m_pBtnTexBlend, "texblend"); + get(m_pBtnTexObjectX, "texobjx"); + get(m_pBtnTexParallelX, "texparallelx"); + get(m_pBtnTexCircleX, "texcirclex"); + get(m_pBtnTexObjectY, "texobjy"); + get(m_pBtnTexParallelY, "texparallely"); + get(m_pBtnTexCircleY, "texcircley"); + get(m_pBtnTexFilter, "texfilter"); + + get(m_pFLMaterial, "materialframe"); + get(m_pLbMatFavorites, "favorites"); + get(m_pLbMatColor, "objcolor"); + get(m_pBtnMatColor, "colorbutton3"); + get(m_pLbMatEmission, "illumcolor"); + get(m_pBtnEmissionColor, "colorbutton4"); + + get(m_pFLMatSpecular, "specframe"); + get(m_pLbMatSpecular, "speccolor"); + get(m_pBtnSpecularColor, "colorbutton5"); + get(m_pMtrMatSpecularIntensity, "intensity"); + + get(m_pCtlPreview, "preview"); + get(m_pCtlLightPreview, "lightpreview"); + Size aSize(LogicToPixel(Size(83, 76), MAP_APPFONT)); + m_pCtlPreview->set_width_request(aSize.Width()); + m_pCtlLightPreview->set_width_request(aSize.Width()); + m_pCtlPreview->set_height_request(aSize.Height()); + m_pCtlLightPreview->set_height_request(aSize.Height()); + + get(m_pBtnConvertTo3D, "to3d"); + get(m_pBtnLatheObject, "tolathe"); + get(m_pBtnPerspective, "perspective"); mpImpl->pPool = NULL; - FreeResource(); // Set Metric eFUnit = pInBindings->GetDispatcher()->GetModule()->GetFieldUnit(); - aMtrDepth.SetUnit( eFUnit ); - aMtrDistance.SetUnit( eFUnit ); - aMtrFocalLength.SetUnit( eFUnit ); + m_pMtrDepth->SetUnit( eFUnit ); + m_pMtrDistance->SetUnit( eFUnit ); + m_pMtrFocalLength->SetUnit( eFUnit ); pControllerItem = new Svx3DCtrlItem(SID_3D_STATE, pBindings); pConvertTo3DItem = new SvxConvertTo3DItem(SID_CONVERT_TO_3D, pBindings); pConvertTo3DLatheItem = new SvxConvertTo3DItem(SID_CONVERT_TO_3D_LATHE_FAST, pBindings); - aBtnAssign.SetClickHdl( LINK( this, Svx3DWin, ClickAssignHdl ) ); - aBtnUpdate.SetClickHdl( LINK( this, Svx3DWin, ClickUpdateHdl ) ); + m_pBtnAssign->SetClickHdl( LINK( this, Svx3DWin, ClickAssignHdl ) ); + m_pBtnUpdate->SetClickHdl( LINK( this, Svx3DWin, ClickUpdateHdl ) ); Link aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) ); - aBtnGeo.SetClickHdl( aLink ); - aBtnRepresentation.SetClickHdl( aLink ); - aBtnLight.SetClickHdl( aLink ); - aBtnTexture.SetClickHdl( aLink ); - aBtnMaterial.SetClickHdl( aLink ); + m_pBtnGeo->SetClickHdl( aLink ); + m_pBtnRepresentation->SetClickHdl( aLink ); + m_pBtnLight->SetClickHdl( aLink ); + m_pBtnTexture->SetClickHdl( aLink ); + m_pBtnMaterial->SetClickHdl( aLink ); aLink = LINK( this, Svx3DWin, ClickHdl ); - aBtnPerspective.SetClickHdl( aLink ); - aBtnConvertTo3D.SetClickHdl( aLink ); - aBtnLatheObject.SetClickHdl( aLink ); + m_pBtnPerspective->SetClickHdl( aLink ); + m_pBtnConvertTo3D->SetClickHdl( aLink ); + m_pBtnLatheObject->SetClickHdl( aLink ); // Geometry - aBtnNormalsObj.SetClickHdl( aLink ); - aBtnNormalsFlat.SetClickHdl( aLink ); - aBtnNormalsSphere.SetClickHdl( aLink ); - aBtnTwoSidedLighting.SetClickHdl( aLink ); - aBtnNormalsInvert.SetClickHdl( aLink ); - aBtnDoubleSided.SetClickHdl( aLink ); + m_pBtnNormalsObj->SetClickHdl( aLink ); + m_pBtnNormalsFlat->SetClickHdl( aLink ); + m_pBtnNormalsSphere->SetClickHdl( aLink ); + m_pBtnTwoSidedLighting->SetClickHdl( aLink ); + m_pBtnNormalsInvert->SetClickHdl( aLink ); + m_pBtnDoubleSided->SetClickHdl( aLink ); // Representation - aBtnShadow3d.SetClickHdl( aLink ); + m_pBtnShadow3d->SetClickHdl( aLink ); // Lighting - aBtnLight1.SetClickHdl( aLink ); - aBtnLight2.SetClickHdl( aLink ); - aBtnLight3.SetClickHdl( aLink ); - aBtnLight4.SetClickHdl( aLink ); - aBtnLight5.SetClickHdl( aLink ); - aBtnLight6.SetClickHdl( aLink ); - aBtnLight7.SetClickHdl( aLink ); - aBtnLight8.SetClickHdl( aLink ); + m_pBtnLight1->SetClickHdl( aLink ); + m_pBtnLight2->SetClickHdl( aLink ); + m_pBtnLight3->SetClickHdl( aLink ); + m_pBtnLight4->SetClickHdl( aLink ); + m_pBtnLight5->SetClickHdl( aLink ); + m_pBtnLight6->SetClickHdl( aLink ); + m_pBtnLight7->SetClickHdl( aLink ); + m_pBtnLight8->SetClickHdl( aLink ); // Textures - aBtnTexLuminance.SetClickHdl( aLink ); - aBtnTexColor.SetClickHdl( aLink ); - aBtnTexReplace.SetClickHdl( aLink ); - aBtnTexModulate.SetClickHdl( aLink ); - aBtnTexParallelX.SetClickHdl( aLink ); - aBtnTexCircleX.SetClickHdl( aLink ); - aBtnTexObjectX.SetClickHdl( aLink ); - aBtnTexParallelY.SetClickHdl( aLink ); - aBtnTexCircleY.SetClickHdl( aLink ); - aBtnTexObjectY.SetClickHdl( aLink ); - aBtnTexFilter.SetClickHdl( aLink ); + m_pBtnTexLuminance->SetClickHdl( aLink ); + m_pBtnTexColor->SetClickHdl( aLink ); + m_pBtnTexReplace->SetClickHdl( aLink ); + m_pBtnTexModulate->SetClickHdl( aLink ); + m_pBtnTexParallelX->SetClickHdl( aLink ); + m_pBtnTexCircleX->SetClickHdl( aLink ); + m_pBtnTexObjectX->SetClickHdl( aLink ); + m_pBtnTexParallelY->SetClickHdl( aLink ); + m_pBtnTexCircleY->SetClickHdl( aLink ); + m_pBtnTexObjectY->SetClickHdl( aLink ); + m_pBtnTexFilter->SetClickHdl( aLink ); // Material aLink = LINK( this, Svx3DWin, ClickColorHdl ); - aBtnLightColor.SetClickHdl( aLink ); - aBtnAmbientColor.SetClickHdl( aLink ); - aBtnMatColor.SetClickHdl( aLink ); - aBtnEmissionColor.SetClickHdl( aLink ); - aBtnSpecularColor.SetClickHdl( aLink ); + m_pBtnLightColor->SetClickHdl( aLink ); + m_pBtnAmbientColor->SetClickHdl( aLink ); + m_pBtnMatColor->SetClickHdl( aLink ); + m_pBtnEmissionColor->SetClickHdl( aLink ); + m_pBtnSpecularColor->SetClickHdl( aLink ); aLink = LINK( this, Svx3DWin, SelectHdl ); - aLbMatFavorites.SetSelectHdl( aLink ); - aLbMatColor.SetSelectHdl( aLink ); - aLbMatEmission.SetSelectHdl( aLink ); - aLbMatSpecular.SetSelectHdl( aLink ); - aLbLight1.SetSelectHdl( aLink ); - aLbLight2.SetSelectHdl( aLink ); - aLbLight3.SetSelectHdl( aLink ); - aLbLight4.SetSelectHdl( aLink ); - aLbLight5.SetSelectHdl( aLink ); - aLbLight6.SetSelectHdl( aLink ); - aLbLight7.SetSelectHdl( aLink ); - aLbLight8.SetSelectHdl( aLink ); - aLbAmbientlight.SetSelectHdl( aLink ); - aLbShademode.SetSelectHdl( aLink ); + m_pLbMatFavorites->SetSelectHdl( aLink ); + m_pLbMatColor->SetSelectHdl( aLink ); + m_pLbMatEmission->SetSelectHdl( aLink ); + m_pLbMatSpecular->SetSelectHdl( aLink ); + m_pLbLight1->SetSelectHdl( aLink ); + m_pLbLight2->SetSelectHdl( aLink ); + m_pLbLight3->SetSelectHdl( aLink ); + m_pLbLight4->SetSelectHdl( aLink ); + m_pLbLight5->SetSelectHdl( aLink ); + m_pLbLight6->SetSelectHdl( aLink ); + m_pLbLight7->SetSelectHdl( aLink ); + m_pLbLight8->SetSelectHdl( aLink ); + m_pLbAmbientlight->SetSelectHdl( aLink ); + m_pLbShademode->SetSelectHdl( aLink ); aLink = LINK( this, Svx3DWin, ModifyHdl ); - aMtrMatSpecularIntensity.SetModifyHdl( aLink ); - aNumHorizontal.SetModifyHdl( aLink ); - aNumVertical.SetModifyHdl( aLink ); - aMtrSlant.SetModifyHdl( aLink ); + m_pMtrMatSpecularIntensity->SetModifyHdl( aLink ); + m_pNumHorizontal->SetModifyHdl( aLink ); + m_pNumVertical->SetModifyHdl( aLink ); + m_pMtrSlant->SetModifyHdl( aLink ); // Preview callback aLink = LINK( this, Svx3DWin, ChangeLightCallbackHdl ); - aCtlLightPreview.SetUserInteractiveChangeCallback(aLink); + m_pCtlLightPreview->SetUserInteractiveChangeCallback(aLink); aLink = LINK( this, Svx3DWin, ChangeSelectionCallbackHdl ); - aCtlLightPreview.SetUserSelectionChangeCallback(aLink); + m_pCtlLightPreview->SetUserSelectionChangeCallback(aLink); aSize = GetOutputSizePixel(); SetMinOutputSizePixel( aSize ); @@ -346,88 +317,12 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, Reset(); - aBtnNormalsObj.SetAccessibleRelationMemberOf( &aFLNormals ); - aBtnNormalsFlat.SetAccessibleRelationMemberOf( &aFLNormals ); - aBtnNormalsSphere.SetAccessibleRelationMemberOf( &aFLNormals ); - aBtnNormalsInvert.SetAccessibleRelationMemberOf( &aFLNormals ); - aBtnTwoSidedLighting.SetAccessibleRelationMemberOf( &aFLNormals ); - aBtnDoubleSided.SetAccessibleRelationMemberOf( &aFLNormals ); - - aBtnLight1.SetAccessibleRelationMemberOf( &aFLLight ); - aBtnLight2.SetAccessibleRelationMemberOf( &aFLLight ); - aBtnLight3.SetAccessibleRelationMemberOf( &aFLLight ); - aBtnLight4.SetAccessibleRelationMemberOf( &aFLLight ); - aBtnLight5.SetAccessibleRelationMemberOf( &aFLLight ); - aBtnLight6.SetAccessibleRelationMemberOf( &aFLLight ); - aBtnLight7.SetAccessibleRelationMemberOf( &aFLLight ); - aBtnLight8.SetAccessibleRelationMemberOf( &aFLLight ); - - aBtnLight1.SetAccessibleRelationLabeledBy( &aFTLightsource ); - aBtnLight2.SetAccessibleRelationLabeledBy( &aFTLightsource ); - aBtnLight3.SetAccessibleRelationLabeledBy( &aFTLightsource ); - aBtnLight4.SetAccessibleRelationLabeledBy( &aFTLightsource ); - aBtnLight5.SetAccessibleRelationLabeledBy( &aFTLightsource ); - aBtnLight6.SetAccessibleRelationLabeledBy( &aFTLightsource ); - aBtnLight7.SetAccessibleRelationLabeledBy( &aFTLightsource ); - aBtnLight8.SetAccessibleRelationLabeledBy( &aFTLightsource ); - aBtnLightColor.SetAccessibleRelationMemberOf( &aFLLight ); - aBtnLightColor.SetAccessibleRelationLabeledBy( &aFTLightsource ); - aBtnAmbientColor.SetAccessibleRelationMemberOf( &aFLLight ); - aBtnAmbientColor.SetAccessibleRelationLabeledBy( &aFTAmbientlight ); - - aBtnSpecularColor.SetAccessibleRelationLabeledBy( &aFtMatSpecular ); - aBtnMatColor.SetAccessibleRelationLabeledBy( &aFtMatColor ); - aBtnEmissionColor.SetAccessibleRelationLabeledBy( &aFtMatEmission ); - aBtnTexLuminance.SetAccessibleRelationLabeledBy( &aFtTexKind ); - aBtnTexColor.SetAccessibleRelationLabeledBy( &aFtTexKind ); - aBtnTexReplace.SetAccessibleRelationLabeledBy( &aFtTexMode ); - aBtnTexModulate.SetAccessibleRelationLabeledBy( &aFtTexMode ); - aBtnTexBlend.SetAccessibleRelationLabeledBy( &aFtTexMode ); - aBtnTexObjectX.SetAccessibleRelationLabeledBy( &aFtTexProjectionX ); - aBtnTexParallelX.SetAccessibleRelationLabeledBy( &aFtTexProjectionX ); - aBtnTexCircleX.SetAccessibleRelationLabeledBy( &aFtTexProjectionX ); - aBtnTexObjectY.SetAccessibleRelationLabeledBy( &aFtTexProjectionY ); - aBtnTexParallelY.SetAccessibleRelationLabeledBy( &aFtTexProjectionY ); - aBtnTexCircleY.SetAccessibleRelationLabeledBy( &aFtTexProjectionY ); - aBtnTexFilter.SetAccessibleRelationLabeledBy( &aFtTexFilter ); - aCtlLightPreview.SetAccessibleRelationLabeledBy( &aCtlLightPreview ); - aBtnNormalsObj.SetAccessibleRelationMemberOf(&aFLNormals); - aBtnNormalsFlat.SetAccessibleRelationMemberOf(&aFLNormals); - aBtnNormalsSphere.SetAccessibleRelationMemberOf(&aFLNormals); - aBtnNormalsInvert.SetAccessibleRelationMemberOf(&aFLNormals); - aBtnTwoSidedLighting.SetAccessibleRelationMemberOf(&aFLNormals); - - aBtnShadow3d.SetAccessibleRelationMemberOf(&aFLShadow); - - aBtnLight1.SetAccessibleRelationMemberOf(&aFLLight); - aBtnLight2.SetAccessibleRelationMemberOf(&aFLLight); - aBtnLight3.SetAccessibleRelationMemberOf(&aFLLight); - aBtnLight4.SetAccessibleRelationMemberOf(&aFLLight); - aBtnLight5.SetAccessibleRelationMemberOf(&aFLLight); - aBtnLight6.SetAccessibleRelationMemberOf(&aFLLight); - aBtnLight7.SetAccessibleRelationMemberOf(&aFLLight); - aBtnLight8.SetAccessibleRelationMemberOf(&aFLLight); - - aBtnTexLuminance.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexColor.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexReplace.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexModulate.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexBlend.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexObjectX.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexParallelX.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexCircleX.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexObjectY.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexParallelY.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexCircleY.SetAccessibleRelationMemberOf(&aFLTexture); - aBtnTexFilter.SetAccessibleRelationMemberOf(&aFLTexture); - - aBtnMatColor.SetAccessibleRelationMemberOf(&aFLMaterial); - aBtnEmissionColor.SetAccessibleRelationMemberOf(&aFLMaterial); - - aBtnSpecularColor.SetAccessibleRelationMemberOf(&aFLMatSpecular); + //lock down the size of the initial largest default mode as the permanent size + aSize = get_preferred_size(); + set_width_request(aSize.Width()); + set_height_request(aSize.Height()); } - Svx3DWin::~Svx3DWin() { delete p3DView; @@ -446,38 +341,37 @@ Svx3DWin::~Svx3DWin() void Svx3DWin::Construct() { - aBtnGeo.Check(); + m_pBtnGeo->Check(); Link aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) ); - aLink.Call( &aBtnGeo ); - aCtlLightPreview.Hide(); + aLink.Call(m_pBtnGeo); + m_pCtlLightPreview->Hide(); } void Svx3DWin::Reset() { // Various initializations, default is AllAttributes - aLbShademode.SelectEntryPos( 0 ); - aMtrMatSpecularIntensity.SetValue( 50 ); + m_pLbShademode->SelectEntryPos( 0 ); + m_pMtrMatSpecularIntensity->SetValue( 50 ); - aBtnLight1.Check(); + m_pBtnLight1->Check(); ClickUpdateHdl( NULL ); // Select nothing, to avoid errors when selecting the first - aCtlLightPreview.GetSvx3DLightControl().SelectLight(0); - aCtlLightPreview.CheckSelection(); + m_pCtlLightPreview->GetSvx3DLightControl().SelectLight(0); + m_pCtlLightPreview->CheckSelection(); } -bool Svx3DWin::GetUILightState( const ImageButton& rBtn ) const +bool Svx3DWin::GetUILightState(const PushButton& rBtn) const { return (rBtn.GetModeImage() == aImgLightOn); } -void Svx3DWin::SetUILightState( ImageButton& aBtn, bool bState ) +void Svx3DWin::SetUILightState(PushButton& rBtn, bool bState) { - aBtn.SetModeImage( bState ? aImgLightOn : aImgLightOff ); + rBtn.SetModeImage( bState ? aImgLightOn : aImgLightOff ); } - void Svx3DWin::Update( SfxItemSet& rAttrs ) { // remember 2d attributes @@ -530,70 +424,55 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !bChart ) { // For cube objects are no segments set - aFtHorizontal.Enable( !bCube ); - aNumHorizontal.Enable( !bCube ); - aFtVertical.Enable( !bCube ); - aNumVertical.Enable( !bCube ); - aFLSegments.Enable( !bCube ); - - aFtPercentDiagonal.Enable( !bCube && !bSphere ); - aMtrPercentDiagonal.Enable( !bCube && !bSphere ); - aFtBackscale.Enable( !bCube && !bSphere ); - aMtrBackscale.Enable( !bCube && !bSphere ); - aFtDepth.Enable( !bCube && !bSphere ); - aMtrDepth.Enable( !bCube && !bSphere ); + m_pFLSegments->Enable(!bCube); + + m_pFtPercentDiagonal->Enable( !bCube && !bSphere ); + m_pMtrPercentDiagonal->Enable( !bCube && !bSphere ); + m_pFtBackscale->Enable( !bCube && !bSphere ); + m_pMtrBackscale->Enable( !bCube && !bSphere ); + m_pFtDepth->Enable( !bCube && !bSphere ); + m_pMtrDepth->Enable( !bCube && !bSphere ); if( bCube ) { - aNumHorizontal.SetEmptyFieldValue(); - aNumVertical.SetEmptyFieldValue(); + m_pNumHorizontal->SetEmptyFieldValue(); + m_pNumVertical->SetEmptyFieldValue(); } if( bCube || bSphere ) { - aMtrPercentDiagonal.SetEmptyFieldValue(); - aMtrBackscale.SetEmptyFieldValue(); - aMtrDepth.SetEmptyFieldValue(); + m_pMtrPercentDiagonal->SetEmptyFieldValue(); + m_pMtrBackscale->SetEmptyFieldValue(); + m_pMtrDepth->SetEmptyFieldValue(); } // There is a final angle only for Lathe objects. - aFtEndAngle.Enable( !bExtrude && !bCube && !bSphere ); - aMtrEndAngle.Enable( !bExtrude && !bCube && !bSphere ); + m_pFtEndAngle->Enable( !bExtrude && !bCube && !bSphere ); + m_pMtrEndAngle->Enable( !bExtrude && !bCube && !bSphere ); if( bExtrude || bCube || bSphere ) - aMtrEndAngle.SetEmptyFieldValue(); + m_pMtrEndAngle->SetEmptyFieldValue(); } else { // Geometry - aFtHorizontal.Enable( false ); - aNumHorizontal.Enable( false ); - aNumHorizontal.SetEmptyFieldValue(); - aFtVertical.Enable( false ); - aNumVertical.Enable( false ); - aNumVertical.SetEmptyFieldValue(); - aFLSegments.Enable( false ); - aFtEndAngle.Enable( false ); - aMtrEndAngle.Enable( false ); - aMtrEndAngle.SetEmptyFieldValue(); - aFtDepth.Enable( false ); - aMtrDepth.Enable( false ); - aMtrDepth.SetEmptyFieldValue(); + m_pNumHorizontal->SetEmptyFieldValue(); + m_pNumVertical->SetEmptyFieldValue(); + m_pFLSegments->Enable( false ); + m_pFtEndAngle->Enable( false ); + m_pMtrEndAngle->Enable( false ); + m_pMtrEndAngle->SetEmptyFieldValue(); + m_pFtDepth->Enable( false ); + m_pMtrDepth->Enable( false ); + m_pMtrDepth->SetEmptyFieldValue(); // Representation - aBtnShadow3d.Enable( false ); - aFtSlant.Enable( false ); - aMtrSlant.Enable( false ); - aFLShadow.Enable( false ); - - aFtDistance.Enable( false ); - aMtrDistance.Enable( false ); - aMtrDistance.SetEmptyFieldValue(); - aFtFocalLeng.Enable( false ); - aMtrFocalLength.Enable( false ); - aMtrFocalLength.SetEmptyFieldValue(); - aFLCamera.Enable( false ); + m_pFLShadow->Enable(false); + + m_pMtrDistance->SetEmptyFieldValue(); + m_pMtrFocalLength->SetEmptyFieldValue(); + m_pFLCamera->Enable( false ); //Lower Range - aBtnConvertTo3D.Enable( false ); - aBtnLatheObject.Enable( false ); + m_pBtnConvertTo3D->Enable( false ); + m_pBtnLatheObject->Enable( false ); } } // Bitmap fill ? -> Status @@ -605,101 +484,83 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) bBitmap = (eXFS == drawing::FillStyle_BITMAP || eXFS == drawing::FillStyle_GRADIENT || eXFS == drawing::FillStyle_HATCH); } - aFtTexKind.Enable( bBitmap ); - aBtnTexLuminance.Enable( bBitmap ); - aBtnTexColor.Enable( bBitmap ); - aFtTexMode.Enable( bBitmap ); - aBtnTexReplace.Enable( bBitmap ); - aBtnTexModulate.Enable( bBitmap ); - aBtnTexBlend.Enable( bBitmap ); - aFtTexProjectionX.Enable( bBitmap ); - aBtnTexParallelX.Enable( bBitmap ); - aBtnTexCircleX.Enable( bBitmap ); - aBtnTexObjectX.Enable( bBitmap ); - aFtTexProjectionY.Enable( bBitmap ); - aBtnTexParallelY.Enable( bBitmap ); - aBtnTexCircleY.Enable( bBitmap ); - aBtnTexObjectY.Enable( bBitmap ); - aFtTexFilter.Enable( bBitmap ); - aBtnTexFilter.Enable( bBitmap ); - aFLTexture.Enable( bBitmap ); - + m_pFLTexture->Enable(bBitmap); // Geometry // Number of segments (horizontal) - if( aNumHorizontal.IsEnabled() ) + if( m_pNumHorizontal->IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_HORZ_SEGS); if(eState != SfxItemState::DONTCARE) { sal_uInt32 nValue = static_cast<const SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DOBJ_HORZ_SEGS)).GetValue(); - if(nValue != (sal_uInt32 )aNumHorizontal.GetValue()) + if(nValue != (sal_uInt32 )m_pNumHorizontal->GetValue()) { - aNumHorizontal.SetValue( nValue ); + m_pNumHorizontal->SetValue( nValue ); bUpdate = true; } - else if( aNumHorizontal.IsEmptyFieldValue() ) - aNumHorizontal.SetValue( nValue ); + else if( m_pNumHorizontal->IsEmptyFieldValue() ) + m_pNumHorizontal->SetValue( nValue ); } else { - if( !aNumHorizontal.IsEmptyFieldValue() ) + if( !m_pNumHorizontal->IsEmptyFieldValue() ) { - aNumHorizontal.SetEmptyFieldValue(); + m_pNumHorizontal->SetEmptyFieldValue(); bUpdate = true; } } } //Number of segments (vertical) - if( aNumVertical.IsEnabled() ) + if( m_pNumVertical->IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_VERT_SEGS); if( eState != SfxItemState::DONTCARE ) { sal_uInt32 nValue = static_cast<const SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); - if( nValue != (sal_uInt32) aNumVertical.GetValue() ) + if( nValue != (sal_uInt32) m_pNumVertical->GetValue() ) { - aNumVertical.SetValue( nValue ); + m_pNumVertical->SetValue( nValue ); bUpdate = true; } - else if( aNumVertical.IsEmptyFieldValue() ) - aNumVertical.SetValue( nValue ); + else if( m_pNumVertical->IsEmptyFieldValue() ) + m_pNumVertical->SetValue( nValue ); } else { - if( !aNumVertical.IsEmptyFieldValue() ) + if( !m_pNumVertical->IsEmptyFieldValue() ) { - aNumVertical.SetEmptyFieldValue(); + m_pNumVertical->SetEmptyFieldValue(); bUpdate = true; } } } // Depth - if( aMtrDepth.IsEnabled() ) + if( m_pMtrDepth->IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DEPTH); if( eState != SfxItemState::DONTCARE ) { sal_uInt32 nValue = static_cast<const SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue(); - sal_uInt32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit ); + sal_uInt32 nValue2 = GetCoreValue(*m_pMtrDepth, ePoolUnit); if( nValue != nValue2 ) { - if( eFUnit != aMtrDepth.GetUnit() ) - SetFieldUnit( aMtrDepth, eFUnit ); + if( eFUnit != m_pMtrDepth->GetUnit() ) + SetFieldUnit(*m_pMtrDepth, eFUnit); - SetMetricValue( aMtrDepth, nValue, ePoolUnit ); + SetMetricValue(*m_pMtrDepth, nValue, ePoolUnit); bUpdate = true; } - else if( aMtrDepth.IsEmptyFieldValue() ) - aMtrDepth.SetValue( aMtrDepth.GetValue() ); + else if( m_pMtrDepth->IsEmptyFieldValue() ) + m_pMtrDepth->SetValue( m_pMtrDepth->GetValue() ); } else { - if( !aMtrDepth.IsEmptyFieldValue() ) + if( !m_pMtrDepth->IsEmptyFieldValue() ) { - aMtrDepth.SetEmptyFieldValue(); + m_pMtrDepth->SetEmptyFieldValue(); bUpdate = true; } } @@ -710,91 +571,91 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bValue = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); - if( bValue != aBtnDoubleSided.IsChecked() ) + if( bValue != m_pBtnDoubleSided->IsChecked() ) { - aBtnDoubleSided.Check( bValue ); + m_pBtnDoubleSided->Check( bValue ); bUpdate = true; } - else if( aBtnDoubleSided.GetState() == TRISTATE_INDET ) - aBtnDoubleSided.Check( bValue ); + else if( m_pBtnDoubleSided->GetState() == TRISTATE_INDET ) + m_pBtnDoubleSided->Check( bValue ); } else { - if( aBtnDoubleSided.GetState() != TRISTATE_INDET ) + if( m_pBtnDoubleSided->GetState() != TRISTATE_INDET ) { - aBtnDoubleSided.SetState( TRISTATE_INDET ); + m_pBtnDoubleSided->SetState( TRISTATE_INDET ); bUpdate = true; } } // Edge rounding - if( aMtrPercentDiagonal.IsEnabled() ) + if( m_pMtrPercentDiagonal->IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_PERCENT_DIAGONAL); if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = static_cast<const SfxUInt16Item&>(rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue(); - if( nValue != aMtrPercentDiagonal.GetValue() ) + if( nValue != m_pMtrPercentDiagonal->GetValue() ) { - aMtrPercentDiagonal.SetValue( nValue ); + m_pMtrPercentDiagonal->SetValue( nValue ); bUpdate = true; } - else if( aMtrPercentDiagonal.IsEmptyFieldValue() ) - aMtrPercentDiagonal.SetValue( nValue ); + else if( m_pMtrPercentDiagonal->IsEmptyFieldValue() ) + m_pMtrPercentDiagonal->SetValue( nValue ); } else { - if( !aMtrPercentDiagonal.IsEmptyFieldValue() ) + if( !m_pMtrPercentDiagonal->IsEmptyFieldValue() ) { - aMtrPercentDiagonal.SetEmptyFieldValue(); + m_pMtrPercentDiagonal->SetEmptyFieldValue(); bUpdate = true; } } } // Depth scaling - if( aMtrBackscale.IsEnabled() ) + if( m_pMtrBackscale->IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_BACKSCALE); if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = static_cast<const SfxUInt16Item&>(rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue(); - if( nValue != aMtrBackscale.GetValue() ) + if( nValue != m_pMtrBackscale->GetValue() ) { - aMtrBackscale.SetValue( nValue ); + m_pMtrBackscale->SetValue( nValue ); bUpdate = true; } - else if( aMtrBackscale.IsEmptyFieldValue() ) - aMtrBackscale.SetValue( nValue ); + else if( m_pMtrBackscale->IsEmptyFieldValue() ) + m_pMtrBackscale->SetValue( nValue ); } else { - if( !aMtrBackscale.IsEmptyFieldValue() ) + if( !m_pMtrBackscale->IsEmptyFieldValue() ) { - aMtrBackscale.SetEmptyFieldValue(); + m_pMtrBackscale->SetEmptyFieldValue(); bUpdate = true; } } } // End angle - if( aMtrEndAngle.IsEnabled() ) + if( m_pMtrEndAngle->IsEnabled() ) { eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE); if( eState != SfxItemState::DONTCARE ) { sal_Int32 nValue = static_cast<const SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue(); - if( nValue != aMtrEndAngle.GetValue() ) + if( nValue != m_pMtrEndAngle->GetValue() ) { - aMtrEndAngle.SetValue( nValue ); + m_pMtrEndAngle->SetValue( nValue ); bUpdate = true; } } else { - if( !aMtrEndAngle.IsEmptyFieldValue() ) + if( !m_pMtrEndAngle->IsEmptyFieldValue() ) { - aMtrEndAngle.SetEmptyFieldValue(); + m_pMtrEndAngle->SetEmptyFieldValue(); bUpdate = true; } } @@ -806,25 +667,25 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) { sal_uInt16 nValue = static_cast<const Svx3DNormalsKindItem&>(rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); - if( ( !aBtnNormalsObj.IsChecked() && nValue == 0 ) || - ( !aBtnNormalsFlat.IsChecked() && nValue == 1 ) || - ( !aBtnNormalsSphere.IsChecked() && nValue == 2 ) ) + if( ( !m_pBtnNormalsObj->IsChecked() && nValue == 0 ) || + ( !m_pBtnNormalsFlat->IsChecked() && nValue == 1 ) || + ( !m_pBtnNormalsSphere->IsChecked() && nValue == 2 ) ) { - aBtnNormalsObj.Check( nValue == 0 ); - aBtnNormalsFlat.Check( nValue == 1 ); - aBtnNormalsSphere.Check( nValue == 2 ); + m_pBtnNormalsObj->Check( nValue == 0 ); + m_pBtnNormalsFlat->Check( nValue == 1 ); + m_pBtnNormalsSphere->Check( nValue == 2 ); bUpdate = true; } } else { - if( aBtnNormalsObj.IsChecked() || - aBtnNormalsFlat.IsChecked() || - aBtnNormalsSphere.IsChecked() ) + if( m_pBtnNormalsObj->IsChecked() || + m_pBtnNormalsFlat->IsChecked() || + m_pBtnNormalsSphere->IsChecked() ) { - aBtnNormalsObj.Check( false ); - aBtnNormalsFlat.Check( false ); - aBtnNormalsSphere.Check( false ); + m_pBtnNormalsObj->Check( false ); + m_pBtnNormalsFlat->Check( false ); + m_pBtnNormalsSphere->Check( false ); bUpdate = true; } } @@ -834,19 +695,19 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bValue = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); - if( bValue != aBtnNormalsInvert.IsChecked() ) + if( bValue != m_pBtnNormalsInvert->IsChecked() ) { - aBtnNormalsInvert.Check( bValue ); + m_pBtnNormalsInvert->Check( bValue ); bUpdate = true; } - else if( aBtnNormalsInvert.GetState() == TRISTATE_INDET ) - aBtnNormalsInvert.Check( bValue ); + else if( m_pBtnNormalsInvert->GetState() == TRISTATE_INDET ) + m_pBtnNormalsInvert->Check( bValue ); } else { - if( aBtnNormalsInvert.GetState() != TRISTATE_INDET ) + if( m_pBtnNormalsInvert->GetState() != TRISTATE_INDET ) { - aBtnNormalsInvert.SetState( TRISTATE_INDET ); + m_pBtnNormalsInvert->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -856,19 +717,19 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bValue = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); - if( bValue != aBtnTwoSidedLighting.IsChecked() ) + if( bValue != m_pBtnTwoSidedLighting->IsChecked() ) { - aBtnTwoSidedLighting.Check( bValue ); + m_pBtnTwoSidedLighting->Check( bValue ); bUpdate = true; } - else if( aBtnTwoSidedLighting.GetState() == TRISTATE_INDET ) - aBtnTwoSidedLighting.Check( bValue ); + else if( m_pBtnTwoSidedLighting->GetState() == TRISTATE_INDET ) + m_pBtnTwoSidedLighting->Check( bValue ); } else { - if( aBtnTwoSidedLighting.GetState() != TRISTATE_INDET ) + if( m_pBtnTwoSidedLighting->GetState() != TRISTATE_INDET ) { - aBtnTwoSidedLighting.SetState( TRISTATE_INDET ); + m_pBtnTwoSidedLighting->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -879,17 +740,17 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = static_cast<const Svx3DShadeModeItem&>(rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); - if( nValue != aLbShademode.GetSelectEntryPos() ) + if( nValue != m_pLbShademode->GetSelectEntryPos() ) { - aLbShademode.SelectEntryPos( nValue ); + m_pLbShademode->SelectEntryPos( nValue ); bUpdate = true; } } else { - if( aLbShademode.GetSelectEntryCount() != 0 ) + if( m_pLbShademode->GetSelectEntryCount() != 0 ) { - aLbShademode.SetNoSelection(); + m_pLbShademode->SetNoSelection(); bUpdate = true; } } @@ -899,21 +760,21 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bValue = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); - if( bValue != aBtnShadow3d.IsChecked() ) + if( bValue != m_pBtnShadow3d->IsChecked() ) { - aBtnShadow3d.Check( bValue ); - aFtSlant.Enable( bValue ); - aMtrSlant.Enable( bValue ); + m_pBtnShadow3d->Check( bValue ); + m_pFtSlant->Enable( bValue ); + m_pMtrSlant->Enable( bValue ); bUpdate = true; } - else if( aBtnShadow3d.GetState() == TRISTATE_INDET ) - aBtnShadow3d.Check( bValue ); + else if( m_pBtnShadow3d->GetState() == TRISTATE_INDET ) + m_pBtnShadow3d->Check( bValue ); } else { - if( aBtnShadow3d.GetState() != TRISTATE_INDET ) + if( m_pBtnShadow3d->GetState() != TRISTATE_INDET ) { - aBtnShadow3d.SetState( TRISTATE_INDET ); + m_pBtnShadow3d->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -923,17 +784,17 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = static_cast<const SfxUInt16Item&>(rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue(); - if( nValue != aMtrSlant.GetValue() ) + if( nValue != m_pMtrSlant->GetValue() ) { - aMtrSlant.SetValue( nValue ); + m_pMtrSlant->SetValue( nValue ); bUpdate = true; } } else { - if( !aMtrSlant.IsEmptyFieldValue() ) + if( !m_pMtrSlant->IsEmptyFieldValue() ) { - aMtrSlant.SetEmptyFieldValue(); + m_pMtrSlant->SetEmptyFieldValue(); bUpdate = true; } } @@ -943,21 +804,21 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { sal_uInt32 nValue = static_cast<const SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue(); - sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit ); + sal_uInt32 nValue2 = GetCoreValue(*m_pMtrDistance, ePoolUnit); if( nValue != nValue2 ) { - if( eFUnit != aMtrDistance.GetUnit() ) - SetFieldUnit( aMtrDistance, eFUnit ); + if( eFUnit != m_pMtrDistance->GetUnit() ) + SetFieldUnit(*m_pMtrDistance, eFUnit); - SetMetricValue( aMtrDistance, nValue, ePoolUnit ); + SetMetricValue(*m_pMtrDistance, nValue, ePoolUnit); bUpdate = true; } } else { - if( !aMtrDepth.IsEmptyFieldValue() ) + if( !m_pMtrDepth->IsEmptyFieldValue() ) { - aMtrDepth.SetEmptyFieldValue(); + m_pMtrDepth->SetEmptyFieldValue(); bUpdate = true; } } @@ -967,21 +828,21 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { sal_uInt32 nValue = static_cast<const SfxUInt32Item&>(rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); - sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit ); + sal_uInt32 nValue2 = GetCoreValue(*m_pMtrFocalLength, ePoolUnit); if( nValue != nValue2 ) { - if( eFUnit != aMtrFocalLength.GetUnit() ) - SetFieldUnit( aMtrFocalLength, eFUnit ); + if( eFUnit != m_pMtrFocalLength->GetUnit() ) + SetFieldUnit(*m_pMtrFocalLength, eFUnit); - SetMetricValue( aMtrFocalLength, nValue, ePoolUnit ); + SetMetricValue(*m_pMtrFocalLength, nValue, ePoolUnit); bUpdate = true; } } else { - if( !aMtrFocalLength.IsEmptyFieldValue() ) + if( !m_pMtrFocalLength->IsEmptyFieldValue() ) { - aMtrFocalLength.SetEmptyFieldValue(); + m_pMtrFocalLength->SetEmptyFieldValue(); bUpdate = true; } } @@ -994,7 +855,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_1)).GetValue(); - ColorLB* pLb = &aLbLight1; + ColorLB* pLb = m_pLbLight1; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1003,9 +864,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbLight1.GetSelectEntryCount() != 0 ) + if( m_pLbLight1->GetSelectEntryCount() != 0 ) { - aLbLight1.SetNoSelection(); + m_pLbLight1->SetNoSelection(); bUpdate = true; } } @@ -1014,20 +875,20 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bOn = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); - if( ( bOn && !GetUILightState( aBtnLight1 )) || - ( !bOn && GetUILightState( aBtnLight1 )) ) + if( ( bOn && !GetUILightState(*m_pBtnLight1)) || + ( !bOn && GetUILightState(*m_pBtnLight1)) ) { - SetUILightState( aBtnLight1, bOn ); + SetUILightState(*m_pBtnLight1, bOn); bUpdate = true; } - if( aBtnLight1.GetState() == TRISTATE_INDET ) - aBtnLight1.Check( aBtnLight1.IsChecked() ); + if( m_pBtnLight1->GetState() == TRISTATE_INDET ) + m_pBtnLight1->Check( m_pBtnLight1->IsChecked() ); } else { - if( aBtnLight1.GetState() != TRISTATE_INDET ) + if( m_pBtnLight1->GetState() != TRISTATE_INDET ) { - aBtnLight1.SetState( TRISTATE_INDET ); + m_pBtnLight1->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -1043,7 +904,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_2)).GetValue(); - ColorLB* pLb = &aLbLight2; + ColorLB* pLb = m_pLbLight2; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1052,9 +913,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbLight2.GetSelectEntryCount() != 0 ) + if( m_pLbLight2->GetSelectEntryCount() != 0 ) { - aLbLight2.SetNoSelection(); + m_pLbLight2->SetNoSelection(); bUpdate = true; } } @@ -1063,20 +924,20 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bOn = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); - if( ( bOn && !GetUILightState( aBtnLight2 )) || - ( !bOn && GetUILightState( aBtnLight2 )) ) + if( ( bOn && !GetUILightState(*m_pBtnLight2)) || + ( !bOn && GetUILightState(*m_pBtnLight2)) ) { - SetUILightState( aBtnLight2, bOn ); + SetUILightState(*m_pBtnLight2, bOn); bUpdate = true; } - if( aBtnLight2.GetState() == TRISTATE_INDET ) - aBtnLight2.Check( aBtnLight2.IsChecked() ); + if( m_pBtnLight2->GetState() == TRISTATE_INDET ) + m_pBtnLight2->Check( m_pBtnLight2->IsChecked() ); } else { - if( aBtnLight2.GetState() != TRISTATE_INDET ) + if( m_pBtnLight2->GetState() != TRISTATE_INDET ) { - aBtnLight2.SetState( TRISTATE_INDET ); + m_pBtnLight2->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -1092,7 +953,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_3)).GetValue(); - ColorLB* pLb = &aLbLight3; + ColorLB* pLb = m_pLbLight3; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1101,9 +962,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbLight3.GetSelectEntryCount() != 0 ) + if( m_pLbLight3->GetSelectEntryCount() != 0 ) { - aLbLight3.SetNoSelection(); + m_pLbLight3->SetNoSelection(); bUpdate = true; } } @@ -1112,20 +973,20 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bOn = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); - if( ( bOn && !GetUILightState( aBtnLight3)) || - ( !bOn && GetUILightState( aBtnLight3)) ) + if( ( bOn && !GetUILightState(*m_pBtnLight3)) || + ( !bOn && GetUILightState(*m_pBtnLight3)) ) { - SetUILightState( aBtnLight3, bOn ); + SetUILightState(*m_pBtnLight3, bOn); bUpdate = true; } - if( aBtnLight3.GetState() == TRISTATE_INDET ) - aBtnLight3.Check( aBtnLight3.IsChecked() ); + if( m_pBtnLight3->GetState() == TRISTATE_INDET ) + m_pBtnLight3->Check( m_pBtnLight3->IsChecked() ); } else { - if( aBtnLight3.GetState() != TRISTATE_INDET ) + if( m_pBtnLight3->GetState() != TRISTATE_INDET ) { - aBtnLight3.SetState( TRISTATE_INDET ); + m_pBtnLight3->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -1141,7 +1002,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_4)).GetValue(); - ColorLB* pLb = &aLbLight4; + ColorLB* pLb = m_pLbLight4; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1150,9 +1011,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbLight4.GetSelectEntryCount() != 0 ) + if( m_pLbLight4->GetSelectEntryCount() != 0 ) { - aLbLight4.SetNoSelection(); + m_pLbLight4->SetNoSelection(); bUpdate = true; } } @@ -1161,20 +1022,20 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bOn = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); - if( ( bOn && !GetUILightState( aBtnLight4 )) || - ( !bOn && GetUILightState( aBtnLight4 )) ) + if( ( bOn && !GetUILightState(*m_pBtnLight4)) || + ( !bOn && GetUILightState(*m_pBtnLight4)) ) { - SetUILightState( aBtnLight4, bOn ); + SetUILightState(*m_pBtnLight4, bOn); bUpdate = true; } - if( aBtnLight4.GetState() == TRISTATE_INDET ) - aBtnLight4.Check( aBtnLight4.IsChecked() ); + if( m_pBtnLight4->GetState() == TRISTATE_INDET ) + m_pBtnLight4->Check( m_pBtnLight4->IsChecked() ); } else { - if( aBtnLight4.GetState() != TRISTATE_INDET ) + if( m_pBtnLight4->GetState() != TRISTATE_INDET ) { - aBtnLight4.SetState( TRISTATE_INDET ); + m_pBtnLight4->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -1190,7 +1051,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_5)).GetValue(); - ColorLB* pLb = &aLbLight5; + ColorLB* pLb = m_pLbLight5; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1199,9 +1060,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbLight5.GetSelectEntryCount() != 0 ) + if( m_pLbLight5->GetSelectEntryCount() != 0 ) { - aLbLight5.SetNoSelection(); + m_pLbLight5->SetNoSelection(); bUpdate = true; } } @@ -1210,20 +1071,20 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bOn = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); - if( ( bOn && !GetUILightState( aBtnLight5 )) || - ( !bOn && GetUILightState( aBtnLight5 )) ) + if( ( bOn && !GetUILightState(*m_pBtnLight5)) || + ( !bOn && GetUILightState(*m_pBtnLight5)) ) { - SetUILightState( aBtnLight5, bOn ); + SetUILightState(*m_pBtnLight5, bOn); bUpdate = true; } - if( aBtnLight5.GetState() == TRISTATE_INDET ) - aBtnLight5.Check( aBtnLight5.IsChecked() ); + if( m_pBtnLight5->GetState() == TRISTATE_INDET ) + m_pBtnLight5->Check( m_pBtnLight5->IsChecked() ); } else { - if( aBtnLight5.GetState() != TRISTATE_INDET ) + if( m_pBtnLight5->GetState() != TRISTATE_INDET ) { - aBtnLight5.SetState( TRISTATE_INDET ); + m_pBtnLight5->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -1239,7 +1100,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_6)).GetValue(); - ColorLB* pLb = &aLbLight6; + ColorLB* pLb = m_pLbLight6; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1248,9 +1109,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbLight6.GetSelectEntryCount() != 0 ) + if( m_pLbLight6->GetSelectEntryCount() != 0 ) { - aLbLight6.SetNoSelection(); + m_pLbLight6->SetNoSelection(); bUpdate = true; } } @@ -1259,20 +1120,20 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bOn = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); - if( ( bOn && !GetUILightState( aBtnLight6 )) || - ( !bOn && GetUILightState( aBtnLight6 )) ) + if( ( bOn && !GetUILightState(*m_pBtnLight6)) || + ( !bOn && GetUILightState(*m_pBtnLight6)) ) { - SetUILightState( aBtnLight6, bOn ); + SetUILightState(*m_pBtnLight6, bOn); bUpdate = true; } - if( aBtnLight6.GetState() == TRISTATE_INDET ) - aBtnLight6.Check( aBtnLight6.IsChecked() ); + if( m_pBtnLight6->GetState() == TRISTATE_INDET ) + m_pBtnLight6->Check( m_pBtnLight6->IsChecked() ); } else { - if( aBtnLight6.GetState() != TRISTATE_INDET ) + if( m_pBtnLight6->GetState() != TRISTATE_INDET ) { - aBtnLight6.SetState( TRISTATE_INDET ); + m_pBtnLight6->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -1288,7 +1149,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_7)).GetValue(); - ColorLB* pLb = &aLbLight7; + ColorLB* pLb = m_pLbLight7; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1297,9 +1158,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbLight7.GetSelectEntryCount() != 0 ) + if( m_pLbLight7->GetSelectEntryCount() != 0 ) { - aLbLight7.SetNoSelection(); + m_pLbLight7->SetNoSelection(); bUpdate = true; } } @@ -1308,20 +1169,20 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bOn = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); - if( ( bOn && !GetUILightState( aBtnLight7 )) || - ( !bOn && GetUILightState( aBtnLight7 )) ) + if( ( bOn && !GetUILightState(*m_pBtnLight7)) || + ( !bOn && GetUILightState(*m_pBtnLight7)) ) { - SetUILightState( aBtnLight7 , bOn ); + SetUILightState(*m_pBtnLight7 , bOn); bUpdate = true; } - if( aBtnLight7.GetState() == TRISTATE_INDET ) - aBtnLight7.Check( aBtnLight7.IsChecked() ); + if( m_pBtnLight7->GetState() == TRISTATE_INDET ) + m_pBtnLight7->Check( m_pBtnLight7->IsChecked() ); } else { - if( aBtnLight7.GetState() != TRISTATE_INDET ) + if( m_pBtnLight7->GetState() != TRISTATE_INDET ) { - aBtnLight7.SetState( TRISTATE_INDET ); + m_pBtnLight7->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -1337,7 +1198,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTCOLOR_8)).GetValue(); - ColorLB* pLb = &aLbLight8; + ColorLB* pLb = m_pLbLight8; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1346,9 +1207,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbLight8.GetSelectEntryCount() != 0 ) + if( m_pLbLight8->GetSelectEntryCount() != 0 ) { - aLbLight8.SetNoSelection(); + m_pLbLight8->SetNoSelection(); bUpdate = true; } } @@ -1357,20 +1218,20 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bOn = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); - if( ( bOn && !GetUILightState( aBtnLight8 )) || - ( !bOn && GetUILightState( aBtnLight8 )) ) + if( ( bOn && !GetUILightState(*m_pBtnLight8)) || + ( !bOn && GetUILightState(*m_pBtnLight8)) ) { - SetUILightState( aBtnLight8, bOn ); + SetUILightState(*m_pBtnLight8, bOn); bUpdate = true; } - if( aBtnLight8.GetState() == TRISTATE_INDET ) - aBtnLight8.Check( aBtnLight8.IsChecked() ); + if( m_pBtnLight8->GetState() == TRISTATE_INDET ) + m_pBtnLight8->Check( m_pBtnLight8->IsChecked() ); } else { - if( aBtnLight8.GetState() != TRISTATE_INDET ) + if( m_pBtnLight8->GetState() != TRISTATE_INDET ) { - aBtnLight8.SetState( TRISTATE_INDET ); + m_pBtnLight8->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -1386,7 +1247,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DSCENE_AMBIENTCOLOR)).GetValue(); - ColorLB* pLb = &aLbAmbientlight; + ColorLB* pLb = m_pLbAmbientlight; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1395,9 +1256,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbAmbientlight.GetSelectEntryCount() != 0 ) + if( m_pLbAmbientlight->GetSelectEntryCount() != 0 ) { - aLbAmbientlight.SetNoSelection(); + m_pLbAmbientlight->SetNoSelection(); bUpdate = true; } } @@ -1412,21 +1273,21 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) { sal_uInt16 nValue = static_cast<const Svx3DTextureKindItem&>(rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue(); - if( ( !aBtnTexLuminance.IsChecked() && nValue == 1 ) || - ( !aBtnTexColor.IsChecked() && nValue == 3 ) ) + if( ( !m_pBtnTexLuminance->IsChecked() && nValue == 1 ) || + ( !m_pBtnTexColor->IsChecked() && nValue == 3 ) ) { - aBtnTexLuminance.Check( nValue == 1 ); - aBtnTexColor.Check( nValue == 3 ); + m_pBtnTexLuminance->Check( nValue == 1 ); + m_pBtnTexColor->Check( nValue == 3 ); bUpdate = true; } } else { - if( aBtnTexLuminance.IsChecked() || - aBtnTexColor.IsChecked() ) + if( m_pBtnTexLuminance->IsChecked() || + m_pBtnTexColor->IsChecked() ) { - aBtnTexLuminance.Check( false ); - aBtnTexColor.Check( false ); + m_pBtnTexLuminance->Check( false ); + m_pBtnTexColor->Check( false ); bUpdate = true; } } @@ -1437,21 +1298,21 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) { sal_uInt16 nValue = static_cast<const Svx3DTextureModeItem&>(rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue(); - if( ( !aBtnTexReplace.IsChecked() && nValue == 1 ) || - ( !aBtnTexModulate.IsChecked() && nValue == 2 ) ) + if( ( !m_pBtnTexReplace->IsChecked() && nValue == 1 ) || + ( !m_pBtnTexModulate->IsChecked() && nValue == 2 ) ) { - aBtnTexReplace.Check( nValue == 1 ); - aBtnTexModulate.Check( nValue == 2 ); + m_pBtnTexReplace->Check( nValue == 1 ); + m_pBtnTexModulate->Check( nValue == 2 ); bUpdate = true; } } else { - if( aBtnTexReplace.IsChecked() || - aBtnTexModulate.IsChecked() ) + if( m_pBtnTexReplace->IsChecked() || + m_pBtnTexModulate->IsChecked() ) { - aBtnTexReplace.Check( false ); - aBtnTexModulate.Check( false ); + m_pBtnTexReplace->Check( false ); + m_pBtnTexModulate->Check( false ); bUpdate = true; } } @@ -1462,25 +1323,25 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) { sal_uInt16 nValue = static_cast<const Svx3DTextureProjectionXItem&>(rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); - if( ( !aBtnTexObjectX.IsChecked() && nValue == 0 ) || - ( !aBtnTexParallelX.IsChecked() && nValue == 1 ) || - ( !aBtnTexCircleX.IsChecked() && nValue == 2 ) ) + if( ( !m_pBtnTexObjectX->IsChecked() && nValue == 0 ) || + ( !m_pBtnTexParallelX->IsChecked() && nValue == 1 ) || + ( !m_pBtnTexCircleX->IsChecked() && nValue == 2 ) ) { - aBtnTexObjectX.Check( nValue == 0 ); - aBtnTexParallelX.Check( nValue == 1 ); - aBtnTexCircleX.Check( nValue == 2 ); + m_pBtnTexObjectX->Check( nValue == 0 ); + m_pBtnTexParallelX->Check( nValue == 1 ); + m_pBtnTexCircleX->Check( nValue == 2 ); bUpdate = true; } } else { - if( aBtnTexObjectX.IsChecked() || - aBtnTexParallelX.IsChecked() || - aBtnTexCircleX.IsChecked() ) + if( m_pBtnTexObjectX->IsChecked() || + m_pBtnTexParallelX->IsChecked() || + m_pBtnTexCircleX->IsChecked() ) { - aBtnTexObjectX.Check( false ); - aBtnTexParallelX.Check( false ); - aBtnTexCircleX.Check( false ); + m_pBtnTexObjectX->Check( false ); + m_pBtnTexParallelX->Check( false ); + m_pBtnTexCircleX->Check( false ); bUpdate = true; } } @@ -1491,25 +1352,25 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) { sal_uInt16 nValue = static_cast<const Svx3DTextureProjectionYItem&>(rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); - if( ( !aBtnTexObjectY.IsChecked() && nValue == 0 ) || - ( !aBtnTexParallelY.IsChecked() && nValue == 1 ) || - ( !aBtnTexCircleY.IsChecked() && nValue == 2 ) ) + if( ( !m_pBtnTexObjectY->IsChecked() && nValue == 0 ) || + ( !m_pBtnTexParallelY->IsChecked() && nValue == 1 ) || + ( !m_pBtnTexCircleY->IsChecked() && nValue == 2 ) ) { - aBtnTexObjectY.Check( nValue == 0 ); - aBtnTexParallelY.Check( nValue == 1 ); - aBtnTexCircleY.Check( nValue == 2 ); + m_pBtnTexObjectY->Check( nValue == 0 ); + m_pBtnTexParallelY->Check( nValue == 1 ); + m_pBtnTexCircleY->Check( nValue == 2 ); bUpdate = true; } } else { - if( aBtnTexObjectY.IsChecked() || - aBtnTexParallelY.IsChecked() || - aBtnTexCircleY.IsChecked() ) + if( m_pBtnTexObjectY->IsChecked() || + m_pBtnTexParallelY->IsChecked() || + m_pBtnTexCircleY->IsChecked() ) { - aBtnTexObjectY.Check( false ); - aBtnTexParallelY.Check( false ); - aBtnTexCircleY.Check( false ); + m_pBtnTexObjectY->Check( false ); + m_pBtnTexParallelY->Check( false ); + m_pBtnTexCircleY->Check( false ); bUpdate = true; } } @@ -1519,19 +1380,19 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { bool bValue = static_cast<const SfxBoolItem&>(rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); - if( bValue != aBtnTexFilter.IsChecked() ) + if( bValue != m_pBtnTexFilter->IsChecked() ) { - aBtnTexFilter.Check( bValue ); + m_pBtnTexFilter->Check( bValue ); bUpdate = true; } - if( aBtnTexFilter.GetState() == TRISTATE_INDET ) - aBtnTexFilter.Check( bValue ); + if( m_pBtnTexFilter->GetState() == TRISTATE_INDET ) + m_pBtnTexFilter->Check( bValue ); } else { - if( aBtnTexFilter.GetState() != TRISTATE_INDET ) + if( m_pBtnTexFilter->GetState() != TRISTATE_INDET ) { - aBtnTexFilter.SetState( TRISTATE_INDET ); + m_pBtnTexFilter->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -1539,14 +1400,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Material Favorites - aLbMatFavorites.SelectEntryPos( 0 ); + m_pLbMatFavorites->SelectEntryPos( 0 ); // Object color eState = rAttrs.GetItemState(XATTR_FILLCOLOR); if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const XFillColorItem&>(rAttrs.Get(XATTR_FILLCOLOR)).GetColorValue(); - ColorLB* pLb = &aLbMatColor; + ColorLB* pLb = m_pLbMatColor; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1555,9 +1416,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbMatColor.GetSelectEntryCount() != 0 ) + if( m_pLbMatColor->GetSelectEntryCount() != 0 ) { - aLbMatColor.SetNoSelection(); + m_pLbMatColor->SetNoSelection(); bUpdate = true; } } @@ -1567,7 +1428,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DOBJ_MAT_EMISSION)).GetValue(); - ColorLB* pLb = &aLbMatEmission; + ColorLB* pLb = m_pLbMatEmission; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1576,9 +1437,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbMatEmission.GetSelectEntryCount() != 0 ) + if( m_pLbMatEmission->GetSelectEntryCount() != 0 ) { - aLbMatEmission.SetNoSelection(); + m_pLbMatEmission->SetNoSelection(); bUpdate = true; } } @@ -1588,7 +1449,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { aColor = static_cast<const SvxColorItem&>(rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR)).GetValue(); - ColorLB* pLb = &aLbMatSpecular; + ColorLB* pLb = m_pLbMatSpecular; if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); @@ -1597,9 +1458,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) } else { - if( aLbMatSpecular.GetSelectEntryCount() != 0 ) + if( m_pLbMatSpecular->GetSelectEntryCount() != 0 ) { - aLbMatSpecular.SetNoSelection(); + m_pLbMatSpecular->SetNoSelection(); bUpdate = true; } } @@ -1609,17 +1470,17 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = static_cast<const SfxUInt16Item&>(rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue(); - if( nValue != aMtrMatSpecularIntensity.GetValue() ) + if( nValue != m_pMtrMatSpecularIntensity->GetValue() ) { - aMtrMatSpecularIntensity.SetValue( nValue ); + m_pMtrMatSpecularIntensity->SetValue( nValue ); bUpdate = true; } } else { - if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() ) + if( !m_pMtrMatSpecularIntensity->IsEmptyFieldValue() ) { - aMtrMatSpecularIntensity.SetEmptyFieldValue(); + m_pMtrMatSpecularIntensity->SetEmptyFieldValue(); bUpdate = true; } } @@ -1631,20 +1492,20 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( eState != SfxItemState::DONTCARE ) { ProjectionType ePT = (ProjectionType)static_cast<const Svx3DPerspectiveItem&>(rAttrs.Get(SDRATTR_3DSCENE_PERSPECTIVE)).GetValue(); - if( ( !aBtnPerspective.IsChecked() && ePT == PR_PERSPECTIVE ) || - ( aBtnPerspective.IsChecked() && ePT == PR_PARALLEL ) ) + if( ( !m_pBtnPerspective->IsChecked() && ePT == PR_PERSPECTIVE ) || + ( m_pBtnPerspective->IsChecked() && ePT == PR_PARALLEL ) ) { - aBtnPerspective.Check( ePT == PR_PERSPECTIVE ); + m_pBtnPerspective->Check( ePT == PR_PERSPECTIVE ); bUpdate = true; } - if( aBtnPerspective.GetState() == TRISTATE_INDET ) - aBtnPerspective.Check( ePT == PR_PERSPECTIVE ); + if( m_pBtnPerspective->GetState() == TRISTATE_INDET ) + m_pBtnPerspective->Check( ePT == PR_PERSPECTIVE ); } else { - if( aBtnPerspective.GetState() != TRISTATE_INDET ) + if( m_pBtnPerspective->GetState() != TRISTATE_INDET ) { - aBtnPerspective.SetState( TRISTATE_INDET ); + m_pBtnPerspective->SetState( TRISTATE_INDET ); bUpdate = true; } } @@ -1671,38 +1532,38 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if(SfxItemState::DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, false)) aSet.Put(XFillColorItem(OUString(), Color(COL_WHITE))); - aCtlPreview.Set3DAttributes(aSet); - aCtlLightPreview.GetSvx3DLightControl().Set3DAttributes(aSet); + m_pCtlPreview->Set3DAttributes(aSet); + m_pCtlLightPreview->GetSvx3DLightControl().Set3DAttributes(aSet); // try to select light corresponding to active button sal_uInt32 nNumber(0xffffffff); - if(aBtnLight1.IsChecked()) + if(m_pBtnLight1->IsChecked()) nNumber = 0; - else if(aBtnLight2.IsChecked()) + else if(m_pBtnLight2->IsChecked()) nNumber = 1; - else if(aBtnLight3.IsChecked()) + else if(m_pBtnLight3->IsChecked()) nNumber = 2; - else if(aBtnLight4.IsChecked()) + else if(m_pBtnLight4->IsChecked()) nNumber = 3; - else if(aBtnLight5.IsChecked()) + else if(m_pBtnLight5->IsChecked()) nNumber = 4; - else if(aBtnLight6.IsChecked()) + else if(m_pBtnLight6->IsChecked()) nNumber = 5; - else if(aBtnLight7.IsChecked()) + else if(m_pBtnLight7->IsChecked()) nNumber = 6; - else if(aBtnLight8.IsChecked()) + else if(m_pBtnLight8->IsChecked()) nNumber = 7; if(nNumber != 0xffffffff) { - aCtlLightPreview.GetSvx3DLightControl().SelectLight(nNumber); + m_pCtlLightPreview->GetSvx3DLightControl().SelectLight(nNumber); } } // handle state of converts possible - aBtnConvertTo3D.Enable(pConvertTo3DItem->GetState()); - aBtnLatheObject.Enable(pConvertTo3DLatheItem->GetState()); + m_pBtnConvertTo3D->Enable(pConvertTo3DItem->GetState()); + m_pBtnLatheObject->Enable(pConvertTo3DLatheItem->GetState()); } @@ -1728,10 +1589,10 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) //Others must stand as the front on all sides // Perspective - if( aBtnPerspective.GetState() != TRISTATE_INDET ) + if( m_pBtnPerspective->GetState() != TRISTATE_INDET ) { sal_uInt16 nValue; - if( aBtnPerspective.IsChecked() ) + if( m_pBtnPerspective->IsChecked() ) nValue = PR_PERSPECTIVE; else nValue = PR_PARALLEL; @@ -1753,34 +1614,34 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } // Number of segments (horizontal) - if( !aNumHorizontal.IsEmptyFieldValue() ) + if( !m_pNumHorizontal->IsEmptyFieldValue() ) { - sal_uInt32 nValue = static_cast<sal_uInt32>(aNumHorizontal.GetValue()); + sal_uInt32 nValue = static_cast<sal_uInt32>(m_pNumHorizontal->GetValue()); rAttrs.Put(makeSvx3DHorizontalSegmentsItem(nValue)); } else rAttrs.InvalidateItem(SDRATTR_3DOBJ_HORZ_SEGS); // Number of segments (vertical) - if( !aNumVertical.IsEmptyFieldValue() ) + if( !m_pNumVertical->IsEmptyFieldValue() ) { - sal_uInt32 nValue = static_cast<sal_uInt32>(aNumVertical.GetValue()); + sal_uInt32 nValue = static_cast<sal_uInt32>(m_pNumVertical->GetValue()); rAttrs.Put(makeSvx3DVerticalSegmentsItem(nValue)); } else rAttrs.InvalidateItem(SDRATTR_3DOBJ_VERT_SEGS); // Depth - if( !aMtrDepth.IsEmptyFieldValue() ) + if( !m_pMtrDepth->IsEmptyFieldValue() ) { - sal_uInt32 nValue = GetCoreValue( aMtrDepth, ePoolUnit ); + sal_uInt32 nValue = GetCoreValue(*m_pMtrDepth, ePoolUnit); rAttrs.Put(makeSvx3DDepthItem(nValue)); } else rAttrs.InvalidateItem(SDRATTR_3DOBJ_DEPTH); // Double-sided - TriState eState = aBtnDoubleSided.GetState(); + TriState eState = m_pBtnDoubleSided->GetState(); if( eState != TRISTATE_INDET ) { bool bValue = TRISTATE_TRUE == eState; @@ -1790,27 +1651,27 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DOBJ_DOUBLE_SIDED); // Edge rounding - if( !aMtrPercentDiagonal.IsEmptyFieldValue() ) + if( !m_pMtrPercentDiagonal->IsEmptyFieldValue() ) { - sal_uInt16 nValue = (sal_uInt16) aMtrPercentDiagonal.GetValue(); + sal_uInt16 nValue = (sal_uInt16) m_pMtrPercentDiagonal->GetValue(); rAttrs.Put(makeSvx3DPercentDiagonalItem(nValue)); } else rAttrs.InvalidateItem(SDRATTR_3DOBJ_PERCENT_DIAGONAL); // Depth scale - if( !aMtrBackscale.IsEmptyFieldValue() ) + if( !m_pMtrBackscale->IsEmptyFieldValue() ) { - sal_uInt16 nValue = (sal_uInt16)aMtrBackscale.GetValue(); + sal_uInt16 nValue = (sal_uInt16)m_pMtrBackscale->GetValue(); rAttrs.Put(makeSvx3DBackscaleItem(nValue)); } else rAttrs.InvalidateItem(SDRATTR_3DOBJ_BACKSCALE); // End angle - if( !aMtrEndAngle.IsEmptyFieldValue() ) + if( !m_pMtrEndAngle->IsEmptyFieldValue() ) { - sal_uInt16 nValue = (sal_uInt16)aMtrEndAngle.GetValue(); + sal_uInt16 nValue = (sal_uInt16)m_pMtrEndAngle->GetValue(); rAttrs.Put(makeSvx3DEndAngleItem(nValue)); } else @@ -1818,11 +1679,11 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Normal type sal_uInt16 nValue = 99; - if( aBtnNormalsObj.IsChecked() ) + if( m_pBtnNormalsObj->IsChecked() ) nValue = 0; - else if( aBtnNormalsFlat.IsChecked() ) + else if( m_pBtnNormalsFlat->IsChecked() ) nValue = 1; - else if( aBtnNormalsSphere.IsChecked() ) + else if( m_pBtnNormalsSphere->IsChecked() ) nValue = 2; if( nValue <= 2 ) @@ -1831,7 +1692,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DOBJ_NORMALS_KIND); // Normal inverted - eState = aBtnNormalsInvert.GetState(); + eState = m_pBtnNormalsInvert->GetState(); if( eState != TRISTATE_INDET ) { bool bValue = TRISTATE_TRUE == eState; @@ -1841,7 +1702,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DOBJ_NORMALS_INVERT); // 2-sided lighting - eState = aBtnTwoSidedLighting.GetState(); + eState = m_pBtnTwoSidedLighting->GetState(); if( eState != TRISTATE_INDET ) { bool bValue = TRISTATE_TRUE == eState; @@ -1852,16 +1713,16 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Representation // Shade mode - if( aLbShademode.GetSelectEntryCount() ) + if( m_pLbShademode->GetSelectEntryCount() ) { - nValue = aLbShademode.GetSelectEntryPos(); + nValue = m_pLbShademode->GetSelectEntryPos(); rAttrs.Put(Svx3DShadeModeItem(nValue)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_SHADE_MODE); // 3D-Shadow - eState = aBtnShadow3d.GetState(); + eState = m_pBtnShadow3d->GetState(); if( eState != TRISTATE_INDET ) { bool bValue = TRISTATE_TRUE == eState; @@ -1875,27 +1736,27 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } // Slant (Shadow) - if( !aMtrSlant.IsEmptyFieldValue() ) + if( !m_pMtrSlant->IsEmptyFieldValue() ) { - sal_uInt16 nValue2 = (sal_uInt16) aMtrSlant.GetValue(); + sal_uInt16 nValue2 = (sal_uInt16) m_pMtrSlant->GetValue(); rAttrs.Put(makeSvx3DShadowSlantItem(nValue2)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_SHADOW_SLANT); // Distance - if( !aMtrDistance.IsEmptyFieldValue() ) + if( !m_pMtrDistance->IsEmptyFieldValue() ) { - sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit ); + sal_uInt32 nValue2 = GetCoreValue(*m_pMtrDistance, ePoolUnit); rAttrs.Put(makeSvx3DDistanceItem(nValue2)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_DISTANCE); // Focal length - if( !aMtrFocalLength.IsEmptyFieldValue() ) + if( !m_pMtrFocalLength->IsEmptyFieldValue() ) { - sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit ); + sal_uInt32 nValue2 = GetCoreValue(*m_pMtrFocalLength, ePoolUnit); rAttrs.Put(makeSvx3DFocalLengthItem(nValue2)); } else @@ -1905,21 +1766,21 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) Image aImg; basegfx::B3DVector aVector; Color aColor; - const SfxItemSet aLightItemSet(aCtlLightPreview.GetSvx3DLightControl().Get3DAttributes()); + const SfxItemSet aLightItemSet(m_pCtlLightPreview->GetSvx3DLightControl().Get3DAttributes()); // Light 1 color - if( aLbLight1.GetSelectEntryCount() ) + if( m_pLbLight1->GetSelectEntryCount() ) { - aColor = aLbLight1.GetSelectEntryColor(); + aColor = m_pLbLight1->GetSelectEntryColor(); rAttrs.Put(makeSvx3DLightcolor1Item(aColor)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_1); // Light 1 (on/off) - eState = aBtnLight1.GetState(); + eState = m_pBtnLight1->GetState(); if( eState != TRISTATE_INDET ) { - bool bValue = GetUILightState( aBtnLight1 ); + bool bValue = GetUILightState(*m_pBtnLight1); rAttrs.Put(makeSvx3DLightOnOff1Item(bValue)); // Light 1 (direction) @@ -1933,18 +1794,18 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Light 2 color - if( aLbLight2.GetSelectEntryCount() ) + if( m_pLbLight2->GetSelectEntryCount() ) { - aColor = aLbLight2.GetSelectEntryColor(); + aColor = m_pLbLight2->GetSelectEntryColor(); rAttrs.Put(makeSvx3DLightcolor2Item(aColor)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_2); // Light 2 (on/off) - eState = aBtnLight2.GetState(); + eState = m_pBtnLight2->GetState(); if( eState != TRISTATE_INDET ) { - bool bValue = GetUILightState( aBtnLight2 ); + bool bValue = GetUILightState(*m_pBtnLight2); rAttrs.Put(makeSvx3DLightOnOff2Item(bValue)); // Light 2 (direction) @@ -1957,18 +1818,18 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_2); // Light 3 color - if( aLbLight3.GetSelectEntryCount() ) + if( m_pLbLight3->GetSelectEntryCount() ) { - aColor = aLbLight3.GetSelectEntryColor(); + aColor = m_pLbLight3->GetSelectEntryColor(); rAttrs.Put(makeSvx3DLightcolor3Item(aColor)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_3); // Light 3 (on/off) - eState = aBtnLight3.GetState(); + eState = m_pBtnLight3->GetState(); if( eState != TRISTATE_INDET ) { - bool bValue = GetUILightState( aBtnLight3 ); + bool bValue = GetUILightState(*m_pBtnLight3); rAttrs.Put(makeSvx3DLightOnOff3Item(bValue)); // Light 3 (direction) @@ -1981,18 +1842,18 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_3); // Light 4 color - if( aLbLight4.GetSelectEntryCount() ) + if( m_pLbLight4->GetSelectEntryCount() ) { - aColor = aLbLight4.GetSelectEntryColor(); + aColor = m_pLbLight4->GetSelectEntryColor(); rAttrs.Put(makeSvx3DLightcolor4Item(aColor)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_4); // Light 4 (on/off) - eState = aBtnLight4.GetState(); + eState = m_pBtnLight4->GetState(); if( eState != TRISTATE_INDET ) { - bool bValue = GetUILightState( aBtnLight4 ); + bool bValue = GetUILightState(*m_pBtnLight4); rAttrs.Put(makeSvx3DLightOnOff4Item(bValue)); // Light 4 (direction) @@ -2005,18 +1866,18 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_4); // Light 5 color - if( aLbLight5.GetSelectEntryCount() ) + if( m_pLbLight5->GetSelectEntryCount() ) { - aColor = aLbLight5.GetSelectEntryColor(); + aColor = m_pLbLight5->GetSelectEntryColor(); rAttrs.Put(makeSvx3DLightcolor5Item(aColor)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_5); // Light 5 (on/off) - eState = aBtnLight5.GetState(); + eState = m_pBtnLight5->GetState(); if( eState != TRISTATE_INDET ) { - bool bValue = GetUILightState( aBtnLight5 ); + bool bValue = GetUILightState(*m_pBtnLight5); rAttrs.Put(makeSvx3DLightOnOff5Item(bValue)); // Light 5 (direction) @@ -2029,18 +1890,18 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_5); // Light 6 color - if( aLbLight6.GetSelectEntryCount() ) + if( m_pLbLight6->GetSelectEntryCount() ) { - aColor = aLbLight6.GetSelectEntryColor(); + aColor = m_pLbLight6->GetSelectEntryColor(); rAttrs.Put(makeSvx3DLightcolor6Item(aColor)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_6); // Light 6 (on/off) - eState = aBtnLight6.GetState(); + eState = m_pBtnLight6->GetState(); if( eState != TRISTATE_INDET ) { - bool bValue = GetUILightState( aBtnLight6 ); + bool bValue = GetUILightState(*m_pBtnLight6); rAttrs.Put(makeSvx3DLightOnOff6Item(bValue)); // Light 6 (direction) @@ -2053,18 +1914,18 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_6); // Light 7 color - if( aLbLight7.GetSelectEntryCount() ) + if( m_pLbLight7->GetSelectEntryCount() ) { - aColor = aLbLight7.GetSelectEntryColor(); + aColor = m_pLbLight7->GetSelectEntryColor(); rAttrs.Put(makeSvx3DLightcolor7Item(aColor)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_7); // Light 7 (on/off) - eState = aBtnLight7.GetState(); + eState = m_pBtnLight7->GetState(); if( eState != TRISTATE_INDET ) { - bool bValue = GetUILightState( aBtnLight7 ); + bool bValue = GetUILightState(*m_pBtnLight7); rAttrs.Put(makeSvx3DLightOnOff7Item(bValue)); // Light 7 (direction) @@ -2077,18 +1938,18 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_7); // Light 8 color - if( aLbLight8.GetSelectEntryCount() ) + if( m_pLbLight8->GetSelectEntryCount() ) { - aColor = aLbLight8.GetSelectEntryColor(); + aColor = m_pLbLight8->GetSelectEntryColor(); rAttrs.Put(makeSvx3DLightcolor8Item(aColor)); } else rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTCOLOR_8); // Light 8 (on/off) - eState = aBtnLight8.GetState(); + eState = m_pBtnLight8->GetState(); if( eState != TRISTATE_INDET ) { - bool bValue = GetUILightState( aBtnLight8 ); + bool bValue = GetUILightState(*m_pBtnLight8); rAttrs.Put(makeSvx3DLightOnOff8Item(bValue)); // Light 8 (direction) @@ -2101,9 +1962,9 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) rAttrs.InvalidateItem(SDRATTR_3DSCENE_LIGHTON_8); // Ambient light - if( aLbAmbientlight.GetSelectEntryCount() ) + if( m_pLbAmbientlight->GetSelectEntryCount() ) { - aColor = aLbAmbientlight.GetSelectEntryColor(); + aColor = m_pLbAmbientlight->GetSelectEntryColor(); rAttrs.Put(makeSvx3DAmbientcolorItem(aColor)); } else @@ -2112,9 +1973,9 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Textures // Art nValue = 99; - if( aBtnTexLuminance.IsChecked() ) + if( m_pBtnTexLuminance->IsChecked() ) nValue = 1; - else if( aBtnTexColor.IsChecked() ) + else if( m_pBtnTexColor->IsChecked() ) nValue = 3; if( nValue == 1 || nValue == 3 ) @@ -2125,9 +1986,9 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Mode nValue = 99; - if( aBtnTexReplace.IsChecked() ) + if( m_pBtnTexReplace->IsChecked() ) nValue = 1; - else if( aBtnTexModulate.IsChecked() ) + else if( m_pBtnTexModulate->IsChecked() ) nValue = 2; if( nValue == 1 || nValue == 2 ) @@ -2137,11 +1998,11 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // X projection nValue = 99; - if( aBtnTexObjectX.IsChecked() ) + if( m_pBtnTexObjectX->IsChecked() ) nValue = 0; - else if( aBtnTexParallelX.IsChecked() ) + else if( m_pBtnTexParallelX->IsChecked() ) nValue = 1; - else if( aBtnTexCircleX.IsChecked() ) + else if( m_pBtnTexCircleX->IsChecked() ) nValue = 2; if( nValue <= 2 ) @@ -2151,11 +2012,11 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Y projection nValue = 99; - if( aBtnTexObjectY.IsChecked() ) + if( m_pBtnTexObjectY->IsChecked() ) nValue = 0; - else if( aBtnTexParallelY.IsChecked() ) + else if( m_pBtnTexParallelY->IsChecked() ) nValue = 1; - else if( aBtnTexCircleY.IsChecked() ) + else if( m_pBtnTexCircleY->IsChecked() ) nValue = 2; if( nValue <= 2 ) @@ -2165,7 +2026,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Filter - eState = aBtnTexFilter.GetState(); + eState = m_pBtnTexFilter->GetState(); if( eState != TRISTATE_INDET ) { bool bValue = TRISTATE_TRUE == eState; @@ -2177,9 +2038,9 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Material // Object color - if( aLbMatColor.GetSelectEntryCount() ) + if( m_pLbMatColor->GetSelectEntryCount() ) { - aColor = aLbMatColor.GetSelectEntryColor(); + aColor = m_pLbMatColor->GetSelectEntryColor(); rAttrs.Put( XFillColorItem( "", aColor) ); } else @@ -2188,34 +2049,33 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) } // luminous color - if( aLbMatEmission.GetSelectEntryCount() ) + if( m_pLbMatEmission->GetSelectEntryCount() ) { - aColor = aLbMatEmission.GetSelectEntryColor(); + aColor = m_pLbMatEmission->GetSelectEntryColor(); rAttrs.Put(makeSvx3DMaterialEmissionItem(aColor)); } else rAttrs.InvalidateItem(SDRATTR_3DOBJ_MAT_EMISSION); // Specular - if( aLbMatSpecular.GetSelectEntryCount() ) + if( m_pLbMatSpecular->GetSelectEntryCount() ) { - aColor = aLbMatSpecular.GetSelectEntryColor(); + aColor = m_pLbMatSpecular->GetSelectEntryColor(); rAttrs.Put(makeSvx3DMaterialSpecularItem(aColor)); } else rAttrs.InvalidateItem(SDRATTR_3DOBJ_MAT_SPECULAR); // Specular intensity - if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() ) + if( !m_pMtrMatSpecularIntensity->IsEmptyFieldValue() ) { - sal_uInt16 nValue2 = (sal_uInt16) aMtrMatSpecularIntensity.GetValue(); + sal_uInt16 nValue2 = (sal_uInt16) m_pMtrMatSpecularIntensity->GetValue(); rAttrs.Put(makeSvx3DMaterialSpecularIntensityItem(nValue2)); } else rAttrs.InvalidateItem(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY); } - void Svx3DWin::Resize() { if ( !IsFloatingMode() || @@ -2226,93 +2086,51 @@ void Svx3DWin::Resize() if( aWinSize.Height() >= GetMinOutputSizePixel().Height() && aWinSize.Width() >= GetMinOutputSizePixel().Width() ) { - Size aDiffSize; - aDiffSize.Width() = aWinSize.Width() - aSize.Width(); - aDiffSize.Height() = aWinSize.Height() - aSize.Height(); + // Hide + m_pBtnUpdate->Hide(); + m_pBtnAssign->Hide(); - Point aXPt; - Point aYPt; - aXPt.X() = aDiffSize.Width(); - aYPt.Y() = aDiffSize.Height(); + m_pBtnConvertTo3D->Hide(); + m_pBtnLatheObject->Hide(); + m_pBtnPerspective->Hide(); - Size aObjSize; + m_pCtlPreview->Hide(); + m_pCtlLightPreview->Hide(); - // Hide - aBtnUpdate.Hide(); - aBtnAssign.Hide(); - - aBtnConvertTo3D.Hide(); - aBtnLatheObject.Hide(); - aBtnPerspective.Hide(); - - aCtlPreview.Hide(); - aCtlLightPreview.Hide(); - - aFLGeometrie.Hide(); - aFLRepresentation.Hide(); - aFLLight.Hide(); - aFLTexture.Hide(); - aFLMaterial.Hide(); - - // Moving / resizing - aBtnUpdate.SetPosPixel( aBtnUpdate.GetPosPixel() + aXPt ); - aBtnAssign.SetPosPixel( aBtnAssign.GetPosPixel() + aXPt ); - - // Preview controls - aObjSize = aCtlPreview.GetOutputSizePixel(); - aObjSize.Width() += aDiffSize.Width(); - aObjSize.Height() += aDiffSize.Height(); - aCtlPreview.SetOutputSizePixel( aObjSize ); - aCtlLightPreview.SetOutputSizePixel( aObjSize ); - - // Groups - aObjSize = aFLGeometrie.GetOutputSizePixel(); - aObjSize.Width() += aDiffSize.Width(); - aFLGeometrie.SetOutputSizePixel( aObjSize ); - aFLSegments.SetOutputSizePixel( aObjSize ); - aFLShadow.SetOutputSizePixel( aObjSize ); - aFLCamera.SetOutputSizePixel( aObjSize ); - aFLRepresentation.SetOutputSizePixel( aObjSize ); - aFLLight.SetOutputSizePixel( aObjSize ); - aFLTexture.SetOutputSizePixel( aObjSize ); - aFLMaterial.SetOutputSizePixel( aObjSize ); - - // Y-position of the lower buttons - aBtnConvertTo3D.SetPosPixel( aBtnConvertTo3D.GetPosPixel() + aYPt ); - aBtnLatheObject.SetPosPixel( aBtnLatheObject.GetPosPixel() + aYPt ); - aBtnPerspective.SetPosPixel( aBtnPerspective.GetPosPixel() + aYPt ); + m_pFLGeometrie->Hide(); + m_pFLRepresentation->Hide(); + m_pFLLight->Hide(); + m_pFLTexture->Hide(); + m_pFLMaterial->Hide(); // Show - aBtnUpdate.Show(); - aBtnAssign.Show(); - - aBtnConvertTo3D.Show(); - aBtnLatheObject.Show(); - aBtnPerspective.Show(); + m_pBtnUpdate->Show(); + m_pBtnAssign->Show(); - if( aBtnGeo.IsChecked() ) - ClickViewTypeHdl( &aBtnGeo ); - if( aBtnRepresentation.IsChecked() ) - ClickViewTypeHdl( &aBtnRepresentation ); - if( aBtnLight.IsChecked() ) - ClickViewTypeHdl( &aBtnLight ); - if( aBtnTexture.IsChecked() ) - ClickViewTypeHdl( &aBtnTexture ); - if( aBtnMaterial.IsChecked() ) - ClickViewTypeHdl( &aBtnMaterial ); + m_pBtnConvertTo3D->Show(); + m_pBtnLatheObject->Show(); + m_pBtnPerspective->Show(); - aSize = aWinSize; + if( m_pBtnGeo->IsChecked() ) + ClickViewTypeHdl(m_pBtnGeo); + if( m_pBtnRepresentation->IsChecked() ) + ClickViewTypeHdl(m_pBtnRepresentation); + if( m_pBtnLight->IsChecked() ) + ClickViewTypeHdl(m_pBtnLight); + if( m_pBtnTexture->IsChecked() ) + ClickViewTypeHdl(m_pBtnTexture); + if( m_pBtnMaterial->IsChecked() ) + ClickViewTypeHdl(m_pBtnMaterial); } } SfxDockingWindow::Resize(); } - IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl) { - bUpdate = !aBtnUpdate.IsChecked(); - aBtnUpdate.Check( bUpdate ); + bUpdate = !m_pBtnUpdate->IsChecked(); + m_pBtnUpdate->Check( bUpdate ); if( bUpdate ) { @@ -2354,257 +2172,104 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) if( pBtn ) { // Since the permanent updating of the preview would be too expensive - bool bUpdatePreview = aBtnLight.IsChecked(); + bool bUpdatePreview = m_pBtnLight->IsChecked(); - aBtnGeo.Check( &aBtnGeo == pBtn ); - aBtnRepresentation.Check( &aBtnRepresentation == pBtn ); - aBtnLight.Check( &aBtnLight == pBtn ); - aBtnTexture.Check( &aBtnTexture == pBtn ); - aBtnMaterial.Check( &aBtnMaterial == pBtn ); + m_pBtnGeo->Check(m_pBtnGeo == pBtn); + m_pBtnRepresentation->Check(m_pBtnRepresentation == pBtn); + m_pBtnLight->Check(m_pBtnLight == pBtn); + m_pBtnTexture->Check(m_pBtnTexture == pBtn); + m_pBtnMaterial->Check(m_pBtnMaterial == pBtn); - if( aBtnGeo.IsChecked() ) + if( m_pBtnGeo->IsChecked() ) eViewType = VIEWTYPE_GEO; - if( aBtnRepresentation.IsChecked() ) + if( m_pBtnRepresentation->IsChecked() ) eViewType = VIEWTYPE_REPRESENTATION; - if( aBtnLight.IsChecked() ) + if( m_pBtnLight->IsChecked() ) eViewType = VIEWTYPE_LIGHT; - if( aBtnTexture.IsChecked() ) + if( m_pBtnTexture->IsChecked() ) eViewType = VIEWTYPE_TEXTURE; - if( aBtnMaterial.IsChecked() ) + if( m_pBtnMaterial->IsChecked() ) eViewType = VIEWTYPE_MATERIAL; // Geometry if( eViewType == VIEWTYPE_GEO ) { - aFtHorizontal.Show(); - aNumHorizontal.Show(); - aFtVertical.Show(); - aNumVertical.Show(); - aFLSegments.Show(); - aFtPercentDiagonal.Show(); - aMtrPercentDiagonal.Show(); - aFtBackscale.Show(); - aMtrBackscale.Show(); - aFtEndAngle.Show(); - aMtrEndAngle.Show(); - aFtDepth.Show(); - aMtrDepth.Show(); - aFLGeometrie.Show(); - - aBtnNormalsObj.Show(); - aBtnNormalsFlat.Show(); - aBtnNormalsSphere.Show(); - aBtnTwoSidedLighting.Show(); - aBtnNormalsInvert.Show(); - aFLNormals.Show(); - aBtnDoubleSided.Show(); + m_pFLSegments->Show(); + m_pFLGeometrie->Show(); + m_pFLNormals->Show(); } else { - aFtHorizontal.Hide(); - aNumHorizontal.Hide(); - aFtVertical.Hide(); - aNumVertical.Hide(); - aFLSegments.Hide(); - aFtPercentDiagonal.Hide(); - aMtrPercentDiagonal.Hide(); - aFtBackscale.Hide(); - aMtrBackscale.Hide(); - aFtEndAngle.Hide(); - aMtrEndAngle.Hide(); - aFtDepth.Hide(); - aMtrDepth.Hide(); - aFLGeometrie.Hide(); - - aBtnNormalsObj.Hide(); - aBtnNormalsFlat.Hide(); - aBtnNormalsSphere.Hide(); - aBtnTwoSidedLighting.Hide(); - aBtnNormalsInvert.Hide(); - aFLNormals.Hide(); - aBtnDoubleSided.Hide(); + m_pFLSegments->Hide(); + m_pFLGeometrie->Hide(); + m_pFLNormals->Hide(); } // Representation if( eViewType == VIEWTYPE_REPRESENTATION ) { - aFtShademode.Show(); - aLbShademode.Show(); - aBtnShadow3d.Show(); - aFtSlant.Show(); - aMtrSlant.Show(); - aFLShadow.Show(); - aFtDistance.Show(); - aMtrDistance.Show(); - aFtFocalLeng.Show(); - aMtrFocalLength.Show(); - aFLCamera.Show(); - aFLRepresentation.Show(); + m_pFLShadow->Show(); + m_pFLCamera->Show(); + m_pFLRepresentation->Show(); } else { - aFtShademode.Hide(); - aLbShademode.Hide(); - aBtnShadow3d.Hide(); - aFtSlant.Hide(); - aMtrSlant.Hide(); - aFLShadow.Hide(); - aFtDistance.Hide(); - aMtrDistance.Hide(); - aFtFocalLeng.Hide(); - aMtrFocalLength.Hide(); - aFLCamera.Hide(); - aFLRepresentation.Hide(); + m_pFLShadow->Hide(); + m_pFLCamera->Hide(); + m_pFLRepresentation->Hide(); } // Lighting if( eViewType == VIEWTYPE_LIGHT ) { - aBtnLight1.Show(); - aBtnLight2.Show(); - aBtnLight3.Show(); - aBtnLight4.Show(); - aBtnLight5.Show(); - aBtnLight6.Show(); - aBtnLight7.Show(); - aBtnLight8.Show(); - aBtnLightColor.Show(); - aFTLightsource.Show(); - aLbAmbientlight.Show(); - aBtnAmbientColor.Show(); - aFTAmbientlight.Show(); - aFLLight.Show(); + m_pFLLight->Show(); ColorLB* pLb = GetLbByButton(); if( pLb ) pLb->Show(); - aCtlLightPreview.Show(); - aCtlPreview.Hide(); + m_pCtlLightPreview->Show(); + m_pCtlPreview->Hide(); } else { - aBtnLight1.Hide(); - aBtnLight2.Hide(); - aBtnLight3.Hide(); - aBtnLight4.Hide(); - aBtnLight5.Hide(); - aBtnLight6.Hide(); - aBtnLight7.Hide(); - aBtnLight8.Hide(); - aLbLight1.Hide(); - aLbLight2.Hide(); - aLbLight3.Hide(); - aLbLight4.Hide(); - aLbLight5.Hide(); - aLbLight6.Hide(); - aLbLight7.Hide(); - aLbLight8.Hide(); - aBtnLightColor.Hide(); - aFTLightsource.Hide(); - aLbAmbientlight.Hide(); - aBtnAmbientColor.Hide(); - aFTAmbientlight.Hide(); - aFLLight.Hide(); - - if( !aCtlPreview.IsVisible() ) + m_pFLLight->Hide(); + + if( !m_pCtlPreview->IsVisible() ) { - aCtlPreview.Show(); - aCtlLightPreview.Hide(); + m_pCtlPreview->Show(); + m_pCtlLightPreview->Hide(); } } // Textures - if( eViewType == VIEWTYPE_TEXTURE ) - { - aFtTexKind.Show(); - aBtnTexLuminance.Show(); - aBtnTexColor.Show(); - aFtTexMode.Show(); - aBtnTexReplace.Show(); - aBtnTexModulate.Show(); - aFtTexProjectionX.Show(); - aBtnTexParallelX.Show(); - aBtnTexCircleX.Show(); - aBtnTexObjectX.Show(); - aFtTexProjectionY.Show(); - aBtnTexParallelY.Show(); - aBtnTexCircleY.Show(); - aBtnTexObjectY.Show(); - aFtTexFilter.Show(); - aBtnTexFilter.Show(); - aFLTexture.Show(); - } + if (eViewType == VIEWTYPE_TEXTURE) + m_pFLTexture->Show(); else - { - aFtTexKind.Hide(); - aBtnTexLuminance.Hide(); - aBtnTexColor.Hide(); - aFtTexMode.Hide(); - aBtnTexReplace.Hide(); - aBtnTexModulate.Hide(); - aBtnTexBlend.Hide(); - aFtTexProjectionX.Hide(); - aBtnTexParallelX.Hide(); - aBtnTexCircleX.Hide(); - aBtnTexObjectX.Hide(); - aFtTexProjectionY.Hide(); - aBtnTexParallelY.Hide(); - aBtnTexCircleY.Hide(); - aBtnTexObjectY.Hide(); - aFtTexFilter.Hide(); - aBtnTexFilter.Hide(); - aFLTexture.Hide(); - } + m_pFLTexture->Hide(); // Material if( eViewType == VIEWTYPE_MATERIAL ) { - aFtMatFavorites.Show(); - aLbMatFavorites.Show(); - aFtMatColor.Show(); - aLbMatColor.Show(); - aBtnMatColor.Show(); - aFtMatEmission.Show(); - aLbMatEmission.Show(); - aBtnEmissionColor.Show(); - aFtMatSpecular.Show(); - aLbMatSpecular.Show(); - aBtnSpecularColor.Show(); - aFtMatSpecularIntensity.Show(); - aMtrMatSpecularIntensity.Show(); - aFLMatSpecular.Show(); - aFLMaterial.Show(); + m_pFLMatSpecular->Show(); + m_pFLMaterial->Show(); } else { - aFtMatFavorites.Hide(); - aLbMatFavorites.Hide(); - aFtMatColor.Hide(); - aLbMatColor.Hide(); - aBtnMatColor.Hide(); - aFtMatEmission.Hide(); - aLbMatEmission.Hide(); - aBtnEmissionColor.Hide(); - aFtMatSpecular.Hide(); - aLbMatSpecular.Hide(); - aBtnSpecularColor.Hide(); - aFtMatSpecularIntensity.Hide(); - aMtrMatSpecularIntensity.Hide(); - aFLMatSpecular.Hide(); - aFLMaterial.Hide(); - } - if( bUpdatePreview && !aBtnLight.IsChecked() ) + m_pFLMatSpecular->Hide(); + m_pFLMaterial->Hide(); + } + if( bUpdatePreview && !m_pBtnLight->IsChecked() ) UpdatePreview(); } else { - aBtnGeo.Check( eViewType == VIEWTYPE_GEO ); - aBtnRepresentation.Check( eViewType == VIEWTYPE_REPRESENTATION ); - aBtnLight.Check( eViewType == VIEWTYPE_LIGHT ); - aBtnTexture.Check( eViewType == VIEWTYPE_TEXTURE ); - aBtnMaterial.Check( eViewType == VIEWTYPE_MATERIAL ); + m_pBtnGeo->Check( eViewType == VIEWTYPE_GEO ); + m_pBtnRepresentation->Check( eViewType == VIEWTYPE_REPRESENTATION ); + m_pBtnLight->Check( eViewType == VIEWTYPE_LIGHT ); + m_pBtnTexture->Check( eViewType == VIEWTYPE_TEXTURE ); + m_pBtnMaterial->Check( eViewType == VIEWTYPE_MATERIAL ); } return( 0L ); } @@ -2618,32 +2283,32 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) { sal_uInt16 nSId = 0; - if( pBtn == &aBtnConvertTo3D ) + if( pBtn == m_pBtnConvertTo3D ) { nSId = SID_CONVERT_TO_3D; } - else if( pBtn == &aBtnLatheObject ) + else if( pBtn == m_pBtnLatheObject ) { nSId = SID_CONVERT_TO_3D_LATHE_FAST; } // Geometry - else if( pBtn == &aBtnNormalsObj || - pBtn == &aBtnNormalsFlat || - pBtn == &aBtnNormalsSphere ) + else if( pBtn == m_pBtnNormalsObj || + pBtn == m_pBtnNormalsFlat || + pBtn == m_pBtnNormalsSphere ) { - aBtnNormalsObj.Check( pBtn == &aBtnNormalsObj ); - aBtnNormalsFlat.Check( pBtn == &aBtnNormalsFlat ); - aBtnNormalsSphere.Check( pBtn == &aBtnNormalsSphere ); + m_pBtnNormalsObj->Check( pBtn == m_pBtnNormalsObj ); + m_pBtnNormalsFlat->Check( pBtn == m_pBtnNormalsFlat ); + m_pBtnNormalsSphere->Check( pBtn == m_pBtnNormalsSphere ); bUpdatePreview = true; } - else if( pBtn == &aBtnLight1 || - pBtn == &aBtnLight2 || - pBtn == &aBtnLight3 || - pBtn == &aBtnLight4 || - pBtn == &aBtnLight5 || - pBtn == &aBtnLight6 || - pBtn == &aBtnLight7 || - pBtn == &aBtnLight8 ) + else if( pBtn == m_pBtnLight1 || + pBtn == m_pBtnLight2 || + pBtn == m_pBtnLight3 || + pBtn == m_pBtnLight4 || + pBtn == m_pBtnLight5 || + pBtn == m_pBtnLight6 || + pBtn == m_pBtnLight7 || + pBtn == m_pBtnLight8 ) { // Lighting ColorLB* pLb = GetLbByButton( pBtn ); @@ -2657,92 +2322,92 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) { pBtn->Check(); - if( pBtn != &aBtnLight1 && aBtnLight1.IsChecked() ) + if (pBtn != m_pBtnLight1 && m_pBtnLight1->IsChecked()) { - aBtnLight1.Check( false ); - aLbLight1.Hide(); + m_pBtnLight1->Check( false ); + m_pLbLight1->Hide(); } - if( pBtn != &aBtnLight2 && aBtnLight2.IsChecked() ) + if (pBtn != m_pBtnLight2 && m_pBtnLight2->IsChecked()) { - aBtnLight2.Check( false ); - aLbLight2.Hide(); + m_pBtnLight2->Check( false ); + m_pLbLight2->Hide(); } - if( pBtn != &aBtnLight3 && aBtnLight3.IsChecked() ) + if( pBtn != m_pBtnLight3 && m_pBtnLight3->IsChecked() ) { - aBtnLight3.Check( false ); - aLbLight3.Hide(); + m_pBtnLight3->Check( false ); + m_pLbLight3->Hide(); } - if( pBtn != &aBtnLight4 && aBtnLight4.IsChecked() ) + if( pBtn != m_pBtnLight4 && m_pBtnLight4->IsChecked() ) { - aBtnLight4.Check( false ); - aLbLight4.Hide(); + m_pBtnLight4->Check( false ); + m_pLbLight4->Hide(); } - if( pBtn != &aBtnLight5 && aBtnLight5.IsChecked() ) + if( pBtn != m_pBtnLight5 && m_pBtnLight5->IsChecked() ) { - aBtnLight5.Check( false ); - aLbLight5.Hide(); + m_pBtnLight5->Check( false ); + m_pLbLight5->Hide(); } - if( pBtn != &aBtnLight6 && aBtnLight6.IsChecked() ) + if( pBtn != m_pBtnLight6 && m_pBtnLight6->IsChecked() ) { - aBtnLight6.Check( false ); - aLbLight6.Hide(); + m_pBtnLight6->Check( false ); + m_pLbLight6->Hide(); } - if( pBtn != &aBtnLight7 && aBtnLight7.IsChecked() ) + if( pBtn != m_pBtnLight7 && m_pBtnLight7->IsChecked() ) { - aBtnLight7.Check( false ); - aLbLight7.Hide(); + m_pBtnLight7->Check( false ); + m_pLbLight7->Hide(); } - if( pBtn != &aBtnLight8 && aBtnLight8.IsChecked() ) + if( pBtn != m_pBtnLight8 && m_pBtnLight8->IsChecked() ) { - aBtnLight8.Check( false ); - aLbLight8.Hide(); + m_pBtnLight8->Check( false ); + m_pLbLight8->Hide(); } } bool bEnable = GetUILightState( *static_cast<ImageButton*>(pBtn) ); - aBtnLightColor.Enable( bEnable ); + m_pBtnLightColor->Enable( bEnable ); pLb->Enable( bEnable ); ClickLight(*pBtn); bUpdatePreview = true; } // Textures - else if( pBtn == &aBtnTexLuminance || - pBtn == &aBtnTexColor ) + else if( pBtn == m_pBtnTexLuminance || + pBtn == m_pBtnTexColor ) { - aBtnTexLuminance.Check( pBtn == &aBtnTexLuminance ); - aBtnTexColor.Check( pBtn == &aBtnTexColor ); + m_pBtnTexLuminance->Check( pBtn == m_pBtnTexLuminance ); + m_pBtnTexColor->Check( pBtn == m_pBtnTexColor ); bUpdatePreview = true; } - else if( pBtn == &aBtnTexReplace || - pBtn == &aBtnTexModulate ) + else if( pBtn == m_pBtnTexReplace || + pBtn == m_pBtnTexModulate ) { - aBtnTexReplace.Check( pBtn == &aBtnTexReplace ); - aBtnTexModulate.Check( pBtn == &aBtnTexModulate ); + m_pBtnTexReplace->Check( pBtn == m_pBtnTexReplace ); + m_pBtnTexModulate->Check( pBtn == m_pBtnTexModulate ); bUpdatePreview = true; } - else if( pBtn == &aBtnTexParallelX || - pBtn == &aBtnTexCircleX || - pBtn == &aBtnTexObjectX ) + else if( pBtn == m_pBtnTexParallelX || + pBtn == m_pBtnTexCircleX || + pBtn == m_pBtnTexObjectX ) { - aBtnTexParallelX.Check( pBtn == &aBtnTexParallelX ); - aBtnTexCircleX.Check( pBtn == &aBtnTexCircleX ); - aBtnTexObjectX.Check( pBtn == &aBtnTexObjectX ); + m_pBtnTexParallelX->Check( pBtn == m_pBtnTexParallelX ); + m_pBtnTexCircleX->Check( pBtn == m_pBtnTexCircleX ); + m_pBtnTexObjectX->Check( pBtn == m_pBtnTexObjectX ); bUpdatePreview = true; } - else if( pBtn == &aBtnTexParallelY || - pBtn == &aBtnTexCircleY || - pBtn == &aBtnTexObjectY ) + else if( pBtn == m_pBtnTexParallelY || + pBtn == m_pBtnTexCircleY || + pBtn == m_pBtnTexObjectY ) { - aBtnTexParallelY.Check( pBtn == &aBtnTexParallelY ); - aBtnTexCircleY.Check( pBtn == &aBtnTexCircleY ); - aBtnTexObjectY.Check( pBtn == &aBtnTexObjectY ); + m_pBtnTexParallelY->Check( pBtn == m_pBtnTexParallelY ); + m_pBtnTexCircleY->Check( pBtn == m_pBtnTexCircleY ); + m_pBtnTexObjectY->Check( pBtn == m_pBtnTexObjectY ); bUpdatePreview = true; } - else if( pBtn == &aBtnShadow3d ) + else if (pBtn == m_pBtnShadow3d) { pBtn->Check( !pBtn->IsChecked() ); - aFtSlant.Enable( pBtn->IsChecked() ); - aMtrSlant.Enable( pBtn->IsChecked() ); + m_pFtSlant->Enable( pBtn->IsChecked() ); + m_pMtrSlant->Enable( pBtn->IsChecked() ); bUpdatePreview = true; } // Other (no groups) @@ -2775,16 +2440,16 @@ IMPL_LINK( Svx3DWin, ClickColorHdl, PushButton *, pBtn ) SvColorDialog aColorDlg( this ); ColorLB* pLb; - if( pBtn == &aBtnLightColor ) + if( pBtn == m_pBtnLightColor ) pLb = GetLbByButton(); - else if( pBtn == &aBtnAmbientColor ) - pLb = &aLbAmbientlight; - else if( pBtn == &aBtnMatColor ) - pLb = &aLbMatColor; - else if( pBtn == &aBtnEmissionColor ) - pLb = &aLbMatEmission; - else // if( pBtn == &aBtnSpecularColor ) - pLb = &aLbMatSpecular; + else if( pBtn == m_pBtnAmbientColor ) + pLb = m_pLbAmbientlight; + else if( pBtn == m_pBtnMatColor ) + pLb = m_pLbMatColor; + else if( pBtn == m_pBtnEmissionColor ) + pLb = m_pLbMatEmission; + else // if( pBtn == m_pBtnSpecularColor ) + pLb = m_pLbMatSpecular; Color aColor = pLb->GetSelectEntryColor(); @@ -2806,14 +2471,14 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) bool bUpdatePreview = false; // Material - if( p == &aLbMatFavorites ) + if (p == m_pLbMatFavorites) { Color aColObj( COL_WHITE ); Color aColEmis( COL_BLACK ); Color aColSpec( COL_WHITE ); sal_uInt16 nSpecIntens = 20; - sal_uInt16 nPos = aLbMatFavorites.GetSelectEntryPos(); + sal_uInt16 nPos = m_pLbMatFavorites->GetSelectEntryPos(); switch( nPos ) { case 1: // Metall @@ -2861,37 +2526,37 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) } break; } - LBSelectColor( &aLbMatColor, aColObj ); - LBSelectColor( &aLbMatEmission, aColEmis ); - LBSelectColor( &aLbMatSpecular, aColSpec ); - aMtrMatSpecularIntensity.SetValue( nSpecIntens ); + LBSelectColor( m_pLbMatColor, aColObj ); + LBSelectColor( m_pLbMatEmission, aColEmis ); + LBSelectColor( m_pLbMatSpecular, aColSpec ); + m_pMtrMatSpecularIntensity->SetValue( nSpecIntens ); bUpdatePreview = true; } - else if( p == &aLbMatColor || - p == &aLbMatEmission || - p == &aLbMatSpecular ) + else if( p == m_pLbMatColor || + p == m_pLbMatEmission || + p == m_pLbMatSpecular ) { - aLbMatFavorites.SelectEntryPos( 0 ); + m_pLbMatFavorites->SelectEntryPos( 0 ); bUpdatePreview = true; } // Lighting - else if( p == &aLbAmbientlight ) + else if( p == m_pLbAmbientlight ) { bUpdatePreview = true; } - else if( p == &aLbLight1 || - p == &aLbLight2 || - p == &aLbLight3 || - p == &aLbLight4 || - p == &aLbLight5 || - p == &aLbLight6 || - p == &aLbLight7 || - p == &aLbLight8 ) + else if( p == m_pLbLight1 || + p == m_pLbLight2 || + p == m_pLbLight3 || + p == m_pLbLight4 || + p == m_pLbLight5 || + p == m_pLbLight6 || + p == m_pLbLight7 || + p == m_pLbLight8 ) { bUpdatePreview = true; } - else if( p == &aLbShademode ) + else if (p == m_pLbShademode) bUpdatePreview = true; if( bUpdatePreview ) @@ -2908,19 +2573,19 @@ IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField ) bool bUpdatePreview = false; // Material - if( pField == &aMtrMatSpecularIntensity ) + if( pField == m_pMtrMatSpecularIntensity ) { bUpdatePreview = true; } - else if( pField == &aNumHorizontal ) + else if (pField == m_pNumHorizontal) { bUpdatePreview = true; } - else if( pField == &aNumVertical ) + else if (pField == m_pNumVertical) { bUpdatePreview = true; } - else if( pField == &aMtrSlant ) + else if (pField == m_pMtrSlant) { bUpdatePreview = true; } @@ -2938,7 +2603,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn) sal_uInt16 nLightSource = GetLightSource( &rBtn ); ColorLB* pLb = GetLbByButton( &rBtn ); Color aColor( pLb->GetSelectEntryColor() ); - SfxItemSet aLightItemSet(aCtlLightPreview.GetSvx3DLightControl().Get3DAttributes()); + SfxItemSet aLightItemSet(m_pCtlLightPreview->GetSvx3DLightControl().Get3DAttributes()); const bool bOnOff(GetUILightState( static_cast<const ImageButton&>(rBtn) )); switch(nLightSource) @@ -2954,9 +2619,9 @@ void Svx3DWin::ClickLight(PushButton& rBtn) case 7: aLightItemSet.Put(makeSvx3DLightcolor8Item(aColor)); aLightItemSet.Put(makeSvx3DLightOnOff8Item(bOnOff)); break; } - aCtlLightPreview.GetSvx3DLightControl().Set3DAttributes(aLightItemSet); - aCtlLightPreview.GetSvx3DLightControl().SelectLight(nLightSource); - aCtlLightPreview.CheckSelection(); + m_pCtlLightPreview->GetSvx3DLightControl().Set3DAttributes(aLightItemSet); + m_pCtlLightPreview->GetSvx3DLightControl().SelectLight(nLightSource); + m_pCtlLightPreview->CheckSelection(); } @@ -2971,19 +2636,19 @@ IMPL_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl) IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl) { - const sal_uInt32 nLight(aCtlLightPreview.GetSvx3DLightControl().GetSelectedLight()); + const sal_uInt32 nLight(m_pCtlLightPreview->GetSvx3DLightControl().GetSelectedLight()); PushButton* pBtn = 0; switch( nLight ) { - case 0: pBtn = &aBtnLight1; break; - case 1: pBtn = &aBtnLight2; break; - case 2: pBtn = &aBtnLight3; break; - case 3: pBtn = &aBtnLight4; break; - case 4: pBtn = &aBtnLight5; break; - case 5: pBtn = &aBtnLight6; break; - case 6: pBtn = &aBtnLight7; break; - case 7: pBtn = &aBtnLight8; break; + case 0: pBtn = m_pBtnLight1; break; + case 1: pBtn = m_pBtnLight2; break; + case 2: pBtn = m_pBtnLight3; break; + case 3: pBtn = m_pBtnLight4; break; + case 4: pBtn = m_pBtnLight5; break; + case 5: pBtn = m_pBtnLight6; break; + case 6: pBtn = m_pBtnLight7; break; + case 7: pBtn = m_pBtnLight8; break; default: break; } @@ -2992,47 +2657,47 @@ IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl) else { // Status: No lamp selected - if( aBtnLight1.IsChecked() ) + if( m_pBtnLight1->IsChecked() ) { - aBtnLight1.Check( false ); - aLbLight1.Enable( false ); + m_pBtnLight1->Check( false ); + m_pLbLight1->Enable( false ); } - else if( aBtnLight2.IsChecked() ) + else if( m_pBtnLight2->IsChecked() ) { - aBtnLight2.Check( false ); - aLbLight2.Enable( false ); + m_pBtnLight2->Check( false ); + m_pLbLight2->Enable( false ); } - else if( aBtnLight3.IsChecked() ) + else if( m_pBtnLight3->IsChecked() ) { - aBtnLight3.Check( false ); - aLbLight3.Enable( false ); + m_pBtnLight3->Check( false ); + m_pLbLight3->Enable( false ); } - else if( aBtnLight4.IsChecked() ) + else if( m_pBtnLight4->IsChecked() ) { - aBtnLight4.Check( false ); - aLbLight4.Enable( false ); + m_pBtnLight4->Check( false ); + m_pLbLight4->Enable( false ); } - else if( aBtnLight5.IsChecked() ) + else if( m_pBtnLight5->IsChecked() ) { - aBtnLight5.Check( false ); - aLbLight5.Enable( false ); + m_pBtnLight5->Check( false ); + m_pLbLight5->Enable( false ); } - else if( aBtnLight6.IsChecked() ) + else if( m_pBtnLight6->IsChecked() ) { - aBtnLight6.Check( false ); - aLbLight6.Enable( false ); + m_pBtnLight6->Check( false ); + m_pLbLight6->Enable( false ); } - else if( aBtnLight7.IsChecked() ) + else if( m_pBtnLight7->IsChecked() ) { - aBtnLight7.Check( false ); - aLbLight7.Enable( false ); + m_pBtnLight7->Check( false ); + m_pLbLight7->Enable( false ); } - else if( aBtnLight8.IsChecked() ) + else if( m_pBtnLight8->IsChecked() ) { - aBtnLight8.Check( false ); - aLbLight8.Enable( false ); + m_pBtnLight8->Check( false ); + m_pLbLight8->Enable( false ); } - aBtnLightColor.Enable( false ); + m_pBtnLightColor->Enable( false ); } return( 0L ); @@ -3092,8 +2757,8 @@ void Svx3DWin::UpdatePreview() // Get Attributes and set the preview GetAttr( aSet ); - aCtlPreview.Set3DAttributes( aSet ); - aCtlLightPreview.GetSvx3DLightControl().Set3DAttributes( aSet ); + m_pCtlPreview->Set3DAttributes( aSet ); + m_pCtlLightPreview->GetSvx3DLightControl().Set3DAttributes( aSet ); } @@ -3107,34 +2772,34 @@ void Svx3DWin::DocumentReload() void Svx3DWin::InitColorLB( const SdrModel* pDoc ) { - aLbLight1.Fill( pDoc->GetColorList() ); - aLbLight2.CopyEntries( aLbLight1 ); - aLbLight3.CopyEntries( aLbLight1 ); - aLbLight4.CopyEntries( aLbLight1 ); - aLbLight5.CopyEntries( aLbLight1 ); - aLbLight6.CopyEntries( aLbLight1 ); - aLbLight7.CopyEntries( aLbLight1 ); - aLbLight8.CopyEntries( aLbLight1 ); - aLbAmbientlight.CopyEntries( aLbLight1 ); - aLbMatColor.CopyEntries( aLbLight1 ); - aLbMatEmission.CopyEntries( aLbLight1 ); - aLbMatSpecular.CopyEntries( aLbLight1 ); + m_pLbLight1->Fill( pDoc->GetColorList() ); + m_pLbLight2->CopyEntries( *m_pLbLight1 ); + m_pLbLight3->CopyEntries( *m_pLbLight1 ); + m_pLbLight4->CopyEntries( *m_pLbLight1 ); + m_pLbLight5->CopyEntries( *m_pLbLight1 ); + m_pLbLight6->CopyEntries( *m_pLbLight1 ); + m_pLbLight7->CopyEntries( *m_pLbLight1 ); + m_pLbLight8->CopyEntries( *m_pLbLight1 ); + m_pLbAmbientlight->CopyEntries( *m_pLbLight1 ); + m_pLbMatColor->CopyEntries( *m_pLbLight1 ); + m_pLbMatEmission->CopyEntries( *m_pLbLight1 ); + m_pLbMatSpecular->CopyEntries( *m_pLbLight1 ); // First... Color aColWhite( COL_WHITE ); Color aColBlack( COL_BLACK ); - aLbLight1.SelectEntry( aColWhite ); - aLbLight2.SelectEntry( aColWhite ); - aLbLight3.SelectEntry( aColWhite ); - aLbLight4.SelectEntry( aColWhite ); - aLbLight5.SelectEntry( aColWhite ); - aLbLight6.SelectEntry( aColWhite ); - aLbLight7.SelectEntry( aColWhite ); - aLbLight8.SelectEntry( aColWhite ); - aLbAmbientlight.SelectEntry( aColBlack ); - aLbMatColor.SelectEntry( aColWhite ); - aLbMatEmission.SelectEntry( aColBlack ); - aLbMatSpecular.SelectEntry( aColWhite ); + m_pLbLight1->SelectEntry( aColWhite ); + m_pLbLight2->SelectEntry( aColWhite ); + m_pLbLight3->SelectEntry( aColWhite ); + m_pLbLight4->SelectEntry( aColWhite ); + m_pLbLight5->SelectEntry( aColWhite ); + m_pLbLight6->SelectEntry( aColWhite ); + m_pLbLight7->SelectEntry( aColWhite ); + m_pLbLight8->SelectEntry( aColWhite ); + m_pLbAmbientlight->SelectEntry( aColBlack ); + m_pLbMatColor->SelectEntry( aColWhite ); + m_pLbMatEmission->SelectEntry( aColBlack ); + m_pLbMatSpecular->SelectEntry( aColWhite ); } @@ -3144,40 +2809,40 @@ sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn ) if( pBtn == NULL ) { - if( aBtnLight1.IsChecked() ) + if( m_pBtnLight1->IsChecked() ) nLight = 0; - else if( aBtnLight2.IsChecked() ) + else if( m_pBtnLight2->IsChecked() ) nLight = 1; - else if( aBtnLight3.IsChecked() ) + else if( m_pBtnLight3->IsChecked() ) nLight = 2; - else if( aBtnLight4.IsChecked() ) + else if( m_pBtnLight4->IsChecked() ) nLight = 3; - else if( aBtnLight5.IsChecked() ) + else if( m_pBtnLight5->IsChecked() ) nLight = 4; - else if( aBtnLight6.IsChecked() ) + else if( m_pBtnLight6->IsChecked() ) nLight = 5; - else if( aBtnLight7.IsChecked() ) + else if( m_pBtnLight7->IsChecked() ) nLight = 6; - else if( aBtnLight8.IsChecked() ) + else if( m_pBtnLight8->IsChecked() ) nLight = 7; } else { - if( pBtn == &aBtnLight1 ) + if (pBtn == m_pBtnLight1) nLight = 0; - else if( pBtn == &aBtnLight2 ) + else if (pBtn == m_pBtnLight2) nLight = 1; - else if( pBtn == &aBtnLight3 ) + else if( pBtn == m_pBtnLight3 ) nLight = 2; - else if( pBtn == &aBtnLight4 ) + else if( pBtn == m_pBtnLight4 ) nLight = 3; - else if( pBtn == &aBtnLight5 ) + else if( pBtn == m_pBtnLight5 ) nLight = 4; - else if( pBtn == &aBtnLight6 ) + else if( pBtn == m_pBtnLight6 ) nLight = 5; - else if( pBtn == &aBtnLight7 ) + else if( pBtn == m_pBtnLight7 ) nLight = 6; - else if( pBtn == &aBtnLight8 ) + else if( pBtn == m_pBtnLight8 ) nLight = 7; } return( nLight ); @@ -3190,41 +2855,41 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn ) if( pBtn == NULL ) { - if( aBtnLight1.IsChecked() ) - pLb = &aLbLight1; - else if( aBtnLight2.IsChecked() ) - pLb = &aLbLight2; - else if( aBtnLight3.IsChecked() ) - pLb = &aLbLight3; - else if( aBtnLight4.IsChecked() ) - pLb = &aLbLight4; - else if( aBtnLight5.IsChecked() ) - pLb = &aLbLight5; - else if( aBtnLight6.IsChecked() ) - pLb = &aLbLight6; - else if( aBtnLight7.IsChecked() ) - pLb = &aLbLight7; - else if( aBtnLight8.IsChecked() ) - pLb = &aLbLight8; - } - else - { - if( pBtn == &aBtnLight1 ) - pLb = &aLbLight1; - else if( pBtn == &aBtnLight2 ) - pLb = &aLbLight2; - else if( pBtn == &aBtnLight3 ) - pLb = &aLbLight3; - else if( pBtn == &aBtnLight4 ) - pLb = &aLbLight4; - else if( pBtn == &aBtnLight5 ) - pLb = &aLbLight5; - else if( pBtn == &aBtnLight6 ) - pLb = &aLbLight6; - else if( pBtn == &aBtnLight7 ) - pLb = &aLbLight7; - else if( pBtn == &aBtnLight8 ) - pLb = &aLbLight8; + if( m_pBtnLight1->IsChecked() ) + pLb = m_pLbLight1; + else if( m_pBtnLight2->IsChecked() ) + pLb = m_pLbLight2; + else if( m_pBtnLight3->IsChecked() ) + pLb = m_pLbLight3; + else if( m_pBtnLight4->IsChecked() ) + pLb = m_pLbLight4; + else if( m_pBtnLight5->IsChecked() ) + pLb = m_pLbLight5; + else if( m_pBtnLight6->IsChecked() ) + pLb = m_pLbLight6; + else if( m_pBtnLight7->IsChecked() ) + pLb = m_pLbLight7; + else if( m_pBtnLight8->IsChecked() ) + pLb = m_pLbLight8; + } + else + { + if( pBtn == m_pBtnLight1 ) + pLb = m_pLbLight1; + else if (pBtn == m_pBtnLight2) + pLb = m_pLbLight2; + else if( pBtn == m_pBtnLight3 ) + pLb = m_pLbLight3; + else if( pBtn == m_pBtnLight4 ) + pLb = m_pLbLight4; + else if( pBtn == m_pBtnLight5 ) + pLb = m_pLbLight5; + else if( pBtn == m_pBtnLight6 ) + pLb = m_pLbLight6; + else if( pBtn == m_pBtnLight7 ) + pLb = m_pLbLight7; + else if( pBtn == m_pBtnLight8 ) + pLb = m_pLbLight8; } return( pLb ); }; diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index 6ce305325316..3a3451e25f07 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -49,1120 +49,6 @@ #define MASKCOLOR MaskColor = Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }; -DockingWindow RID_SVXFLOAT_3D -{ - HelpID = CMD_SID_3D_WIN ; - Border = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Sizeable = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Dockable = TRUE ; - EnableResizing = TRUE ; - Size = MAP_APPFONT ( WIDTH , HEIGHT ) ; - Text [ en-US ] = "3D Effects" ; - Closeable = TRUE ; - Zoomable = TRUE ; - - ImageButton BTN_GEO - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_GEO"; - Pos = MAP_APPFONT ( 4 , BORDER ) ; - Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; - TabStop = TRUE ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "3dgeo.bmp" ; }; - MASKCOLOR - }; - QuickHelpText [ en-US ] = "Geometry" ; - }; - ImageButton BTN_REPRESENTATION - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_REPRESENTATION"; - Pos = MAP_APPFONT ( 22 , BORDER ) ; - Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; - TabStop = TRUE ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "3drepres.bmp" ; }; - MASKCOLOR - }; - QuickHelpText [ en-US ] = "Shading" ; - }; - ImageButton BTN_LIGHT - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT"; - Pos = MAP_APPFONT ( 40 , BORDER ) ; - Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; - TabStop = TRUE ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "3dlight.bmp" ; }; - MASKCOLOR - }; - QuickHelpText [ en-US ] = "Illumination" ; - }; - ImageButton BTN_TEXTURE - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEXTURE"; - Pos = MAP_APPFONT ( 58 , BORDER ) ; - Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "3dtextur.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Textures" ; - }; - ImageButton BTN_MATERIAL - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MATERIAL"; - Pos = MAP_APPFONT ( 76 , BORDER ) ; - Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; - TabStop = TRUE ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "material.bmp" ; }; - MASKCOLOR - }; - QuickHelpText [ en-US ] = "Material" ; - }; - - ImageButton BTN_UPDATE - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_UPDATE"; - Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH * 2 , BORDER ) ; - Size = IMG_BUTTON_SIZE; - TabStop = TRUE ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "sc10350.bmp" ; }; - MASKCOLOR - }; - QuickHelpText [ en-US ] = "Update" ; - }; - ImageButton BTN_ASSIGN - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_ASSIGN"; - Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH , BORDER ) ; - Size = IMG_BUTTON_SIZE; - TabStop = TRUE ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "apply.bmp" ; }; - MASKCOLOR - }; - QuickHelpText [ en-US ] = "Assign" ; - }; - // Lower part - ImageButton BTN_CHANGE_TO_3D - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D"; - Pos = MAP_APPFONT ( 9 , 200 - BUTTON_HEIGHT ) ; - Size = IMG_BUTTON_SIZE; - TabStop = TRUE ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "convrt3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Convert to 3D" ; - }; - ImageButton BTN_LATHE_OBJ - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LATHE_OBJ"; - Pos = MAP_APPFONT ( 9 + BUTTON_WIDTH + 1 , 200 - BUTTON_HEIGHT ) ; - Size = IMG_BUTTON_SIZE; - TabStop = TRUE ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "rotate3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Convert to Lathe Object" ; - }; - ImageButton BTN_PERSPECTIVE - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_PERSPECTIVE"; - Pos = MAP_APPFONT ( 9 + ( BUTTON_WIDTH + 1 ) * 2 , 200 - BUTTON_HEIGHT ) ; - Size = IMG_BUTTON_SIZE; - TabStop = TRUE ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "persp3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Perspective On/Off" ; - }; - Control CTL_PREVIEW - { - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 124 ) ; - Size = MAP_APPFONT ( 83 , 76 ) ; - TabStop = TRUE ; - }; - Control CTL_LIGHT_PREVIEW - { - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 124 ) ; - Size = MAP_APPFONT ( 83 , 76 ) ; - TabStop = TRUE ; - }; - FixedLine FL_GEOMETRIE - { - Pos = TOP_FIXED_LINE_POS; - Size = FIXED_LINE_SIZE; - Text [ en-US ] = "Geometry" ; - }; - FixedText FT_PERCENT_DIAGONAL - { - Pos = MAP_APPFONT ( FT_INDENT, FIRST_FT_START_Y ); - Size = MAP_APPFONT ( FT_WIDTH_LONG , FT_HEIGHT ) ; - Text [ en-US ] = "R~ounded edges" ; - }; - MetricField MTR_PERCENT_DIAGONAL - { - HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , FIRST_FT_START_Y - 2 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - SpinSize = 5 ; - Maximum = 100 ; - Last = 100 ; - Unit = FUNIT_PERCENT ; - }; - FixedText FT_BACKSCALE - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + FT_OFFSET_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_LONG , FT_HEIGHT ) ; - Text [ en-US ] = "~Scaled depth" ; - }; - MetricField MTR_BACKSCALE - { - HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_BACKSCALE"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, - FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - SpinSize = 5 ; - Maximum = 10000 ; - Unit = FUNIT_PERCENT ; - Last = 10000 ; - }; - FixedText FT_END_ANGLE - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 2*FT_OFFSET_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_LONG , FT_HEIGHT ) ; - Text [ en-US ] = "~Rotation angle" ; - }; - MetricField MTR_END_ANGLE - { - HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_END_ANGLE"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, - FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - SpinSize = 5 ; - Unit = FUNIT_CUSTOM ; - Maximum = 36000 ; - Last = 36000 ; - DecimalDigits = 1 ; - CustomUnitText [ en-US ] = " degree(s)"; - }; - FixedText FT_DEPTH - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 3*FT_OFFSET_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_LONG , FT_HEIGHT ) ; - Text [ en-US ] = "~Depth" ; - }; - MetricField MTR_DEPTH - { - HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DEPTH"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, - FIRST_FT_START_Y + 3*FT_OFFSET_NEXT - 2 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Unit = FUNIT_MM ; - StrictFormat = TRUE ; - Minimum = 0 ; - First = 0 ; - Maximum = 10000000 ; - Last = 10000000 ; - DecimalDigits = 2 ; - SpinSize = 100 ; - }; - FixedLine FL_SEGMENTS - { - Pos = MAP_APPFONT ( BORDER , SEGMENTS_START_Y ) ; - Size = FIXED_LINE_SIZE; - Text [ en-US ] = "Segments" ; - }; - // Geometry - FixedText FT_HORIZONTAL - { - Pos = MAP_APPFONT ( FT_INDENT , SEGMENTS_START_Y+13 ) ; - Size = MAP_APPFONT ( 40 , 8 ) ; - Text [ en-US ] = "~Horizontal" ; - }; - NumericField NUM_HORIZONTAL - { - HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_HORIZONTAL"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + 42, SEGMENTS_START_Y+13-2 ) ; - Size = MAP_APPFONT ( 22 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 2 ; - First = 2 ; - Maximum = 256 ; - Last = 256 ; - }; - FixedText FT_VERTICAL - { - Pos = MAP_APPFONT ( FT_INDENT + 74 , SEGMENTS_START_Y+13 ) ; - Size = MAP_APPFONT ( 40 , 8 ) ; - Text [ en-US ] = "~Vertical" ; - }; - NumericField NUM_VERTICAL - { - HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_VERTICAL"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + 114+2 , SEGMENTS_START_Y+13-2 ) ; - Size = MAP_APPFONT ( 22 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 2 ; - First = 2 ; - Maximum = 256 ; - Last = 256 ; - }; - - FixedLine FL_NORMALS - { - Pos = MAP_APPFONT ( BORDER , NORMALS_START_Y ) ; - Size = MAP_APPFONT ( 54 , 8 ) ; - Text [ en-US ] = "Normals" ; - }; - ImageButton BTN_NORMALS_OBJ - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ"; - Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "normobjs.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Object-Specific" ; - }; - ImageButton BTN_NORMALS_FLAT - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT"; - Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) , NORMALS_BT_START_Y ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "normflat.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Flat" ; - }; - ImageButton BTN_NORMALS_SPHERE - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE"; - Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 , NORMALS_BT_START_Y ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "normsphe.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Spherical" ; - }; - ImageButton BTN_NORMALS_INVERT - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT"; - Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "invert3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Invert Normals" ; - }; - ImageButton BTN_TWO_SIDED_LIGHTING - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING"; - Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 , - NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "lght2sid.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Double-Sided Illumination" ; - }; - ImageButton BTN_DOUBLE_SIDED - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED"; - Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + 2*IMG_BUTTON_NEXT ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "doublesi.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Double-Sided" ; - }; - - // Representation - FixedText FT_SHADEMODE - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "~Mode" ; - }; - ListBox LB_SHADEMODE - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_SHADEMODE"; - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , 30 ) ; - Size = MAP_APPFONT ( 83 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - StringList [ en-US ] = - { - < "Flat" ; > ; - < "Phong" ; > ; - < "Gouraud" ; > ; - }; - }; - FixedLine FL_SHADOW - { - Pos = MAP_APPFONT ( BORDER , SHADOW_START_Y ) ; - Size = FIXED_LINE_SIZE; - Text [ en-US ] = "Shadow" ; - }; - ImageButton BTN_SHADOW_3D - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SHADOW_3D"; - Pos = MAP_APPFONT ( FT_INDENT , SHADOW_START_Y + 11 ) ; - Size = IMG_BUTTON_SIZE; - TabStop = TRUE ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "shadow3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "3D Shadowing On/Off" ; - }; - FixedText FT_SLANT - { - Pos = MAP_APPFONT ( FT_INDENT + BUTTON_WIDTH + 3 , SHADOW_START_Y + 11 + 2 ) ; - Size = MAP_APPFONT ( 68 , FT_HEIGHT ) ; - Right = TRUE; - Text [ en-US ] = "S~urface angle" ; - }; - MetricField MTR_SLANT - { - HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_SLANT"; - Border = TRUE ; - Pos = MAP_APPFONT ( 99 , SHADOW_START_Y + 11 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - SpinSize = 5 ; - Maximum = 90 ; - Unit = FUNIT_CUSTOM ; - Last = 90 ; - CustomUnitText [ en-US ] = " degree(s)"; - }; - - FixedLine FL_CAMERA - { - Pos = MAP_APPFONT ( BORDER , CAMERA_START_Y ) ; - Size = FIXED_LINE_SIZE; - Text [ en-US ] = "Camera" ; - }; - FixedText FT_DISTANCE - { - Pos = MAP_APPFONT ( FT_INDENT , CAMERA_START_Y + 11 ) ; - Size = MAP_APPFONT ( FT_WIDTH_LONG , FT_HEIGHT ) ; - Text [ en-US ] = "~Distance" ; - }; - MetricField MTR_DISTANCE - { - HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DISTANCE"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , - CAMERA_START_Y + 11 - 2 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - StrictFormat = TRUE ; - Unit = FUNIT_MM ; - Minimum = 1 ; - First = 1 ; - Maximum = 1000000 ; - Last = 1000000 ; - DecimalDigits = 2 ; - SpinSize = 100 ; - }; - FixedText FT_FOCAL_LENGTH - { - Pos = MAP_APPFONT ( FT_INDENT , CAMERA_START_Y + 11 + FT_OFFSET_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_LONG , FT_HEIGHT ) ; - Text [ en-US ] = "~Focal length" ; - }; - MetricField MTR_FOCAL_LENGTH - { - HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , - CAMERA_START_Y + 11 + FT_OFFSET_NEXT - 2 ) ; - Size = MAP_APPFONT ( 50 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - StrictFormat = TRUE ; - Unit = FUNIT_MM ; - Minimum = 1 ; - First = 1 ; - Maximum = 1000000 ; - Last = 1000000 ; - DecimalDigits = 2 ; - SpinSize = 100 ; - }; - FixedLine FL_REPRESENTATION - { - Pos = TOP_FIXED_LINE_POS; - Size = FIXED_LINE_SIZE; - Text [ en-US ] = "Shading" ; - }; - // Lighting - FixedText FT_LIGHTSOURCE - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y ) ; - Size = MAP_APPFONT ( FT_WIDTH_LONG , FT_HEIGHT ) ; - Text [ en-US ] = "~Light source" ; - }; - ImageButton BTN_LIGHT_1 - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_1"; - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "light.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Light Source 1" ; - }; - ImageButton BTN_LIGHT_2 - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_2"; - Pos = MAP_APPFONT ( FT_INDENT + 13 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "light.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Light Source 2" ; - }; - ImageButton BTN_LIGHT_3 - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_3"; - Pos = MAP_APPFONT ( FT_INDENT + 2*13 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "light.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Light Source 3" ; - }; - ImageButton BTN_LIGHT_4 - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_4"; - Pos = MAP_APPFONT ( FT_INDENT + 3*13 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "light.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Light Source 4" ; - }; - ImageButton BTN_LIGHT_5 - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_5"; - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 26 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "light.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Light Source 5" ; - }; - ImageButton BTN_LIGHT_6 - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_6"; - Pos = MAP_APPFONT ( FT_INDENT + 13, FIRST_FT_START_Y + 26 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "light.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Light Source 6" ; - }; - ImageButton BTN_LIGHT_7 - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_7"; - Pos = MAP_APPFONT ( FT_INDENT + 2*13, FIRST_FT_START_Y + 26 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "light.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Light Source 7" ; - }; - ImageButton BTN_LIGHT_8 - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_8"; - Pos = MAP_APPFONT ( FT_INDENT +3*13 , FIRST_FT_START_Y + 26 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "light.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Light Source 8" ; - }; - ListBox LB_LIGHT_1 - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_1"; - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ListBox LB_LIGHT_2 - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_2"; - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ListBox LB_LIGHT_3 - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_3"; - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ListBox LB_LIGHT_4 - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_4"; - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ListBox LB_LIGHT_5 - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_5"; - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ListBox LB_LIGHT_6 - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_6"; - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ListBox LB_LIGHT_7 - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_7"; - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ListBox LB_LIGHT_8 - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_8"; - Border = TRUE ; - Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ImageButton BTN_LIGHT_COLOR - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR"; - Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 11 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "colordlg.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Colors Dialog" ; - }; - FixedText FT_AMBIENTLIGHT - { - Pos = MAP_APPFONT ( FT_INDENT, FIRST_FT_START_Y + 53 ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "~Ambient light" ; - }; - ListBox LB_AMBIENTLIGHT - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + 53 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ImageButton BTN_AMBIENT_COLOR - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR"; - Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 53 ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "colordlg.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Colors Dialog" ; - }; - - FixedLine FL_LIGHT - { - Pos = TOP_FIXED_LINE_POS; - Size = FIXED_LINE_SIZE ; - Text [ en-US ] = "Illumination" ; - }; - // Textures - FixedText FT_TEX_KIND - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "~Type" ; - }; - ImageButton BTN_TEX_LUMINANCE - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, - FIRST_FT_START_Y - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "luminanc.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Black & White" ; - }; - ImageButton BTN_TEX_COLOR - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_COLOR"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, - FIRST_FT_START_Y - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "color.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Color" ; - }; - FixedText FT_TEX_MODE - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + IMG_BUTTON_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "~Mode" ; - }; - ImageButton BTN_TEX_REPLACE - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_REPLACE"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, - FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "replac3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Only Texture" ; - }; - ImageButton BTN_TEX_MODULATE - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_MODULATE"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, - FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "modula3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Texture and Shading" ; - }; - ImageButton BTN_TEX_BLEND - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_BLEND"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, - FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "blend3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Texture, Shadow and Color" ; - }; - FixedText FT_TEX_PROJECTION_X - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "~Projection X" ; - }; - ImageButton BTN_TEX_OBJECT_X - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, - FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "objspc3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Object-Specific" ; - }; - ImageButton BTN_TEX_PARALLEL_X - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, - FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "parallel.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Parallel" ; - }; - ImageButton BTN_TEX_CIRCLE_X - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, - FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "sphere3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Circular" ; - }; - FixedText FT_TEX_PROJECTION_Y - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "P~rojection Y" ; - }; - ImageButton BTN_TEX_OBJECT_Y - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, - FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "objspc3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Object-Specific" ; - }; - ImageButton BTN_TEX_PARALLEL_Y - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, - FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "parallel.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Parallel" ; - }; - ImageButton BTN_TEX_CIRCLE_Y - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, - FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "sphere3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Circular" ; - }; - FixedText FT_TEX_FILTER - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 4*IMG_BUTTON_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "~Filtering" ; - }; - ImageButton BTN_TEX_FILTER - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_FILTER"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, - FIRST_FT_START_Y + 4*IMG_BUTTON_NEXT - 2 ) ; - Size = IMG_BUTTON_SIZE; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "filter3d.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Filtering On/Off" ; - }; - FixedLine FL_TEXTURE - { - Pos = TOP_FIXED_LINE_POS; - Size = FIXED_LINE_SIZE; - Text [ en-US ] = "Textures" ; - }; - // Material - // Materialeditor - FixedText FT_MAT_FAVORITES - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "~Favorites" ; - }; - ListBox LB_MAT_FAVORITES - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_FAVORITES"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, - FIRST_FT_START_Y - 2 ) ; - Size = MAP_APPFONT ( 83 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - StringList [ en-US ] = - { - < "User-defined" ; > ; - < "Metal" ; > ; - < "Gold" ; > ; - < "Chrome" ; > ; - < "Plastic" ; > ; - < "Wood" ; > ; - }; - }; - FixedText FT_MAT_COLOR - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + FT_OFFSET_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "~Object color" ; - }; - ListBox LB_MAT_COLOR - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_COLOR"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , - FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ImageButton BTN_MAT_COLOR - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_COLOR"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 , - FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; - Size = MAP_APPFONT ( 12, 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "colordlg.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Colors Dialog" ; - }; - FixedText FT_MAT_EMISSION - { - Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 2*FT_OFFSET_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "~Illumination color" ; - }; - ListBox LB_MAT_EMISSION - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_EMISSION"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , - FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ImageButton BTN_EMISSION_COLOR - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_EMISSION_COLOR"; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 , - FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; - Size = MAP_APPFONT ( 12, 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "colordlg.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Colors Dialog" ; - }; - - FixedLine FL_MAT_SPECULAR - { - Pos = MAP_APPFONT ( BORDER , SPECULAR_START_Y ) ; - Size = FIXED_LINE_SIZE; - Text [ en-US ] = "Specular" ; - }; - FixedText FT_MAT_SPECULAR - { - Pos = MAP_APPFONT ( FT_INDENT , SPECULAR_START_Y + 13 ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "~Color" ; - }; - ListBox LB_MAT_SPECULAR - { - HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_SPECULAR"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, SPECULAR_START_Y + 13 - 2 ) ; - Size = MAP_APPFONT ( 68 , 100 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - ImageButton BTN_SPECULAR_COLOR - { - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SPECULAR_COLOR"; - Pos = MAP_APPFONT ( 137 , SPECULAR_START_Y + 13 - 2 ) ; - Size = MAP_APPFONT ( 12, 14 ) ; - ButtonImage = Image - { - ImageBitmap = Bitmap { File = "colordlg.bmp" ; }; - MASKCOLOR - }; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Colors Dialog" ; - }; - FixedText FT_MAT_SPECULAR_INTENSITY - { - Pos = MAP_APPFONT ( FT_INDENT , SPECULAR_START_Y + 13 + FT_OFFSET_NEXT ) ; - Size = MAP_APPFONT ( FT_WIDTH_SHORT , FT_HEIGHT ) ; - Text [ en-US ] = "I~ntensity" ; - }; - MetricField MTR_MAT_SPECULAR_INTENSITY - { - HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_MAT_SPECULAR_INTENSITY"; - Border = TRUE ; - Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , - SPECULAR_START_Y + 13 + FT_OFFSET_NEXT ) ; - Size = MAP_APPFONT ( 68 , 12 ) ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Unit = FUNIT_PERCENT ; - Minimum = 1 ; - First = 1 ; - Maximum = 100 ; - Last = 100 ; - SpinSize = 1 ; - }; - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_FAVORITES"; - HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_EDITOR"; - FixedLine FL_MATERIAL - { - Pos = TOP_FIXED_LINE_POS; - Size = FIXED_LINE_SIZE; - Text [ en-US ] = "Material" ; - }; - -}; - Image RID_SVXIMAGE_LIGHT_ON { ImageBitmap = Bitmap { File = "lighton.bmp" ; }; @@ -1216,9 +102,4 @@ String RID_SVXFLOAT3D_FIX_B Text [ en-US ] = "B:"; }; -String RID_SVXFLOAT3D_COLOR_LIGHT_PRE -{ - Text [ en-US ] = "Color Light Preview"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/uiconfig/ui/docking3deffects.ui b/svx/uiconfig/ui/docking3deffects.ui new file mode 100644 index 000000000000..34b65427fc95 --- /dev/null +++ b/svx/uiconfig/ui/docking3deffects.ui @@ -0,0 +1,2048 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> +<interface> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">100</property> + <property name="step_increment">5</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">10000</property> + <property name="step_increment">5</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment3"> + <property name="upper">3600</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment4"> + <property name="upper">10000</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment5"> + <property name="lower">2</property> + <property name="upper">256</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment6"> + <property name="lower">1</property> + <property name="upper">1000</property> + <property name="step_increment">5</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment7"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment8"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/3dgeo.png</property> + </object> + <object class="GtkImage" id="image10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/normsphe.png</property> + </object> + <object class="GtkImage" id="image11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/invert3d.png</property> + </object> + <object class="GtkImage" id="image12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/lght2sid.png</property> + </object> + <object class="GtkImage" id="image13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/doublesi.png</property> + </object> + <object class="GtkImage" id="image14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/convrt3d.png</property> + </object> + <object class="GtkImage" id="image15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/rotate3d.png</property> + </object> + <object class="GtkImage" id="image16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/persp3d.png</property> + </object> + <object class="GtkImage" id="image17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/shadow3d.png</property> + </object> + <object class="GtkImage" id="image18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/colordlg.png</property> + </object> + <object class="GtkImage" id="image19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/colordlg.png</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/3drepres.png</property> + </object> + <object class="GtkImage" id="image20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/light.png</property> + </object> + <object class="GtkImage" id="image21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/light.png</property> + </object> + <object class="GtkImage" id="image22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/light.png</property> + </object> + <object class="GtkImage" id="image23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/light.png</property> + </object> + <object class="GtkImage" id="image24"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/light.png</property> + </object> + <object class="GtkImage" id="image25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/light.png</property> + </object> + <object class="GtkImage" id="image26"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/light.png</property> + </object> + <object class="GtkImage" id="image27"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/light.png</property> + </object> + <object class="GtkImage" id="image28"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/luminanc.png</property> + </object> + <object class="GtkImage" id="image29"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/color.png</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/3dlight.png</property> + </object> + <object class="GtkImage" id="image30"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/replac3d.png</property> + </object> + <object class="GtkImage" id="image31"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/modula3d.png</property> + </object> + <object class="GtkImage" id="image32"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/objspc3d.png</property> + </object> + <object class="GtkImage" id="image33"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/parallel.png</property> + </object> + <object class="GtkImage" id="image34"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/sphere3d.png</property> + </object> + <object class="GtkImage" id="image35"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/objspc3d.png</property> + </object> + <object class="GtkImage" id="image36"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/parallel.png</property> + </object> + <object class="GtkImage" id="image37"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/sphere3d.png</property> + </object> + <object class="GtkImage" id="image38"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/filter3d.png</property> + </object> + <object class="GtkImage" id="image39"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/colordlg.png</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/3dtextur.png</property> + </object> + <object class="GtkImage" id="image40"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/colordlg.png</property> + </object> + <object class="GtkImage" id="image41"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/colordlg.png</property> + </object> + <object class="GtkImage" id="image42"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/blend3d.png</property> + </object> + <object class="GtkImage" id="image5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/material.png</property> + </object> + <object class="GtkImage" id="image6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">res/sc10350.png</property> + </object> + <object class="GtkImage" id="image7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/apply.png</property> + </object> + <object class="GtkImage" id="image8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/normobjs.png</property> + </object> + <object class="GtkImage" id="image9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">svx/res/normflat.png</property> + </object> + <object class="GtkWindow" id="Docking3DEffects"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">3D Effects</property> + <property name="type_hint">dock</property> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">24</property> + <child> + <object class="GtkFrame" id="geoframe"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="diagonalft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">R_ounded edges</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">diagonal:0%</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="scaleddepthft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Scaled depth</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">scaleddepth:0%</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="angleft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Rotation angle</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">angle:0.0°</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="depthft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Depth</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">depth:0.00cm</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="diagonal:0%"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="scaleddepth:0%"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="angle:0.0°"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment3</property> + <property name="digits">1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="depth:0.00cm"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment4</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Geometry</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="segmentsframe"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="column_spacing">24</property> + <child> + <object class="GtkGrid" id="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Horizontal</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">hori</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="hori"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment5</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Vertical</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">veri</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="veri"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0</property> + <property name="adjustment">adjustment5</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Segments</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_right">12</property> + <property name="margin_bottom">12</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkGrid" id="grid7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkFrame" id="normals"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <property name="row_homogeneous">True</property> + <property name="column_homogeneous">True</property> + <child> + <object class="GtkButton" id="objspecific"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Object-Specific</property> + <property name="valign">center</property> + <property name="image">image8</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="flat"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Flat</property> + <property name="valign">center</property> + <property name="image">image9</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="spherical"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Spherical</property> + <property name="valign">center</property> + <property name="image">image10</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="invertnormals"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Invert Normals</property> + <property name="valign">center</property> + <property name="image">image11</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="doublesidedillum"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Double-Sided Illumination</property> + <property name="valign">center</property> + <property name="image">image12</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="doublesided"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Double-Sided</property> + <property name="valign">center</property> + <property name="image">image13</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Normals</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <property name="row_homogeneous">True</property> + <property name="column_homogeneous">True</property> + <child> + <object class="GtkButton" id="to3d"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Convert to 3D</property> + <property name="image">image14</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="tolathe"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Convert to Lathe Object</property> + <property name="image">image15</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="perspective"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Perspective On/Off</property> + <property name="image">image16</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="svxlo-Svx3DPreviewControl" id="preview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">end</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="preview-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">3D Preview</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="svxlo-SvxLightCtl3D" id="lightpreview"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">end</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="lightpreview-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Color Light Preview</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="shadingframe"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Mode</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mode</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="mode"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes">Flat</item> + <item translatable="yes">Phong</item> + <item translatable="yes">Gourand</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Shading</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="shadowframe"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="slantft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">S_urface angle</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">slant:0°</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="slant:0°"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">0.0</property> + <property name="adjustment">adjustment6</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="shadow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">3D Shadowing On/Off</property> + <property name="image">image17</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Shadow</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="cameraframe"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkSpinButton" id="focal:0.00cm"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">2</property> + <property name="adjustment">adjustment7</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="distance:0.00cm"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="text" translatable="yes">2</property> + <property name="adjustment">adjustment7</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Focal length</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">veri</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Distance</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">hori</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Camera</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="illumframe"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Light source</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="colorbutton1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Colors Dialog</property> + <property name="valign">start</property> + <property name="image">image19</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="ambientcolor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="colorbutton2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Colors Dialog</property> + <property name="valign">center</property> + <property name="image">image18</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Ambient light</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">ambientcolor</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkButton" id="light1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Light Source 1</property> + <property name="image">image20</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="light2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Light Source 2</property> + <property name="image">image21</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="light3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Light Source 3</property> + <property name="image">image22</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="light4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Light Source 4</property> + <property name="image">image23</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="light5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Light Source 5</property> + <property name="image">image24</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="light6"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Light Source 6</property> + <property name="image">image25</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="light7"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Light Source 7</property> + <property name="image">image26</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="light8"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Light Source 8</property> + <property name="image">image27</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="svxlo-ColorLB" id="lightcolor1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="lightcolor2"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="lightcolor3"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="lightcolor4"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="lightcolor5"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="lightcolor6"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="lightcolor7"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="lightcolor8"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="valign">start</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Illumination</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="textureframe"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid15"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Type</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Mode</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label23"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Projection X</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">P_rojection Y</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label25"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Filtering</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="textype"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Black & White</property> + <property name="halign">center</property> + <property name="image">image28</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texcolor"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Color</property> + <property name="halign">center</property> + <property name="image">image29</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texreplace"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Only Texture</property> + <property name="halign">center</property> + <property name="image">image30</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texmodulate"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Texture and Shading</property> + <property name="halign">center</property> + <property name="image">image31</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texobjx"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Object-Specific</property> + <property name="halign">center</property> + <property name="image">image32</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texparallelx"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Parallel</property> + <property name="halign">center</property> + <property name="image">image33</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texcirclex"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Circular</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="image">image34</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texobjy"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Object-Specific</property> + <property name="halign">center</property> + <property name="image">image35</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texparallely"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Parallel</property> + <property name="halign">center</property> + <property name="image">image36</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texcircley"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Circular</property> + <property name="halign">start</property> + <property name="image">image37</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texfilter"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Filtering On/Off</property> + <property name="halign">center</property> + <property name="image">image38</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texblend"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Texture, Shadow and Color</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="image">image42</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label21"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Textures</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="materialframe"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment10"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid16"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label26"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Favorites</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label27"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Object color</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">objcolor</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label29"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Illumination color</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">illumcolor</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="objcolor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="illumcolor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="favorites"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes">User-defined</item> + <item translatable="yes">Metal</item> + <item translatable="yes">Gold</item> + <item translatable="yes">Chrome</item> + <item translatable="yes">Plastic</item> + <item translatable="yes">Wood</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="colorbutton3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Colors Dialog</property> + <property name="image">image39</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="colorbutton4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Colors Dialog</property> + <property name="image">image40</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label28"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Material</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="specframe"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid17"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label30"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Color</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">speccolor</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label31"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">i_ntensity</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">intensity:0%</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="svxlo-ColorLB" id="speccolor"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="colorbutton5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Colors Dialog</property> + <property name="image">image41</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="intensity:0%"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">adjustment8</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label32"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Specular</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid18"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkButton" id="assign"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Assign</property> + <property name="image">image7</property> + </object> + <packing> + <property name="left_attach">6</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="update"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Update</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="image">image6</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="material"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Material</property> + <property name="image">image5</property> + </object> + <packing> + <property name="left_attach">4</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="texture"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Textures</property> + <property name="image">image4</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="light"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Illumination</property> + <property name="image">image3</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="representation"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Shading</property> + <property name="image">image2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="geometry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Geometry</property> + <property name="image">image1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkSizeGroup" id="sizegroup1"> + <widgets> + <widget name="diagonalft"/> + <widget name="scaleddepthft"/> + <widget name="angleft"/> + <widget name="depthft"/> + <widget name="label6"/> + <widget name="label7"/> + </widgets> + </object> + <object class="GtkSizeGroup" id="sizegroup2"> + <widgets> + <widget name="label8"/> + <widget name="label15"/> + <widget name="label14"/> + </widgets> + </object> + <object class="GtkSizeGroup" id="sizegroup3"> + <widgets> + <widget name="label26"/> + <widget name="label27"/> + <widget name="label29"/> + <widget name="label30"/> + <widget name="label31"/> + </widgets> + </object> +</interface> |