* LyXView.C:

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

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index c32a47e3ce3b434f4b914be1212aaa3d0c67aa0b..8c6059bf75b9419b0055af0382edd4d3247ec4a4 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -17,6 +17,7 @@
 #include "Toolbars.h"
 #include "Menubar.h"
 #include "WorkArea.h"
+#include "Gui.h"
 
 #include "buffer.h"
 #include "bufferparams.h"
@@ -52,12 +53,12 @@ namespace lyx {
 # include <unistd.h>
 #endif
 
-using lyx::frontend::WorkArea;
+using frontend::WorkArea;
 
-using lyx::docstring;
-using lyx::support::bformat;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyFilename;
+using support::bformat;
+using support::FileName;
+using support::makeDisplayPath;
+using support::onlyFilename;
 
 using std::endl;
 using std::string;
@@ -85,20 +86,37 @@ LyXView::LyXView(int id)
 
 LyXView::~LyXView()
 {
+       disconnectBuffer();
 }
 
 
 // FIXME, there's only one WorkArea per LyXView possible for now.
 void LyXView::setWorkArea(WorkArea * work_area)
 {
+       BOOST_ASSERT(work_area);
        work_area_ = work_area;
        work_area_ids_.clear();
        work_area_ids_.push_back(work_area_->id());
 }
 
 
+// FIXME, there's only one WorkArea per LyXView possible for now.
+WorkArea const * LyXView::currentWorkArea() const
+{
+       return work_area_;
+}
+
+
+// FIXME, there's only one WorkArea per LyXView possible for now.
+WorkArea * LyXView::currentWorkArea()
+{
+       return work_area_;
+}
+
+
 Buffer * LyXView::buffer() const
 {
+       BOOST_ASSERT(work_area_);
        return work_area_->bufferView().buffer();
 }
 
@@ -107,6 +125,7 @@ void LyXView::setBuffer(Buffer * b)
 {
        busy(true);
 
+       BOOST_ASSERT(work_area_);
        if (work_area_->bufferView().buffer())
                disconnectBuffer();
 
@@ -137,10 +156,11 @@ void LyXView::setBuffer(Buffer * b)
 }
 
 
-bool LyXView::loadLyXFile(string const & filename, bool tolastfiles)
+bool LyXView::loadLyXFile(FileName const & filename, bool tolastfiles)
 {
        busy(true);
 
+       BOOST_ASSERT(work_area_);
        if (work_area_->bufferView().buffer())
                disconnectBuffer();
 
@@ -167,6 +187,7 @@ void LyXView::connectBuffer(Buffer & buf)
        if (errorsConnection_.connected())
                disconnectBuffer();
 
+       BOOST_ASSERT(work_area_);
        bufferChangedConnection_ =
                buf.changed.connect(
                        boost::bind(&WorkArea::redraw, work_area_));
@@ -283,12 +304,14 @@ void LyXView::showReadonly(bool)
 
 BufferView * LyXView::view() const
 {
+       BOOST_ASSERT(work_area_);
        return &work_area_->bufferView();
 }
 
 
 void LyXView::updateToolbars()
 {
+       BOOST_ASSERT(work_area_);
        bool const math =
                work_area_->bufferView().cursor().inMathed();
        bool const table =
@@ -305,6 +328,26 @@ void LyXView::updateToolbars()
 }
 
 
+ToolbarBackend::Flags LyXView::getToolbarState(string const & name)
+{
+       return toolbars_->getToolbarState(name);
+}
+
+
+void LyXView::toggleToolbarState(string const & name)
+{
+       // it is possible to get current toolbar status like this,...
+       // but I decide to obey the order of ToolbarBackend::flags
+       // and disregard real toolbar status.
+       // toolbars_->saveToolbarInfo();
+       //
+       // toggle state on/off/auto
+       toolbars_->toggleToolbarState(name);
+       // update toolbar
+       updateToolbars();
+}
+
+
 void LyXView::updateMenubar()
 {
        menubar_->update();
@@ -340,6 +383,7 @@ void LyXView::updateLayoutChoice()
                current_layout = buffer()->params().getLyXTextClass().defaultLayoutName();
        }
 
+       BOOST_ASSERT(work_area_);
        if (work_area_->bufferView().cursor().inMathed())
                return;
 
@@ -355,7 +399,6 @@ void LyXView::updateLayoutChoice()
 
 void LyXView::updateWindowTitle()
 {
-       static docstring last_title = lyx::from_ascii("LyX");
        docstring maximize_title = lyx::from_ascii("LyX");
        docstring minimize_title = lyx::from_ascii("LyX");
 
@@ -373,21 +416,12 @@ void LyXView::updateWindowTitle()
                }
        }
 
-       if (maximize_title != last_title) {
-               setWindowTitle(maximize_title, minimize_title);
-               last_title = maximize_title;
-       }
+       setWindowTitle(maximize_title, minimize_title);
 }
 
 
 void LyXView::dispatch(FuncRequest const & cmd)
 {
-       if (cmd.action == LFUN_WINDOW_CLOSE) {
-               close();
-               closed(id_);
-               return;
-       }
-
        theLyXFunc().setLyXView(this);
        lyx::dispatch(cmd);
 }
@@ -397,9 +431,10 @@ Buffer const * const LyXView::updateInset(InsetBase const * inset) const
 {
        Buffer const * buffer_ptr = 0;
        if (inset) {
+               BOOST_ASSERT(work_area_);
+               work_area_->scheduleRedraw();
+
                buffer_ptr = work_area_->bufferView().buffer();
-               // No FitCursor:
-               work_area_->bufferView().update(Update::Force);
        }
        return buffer_ptr;
 }