#include "qt_helpers.h"
#include "Buffer.h"
+#include "BufferParams.h"
#include "BufferView.h"
#include "Cursor.h"
#include "FuncRequest.h"
#include "insets/Inset.h"
#include "support/debug.h"
+#include "support/gettext.h"
#include "support/lassert.h"
#include <QLabel>
namespace frontend {
Dialog::Dialog(GuiView & lv, QString const & name, QString const & title)
- : name_(name), title_(title), lyxview_(&lv)
+ : name_(name), title_(title), lyxview_(lv)
{}
void Dialog::disconnect() const
{
- lyxview_->disconnectDialog(fromqstr(name_));
+ lyxview_.disconnectDialog(fromqstr(name_));
}
bool Dialog::isBufferAvailable() const
{
- return lyxview_->currentBufferView() != 0;
+ return lyxview_.currentBufferView() != 0;
}
bool Dialog::isBufferReadonly() const
{
- if (!lyxview_->documentBufferView())
+ if (!lyxview_.documentBufferView())
return true;
- return lyxview_->documentBufferView()->buffer().isReadonly();
+ return lyxview_.documentBufferView()->buffer().isReadonly();
}
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 const * Dialog::bufferview() const
{
- return lyxview_->currentBufferView();
+ return lyxview_.currentBufferView();
}
Buffer const & Dialog::buffer() const
{
- LASSERT(lyxview_->currentBufferView(), /**/);
- return lyxview_->currentBufferView()->buffer();
+ LAPPERR(lyxview_.currentBufferView());
+ return lyxview_.currentBufferView()->buffer();
+}
+
+
+Buffer const & Dialog::documentBuffer() const
+{
+ LAPPERR(lyxview_.documentBufferView());
+ return lyxview_.documentBufferView()->buffer();
}
if (wantInitialFocus())
w->setFocus();
else {
- lyxview_->raise();
- lyxview_->activateWindow();
- lyxview_->setFocus();
+ lyxview_.raise();
+ lyxview_.activateWindow();
+ lyxview_.setFocus();
}
}
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;
}
QString Dialog::sessionKey() const
{
- return "views/" + QString::number(lyxview_->id())
+ return "views/" + QString::number(lyxview_.id())
+ "/" + name();
}