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 2be31a4ffc4aff2343b140fab629afdfb53798f0..e1fddaaa7e0f2660b4e3380d61c3e73fb3205e03 100644 (file)
--- a/src/frontends/qt4/Dialog.cpp
+++ b/src/frontends/qt4/Dialog.cpp
@@ -16,16 +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 <boost/assert.hpp>
+#include <QValidator>
 
 #include <string>
 
@@ -35,9 +44,8 @@ using namespace lyx::support;
 namespace lyx {
 namespace frontend {
 
-
-Dialog::Dialog(GuiView & lv, string const & name, QString const & title)
-       : name_(name), title_(title), lyxview_(&lv)
+Dialog::Dialog(GuiView & lv, QString const & name, QString const & title)
+       : name_(name), title_(title), lyxview_(lv)
 {}
 
 
@@ -45,15 +53,9 @@ Dialog::~Dialog()
 {}
 
 
-string const & Dialog::name() const
-{
-       return name_;
-}
-
-
 bool Dialog::canApply() const
 {
-       FuncRequest const fr(getLfun(), from_ascii(name_));
+       FuncRequest const fr(getLfun(), fromqstr(name_));
        FuncStatus const fs(getStatus(fr));
        return fs.enabled();
 }
@@ -61,77 +63,70 @@ bool Dialog::canApply() const
 
 void Dialog::dispatch(FuncRequest const & fr) const
 {
-       theLyXFunc().setLyXView(lyxview_);
        lyx::dispatch(fr);
 }
 
 
 void Dialog::updateDialog() const
 {
-       dispatch(FuncRequest(LFUN_DIALOG_UPDATE, from_ascii(name_)));
+       dispatch(FuncRequest(LFUN_DIALOG_UPDATE, fromqstr(name_)));
 }
 
 
 void Dialog::disconnect() const
 {
-       lyxview_->disconnectDialog(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();
 }
 
 
-string const Dialog::bufferFilepath() const
+QString Dialog::bufferFilePath() const
 {
-       return buffer().filePath();
+       return toqstr(buffer().filePath());
 }
 
 
 KernelDocType Dialog::docType() const
 {
-       if (buffer().isLatex())
+       if (buffer().params().isLatex())
                return LATEX;
-       if (buffer().isLiterate())
+       if (buffer().params().isLiterate())
                return LITERATE;
 
        return DOCBOOK;
 }
 
 
-BufferView * Dialog::bufferview()
-{
-       return lyxview_->view();
-}
-
-
 BufferView const * Dialog::bufferview() const
 {
-       return lyxview_->view();
+       return lyxview_.currentBufferView();
 }
 
 
-Buffer & Dialog::buffer()
+Buffer const & Dialog::buffer() const
 {
-       BOOST_ASSERT(lyxview_->buffer());
-       return *lyxview_->buffer();
+       LAPPERR(lyxview_.currentBufferView());
+       return lyxview_.currentBufferView()->buffer();
 }
 
 
-Buffer const & Dialog::buffer() const
+Buffer const & Dialog::documentBuffer() const
 {
-       BOOST_ASSERT(lyxview_->buffer());
-       return *lyxview_->buffer();
+       LAPPERR(lyxview_.documentBufferView());
+       return lyxview_.documentBufferView()->buffer();
 }
 
 
@@ -169,30 +164,11 @@ void Dialog::apply()
 }
 
 
-void Dialog::updateData(string const & data)
+void Dialog::prepareView()
 {
-       if (isBufferDependent() && !isBufferAvailable())
-               return;
-
-       if (!initialiseParams(data)) {
-               LYXERR0("Dialog \"" << name()
-                      << "\" could not be initialized");
-               return;
-       }
-
-       updateView();
-}
-
-
-void Dialog::showView()
-{
-       // Make sure the dialog is up-to-date.
-       updateView(); 
        // Make sure the dialog controls are correctly enabled/disabled with
        // readonly status.
        checkStatus();
-       if (exitEarly())
-               return;
 
        QWidget * w = asQWidget();
        w->setWindowTitle(title_);
@@ -200,14 +176,27 @@ void Dialog::showView()
        QSize const hint = w->sizeHint();
        if (hint.height() >= 0 && hint.width() >= 0)
                w->setMinimumSize(hint);
+}
 
+
+void Dialog::showView()
+{
+       prepareView();
+
+       QWidget * w = asQWidget();
        if (w->isVisible()) {
                w->raise();
                w->activateWindow();
        } else
                w->show();
 
-       w->setFocus();
+       if (wantInitialFocus())
+               w->setFocus();
+       else {
+               lyxview_.raise();
+               lyxview_.activateWindow();
+               lyxview_.setFocus();
+       }
 }
 
 
@@ -228,12 +217,37 @@ 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);
+       // 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())
+       if (!isBufferDependent()) {
+               updateView();
                return;
+       }
 
        // deactivate the dialog if we have no buffer
        if (!isBufferAvailable()) {
@@ -244,13 +258,11 @@ void Dialog::checkStatus()
        // check whether this dialog may be active
        if (canApply()) {
                bool const readonly = isBufferReadonly();
-               enableView(!readonly);
+               enableView(!readonly || canApplyToReadOnly());
                // refreshReadOnly() is too generous in _enabling_ widgets
                // update dialog to disable disabled widgets again
 
-               if (!readonly || canApplyToReadOnly())
-                       updateView();
-
+               updateView();
        } else
                enableView(false);
 }
@@ -258,8 +270,8 @@ void Dialog::checkStatus()
 
 QString Dialog::sessionKey() const
 {
-       return "view-" + QString::number(lyxview_->id())
-               + "/" + toqstr(name());
+       return "views/" + QString::number(lyxview_.id())
+               + "/" + name();
 }