Changeset 3e8325 for molecuilder/src/builder.cpp

Timestamp:

Jan 7, 2010, 2:46:34 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

d97af9

Parents:

34ff5e6

Message:

Added a central registry that allows access to actions by name.

File:

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

molecuilder/src/builder.cpp

@@ -65 +65 @@
 #include "molecule.hpp"
 #include "periodentafel.hpp"
-#include "menu.hpp"
+#include "UIElements/UIFactory.hpp"
+#include "UIElements/MainWindow.hpp"
 
 /** Parses the command line options.
@@ -904 +905 @@
     char *ConfigFileName = NULL;
     int j;
-    oldmenu *main_menu;
-    main_menu = new oldmenu;
     setVerbosity(0);
     /* structure of ParseCommandLineOptions will be refactored later */
@@ -940 +939 @@
 
 
-
-    main_menu->perform(molecules, configuration, periode, ConfigFileName);
+    UIFactory::makeUserInterface(UIFactory::Text);
+    MainWindow *mainWindow = UIFactory::get()->makeMainWindow();
+    mainWindow->display(molecules, configuration, periode, ConfigFileName);
 
     if(periode->StorePeriodentafel(configuration->databasepath))
@@ -952 +952 @@
     delete(periode);
   delete(configuration);
+
+  delete mainWindow;
 
   Log() << Verbose(0) <<  "Maximum of allocated memory: "
@@ -960 +962 @@
   logger::purgeInstance();
   errorLogger::purgeInstance();
-
+  UIFactory::purgeInstance();
   return (0);
 }