#include <config.h>
#include "LyXView.h"
+#include "Gui.h"
#include "Dialogs.h"
#include "Timeout.h"
-#include "Toolbar.h"
+#include "Toolbars.h"
#include "Menubar.h"
+#include "WorkArea.h"
#include "buffer.h"
#include "bufferparams.h"
#include <boost/bind.hpp>
-#include <sys/time.h>
-#include <unistd.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
-using lyx::support::MakeDisplayPath;
-using lyx::support::OnlyFilename;
+using lyx::frontend::Gui;
+using lyx::frontend::WorkArea;
+
+using lyx::support::makeDisplayPath;
+using lyx::support::onlyFilename;
using std::endl;
using std::string;
+using lyx::frontend::ControlCommandBuffer;
string current_layout;
+Gui & LyXView::gui()
+{
+ return owner_;
+}
+
-LyXView::LyXView()
- : intl_(new Intl),
+LyXView::LyXView(Gui & owner)
+ : work_area_(0),
+ owner_(owner),
+ toolbars_(new Toolbars(*this)),
+ intl_(new Intl),
autosave_timeout_(new Timeout(5000)),
lyxfunc_(new LyXFunc(this)),
dialogs_(new Dialogs(*this)),
}
+void LyXView::setWorkArea(WorkArea * work_area)
+{
+ work_area_ = work_area;
+}
+
+
+void LyXView::redrawWorkArea()
+{
+ work_area_->redraw();
+}
+
+
void LyXView::init()
{
updateLayoutChoice();
autosave_timeout_->start();
}
- intl_->InitKeyMapper(lyxrc.use_kbmap);
+ intl_->initKeyMapper(lyxrc.use_kbmap);
}
Buffer * LyXView::buffer() const
{
- return bufferview_->buffer();
+ return work_area_->bufferView().buffer();
}
-boost::shared_ptr<BufferView> const & LyXView::view() const
+BufferView * LyXView::view() const
{
- return bufferview_;
+ return &work_area_->bufferView();
}
void LyXView::setLayout(string const & layout)
{
- toolbar_->setLayout(layout);
+ toolbars_->setLayout(layout);
}
-void LyXView::updateToolbar()
+void LyXView::updateToolbars()
{
- bool const math = bufferview_->cursor().inMathed();
+ bool const math = work_area_->bufferView().cursor().inMathed();
bool const table =
getLyXFunc().getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
- toolbar_->update(math, table);
+ toolbars_->update(math, table);
+ // update redaonly status of open dialogs. This could also be in
+ // updateMenubar(), but since updateToolbars() and updateMenubar()
+ // are always called together it is only here.
+ getDialogs().checkStatus();
}
lyxerr[Debug::INFO] << "Running autoSave()" << endl;
if (view()->available()) {
- ::AutoSave(view().get());
+ ::autoSave(view());
}
}
void LyXView::updateLayoutChoice()
{
- // don't show any layouts without a buffer
+ // 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)) {
+ // Update the layout display
+ if (toolbars_->updateLayoutList(buffer()->params().textclass)) {
current_layout = buffer()->params().getLyXTextClass().defaultLayoutName();
}
- if (bufferview_->cursor().inMathed())
+ if (work_area_->bufferView().cursor().inMathed())
return;
string const & layout =
- bufferview_->cursor().paragraph().layout()->name();
+ work_area_->bufferView().cursor().paragraph().layout()->name();
if (layout != current_layout) {
- toolbar_->setLayout(layout);
+ toolbars_->setLayout(layout);
current_layout = layout;
}
}
if (view()->available()) {
string const cur_title = buffer()->fileName();
if (!cur_title.empty()) {
- maximize_title += ": " + MakeDisplayPath(cur_title, 30);
- minimize_title = OnlyFilename(cur_title);
+ maximize_title += ": " + makeDisplayPath(cur_title, 30);
+ minimize_title = onlyFilename(cur_title);
if (!buffer()->isClean()) {
maximize_title += _(" (changed)");
minimize_title += '*';
{
Buffer const * buffer_ptr = 0;
if (inset) {
- buffer_ptr = bufferview_->buffer();
- bufferview_->update();
+ buffer_ptr = work_area_->bufferView().buffer();
+ // No FitCursor:
+ work_area_->bufferView().update(Update::Force);
}
return buffer_ptr;
}