#include "LyXView.h"
#include "Dialogs.h"
#include "Timeout.h"
-#include "Toolbar.h"
+#include "Toolbars.h"
#include "Menubar.h"
#include "buffer.h"
#include "bufferparams.h"
#include "BufferView.h"
#include "bufferview_funcs.h"
+#include "cursor.h"
#include "debug.h"
#include "funcrequest.h"
#include "gettext.h"
#include "controllers/ControlCommandBuffer.h"
-#include "mathed/math_cursor.h"
-
#include "support/filetools.h" // OnlyFilename()
#include <boost/bind.hpp>
using std::endl;
using std::string;
+using lyx::frontend::ControlCommandBuffer;
string current_layout;
LyXView::LyXView()
- : intl_(new Intl),
+ : toolbars_(new Toolbars(*this)),
+ intl_(new Intl),
autosave_timeout_(new Timeout(5000)),
lyxfunc_(new LyXFunc(this)),
dialogs_(new Dialogs(*this)),
void LyXView::setLayout(string const & layout)
{
- toolbar_->setLayout(layout);
+ toolbars_->setLayout(layout);
}
-void LyXView::updateToolbar()
+void LyXView::updateToolbars()
{
- bool const math = mathcursor;
+ bool const math = bufferview_->cursor().inMathed();
bool const table =
- !getLyXFunc().getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).disabled();
- toolbar_->update(math, table);
+ getLyXFunc().getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
+ toolbars_->update(math, table);
}
{
// don't show any layouts without a buffer
if (!view()->buffer()) {
- toolbar_->clearLayoutList();
+ toolbars_->clearLayoutList();
return;
}
// update the layout display
- if (toolbar_->updateLayoutList(buffer()->params().textclass)) {
+ if (toolbars_->updateLayoutList(buffer()->params().textclass)) {
current_layout = buffer()->params().getLyXTextClass().defaultLayoutName();
}
+ if (bufferview_->cursor().inMathed())
+ return;
+
string const & layout =
- bufferview_->getLyXText()->cursorPar()->layout()->name();
+ bufferview_->cursor().paragraph().layout()->name();
if (layout != current_layout) {
- toolbar_->setLayout(layout);
+ toolbars_->setLayout(layout);
current_layout = layout;
}
}
}
-void LyXView::dispatch(FuncRequest const & req)
+void LyXView::dispatch(FuncRequest const & cmd)
{
- // substitute the correct BufferView here
- FuncRequest r = req;
- r.setView(view().get());
- getLyXFunc().dispatch(r);
+ getLyXFunc().dispatch(cmd);
}
-Buffer const * const LyXView::updateInset(InsetOld const * inset) const
+Buffer const * const LyXView::updateInset(InsetBase const * inset) const
{
Buffer const * buffer_ptr = 0;
if (inset) {