]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiView.cpp
Let the tag affect other sides too
[lyx.git] / src / frontends / qt4 / GuiView.cpp
index bfbe8d2605236b59e3e393ab9b0db75f6b9f5bc4..93099faaf7d5420424ac05cf614c589f32d9cfd9 100644 (file)
 #include "GuiApplication.h"
 #include "GuiCommandBuffer.h"
 #include "GuiCompleter.h"
-#include "GuiWorkArea.h"
 #include "GuiKeySymbol.h"
 #include "GuiToc.h"
 #include "GuiToolbar.h"
+#include "GuiWorkArea.h"
 #include "LayoutBox.h"
 #include "Menus.h"
 #include "TocModel.h"
@@ -76,6 +76,8 @@
 #include "support/Path.h"
 #include "support/Systemcall.h"
 #include "support/Timeout.h"
+#include "support/ProgressInterface.h"
+#include "GuiProgress.h"
 
 #include <QAction>
 #include <QApplication>
 #include <QSplitter>
 #include <QStackedWidget>
 #include <QStatusBar>
+#include <QTime>
 #include <QTimer>
 #include <QToolBar>
 #include <QUrl>
 #include <QScrollBar>
 
+#define EXPORT_in_THREAD 1
+
+
+// QtConcurrent was introduced in Qt 4.4
+#if (QT_VERSION >= 0x040400)
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QtConcurrentRun>
+#endif
+
 #include <boost/bind.hpp>
 
 #include <sstream>
@@ -141,6 +154,7 @@ public:
                font.setPointSize(int(toqstr(lyxrc.font_sizes[FONT_SIZE_LARGE]).toDouble()));
                pain.setFont(font);
                pain.drawText(260, 15, text);
+               setFocusPolicy(Qt::StrongFocus);
        }
 
        void paintEvent(QPaintEvent *)
@@ -151,13 +165,25 @@ public:
                pain.drawPixmap(x, y, splash_);
        }
 
+       void keyPressEvent(QKeyEvent * ev)
+       {
+               KeySymbol sym;
+               setKeySymbol(&sym, ev);
+               if (sym.isOK()) {
+                       guiApp->processKeySym(sym, q_key_state(ev->modifiers()));
+                       ev->accept();
+               } else {
+                       ev->ignore();
+               }
+       }
+
 private:
        QPixmap splash_;
 };
 
 
 /// Toolbar store providing access to individual toolbars by name.
-typedef std::map<std::string, GuiToolbar *> ToolbarMap;
+typedef map<string, GuiToolbar *> ToolbarMap;
 
 typedef boost::shared_ptr<Dialog> DialogPtr;
 
@@ -166,8 +192,8 @@ typedef boost::shared_ptr<Dialog> DialogPtr;
 
 struct GuiView::GuiViewPrivate
 {
-       GuiViewPrivate()
-               : current_work_area_(0), current_main_work_area_(0),
+       GuiViewPrivate(GuiView * gv)
+               : gv_(gv), current_work_area_(0), current_main_work_area_(0),
                layout_(0), autosave_timeout_(5000),
                in_show_(false)
        {
@@ -182,6 +208,7 @@ struct GuiView::GuiViewPrivate
                stack_widget_->addWidget(bg_widget_);
                stack_widget_->addWidget(splitter_);
                setBackground();
+               progress_ = new GuiProgress(gv);
        }
 
        ~GuiViewPrivate()
@@ -189,6 +216,7 @@ struct GuiView::GuiViewPrivate
                delete splitter_;
                delete bg_widget_;
                delete stack_widget_;
+               delete progress_;
        }
 
        QMenu * toolBarPopup(GuiView * parent)
@@ -233,6 +261,7 @@ struct GuiView::GuiViewPrivate
        {
                stack_widget_->setCurrentWidget(bg_widget_);
                bg_widget_->setUpdatesEnabled(true);
+               bg_widget_->setFocus();
        }
 
        TabWorkArea * tabWorkArea(int i)
@@ -256,7 +285,20 @@ struct GuiView::GuiViewPrivate
                return tabWorkArea(0);
        }
 
+#if (QT_VERSION >= 0x040400)
+       void setPreviewFuture(QFuture<docstring> const & f)
+       {
+               if (preview_watcher_.isRunning()) {
+                       // we prefer to cancel this preview in order to keep a snappy
+                       // interface.
+                       return;
+               }
+               preview_watcher_.setFuture(f);
+       }
+#endif
+
 public:
+       GuiView * gv_;
        GuiWorkArea * current_work_area_;
        GuiWorkArea * current_main_work_area_;
        QSplitter * splitter_;
@@ -264,6 +306,7 @@ public:
        BackgroundWidget * bg_widget_;
        /// view's toolbars
        ToolbarMap toolbars_;
+       ProgressInterface* progress_;
        /// The main layout box.
        /** 
         * \warning Don't Delete! The layout box is actually owned by
@@ -290,11 +333,20 @@ public:
 
        ///
        TocModels toc_models_;
+
+#if (QT_VERSION >= 0x040400)
+       ///
+       QFutureWatcher<docstring> autosave_watcher_;
+       QFutureWatcher<docstring> preview_watcher_;
+#else
+       struct DummyWatcher { bool isRunning(){return false;} }; 
+       DummyWatcher preview_watcher_;
+#endif
 };
 
 
 GuiView::GuiView(int id)
-       : d(*new GuiViewPrivate), id_(id), closing_(false)
+       : d(*new GuiViewPrivate(this)), id_(id), closing_(false)
 {
        // GuiToolbars *must* be initialised before the menu bar.
        normalSizedIcons(); // at least on Mac the default is 32 otherwise, which is huge
@@ -332,6 +384,17 @@ GuiView::GuiView(int id)
        setAcceptDrops(true);
 
        statusBar()->setSizeGripEnabled(true);
+       updateStatusBar();
+
+#if (QT_VERSION >= 0x040400)
+       connect(&d.autosave_watcher_, SIGNAL(finished()), this,
+               SLOT(threadFinished()));
+       connect(&d.preview_watcher_, SIGNAL(finished()), this,
+               SLOT(threadFinished()));
+#endif
+
+       connect(this, SIGNAL(triggerShowDialog(QString const &, QString const &, Inset *)),
+               SLOT(doShowDialog(QString const &, QString const &, Inset *)));
 
        // Forbid too small unresizable window because it can happen
        // with some window manager under X11.
@@ -359,6 +422,16 @@ GuiView::~GuiView()
 }
 
 
+void GuiView::threadFinished()
+{
+#if (QT_VERSION >= 0x040400)
+       QFutureWatcher<docstring> const * watcher =
+               static_cast<QFutureWatcher<docstring> const *>(sender());
+       message(watcher->result());
+#endif
+}
+
+
 void GuiView::saveLayout() const
 {
        QSettings settings;
@@ -410,6 +483,8 @@ bool GuiView::restoreLayout()
                dialog->prepareView();
        if ((dialog = findOrBuild("view-source", true)))
                dialog->prepareView();
+       if ((dialog = findOrBuild("progress", true)))
+               dialog->prepareView();
 
        if (!restoreState(settings.value("layout").toByteArray(), 0))
                initToolbars();
@@ -461,7 +536,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);
 
@@ -474,7 +549,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);
                }
@@ -482,7 +558,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);
                }
@@ -490,7 +567,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);
                }
@@ -510,11 +588,22 @@ 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();
 }
 
 
@@ -608,13 +697,42 @@ void GuiView::dropEvent(QDropEvent * event)
        for (int i = 0; i != files.size(); ++i) {
                string const file = os::internal_path(fromqstr(
                        files.at(i).toLocalFile()));
-               if (!file.empty()) {
-                       // Asynchronously post the event. DropEvent usually come
-                       // from the BufferView. But reloading a file might close
-                       // the BufferView from within its own event handler.
-                       guiApp->dispatchDelayed(FuncRequest(LFUN_FILE_OPEN, file));
-                       event->accept();
+               if (file.empty())
+                       continue;
+
+               string const ext = support::getExtension(file);
+               vector<const Format *> found_formats;
+
+               // Find all formats that have the correct extension.
+               vector<const Format *> const & import_formats 
+                       = theConverters().importableFormats();
+               vector<const Format *>::const_iterator it = import_formats.begin();
+               for (; it != import_formats.end(); ++it)
+                       if ((*it)->extension() == ext)
+                               found_formats.push_back(*it);
+
+               FuncRequest cmd;
+               if (found_formats.size() >= 1) {
+                       if (found_formats.size() > 1) {
+                               //FIXME: show a dialog to choose the correct importable format
+                               LYXERR(Debug::FILES,
+                                       "Multiple importable formats found, selecting first");
+                       }
+                       string const arg = found_formats[0]->name() + " " + file;
+                       cmd = FuncRequest(LFUN_BUFFER_IMPORT, arg);
+               } 
+               else {
+                       //FIXME: do we have to explicitly check whether it's a lyx file?
+                       LYXERR(Debug::FILES,
+                               "No formats found, trying to open it as a lyx file");
+                       cmd = FuncRequest(LFUN_FILE_OPEN, file);
                }
+
+               // Asynchronously post the event. DropEvent usually comes
+               // from the BufferView. But reloading a file might close
+               // the BufferView from within its own event handler.
+               guiApp->dispatchDelayed(cmd);
+               event->accept();
        }
 }
 
@@ -623,8 +741,15 @@ void GuiView::message(docstring const & str)
 {
        if (ForkedProcess::iAmAChild())
                return;
+       
+       // call is moved to GUI-thread by GuiProgress
+       d.progress_->appendMessage(toqstr(str));
+}
+
 
-       statusBar()->showMessage(toqstr(str));
+void GuiView::updateMessage(QString const & str)
+{
+       statusBar()->showMessage(str);
        d.statusbar_timer_.stop();
        d.statusbar_timer_.start(3000);
 }
@@ -650,8 +775,11 @@ void GuiView::bigSizedIcons()
 
 void GuiView::clearMessage()
 {
-       if (!hasFocus())
-               return;
+       // FIXME: This code was introduced in r19643 to fix bug #4123. However,
+       // the hasFocus function mostly returns false, even if the focus is on
+       // a workarea in this view.
+       //if (!hasFocus())
+       //      return;
        showMessage();
        d.statusbar_timer_.stop();
 }
@@ -659,7 +787,8 @@ void GuiView::clearMessage()
 
 void GuiView::updateWindowTitle(GuiWorkArea * wa)
 {
-       if (wa != d.current_work_area_)
+       if (wa != d.current_work_area_
+           || wa->bufferView().buffer().isInternal())
                return;
        setWindowTitle(qt_("LyX: ") + wa->windowTitle());
        setWindowIconText(wa->windowIconText());
@@ -704,6 +833,7 @@ void GuiView::on_lastWorkAreaRemoved()
        updateDialogs();
 
        resetWindowTitleAndIconText();
+       updateStatusBar();
 
        if (lyxrc.open_buffers_in_tabs)
                // Nothing more to do, the window should stay open.
@@ -811,25 +941,7 @@ bool GuiView::event(QEvent * e)
                        }
                }
 #endif
-
-               if (d.current_work_area_)
-                       // Nothing special to do.
-                       return QMainWindow::event(e);
-
-               QKeyEvent * ke = static_cast<QKeyEvent*>(e);
-               // Let Qt handle menu access and the Tab keys to navigate keys to navigate
-               // between controls.
-               if (ke->modifiers() & Qt::AltModifier || ke->key() == Qt::Key_Tab 
-                       || ke->key() == Qt::Key_Backtab)
-                       return QMainWindow::event(e);
-
-               // Allow processing of shortcuts that are allowed even when no Buffer
-               // is viewed.
-               KeySymbol sym;
-               setKeySymbol(&sym, ke);
-               guiApp->processKeySym(sym, q_key_state(ke->modifiers()));
-               e->accept();
-               return true;
+               return QMainWindow::event(e);
        }
 
        default:
@@ -1049,7 +1161,7 @@ void GuiView::updateToolbars()
 
 void GuiView::setBuffer(Buffer * newBuffer)
 {
-       LYXERR(Debug::DEBUG, "Setting buffer: " << newBuffer << std::endl);
+       LYXERR(Debug::DEBUG, "Setting buffer: " << newBuffer << endl);
        LASSERT(newBuffer, return);
        setBusy(true);
 
@@ -1108,7 +1220,7 @@ void GuiView::errors(string const & error_type, bool from_master)
 }
 
 
-void GuiView::updateTocItem(std::string const & type, DocIterator const & dit)
+void GuiView::updateTocItem(string const & type, DocIterator const & dit)
 {
        d.toc_models_.updateItem(toqstr(type), dit);
 }
@@ -1166,12 +1278,43 @@ BufferView const * GuiView::currentBufferView() const
 }
 
 
+#if (QT_VERSION >= 0x040400)
+static docstring saveAndDestroyBuffer(Buffer * buffer, FileName const & fname)
+{
+       bool failed = true;
+       FileName const tmp_ret = FileName::tempName("lyxauto");
+       if (!tmp_ret.empty()) {
+               if (buffer->writeFile(tmp_ret))
+                       failed = !tmp_ret.moveTo(fname);
+       }
+       if (failed) {
+               // failed to write/rename tmp_ret so try writing direct
+               failed = buffer->writeFile(fname);
+       }
+       delete buffer;
+       return failed
+               ? _("Automatic save failed!")
+               : _("Automatic save done.");
+}
+#endif
+
+
 void GuiView::autoSave()
 {
        LYXERR(Debug::INFO, "Running autoSave()");
 
-       if (documentBufferView())
-               documentBufferView()->buffer().autoSave();
+       Buffer * buffer = documentBufferView()
+               ? &documentBufferView()->buffer() : 0;
+       if (!buffer)
+               return;
+
+#if (QT_VERSION >= 0x040400)
+       QFuture<docstring> f = QtConcurrent::run(saveAndDestroyBuffer, buffer->clone(),
+               buffer->getAutosaveFilename());
+       d.autosave_watcher_.setFuture(f);
+#else
+       buffer->autoSave();
+#endif
 }
 
 
@@ -1213,6 +1356,25 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
        case LFUN_BUFFER_IMPORT:
                break;
 
+       case LFUN_MASTER_BUFFER_UPDATE:
+       case LFUN_MASTER_BUFFER_VIEW: 
+               enable = doc_buffer && doc_buffer->parent() != 0
+                       && !d.preview_watcher_.isRunning();
+               break;
+
+       case LFUN_BUFFER_UPDATE:
+       case LFUN_BUFFER_VIEW: {
+               if (!doc_buffer || d.preview_watcher_.isRunning()) {
+                       enable = false;
+                       break;
+               }
+               string format = to_utf8(cmd.argument());
+               if (cmd.argument().empty())
+                       format = doc_buffer->getDefaultOutputFormat();
+               enable = doc_buffer->isExportableFormat(format);
+               break;
+       }
+
        case LFUN_BUFFER_RELOAD:
                enable = doc_buffer && !doc_buffer->isUnnamed()
                        && doc_buffer->fileName().exists()
@@ -1302,6 +1464,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                                || name == "file" //FIXME: should be removed.
                                || name == "prefs"
                                || name == "texinfo"
+                               || name == "progress"
                                || name == "compare";
                else if (name == "print")
                        enable = doc_buffer->isExportable("dvi")
@@ -1974,6 +2137,7 @@ bool GuiView::closeWorkArea(GuiWorkArea * wa)
 bool GuiView::closeBuffer()
 {
        GuiWorkArea * wa = currentMainWorkArea();
+       setCurrentWorkArea(wa);
        Buffer & buf = wa->bufferView().buffer();
        return wa && closeWorkArea(wa, !buf.parent());
 }
@@ -2162,7 +2326,7 @@ bool GuiView::saveBufferIfNeeded(Buffer & buf, bool hiding)
                buf.removeAutosaveFile();
                if (hiding)
                        // revert all changes
-                       buf.loadLyXFile(buf.fileName());
+                       buf.reload();
                buf.markClean();
                break;
        case 2:
@@ -2259,33 +2423,33 @@ static bool ensureBufferClean(Buffer * buffer)
 void GuiView::reloadBuffer()
 {
        Buffer * buf = &documentBufferView()->buffer();
-       FileName filename = buf->fileName();
-       Buffer const * master = buf->masterBuffer();
-       bool const is_child = master != buf;
-       // The user has already confirmed that the changes, if any, should
-       // be discarded. So we just release the Buffer and don't call closeBuffer();
-       theBufferList().release(buf);
-       buf = loadDocument(filename);
-       docstring const disp_fn = makeDisplayPath(filename.absFilename());
-       docstring str;
-       if (buf) {
-               // re-allocate master if necessary
-               if (is_child && theBufferList().isLoaded(master)
-                   && buf->masterBuffer() != master)
-                       buf->setParent(master);
-               buf->updateLabels();
-               setBuffer(buf);
-               buf->errors("Parse");
-               str = bformat(_("Document %1$s reloaded."), disp_fn);
-       } else {
-               str = bformat(_("Could not reload document %1$s"), disp_fn);
+       buf->reload();
+}
+
+
+void GuiView::checkExternallyModifiedBuffers()
+{
+       BufferList::iterator bit = theBufferList().begin();
+       BufferList::iterator const bend = theBufferList().end();
+       for (; bit != bend; ++bit) {
+               if ((*bit)->fileName().exists()
+                   && (*bit)->isExternallyModified(Buffer::checksum_method)) {
+                       docstring text = bformat(_("Document \n%1$s\n has been externally modified."
+                                       " Reload now? Any local changes will be lost."),
+                                       from_utf8((*bit)->absFileName()));
+                       int const ret = Alert::prompt(_("Reload externally changed document?"),
+                                               text, 0, 1, _("&Reload"), _("&Cancel"));
+                       if (!ret)
+                               (*bit)->reload();
+               }
        }
-       message(str);
 }
 
 
 void GuiView::dispatchVC(FuncRequest const & cmd)
 {
+       // message for statusbar
+       string msg;
        Buffer * buffer = documentBufferView()
                ? &(documentBufferView()->buffer()) : 0;
 
@@ -2303,8 +2467,9 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
                if (!buffer || !ensureBufferClean(buffer))
                        break;
                if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
-                       message(from_utf8(buffer->lyxvc().checkIn()));
-                       reloadBuffer();
+                       msg = buffer->lyxvc().checkIn();
+                       if (!msg.empty())
+                               reloadBuffer();
                }
                break;
 
@@ -2312,7 +2477,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
                if (!buffer || !ensureBufferClean(buffer))
                        break;
                if (buffer->lyxvc().inUse()) {
-                       message(from_utf8(buffer->lyxvc().checkOut()));
+                       msg = buffer->lyxvc().checkOut();
                        reloadBuffer();
                }
                break;
@@ -2327,7 +2492,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
                                frontend::Alert::error(_("Revision control error."),
                                _("Error when setting the locking property."));
                        } else {
-                               message(from_utf8(res));
+                               msg = res;
                                reloadBuffer();
                        }
                }
@@ -2348,9 +2513,8 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
        case LFUN_VC_REPO_UPDATE:
                LASSERT(buffer, return);
                if (ensureBufferClean(buffer)) {
-                       string res = buffer->lyxvc().repoUpdate();
-                       message(from_utf8(res));
-                       reloadBuffer();
+                       msg = buffer->lyxvc().repoUpdate();
+                       checkExternallyModifiedBuffers();
                }
                break;
 
@@ -2398,6 +2562,9 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
        default:
                break;
        }
+
+       if (!msg.empty())
+               message(from_utf8(msg));
 }
 
 
@@ -2435,9 +2602,18 @@ bool GuiView::goToFileRow(string const & argument)
 {
        string file_name;
        int row;
-       istringstream is(argument);
-       is >> file_name >> row;
-       file_name = os::internal_path(file_name);
+       size_t i = argument.find_last_of(' ');
+       if (i != string::npos) {
+               file_name = os::internal_path(trim(argument.substr(0, i)));
+               istringstream is(argument.substr(i + 1));
+               is >> row;
+               if (is.fail())
+                       i = string::npos;
+       }
+       if (i == string::npos) {
+               LYXERR0("Wrong argument: " << argument);
+               return false;
+       }
        Buffer * buf = 0;
        string const abstmp = package().temp_dir().absFilename();
        string const realtmp = package().temp_dir().realPath();
@@ -2478,6 +2654,34 @@ bool GuiView::goToFileRow(string const & argument)
 }
 
 
+#if (QT_VERSION >= 0x040400)
+static docstring exportAndDestroy(Buffer * buffer, string const & format)
+{
+       bool const update_unincluded =
+                               buffer->params().maintain_unincluded_children
+                               && !buffer->params().getIncludedChildren().empty();
+       bool const success = buffer->doExport(format, true, update_unincluded);
+       delete buffer;
+       return success
+               ? bformat(_("Successful export to format: %1$s"), from_utf8(format))
+               : bformat(_("Error exporting to format: %1$s"), from_utf8(format));
+}
+
+
+static docstring previewAndDestroy(Buffer * buffer, string const & format)
+{
+       bool const update_unincluded =
+                               buffer->params().maintain_unincluded_children
+                               && !buffer->params().getIncludedChildren().empty();
+       bool const success = buffer->preview(format, update_unincluded);
+       delete buffer;
+       return success
+               ? bformat(_("Successful preview of format: %1$s"), from_utf8(format))
+               : bformat(_("Error previewing format: %1$s"), from_utf8(format));
+}
+#endif
+
+
 bool GuiView::dispatch(FuncRequest const & cmd)
 {
        BufferView * bv = currentBufferView();
@@ -2496,6 +2700,8 @@ bool GuiView::dispatch(FuncRequest const & cmd)
                return true;
        }
 
+       string const argument = to_utf8(cmd.argument());
+
        switch(cmd.action) {
                case LFUN_BUFFER_CHILD_OPEN:
                        openChildDocument(to_utf8(cmd.argument()));
@@ -2505,6 +2711,93 @@ bool GuiView::dispatch(FuncRequest const & cmd)
                        importDocument(to_utf8(cmd.argument()));
                        break;
 
+               case LFUN_BUFFER_EXPORT: {
+                       if (!doc_buffer)
+                               break;
+                       if (cmd.argument() == "custom") {
+                               lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"));
+                               break;
+                       }
+                       if (doc_buffer->doExport(argument, false)) {
+                               message(bformat(_("Error exporting to format: %1$s."),
+                                       cmd.argument()));
+                       }
+                       break;
+               }
+
+               case LFUN_BUFFER_UPDATE: {
+                       if (!doc_buffer)
+                               break;
+                       string format = argument;
+                       if (argument.empty())
+                               format = doc_buffer->getDefaultOutputFormat();
+#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+                       d.progress_->clearMessages();
+                       message(_("Exporting ..."));
+                       QFuture<docstring> f = QtConcurrent::run(exportAndDestroy,
+                               doc_buffer->clone(), format);
+                       d.setPreviewFuture(f);
+#else
+                       bool const update_unincluded =
+                               doc_buffer->params().maintain_unincluded_children
+                               && !doc_buffer->params().getIncludedChildren().empty();
+                       doc_buffer->doExport(format, true, update_unincluded);
+#endif
+                       break;
+               }
+               case LFUN_BUFFER_VIEW: {
+                       if (!doc_buffer)
+                               break;
+                       string format = argument;
+                       if (argument.empty())
+                               format = doc_buffer->getDefaultOutputFormat();
+#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+                       d.progress_->clearMessages();
+                       message(_("Previewing ..."));
+                       QFuture<docstring> f = QtConcurrent::run(previewAndDestroy,
+                               doc_buffer->clone(), format);
+                       d.setPreviewFuture(f);
+#else
+                       bool const update_unincluded =
+                               doc_buffer->params().maintain_unincluded_children
+                               && !doc_buffer->params().getIncludedChildren().empty();
+                       doc_buffer->preview(format, update_unincluded);
+#endif
+                       break;
+               }
+               case LFUN_MASTER_BUFFER_UPDATE: {
+                       if (!doc_buffer)
+                               break;
+                       string format = argument;
+                       Buffer const * master = doc_buffer->masterBuffer();
+                       if (argument.empty())
+                               format = master->getDefaultOutputFormat();
+#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+                       QFuture<docstring> f = QtConcurrent::run(exportAndDestroy,
+                               master->clone(), format);
+                       d.setPreviewFuture(f);
+#else
+                       bool const update_unincluded =
+                               master->params().maintain_unincluded_children
+                               && !master->params().getIncludedChildren().empty();
+                       master->doExport(format, true);
+#endif
+                       break;
+               }
+               case LFUN_MASTER_BUFFER_VIEW: {
+                       string format = argument;
+                       Buffer const * master = doc_buffer->masterBuffer();
+                       if (argument.empty())
+                               format = master->getDefaultOutputFormat();
+#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+                       QFuture<docstring> f = QtConcurrent::run(previewAndDestroy,
+                               master->clone(), format);
+                       d.setPreviewFuture(f);
+#else
+                       master->preview(format);
+#endif
+                       break;
+               }
                case LFUN_BUFFER_SWITCH:
                        if (FileName::isAbsolute(to_utf8(cmd.argument()))) {
                                Buffer * buffer = 
@@ -2563,8 +2856,10 @@ bool GuiView::dispatch(FuncRequest const & cmd)
                        int const ret = Alert::prompt(_("Revert to saved document?"),
                                text, 1, 1, _("&Revert"), _("&Cancel"));
 
-                       if (ret == 0)
+                       if (ret == 0) {
+                               doc_buffer->markClean();
                                reloadBuffer();
+                       }
                        break;
                }
 
@@ -2934,7 +3229,7 @@ char const * const dialognames[] = {
 "mathmatrix", "mathspace", "nomenclature", "nomencl_print", "note",
 "paragraph", "phantom", "prefs", "print", "ref", "sendto", "space",
 "spellchecker", "symbols", "tabular", "tabularcreate", "thesaurus", "texinfo",
-"toc", "view-source", "vspace", "wrap" };
+"toc", "view-source", "vspace", "wrap", "progress"};
 
 char const * const * const end_dialognames =
        dialognames + (sizeof(dialognames) / sizeof(char *));
@@ -3000,10 +3295,20 @@ Dialog * GuiView::findOrBuild(string const & name, bool hide_it)
 
 void GuiView::showDialog(string const & name, string const & data,
        Inset * inset)
+{
+       triggerShowDialog(toqstr(name), toqstr(data), inset);
+}
+
+
+void GuiView::doShowDialog(QString const & qname, QString const & qdata,
+       Inset * inset)
 {
        if (d.in_show_)
                return;
 
+       const string name = fromqstr(qname);
+       const string data = fromqstr(qdata);
+
        d.in_show_ = true;
        try {
                Dialog * dialog = findOrBuild(name, false);
@@ -3074,8 +3379,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();
@@ -3132,6 +3441,8 @@ Dialog * createGuiHyperlink(GuiView & lv);
 Dialog * createGuiVSpace(GuiView & lv);
 Dialog * createGuiViewSource(GuiView & lv);
 Dialog * createGuiWrap(GuiView & lv);
+Dialog * createGuiProgressView(GuiView & lv);
+
 
 
 Dialog * GuiView::build(string const & name)
@@ -3236,6 +3547,8 @@ Dialog * GuiView::build(string const & name)
                return createGuiVSpace(*this);
        if (name == "wrap")
                return createGuiWrap(*this);
+       if (name == "progress")
+               return createGuiProgressView(*this);
 
        return 0;
 }