Changeset 770138 for molecuilder/src

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

Files:

• Actions/Action.cpp (modified) (1 diff)
• Actions/Action.hpp (modified) (1 diff)
• Actions/ActionHistory.cpp (modified) (3 diffs)
• Actions/ActionHistory.hpp (modified) (3 diffs)
• Menu/ActionMenuItem.cpp (modified) (1 diff)
• Menu/ActionMenuItem.hpp (modified) (1 diff)
• Menu/MenuItem.cpp (modified) (1 diff)
• Menu/MenuItem.hpp (modified) (2 diffs)
• Menu/TextMenu.cpp (modified) (2 diffs)

molecuilder/src/Actions/Action.cpp

@@ -53 +53 @@
   return performRedo(_state);
 }
+
+
+bool Action::isActive(){
+  return true;
+}

molecuilder/src/Actions/Action.hpp

@@ -44 +44 @@
   virtual bool shouldUndo()=0;
 
+  virtual bool isActive();
+
   virtual const std::string getName();
 

molecuilder/src/Actions/ActionHistory.cpp

@@ -34 +34 @@
   Action::state_ptr oldState = elem.action->redo(elem.state);
   history.push_back(HistoryElement(elem.action,oldState));
+}
+
+bool ActionHistory::hasUndo(){
+  return history.size()>0;
+}
+
+bool ActionHistory::hasRedo(){
+  return yrotsih.size()>0;
 }
 
@@ -73 +81 @@
 }
 
+bool ActionHistory::UndoAction::isActive(){
+  return hist->hasUndo();
+}
+
 Action::state_ptr ActionHistory::UndoAction::performCall(){
   hist->undoLast();
@@ -103 +115 @@
 }
 
+bool ActionHistory::RedoAction::isActive(){
+  return hist->hasRedo();
+}
+
 Action::state_ptr ActionHistory::RedoAction::performCall(){
   hist->redoLast();

molecuilder/src/Actions/ActionHistory.hpp

@@ -37 +37 @@
     virtual bool shouldUndo();
 
+    virtual bool isActive();
+
   private:
     virtual Action::state_ptr performCall();
@@ -53 +55 @@
     virtual bool shouldUndo();
 
+    virtual bool isActive();
+
   private:
     virtual Action::state_ptr performCall();
@@ -65 +69 @@
   void undoLast();
   void redoLast();
+
+  bool hasUndo();
+  bool hasRedo();
 
   void addElement(Action*,Action::state_ptr);

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