Merge branch 'V7_dev'

[modules/yacs.git] / src / genericgui / Menus.cxx

diff --git a/src/genericgui/Menus.cxx b/src/genericgui/Menus.cxx
index 49c996f05bfaadb53d7f19d474ead490fd14f4fa..8d3f8bac5323fb5145aaad3651479f5e54270b7b 100644 (file)
--- a/src/genericgui/Menus.cxx
+++ b/src/genericgui/Menus.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -29,6 +29,7 @@
 
 //#define _DEVDEBUG_
 #include "YacsTrace.hxx"
+#include "chrono.hxx"
 
 using namespace std;
 using namespace YACS::HMI;
@@ -170,6 +171,8 @@ void ComposedNodeMenu::popupMenu(QWidget *caller, const QPoint &globalPos, const
   menu.addAction(gmain->_zoomToBlocAct);
   menu.addAction(gmain->_centerOnNodeAct);
   menu.addAction(gmain->_shrinkExpand);
+  menu.addAction(gmain->_shrinkExpandChildren);
+  menu.addAction(gmain->_shrinkExpandElementaryRecursively);
   menu.addAction(gmain->_computeLinkAct);
 //   menu.addAction(gmain->_toggleAutomaticComputeLinkAct);
 //   menu.addAction(gmain->_toggleSimplifyLinkAct);
@@ -225,6 +228,7 @@ void ProcMenu::popupMenu(QWidget *caller, const QPoint &globalPos, const QString
       menu.addSeparator();
       menu.addAction(gmain->_importDataTypeAct);
       menu.addAction(gmain->_newContainerAct);
+      menu.addAction(gmain->_newHPContainerAct);
       QMenu *CNmenu = menu.addMenu(tr("Create Node"));
       CNmenu->addAction(gmain->_nodeFromCatalogAct);
       //   CNmenu->addSeparator();
@@ -272,6 +276,8 @@ void ProcMenu::popupMenu(QWidget *caller, const QPoint &globalPos, const QString
   menu.addAction(gmain->_zoomToBlocAct);
   menu.addAction(gmain->_centerOnNodeAct);
   menu.addAction(gmain->_shrinkExpand);
+  menu.addAction(gmain->_shrinkExpandChildren);
+  menu.addAction(gmain->_shrinkExpandElementaryRecursively);
   menu.addAction(gmain->_computeLinkAct);
 //   menu.addAction(gmain->_toggleAutomaticComputeLinkAct);
 //   menu.addAction(gmain->_toggleSimplifyLinkAct);
@@ -603,6 +609,7 @@ void ContainerDirMenu::popupMenu(QWidget *caller, const QPoint &globalPos, const
   if (isEdition)
     {
       menu.addAction(gmain->_newContainerAct);
+      menu.addAction(gmain->_newHPContainerAct);
     }
   menu.exec(globalPos);
 }