From fa93763656260c5da34d5ea479a9263a3d7001c0 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 12 Jul 2007 07:56:05 +0000 Subject: [PATCH] *** empty log message *** --- src/VTKViewer/VTKViewer_ViewWindow.cxx | 45 +++++++++++++------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/VTKViewer/VTKViewer_ViewWindow.cxx b/src/VTKViewer/VTKViewer_ViewWindow.cxx index daa1de6eb..ead79fd57 100755 --- a/src/VTKViewer/VTKViewer_ViewWindow.cxx +++ b/src/VTKViewer/VTKViewer_ViewWindow.cxx @@ -25,12 +25,10 @@ #include "VTKViewer_Transform.h" #include "VTKViewer_Utilities.h" -#include "SUIT_Session.h" -#include "SUIT_ToolButton.h" -#include "SUIT_MessageBox.h" - -#include "SUIT_Tools.h" -#include "SUIT_ResourceMgr.h" +#include +#include +#include +#include #include @@ -38,6 +36,7 @@ #include #include +#include /*! Construction*/ VTKViewer_ViewWindow::VTKViewer_ViewWindow( SUIT_Desktop* theDesktop, @@ -292,27 +291,27 @@ void VTKViewer_ViewWindow::createToolBar() myToolBar->addAction( myActionsMap[DumpId] ); myToolBar->addAction( myActionsMap[TrihedronShowId] ); - SUIT_ToolButton* aScaleBtn = new SUIT_ToolButton(myToolBar); - aScaleBtn->AddAction(myActionsMap[FitAllId]); - aScaleBtn->AddAction(myActionsMap[FitRectId]); - aScaleBtn->AddAction(myActionsMap[ZoomId]); - myToolBar->addWidget( aScaleBtn ); + QtxMultiAction* aScaleAction = new QtxMultiAction( this ); + aScaleAction->insertAction( myActionsMap[FitAllId] ); + aScaleAction->insertAction( myActionsMap[FitRectId] ); + aScaleAction->insertAction( myActionsMap[ZoomId] ); + myToolBar->addAction( aScaleAction ); - SUIT_ToolButton* aPanningBtn = new SUIT_ToolButton(myToolBar); - aPanningBtn->AddAction(myActionsMap[PanId]); - aPanningBtn->AddAction(myActionsMap[GlobalPanId]); - myToolBar->addWidget( aPanningBtn ); + QtxMultiAction* aPanningAction = new QtxMultiAction( this ); + aPanningAction->insertAction( myActionsMap[PanId] ); + aPanningAction->insertAction( myActionsMap[GlobalPanId] ); + myToolBar->addAction( aPanningAction ); myToolBar->addAction( myActionsMap[RotationId] ); - SUIT_ToolButton* aViewsBtn = new SUIT_ToolButton(myToolBar); - aViewsBtn->AddAction(myActionsMap[FrontId]); - aViewsBtn->AddAction(myActionsMap[BackId]); - aViewsBtn->AddAction(myActionsMap[TopId]); - aViewsBtn->AddAction(myActionsMap[BottomId]); - aViewsBtn->AddAction(myActionsMap[LeftId]); - aViewsBtn->AddAction(myActionsMap[RightId]); - myToolBar->addWidget( aViewsBtn ); + QtxMultiAction* aViewsAction = new QtxMultiAction(myToolBar); + aViewsAction->insertAction( myActionsMap[FrontId] ); + aViewsAction->insertAction( myActionsMap[BackId] ); + aViewsAction->insertAction( myActionsMap[TopId] ); + aViewsAction->insertAction( myActionsMap[BottomId] ); + aViewsAction->insertAction( myActionsMap[LeftId] ); + aViewsAction->insertAction( myActionsMap[RightId] ); + myToolBar->addAction( aViewsAction ); myToolBar->addAction( myActionsMap[ResetId] ); } -- 2.39.2