Account for old versions of Pygments

[lyx.git] / src / frontends / qt4 / Dialog.cpp

diff --git a/src/frontends/qt4/Dialog.cpp b/src/frontends/qt4/Dialog.cpp
index c1f91187b62f7fa11dfd60f7578e29f5dc9bc269..e1fddaaa7e0f2660b4e3380d61c3e73fb3205e03 100644 (file)
--- a/src/frontends/qt4/Dialog.cpp
+++ b/src/frontends/qt4/Dialog.cpp
@@ -16,19 +16,25 @@
 #include "qt_helpers.h"
 
 #include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "LyXFunc.h"
+#include "LyX.h"
 
 #include "insets/Inset.h"
 
 #include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lassert.h"
 
+#include <QLabel>
+#include <QLineEdit>
+#include <QList>
 #include <QSettings>
 #include <QString>
+#include <QValidator>
 
 #include <string>
 
@@ -38,9 +44,8 @@ using namespace lyx::support;
 namespace lyx {
 namespace frontend {
 
-
 Dialog::Dialog(GuiView & lv, QString const & name, QString const & title)
-       : name_(name), title_(title), lyxview_(&lv)
+       : name_(name), title_(title), lyxview_(lv)
 {}
 
 
@@ -58,7 +63,6 @@ bool Dialog::canApply() const
 
 void Dialog::dispatch(FuncRequest const & fr) const
 {
-       theLyXFunc().setLyXView(lyxview_);
        lyx::dispatch(fr);
 }
 
@@ -71,25 +75,25 @@ void Dialog::updateDialog() const
 
 void Dialog::disconnect() const
 {
-       lyxview_->disconnectDialog(fromqstr(name_));
+       lyxview_.disconnectDialog(fromqstr(name_));
 }
 
 
 bool Dialog::isBufferAvailable() const
 {
-       return lyxview_->buffer() != 0;
+       return lyxview_.currentBufferView() != 0;
 }
 
 
 bool Dialog::isBufferReadonly() const
 {
-       if (!lyxview_->buffer())
+       if (!lyxview_.documentBufferView())
                return true;
-       return lyxview_->buffer()->isReadonly();
+       return lyxview_.documentBufferView()->buffer().isReadonly();
 }
 
 
-QString Dialog::bufferFilepath() const
+QString Dialog::bufferFilePath() const
 {
        return toqstr(buffer().filePath());
 }
@@ -97,9 +101,9 @@ QString Dialog::bufferFilepath() const
 
 KernelDocType Dialog::docType() const
 {
-       if (buffer().isLatex())
+       if (buffer().params().isLatex())
                return LATEX;
-       if (buffer().isLiterate())
+       if (buffer().params().isLiterate())
                return LITERATE;
 
        return DOCBOOK;
@@ -108,14 +112,21 @@ KernelDocType Dialog::docType() const
 
 BufferView const * Dialog::bufferview() const
 {
-       return lyxview_->currentBufferView();
+       return lyxview_.currentBufferView();
 }
 
 
 Buffer const & Dialog::buffer() const
 {
-       LASSERT(lyxview_->buffer(), /**/);
-       return *lyxview_->buffer();
+       LAPPERR(lyxview_.currentBufferView());
+       return lyxview_.currentBufferView()->buffer();
+}
+
+
+Buffer const & Dialog::documentBuffer() const
+{
+       LAPPERR(lyxview_.documentBufferView());
+       return lyxview_.documentBufferView()->buffer();
 }
 
 
@@ -182,9 +193,9 @@ void Dialog::showView()
        if (wantInitialFocus())
                w->setFocus();
        else {
-               lyxview_->raise();
-               lyxview_->activateWindow();
-               lyxview_->setFocus();
+               lyxview_.raise();
+               lyxview_.activateWindow();
+               lyxview_.setFocus();
        }
 }
 
@@ -208,18 +219,30 @@ bool Dialog::isVisibleView() const
 
 Inset const * Dialog::inset(InsetCode code) const
 {
+       // ins: the innermost inset of the type we look for
+       //      that contains the cursor
        Inset * ins = bufferview()->cursor().innerInsetOfType(code);
-       if (!ins)
-               ins = bufferview()->cursor().nextInset();
-       if (!ins || ins->lyxCode() != code)
-               return 0;
+       // next: a potential inset at cursor position
+       Inset * next = bufferview()->cursor().nextInset();
+       // Check if next is of the type we look for
+       if (next)
+               if (next->lyxCode() != code)
+                       next = 0;
+       if (ins) {
+               // prefer next if it is of the requested type (bug 8716)
+               if (next)
+                       ins = next;
+       } else
+               // no containing inset of requested type
+               // use next (which might also be 0)
+               ins = next;
        return ins;
 }
 
 
 void Dialog::checkStatus()
 {
-       // buffer independant dialogs are always active.
+       // buffer independent dialogs are always active.
        // This check allows us leave canApply unimplemented for some dialogs.
        if (!isBufferDependent()) {
                updateView();
@@ -239,9 +262,7 @@ void Dialog::checkStatus()
                // refreshReadOnly() is too generous in _enabling_ widgets
                // update dialog to disable disabled widgets again
 
-               if (!readonly || canApplyToReadOnly())
-                       updateView();
-
+               updateView();
        } else
                enableView(false);
 }
@@ -249,7 +270,7 @@ void Dialog::checkStatus()
 
 QString Dialog::sessionKey() const
 {
-       return "views/" + QString::number(lyxview_->id())
+       return "views/" + QString::number(lyxview_.id())
                + "/" + name();
 }