Changeset 770138 for molecuilder/src/Menu

Timestamp:

Mar 26, 2010, 3:13:31 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

0f7883, 71910a, abd4a1

Parents:

cbc639

Message:

Added mechanism that deactivates undo and redo menupoint if not applicable

Location:

molecuilder/src/Menu

Files:

• ActionMenuItem.cpp (modified) (1 diff)
• ActionMenuItem.hpp (modified) (1 diff)
• MenuItem.cpp (modified) (1 diff)
• MenuItem.hpp (modified) (2 diffs)
• TextMenu.cpp (modified) (2 diffs)

molecuilder/src/Menu/ActionMenuItem.cpp

@@ -20 +20 @@
 
 ActionMenuItem::~ActionMenuItem()
-{
-  // TODO Auto-generated destructor stub
-}
+{}
 
 void ActionMenuItem::doTrigger() {
   action->call();
 }
+
+bool ActionMenuItem::isActive() {
+  return action->isActive();
+}

molecuilder/src/Menu/ActionMenuItem.hpp

@@ -26 +26 @@
   virtual void doTrigger();
 
+  virtual bool isActive();
+
 private:
   Action* action; //!< this action will be called when the trigger matches

molecuilder/src/Menu/MenuItem.cpp

@@ -78 +78 @@
   return added;
 }
+
+bool MenuItem::isActive(){
+  return true;
+}

molecuilder/src/Menu/MenuItem.hpp

@@ -21 +21 @@
  */
 class MenuItem {
-private:
-  char trigger;
-  string *description;
-  bool added;
-
 public:
   MenuItem(char,const char*,Menu*);
@@ -41 +36 @@
   bool wasAdded();
 
+  virtual bool isActive();
+
 protected:
   void setDescription(string);
+
+private:
+  char trigger;
+  string *description;
+  bool added;
 };
 

molecuilder/src/Menu/TextMenu.cpp

@@ -52 +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";
 }
 
@@ -75 +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