#include "Font.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "support/gettext.h"
#include "LyX.h"
#include "LyXFunc.h"
#include "LyXRC.h"
#include "support/ExceptionMessage.h"
#include "support/FileName.h"
#include "support/ForkedCalls.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/os.h"
#include "support/Package.h"
QCoreApplication::setApplicationName(app_name + "-" + lyx_version);
//FIXME: quitOnLastWindowClosed is true by default, at least on Windows and
- // X11 platform. We should have a setting for this in order to let the
- // application to stay resident.
+ // X11 platforms. We should have a lyxrc setting for this in order to let the
+ // application stay resident.
/*
if (lyxrc.quit_on_last_window_closed)
setQuitOnLastWindowClosed(false);
void GuiApplication::createView(QString const & geometry_arg)
{
+ if (global_menubar_)
+ global_menubar_->releaseKeyboard();
+
+ // create new view
updateIds(views_, view_ids_);
int id = 0;
while (views_.find(id) != views_.end())
id++;
- views_[id] = new GuiView(id);
- updateIds(views_, view_ids_);
+ GuiView * view = new GuiView(id);
+
+ // copy the icon size from old view
+ if (viewCount() > 0)
+ view->setIconSize(current_view_->iconSize());
- GuiView * view = views_[id];
+ // register view
+ views_[id] = view;
+ updateIds(views_, view_ids_);
+
theLyXFunc().setLyXView(view);
-
view->show();
if (!geometry_arg.isEmpty()) {
#ifdef Q_WS_WIN
return QApplication::notify(receiver, event);
}
catch (ExceptionMessage const & e) {
- if (e.type_ == ErrorException) {
+ switch(e.type_) {
+ case ErrorException:
+ LyX::cref().emergencyCleanup();
+ setQuitOnLastWindowClosed(false);
+ closeAllViews();
Alert::error(e.title_, e.details_);
- LyX::cref().exit(1);
- } else if (e.type_ == WarningException) {
- Alert::warning(e.title_, e.details_);
+#ifndef NDEBUG
+ // Properly crash in debug mode in order to get a useful backtrace.
+ abort();
+#endif
+ // In release mode, try to exit gracefully.
+ this->exit(1);
+
+ case BufferException: {
+ Buffer * buf = current_view_->buffer();
+ docstring details = e.details_ + '\n';
+ details += theBufferList().emergencyWrite(buf);
+ theBufferList().release(buf);
+ details += _("\nThe current document was closed.");
+ Alert::error(e.title_, details);
return false;
}
+ case WarningException:
+ Alert::warning(e.title_, e.details_);
+ return false;
+ };
}
catch (exception const & e) {
docstring s = _("LyX has caught an exception, it will now "
}
+void GuiApplication::readMenus(Lexer & lex)
+{
+ menus().read(lex);
+}
+
+
+bool GuiApplication::searchMenu(FuncRequest const & func,
+ vector<docstring> & names) const
+{
+ return menus().searchMenu(func, names);
+}
+
+
////////////////////////////////////////////////////////////////////////
// X11 specific stuff goes here...
#ifdef Q_WS_X11