Update copyrights

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

diff --git a/src/genericgui/Menus.cxx b/src/genericgui/Menus.cxx
index 94e6632987ef6d0f553e99666ce0daa8928eaa3b..9c96aba365860c1d129941b804e52bd275d0e65e 100644 (file)
--- a/src/genericgui/Menus.cxx
+++ b/src/genericgui/Menus.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2019  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,6 +29,7 @@
 
 //#define _DEVDEBUG_
 #include "YacsTrace.hxx"
+#include "chrono.hxx"
 
 using namespace std;
 using namespace YACS::HMI;
@@ -91,7 +92,7 @@ void MenusBase::buildForEachMenu(QMenu *m, QActionGroup* actgroup)
   QPixmap pixmap;
   pixmap.load("icons:new_foreach_loop_node.png");
 
-  QMenu *ForEachMenu=m->addMenu(QIcon(pixmap),"ForEachLoop");
+  QMenu *ForEachMenu=m->addMenu(QIcon(pixmap),"ForEach Loop");
 
   Proc* proc = GuiContext::getCurrent()->getProc();
   std::map<std::string, TypeCode*>::const_iterator it = proc->typeMap.begin();
@@ -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();
@@ -250,7 +254,11 @@ void ProcMenu::popupMenu(QWidget *caller, const QPoint &globalPos, const QString
       menu.addAction(gmain->_pasteItemAct);
 
       QMenu *PINmenu = menu.addMenu(tr("Put Graph Content in Node"));
+      PINmenu->addAction(gmain->_putGraphInBlocAct);
+      PINmenu->addSeparator();
+      PINmenu->addAction(gmain->_putGraphInForLoopAct);
       addForEachMenuToPutGraph(PINmenu,&actgroup2);
+      PINmenu->addAction(gmain->_putGraphInWhileLoopAct);
       PINmenu->addAction(gmain->_putGraphInOptimizerLoopAct);
 
       menu.addSeparator();
@@ -267,6 +275,9 @@ void ProcMenu::popupMenu(QWidget *caller, const QPoint &globalPos, const QString
   menu.addSeparator();
   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);
@@ -598,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);
 }