0004414: External 20709 Plot2D icons FIT

diff --git a/src/GLViewer/GLViewer_ViewFrame.cxx b/src/GLViewer/GLViewer_ViewFrame.cxx
index 2876221c0039a28d0ad11d557d31ae08bb3d7c81..0017a2b00291d59bd56cf92bf6ed9a64e23dd715 100644 (file)
--- a/src/GLViewer/GLViewer_ViewFrame.cxx
+++ b/src/GLViewer/GLViewer_ViewFrame.cxx
@@ -28,7 +28,6 @@
 #include "GLViewer_ViewPort2d.h"
 
 #include <QtxToolBar.h>
-#include <QtxMultiAction.h>
 #include <QtxActionToolMgr.h>
 
 #include <SUIT_Desktop.h>
@@ -154,20 +153,16 @@ void GLViewer_ViewFrame::createToolBar()
 {
   int tid = toolMgr()->createToolBar( tr("LBL_TOOLBAR_LABEL") );
   toolMgr()->append( DumpId, tid );
-
-  QtxMultiAction* aScaleAction = new QtxMultiAction( this );
-  aScaleAction->insertAction( toolMgr()->action( FitAllId ) );
-  aScaleAction->insertAction( toolMgr()->action( FitRectId ) );
-  aScaleAction->insertAction( toolMgr()->action( FitSelectId ) );
-  aScaleAction->insertAction( toolMgr()->action( ZoomId ) );
-  toolMgr()->append( aScaleAction, tid );
-
-  QtxMultiAction* aPanAction = new QtxMultiAction( this );
-  aPanAction->insertAction( toolMgr()->action( PanId ) );
-  aPanAction->insertAction( toolMgr()->action( GlobalPanId ) );
-  toolMgr()->append( aPanAction, tid );
-
-  toolMgr()->append( toolMgr()->action( ResetId ), tid );
+  toolMgr()->append( toolMgr()->separator(), tid );
+  toolMgr()->append( FitAllId, tid );
+  toolMgr()->append( FitRectId, tid );
+  toolMgr()->append( FitSelectId, tid );
+  toolMgr()->append( ZoomId, tid );
+  toolMgr()->append( toolMgr()->separator(), tid );
+  toolMgr()->append( PanId, tid );
+  toolMgr()->append( GlobalPanId, tid );
+  toolMgr()->append( toolMgr()->separator(), tid );
+  toolMgr()->append( ResetId, tid );
 }
 
 /*!

diff --git a/src/GraphicsView/GraphicsView_ViewFrame.cxx b/src/GraphicsView/GraphicsView_ViewFrame.cxx
index 459e10a8cc1cfad5de03704e0e13cf644a606ebd..8850c8079d027fa6b49facd7780389767fa296ca 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewFrame.cxx
+++ b/src/GraphicsView/GraphicsView_ViewFrame.cxx
@@ -27,7 +27,6 @@
 
 #include <QtxAction.h>
 #include <QtxActionToolMgr.h>
-#include <QtxMultiAction.h>
 #include <QtxToolBar.h>
 
 #include <SUIT_Desktop.h>
@@ -169,21 +168,16 @@ int GraphicsView_ViewFrame::createToolBar()
 {
   int tid = toolMgr()->createToolBar( tr("LBL_TOOLBAR_LABEL") );
   toolMgr()->append( DumpId, tid );
-
-  myScaleAction = new QtxMultiAction( this );
-  myScaleAction->insertAction( toolMgr()->action( FitAllId ) );
-  myScaleAction->insertAction( toolMgr()->action( FitRectId ) );
-  myScaleAction->insertAction( toolMgr()->action( FitSelectId ) );
-  myScaleAction->insertAction( toolMgr()->action( ZoomId ) );
-  toolMgr()->append( myScaleAction, tid );
-
-  myPanAction = new QtxMultiAction( this );
-  myPanAction->insertAction( toolMgr()->action( PanId ) );
-  myPanAction->insertAction( toolMgr()->action( GlobalPanId ) );
-  toolMgr()->append( myPanAction, tid );
-
-  toolMgr()->append( toolMgr()->action( ResetId ), tid );
-
+  toolMgr()->append( toolMgr()->separator(), tid );
+  toolMgr()->append( FitAllId, tid );
+  toolMgr()->append( FitRectId, tid );
+  toolMgr()->append( FitSelectId, tid );
+  toolMgr()->append( ZoomId, tid );
+  toolMgr()->append( toolMgr()->separator(), tid );
+  toolMgr()->append( PanId, tid );
+  toolMgr()->append( GlobalPanId, tid );
+  toolMgr()->append( toolMgr()->separator(), tid );
+  toolMgr()->append( ResetId, tid );
   return tid;
 }
 
@@ -196,33 +190,6 @@ QImage GraphicsView_ViewFrame::dumpView()
   return myViewPort->dumpView();
 }
 
-//================================================================
-// Function : expandToolBarActions
-// Purpose  : 
-//================================================================
-void GraphicsView_ViewFrame::expandToolBarActions()
-{
-  QList<QtxMultiAction*> anExpandableActions;
-  anExpandableActions.append( myScaleAction );
-  anExpandableActions.append( myPanAction );
-
-  QListIterator<QtxMultiAction*> anIter( anExpandableActions );
-  while( anIter.hasNext() )
-  {
-    if( QtxMultiAction* aMultiAction = anIter.next() )
-    {
-      QList<QAction*> aLocalActions = aMultiAction->actions();
-      QListIterator<QAction*> aLocalIter( aLocalActions );
-      while( aLocalIter.hasNext() )
-        if( QAction* anAction = aLocalIter.next() )
-          toolMgr()->append( anAction, myToolBarId );
-
-      int anId = toolMgr()->actionId( aMultiAction );
-      toolMgr()->remove( anId, myToolBarId );
-    }
-  }
-}
-
 //================================================================
 // Function : onViewPan
 // Purpose  : 

diff --git a/src/GraphicsView/GraphicsView_ViewFrame.h b/src/GraphicsView/GraphicsView_ViewFrame.h
index d7f86f4a8afa9aa2e61ebda362c26f37c4f30408..ed45504f3c56a1d907c917cad36acad3cad655e5 100644 (file)
--- a/src/GraphicsView/GraphicsView_ViewFrame.h
+++ b/src/GraphicsView/GraphicsView_ViewFrame.h
@@ -31,8 +31,6 @@ class QGraphicsSceneContextMenuEvent;
 class QGraphicsSceneMouseEvent;
 class QGraphicsSceneWheelEvent;
 
-class QtxMultiAction;
-
 class SUIT_Desktop;
 
 class GraphicsView_Viewer;
@@ -59,8 +57,6 @@ public:
 
   virtual QImage          dumpView();
 
-  void                    expandToolBarActions();
-
   protected slots:
   void                    onViewPan();
   void                    onViewZoom();
@@ -94,8 +90,6 @@ private:
   GraphicsView_ViewPort*  myViewPort;
 
   int                     myToolBarId;
-  QtxMultiAction*         myScaleAction;
-  QtxMultiAction*         myPanAction;
 };
 
 #endif

diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx
index b4f93e84e414fb8ce2919aea7d29653e62413abd..fc8680a5c990f5acd3eec294f02477f53005b4cf 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewWindow.cxx
+++ b/src/Plot2d/Plot2d_ViewWindow.cxx
@@ -29,7 +29,6 @@
 #include <SUIT_Desktop.h>
 
 #include <QtxAction.h>
-#include <QtxMultiAction.h>
 #include <QtxActionToolMgr.h>
 
 #include <QStatusBar>
@@ -232,13 +231,6 @@ void Plot2d_ViewWindow::createActions()
   connect( aAction, SIGNAL( triggered( bool ) ), this, SLOT( onZoom() ) );
   mgr->registerAction( aAction, ZoomId );
 
-  // 2.4. Create multi-action for scaling operations
-  QtxMultiAction* aScaleAction = new QtxMultiAction( this );
-  aScaleAction->insertAction( mgr->action( FitAllId  ) );
-  aScaleAction->insertAction( mgr->action( FitRectId ) );
-  aScaleAction->insertAction( mgr->action( ZoomId    ) );
-  mgr->registerAction( aScaleAction, ScaleOpId );
-
   // 3. Moving operations
 
   // 3.1. Panning
@@ -259,12 +251,6 @@ void Plot2d_ViewWindow::createActions()
   connect( aAction, SIGNAL( triggered( bool ) ), this, SLOT( onGlobalPanning() ) );
   mgr->registerAction( aAction, GlobalPanId );
 
-  // 3.3. Create multi-action for moving operations
-  QtxMultiAction* aPanAction = new QtxMultiAction( this );
-  aPanAction->insertAction( mgr->action( PanId ) );
-  aPanAction->insertAction( mgr->action( GlobalPanId ) );
-  mgr->registerAction( aPanAction, MoveOpId );
-
   // 4. Curve type operations
   
   // 4.1. Points
@@ -407,8 +393,13 @@ void Plot2d_ViewWindow::createToolBar()
   myToolBar = mgr->createToolBar( tr( "LBL_TOOLBAR_LABEL" ) );
   mgr->append( DumpId, myToolBar );
   mgr->append( PrintId, myToolBar );
-  mgr->append( ScaleOpId, myToolBar );
-  mgr->append( MoveOpId, myToolBar );
+  mgr->append( toolMgr()->separator(), myToolBar );
+  mgr->append( FitAllId, myToolBar );
+  mgr->append( FitRectId, myToolBar );
+  mgr->append( ZoomId, myToolBar );
+  mgr->append( toolMgr()->separator(), myToolBar );
+  mgr->append( PanId, myToolBar );
+  mgr->append( GlobalPanId, myToolBar );
   mgr->append( toolMgr()->separator(), myToolBar );
   mgr->append( CurvPointsId, myToolBar );
   mgr->append( CurvLinesId, myToolBar );

diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h
index 8d3a8d5a37591dfe6c4a4efe73e4decb53f13894..2be1a9d4a44cfd3cddd6d394d67accef4f58af35 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewWindow.h
+++ b/src/Plot2d/Plot2d_ViewWindow.h
@@ -45,10 +45,10 @@ class PLOT2D_EXPORT Plot2d_ViewWindow : public SUIT_ViewWindow
 
 public:
   enum { DumpId, PrintId,
-        ScaleOpId, FitAllId, FitRectId, ZoomId,
-        MoveOpId, PanId, GlobalPanId,
+        FitAllId, FitRectId, ZoomId,
+        PanId, GlobalPanId,
         PModeXLinearId, PModeXLogarithmicId, 
-         PModeYLinearId, PModeYLogarithmicId,
+   PModeYLinearId, PModeYLogarithmicId,
         CurvPointsId, CurvLinesId, CurvSplinesId, 
         LegendId,
         CurvSettingsId, CurvesSettingsId,

diff --git a/src/SVTK/SVTK_ViewWindow.cxx b/src/SVTK/SVTK_ViewWindow.cxx
index 769f05420e05a787c68f76e10a5153718eef926e..b49c11e9aa3378c67da0a38fc503244916819145 100755 (executable)
--- a/src/SVTK/SVTK_ViewWindow.cxx
+++ b/src/SVTK/SVTK_ViewWindow.cxx
@@ -1840,16 +1840,12 @@ void SVTK_ViewWindow::createToolBar()
   mgr->append( SwitchInteractionStyleId, myToolBar );
   mgr->append( ViewTrihedronId, myToolBar );
 
-  QtxMultiAction* aScaleAction = new QtxMultiAction( this );
-  aScaleAction->insertAction( getAction( FitAllId ) );
-  aScaleAction->insertAction( getAction( FitRectId ) );
-  aScaleAction->insertAction( getAction( ZoomId ) );
-  mgr->append( aScaleAction, myToolBar );
-
-  QtxMultiAction* aPanningAction = new QtxMultiAction( this );
-  aPanningAction->insertAction( getAction( PanId ) );
-  aPanningAction->insertAction( getAction( GlobalPanId ) );
-  mgr->append( aPanningAction, myToolBar );
+  mgr->append( FitAllId, myToolBar );
+  mgr->append( FitRectId, myToolBar );
+  mgr->append( ZoomId, myToolBar );
+
+  mgr->append( PanId, myToolBar );
+  mgr->append( GlobalPanId, myToolBar );
 
   mgr->append( ChangeRotationPointId, myToolBar );
 

diff --git a/src/VTKViewer/VTKViewer_ViewWindow.cxx b/src/VTKViewer/VTKViewer_ViewWindow.cxx
index 6f462e3e24fad54b5a6f7e8ac713ecc93836c458..249238713276da3519a93833d6d7f0aa9acc5505 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ViewWindow.cxx
+++ b/src/VTKViewer/VTKViewer_ViewWindow.cxx
@@ -291,16 +291,12 @@ void VTKViewer_ViewWindow::createToolBar()
   myToolBar->addAction( myActionsMap[DumpId] );
   myToolBar->addAction( myActionsMap[TrihedronShowId] );
 
-  QtxMultiAction* aScaleAction = new QtxMultiAction( this );
-  aScaleAction->insertAction( myActionsMap[FitAllId] );
-  aScaleAction->insertAction( myActionsMap[FitRectId] );
-  aScaleAction->insertAction( myActionsMap[ZoomId] );
-  myToolBar->addAction( aScaleAction );
-
-  QtxMultiAction* aPanningAction = new QtxMultiAction( this );
-  aPanningAction->insertAction( myActionsMap[PanId] );
-  aPanningAction->insertAction( myActionsMap[GlobalPanId] );
-  myToolBar->addAction( aPanningAction );
+  myToolBar->addAction( myActionsMap[FitAllId] );
+  myToolBar->addAction( myActionsMap[FitRectId] );
+  myToolBar->addAction( myActionsMap[ZoomId] );
+
+  myToolBar->addAction( myActionsMap[PanId] );
+  myToolBar->addAction( myActionsMap[GlobalPanId] );
 
   myToolBar->addAction( myActionsMap[RotationId] );