Changes in src/UIElements/TextUI/TextWindow.cpp [d17f3d:0af7ef]

File:

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

src/UIElements/TextUI/TextWindow.cpp

@@ -21 +21 @@
 
 #include <boost/bind.hpp>
+#include <boost/shared_ptr.hpp>
 
-#include "Menu/Menu.hpp"
-#include "Menu/TextMenu.hpp"
-#include "Menu/ActionMenuItem.hpp"
-#include "Menu/SeperatorItem.hpp"
-#include "Menu/DisplayMenuItem.hpp"
-#include "Menu/SubMenuItem.hpp"
+#include "Menu/TextMenu/TextMenu.hpp"
+#include "Menu/TextMenu/TxMenu.hpp"
+#include "Menu/TextMenu/ActionMenuItem.hpp"
+#include "Menu/TextMenu/SeperatorItem.hpp"
+#include "Menu/TextMenu/DisplayMenuItem.hpp"
+#include "Menu/TextMenu/SubMenuItem.hpp"
 #include "TextUI/TextStatusIndicator.hpp"
 #include "TextUI/TextWindow.hpp"
-#include "Actions/MapOfActions.hpp"
 #include "Actions/MethodAction.hpp"
 #include "Actions/ErrorAction.hpp"
 #include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionTraits.hpp"
 #include "Parser/ChangeTracker.hpp"
 #include "Views/StreamStringView.hpp"
@@ -55 +56 @@
 TextWindow::TextWindow()
 {
-  map <std::string, TextMenu *> NametoTextMenuMap;
-  std::set <char> ShortcutList;
+  // build the main menu
+  main_menu = new TextMenu<TxMenu>(std::cout, "");
   // reserve s for save and q for quite
-  ShortcutList.insert('s');
-  ShortcutList.insert('q');
-
-  // populate all actions
-  MapOfActions::getInstance().populateActions();
-
-  // build the main menu
-  main_menu = new TextMenu(Log() << Verbose(0), "Main Menu");
+  main_menu->reserveShortcut('s', "output");
+  main_menu->reserveShortcut('q', "quit");
 
   moleculeView = new StreamStringView(boost::bind(&MoleculeListClass::Enumerate,World::getInstance().getMolecules(),_1));
-  new DisplayMenuItem(main_menu,moleculeView,"Molecule List");
+  new DisplayMenuItem(main_menu->getMenuInstance(),moleculeView,"Molecule List");
 
-  new SeperatorItem(main_menu);
+  new SeperatorItem(main_menu->getMenuInstance());
 
-  Action* undoAction = ActionRegistry::getInstance().getActionByName("undo");
-  new ActionMenuItem(getSuitableShortForm(ShortcutList,"Undo last operation"),"Undo last operation",main_menu,undoAction);
+  main_menu->init();
 
-  Action* redoAction = ActionRegistry::getInstance().getActionByName("redo");
-  new ActionMenuItem(getSuitableShortForm(ShortcutList,"Redo last operation"),"Redo last operation",main_menu,redoAction);
-
-  new SeperatorItem(main_menu);
-
-  for(map<std::string, pair<std::string,std::string> >::iterator iter = MapOfActions::getInstance().MenuDescription.begin(); iter != MapOfActions::getInstance().MenuDescription.end(); ++iter) {
-    TextMenu *Menu = new TextMenu(Log() << Verbose(0), iter->second.second);
-    NametoTextMenuMap.insert( pair <std::string, TextMenu *> (iter->first, Menu) );
-    new SubMenuItem(getSuitableShortForm(ShortcutList,iter->first),iter->second.first.c_str(),main_menu,Menu);
-  }
-
-  new SeperatorItem(main_menu);
+  new SeperatorItem(main_menu->getMenuInstance());
 
   // save has reserved key 's'
-  Action *saveConfigAction = ActionRegistry::getInstance().getActionByName("output");
-  new ActionMenuItem('s',"save current setup to config files",main_menu,saveConfigAction);
+//  Action *saveConfigAction = ActionRegistry::getInstance().getActionByName("output");
+  new ActionMenuItem('s',"save current setup to config files",main_menu->getMenuInstance(),"output");
 
-  quitAction = new MethodAction("quitAction",boost::bind(&TextMenu::doQuit,main_menu),false);
-  new ActionMenuItem('q',"quit",main_menu,quitAction);
-
-  // quit has reserved key 'q'
-  // go through all menus and create them
-  for (map <std::string, TextMenu *>::iterator MenuRunner = NametoTextMenuMap.begin(); MenuRunner != NametoTextMenuMap.end(); ++MenuRunner)
-    populateMenu(MenuRunner->second, MenuRunner->first);
+  // create a specific quit action for this UI and store in registry
+  ActionTraits quitTrait(OptionTrait("quit", &typeid(void), "quits the program"));
+  quitAction = new MethodAction(quitTrait,boost::bind(&TxMenu::doQuit,main_menu->getMenuInstance()),true);
+  new ActionMenuItem('q',"quit",main_menu->getMenuInstance(),"quit");
 
   // Add status indicators etc...
-
   statusIndicator = new TextStatusIndicator();
 }
@@ -107 +86 @@
 TextWindow::~TextWindow()
 {
-  delete quitAction;
+  for (std::list<Action *>::iterator iter = returnFromActions.begin(); !returnFromActions.empty(); ++iter)
+    delete (*iter);
+  returnFromActions.clear();
   delete moleculeView;
   delete statusIndicator;
@@ -117 +98 @@
 }
 
-char TextWindow::getSuitableShortForm(std::set <char> &ShortcutList, const std::string name) const
-{
-  for (std::string::const_iterator CharRunner = name.begin(); CharRunner != name.end(); ++CharRunner) {
-    if (ShortcutList.find(*CharRunner) == ShortcutList.end()) {
-      ShortcutList.insert(*CharRunner);
-      return *CharRunner;
-    }
-  }
-  // if no letter matches, take digits
-  int i=0;
-  for (;i<10;++i) {
-    if (ShortcutList.find((char)i + '0') == ShortcutList.end())
-      break;
-  }
-  if (i != 10) {
-    ShortcutList.insert((char)i + '0');
-    return ((char)i + '0');
-  } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "Could not find a suitable shortform for " << name << "." << endl);
-    return '#';
-  }
-}
-
-void TextWindow::populateMenu(TextMenu* Menu, const  std::string &MenuName)
-{
-  Action *ActionItem = NULL;
-  set <char> ShortcutList;
-  // reserve 'q' for quit
-  ShortcutList.insert('q');
-  // through all actions for this menu
-  pair < multimap <std::string, std::string>::iterator, multimap <std::string, std::string>::iterator > MenuActions = MapOfActions::getInstance().MenuContainsActionMap.equal_range(MenuName);
-  for (multimap <std::string, std::string>::const_iterator MenuRunner = MenuActions.first; MenuRunner != MenuActions.second; ++MenuRunner) {
-    ActionItem = ActionRegistry::getInstance().getActionByName(MenuRunner->second);
-    new ActionMenuItem(getSuitableShortForm(ShortcutList, MenuRunner->second),MapOfActions::getInstance().getDescription(MenuRunner->second).c_str(),Menu,ActionItem);
-  }
-  // finally add default quit item
-  Action *returnFromAction = new TextMenu::LeaveAction(Menu);
-  MenuItem *returnFromItem = new ActionMenuItem('q',"return to Main menu",Menu,returnFromAction);
-  Menu->addDefault(returnFromItem);
-}