#include "Font.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
+#include "GuiWorkArea.h"
#include "Intl.h"
#include "KeyMap.h"
#include "Language.h"
-#include "LaTeXFeatures.h"
+#include "LaTeXPackages.h"
#include "Lexer.h"
#include "LyX.h"
#include "LyXAction.h"
#include "support/Messages.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
#include "support/Systemcall.h"
+#include "support/TempFile.h"
#ifdef Q_WS_MACX
+#include "support/AppleScript.h"
#include "support/linkback/LinkBackProxy.h"
#endif
#include <QClipboard>
#include <QDateTime>
#include <QDir>
+#include <QEvent>
#include <QEventLoop>
#include <QFileOpenEvent>
#include <QFileInfo>
#include <QHash>
#include <QIcon>
#include <QImageReader>
+#include <QKeyEvent>
#include <QLocale>
#include <QLibraryInfo>
#include <QList>
-#include <QMacPasteboardMime>
#include <QMenuBar>
#include <QMimeData>
#include <QObject>
#include <QRegExp>
#include <QSessionManager>
#include <QSettings>
+#include <QShowEvent>
#include <QSocketNotifier>
#include <QSortFilterProxyModel>
#include <QStandardItemModel>
#include <QTextCodec>
#include <QTimer>
#include <QTranslator>
-#if QT_VERSION >= 0x040400
#include <QThreadPool>
-#endif
#include <QWidget>
#ifdef Q_WS_X11
#include <objidl.h>
#endif // Q_WS_WIN
+#ifdef Q_WS_MACX
+#include <QMacPasteboardMime>
+#endif // Q_WS_MACX
+
#include "support/bind.h"
#include <boost/crc.hpp>
{
static bool initialized = false;
if (!initialized) {
- Q_INIT_RESOURCE(Resources);
+ Q_INIT_RESOURCE(Resources);
initialized = true;
}
}
return guiApp;
}
+
+void setLocale()
+{
+ QLocale theLocale;
+ if (lyxrc.gui_language == "auto") {
+ theLocale = QLocale::system();
+ } else {
+ Language const * l = languages.getLanguage(lyxrc.gui_language);
+ string const code = l ? l->code() : string();
+ theLocale = QLocale(toqstr(code));
+ }
+ string const code = fromqstr(theLocale.name());
+ // Qt tries to outsmart us and transforms en_US to C.
+ Messages::guiLanguage((code == "C") ? "en_US" : code);
+ QLocale::setDefault(theLocale);
+ setlocale(LC_NUMERIC, "C");
+}
+
+
namespace frontend {
// this must be sorted alphabetically
// Upper case comes before lower case
+// Please don't change the formatting, this list is parsed by
+// development/tools/generate_symbols_images.py.
PngMap sorted_png_map[] = {
+ { "Arrownot", "arrownot2"},
+ { "Arrowvert", "arrowvert2"},
+ { "Bowtie", "bowtie2" },
+ { "Box", "box2" },
{ "Bumpeq", "bumpeq2" },
+ { "CIRCLE", "circle3" },
{ "Cap", "cap2" },
+ { "CheckedBox", "checkedbox2" },
+ { "Circle", "circle2" },
+ { "Colonapprox", "colonapprox2" },
+ { "Coloneq", "coloneq2" },
+ { "Coloneqq", "coloneqq2" },
+ { "Colonsim", "colonsim2" },
{ "Cup", "cup2" },
+ { "DOWNarrow", "downarrow3" },
{ "Delta", "delta2" },
{ "Diamond", "diamond2" },
+ { "Doteq", "doteq2" },
{ "Downarrow", "downarrow2" },
+ { "Eqcolon", "eqcolon2" },
+ { "Eqqcolon", "eqqcolon2" },
{ "Gamma", "gamma2" },
+ { "Join", "join2" },
+ { "LEFTCIRCLE", "leftcircle3" },
+ { "LEFTarrow", "leftarrow3" },
+ { "LEFTcircle", "leftcircle4" },
+ { "LHD", "lhd2" },
{ "Lambda", "lambda2" },
+ { "Lbag", "lbag2"},
{ "Leftarrow", "leftarrow2" },
+ { "Leftcircle", "leftcircle2" },
{ "Leftrightarrow", "leftrightarrow2" },
+ { "Longarrownot", "longarrownot2"},
{ "Longleftarrow", "longleftarrow2" },
{ "Longleftrightarrow", "longleftrightarrow2" },
+ { "Longmapsfrom", "longmapsfrom2"},
+ { "Longmapsto", "longmapsto2"},
{ "Longrightarrow", "longrightarrow2" },
+ { "Mapsfrom", "mapsfrom2"},
+ { "Mapsfromchar", "mapsfromchar2"},
+ { "Mapsto", "mapsto2"},
+ { "Mapstochar", "mapstochar2"},
{ "Omega", "omega2" },
{ "Phi", "phi2" },
{ "Pi", "pi2" },
{ "Psi", "psi2" },
+ { "RHD", "rhd2" },
+ { "RIGHTCIRCLE", "rightcircle3" },
+ { "RIGHTarrow", "rightarrow3" },
+ { "RIGHTcircle", "rightcircle4" },
+ { "Rbag", "rbag2"},
{ "Rightarrow", "rightarrow2" },
+ { "Rightcircle", "rightcircle2" },
{ "Sigma", "sigma2" },
+ { "Square", "square2" },
{ "Subset", "subset2" },
{ "Supset", "supset2" },
{ "Theta", "theta2" },
+ { "Thorn", "thorn2" },
+ { "UParrow", "uparrow3" },
{ "Uparrow", "uparrow2" },
{ "Updownarrow", "updownarrow2" },
{ "Upsilon", "upsilon2" },
{ "Vdash", "vdash3" },
{ "Vert", "vert2" },
+ { "XBox", "xbox3" },
+ { "Xbox", "xbox2" },
{ "Xi", "xi2" },
{ "nLeftarrow", "nleftarrow2" },
{ "nLeftrightarrow", "nleftrightarrow2" },
{ "nRightarrow", "nrightarrow2" },
{ "nVDash", "nvdash3" },
+ { "nVdash", "nvdash4" },
{ "nvDash", "nvdash2" },
{ "textrm \\AA", "textrm_AA"},
{ "textrm \\O", "textrm_O"},
- { "vDash", "vdash2" }
+ { "vDash", "vdash2" },
+ { "varDelta", "vardelta2" },
+ { "varGamma", "vargamma2" },
+ { "varLambda", "varlambda2" },
+ { "varOmega", "varomega2" },
+ { "varPhi", "varphi2" },
+ { "varPi", "varpi2" },
+ { "varPsi", "varpsi2" },
+ { "varSigma", "varsigma2" },
+ { "varTheta", "vartheta2" },
+ { "varUpsilon", "varupsilon2" },
+ { "varXi", "varxi2" }
};
+
size_t const nr_sorted_png_map = sizeof(sorted_png_map) / sizeof(PngMap);
+// This list specifies which system's theme icon is related to which lyx
+// command. It was based on:
+// http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
+// this must be sorted alphabetically
+// Upper case comes before lower case
+PngMap sorted_theme_icon_map[] = {
+ { "bookmark-goto 0", "go-jump" },
+ { "buffer-new", "document-new" },
+ { "buffer-print", "document-print" },
+ { "buffer-write", "document-save" },
+ { "buffer-write-as", "document-save-as" },
+ { "buffer-zoom-in", "zoom-in" },
+ { "buffer-zoom-out", "zoom-out" },
+ { "copy", "edit-copy" },
+ { "cut", "edit-cut" },
+ { "depth-decrement", "format-indent-less" },
+ { "depth-increment", "format-indent-more" },
+ { "dialog-show print", "document-print" },
+ { "dialog-show spellchecker", "tools-check-spelling" },
+ { "dialog-show-new-inset graphics", "insert-image" },
+ { "dialog-toggle findreplaceadv", "edit-find-replace" },
+ { "file-open", "document-open" },
+ { "font-bold", "format-text-bold" },
+ { "font-ital", "format-text-italic" },
+ { "font-strikeout", "format-text-strikethrough" },
+ { "font-underline", "format-text-underline" },
+ { "lyx-quit", "application-exit" },
+ { "paste", "edit-paste" },
+ { "redo", "edit-redo" },
+ { "undo", "edit-undo" },
+ { "window-close", "window-close" },
+ { "window-new", "window-new" }
+};
+
+size_t const nr_sorted_theme_icon_map = sizeof(sorted_theme_icon_map) / sizeof(PngMap);
+
QString findPng(QString const & name)
{
PngMap const * const begin = sorted_png_map;
PngMap const * const end = begin + nr_sorted_png_map;
- LASSERT(sorted(begin, end), /**/);
+ LATTEST(sorted(begin, end));
PngMap const * const it = find_if(begin, end, CompareKey(name));
} // namespace anon
+QString themeIconName(QString const & action)
+{
+ PngMap const * const begin = sorted_theme_icon_map;
+ PngMap const * const end = begin + nr_sorted_theme_icon_map;
+ LASSERT(sorted(begin, end), /**/);
+
+ PngMap const * const it = find_if(begin, end, CompareKey(action));
+
+ if (it != end)
+ return it->value;
+ return QString();
+}
+
+
QString iconName(FuncRequest const & f, bool unknown)
{
initializeResources();
}
}
- FileName fname = libFileSearch("images/" + path, name1, "png");
- if (fname.exists())
- return toqstr(fname.absFileName());
+ QStringList imagedirs;
+ imagedirs << "images/" << "images/ipa/";
+ for (int i = 0; i < imagedirs.size(); ++i) {
+ QString imagedir = imagedirs.at(i) + path;
+ FileName fname = imageLibFileSearch(imagedir, name1, "png");
+ if (fname.exists())
+ return toqstr(fname.absFileName());
- fname = libFileSearch("images/" + path, name2, "png");
- if (fname.exists())
- return toqstr(fname.absFileName());
+ fname = imageLibFileSearch(imagedir, name2, "png");
+ if (fname.exists())
+ 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())
<< '(' << to_utf8(f.argument()) << ")\"");
if (unknown) {
- fname = libFileSearch(QString("images/"), "unknown", "png");
+ QString imagedir = "images/";
+ FileName fname = imageLibFileSearch(imagedir, "unknown", "png");
if (fname.exists())
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 imagedir = path;
+ FileName fname = imageLibFileSearch(imagedir, name, ext);
QString path1 = toqstr(fname.absFileName());
QString path2 = ":/" + path + name + "." + ext;
QIcon getIcon(FuncRequest const & f, bool unknown)
{
+#if (QT_VERSION >= 0x040600)
+ if (lyxrc.use_system_theme_icons) {
+ QString action = toqstr(lyxaction.getActionName(f.action()));
+ if (!f.argument().empty())
+ action += " " + toqstr(f.argument());
+ QString const theme_icon = themeIconName(action);
+ if (QIcon::hasThemeIcon(theme_icon))
+ return QIcon::fromTheme(theme_icon);
+ }
+#endif
+
QString icon = iconName(f, unknown);
if (icon.isEmpty())
return QIcon();
: 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) const
{
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();
}
#endif // Q_WS_WIN
+
+/// Allows to check whether ESC was pressed during a long operation
+class KeyChecker : public QObject {
+private:
+ bool pressed_;
+ bool started_;
+public:
+ KeyChecker() : pressed_(false), started_(false) {}
+
+ void start() {
+ QCoreApplication::instance()->installEventFilter(this);
+ pressed_ = false;
+ started_ = true;
+ }
+ void stop() {
+ QCoreApplication::instance()->removeEventFilter(this);
+ started_ = false;
+ }
+ bool pressed() {
+ QCoreApplication::processEvents();
+ return pressed_;
+ }
+ bool started() const {
+ return started_;
+ }
+ bool eventFilter(QObject *obj, QEvent *event) {
+ LYXERR(Debug::ACTION, "Event Type: " << event->type());
+ switch (event->type()) {
+ case QEvent::Show:
+ case QEvent::Hide:
+ case QEvent::Resize:
+ case QEvent::UpdateRequest:
+ case QEvent::CursorChange:
+ case QEvent::ActionChanged:
+ case QEvent::EnabledChange:
+ case QEvent::SockAct:
+ case QEvent::Timer:
+ case QEvent::Paint:
+ case QEvent::ToolTipChange:
+ case QEvent::LayoutRequest:
+ case QEvent::MetaCall:
+ return QObject::eventFilter(obj, event);
+ default:
+ // FIXME Blocking all these events is a bad idea.
+ QKeyEvent *keyEvent = dynamic_cast<QKeyEvent*>(event);
+ if (keyEvent && keyEvent->key() == Qt::Key_Escape)
+ pressed_ = true;
+ return true;
+ }
+ }
+};
+
+
////////////////////////////////////////////////////////////////////////
// GuiApplication::Private definition and implementation.
////////////////////////////////////////////////////////////////////////
{
#ifdef Q_WS_WIN
/// WMF Mime handler for Windows clipboard.
- wmf_mime_ = new QWindowsMimeMetafile();
+ wmf_mime_ = new QWindowsMimeMetafile;
#endif
initKeySequences(&theTopLevelKeymap());
}
/// WMF Mime handler for Windows clipboard.
QWindowsMimeMetafile * wmf_mime_;
#endif
+
+ /// Allows to check whether ESC was pressed during a long operation
+ KeyChecker key_checker_;
};
QCoreApplication::setOrganizationDomain("lyx.org");
QCoreApplication::setApplicationName(lyx_package);
+ qsrand(QDateTime::currentDateTime().toTime_t());
+
// Install translator for GUI elements.
installTranslator(&d->qt_trans_);
/// A translator suitable for the entries in the LyX menu.
/// Only needed with Qt/Mac.
installTranslator(new MenuTranslator(this));
+ ///
+ setupApplescript();
#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 >= 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.
QThreadPool::globalInstance()->setMaxThreadCount(20);
-#endif
}
}
-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));
}
BufferView * bv = 0;
BufferView * doc_bv = 0;
-
+
if (cmd.action() == LFUN_NOACTION) {
status.message(from_utf8(N_("Nothing to do")));
status.setEnabled(false);
// 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)) { }
// 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)) { }
// Does the document Buffer know something?
else if (doc_bv->buffer().getStatus(cmd, status)) { }
- else {
+ 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")));
enable = true;
break;
+ case LFUN_BUFFER_FORALL: {
+ if (theBufferList().empty()) {
+ flag.message(from_utf8(N_("Command not allowed without a buffer open")));
+ flag.setEnabled(false);
+ break;
+ }
+
+ FuncRequest const cmdToPass = lyxaction.lookupFunc(cmd.getLongArg(0));
+ if (cmdToPass.action() == LFUN_UNKNOWN_ACTION) {
+ flag.message(from_utf8(N_("the <LFUN-COMMAND> argument of buffer-forall is not valid")));
+ flag.setEnabled(false);
+ }
+ break;
+ }
+
+ case LFUN_DIALOG_SHOW: {
+ string const name = cmd.getArg(0);
+ return name == "aboutlyx"
+ || name == "prefs"
+ || name == "texinfo"
+ || name == "progress"
+ || name == "compare";
+ }
+
default:
return false;
}
void GuiApplication::dispatch(FuncRequest const & cmd)
{
- if (current_view_ && current_view_->currentBufferView())
+ Buffer * buffer = 0;
+ if (current_view_ && current_view_->currentBufferView()) {
current_view_->currentBufferView()->cursor().saveBeforeDispatchPosXY();
+ buffer = ¤t_view_->currentBufferView()->buffer();
+ if (buffer)
+ buffer->undo().beginUndoGroup();
+ }
DispatchResult dr;
// redraw the screen at the end (first of the two drawing steps).
// This is done unless explicitly requested otherwise
dr.screenUpdate(Update::FitCursor);
dispatch(cmd, dr);
+ updateCurrentView(cmd, dr);
+
+ // the buffer may have been closed by one action
+ if (theBufferList().isLoaded(buffer))
+ buffer->undo().endUndoGroup();
+}
+
+void GuiApplication::updateCurrentView(FuncRequest const & cmd, DispatchResult & dr)
+{
if (!current_view_)
return;
return;
BookmarksSection::Bookmark const & bm =
theSession().bookmarks().bookmark(idx);
- LASSERT(!bm.filename.empty(), /**/);
+ LASSERT(!bm.filename.empty(), return);
string const file = bm.filename.absFileName();
// if the file is not opened, open it.
if (!theBufferList().exists(bm.filename)) {
dispatch(FuncRequest(LFUN_BOOKMARK_SAVE, "0"));
// if the current buffer is not that one, switch to it.
- BufferView * doc_bv = current_view_->documentBufferView();
+ 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;
string configure_command = package().configure_command();
configure_command += option;
Systemcall one;
- int ret = one.startscript(Systemcall::Wait, configure_command);
+ int const ret = one.startscript(Systemcall::Wait, configure_command);
p.pop();
// emit message signal.
if (current_view_)
current_view_->message(_("Reloading configuration..."));
- lyxrc.read(libFileSearch(QString(), "lyxrc.defaults"));
+ lyxrc.read(libFileSearch(QString(), "lyxrc.defaults"), false);
// Re-read packages.lst
- LaTeXFeatures::getAvailable();
+ LaTeXPackages::getAvailable();
if (ret)
Alert::information(_("System reconfiguration failed"),
_("The system reconfiguration has failed.\n"
- "Default textclass is used but LyX may "
+ "Default textclass is used but LyX may\n"
"not be able to work properly.\n"
"Please reconfigure again if needed."));
else
"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)
{
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);
return;
};
+ if (cmd.origin() == FuncRequest::LYXSERVER) {
+ if (current_view_ && current_view_->currentBufferView())
+ current_view_->currentBufferView()->cursor().saveBeforeDispatchPosXY();
+ // we will also need to redraw the screen at the end
+ dr.screenUpdate(Update::FitCursor);
+ }
+
// Assumes that the action will be dispatched.
dr.dispatched(true);
// clear the last opened list, because
// maybe this will end the session
theSession().lastOpened().clear();
- current_view_->closeScheduled();
+ // 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: {
+ validateCurrentView();
// FIXME: create a new method shared with LFUN_HELP_OPEN.
string const fname = to_utf8(cmd.argument());
- if (d->views_.empty() || (!lyxrc.open_buffers_in_tabs
- && current_view_->documentBufferView() != 0)) {
+ bool const is_open = FileName::isAbsolute(fname)
+ && theBufferList().getBuffer(FileName(fname));
+ if (d->views_.empty()
+ || (!lyxrc.open_buffers_in_tabs
+ && current_view_->documentBufferView() != 0
+ && !is_open)) {
// 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;
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();
+
+ // If the request comes from the minibuffer, then we can't reset
+ // the GUI, since that would destory the minibuffer itself and
+ // cause a crash, since we are currently in one of the methods of
+ // GuiCommandBuffer. See bug #8540.
+ if (cmd.origin() != FuncRequest::COMMANDBUFFER)
+ resetGui();
+ // else
+ // FIXME Unfortunately, that leaves a bug here, since we cannot
+ // reset the GUI in this case. If the changes to lyxrc affected the
+ // UI, then, nothing would happen. This seems fairly unlikely, but
+ // it definitely is a bug.
break;
}
// --- lyxserver commands ----------------------------
case LFUN_SERVER_GET_FILENAME: {
- LASSERT(current_view_ && current_view_->documentBufferView(), return);
- docstring const fname = from_utf8(
+ if (current_view_ && current_view_->documentBufferView()) {
+ docstring const fname = from_utf8(
current_view_->documentBufferView()->buffer().absFileName());
- dr.setMessage(fname);
- LYXERR(Debug::INFO, "FNAME[" << fname << ']');
+ 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);
break;
}
+ case LFUN_BUFFER_FORALL: {
+ FuncRequest const funcToRun = lyxaction.lookupFunc(cmd.getLongArg(0));
+
+ map<Buffer *, GuiView *> views_lVisible;
+ map<GuiView *, Buffer *> activeBuffers;
+
+ QList<GuiView *> allViews = d->views_.values();
+
+ // this foreach does not modify any buffer. It just collects info on local visibility of buffers
+ // and on which buffer is active in each view.
+ Buffer * const last = theBufferList().last();
+ foreach (GuiView * view, allViews) {
+ // all of the buffers might be locally hidden. That is, there is no active buffer.
+ if (!view || !view->currentBufferView() || !&view->currentBufferView()->buffer())
+ activeBuffers[view] = 0;
+ else
+ activeBuffers[view] = &view->currentBufferView()->buffer();
+
+ // find out if each is locally visible or locally hidden.
+ // we don't use a for loop as the buffer list cycles.
+ Buffer * b = theBufferList().first();
+ while (true) {
+ bool const locallyVisible = view && view->workArea(*b);
+ if (locallyVisible) {
+ bool const exists_ = (views_lVisible.find(b) != views_lVisible.end());
+ // only need to overwrite/add if we don't already know a buffer is globally
+ // visible or we do know but we would prefer to dispatch LFUN from the
+ // current view because of cursor position issues.
+ if (!exists_ || (exists_ && views_lVisible[b] != current_view_))
+ views_lVisible[b] = view;
+ }
+ if (b == last)
+ break;
+ b = theBufferList().next(b);
+ }
+ }
+
+ GuiView * const homeView = currentView();
+ Buffer * b = theBufferList().first();
+ Buffer * nextBuf = 0;
+ int numProcessed = 0;
+ while (true) {
+ if (b != last)
+ nextBuf = theBufferList().next(b); // get next now bc LFUN might close current.
+
+ bool const visible = (views_lVisible.find(b) != views_lVisible.end());
+ if (visible) {
+ // first change to a view where b is locally visible, preferably current_view_.
+ GuiView * const vLv = views_lVisible[b];
+ vLv->setBuffer(b);
+ lyx::dispatch(funcToRun);
+ numProcessed++;
+ }
+ if (b == last)
+ break;
+ b = nextBuf;
+ }
+
+ // put things back to how they were (if possible).
+ foreach (GuiView * view, allViews) {
+ Buffer * originalBuf = activeBuffers[view];
+ // there might not have been an active buffer in this view or it might have been closed by the LFUN.
+ if (theBufferList().isLoaded(originalBuf))
+ view->setBuffer(originalBuf);
+ }
+ homeView->setFocus();
+
+ dr.setMessage(bformat(_("Applied \"%1$s\" to %2$d buffer(s)"), from_utf8(cmd.getLongArg(0)), numProcessed));
+ break;
+ }
+
case LFUN_COMMAND_ALTERNATIVES: {
// argument contains ';'-terminated commands
string arg = argument;
lyxerr.setLevel(Debug::value(to_utf8(cmd.argument())));
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();
+ case LFUN_DIALOG_SHOW: {
+ string const name = cmd.getArg(0);
+
+ if ( name == "aboutlyx"
+ || name == "prefs"
+ || name == "texinfo"
+ || name == "progress"
+ || name == "compare")
+ {
+ // work around: on Mac OS the application
+ // is not terminated when closing the last view.
+ // Create a new one to be able to dispatch the
+ // LFUN_DIALOG_SHOW to this view.
+ if (current_view_ == 0)
+ createView();
}
-
- // 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();
}
-
- // 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();
+
+ default:
+ // 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 (cmd.origin() == FuncRequest::LYXSERVER)
+ updateCurrentView(cmd, dr);
}
}
if (keysym.isModifier()) {
- LYXERR(Debug::KEY, "isModifier true");
if (current_view_)
current_view_->restartCursor();
return;
}
-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_;
}
void GuiApplication::setGuiLanguage()
{
- // Set the language defined by the user.
- setRcGuiLanguage();
-
- QString const default_language = toqstr(Messages::defaultLanguage());
- LYXERR(Debug::LOCALE, "Trying to set default locale to: " << default_language);
- QLocale const default_locale(default_language);
- QLocale::setDefault(default_locale);
-
+ setLocale();
+ QLocale theLocale;
// 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).
+ QString const language_name = QString("qt_") + theLocale.name();
+ // 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
<< language_name);
}
- switch (default_locale.language()) {
+ switch (theLocale.language()) {
case QLocale::Arabic :
case QLocale::Hebrew :
case QLocale::Persian :
// 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".
- d->global_menubar_ = new GlobalMenuBar();
+ d->global_menubar_ = new GlobalMenuBar;
d->menus_.fillMenuBar(d->global_menubar_, 0, true);
#endif
}
d->language_model_ = new QSortFilterProxyModel(this);
d->language_model_->setSourceModel(lang_model);
-#if QT_VERSION >= 0x040300
d->language_model_->setSortLocaleAware(true);
-#endif
return d->language_model_;
}
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
// 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
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.
-
#ifdef QT_NO_SESSIONMANAGER
- #error Qt is compiled without session manager
+ #ifndef _MSC_VER
+ #warning Qt is compiled without session manager
+ #else
+ #pragma message("warning: Qt is compiled without session manager")
+ #endif
(void) sm;
#else
if (sm.allowsInteraction() && !closeAllViews())
void GuiApplication::unregisterView(GuiView * gv)
{
- LASSERT(d->views_[gv->id()] == gv, /**/);
+ LAPPERR(d->views_[gv->id()] == gv);
d->views_.remove(gv->id());
if (current_view_ == gv)
current_view_ = 0;
// are already entries in the lastOpened list.
theSession().lastOpened().clear();
- QList<GuiView *> views = d->views_.values();
+ QList<GuiView *> const views = d->views_.values();
foreach (GuiView * view, views) {
if (!view->closeScheduled())
return false;
GuiView & GuiApplication::view(int id) const
{
- LASSERT(d->views_.contains(id), /**/);
+ LAPPERR(d->views_.contains(id));
return *d->views_.value(id);
}
void GuiApplication::hideDialogs(string const & name, Inset * inset) const
{
- QList<GuiView *> views = d->views_.values();
+ QList<GuiView *> const views = d->views_.values();
foreach (GuiView * view, views)
view->hideDialog(name, inset);
}
Buffer const * GuiApplication::updateInset(Inset const * inset) const
{
Buffer const * buffer_ = 0;
- QHash<int, GuiView *>::iterator end = d->views_.end();
+ QHash<int, GuiView *>::const_iterator end = d->views_.end();
for (QHash<int, GuiView *>::iterator it = d->views_.begin(); it != end; ++it) {
if (Buffer const * ptr = (*it)->updateInset(inset))
buffer_ = ptr;
}
+// 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());
if (uifiles.contains(uifile)) {
if (!include) {
LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
- enum {
- ui_menuset = 1,
- ui_toolbars,
- ui_toolbarset,
- ui_include,
- ui_last
- };
+ ReturnValues retval = readUIFile(ui_path);
- 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;
-
- 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);
+ TempFile tmp("convertXXXXXX.ui");
+ FileName const tempfile = tmp.name();
+ 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);
}
- 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)
}
+void GuiApplication::startLongOperation() {
+ d->key_checker_.start();
+}
+
+
+bool GuiApplication::longOperationCancelled() {
+ return d->key_checker_.pressed();
+}
+
+
+void GuiApplication::stopLongOperation() {
+ d->key_checker_.stop();
+}
+
+
+bool GuiApplication::longOperationStarted() {
+ return d->key_checker_.started();
+}
+
+
////////////////////////////////////////////////////////////////////////
//
// X11 specific stuff goes here...
frontend::FontLoader & theFontLoader()
{
- LASSERT(frontend::guiApp, /**/);
+ LAPPERR(frontend::guiApp);
return frontend::guiApp->fontLoader();
}
frontend::FontMetrics const & theFontMetrics(FontInfo const & f)
{
- LASSERT(frontend::guiApp, /**/);
+ LAPPERR(frontend::guiApp);
return frontend::guiApp->fontLoader().metrics(f);
}
frontend::Clipboard & theClipboard()
{
- LASSERT(frontend::guiApp, /**/);
+ LAPPERR(frontend::guiApp);
return frontend::guiApp->clipboard();
}
frontend::Selection & theSelection()
{
- LASSERT(frontend::guiApp, /**/);
+ LAPPERR(frontend::guiApp);
return frontend::guiApp->selection();
}