Changes in src/UIElements/Qt4/QtMainWindow.cpp [4cf323d:b59da6]

File:

• src/UIElements/Qt4/QtMainWindow.cpp (modified) (4 diffs)

src/UIElements/Qt4/QtMainWindow.cpp

@@ -38 +38 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/MapOfActions.hpp"
-#include "Menu/Menu.hpp"
+#include "Actions/ValueStorage.hpp"
 #include "Menu/Qt4/QtMenu.hpp"
-#include "Menu/ActionMenuItem.hpp"
 #include "Views/Qt4/QtWorldView.hpp"
 #include "Views/Qt4/GLMoleculeView.hpp"
 #include "Views/Qt4/QtMoleculeView.hpp"
 #include "Views/Qt4/QtStatusBar.hpp"
-
-using namespace std;
 
 QtMainWindow::QtMainWindow(QApplication *_theApp) :
@@ -60 +56 @@
   molecule3dDisplay = new GLMoleculeView();
 
-  MenuBar = menuBar();
-
-  std::map <std::string, QtMenu *> NametoTextMenuMap;
-  // go through all menus and create them
-  QtMenu *Menu = NULL;
-  for(std::map<std::string, std::pair<std::string,std::string> >::iterator iter = MapOfActions::getInstance().MenuDescription.begin(); iter != MapOfActions::getInstance().MenuDescription.end(); ++iter) {
-    cout << "Creating menu " << iter->first << endl;
-    Menu = new QtMenu(iter->first.c_str());
-    MenuBar->addMenu(Menu);
-    NametoTextMenuMap.insert( pair <std::string, QtMenu *> (iter->first, Menu) );
-    //new SubMenuItem(getSuitableShortForm(iter->first),iter->second.first,main_menu,Menu);
-  }
-
-  // populate all actions
-  MapOfActions::getInstance().populateActions();
-
-  // go through all actions and add them to its menu
-  for (std::map <std::string, QtMenu *>::iterator MenuRunner = NametoTextMenuMap.begin(); MenuRunner != NametoTextMenuMap.end(); ++MenuRunner) {
-    cout << "Creating Action " << MenuRunner->first << " in menu " << MenuRunner->second << endl;
-    populateMenu(MenuRunner->second, MenuRunner->first);
-  }
+  MainMenu = new QtMenu<QMenuBar>(menuBar(), "");
+  MainMenu->init();
 
   setCentralWidget(splitter1);
@@ -98 +75 @@
 {
   menuBar()->clear();
-  delete editMoleculesMenu;
 }
 
@@ -106 +82 @@
 }
 
-char QtMainWindow::getSuitableShortForm(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())
-      return *CharRunner;
-  }
-  DoeLog(1) && (eLog() << Verbose(1) << "Could not find a suitable shortform for TextWindow::getSuitableShortForm()." << endl);
-  return ((char)(ShortcutList.size() % 10) + '0');
-}
-
-void QtMainWindow::populateMenu(QtMenu* Menu, const  std::string &MenuName)
-{
-  Action *ActionItem = NULL;
-  set <char> ShortcutList;
-  // through all actions for this menu
-  std::pair < std::multimap <std::string, std::string>::iterator, std::multimap <std::string, std::string>::iterator > MenuActions = MapOfActions::getInstance().MenuContainsActionMap.equal_range(MenuName);
-  for (std::multimap <std::string, std::string>::const_iterator MenuRunner = MenuActions.first; MenuRunner != MenuActions.second; ++MenuRunner) {
-    cout << " Adding " << MenuRunner->second << " to submenu " << MenuName << endl;
-    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);
-}