#include "qt_helpers.h"
#include "GuiImage.h"
+#include "GuiKeySymbol.h"
#include "GuiView.h"
#include "frontends/alert.h"
#include "Session.h"
#include "version.h"
+#include "support/assert.h"
#include "support/debug.h"
#include "support/ExceptionMessage.h"
#include "support/FileName.h"
}
};
+class GlobalMenuBar : public QMenuBar
+{
+public:
+ ///
+ GlobalMenuBar() : QMenuBar(0) {}
+
+ ///
+ bool event(QEvent * e)
+ {
+ if (e->type() == QEvent::ShortcutOverride) {
+ // && activeWindow() == 0) {
+ QKeyEvent * ke = static_cast<QKeyEvent*>(e);
+ KeySymbol sym;
+ setKeySymbol(&sym, ke);
+ theLyXFunc().processKeySym(sym, q_key_state(ke->modifiers()));
+ e->accept();
+ return true;
+ }
+ return false;
+ }
+};
///////////////////////////////////////////////////////////////
// You can find more platform specific stuff
GuiApplication::GuiApplication(int & argc, char ** argv)
- : QApplication(argc, argv), Application(), current_view_(0)
+ : QApplication(argc, argv), Application(), current_view_(0), global_menubar_(0)
{
QString app_name = "LyX";
QCoreApplication::setOrganizationName(app_name);
QCoreApplication::setOrganizationDomain("lyx.org");
QCoreApplication::setApplicationName(app_name + "-" + lyx_version);
- //FIXME: quitOnLastWindowClosed is true by default, at least on Windows and
- // X11 platforms. We should have a lyxrc setting for this in order to let the
- // application stay resident.
+ // FIXME: quitOnLastWindowClosed is true by default. We should have a
+ // lyxrc setting for this in order to let the application stay resident.
+ // But then we need some kind of dock icon, at least on Windows.
/*
if (lyxrc.quit_on_last_window_closed)
setQuitOnLastWindowClosed(false);
*/
-
+#ifdef Q_WS_MACX
+ // FIXME: Do we need a lyxrc setting for this on Mac? This behaviour
+ // seems to be the default case for applications like LyX.
+ setQuitOnLastWindowClosed(false);
+#endif
+
#ifdef Q_WS_X11
// doubleClickInterval() is 400 ms on X11 which is just too long.
// On Windows and Mac OS X, the operating system's value is used.
<< fromqstr(language_name));
#ifdef Q_WS_MACX
- // all windows in a Mac application share the same menu bar.
- QMenuBar *menuBar = new QMenuBar(0);
// This allows to translate the strings that appear in the LyX menu.
addMenuTranslator();
#endif
+ connect(this, SIGNAL(lastWindowClosed()), this, SLOT(onLastWindowClosed()));
using namespace lyx::graphics;
connect(&general_timer_, SIGNAL(timeout()),
this, SLOT(handleRegularEvents()));
general_timer_.start();
+
+#ifdef Q_WS_MACX
+ if (global_menubar_ == 0) {
+ // Create the global default menubar which is shown for the dialogs
+ // and if no GuiView is visible.
+ global_menubar_ = new GlobalMenuBar();
+ }
+#endif
}
case LFUN_LYX_QUIT:
// quitting is triggered by the gui code
// (leaving the event loop).
- current_view_->message(from_utf8(N_("Exiting.")));
+ if (current_view_)
+ current_view_->message(from_utf8(N_("Exiting.")));
if (closeAllViews())
quit();
break;
case LFUN_BUFFER_NEW:
if (viewCount() == 0
- || (!lyxrc.single_window && current_view_->buffer() != 0))
- createView();
- current_view_->newDocument(to_utf8(cmd.argument()), false);
+ || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
+ createView(QString(), false); // keep hidden
+ current_view_->newDocument(to_utf8(cmd.argument()), false);
+ current_view_->show();
+ setActiveWindow(current_view_);
+ } else
+ current_view_->newDocument(to_utf8(cmd.argument()), false);
break;
case LFUN_BUFFER_NEW_TEMPLATE:
if (viewCount() == 0
- || (!lyxrc.single_window && current_view_->buffer() != 0)) {
+ || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
createView();
current_view_->newDocument(to_utf8(cmd.argument()), true);
if (!current_view_->buffer())
case LFUN_FILE_OPEN:
if (viewCount() == 0
- || (!lyxrc.single_window && current_view_->buffer() != 0)) {
+ || (!lyxrc.open_buffers_in_tabs && current_view_->buffer() != 0)) {
createView();
current_view_->openDocument(to_utf8(cmd.argument()));
if (!current_view_->buffer())
}
-void GuiApplication::createView(QString const & geometry_arg)
+void GuiApplication::createView(QString const & geometry_arg, bool autoShow)
{
+ // release the keyboard which might have been grabed by the global
+ // menubar on Mac to catch shortcuts even without any GuiView.
+ if (global_menubar_)
+ global_menubar_->releaseKeyboard();
+
// create new view
updateIds(views_, view_ids_);
int id = 0;
// register view
views_[id] = view;
updateIds(views_, view_ids_);
-
- theLyXFunc().setLyXView(view);
- view->show();
+
+ if (autoShow) {
+ view->show();
+ setActiveWindow(view);
+ }
+
if (!geometry_arg.isEmpty()) {
#ifdef Q_WS_WIN
int x, y;
#endif
}
view->setFocus();
- setActiveWindow(view);
- setCurrentView(*view);
+ setCurrentView(view);
}
docstring details = e.details_ + '\n';
details += theBufferList().emergencyWrite(buf);
theBufferList().release(buf);
- details += _("\nThe current document was closed.");
+ details += "\n" + _("The 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 "
bool GuiApplication::unregisterView(int id)
{
updateIds(views_, view_ids_);
- BOOST_ASSERT(views_.find(id) != views_.end());
- BOOST_ASSERT(views_[id]);
+ LASSERT(views_.find(id) != views_.end(), /**/);
+ LASSERT(views_[id], /**/);
map<int, GuiView *>::iterator it;
for (it = views_.begin(); it != views_.end(); ++it) {
GuiView & GuiApplication::view(int id) const
{
- BOOST_ASSERT(views_.find(id) != views_.end());
+ LASSERT(views_.find(id) != views_.end(), /**/);
return *views_.find(id)->second;
}
}
+void GuiApplication::initGlobalMenu()
+{
+ if (global_menubar_)
+ menus().fillMenuBar(global_menubar_, 0, true);
+}
+
+
+void GuiApplication::onLastWindowClosed()
+{
+ if (global_menubar_)
+ global_menubar_->grabKeyboard();
+}
+
+
////////////////////////////////////////////////////////////////////////
+//
// X11 specific stuff goes here...
+
#ifdef Q_WS_X11
bool GuiApplication::x11EventFilter(XEvent * xev)
{
} // namespace frontend
+void hideDialogs(std::string const & name, Inset * inset)
+{
+ if (theApp())
+ theApp()->hideDialogs(name, inset);
+}
+
+
////////////////////////////////////////////////////////////////////
//
// Font stuff
frontend::FontLoader & theFontLoader()
{
- BOOST_ASSERT(frontend::guiApp);
+ LASSERT(frontend::guiApp, /**/);
return frontend::guiApp->fontLoader();
}
frontend::FontMetrics const & theFontMetrics(FontInfo const & f)
{
- BOOST_ASSERT(frontend::guiApp);
+ LASSERT(frontend::guiApp, /**/);
return frontend::guiApp->fontLoader().metrics(f);
}
+////////////////////////////////////////////////////////////////////
+//
+// Misc stuff
+//
+////////////////////////////////////////////////////////////////////
+
frontend::Clipboard & theClipboard()
{
- BOOST_ASSERT(frontend::guiApp);
+ LASSERT(frontend::guiApp, /**/);
return frontend::guiApp->clipboard();
}
frontend::Selection & theSelection()
{
- BOOST_ASSERT(frontend::guiApp);
+ LASSERT(frontend::guiApp, /**/);
return frontend::guiApp->selection();
}
projects / lyx.git / blobdiff