]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiView.cpp
Allow use of Tab keys when no document's open.
[lyx.git] / src / frontends / qt4 / GuiView.cpp
index efb877ffe4217d00dcbce35e99957bf482dce3d5..c07aa04ec0aedc20424c0bd294ad51f41dbb3bdd 100644 (file)
 #include <config.h>
 
 #include "GuiView.h"
-#include "Dialog.h"
 
+#include "Dialog.h"
+#include "frontends/FileDialog.h"
 #include "GuiApplication.h"
 #include "GuiWorkArea.h"
 #include "GuiKeySymbol.h"
-#include "GuiMenubar.h"
 #include "GuiToolbar.h"
 #include "GuiToolbars.h"
+#include "Menus.h"
 
 #include "qt_helpers.h"
 
+#include "frontends/alert.h"
+
 #include "buffer_funcs.h"
 #include "Buffer.h"
 #include "BufferList.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Intl.h"
 #include "Layout.h"
 #include "Lexer.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "LyXVC.h"
-#include "MenuBackend.h"
 #include "Paragraph.h"
 #include "TextClass.h"
 #include "Text.h"
 #include "ToolbarBackend.h"
 #include "version.h"
 
+#include "support/FileFilterList.h"
 #include "support/FileName.h"
+#include "support/filetools.h"
+#include "support/ForkedCalls.h"
 #include "support/lstrings.h"
 #include "support/os.h"
+#include "support/Package.h"
 #include "support/Timeout.h"
 
 #include <QAction>
@@ -86,9 +92,8 @@
 # include <unistd.h>
 #endif
 
-using std::endl;
-using std::string;
-using std::vector;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -96,10 +101,6 @@ extern bool quitting;
 
 namespace frontend {
 
-using support::bformat;
-using support::FileName;
-using support::trim;
-
 namespace {
 
 class BackgroundWidget : public QWidget
@@ -164,7 +165,6 @@ struct GuiView::GuiViewPrivate
                delete splitter_;
                delete bg_widget_;
                delete stack_widget_;
-               delete menubar_;
                delete toolbars_;
        }
 
@@ -241,8 +241,6 @@ public:
        QSplitter * splitter_;
        QStackedWidget * stack_widget_;
        BackgroundWidget * bg_widget_;
-       /// view's menubar
-       GuiMenubar * menubar_;
        /// view's toolbars
        GuiToolbars * toolbars_;
        /// The main layout box.
@@ -257,10 +255,10 @@ public:
        GuiLayoutBox * layout_;
 
        ///
-       std::map<std::string, Inset *> open_insets_;
+       map<string, Inset *> open_insets_;
 
        ///
-       std::map<std::string, DialogPtr> dialogs_;
+       map<string, DialogPtr> dialogs_;
 
        unsigned int smallIconSize;
        unsigned int normalIconSize;
@@ -279,9 +277,11 @@ public:
 GuiView::GuiView(int id)
        : d(*new GuiViewPrivate), id_(id)
 {
-       // GuiToolbars *must* be initialised before GuiMenubar.
+       // GuiToolbars *must* be initialised before the menu bar.
        d.toolbars_ = new GuiToolbars(*this);
-       d.menubar_ = new GuiMenubar(this, menubackend);
+
+       // Fill up the menu bar.
+       guiApp->menus().fillMenuBar(this);
 
        setCentralWidget(d.stack_widget_);
 
@@ -386,7 +386,7 @@ void GuiView::closeEvent(QCloseEvent * close_event)
        // we may have been called through the close window button
        // which bypasses the LFUN machinery.
        if (!d.quitting_by_menu_ && guiApp->viewCount() == 1) {
-               if (!theBufferList().quitWriteAll()) {
+               if (!quitWriteAll()) {
                        close_event->ignore();
                        return;
                }
@@ -408,6 +408,10 @@ void GuiView::closeEvent(QCloseEvent * close_event)
 #endif
                settings.setValue(key + "/icon_size", iconSize());
                d.toolbars_->saveToolbarInfo();
+               // Now take care of all other dialogs:
+               map<string, DialogPtr>::const_iterator it = d.dialogs_.begin();
+               for (; it!= d.dialogs_.end(); ++it)
+                       it->second->saveSession();
        }
 
        guiApp->unregisterView(id_);
@@ -446,16 +450,19 @@ void GuiView::dropEvent(QDropEvent* event)
 
        LYXERR(Debug::GUI, "GuiView::dropEvent: got URLs!");
        for (int i = 0; i != files.size(); ++i) {
-               string const file = support::os::internal_path(fromqstr(
+               string const file = os::internal_path(fromqstr(
                        files.at(i).toLocalFile()));
                if (!file.empty())
-                       dispatch(FuncRequest(LFUN_FILE_OPEN, file));
+                       lyx::dispatch(FuncRequest(LFUN_FILE_OPEN, file));
        }
 }
 
 
 void GuiView::message(docstring const & str)
 {
+       if (ForkedProcess::iAmAChild())
+               return;
+
        statusBar()->showMessage(toqstr(str));
        d.statusbar_timer_.stop();
        d.statusbar_timer_.start(3000);
@@ -571,24 +578,30 @@ bool GuiView::event(QEvent * e)
                }
                return QMainWindow::event(e);
        }
+
        case QEvent::ShortcutOverride: {
+               if (d.current_work_area_)
+                       // Nothing special to do.
+                       return QMainWindow::event(e);
+
                QKeyEvent * ke = static_cast<QKeyEvent*>(e);
-               if (!d.current_work_area_) {
-                       theLyXFunc().setLyXView(this);
-                       KeySymbol sym;
-                       setKeySymbol(&sym, ke);
-                       theLyXFunc().processKeySym(sym, q_key_state(ke->modifiers()));
-                       e->accept();
-                       return true;
-               }
-               if (ke->key() == Qt::Key_Tab || ke->key() == Qt::Key_Backtab) {
-                       KeySymbol sym;
-                       setKeySymbol(&sym, ke);
-                       d.current_work_area_->processKeySym(sym, NoModifier);
-                       e->accept();
-                       return true;
-               }
+
+               // 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.
+               theLyXFunc().setLyXView(this);
+               KeySymbol sym;
+               setKeySymbol(&sym, ke);
+               theLyXFunc().processKeySym(sym, q_key_state(ke->modifiers()));
+               e->accept();
+               return true;
        }
+
        default:
                return QMainWindow::event(e);
        }
@@ -705,15 +718,14 @@ GuiWorkArea const * GuiView::currentWorkArea() const
 }
 
 
-void GuiView::setCurrentWorkArea(GuiWorkArea * work_area)
+void GuiView::setCurrentWorkArea(GuiWorkArea * wa)
 {
-       BOOST_ASSERT(work_area);
+       BOOST_ASSERT(wa);
 
        // Changing work area can result from opening a file so
        // update the toc in any case.
        updateToc();
 
-       GuiWorkArea * wa = static_cast<GuiWorkArea *>(work_area);
        d.current_work_area_ = wa;
        for (int i = 0; i != d.splitter_->count(); ++i) {
                if (d.tabWorkArea(i)->setCurrentWorkArea(wa))
@@ -722,24 +734,19 @@ void GuiView::setCurrentWorkArea(GuiWorkArea * work_area)
 }
 
 
-void GuiView::removeWorkArea(GuiWorkArea * work_area)
+void GuiView::removeWorkArea(GuiWorkArea * wa)
 {
-       BOOST_ASSERT(work_area);
-       GuiWorkArea * gwa = static_cast<GuiWorkArea *>(work_area);
-       if (gwa == d.current_work_area_) {
+       BOOST_ASSERT(wa);
+       if (wa == d.current_work_area_) {
                disconnectBuffer();
                disconnectBufferView();
                hideBufferDependent();
                d.current_work_area_ = 0;
        }
 
-       // removing a work area often results from closing a file so
-       // update the toc in any case.
-       updateToc();
-
        for (int i = 0; i != d.splitter_->count(); ++i) {
                TabWorkArea * twa = d.tabWorkArea(i);
-               if (!twa->removeWorkArea(gwa))
+               if (!twa->removeWorkArea(wa))
                        // Not found in this tab group.
                        continue;
 
@@ -788,10 +795,12 @@ void GuiView::updateToolbars()
                bool const review =
                        lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).enabled() &&
                        lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).onoff(true);
+               bool const mathmacrotemplate =
+                       lyx::getStatus(FuncRequest(LFUN_IN_MATHMACROTEMPLATE)).enabled();
 
-               d.toolbars_->update(math, table, review);
+               d.toolbars_->update(math, table, review, mathmacrotemplate);
        } else
-               d.toolbars_->update(false, false, false);
+               d.toolbars_->update(false, false, false, false);
 
        // update read-only status of open dialogs.
        checkStatus();
@@ -874,7 +883,7 @@ void GuiView::updateDialog(string const & name, string const & data)
        if (!isDialogVisible(name))
                return;
 
-       std::map<string, DialogPtr>::const_iterator it = d.dialogs_.find(name);
+       map<string, DialogPtr>::const_iterator it = d.dialogs_.find(name);
        if (it == d.dialogs_.end())
                return;
 
@@ -936,6 +945,14 @@ FuncStatus GuiView::getStatus(FuncRequest const & cmd)
                buf = 0;
 
        switch(cmd.action) {
+       case LFUN_BUFFER_WRITE:
+               enable = buf && (buf->isUnnamed() || !buf->isClean());
+               break;
+
+       case LFUN_BUFFER_WRITE_AS:
+               enable = buf;
+               break;
+
        case LFUN_TOOLBAR_TOGGLE:
                flag.setOnOff(d.toolbars_->visible(cmd.getArg(0)));
                break;
@@ -1018,6 +1035,314 @@ FuncStatus GuiView::getStatus(FuncRequest const & cmd)
 }
 
 
+static FileName selectTemplateFile()
+{
+       FileDialog dlg(_("Select template file"));
+       dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
+       dlg.setButton1(_("Templates|#T#t"), from_utf8(lyxrc.template_path));
+
+       FileDialog::Result result =
+               dlg.open(from_utf8(lyxrc.template_path),
+                            FileFilterList(_("LyX Documents (*.lyx)")),
+                            docstring());
+
+       if (result.first == FileDialog::Later)
+               return FileName();
+       if (result.second.empty())
+               return FileName();
+       return FileName(to_utf8(result.second));
+}
+
+
+void GuiView::newDocument(string const & filename, bool from_template)
+{
+       FileName initpath(lyxrc.document_path);
+       Buffer * buf = buffer();
+       if (buf) {
+               FileName const trypath(buf->filePath());
+               // If directory is writeable, use this as default.
+               if (trypath.isDirWritable())
+                       initpath = trypath;
+       }
+
+       string templatefile = from_template ?
+               selectTemplateFile().absFilename() : string();
+       Buffer * b;
+       if (filename.empty())
+               b = newUnnamedFile(templatefile, initpath);
+       else
+               b = newFile(filename, templatefile, true);
+
+       if (b)
+               setBuffer(b);
+       // Ensure the cursor is correctly positionned on screen.
+       view()->showCursor();
+}
+
+
+void GuiView::insertLyXFile(docstring const & fname)
+{
+       BufferView * bv = view();
+       if (!bv)
+               return;
+
+       // FIXME UNICODE
+       FileName filename(to_utf8(fname));
+       
+       if (!filename.empty()) {
+               bv->insertLyXFile(filename);
+               return;
+       }
+
+       // Launch a file browser
+       // FIXME UNICODE
+       string initpath = lyxrc.document_path;
+       string const trypath = bv->buffer().filePath();
+       // If directory is writeable, use this as default.
+       if (FileName(trypath).isDirWritable())
+               initpath = trypath;
+
+       // FIXME UNICODE
+       FileDialog dlg(_("Select LyX document to insert"), LFUN_FILE_INSERT);
+       dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
+       dlg.setButton2(_("Examples|#E#e"),
+               from_utf8(addPath(package().system_support().absFilename(),
+               "examples")));
+
+       FileDialog::Result result =
+               dlg.open(from_utf8(initpath),
+                            FileFilterList(_("LyX Documents (*.lyx)")),
+                            docstring());
+
+       if (result.first == FileDialog::Later)
+               return;
+
+       // FIXME UNICODE
+       filename.set(to_utf8(result.second));
+
+       // check selected filename
+       if (filename.empty()) {
+               // emit message signal.
+               message(_("Canceled."));
+               return;
+       }
+
+       bv->insertLyXFile(filename);
+}
+
+
+void GuiView::insertPlaintextFile(docstring const & fname,
+       bool asParagraph)
+{
+       BufferView * bv = view();
+       if (!bv)
+               return;
+
+       // FIXME UNICODE
+       FileName filename(to_utf8(fname));
+       
+       if (!filename.empty()) {
+               bv->insertPlaintextFile(filename, asParagraph);
+               return;
+       }
+
+       FileDialog dlg(_("Select file to insert"), (asParagraph ?
+               LFUN_FILE_INSERT_PLAINTEXT_PARA : LFUN_FILE_INSERT_PLAINTEXT));
+
+       FileDialog::Result result = dlg.open(from_utf8(bv->buffer().filePath()),
+               FileFilterList(), docstring());
+
+       if (result.first == FileDialog::Later)
+               return;
+
+       // FIXME UNICODE
+       filename.set(to_utf8(result.second));
+
+       // check selected filename
+       if (filename.empty()) {
+               // emit message signal.
+               message(_("Canceled."));
+               return;
+       }
+
+       bv->insertPlaintextFile(filename, asParagraph);
+}
+
+
+bool GuiView::renameBuffer(Buffer & b, docstring const & newname)
+{
+       FileName fname = b.fileName();
+       FileName const oldname = fname;
+
+       if (!newname.empty()) {
+               // FIXME UNICODE
+               fname = makeAbsPath(to_utf8(newname), oldname.onlyPath().absFilename());
+       } else {
+               // Switch to this Buffer.
+               setBuffer(&b);
+
+               /// No argument? Ask user through dialog.
+               // FIXME UNICODE
+               FileDialog dlg(_("Choose a filename to save document as"),
+                                  LFUN_BUFFER_WRITE_AS);
+               dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
+               dlg.setButton2(_("Templates|#T#t"), from_utf8(lyxrc.template_path));
+
+               if (!isLyXFilename(fname.absFilename()))
+                       fname.changeExtension(".lyx");
+
+               FileFilterList const filter(_("LyX Documents (*.lyx)"));
+
+               FileDialog::Result result =
+                       dlg.save(from_utf8(fname.onlyPath().absFilename()),
+                                    filter,
+                                    from_utf8(fname.onlyFileName()));
+
+               if (result.first == FileDialog::Later)
+                       return false;
+
+               fname.set(to_utf8(result.second));
+
+               if (fname.empty())
+                       return false;
+
+               if (!isLyXFilename(fname.absFilename()))
+                       fname.changeExtension(".lyx");
+       }
+
+       if (FileName(fname).exists()) {
+               docstring const file = makeDisplayPath(fname.absFilename(), 30);
+               docstring text = bformat(_("The document %1$s already "
+                                          "exists.\n\nDo you want to "
+                                          "overwrite that document?"), 
+                                        file);
+               int const ret = Alert::prompt(_("Overwrite document?"),
+                       text, 0, 2, _("&Overwrite"), _("&Rename"), _("&Cancel"));
+               switch (ret) {
+               case 0: break;
+               case 1: return renameBuffer(b, docstring());
+               case 2: return false;
+               }
+       }
+
+       // Ok, change the name of the buffer
+       b.setFileName(fname.absFilename());
+       b.markDirty();
+       bool unnamed = b.isUnnamed();
+       b.setUnnamed(false);
+       b.saveCheckSum(fname);
+
+       if (!saveBuffer(b)) {
+               b.setFileName(oldname.absFilename());
+               b.setUnnamed(unnamed);
+               b.saveCheckSum(oldname);
+               return false;
+       }
+
+       return true;
+}
+
+
+bool GuiView::saveBuffer(Buffer & b)
+{
+       if (b.isUnnamed())
+               return renameBuffer(b, docstring());
+
+       if (b.save()) {
+               LyX::ref().session().lastFiles().add(b.fileName());
+               return true;
+       }
+
+       // Switch to this Buffer.
+       setBuffer(&b);
+
+       // FIXME: we don't tell the user *WHY* the save failed !!
+       docstring const file = makeDisplayPath(b.absFileName(), 30);
+       docstring text = bformat(_("The document %1$s could not be saved.\n\n"
+                                  "Do you want to rename the document and "
+                                  "try again?"), file);
+       int const ret = Alert::prompt(_("Rename and save?"),
+               text, 0, 2, _("&Rename"), _("&Retry"), _("&Cancel"));
+       switch (ret) {
+       case 0:
+               if (!renameBuffer(b, docstring()))
+                       return false;
+               break;
+       case 1:
+               return false;
+       case 2:
+               break;
+       }
+
+       return saveBuffer(b);
+}
+
+
+bool GuiView::closeBuffer()
+{
+       Buffer * buf = buffer();
+       return buf && closeBuffer(*buf);
+}
+
+
+bool GuiView::closeBuffer(Buffer & buf)
+{
+       if (buf.isClean() || buf.paragraphs().empty()) {
+               theBufferList().release(&buf);
+               return true;
+       }
+       // Switch to this Buffer.
+       setBuffer(&buf);
+
+       docstring file;
+       // FIXME: Unicode?
+       if (buf.isUnnamed())
+               file = from_utf8(buf.fileName().onlyFileName());
+       else
+               file = buf.fileName().displayName(30);
+
+       docstring const text = bformat(_("The document %1$s has unsaved changes."
+               "\n\nDo you want to save the document or discard the changes?"), file);
+       int const ret = Alert::prompt(_("Save changed document?"),
+               text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
+
+       switch (ret) {
+       case 0:
+               if (!saveBuffer(buf))
+                       return false;
+               break;
+       case 1:
+               // if we crash after this we could
+               // have no autosave file but I guess
+               // this is really improbable (Jug)
+               removeAutosaveFile(buf.absFileName());
+               break;
+       case 2:
+               return false;
+       }
+
+       // save file names to .lyx/session
+       // if master/slave are both open, do not save slave since it
+       // will be automatically loaded when the master is loaded
+       if (buf.masterBuffer() == &buf)
+               LyX::ref().session().lastOpened().add(buf.fileName());
+
+       theBufferList().release(&buf);
+       return true;
+}
+
+
+bool GuiView::quitWriteAll()
+{
+       while (!theBufferList().empty()) {
+               Buffer * b = theBufferList().first();
+               if (!closeBuffer(*b))
+                       return false;
+       }
+       return true;
+}
+
+
 bool GuiView::dispatch(FuncRequest const & cmd)
 {
        BufferView * bv = view();       
@@ -1049,9 +1374,49 @@ bool GuiView::dispatch(FuncRequest const & cmd)
                        break;
 
                case LFUN_MENU_OPEN:
-                       d.menubar_->openByName(toqstr(cmd.argument()));
+                       if (QMenu * menu = guiApp->menus().menu(toqstr(cmd.argument())))
+                               menu->exec(QCursor::pos());
+                       break;
+
+               case LFUN_FILE_INSERT:
+                       insertLyXFile(cmd.argument());
+                       break;
+               case LFUN_FILE_INSERT_PLAINTEXT_PARA:
+                       insertPlaintextFile(cmd.argument(), true);
+                       break;
+
+               case LFUN_FILE_INSERT_PLAINTEXT:
+                       insertPlaintextFile(cmd.argument(), false);
                        break;
 
+               case LFUN_BUFFER_WRITE:
+                       if (bv)
+                               saveBuffer(bv->buffer());
+                       break;
+
+               case LFUN_BUFFER_WRITE_AS:
+                       if (bv)
+                               renameBuffer(bv->buffer(), cmd.argument());
+                       break;
+
+               case LFUN_BUFFER_WRITE_ALL: {
+                       Buffer * first = theBufferList().first();
+                       if (!first)
+                               break;
+                       message(_("Saving all documents..."));
+                       // We cannot use a for loop as the buffer list cycles.
+                       Buffer * b = first;
+                       do {
+                               if (b->isClean())
+                                       continue;
+                               saveBuffer(*b);
+                               LYXERR(Debug::ACTION, "Saved " << b->absFileName());
+                               b = theBufferList().next(b);
+                       } while (b != first); 
+                       message(_("All documents saved."));
+                       break;
+               }
+
                case LFUN_TOOLBAR_TOGGLE: {
                        string const name = cmd.getArg(0);
                        bool const allowauto = cmd.getArg(1) == "allowauto";
@@ -1228,7 +1593,7 @@ private:
 
 bool isValidName(string const & name)
 {
-       return std::find_if(dialognames, end_dialognames,
+       return find_if(dialognames, end_dialognames,
                            cmpCStr(name.c_str())) != end_dialognames;
 }
 
@@ -1240,7 +1605,7 @@ void GuiView::resetDialogs()
        // Make sure that no LFUN uses any LyXView.
        theLyXFunc().setLyXView(0);
        d.toolbars_->init();
-       d.menubar_->init();
+       guiApp->menus().fillMenuBar(this);
        if (d.layout_)
                d.layout_->updateContents(true);
        // Now update controls with current buffer.
@@ -1254,13 +1619,16 @@ Dialog * GuiView::find_or_build(string const & name)
        if (!isValidName(name))
                return 0;
 
-       std::map<string, DialogPtr>::iterator it = d.dialogs_.find(name);
+       map<string, DialogPtr>::iterator it = d.dialogs_.find(name);
 
        if (it != d.dialogs_.end())
                return it->second.get();
 
-       d.dialogs_[name].reset(build(name));
-       return d.dialogs_[name].get();
+       Dialog * dialog = build(name);
+       d.dialogs_[name].reset(dialog);
+       if (lyxrc.allow_geometry_session)
+               dialog->restoreSession();
+       return dialog;
 }
 
 
@@ -1283,7 +1651,7 @@ void GuiView::showDialog(string const & name, string const & data,
 
 bool GuiView::isDialogVisible(string const & name) const
 {
-       std::map<string, DialogPtr>::const_iterator it = d.dialogs_.find(name);
+       map<string, DialogPtr>::const_iterator it = d.dialogs_.find(name);
        if (it == d.dialogs_.end())
                return false;
        return it->second.get()->isVisibleView();
@@ -1299,7 +1667,7 @@ void GuiView::hideDialog(string const & name, Inset * inset)
        if (quitting)
                return;
 
-       std::map<string, DialogPtr>::const_iterator it = d.dialogs_.find(name);
+       map<string, DialogPtr>::const_iterator it = d.dialogs_.find(name);
        if (it == d.dialogs_.end())
                return;
 
@@ -1308,7 +1676,7 @@ void GuiView::hideDialog(string const & name, Inset * inset)
 
        Dialog * const dialog = it->second.get();
        if (dialog->isVisibleView())
-               dialog->hide();
+               dialog->hideView();
        d.open_insets_[name] = 0;
 }
 
@@ -1328,46 +1696,48 @@ Inset * GuiView::getOpenInset(string const & name) const
        if (!isValidName(name))
                return 0;
 
-       std::map<string, Inset *>::const_iterator it = d.open_insets_.find(name);
+       map<string, Inset *>::const_iterator it = d.open_insets_.find(name);
        return it == d.open_insets_.end() ? 0 : it->second;
 }
 
 
 void GuiView::hideAll() const
 {
-       std::map<string, DialogPtr>::const_iterator it  = d.dialogs_.begin();
-       std::map<string, DialogPtr>::const_iterator end = d.dialogs_.end();
+       map<string, DialogPtr>::const_iterator it  = d.dialogs_.begin();
+       map<string, DialogPtr>::const_iterator end = d.dialogs_.end();
 
        for(; it != end; ++it)
-               it->second->hide();
+               it->second->hideView();
 }
 
 
 void GuiView::hideBufferDependent() const
 {
-       std::map<string, DialogPtr>::const_iterator it  = d.dialogs_.begin();
-       std::map<string, DialogPtr>::const_iterator end = d.dialogs_.end();
+       map<string, DialogPtr>::const_iterator it  = d.dialogs_.begin();
+       map<string, DialogPtr>::const_iterator end = d.dialogs_.end();
 
        for(; it != end; ++it) {
                Dialog * dialog = it->second.get();
                if (dialog->isBufferDependent())
-                       dialog->hide();
+                       dialog->hideView();
        }
 }
 
 
 void GuiView::updateBufferDependent(bool switched) const
 {
-       std::map<string, DialogPtr>::const_iterator it  = d.dialogs_.begin();
-       std::map<string, DialogPtr>::const_iterator end = d.dialogs_.end();
+       map<string, DialogPtr>::const_iterator it  = d.dialogs_.begin();
+       map<string, DialogPtr>::const_iterator end = d.dialogs_.end();
 
        for(; it != end; ++it) {
                Dialog * dialog = it->second.get();
+               if (!dialog->isVisibleView())
+                       continue;
                if (switched && dialog->isBufferDependent()) {
-                       if (dialog->isVisibleView() && dialog->initialiseParams(""))
+                       if (dialog->initialiseParams(""))
                                dialog->updateView();
                        else
-                               dialog->hide();
+                               dialog->hideView();
                } else {
                        // A bit clunky, but the dialog will request
                        // that the kernel provides it with the necessary
@@ -1380,8 +1750,8 @@ void GuiView::updateBufferDependent(bool switched) const
 
 void GuiView::checkStatus()
 {
-       std::map<string, DialogPtr>::const_iterator it  = d.dialogs_.begin();
-       std::map<string, DialogPtr>::const_iterator end = d.dialogs_.end();
+       map<string, DialogPtr>::const_iterator it  = d.dialogs_.begin();
+       map<string, DialogPtr>::const_iterator end = d.dialogs_.end();
 
        for(; it != end; ++it) {
                Dialog * const dialog = it->second.get();