X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FLyXView.C;h=8c6059bf75b9419b0055af0382edd4d3247ec4a4;hb=25079a83c2c4efd877a735e6571f149f703d4a16;hp=5f600ac88af2015a9cebace10cf5d04980e3be13;hpb=2c0d4b31ee7b27ba9273211d76c910d8420259f0;p=lyx.git

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index 5f600ac88a..8c6059bf75 100644
--- 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;
@@ -67,12 +68,12 @@ using lyx::frontend::ControlCommandBuffer;
 string current_layout;
 
 
-LyXView::LyXView()
+LyXView::LyXView(int id)
 	: work_area_(0),
 	  toolbars_(new Toolbars(*this)),
 	  autosave_timeout_(new Timeout(5000)),
 	  dialogs_(new Dialogs(*this)),
-	  controlcommand_(new ControlCommandBuffer(*this))
+	  controlcommand_(new ControlCommandBuffer(*this)), id_(id)
 {
 	// Start autosave timer
 	if (lyxrc.autosave) {
@@ -85,24 +86,29 @@ LyXView::LyXView()
 
 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());
 }
 
 
-void LyXView::redrawWorkArea()
+// FIXME, there's only one WorkArea per LyXView possible for now.
+WorkArea const * LyXView::currentWorkArea() const
 {
-	lyxerr[Debug::WORKAREA] << "LyXView::redrawWorkArea" << std::endl;
-	work_area_->redraw();
-	updateStatusBar();
+	return work_area_;
 }
 
 
-WorkArea * LyXView::workArea()
+// FIXME, there's only one WorkArea per LyXView possible for now.
+WorkArea * LyXView::currentWorkArea()
 {
 	return work_area_;
 }
@@ -110,12 +116,16 @@ WorkArea * LyXView::workArea()
 
 Buffer * LyXView::buffer() const
 {
+	BOOST_ASSERT(work_area_);
 	return work_area_->bufferView().buffer();
 }
 
 
 void LyXView::setBuffer(Buffer * b)
 {
+	busy(true);
+
+	BOOST_ASSERT(work_area_);
 	if (work_area_->bufferView().buffer())
 		disconnectBuffer();
 
@@ -132,16 +142,25 @@ void LyXView::setBuffer(Buffer * b)
 		connectBuffer(*work_area_->bufferView().buffer());
 	}
 
+	if (quitting)
+		return;
+
 	updateMenubar();
 	updateToolbars();
 	updateLayoutChoice();
 	updateWindowTitle();
-	redrawWorkArea();
+	updateStatusBar();
+	updateTab();
+	busy(false);
+	work_area_->redraw();
 }
 
 
-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();
 
@@ -151,11 +170,14 @@ bool LyXView::loadLyXFile(string const & filename, bool tolastfiles)
 	updateToolbars();
 	updateLayoutChoice();
 	updateWindowTitle();
+	updateTab();
 	if (loaded) {
 		connectBuffer(*work_area_->bufferView().buffer());
 		showErrorList("Parse");
 	}
-	redrawWorkArea();
+	updateStatusBar();
+	busy(false);
+	work_area_->redraw();
 	return loaded;
 }
 
@@ -165,6 +187,11 @@ void LyXView::connectBuffer(Buffer & buf)
 	if (errorsConnection_.connected())
 		disconnectBuffer();
 
+	BOOST_ASSERT(work_area_);
+	bufferChangedConnection_ =
+		buf.changed.connect(
+			boost::bind(&WorkArea::redraw, work_area_));
+
 	errorsConnection_ =
 		buf.errors.connect(
 			boost::bind(&LyXView::showErrorList, this, _1));
@@ -197,6 +224,8 @@ void LyXView::connectBuffer(Buffer & buf)
 
 void LyXView::disconnectBuffer()
 {
+	errorsConnection_.disconnect();
+	bufferChangedConnection_.disconnect();
 	messageConnection_.disconnect();
 	busyConnection_.disconnect();
 	titleConnection_.disconnect();
@@ -275,16 +304,23 @@ void LyXView::showReadonly(bool)
 
 BufferView * LyXView::view() const
 {
+	BOOST_ASSERT(work_area_);
 	return &work_area_->bufferView();
 }
 
 
 void LyXView::updateToolbars()
 {
-	bool const math = work_area_->bufferView().cursor().inMathed();
+	BOOST_ASSERT(work_area_);
+	bool const math =
+		work_area_->bufferView().cursor().inMathed();
 	bool const table =
 		lyx::getStatus(FuncRequest(LFUN_LAYOUT_TABULAR)).enabled();
-	toolbars_->update(math, table);
+	bool const review =
+		lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).enabled() &&
+		lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).onoff(true);
+		
+	toolbars_->update(math, table, review);
 	// 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.
@@ -292,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();
@@ -327,6 +383,7 @@ void LyXView::updateLayoutChoice()
 		current_layout = buffer()->params().getLyXTextClass().defaultLayoutName();
 	}
 
+	BOOST_ASSERT(work_area_);
 	if (work_area_->bufferView().cursor().inMathed())
 		return;
 
@@ -342,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");
 
@@ -360,10 +416,7 @@ void LyXView::updateWindowTitle()
 		}
 	}
 
-	if (maximize_title != last_title) {
-		setWindowTitle(maximize_title, minimize_title);
-		last_title = maximize_title;
-	}
+	setWindowTitle(maximize_title, minimize_title);
 }
 
 
@@ -378,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;
 }