void Dialog::dispatch(FuncRequest const & fr) const
{
- theLyXFunc().setLyXView(lyxview_);
lyx::dispatch(fr);
}
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();
}
}
-BufferView * Dialog::bufferview()
-{
- return lyxview_->view();
-}
-
-
BufferView const * Dialog::bufferview() const
{
- return lyxview_->view();
-}
-
-
-Buffer & Dialog::buffer()
-{
- LASSERT(lyxview_->buffer(), /**/);
- return *lyxview_->buffer();
+ return lyxview_->currentBufferView();
}
Buffer const & Dialog::buffer() const
{
- LASSERT(lyxview_->buffer(), /**/);
- return *lyxview_->buffer();
+ LASSERT(lyxview_->currentBufferView(), /**/);
+ return lyxview_->currentBufferView()->buffer();
}
}
-void Dialog::showView()
+void Dialog::prepareView()
{
// Make sure the dialog controls are correctly enabled/disabled with
// readonly status.
checkStatus();
- if (exitEarly())
- return;
QWidget * w = asQWidget();
w->setWindowTitle(title_);
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();
+ }
}
}
-Inset * Dialog::inset(InsetCode code) const
+Inset const * Dialog::inset(InsetCode code) const
{
Inset * ins = bufferview()->cursor().innerInsetOfType(code);
if (!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();
// 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);
}
QString Dialog::sessionKey() const
{
- return "view-" + QString::number(lyxview_->id())
+ return "views/" + QString::number(lyxview_->id())
+ "/" + name();
}