Changes in src/UIElements/Menu/TextMenu/TxMenu.cpp [f0f9a6:b59da6]

File:

• src/UIElements/Menu/TextMenu/TxMenu.cpp (modified) (6 diffs)

src/UIElements/Menu/TextMenu/TxMenu.cpp

@@ -24 +24 @@
 #include <iostream>
 #include <cmath>
+#include "Actions/Action.hpp"
+#include "Actions/ActionTraits.hpp"
 #include "Menu/TextMenu/TxMenu.hpp"
 #include "Menu/TextMenu/MenuItem.hpp"
+#include "Helpers/Assert.hpp"
 
 
-/** Constructor for class TxMenu.
- *
+/**
  * produce a text menu with a given title.
  * The text will later be displayed using the stream passed to the constructor.
- * \param &_outputter output stream to use for displaying the text
- * \param _title title of this menu
- * \param _spacer key to separate trigger key from descriptive text shown
- * \param _length maximum length of the descriptive text
  */
 TxMenu::TxMenu(std::ostream& _outputter, const std::string _title, char _spacer,int _length) :
@@ -47 +45 @@
 }
 
-/** Destructor for class TxMenu.
- *
- */
 TxMenu::~TxMenu()
 {
@@ -56 +51 @@
 }
 
-/** Adds an MenuItem to the internal list.
- * \param *item item to add
- */
 void TxMenu::addItem(MenuItem* item) {
   items.push_back(item);
 }
 
-/** Removes an MenuItem to the internal list.
- * \param *item item to remove
- */
 void TxMenu::removeItem(MenuItem* item) {
   items.remove(item);
 }
 
-/** Function to quit this TxMenu.
- */
 void TxMenu::doQuit(){
   quit = true;
 }
 
-/** Return the current state of quitting.
- * \return quit boolean
- */
 bool TxMenu::hasQuit(){
   return quit;
 }
 
-/** Display in a formatted manner a given entry of this menu.
- * \param *entry MenuItem to show
- */
 void TxMenu::showEntry(MenuItem* entry){
   if(entry->isActive()==false){
@@ -97 +78 @@
 }
 
-/** Display this menu.
- *
- */
 void TxMenu::display() {
   char choice;
@@ -136 +114 @@
 }
 
-/**  Return the internally stored title of the menu.
- * \return title string
- */
 std::string TxMenu::getTitle(){
   return title;
 }
 
-/**  Return the internally stored outputter of the menu.
- * \return output stream reference
- */
 std::ostream& TxMenu::getOutputter()
 {
@@ -151 +123 @@
 }
 
-/** Add a default item to the menu.
- * \param *_defaultItem MenuItem to act as default item.
- */
+
 void TxMenu::addDefault(MenuItem* _defaultItem) {
   defaultItem = _defaultItem;
 }
 
+/****************************** Contained Actions ****************/
+
+TxMenu::LeaveAction::LeaveAction(TxMenu* const _menu, const ActionTraits & LeaveActionTrait) :
+  Action(LeaveActionTrait, true),
+  menu(_menu)
+{}
+
+TxMenu::LeaveAction::~LeaveAction(){}
+
+bool TxMenu::LeaveAction::canUndo(){
+  return false;
+}
+
+bool TxMenu::LeaveAction::shouldUndo(){
+  return false;
+}
+
+void TxMenu::LeaveAction::getParametersfromValueStorage()
+{}
+
+Dialog* TxMenu::LeaveAction::fillDialog(Dialog *dialog){
+  ASSERT(dialog,"No Dialog given when filling action dialog");
+  return dialog;
+}
+
+
+Action::state_ptr TxMenu::LeaveAction::performCall(){
+  menu->doQuit();
+  return Action::success;
+}
+
+
+Action::state_ptr TxMenu::LeaveAction::performUndo(Action::state_ptr){
+  ASSERT(0,"Cannot undo leaving a menu");
+  return Action::success;
+}
+
+Action::state_ptr TxMenu::LeaveAction::performRedo(Action::state_ptr){
+  ASSERT(0,"Cannot redo leaving a menu");
+  return Action::success;
+}