}
case LFUN_DIALOG_TOGGLE:
- flag.setOnOff(lyx_view_->isDialogVisible(cmd.getArg(0)));
+ flag.setOnOff(lyx_view_?
+ lyx_view_->isDialogVisible(cmd.getArg(0)) : false);
// fall through to set "enable"
case LFUN_DIALOG_SHOW: {
string const name = cmd.getArg(0);
break;
case LFUN_TOOLBAR_TOGGLE: {
- bool const current = lyx_view_->isToolbarVisible(cmd.getArg(0));
+ bool const current = lyx_view_?
+ lyx_view_->isToolbarVisible(cmd.getArg(0)) : false;
flag.setOnOff(current);
break;
}
// For Drag&Drop.
setAcceptDrops(true);
- init();
+ setMinimumSize(300, 200);
+ // GuiToolbars *must* be initialised before GuiMenubar.
+ d.toolbars_ = new GuiToolbars(*this);
+ d.toolbars_->init();
+ d.menubar_ = new GuiMenubar(this, menubackend);
+
+ statusBar()->setSizeGripEnabled(true);
+
+ QObject::connect(&statusbar_timer_, SIGNAL(timeout()),
+ this, SLOT(clearMessage()));
+
+ d.setBackground();
+
+ if (!lyxrc.allow_geometry_session)
+ setGeometry(50, 50, 690, 510);
+
+ // Now take care of session management.
+ QSettings settings;
+ QString const key = "view-" + QString::number(id);
+#ifdef Q_WS_X11
+ QPoint pos = settings.value(key + "/pos", QPoint(50, 50)).toPoint();
+ QSize size = settings.value(key + "/size", QSize(690, 510)).toSize();
+ resize(size);
+ move(pos);
+#else
+ if (!restoreGeometry(settings.value(key + "/geometry").toByteArray()))
+ setGeometry(50, 50, 690, 510);
+#endif
+ setIconSize(settings.value(key + "/icon_size").toSize());
}
}
-void GuiView::init()
-{
- setMinimumSize(300, 200);
- // GuiToolbars *must* be initialised before GuiMenubar.
- d.toolbars_ = new GuiToolbars(*this);
- // FIXME: GuiToolbars::init() cannot be integrated in the ctor
- // because LyXFunc::getStatus() needs a properly initialized
- // GuiToolbars object (for LFUN_TOOLBAR_TOGGLE).
- d.toolbars_->init();
- d.menubar_ = new GuiMenubar(this, menubackend);
-
- statusBar()->setSizeGripEnabled(true);
-
- QObject::connect(&statusbar_timer_, SIGNAL(timeout()),
- this, SLOT(clearMessage()));
-
- d.setBackground();
-
- if (!lyxrc.allow_geometry_session)
- setGeometry(50, 50, 690, 510);
-
- // Now take care of session management.
- QSettings settings;
- QString const key = "view-" + QString::number(id());
-#ifdef Q_WS_X11
- QPoint pos = settings.value(key + "/pos", QPoint(50, 50)).toPoint();
- QSize size = settings.value(key + "/size", QSize(690, 510)).toSize();
- resize(size);
- move(pos);
-#else
- if (!restoreGeometry(settings.value(key + "/geometry").toByteArray()))
- setGeometry(50, 50, 690, 510);
-#endif
- setIconSize(settings.value(key + "/icon_size").toSize());
-}
-
-
void GuiView::showEvent(QShowEvent * e)
{
LYXERR(Debug::GUI, "Passed Geometry "