From: sln Date: Thu, 11 Sep 2008 11:58:07 +0000 (+0000) Subject: Dialog for editing curve parameters moved here from For_CTH_V12 branch X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=883c142e87ac8d065b2d1023ffc3b11a4e918641;p=modules%2Fgui.git Dialog for editing curve parameters moved here from For_CTH_V12 branch --- diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx index 84f551307..cc31f985a 100755 --- a/src/Plot2d/Plot2d_ViewWindow.cxx +++ b/src/Plot2d/Plot2d_ViewWindow.cxx @@ -145,6 +145,7 @@ void Plot2d_ViewWindow::contextMenuPopup( QMenu* thePopup ) // settings thePopup->addAction( mgr->action( CurvSettingsId ) ); + thePopup->addAction( mgr->action( CurvesSettingsId ) ); } /*! @@ -362,6 +363,14 @@ void Plot2d_ViewWindow::createActions() connect( aAction, SIGNAL( triggered( bool ) ), myViewFrame, SLOT( onSettings() ) ); mgr->registerAction( aAction, CurvSettingsId ); + // 8. Curves Settings + aAction = new QtxAction( tr( "TOT_CURVES_SETTINGS"), + aResMgr->loadPixmap("Plot2d", tr("ICON_CURVES_SETTINGS")), + tr("MEN_CURVES_SETTINGS"), 0, this); + aAction->setStatusTip( tr( "PRP_CURVES_SETTINGS") ); + connect( aAction, SIGNAL( activated() ), myViewFrame, SLOT( onCurvesSettings() ) ); + mgr->registerAction( aAction, CurvesSettingsId ); + // 9. Clone aAction = new QtxAction( tr( "MNU_CLONE_VIEW" ), aResMgr->loadPixmap( "Plot2d", tr( "ICON_PLOT2D_CLONE_VIEW" ) ), @@ -401,6 +410,7 @@ void Plot2d_ViewWindow::createToolBar() mgr->append( toolMgr()->separator(), myToolBar ); mgr->append( LegendId, myToolBar ); mgr->append( CurvSettingsId, myToolBar ); + mgr->append( CurvesSettingsId, myToolBar ); mgr->append( CloneId, myToolBar ); } diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h index 68795cd49..4cdb7c429 100755 --- a/src/Plot2d/Plot2d_ViewWindow.h +++ b/src/Plot2d/Plot2d_ViewWindow.h @@ -27,7 +27,6 @@ #include #include - #ifdef WIN32 #pragma warning( disable:4251 ) #endif @@ -52,7 +51,7 @@ public: PModeYLinearId, PModeYLogarithmicId, CurvPointsId, CurvLinesId, CurvSplinesId, LegendId, - CurvSettingsId, + CurvSettingsId, CurvesSettingsId, CloneId }; public: