X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiView.cpp;h=fe0c201b8dc3fe26d20f4ab403dcc02555094797;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=0570d8cb2c02d78aea75e5cd0aa4ebad7e7a0b3b;hpb=7a7ab8f14b4d297d52cc1c01e0e057f3768df29c;p=lyx.git

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 0570d8cb2c..fe0c201b8d 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -16,6 +16,7 @@
 #include "GuiView.h"
 
 #include "Dialog.h"
+#include "DispatchResult.h"
 #include "FileDialog.h"
 #include "FontLoader.h"
 #include "GuiApplication.h"
@@ -380,6 +381,12 @@ GuiView::GuiView(int id)
 	setWindowIcon(getPixmap("images/", "lyx", "png"));
 #endif
 
+#if (QT_VERSION >= 0x040300)
+	// use tabbed dock area for multiple docks
+	// (such as "source" and "messages")
+	setDockOptions(QMainWindow::ForceTabbedDocks);
+#endif
+
 	// For Drag&Drop.
 	setAcceptDrops(true);
 
@@ -536,7 +543,7 @@ void GuiView::initToolbars()
 		if (!tb)
 			continue;
 		int const visibility = guiApp->toolbars().defaultVisibility(cit->name);
-		bool newline = true;
+		bool newline = !(visibility & Toolbars::SAMEROW);
 		tb->setVisible(false);
 		tb->setVisibility(visibility);
 
@@ -549,7 +556,8 @@ void GuiView::initToolbars()
 		if (visibility & Toolbars::BOTTOM) {
 			// Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
 #if (QT_VERSION >= 0x040202)
-			addToolBarBreak(Qt::BottomToolBarArea);
+			if (newline)
+				addToolBarBreak(Qt::BottomToolBarArea);
 #endif
 			addToolBar(Qt::BottomToolBarArea, tb);
 		}
@@ -557,7 +565,8 @@ void GuiView::initToolbars()
 		if (visibility & Toolbars::LEFT) {
 			// Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
 #if (QT_VERSION >= 0x040202)
-			addToolBarBreak(Qt::LeftToolBarArea);
+			if (newline)
+				addToolBarBreak(Qt::LeftToolBarArea);
 #endif
 			addToolBar(Qt::LeftToolBarArea, tb);
 		}
@@ -565,7 +574,8 @@ void GuiView::initToolbars()
 		if (visibility & Toolbars::RIGHT) {
 			// Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
 #if (QT_VERSION >= 0x040202)
-			addToolBarBreak(Qt::RightToolBarArea);
+			if (newline)
+				addToolBarBreak(Qt::RightToolBarArea);
 #endif
 			addToolBar(Qt::RightToolBarArea, tb);
 		}
@@ -585,11 +595,20 @@ TocModels & GuiView::tocModels()
 void GuiView::setFocus()
 {
 	LYXERR(Debug::DEBUG, "GuiView::setFocus()" << this);
+	QMainWindow::setFocus();
+}
+
+
+void GuiView::focusInEvent(QFocusEvent * e)
+{
+	LYXERR(Debug::DEBUG, "GuiView::focusInEvent()" << this);
+	QMainWindow::focusInEvent(e);
 	// Make sure LyXFunc points to the correct view.
 	guiApp->setCurrentView(this);
-	QMainWindow::setFocus();
-	if (d.current_work_area_)
-		d.current_work_area_->setFocus();
+	if (currentMainWorkArea())
+		currentMainWorkArea()->setFocus();
+	else if (currentWorkArea())
+		currentWorkArea()->setFocus();
 	else
 		d.bg_widget_->setFocus();
 }
@@ -2434,6 +2453,7 @@ void GuiView::checkExternallyModifiedBuffers()
 }
 
 
+//FIXME use a DispatchResult object to transmit messages
 void GuiView::dispatchVC(FuncRequest const & cmd)
 {
 	// message for statusbar
@@ -2456,7 +2476,8 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
 			break;
 		if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
 			msg = buffer->lyxvc().checkIn();
-			reloadBuffer();
+			if (!msg.empty())
+				reloadBuffer();
 		}
 		break;
 
@@ -2669,22 +2690,22 @@ static docstring previewAndDestroy(Buffer * buffer, string const & format)
 #endif
 
 
-bool GuiView::dispatch(FuncRequest const & cmd)
+void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 {
 	BufferView * bv = currentBufferView();
 	// By default we won't need any update.
-	if (bv)
-		bv->cursor().updateFlags(Update::None);
+	dr.update(Update::None);
+	// assume cmd will be dispatched
+	dr.dispatched(true);
 
 	Buffer * doc_buffer = documentBufferView()
 		? &(documentBufferView()->buffer()) : 0;
 
-	bool dispatched = true;
-
 	if (cmd.origin == FuncRequest::TOC) {
 		GuiToc * toc = static_cast<GuiToc*>(findOrBuild("toc", false));
+		// FIXME: do we need to pass a DispatchResult object here?
 		toc->doDispatch(bv->cursor(), cmd);
-		return true;
+		return;
 	}
 
 	string const argument = to_utf8(cmd.argument());
@@ -2702,11 +2723,13 @@ bool GuiView::dispatch(FuncRequest const & cmd)
 			if (!doc_buffer)
 				break;
 			if (cmd.argument() == "custom") {
-				lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"));
+				dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"), 
+					 dr);
 				break;
 			}
 			if (doc_buffer->doExport(argument, false)) {
-				message(bformat(_("Error exporting to format: %1$s."),
+				dr.setError(true);
+				dr.setMessage(bformat(_("Error exporting to format: %1$s."),
 					cmd.argument()));
 			}
 			break;
@@ -2791,8 +2814,10 @@ bool GuiView::dispatch(FuncRequest const & cmd)
 					theBufferList().getBuffer(FileName(to_utf8(cmd.argument())));
 				if (buffer)
 					setBuffer(buffer);
-				else
-					message(_("Document not loaded"));
+				else {
+					dr.setError(true);
+					dr.setMessage(_("Document not loaded"));
+				}
 			}
 			break;
 
@@ -2903,6 +2928,7 @@ bool GuiView::dispatch(FuncRequest const & cmd)
 				// FIXME: get rid of this indirection; GuiView ask the inset
 				// if he is kind enough to update itself...
 				FuncRequest fr(LFUN_INSET_DIALOG_UPDATE, cmd.argument());
+				//FIXME: pass DispatchResult here?
 				inset->dispatch(currentBufferView()->cursor(), fr);
 			} else if (name == "paragraph") {
 				lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE));
@@ -2914,9 +2940,9 @@ bool GuiView::dispatch(FuncRequest const & cmd)
 
 		case LFUN_DIALOG_TOGGLE: {
 			if (isDialogVisible(cmd.getArg(0)))
-				dispatch(FuncRequest(LFUN_DIALOG_HIDE, cmd.argument()));
+				dispatch(FuncRequest(LFUN_DIALOG_HIDE, cmd.argument()), dr);
 			else
-				dispatch(FuncRequest(LFUN_DIALOG_SHOW, cmd.argument()));
+				dispatch(FuncRequest(LFUN_DIALOG_SHOW, cmd.argument()), dr);
 			break;
 		}
 
@@ -3069,7 +3095,7 @@ bool GuiView::dispatch(FuncRequest const & cmd)
 			break;
 
 		default:
-			dispatched = false;
+			dr.dispatched(false);
 			break;
 	}
 
@@ -3081,7 +3107,7 @@ bool GuiView::dispatch(FuncRequest const & cmd)
 			statusBar()->hide();
 	}
 
-	return dispatched;
+	return;
 }
 
 
@@ -3366,8 +3392,12 @@ void GuiView::updateDialogs()
 
 	for(; it != end; ++it) {
 		Dialog * dialog = it->second.get();
-		if (dialog && dialog->isVisibleView())
-			dialog->checkStatus();
+		if (dialog) {
+			if (dialog->isBufferDependent() && !documentBufferView())
+				hideDialog(fromqstr(dialog->name()), 0);
+			else if (dialog->isVisibleView())
+				dialog->checkStatus();
+		}
 	}
 	updateToolbars();
 	updateLayoutList();