Changeset 536380

Timestamp:

Feb 18, 2010, 11:38:02 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

1614a17, 1aa81a

Parents:

b53a7e

Message:

Added a progress indicator for the text menu

Location:

molecuilder/src

Files:

• Actions/small_actions.hpp (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• UIElements/TextStatusIndicator.cpp (added)
• UIElements/TextStatusIndicator.hpp (added)
• UIElements/TextWindow.cpp (modified) (3 diffs)
• UIElements/TextWindow.hpp (modified) (2 diffs)
• builder.cpp (modified) (1 diff)

molecuilder/src/Actions/small_actions.hpp

@@ -25 +25 @@
 };
 
+
 #endif // _SMALL_ACTIONS_HPP

molecuilder/src/Makefile.am

@@ -20 +20 @@
 MENUHEADER = Menu/Menu.hpp Menu/TextMenu.hpp Menu/MenuItem.hpp Menu/SubMenuItem.hpp Menu/ActionMenuItem.hpp Menu/SeperatorItem.hpp Menu/DisplayMenuItem.hpp
 
-UISOURCE = ${ACTIONSSOURCE} ${VIEWSOURCE} ${MENUSOURCE} UIElements/UIFactory.cpp UIElements/TextUIFactory.cpp UIElements/MainWindow.cpp UIElements/TextWindow.cpp UIElements/Dialog.cpp UIElements/TextDialog.cpp
-UIHEADER = ${ACTIONSHEADER} ${VIEWHEADER} ${MENUHEADER} UIElements/UIFactory.hpp UIElements/TextUIFactory.hpp UIElements/MainWindow.hpp UIElements/TextWindow.hpp UIElements/Dialog.hpp UIElements/TextDialog.hpp
+UISOURCE = ${ACTIONSSOURCE} ${VIEWSOURCE} ${MENUSOURCE} UIElements/UIFactory.cpp UIElements/TextUIFactory.cpp UIElements/MainWindow.cpp UIElements/TextWindow.cpp UIElements/TextStatusIndicator.cpp UIElements/Dialog.cpp UIElements/TextDialog.cpp
+UIHEADER = ${ACTIONSHEADER} ${VIEWHEADER} ${MENUHEADER} UIElements/UIFactory.hpp UIElements/TextUIFactory.hpp UIElements/MainWindow.hpp UIElements/TextWindow.hpp UIElements/TextStatusIndicator.hpp UIElements/Dialog.hpp UIElements/TextDialog.hpp
 
 # all these files are only used for legacy reasons while the transition is in progress

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

molecuilder/src/builder.cpp

@@ -2160 +2160 @@
   Action *eraseMoleculeAction = new MethodAction("eraseMoleculeAction",boost::bind(&MoleculeListClass::eraseMolecule,molecules));
   new ActionMenuItem('r',"remove a molecule",editMoleculesMenu,eraseMoleculeAction);
+
 }