#include "support/Messages.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
#include "support/Systemcall.h"
#ifdef Q_WS_MACX
+#include "support/AppleScript.h"
#include "support/linkback/LinkBackProxy.h"
#endif
#include <QLocale>
#include <QLibraryInfo>
#include <QList>
-#include <QMacPasteboardMime>
#include <QMenuBar>
#include <QMimeData>
#include <QObject>
#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>
// 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();
}
}
- QString imagedir = "images/" + path;
- FileName fname = imageLibFileSearch(imagedir, 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 = imageLibFileSearch(imagedir, 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);
<< '(' << to_utf8(f.argument()) << ")\"");
if (unknown) {
- imagedir = "images/";
- fname = imageLibFileSearch(imagedir, "unknown", "png");
+ QString imagedir = "images/";
+ FileName fname = imageLibFileSearch(imagedir, "unknown", "png");
if (fname.exists())
return toqstr(fname.absFileName());
return QString(":/images/unknown.png");
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();
QString translate(const char * /*context*/,
const char * sourceText,
- const char * /*comment*/ = 0)
+ const char * /*comment*/ = 0) const
{
string const s = sourceText;
if (s == N_("About %1") || s == N_("Preferences")
class KeyChecker : public QObject {
private:
bool pressed_;
+ bool started_;
public:
- KeyChecker() {
- pressed_ = false;
- }
+ 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()) {
{
#ifdef Q_WS_WIN
/// WMF Mime handler for Windows clipboard.
- wmf_mime_ = new QWindowsMimeMetafile();
+ wmf_mime_ = new QWindowsMimeMetafile;
#endif
initKeySequences(&theTopLevelKeymap());
}
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
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
}
break;
case LFUN_BUFFER_FORALL: {
- if (!currentView() || !currentView()->currentBufferView() || !¤tView()->currentBufferView()->buffer()) {
- flag.message(from_utf8(N_("Command not allowed without any visible document in the active window")));
+ 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;
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)) {
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_)
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
}
case LFUN_BUFFER_FORALL: {
- GuiView * gv = currentView();
- Buffer * const buf = &gv->currentBufferView()->buffer();
-
- bool processVisible = true;
- bool processHidden = false;
- docstring msg = _("Applied the following command to all visible buffers in the active window: ");
- string commandToRun = argument;
- if (cmd.getArg(0) == "both") {
- processHidden = true;
- msg = _("Applied the following command to all visible and hidden buffers in the active window: ");
- commandToRun = cmd.getLongArg(1);
- } else if (cmd.getArg(0) == "visible") {
- commandToRun = cmd.getLongArg(1);
- } else if (cmd.getArg(0) == "hidden") {
- processHidden = true;
- processVisible = false;
- commandToRun = cmd.getLongArg(1);
- msg = _("Applied the following command to all hidden buffers in the active window: ");
- }
- FuncRequest const funcToRun = lyxaction.lookupFunc(commandToRun);
- dr.setMessage(bformat(_("%1$s%2$s"), msg, from_utf8(commandToRun)));
+ 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;
- // We cannot use a for loop as the buffer list cycles.
+ int numProcessed = 0;
while (true) {
if (b != last)
- nextBuf = theBufferList().next(b); //get next now bc LFUN might close current
-
- bool const hidden = !(gv && gv->workArea(*b));
- if (hidden) {
- if (processHidden) {
- gv->setBuffer(b);
- lyx::dispatch(funcToRun);
- gv->currentWorkArea()->view().hideWorkArea(gv->currentWorkArea());
- }
- }
-
- else {
- if (processVisible) {
- gv->setBuffer(b);
- lyx::dispatch(funcToRun);
- }
+ 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;
}
- if (theBufferList().isLoaded(buf)) //the LFUN might have closed buf
- gv->setBuffer(buf);
+ // 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;
}
// 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_;
}
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;
}
+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();
}
projects / lyx.git / blobdiff