namespace grfx -> lyx::graphics

[lyx.git] / src / frontends / Toolbar.C

diff --git a/src/frontends/Toolbar.C b/src/frontends/Toolbar.C
index dc1237a6f759136e13145bb921807f39a0735bc7..b243030f9049d20f085391061a4af0e1a3be14df 100644 (file)
--- a/src/frontends/Toolbar.C
+++ b/src/frontends/Toolbar.C
@@ -1,47 +1,35 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
+/**
+ * \file Toolbar.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+ * \author Lars Gullik Bjønnes
  *
- *           This file is Copyright 1996-1998
- *           Lars Gullik Bjønnes
- *
- * ====================================================== */
-
-//  Added pseudo-action handling, asierra 180296
+ * Full author contact details are available in file CREDITS
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation "Toolbar.h"
-#endif
 
 #include "Toolbar.h"
+#include "ToolbarBackend.h"
 #include "Toolbar_pimpl.h"
 #include "debug.h"
 #include "LyXAction.h"
 
 using std::endl;
 
-extern LyXAction lyxaction;
-
-
-Toolbar::Toolbar(LyXView * o, int x, int y, ToolbarDefaults const &tbd)
+Toolbar::Toolbar(LyXView * o, int x, int y)
+       : last_textclass_(-1)
 {
        pimpl_ = new Pimpl(o, x, y);
 
-       pimpl_->reset();
+       // extracts the toolbars from the backend
+       ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin();
+       ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end();
 
-       // extracts the toolbar actions from tbd
-       for (ToolbarDefaults::const_iterator cit = tbd.begin();
-            cit != tbd.end(); ++cit) {
-               pimpl_->add((*cit));
-               lyxerr[Debug::GUI] << "tool action: "
-                                      << (*cit) << endl;
-       }
+       for (; cit != end; ++cit)
+               pimpl_->add(*cit);
 }
 
 
@@ -51,27 +39,20 @@ Toolbar::~Toolbar()
 }
 
 
-void Toolbar::set(bool doingmain)
-{
-       pimpl_->set(doingmain);
-}
-
-
-void Toolbar::activate()
-{
-       pimpl_->activate();
-}
-
-
-void Toolbar::deactivate()
+void Toolbar::update(bool in_math, bool in_table)
 {
-       pimpl_->deactivate();
-}
+       pimpl_->update();
 
+       // extracts the toolbars from the backend
+       ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin();
+       ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end();
 
-void Toolbar::update()
-{
-       pimpl_->update();
+       for (; cit != end; ++cit) {
+               if (cit->flags & ToolbarBackend::MATH)
+                       pimpl_->displayToolbar(*cit, in_math);
+               else if (cit->flags & ToolbarBackend::TABLE)
+                       pimpl_->displayToolbar(*cit, in_table);
+       }
 }
 
 
@@ -82,12 +63,20 @@ void Toolbar::setLayout(string const & layout)
 }
 
 
-void Toolbar::updateLayoutList(bool force)
+bool Toolbar::updateLayoutList(int textclass)
 {
-       pimpl_->updateLayoutList(force);
+       // update the layout display
+       if (last_textclass_ != textclass) {
+               pimpl_->updateLayoutList(true);
+               last_textclass_ = textclass;
+               return true;
+       } else {
+               pimpl_->updateLayoutList(false);
+               return false;
+       }
 }
 
-               
+
 void Toolbar::openLayoutList()
 {
        pimpl_->openLayoutList();
@@ -98,22 +87,3 @@ void Toolbar::clearLayoutList()
 {
        pimpl_->clearLayoutList();
 }
-
-
-void Toolbar::push(int nth)
-{
-       pimpl_->push(nth);
-}
-
-
-void Toolbar::add(string const & func, bool doclean)
-{
-       int const tf = lyxaction.LookupFunc(func);
-
-       if (tf == -1) {
-               lyxerr << "Toolbar::add: no LyX command called`"
-                      << func << "'exists!" << endl; 
-       } else {
-               pimpl_->add(tf, doclean);
-       }
-}