Changes in src/Menu/TextMenu.cpp [24a5e0:f9352d]

File:

• src/Menu/TextMenu.cpp (modified) (4 diffs)

src/Menu/TextMenu.cpp

@@ -11 +11 @@
 #include "Menu/TextMenu.hpp"
 #include "Menu/MenuItem.hpp"
+#include "Helpers/Assert.hpp"
 
 
@@ -51 +52 @@
 
 void TextMenu::showEntry(MenuItem* entry){
-  outputter << entry->formatEntry() << "\n";
+  if(entry->isActive()==false){
+    outputter << "(";
+  }
+  outputter << entry->formatEntry();
+  if(entry->isActive()==false){
+    outputter << ")";
+  }
+  outputter << "\n";
 }
 
@@ -74 +82 @@
     list<MenuItem*>::iterator iter;
     for(iter = items.begin(); iter!=items.end();iter++){
-      somethingChosen |= (*iter)->checkTrigger(choice);
+      if((*iter)->isActive()){
+        somethingChosen |= (*iter)->checkTrigger(choice);
+      }
     }
     // see if something was chosen and call default Item if not
@@ -88 +98 @@
 }
 
+string TextMenu::getTitle(){
+  return title;
+}
+
 void TextMenu::addDefault(MenuItem* _defaultItem) {
   defaultItem = _defaultItem;
 }
+
+/****************************** Contained Actions ****************/
+
+const string TextMenu::LeaveAction::nameBase = "Leave menu: ";
+
+TextMenu::LeaveAction::LeaveAction(TextMenu* _menu) :
+Action(nameBase+_menu->getTitle()),
+menu(_menu)
+{}
+
+TextMenu::LeaveAction::~LeaveAction(){}
+
+bool TextMenu::LeaveAction::canUndo(){
+  return false;
+}
+
+bool TextMenu::LeaveAction::shouldUndo(){
+  return false;
+}
+
+Action::state_ptr TextMenu::LeaveAction::performCall(){
+  menu->doQuit();
+  return Action::success;
+}
+
+
+Action::state_ptr TextMenu::LeaveAction::performUndo(Action::state_ptr){
+  ASSERT(0,"Cannot undo leaving a menu");
+  return Action::success;
+}
+
+Action::state_ptr TextMenu::LeaveAction::performRedo(Action::state_ptr){
+  ASSERT(0,"Cannot redo leaving a menu");
+  return Action::success;
+}