#include <QTextCodec>
#include <QTimer>
#include <QTranslator>
-#if QT_VERSION >= 0x040300
+#if QT_VERSION >= 0x040400
#include <QThreadPool>
#endif
#include <QWidget>
#include <objidl.h>
#endif // Q_WS_WIN
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <boost/crc.hpp>
#include <exception>
{
static bool initialized = false;
if (!initialized) {
- Q_INIT_RESOURCE(Resources);
+ Q_INIT_RESOURCE(Resources);
initialized = true;
}
}
}
}
#endif
- return new frontend::GuiApplication(argc, argv);
+ frontend::GuiApplication * guiApp = new frontend::GuiApplication(argc, argv);
+ // I'd rather do that in the constructor, but I do not think that
+ // the palette is accessible there.
+ guiApp->colorCache().setPalette(guiApp->palette());
+ return guiApp;
}
namespace frontend {
QString name1;
QString name2;
QString path;
- switch (f.action) {
+ switch (f.action()) {
case LFUN_MATH_INSERT:
if (!f.argument().empty()) {
path = "math/";
}
}
default:
- name2 = toqstr(lyxaction.getActionName(f.action));
+ name2 = toqstr(lyxaction.getActionName(f.action()));
name1 = name2;
if (!f.argument().empty()) {
}
}
- FileName fname = libFileSearch("images/" + path, name1, "png");
+ QString imagedir = "images/" + path;
+ FileName fname = imageLibFileSearch(imagedir, name1, "png");
if (fname.exists())
- return toqstr(fname.absFilename());
+ return toqstr(fname.absFileName());
- fname = libFileSearch("images/" + path, name2, "png");
+ fname = imageLibFileSearch(imagedir, name2, "png");
if (fname.exists())
- return toqstr(fname.absFilename());
+ return toqstr(fname.absFileName());
path = ":/images/" + path;
QDir res(path);
if (!res.exists()) {
- LYXERR0("Directory " << path << " not found in resource!");
+ LYXERR0("Directory " << path << " not found in resource!");
return QString();
}
name1 += ".png";
LYXERR(Debug::GUI, "Cannot find icon with filename "
<< "\"" << name1 << "\""
<< " or filename "
- << "\"" << name2 << "\""
+ << "\"" << name2 << "\""
<< " for command \""
- << lyxaction.getActionName(f.action)
+ << lyxaction.getActionName(f.action())
<< '(' << to_utf8(f.argument()) << ")\"");
if (unknown) {
- fname = libFileSearch(QString("images/"), "unknown", "png");
+ imagedir = "images/";
+ fname = imageLibFileSearch(imagedir, "unknown", "png");
if (fname.exists())
- return toqstr(fname.absFilename());
+ return toqstr(fname.absFileName());
return QString(":/images/unknown.png");
}
QPixmap getPixmap(QString const & path, QString const & name, QString const & ext)
{
QPixmap pixmap;
- FileName fname = libFileSearch(path, name, ext);
- QString path1 = toqstr(fname.absFilename());
+ QString imagedir = path;
+ FileName fname = imageLibFileSearch(imagedir, name, ext);
+ QString path1 = toqstr(fname.absFileName());
QString path2 = ":/" + path + name + "." + ext;
if (pixmap.load(path1)) {
: QTranslator(parent)
{}
- QString translate(const char * /*context*/,
- const char * sourceText,
- const char * /*comment*/ = 0)
+ QString translate(const char * /*context*/,
+ const char * sourceText,
+ const char * /*comment*/ = 0)
{
string const s = sourceText;
- if (s == N_("About %1") || s == N_("Preferences")
+ if (s == N_("About %1") || s == N_("Preferences")
|| s == N_("Reconfigure") || s == N_("Quit %1"))
return qt_(s);
- else
+ else
return QString();
}
};
public:
///
GlobalMenuBar() : QMenuBar(0) {}
-
+
///
bool event(QEvent * e)
{
{
switch (formatetc.cfFormat) {
case CF_ENHMETAFILE:
- return emfMimeType();
+ return emfMimeType();
case CF_METAFILEPICT:
return wmfMimeType();
}
// 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);
-
// This allows to translate the strings that appear in the LyX menu.
/// A translator suitable for the entries in the LyX menu.
/// Only needed with Qt/Mac.
installTranslator(new MenuTranslator(this));
#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.
this, SLOT(handleRegularEvents()));
d->general_timer_.start();
-#if QT_VERSION >= 0x040300
+#if QT_VERSION >= 0x040400
// maxThreadCount() defaults in general to 2 on single or dual-processor.
// This is clearly not enough in a time where we use threads for
// document preview and/or export. 20 should be OK.
}
-docstring GuiApplication::iconName(FuncRequest const & f, bool unknown)
+docstring Application::iconName(FuncRequest const & f, bool unknown)
{
return qstring_to_ucs4(lyx::frontend::iconName(f, unknown));
}
FuncStatus GuiApplication::getStatus(FuncRequest const & cmd) const
{
- FuncStatus flag;
+ FuncStatus status;
- if (cmd.action == LFUN_NOACTION) {
- flag.message(from_utf8(N_("Nothing to do")));
- flag.setEnabled(false);
- return flag;
+ BufferView * bv = 0;
+ BufferView * doc_bv = 0;
+
+ if (cmd.action() == LFUN_NOACTION) {
+ status.message(from_utf8(N_("Nothing to do")));
+ status.setEnabled(false);
}
- if (cmd.action == LFUN_UNKNOWN_ACTION) {
- flag.unknown(true);
- flag.setEnabled(false);
- flag.message(from_utf8(N_("Unknown action")));
- return flag;
+ else if (cmd.action() == LFUN_UNKNOWN_ACTION) {
+ status.setUnknown(true);
+ status.message(from_utf8(N_("Unknown action")));
+ status.setEnabled(false);
+ }
+
+ // Does the GuiApplication know something?
+ else if (getStatus(cmd, status)) { }
+
+ // If we do not have a GuiView, then other functions are disabled
+ else if (!current_view_)
+ status.setEnabled(false);
+
+ // Does the GuiView know something?
+ else if (current_view_->getStatus(cmd, status)) { }
+
+ // In LyX/Mac, when a dialog is open, the menus of the
+ // application can still be accessed without giving focus to
+ // the main window. In this case, we want to disable the menu
+ // entries that are buffer or view-related.
+ //FIXME: Abdel (09/02/10) This has very bad effect on Linux, don't know why...
+ /*
+ else if (cmd.origin() == FuncRequest::MENU && !current_view_->hasFocus())
+ status.setEnabled(false);
+ */
+
+ // If we do not have a BufferView, then other functions are disabled
+ else if (!(bv = current_view_->currentBufferView()))
+ status.setEnabled(false);
+
+ // Does the current BufferView know something?
+ else if (bv->getStatus(cmd, status)) { }
+
+ // Does the current Buffer know something?
+ else if (bv->buffer().getStatus(cmd, status)) { }
+
+ // If we do not have a document BufferView, different from the
+ // current BufferView, then other functions are disabled
+ else if (!(doc_bv = current_view_->documentBufferView()) || doc_bv == bv)
+ status.setEnabled(false);
+
+ // Does the document Buffer know something?
+ else if (doc_bv->buffer().getStatus(cmd, status)) { }
+
+ else {
+ LYXERR(Debug::ACTION, "LFUN not handled in getStatus(): " << cmd);
+ status.message(from_utf8(N_("Command not handled")));
+ status.setEnabled(false);
}
+ // the default error message if we disable the command
+ if (!status.enabled() && status.message().empty())
+ status.message(from_utf8(N_("Command disabled")));
+
+ return status;
+}
+
+
+bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
+{
// I would really like to avoid having this switch and rather try to
// encode this in the function itself.
// -- And I'd rather let an inset decide which LFUNs it is willing
// to handle (Andre')
bool enable = true;
- switch (cmd.action) {
+ switch (cmd.action()) {
// This could be used for the no-GUI version. The GUI version is handled in
// GuiView::getStatus(). See above.
// argument contains ';'-terminated commands
string const firstcmd = token(to_utf8(cmd.argument()), ';', 0);
FuncRequest func(lyxaction.lookupFunc(firstcmd));
- func.origin = cmd.origin;
+ func.setOrigin(cmd.origin());
flag = getStatus(func);
break;
}
string first;
arg = split(arg, first, ';');
FuncRequest func(lyxaction.lookupFunc(first));
- func.origin = cmd.origin;
+ func.setOrigin(cmd.origin());
flag = getStatus(func);
// if this one is enabled, the whole thing is
if (flag.enabled())
FuncRequest func;
string name = to_utf8(cmd.argument());
if (theTopLevelCmdDef().lock(name, func)) {
- func.origin = cmd.origin;
+ func.setOrigin(cmd.origin());
flag = getStatus(func);
theTopLevelCmdDef().release(name);
} else {
break;
default:
- // Does the view know something?
- if (!current_view_) {
- enable = false;
- break;
- }
-
- if (current_view_->getStatus(cmd, flag))
- break;
-
- // In LyX/Mac, when a dialog is open, the menus of the
- // application can still be accessed without giving focus to
- // the main window. In this case, we want to disable the menu
- // entries that are buffer or view-related.
- //FIXME: Abdel (09/02/10) This has very bad effect on Linux, don't know why...
- /*
- if (cmd.origin == FuncRequest::MENU && !current_view_->hasFocus()) {
- enable = false;
- break;
- }
- */
-
- BufferView * bv = current_view_->currentBufferView();
- BufferView * doc_bv = current_view_->documentBufferView();
- // If we do not have a BufferView, then other functions are disabled
- if (!bv) {
- enable = false;
- break;
- }
- // try the BufferView
- bool decided = bv->getStatus(cmd, flag);
- if (!decided)
- // try the Buffer
- decided = bv->buffer().getStatus(cmd, flag);
- if (!decided && doc_bv)
- // try the Document Buffer
- decided = doc_bv->buffer().getStatus(cmd, flag);
+ return false;
}
if (!enable)
flag.setEnabled(false);
-
- // the default error message if we disable the command
- if (!flag.enabled() && flag.message().empty())
- flag.message(from_utf8(N_("Command disabled")));
-
- return flag;
+ return true;
}
/// make a post-dispatch status message
static docstring makeDispatchMessage(docstring const & msg,
FuncRequest const & cmd)
{
- const bool verbose = (cmd.origin == FuncRequest::MENU
- || cmd.origin == FuncRequest::TOOLBAR
- || cmd.origin == FuncRequest::COMMANDBUFFER);
+ const bool verbose = (cmd.origin() == FuncRequest::MENU
+ || cmd.origin() == FuncRequest::TOOLBAR
+ || cmd.origin() == FuncRequest::COMMANDBUFFER);
- if (cmd.action == LFUN_SELF_INSERT || !verbose) {
+ if (cmd.action() == LFUN_SELF_INSERT || !verbose) {
LYXERR(Debug::ACTION, "dispatch msg is " << msg);
return msg;
}
if (!dispatch_msg.empty())
dispatch_msg += ' ';
- docstring comname = from_utf8(lyxaction.getActionName(cmd.action));
+ docstring comname = from_utf8(lyxaction.getActionName(cmd.action()));
bool argsadded = false;
if (!cmd.argument().empty()) {
- if (cmd.action != LFUN_UNKNOWN_ACTION) {
+ if (cmd.action() != LFUN_UNKNOWN_ACTION) {
comname += ' ' + cmd.argument();
argsadded = true;
}
DispatchResult dr;
// redraw the screen at the end (first of the two drawing steps).
- //This is done unless explicitly requested otherwise
- dr.update(Update::FitCursor);
+ // This is done unless explicitly requested otherwise
+ dr.screenUpdate(Update::FitCursor);
dispatch(cmd, dr);
if (!current_view_)
BufferView * bv = current_view_->currentBufferView();
if (bv) {
+ if (dr.needBufferUpdate()) {
+ bv->cursor().clearBufferUpdate();
+ bv->buffer().updateBuffer();
+ }
// BufferView::update() updates the ViewMetricsInfo and
// also initializes the position cache for all insets in
// (at least partially) visible top-level paragraphs.
// We will redraw the screen only if needed.
- bv->processUpdateFlags(dr.update());
+ bv->processUpdateFlags(dr.screenUpdate());
// Do we have a selection?
theSelection().haveSelection(bv->cursor().selection());
// update gui
current_view_->restartCursor();
}
- // Some messages may already be translated, so we cannot use _()
- current_view_->message(makeDispatchMessage(
- translateIfPossible(dr.message()), cmd));
+ if (dr.needMessageUpdate()) {
+ // Some messages may already be translated, so we cannot use _()
+ current_view_->message(makeDispatchMessage(
+ translateIfPossible(dr.message()), cmd));
+ }
}
-void GuiApplication::gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer)
+void GuiApplication::gotoBookmark(unsigned int idx, bool openFile,
+ bool switchToBuffer)
{
- GuiView * lv = current_view_;
- LASSERT(lv, /**/);
if (!theSession().bookmarks().isValid(idx))
return;
- BookmarksSection::Bookmark const & bm = theSession().bookmarks().bookmark(idx);
+ BookmarksSection::Bookmark const & bm =
+ theSession().bookmarks().bookmark(idx);
LASSERT(!bm.filename.empty(), /**/);
- string const file = bm.filename.absFilename();
+ string const file = bm.filename.absFileName();
// if the file is not opened, open it.
if (!theBufferList().exists(bm.filename)) {
if (openFile)
dispatch(FuncRequest(LFUN_BOOKMARK_SAVE, "0"));
// if the current buffer is not that one, switch to it.
- if (!lv->documentBufferView()
- || lv->documentBufferView()->buffer().fileName() != tmp.filename) {
- if (!switchToBuffer)
+ BufferView * doc_bv = current_view_ ?
+ current_view_->documentBufferView() : 0;
+ if (!doc_bv || doc_bv->buffer().fileName() != tmp.filename) {
+ if (switchToBuffer) {
+ dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
+ if (!current_view_)
+ return;
+ doc_bv = current_view_->documentBufferView();
+ } else
return;
- dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file));
}
// moveToPosition try paragraph id first and then paragraph (pit, pos).
- if (!lv->documentBufferView()->moveToPosition(
- tmp.bottom_pit, tmp.bottom_pos, tmp.top_id, tmp.top_pos))
+ if (!doc_bv->moveToPosition(
+ tmp.bottom_pit, tmp.bottom_pos, tmp.top_id, tmp.top_pos))
return;
// bm changed
return;
// Cursor jump succeeded!
- Cursor const & cur = lv->documentBufferView()->cursor();
+ Cursor const & cur = doc_bv->cursor();
pit_type new_pit = cur.pit();
pos_type new_pos = cur.pos();
int new_id = cur.paragraph().id();
// This function runs "configure" and then rereads lyx.defaults to
// reconfigure the automatic settings.
-static void reconfigure(GuiView * lv, string const & option)
+void GuiApplication::reconfigure(string const & option)
{
// emit message signal.
- if (lv)
- lv->message(_("Running configure..."));
+ if (current_view_)
+ current_view_->message(_("Running configure..."));
// Run configure in user lyx directory
PathChanger p(package().user_support());
int ret = one.startscript(Systemcall::Wait, configure_command);
p.pop();
// emit message signal.
- if (lv)
- lv->message(_("Reloading configuration..."));
- lyxrc.read(libFileSearch(QString(), "lyxrc.defaults"));
+ if (current_view_)
+ current_view_->message(_("Reloading configuration..."));
+ lyxrc.read(libFileSearch(QString(), "lyxrc.defaults"), false);
// Re-read packages.lst
LaTeXFeatures::getAvailable();
"not be able to work properly.\n"
"Please reconfigure again if needed."));
else
-
Alert::information(_("System reconfigured"),
_("The system has been reconfigured.\n"
"You need to restart LyX to make use of any\n"
"updated document class specifications."));
}
-
+void GuiApplication::validateCurrentView()
+{
+ if (!d->views_.empty() && !current_view_) {
+ // currently at least one view exists but no view has the focus.
+ // choose the last view to make it current.
+ // a view without any open document is preferred.
+ GuiView * candidate = 0;
+ QHash<int, GuiView *>::const_iterator it = d->views_.begin();
+ QHash<int, GuiView *>::const_iterator end = d->views_.end();
+ for (; it != end; ++it) {
+ candidate = *it;
+ if (!candidate->documentBufferView())
+ break;
+ }
+ setCurrentView(candidate);
+ }
+}
void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
{
string const argument = to_utf8(cmd.argument());
- FuncCode const action = cmd.action;
+ FuncCode const action = cmd.action();
LYXERR(Debug::ACTION, "cmd: " << cmd);
LYXERR(Debug::ACTION, "action "
<< lyxaction.getActionName(action)
<< " [" << action << "] is disabled at this location");
- if (current_view_)
- current_view_->restartCursor();
dr.setMessage(flag.message());
dr.setError(true);
dr.dispatched(false);
- dr.update(Update::None);
+ dr.screenUpdate(Update::None);
+ dr.clearBufferUpdate();
return;
};
// Assumes that the action will be dispatched.
dr.dispatched(true);
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_WINDOW_NEW:
createView(toqstr(cmd.argument()));
// clear the last opened list, because
// maybe this will end the session
theSession().lastOpened().clear();
- current_view_->close();
+ // check for valid current_view_
+ validateCurrentView();
+ if (current_view_)
+ current_view_->closeScheduled();
break;
case LFUN_LYX_QUIT:
}
case LFUN_BUFFER_NEW:
+ validateCurrentView();
if (d->views_.empty()
|| (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
createView(QString(), false); // keep hidden
break;
case LFUN_BUFFER_NEW_TEMPLATE:
+ validateCurrentView();
if (d->views_.empty()
|| (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
createView();
}
break;
- case LFUN_FILE_OPEN:
+ case LFUN_FILE_OPEN: {
+ validateCurrentView();
// FIXME: create a new method shared with LFUN_HELP_OPEN.
- if (d->views_.empty()
- || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) {
- string const fname = to_utf8(cmd.argument());
+ string const fname = to_utf8(cmd.argument());
+ if (d->views_.empty() || (!lyxrc.open_buffers_in_tabs
+ && current_view_->documentBufferView() != 0)) {
// We want the ui session to be saved per document and not per
// window number. The filename crc is a good enough identifier.
boost::crc_32_type crc;
if (current_view_ && !current_view_->documentBufferView())
current_view_->close();
} else
- current_view_->openDocument(to_utf8(cmd.argument()));
+ current_view_->openDocument(fname);
break;
+ }
case LFUN_HELP_OPEN: {
// FIXME: create a new method shared with LFUN_FILE_OPEN.
break;
}
current_view_->message(bformat(_("Opening help file %1$s..."),
- makeDisplayPath(fname.absFilename())));
+ makeDisplayPath(fname.absFileName())));
Buffer * buf = current_view_->loadDocument(fname, false);
- if (buf) {
- current_view_->setBuffer(buf);
+
#ifndef DEVEL_VERSION
+ if (buf)
buf->setReadonly(true);
+#else
+ (void) buf;
#endif
- buf->updateBuffer();
- buf->errors("Parse");
- }
break;
}
string lyx_name;
string const x11_name = split(to_utf8(cmd.argument()), lyx_name, ' ');
if (lyx_name.empty() || x11_name.empty()) {
- current_view_->message(
+ if (current_view_)
+ current_view_->message(
_("Syntax: set-color <lyx_name> <x11_name>"));
break;
}
+#if 0
+ // FIXME: The graphics cache no longer has a changeDisplay method.
string const graphicsbg = lcolor.getLyXName(Color_graphicsbg);
- bool const graphicsbg_changed =
+ bool const graphicsbg_changed =
lyx_name == graphicsbg && x11_name != graphicsbg;
- if (graphicsbg_changed) {
- // FIXME: The graphics cache no longer has a changeDisplay method.
-#if 0
+ if (graphicsbg_changed)
graphics::GCache::get().changeDisplay(true);
#endif
- }
if (!lcolor.setColor(lyx_name, x11_name)) {
- current_view_->message(
- bformat(_("Set-color \"%1$s\" failed "
+ if (current_view_)
+ current_view_->message(
+ bformat(_("Set-color \"%1$s\" failed "
"- color is undefined or "
"may not be redefined"),
from_utf8(lyx_name)));
LyXRC const lyxrc_orig = lyxrc;
istringstream ss(to_utf8(cmd.argument()));
- bool const success = lyxrc.read(ss) == 0;
+ bool const success = lyxrc.read(ss);
if (!success) {
lyxerr << "Warning in LFUN_LYXRC_APPLY!\n"
}
actOnUpdatedPrefs(lyxrc_orig, lyxrc);
- setSpellChecker();
resetGui();
break;
GuiView * gv = currentView();
if (gv && gv->currentBufferView())
// cancel any selection
- lyx::dispatch(FuncRequest(LFUN_MARK_OFF));
+ processFuncRequest(FuncRequest(LFUN_MARK_OFF));
dr.setMessage(from_ascii(N_("Cancel")));
break;
}
// --- Menus -----------------------------------------------
case LFUN_RECONFIGURE:
// argument is any additional parameter to the configure.py command
- reconfigure(currentView(), to_utf8(cmd.argument()));
+ reconfigure(to_utf8(cmd.argument()));
break;
// --- lyxserver commands ----------------------------
case LFUN_SERVER_GET_FILENAME: {
- GuiView * lv = currentView();
- LASSERT(lv && lv->documentBufferView(), return);
- docstring const fname = from_utf8(
- lv->documentBufferView()->buffer().absFileName());
- dr.setMessage(fname);
- LYXERR(Debug::INFO, "FNAME[" << fname << ']');
+ if (current_view_ && current_view_->documentBufferView()) {
+ docstring const fname = from_utf8(
+ current_view_->documentBufferView()->buffer().absFileName());
+ dr.setMessage(fname);
+ LYXERR(Debug::INFO, "FNAME[" << fname << ']');
+ } else {
+ dr.setMessage(docstring());
+ LYXERR(Debug::INFO, "No current file for LFUN_SERVER_GET_FILENAME");
+ }
break;
}
+
case LFUN_SERVER_NOTIFY: {
docstring const dispatch_buffer = d->keyseq.print(KeySequence::Portable);
dr.setMessage(dispatch_buffer);
string first;
arg = split(arg, first, ';');
FuncRequest func(lyxaction.lookupFunc(first));
- func.origin = cmd.origin;
+ func.setOrigin(cmd.origin());
dispatch(func);
}
// the buffer may have been closed by one action
string first;
arg = split(arg, first, ';');
FuncRequest func(lyxaction.lookupFunc(first));
- func.origin = cmd.origin;
- FuncStatus stat = getStatus(func);
+ func.setOrigin(cmd.origin());
+ FuncStatus const stat = getStatus(func);
if (stat.enabled()) {
dispatch(func);
break;
case LFUN_CALL: {
FuncRequest func;
if (theTopLevelCmdDef().lock(argument, func)) {
- func.origin = cmd.origin;
+ func.setOrigin(cmd.origin());
dispatch(func);
theTopLevelCmdDef().release(argument);
} else {
- if (func.action == LFUN_UNKNOWN_ACTION) {
+ if (func.action() == LFUN_UNKNOWN_ACTION) {
// unknown command definition
lyxerr << "Warning: unknown command definition `"
<< argument << "'"
case LFUN_PREFERENCES_SAVE:
lyxrc.write(support::makeAbsPath("preferences",
- package().user_support().absFilename()), false);
+ package().user_support().absFileName()), false);
break;
case LFUN_BUFFER_SAVE_AS_DEFAULT: {
- string const fname = addName(addPath(package().user_support().absFilename(),
+ string const fname = addName(addPath(package().user_support().absFileName(),
"templates/"), "defaults.lyx");
Buffer defaults(fname);
case LFUN_BOOKMARK_GOTO:
// go to bookmark, open unopened file and switch to buffer if necessary
gotoBookmark(convert<unsigned int>(to_utf8(cmd.argument())), true, true);
- dr.update(Update::FitCursor);
+ dr.screenUpdate(Update::Force | Update::FitCursor);
break;
case LFUN_BOOKMARK_CLEAR:
break;
default:
- // Everything below is only for active window
- if (current_view_ == 0)
- break;
-
- // Let the current GuiView dispatch its own actions.
- current_view_->dispatch(cmd, dr);
- if (dr.dispatched())
- break;
-
- BufferView * bv = current_view_->currentBufferView();
- LASSERT(bv, /**/);
-
- // Let the current BufferView dispatch its own actions.
- bv->dispatch(cmd, dr);
- if (dr.dispatched())
- break;
-
- BufferView * doc_bv = current_view_->documentBufferView();
- // Try with the document BufferView dispatch if any.
- if (doc_bv) {
- doc_bv->dispatch(cmd, dr);
- if (dr.dispatched())
- break;
- }
-
- // OK, so try the current Buffer itself...
- bv->buffer().dispatch(cmd, dr);
- if (dr.dispatched())
- break;
-
- // and with the document Buffer.
- if (doc_bv) {
- doc_bv->buffer().dispatch(cmd, dr);
- if (dr.dispatched())
- break;
- }
-
- // Let the current Cursor dispatch its own actions.
- Cursor old = bv->cursor();
- bv->cursor().dispatch(cmd);
-
- // notify insets we just left
- if (bv->cursor() != old) {
- old.fixIfBroken();
- bool badcursor = notifyCursorLeavesOrEnters(old, bv->cursor());
- if (badcursor)
- bv->cursor().fixIfBroken();
- }
-
- // update completion. We do it here and not in
- // processKeySym to avoid another redraw just for a
- // changed inline completion
- if (cmd.origin == FuncRequest::KEYBOARD) {
- if (cmd.action == LFUN_SELF_INSERT
- || (cmd.action == LFUN_ERT_INSERT && bv->cursor().inMathed()))
- current_view_->updateCompletion(bv->cursor(), true, true);
- else if (cmd.action == LFUN_CHAR_DELETE_BACKWARD)
- current_view_->updateCompletion(bv->cursor(), false, true);
- else
- current_view_->updateCompletion(bv->cursor(), false, false);
- }
-
- dr = bv->cursor().result();
+ // The LFUN must be for one of GuiView, BufferView, Buffer or Cursor;
+ // let's try that:
+ if (current_view_)
+ current_view_->dispatch(cmd, dr);
+ break;
}
-
- // if we executed a mutating lfun, mark the buffer as dirty
- Buffer * doc_buffer = (current_view_ && current_view_->documentBufferView())
- ? &(current_view_->documentBufferView()->buffer()) : 0;
- if (doc_buffer && theBufferList().isLoaded(doc_buffer)
- && flag.enabled()
- && !lyxaction.funcHasFlag(action, LyXAction::NoBuffer)
- && !lyxaction.funcHasFlag(action, LyXAction::ReadOnly))
- current_view_->currentBufferView()->buffer().markDirty();
}
d->keyseq.clear();
// copied verbatim from do_accent_char
bv->cursor().resetAnchor();
- bv->processUpdateFlags(Update::FitCursor);
}
// Do nothing if we have nothing (JMarc)
if (!keysym.isOK()) {
LYXERR(Debug::KEY, "Empty kbd action (probably composing)");
- current_view_->restartCursor();
+ if (current_view_)
+ current_view_->restartCursor();
return;
}
if (keysym.isModifier()) {
- LYXERR(Debug::KEY, "isModifier true");
if (current_view_)
current_view_->restartCursor();
return;
d->cancel_meta_seq.reset();
FuncRequest func = d->cancel_meta_seq.addkey(keysym, state);
- LYXERR(Debug::KEY, "action first set to [" << func.action << ']');
+ LYXERR(Debug::KEY, "action first set to [" << func.action() << ']');
// When not cancel or meta-fake, do the normal lookup.
// Note how the meta_fake Mod1 bit is OR-ed in and reset afterwards.
// Mostly, meta_fake_bit = NoModifier. RVDK_PATCH_5.
- if ((func.action != LFUN_CANCEL) && (func.action != LFUN_META_PREFIX)) {
+ if ((func.action() != LFUN_CANCEL) && (func.action() != LFUN_META_PREFIX)) {
// remove Caps Lock and Mod2 as a modifiers
func = d->keyseq.addkey(keysym, (state | d->meta_fake_bit));
- LYXERR(Debug::KEY, "action now set to [" << func.action << ']');
+ LYXERR(Debug::KEY, "action now set to [" << func.action() << ']');
}
// Dont remove this unless you know what you are doing.
d->meta_fake_bit = NoModifier;
// Can this happen now ?
- if (func.action == LFUN_NOACTION)
+ if (func.action() == LFUN_NOACTION)
func = FuncRequest(LFUN_COMMAND_PREFIX);
- LYXERR(Debug::KEY, " Key [action=" << func.action << "]["
+ LYXERR(Debug::KEY, " Key [action=" << func.action() << "]["
<< d->keyseq.print(KeySequence::Portable) << ']');
// already here we know if it any point in going further
// why not return already here if action == -1 and
// num_bytes == 0? (Lgb)
- if (d->keyseq.length() > 1)
+ if (d->keyseq.length() > 1 && current_view_)
current_view_->message(d->keyseq.print(KeySequence::ForGui));
// Maybe user can only reach the key via holding down shift.
// Let's see. But only if shift is the only modifier
- if (func.action == LFUN_UNKNOWN_ACTION && state == ShiftModifier) {
+ if (func.action() == LFUN_UNKNOWN_ACTION && state == ShiftModifier) {
LYXERR(Debug::KEY, "Trying without shift");
func = d->keyseq.addkey(keysym, NoModifier);
- LYXERR(Debug::KEY, "Action now " << func.action);
+ LYXERR(Debug::KEY, "Action now " << func.action());
}
- if (func.action == LFUN_UNKNOWN_ACTION) {
+ if (func.action() == LFUN_UNKNOWN_ACTION) {
// Hmm, we didn't match any of the keysequences. See
// if it's normal insertable text not already covered
// by a binding
FuncRequest::KEYBOARD);
} else {
LYXERR(Debug::KEY, "Unknown, !isText() - giving up");
- current_view_->message(_("Unknown function."));
- current_view_->restartCursor();
+ if (current_view_) {
+ current_view_->message(_("Unknown function."));
+ current_view_->restartCursor();
+ }
return;
}
}
- if (func.action == LFUN_SELF_INSERT) {
+ if (func.action() == LFUN_SELF_INSERT) {
if (encoded_last_key != 0) {
docstring const arg(1, encoded_last_key);
- lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, arg,
+ processFuncRequest(FuncRequest(LFUN_SELF_INSERT, arg,
FuncRequest::KEYBOARD));
LYXERR(Debug::KEY, "SelfInsert arg[`" << to_utf8(arg) << "']");
}
} else
- lyx::dispatch(func);
+ processFuncRequest(func);
+}
+
+
+void GuiApplication::processFuncRequest(FuncRequest const & func)
+{
+ lyx::dispatch(func);
}
-void GuiApplication::dispatchDelayed(FuncRequest const & func)
+void GuiApplication::processFuncRequestAsync(FuncRequest const & func)
+{
+ addToFuncRequestQueue(func);
+ processFuncRequestQueueAsync();
+}
+
+
+void GuiApplication::processFuncRequestQueue()
+{
+ while (!d->func_request_queue_.empty()) {
+ processFuncRequest(d->func_request_queue_.front());
+ d->func_request_queue_.pop();
+ }
+}
+
+
+void GuiApplication::processFuncRequestQueueAsync()
+{
+ QTimer::singleShot(0, this, SLOT(slotProcessFuncRequestQueue()));
+}
+
+
+void GuiApplication::addToFuncRequestQueue(FuncRequest const & func)
{
d->func_request_queue_.push(func);
- QTimer::singleShot(0, this, SLOT(processFuncRequestQueue()));
}
gv->resetDialogs();
}
- lyx::dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
+ processFuncRequest(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
}
}
-FontLoader & GuiApplication::fontLoader()
+FontLoader & GuiApplication::fontLoader()
{
return d->font_loader_;
}
-Toolbars const & GuiApplication::toolbars() const
+Toolbars const & GuiApplication::toolbars() const
{
return d->toolbars_;
}
Toolbars & GuiApplication::toolbars()
{
- return d->toolbars_;
+ return d->toolbars_;
}
-Menus const & GuiApplication::menus() const
+Menus const & GuiApplication::menus() const
{
return d->menus_;
}
Menus & GuiApplication::menus()
{
- return d->menus_;
+ return d->menus_;
}
// install translation file for Qt built-in dialogs
QString const language_name = QString("qt_") + default_locale.name();
- // language_name can be short (e.g. qt_zh) or long (e.g. qt_zh_CN).
+ // language_name can be short (e.g. qt_zh) or long (e.g. qt_zh_CN).
// Short-named translator can be loaded from a long name, but not the
// opposite. Therefore, long name should be used without truncation.
// c.f. http://doc.trolltech.com/4.1/qtranslator.html#load
}
-void GuiApplication::processFuncRequestQueue()
-{
- while (!d->func_request_queue_.empty()) {
- lyx::dispatch(d->func_request_queue_.back());
- d->func_request_queue_.pop();
- }
-}
-
-
void GuiApplication::execBatchCommands()
{
setGuiLanguage();
return;
#ifdef Q_WS_MACX
+#if QT_VERSION > 0x040600
+ setAttribute(Qt::AA_MacDontSwapCtrlAndMeta,lyxrc.mac_dontswap_ctrl_meta);
+#endif
// Create the global default menubar which is shown for the dialogs
// and if no GuiView is visible.
// This must be done after the session was recovered to know the "last files".
return;
Session & session = theSession();
- LastOpenedSection::LastOpened const & lastopened =
+ LastOpenedSection::LastOpened const & lastopened =
session.lastOpened().getfiles();
+ validateCurrentView();
+
FileName active_file;
// do not add to the lastfile list since these files are restored from
// last session, and should be already there (regular files), or should
if (d->views_.empty() || (!lyxrc.open_buffers_in_tabs
&& current_view_->documentBufferView() != 0)) {
boost::crc_32_type crc;
- string const & fname = file_name.absFilename();
+ string const & fname = file_name.absFileName();
crc = for_each(fname.begin(), fname.end(), crc);
createView(crc.checksum());
}
// Restore last active buffer
Buffer * buffer = theBufferList().getBuffer(active_file);
- if (buffer)
+ if (buffer && current_view_)
current_view_->setBuffer(buffer);
// clear this list to save a few bytes of RAM
// commands are not executed here yet and the gui is not ready
// therefore.
QFileOpenEvent * foe = static_cast<QFileOpenEvent *>(e);
- dispatchDelayed(FuncRequest(LFUN_FILE_OPEN, qstring_to_ucs4(foe->file())));
+ FuncRequest const fr(LFUN_FILE_OPEN, qstring_to_ucs4(foe->file()));
+ processFuncRequestAsync(fr);
e->accept();
return true;
}
return QApplication::notify(receiver, event);
}
catch (ExceptionMessage const & e) {
- switch(e.type_) {
+ switch(e.type_) {
case ErrorException:
emergencyCleanup();
setQuitOnLastWindowClosed(false);
this->exit(1);
case BufferException: {
- if (!current_view_->documentBufferView())
+ if (!current_view_ || !current_view_->documentBufferView())
return false;
Buffer * buf = ¤t_view_->documentBufferView()->buffer();
docstring details = e.details_ + '\n';
}
+bool Application::getRgbColorUncached(ColorCode col, RGBColor & rgbcol)
+{
+ QColor const qcol(lcolor.getX11Name(col).c_str());
+ if (!qcol.isValid()) {
+ rgbcol.r = 0;
+ rgbcol.g = 0;
+ rgbcol.b = 0;
+ return false;
+ }
+ rgbcol.r = qcol.red();
+ rgbcol.g = qcol.green();
+ rgbcol.b = qcol.blue();
+ return true;
+}
+
+
string const GuiApplication::hexName(ColorCode col)
{
return ltrim(fromqstr(d->color_cache_.get(col).name()), "#");
/// interaction.
/// We are changing that to close all wiew one by one.
/// FIXME: verify if the default implementation is enough now.
- if (sm.allowsInteraction() && !closeAllViews())
- sm.cancel();
+ #ifdef QT_NO_SESSIONMANAGER
+ #warning Qt is compiled without session manager
+ (void) sm;
+ #else
+ if (sm.allowsInteraction() && !closeAllViews())
+ sm.cancel();
+ #endif
}
QList<GuiView *> views = d->views_.values();
foreach (GuiView * view, views) {
- if (!view->close())
+ if (!view->closeScheduled())
return false;
}
}
+// Ensure that a file is read only once (prevents include loops)
+static QStringList uifiles;
+// store which ui files define Toolbars
+static QStringList toolbar_uifiles;
+
+
+GuiApplication::ReturnValues GuiApplication::readUIFile(FileName ui_path)
+{
+ enum {
+ ui_menuset = 1,
+ ui_toolbars,
+ ui_toolbarset,
+ ui_include,
+ ui_format,
+ ui_last
+ };
+
+ LexerKeyword uitags[] = {
+ { "format", ui_format },
+ { "include", ui_include },
+ { "menuset", ui_menuset },
+ { "toolbars", ui_toolbars },
+ { "toolbarset", ui_toolbarset }
+ };
+
+ Lexer lex(uitags);
+ lex.setFile(ui_path);
+ if (!lex.isOK()) {
+ lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
+ << endl;
+ }
+
+ if (lyxerr.debugging(Debug::PARSER))
+ lex.printTable(lyxerr);
+
+ bool error = false;
+ // format before introduction of format tag
+ unsigned int format = 0;
+ while (lex.isOK()) {
+ int const status = lex.lex();
+
+ // we have to do this check here, outside the switch,
+ // because otherwise we would start reading include files,
+ // e.g., if the first tag we hit was an include tag.
+ if (status == ui_format)
+ if (lex.next()) {
+ format = lex.getInteger();
+ continue;
+ }
+
+ // this will trigger unless the first tag we hit is a format
+ // tag, with the right format.
+ if (format != LFUN_FORMAT)
+ return FormatMismatch;
+
+ switch (status) {
+ case Lexer::LEX_FEOF:
+ continue;
+
+ case ui_include: {
+ lex.next(true);
+ QString const file = toqstr(lex.getString());
+ bool const success = readUIFile(file, true);
+ if (!success) {
+ LYXERR0("Failed to read inlcuded file: " << fromqstr(file));
+ return ReadError;
+ }
+ break;
+ }
+
+ case ui_menuset:
+ d->menus_.read(lex);
+ break;
+
+ case ui_toolbarset:
+ d->toolbars_.readToolbars(lex);
+ break;
+
+ case ui_toolbars:
+ d->toolbars_.readToolbarSettings(lex);
+ toolbar_uifiles.push_back(toqstr(ui_path.absFileName()));
+ break;
+
+ default:
+ if (!rtrim(lex.getString()).empty())
+ lex.printError("LyX::ReadUIFile: "
+ "Unknown menu tag: `$$Token'");
+ else
+ LYXERR0("Error with status: " << status);
+ error = true;
+ break;
+ }
+
+ }
+ return (error ? ReadError : ReadOK);
+}
+
+
bool GuiApplication::readUIFile(QString const & name, bool include)
{
LYXERR(Debug::INIT, "About to read " << name << "...");
return readUIFile(defaultUIFile, false);
}
- // Ensure that a file is read only once (prevents include loops)
- static QStringList uifiles;
- QString const uifile = toqstr(ui_path.absFilename());
+ QString const uifile = toqstr(ui_path.absFileName());
if (uifiles.contains(uifile)) {
if (!include) {
// We are reading again the top uifile so reset the safeguard:
LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
- enum {
- ui_menuset = 1,
- ui_toolbars,
- ui_toolbarset,
- ui_include,
- ui_last
- };
-
- LexerKeyword uitags[] = {
- { "include", ui_include },
- { "menuset", ui_menuset },
- { "toolbars", ui_toolbars },
- { "toolbarset", ui_toolbarset }
- };
-
- Lexer lex(uitags);
- lex.setFile(ui_path);
- if (!lex.isOK()) {
- lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
- << endl;
- }
-
- if (lyxerr.debugging(Debug::PARSER))
- lex.printTable(lyxerr);
-
- // store which ui files define Toolbars
- static QStringList toolbar_uifiles;
+ ReturnValues retval = readUIFile(ui_path);
- while (lex.isOK()) {
- switch (lex.lex()) {
- case ui_include: {
- lex.next(true);
- QString const file = toqstr(lex.getString());
- if (!readUIFile(file, true))
- return false;
- break;
+ if (retval == FormatMismatch) {
+ LYXERR(Debug::FILES, "Converting ui file to format " << LFUN_FORMAT);
+ FileName const tempfile = FileName::tempName("convert_ui");
+ bool const success = prefs2prefs(ui_path, tempfile, true);
+ if (!success) {
+ LYXERR0("Unable to convert " << ui_path.absFileName() <<
+ " to format " << LFUN_FORMAT << ".");
+ } else {
+ retval = readUIFile(tempfile);
+ tempfile.removeFile();
}
- case ui_menuset:
- d->menus_.read(lex);
- break;
-
- case ui_toolbarset:
- d->toolbars_.readToolbars(lex);
- break;
-
- case ui_toolbars:
- d->toolbars_.readToolbarSettings(lex);
- toolbar_uifiles.push_back(uifile);
- break;
+ }
- default:
- if (!rtrim(lex.getString()).empty())
- lex.printError("LyX::ReadUIFile: "
- "Unknown menu tag: `$$Token'");
- break;
- }
+ if (retval != ReadOK) {
+ LYXERR0("Unable to read UI file: " << ui_path.absFileName());
+ return false;
}
if (include)
projects / lyx.git / blobdiff