Changes in src/UIElements/TextWindow.cpp [f6bbc6:0188ea]

File:

• src/UIElements/TextWindow.cpp (modified) (4 diffs)

src/UIElements/TextWindow.cpp

@@ -39 +39 @@
 #include "Actions/MethodAction.hpp"
 #include "Actions/ErrorAction.hpp"
-#include "Actions/ActionRegistry.hpp"
 #include "Views/StreamStringView.hpp"
 #include "Views/MethodStringView.hpp"
@@ -57 +56 @@
   moleculeView = new StreamStringView(boost::bind(&MoleculeListClass::Enumerate,molecules,_1));
   new DisplayMenuItem(main_menu,moleculeView,"Molecule List");
-
-  new SeperatorItem(main_menu);
-
-  Action* undoAction = ActionRegistry::getInstance().getActionByName("Undo");
-  new ActionMenuItem('u',"Undo last operation",main_menu,undoAction);
-
-  Action* redoAction = ActionRegistry::getInstance().getActionByName("Redo");
-  new ActionMenuItem('r',"Redo last operation",main_menu,redoAction);
 
   new SeperatorItem(main_menu);
@@ -103 +94 @@
   populaters.MakeEditMoleculesMenu(editMoleculesMenu,molecules,configuration,periode);
 
-  Action *returnFromEditMoleculeAction = new TextMenu::LeaveAction(editMoleculesMenu);
+  returnFromEditMoleculeAction = new MethodAction("returnAction",boost::bind(&TextMenu::doQuit,editMoleculesMenu),false);
   MenuItem *returnItem = new ActionMenuItem('q',"return to Main menu",editMoleculesMenu,returnFromEditMoleculeAction);
 
@@ -117 +108 @@
   delete old_menu;
   delete quitAction;
+  delete returnFromEditMoleculeAction;
   delete moleculeView;
   delete statusIndicator;