Changes in src/UIElements/Views/Qt4/QtToolBar.cpp [c01fec:8859b5]

File:

• src/UIElements/Views/Qt4/QtToolBar.cpp (modified) (5 diffs)

src/UIElements/Views/Qt4/QtToolBar.cpp

@@ -28 +28 @@
  */
 
+
+
+
 // include config.h
 #ifdef HAVE_CONFIG_H
@@ -33 +36 @@
 #endif
 
+
 #include "QtToolBar.hpp"
 
 #include "CodePatterns/MemDebug.hpp"
 
-#include "CodePatterns/Observer/Notification.hpp"
-
-#include "Actions/ActionQueue.hpp"
-
 QtToolBar::QtToolBar(QWidget * _parent) :
-  QToolBar(_parent),
-  Observer("QToolBar"),
-  ActionQueue_observing(false),
-  undoaction(addActionItem("undo", "undo the last Action", "edit-undo")),
-  redoaction(addActionItem("redo", "redo the last Action", "edit-redo"))
+  QToolBar(_parent)
 {
-  // gray out undo/redo buttons initially
-  undoaction->setEnabled(false);
-  redoaction->setEnabled(false);
-
-  // sign in
-  MoleCuilder::ActionQueue::getInstance().signOn(this, MoleCuilder::ActionQueue::ActionQueued);
-  ActionQueue_observing = true;
+  addActionItem("undo", "undo the last Action", "edit-undo");
+  addActionItem("redo", "redo the last Action", "edit-redo");
 }
 
@@ -60 +51 @@
 QtToolBar::~QtToolBar()
 {
-  // sign off
-  if (ActionQueue_observing)
-    MoleCuilder::ActionQueue::getInstance().signOff(this, MoleCuilder::ActionQueue::ActionQueued);
 }
 
 
-QAction * QtToolBar::addActionItem(
-    const std::string &token,
-    const std::string &description,
-    const std::string &icon_name)
+void QtToolBar::addActionItem(const std::string &token, const std::string &description, const std::string &icon_name)
 {
   QAction *action = addAction(QString(description.c_str()));
@@ -78 +63 @@
   plumbing.push_back(pipe);
   present_actions.insert( token );
-  return action;
 }
 
@@ -88 +72 @@
 }
 
-void QtToolBar::update(Observable *publisher)
-{
-  ASSERT(0, "QtToolBar::update() - this should never be called, we are only subscribed to channels.");
-}
-
-void QtToolBar::subjectKilled(Observable *publisher)
-{
-  ActionQueue_observing = false;
-}
-
-void QtToolBar::recieveNotification(Observable *publisher, Notification_ptr notification)
-{
-  if (dynamic_cast<MoleCuilder::ActionQueue *>(publisher) != NULL) {
-    switch(notification->getChannelNo()) {
-      case MoleCuilder::ActionQueue::ActionQueued:
-        undoaction->setEnabled(MoleCuilder::ActionQueue::getInstance().canUndo());
-        redoaction->setEnabled(MoleCuilder::ActionQueue::getInstance().canRedo());
-        break;
-      default:
-        ASSERT(0, "QtToolBar::recieveNotification() - cannot get here, not subscribed to channel "
-            +toString(notification->getChannelNo()));
-        break;
-    }
-  } else {
-    ASSERT(0, "QtToolBar::recieveNotification() - cannot get here, we are only subscribed to ActionQueue.");
-  }
-}