Changeset 495a53 for molecuilder/src/builder.cpp

Timestamp:

May 8, 2010, 9:59:27 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

48b5fd

Parents:

e04838

Message:

removed menuPopulaters from MainWindow.

• menuPopulaters is too specific to TextUIFactory.
• for CommandLineUIFactory a different structure was needed.
• the shift of struct menuPopulaters inside of class MainWindow makes it superflous.

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/builder.cpp (modified) (2 diffs)

molecuilder/src/builder.cpp

@@ -2512 +2512 @@
 };
 
-/***************************************** Functions used to build all menus **********************/
-
-void populateEditMoleculesMenu(Menu* editMoleculesMenu){
-  MoleculeListClass *molecules = World::getInstance().getMolecules();
-  periodentafel *periode = World::getInstance().getPeriode();
-
-  // build the EditMoleculesMenu
-  Action *createMoleculeAction = new MethodAction("createMoleculeAction",boost::bind(&MoleculeListClass::createNewMolecule,molecules,periode));
-  new ActionMenuItem('c',"create new molecule",editMoleculesMenu,createMoleculeAction);
-
-  Action *loadMoleculeAction = new MethodAction("loadMoleculeAction",boost::bind(&MoleculeListClass::loadFromXYZ,molecules,periode));
-  new ActionMenuItem('l',"load molecule from xyz file",editMoleculesMenu,loadMoleculeAction);
-
-  Action *changeFilenameAction = new MoleculeChangeNameAction(molecules);
-  new ActionMenuItem('n',"change molecule's name",editMoleculesMenu,changeFilenameAction);
-
-  Action *giveFilenameAction = new MethodAction("giveFilenameAction",boost::bind(&MoleculeListClass::setMoleculeFilename,molecules));
-  new ActionMenuItem('N',"give molecules filename",editMoleculesMenu,giveFilenameAction);
-
-  Action *parseAtomsAction = new MethodAction("parseAtomsAction",boost::bind(&MoleculeListClass::parseXYZIntoMolecule,molecules));
-  new ActionMenuItem('p',"parse atoms in xyz file into molecule",editMoleculesMenu,parseAtomsAction);
-
-  Action *eraseMoleculeAction = new MethodAction("eraseMoleculeAction",boost::bind(&MoleculeListClass::eraseMolecule,molecules));
-  new ActionMenuItem('r',"remove a molecule",editMoleculesMenu,eraseMoleculeAction);
-
-}
-
-
 /********************************************** Main routine **************************************/
 
@@ -2586 +2558 @@
 
     {
-      menuPopulaters populaters;
-      populaters.MakeEditMoleculesMenu = populateEditMoleculesMenu;
-
-      MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow(populaters);
+      MainWindow *mainWindow = UIFactory::getInstance().makeMainWindow();
       mainWindow->display();
       delete mainWindow;