Changeset dc5413 for molecuilder/src/UIElements

Timestamp:

Feb 26, 2010, 1:57:01 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

78b9d9, d50264

Parents:

e65cc0 (diff), 45cc89 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'FreddiesRefactoring' into StructureRefactoring

Conflicts:

molecuilder/src/Patterns/Observer.cpp
molecuilder/src/World.cpp
molecuilder/src/boundary.cpp
molecuilder/src/molecule_dynamics.cpp
molecuilder/src/unittests/AnalysisCorrelationToPointUnitTest.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/AnalysisPairCorrelationUnitTest.cpp
molecuilder/src/unittests/Makefile.am
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/unittests/listofbondsunittest.cpp

Location:

molecuilder/src/UIElements

Files:

• TextStatusIndicator.cpp (added)
• TextStatusIndicator.hpp (added)
• TextWindow.cpp (modified) (3 diffs)
• TextWindow.hpp (modified) (2 diffs)

molecuilder/src/UIElements/TextWindow.cpp

@@ -36 +36 @@
 #include "Menu/DisplayMenuItem.hpp"
 #include "Menu/SubMenuItem.hpp"
+#include "UIElements/TextStatusIndicator.hpp"
 #include "Actions/MethodAction.hpp"
 #include "Actions/ErrorAction.hpp"
@@ -97 +98 @@
 
   editMoleculesMenu->addDefault(returnItem);
+
+  // Add status indicators etc...
+
+  statusIndicator = new TextStatusIndicator();
 }
 
@@ -105 +110 @@
   delete returnFromEditMoleculeAction;
   delete moleculeView;
+  delete statusIndicator;
   delete main_menu;
 }

molecuilder/src/UIElements/TextWindow.hpp

@@ -15 +15 @@
 class oldmenu;
 class StringView;
+class TextStatusIndicator;
 
 class TextWindow : public MainWindow
@@ -31 +32 @@
   // all views that are contained in the main Menu
   StringView *moleculeView;
+  TextStatusIndicator *statusIndicator;
 
   // This class still contains a lot of scattered functionality