X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt%2FGuiApplication.cpp;h=01a646de37372e84bc6b62219456b2d124859129;hb=20cee1593752df09b6c1d47794eb9971404fa448;hp=a4c9132254644c15c24328a975bf5b46b02306f2;hpb=704331fdcd18129e74ff9ac089c044571e707eb7;p=features.git diff --git a/src/frontends/qt/GuiApplication.cpp b/src/frontends/qt/GuiApplication.cpp index a4c9132254..01a646de37 100644 --- a/src/frontends/qt/GuiApplication.cpp +++ b/src/frontends/qt/GuiApplication.cpp @@ -63,6 +63,7 @@ #include "support/convert.h" #include "support/debug.h" #include "support/ExceptionMessage.h" +#include "support/environment.h" #include "support/FileName.h" #include "support/filetools.h" #include "support/ForkedCalls.h" @@ -88,7 +89,9 @@ #include #include #include +#if QT_VERSION < 0x060000 #include +#endif #include #include #include @@ -105,6 +108,9 @@ #include #include #include +#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) +#include +#endif #include #include #include @@ -131,6 +137,7 @@ #if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400) #if defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN) +#if (QT_VERSION < 0x060000) #if (QT_VERSION < 0x050000) #include #define QWINDOWSMIME QWindowsMime @@ -138,6 +145,7 @@ #include #define QWINDOWSMIME QWinMime #endif +#endif #ifdef Q_CC_GNU #include #endif @@ -145,7 +153,7 @@ #endif #endif -#ifdef Q_OS_MAC +#if defined(Q_OS_MAC) && (QT_VERSION < 0x060000) #include #endif // Q_OS_MAC @@ -180,6 +188,24 @@ frontend::Application * createApplication(int & argc, char * argv[]) AllowSetForegroundWindow(ASFW_ANY); #endif + +// Setup high DPI handling. This is a bit complicated, but will be default in Qt6. +// macOS does it by itself. +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_OS_MAC) +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + // Attribute Qt::AA_EnableHighDpiScaling must be set before QCoreApplication is created + if (getEnv("QT_ENABLE_HIGHDPI_SCALING").empty() + && getEnv("QT_AUTO_SCREEN_SCALE_FACTOR").empty()) + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); +#endif + +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + // HighDPI scale factor policy must be set before QGuiApplication is created + if (getEnv("QT_SCALE_FACTOR_ROUNDING_POLICY").empty()) + QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); +#endif +#endif + 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. @@ -490,6 +516,8 @@ IconInfo iconInfo(FuncRequest const & f, bool unknown, bool rtl) name.replace(' ', '_'); name.replace(';', '_'); name.replace('\\', "backslash"); + // avoid duplication for these + name.replace("dialog-toggle", "dialog-show"); names << name; // then special default icon for some lfuns @@ -580,14 +608,13 @@ QPixmap prepareForDarkMode(QPixmap pixmap) // create a layer with blue text turned to lighter blue QPixmap blue_overlay(pixmap.size()); QColor math_blue(0, 0, 255); - blue_overlay.fill(math_blue.lighter()); + blue_overlay.fill(guiApp->colorCache().get(Color(Color_math))); blue_overlay.setMask(pixmap.createMaskFromColor(math_blue, Qt::MaskOutColor)); // create a layer with ("latex") red text turned to lighter red QPixmap red_overlay(pixmap.size()); QColor math_red(128, 0, 0); - QColor math_red_light(233, 175, 175); - red_overlay.fill(math_red_light); + red_overlay.fill(guiApp->colorCache().get(Color(Color_latex))); red_overlay.setMask(pixmap.createMaskFromColor(math_red, Qt::MaskOutColor)); // put layers on top of existing pixmap @@ -608,7 +635,8 @@ QPixmap getPixmap(QString const & path, QString const & name, QString const & ex QPixmap pixmap = QPixmap(); if (pixmap.load(fpath)) { - if (fpath.contains("math") || fpath.contains("ipa")) + if (fpath.contains("math") || fpath.contains("ipa") + || fpath.contains("bullets")) return prepareForDarkMode(pixmap); return pixmap; } @@ -690,7 +718,7 @@ public: QString translate(const char * /* context */, const char *sourceText, #if QT_VERSION >= 0x050000 - const char * /* disambiguation */ = 0, int /* n */ = -1) const override + const char * /* disambiguation */ = nullptr, int /* n */ = -1) const override #else const char * /*comment*/ = 0) const override #endif @@ -724,7 +752,7 @@ public: // //////////////////////////////////////////////////////////////////////// -#ifdef Q_OS_MAC +#if defined(Q_OS_MAC) && (QT_VERSION < 0x060000) // QMacPasteboardMimeGraphics can only be compiled on Mac. class QMacPasteboardMimeGraphics : public QMacPasteboardMime @@ -784,7 +812,7 @@ public: //////////////////////////////////////////////////////////////////////// // Windows specific stuff goes here... -#if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400) +#if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400 && QT_VERSION < 0x060000) #if defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN) // QWindowsMimeMetafile can only be compiled on Windows. @@ -946,8 +974,11 @@ struct GuiApplication::Private { Private(): language_model_(nullptr), meta_fake_bit(NoModifier), global_menubar_(nullptr) + #if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)) + , last_state_(Qt::ApplicationInactive) + #endif { - #if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400) + #if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400 && QT_VERSION < 0x060000) #if defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN) /// WMF Mime handler for Windows clipboard. wmf_mime_ = new QWindowsMimeMetafile; @@ -1012,13 +1043,17 @@ struct GuiApplication::Private /// Only used on mac. QMenuBar * global_menubar_; +#if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)) + /// Holds previous application state on Mac + Qt::ApplicationState last_state_; +#endif -#ifdef Q_OS_MAC +#if defined(Q_OS_MAC) && (QT_VERSION < 0x060000) /// Linkback mime handler for MacOSX. QMacPasteboardMimeGraphics mac_pasteboard_mime_; #endif -#if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400) +#if (QT_VERSION < 0x050000) || (QT_VERSION >= 0x050400 && QT_VERSION < 0x060000) #if defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN) /// WMF Mime handler for Windows clipboard. QWindowsMimeMetafile * wmf_mime_; @@ -1049,7 +1084,7 @@ GuiApplication::GuiApplication(int & argc, char ** argv) QCoreApplication::setOrganizationName(app_name); QCoreApplication::setOrganizationDomain("lyx.org"); QCoreApplication::setApplicationName(lyx_package); -#if QT_VERSION >= 0x050000 +#if QT_VERSION >= 0x050000 && QT_VERSION < 0x060000 QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); #endif @@ -1057,7 +1092,11 @@ GuiApplication::GuiApplication(int & argc, char ** argv) setDesktopFileName(lyx_package); #endif +#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) + QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch()); +#else qsrand(QDateTime::currentDateTime().toTime_t()); +#endif // Install LyX translator for missing Qt translations installTranslator(&d->gui_trans_); @@ -1084,6 +1123,10 @@ GuiApplication::GuiApplication(int & argc, char ** argv) setupApplescript(); appleCleanupEditMenu(); appleCleanupViewMenu(); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)) + connect(this, SIGNAL(applicationStateChanged(Qt::ApplicationState)), + this, SLOT(onApplicationStateChanged(Qt::ApplicationState))); +#endif #endif #if defined(Q_WS_X11) || defined(QPA_XCB) @@ -1356,10 +1399,17 @@ bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const case LFUN_REPEAT: case LFUN_PREFERENCES_SAVE: case LFUN_BUFFER_SAVE_AS_DEFAULT: - case LFUN_DEBUG_LEVEL_SET: // these are handled in our dispatch() break; + case LFUN_DEBUG_LEVEL_SET: { + string bad = Debug::badValue(to_utf8(cmd.argument())); + enable = bad.empty(); + if (!bad.empty()) + flag.message(bformat(_("Bad debug value `%1$s'."), from_utf8(bad))); + break; + } + case LFUN_WINDOW_CLOSE: enable = !d->views_.empty(); break; @@ -1367,6 +1417,7 @@ bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const case LFUN_BUFFER_NEW: case LFUN_BUFFER_NEW_TEMPLATE: case LFUN_FILE_OPEN: + case LFUN_LYXFILES_OPEN: case LFUN_HELP_OPEN: case LFUN_SCREEN_FONT_UPDATE: case LFUN_SET_COLOR: @@ -1464,7 +1515,7 @@ DispatchResult const & GuiApplication::dispatch(FuncRequest const & cmd) { DispatchResult dr; - Buffer * buffer = 0; + Buffer * buffer = nullptr; if (cmd.view_origin() && current_view_ != cmd.view_origin()) { //setCurrentView(cmd.view_origin); //does not work dr.setError(true); @@ -1479,13 +1530,16 @@ DispatchResult const & GuiApplication::dispatch(FuncRequest const & cmd) dr.screenUpdate(Update::FitCursor); { - // This handles undo groups automagically + // All the code is kept inside the undo group because + // updateBuffer can create undo actions (see #11292) UndoGroupHelper ugh(buffer); dispatch(cmd, dr); - // redraw the screen at the end (first of the two drawing steps). - // This is done unless explicitly requested otherwise. - // This code is kept inside the undo group because updateBuffer - // can create undo actions (see #11292) + if (dr.screenUpdate() & Update::ForceAll) { + for (Buffer const * b : theBufferList()) + b->changed(true); + dr.screenUpdate(dr.screenUpdate() & ~Update::ForceAll); + } + updateCurrentView(cmd, dr); } @@ -1501,7 +1555,7 @@ void GuiApplication::updateCurrentView(FuncRequest const & cmd, DispatchResult & BufferView * bv = current_view_->currentBufferView(); if (bv) { - if (dr.needBufferUpdate()) { + if (dr.needBufferUpdate() || bv->buffer().needUpdate()) { bv->cursor().clearBufferUpdate(); bv->buffer().updateBuffer(); } @@ -1554,8 +1608,8 @@ void GuiApplication::gotoBookmark(unsigned int idx, bool openFile, // if the current buffer is not that one, switch to it. BufferView * doc_bv = current_view_ ? - current_view_->documentBufferView() : 0; - Cursor const * old = doc_bv ? &doc_bv->cursor() : 0; + current_view_->documentBufferView() : nullptr; + Cursor const * old = doc_bv ? &doc_bv->cursor() : nullptr; if (!doc_bv || doc_bv->buffer().fileName() != tmp.filename) { if (switchToBuffer) { dispatch(FuncRequest(LFUN_BUFFER_SWITCH, file)); @@ -1598,8 +1652,10 @@ void GuiApplication::gotoBookmark(unsigned int idx, bool openFile, void GuiApplication::reconfigure(string const & option) { // emit message signal. - if (current_view_) + if (current_view_) { current_view_->message(_("Running configure...")); + current_view_->setCursor(Qt::WaitCursor); + } // Run configure in user lyx directory string const lock_file = package().getConfigureLockName(); @@ -1613,6 +1669,9 @@ void GuiApplication::reconfigure(string const & option) LaTeXPackages::getAvailable(); fileUnlock(fd, lock_file.c_str()); + if (current_view_) + current_view_->unsetCursor(); + if (ret) Alert::information(_("System reconfiguration failed"), _("The system reconfiguration has failed.\n" @@ -1632,7 +1691,7 @@ void GuiApplication::validateCurrentView() // 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; + GuiView * candidate = nullptr; QHash::const_iterator it = d->views_.begin(); QHash::const_iterator end = d->views_.end(); for (; it != end; ++it) { @@ -1685,9 +1744,10 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) break; case LFUN_WINDOW_CLOSE: + // FIXME: this is done also in GuiView::closeBuffer()! // update bookmark pit of the current buffer before window close - for (size_t i = 0; i < theSession().bookmarks().size(); ++i) - gotoBookmark(i+1, false, false); + for (size_t i = 1; i < theSession().bookmarks().size(); ++i) + gotoBookmark(i, false, false); // clear the last opened list, because // maybe this will end the session theSession().lastOpened().clear(); @@ -1719,7 +1779,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) case LFUN_BUFFER_NEW: validateCurrentView(); if (!current_view_ - || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) { + || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != nullptr)) { createView(QString(), false); // keep hidden current_view_->newDocument(to_utf8(cmd.argument())); current_view_->show(); @@ -1734,7 +1794,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) string const temp = cmd.getArg(1); validateCurrentView(); if (!current_view_ - || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != 0)) { + || (!lyxrc.open_buffers_in_tabs && current_view_->documentBufferView() != nullptr)) { createView(); current_view_->newDocument(file, temp, true); if (!current_view_->documentBufferView()) @@ -1750,12 +1810,12 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) // current_view_ is not null. validateCurrentView(); // FIXME: create a new method shared with LFUN_HELP_OPEN. - string const fname = to_utf8(cmd.argument()); + string const fname = trim(to_utf8(cmd.argument()), "\""); bool const is_open = FileName::isAbsolute(fname) && theBufferList().getBuffer(FileName(fname)); if (!current_view_ || (!lyxrc.open_buffers_in_tabs - && current_view_->documentBufferView() != 0 + && current_view_->documentBufferView() != nullptr && !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. @@ -1781,7 +1841,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) case LFUN_HELP_OPEN: { // FIXME: create a new method shared with LFUN_FILE_OPEN. - if (current_view_ == 0) + if (current_view_ == nullptr) createView(); string const arg = to_utf8(cmd.argument()); if (arg.empty()) { @@ -1805,6 +1865,25 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) break; } + case LFUN_LYXFILES_OPEN: { + // This is the actual reason for this method (#12106). + validateCurrentView(); + if (!current_view_ + || (!lyxrc.open_buffers_in_tabs + && current_view_->documentBufferView() != nullptr)) + createView(); + string arg = to_utf8(cmd.argument()); + if (arg.empty()) + // set default + arg = "templates"; + if (arg != "templates" && arg != "examples") { + current_view_->message(_("Wrong argument. Must be 'examples' or 'templates'.")); + break; + } + lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "lyxfiles " + arg)); + break; + } + case LFUN_SET_COLOR: { string const lyx_name = cmd.getArg(0); string x11_name = cmd.getArg(1); @@ -1954,7 +2033,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) string arg = argument; // FIXME: this LFUN should also work without any view. Buffer * buffer = (current_view_ && current_view_->documentBufferView()) - ? &(current_view_->documentBufferView()->buffer()) : 0; + ? &(current_view_->documentBufferView()->buffer()) : nullptr; // This handles undo groups automagically UndoGroupHelper ugh(buffer); while (!arg.empty()) { @@ -1984,7 +2063,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) // all of the buffers might be locally hidden. That is, there is no // active buffer. if (!view || !view->currentBufferView()) - activeBuffers[view] = 0; + activeBuffers[view] = nullptr; else activeBuffers[view] = &view->currentBufferView()->buffer(); @@ -2009,7 +2088,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) GuiView * const homeView = currentView(); Buffer * b = theBufferList().first(); - Buffer * nextBuf = 0; + Buffer * nextBuf = nullptr; int numProcessed = 0; while (true) { if (b != last) @@ -2112,9 +2191,8 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) DocumentClassConstPtr olddc = defaults.params().documentClassPtr(); int const unknown_tokens = defaults.readHeader(lex); DocumentClassConstPtr newdc = defaults.params().documentClassPtr(); - ErrorList el; InsetText & theinset = static_cast(defaults.inset()); - cap::switchBetweenClasses(olddc, newdc, theinset, el); + cap::switchBetweenClasses(olddc, newdc, theinset); if (unknown_tokens != 0) { lyxerr << "Warning in LFUN_BUFFER_SAVE_AS_DEFAULT!\n" @@ -2141,6 +2219,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) case LFUN_BOOKMARK_CLEAR: theSession().bookmarks().clear(); + dr.screenUpdate(Update::Force); break; case LFUN_DEBUG_LEVEL_SET: @@ -2160,7 +2239,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) // 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) + if (current_view_ == nullptr) createView(); } } @@ -2173,6 +2252,11 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) break; } + if (current_view_ && current_view_->isFullScreen()) { + if (current_view_->menuBar()->isVisible() && lyxrc.full_screen_menubar) + current_view_->menuBar()->hide(); + } + if (cmd.origin() == FuncRequest::LYXSERVER) updateCurrentView(cmd, dr); } @@ -2255,7 +2339,8 @@ bool GuiApplication::queryKeySym(KeySymbol const & keysym, // seq has been reset at this point func = seq.addkey(keysym, NoModifier); - LYXERR(Debug::KEY, " Key (queried) [action=" << func.action() << "][" + LYXERR(Debug::KEY, " Key (queried) [action=" + << lyxaction.getActionName(func.action()) << "][" << seq.print(KeySequence::Portable) << ']'); return func.action() != LFUN_UNKNOWN_ACTION; } @@ -2282,7 +2367,8 @@ void GuiApplication::processKeySym(KeySymbol const & keysym, KeyModifier state) 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 [" + << lyxaction.getActionName(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. @@ -2290,7 +2376,8 @@ void GuiApplication::processKeySym(KeySymbol const & keysym, KeyModifier state) 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 [" + << lyxaction.getActionName(func.action()) << ']'); } // Don't remove this unless you know what you are doing. @@ -2300,8 +2387,9 @@ void GuiApplication::processKeySym(KeySymbol const & keysym, KeyModifier state) if (func.action() == LFUN_NOACTION) func = FuncRequest(LFUN_COMMAND_PREFIX); - LYXERR(Debug::KEY, " Key [action=" << func.action() << "][" - << d->keyseq.print(KeySequence::Portable) << ']'); + LYXERR(Debug::KEY, " Key [action=" + << lyxaction.getActionName(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 @@ -2318,7 +2406,7 @@ void GuiApplication::processKeySym(KeySymbol const & keysym, KeyModifier state) // If addkey looked up a command and did not find further commands then // seq has been reset at this point func = d->keyseq.addkey(keysym, NoModifier); - LYXERR(Debug::KEY, "Action now " << func.action()); + LYXERR(Debug::KEY, "Action now " << lyxaction.getActionName(func.action())); } if (func.action() == LFUN_UNKNOWN_ACTION) { @@ -2435,7 +2523,7 @@ void GuiApplication::resetGui() return; if (d->global_menubar_) - d->menus_.fillMenuBar(d->global_menubar_, 0, false); + d->menus_.fillMenuBar(d->global_menubar_, nullptr, false); QHash::iterator it; for (it = d->views_.begin(); it != d->views_.end(); ++it) { @@ -2495,6 +2583,7 @@ void GuiApplication::createView(QString const & geometry_arg, bool autoShow, int x, y; int w, h; QChar sx, sy; +#if QT_VERSION < 0x060000 QRegExp re( "[=]*(?:([0-9]+)[xX]([0-9]+)){0,1}[ ]*(?:([+-][0-9]*)){0,1}(?:([+-][0-9]*)){0,1}" ); re.indexIn(geometry_arg); w = re.cap(1).toInt(); @@ -2503,6 +2592,16 @@ void GuiApplication::createView(QString const & geometry_arg, bool autoShow, y = re.cap(4).toInt(); sx = re.cap(3).isEmpty() ? '+' : re.cap(3).at(0); sy = re.cap(4).isEmpty() ? '+' : re.cap(4).at(0); +#else + QRegularExpression re( "[=]*(?:([0-9]+)[xX]([0-9]+)){0,1}[ ]*(?:([+-][0-9]*)){0,1}(?:([+-][0-9]*)){0,1}" ); + QRegularExpressionMatch match = re.match(geometry_arg); + w = match.captured(1).toInt(); + h = match.captured(2).toInt(); + x = match.captured(3).toInt(); + y = match.captured(4).toInt(); + sx = match.captured(3).isEmpty() ? '+' : match.captured(3).at(0); + sy = match.captured(4).isEmpty() ? '+' : match.captured(4).at(0); +#endif // Set initial geometry such that we can get the frame size. view->setGeometry(x, y, w, h); int framewidth = view->geometry().x() - view->x(); @@ -2510,7 +2609,11 @@ void GuiApplication::createView(QString const & geometry_arg, bool autoShow, // Negative displacements must be interpreted as distances // from the right or bottom screen borders. if (sx == '-' || sy == '-') { +#if QT_VERSION < 0x060000 QRect rec = QApplication::desktop()->screenGeometry(); +#else + QRect rec = QGuiApplication::primaryScreen()->geometry(); +#endif if (sx == '-') x += rec.width() - w - framewidth; if (sy == '-') @@ -2622,7 +2725,11 @@ void GuiApplication::setGuiLanguage() // opposite. Therefore, long name should be used without truncation. // c.f. http://doc.trolltech.com/4.1/qtranslator.html#load if (!d->qt_trans_.load(language_name, +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) + QLibraryInfo::path(QLibraryInfo::TranslationsPath))) { +#else QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { +#endif LYXERR(Debug::LOCALE, "Could not find Qt translations for locale " << language_name); } else { @@ -2723,7 +2830,7 @@ void GuiApplication::restoreGuiSession() for (auto const & last : lastopened) { FileName const & file_name = last.file_name; if (!current_view_ || (!lyxrc.open_buffers_in_tabs - && current_view_->documentBufferView() != 0)) { + && current_view_->documentBufferView() != nullptr)) { string const & fname = file_name.absFileName(); createView(support::checksum(fname)); } @@ -2893,6 +3000,11 @@ bool GuiApplication::notify(QObject * receiver, QEvent * event) return false; } +bool GuiApplication::isInDarkMode() +{ + return colorCache().isDarkMode(); +} + bool GuiApplication::getRgbColor(ColorCode col, RGBColor & rgbcol) { @@ -2987,7 +3099,7 @@ void GuiApplication::unregisterView(GuiView * gv) if(d->views_.contains(gv->id()) && d->views_.value(gv->id()) == gv) { d->views_.remove(gv->id()); if (current_view_ == gv) - current_view_ = 0; + current_view_ = nullptr; } } @@ -3044,7 +3156,7 @@ void GuiApplication::hideDialogs(string const & name, Inset * inset) const Buffer const * GuiApplication::updateInset(Inset const * inset) const { - Buffer const * buf = 0; + Buffer const * buf = nullptr; QHash::const_iterator end = d->views_.end(); for (QHash::iterator it = d->views_.begin(); it != end; ++it) { if (Buffer const * ptr = (*it)->updateInset(inset)) @@ -3057,7 +3169,7 @@ Buffer const * GuiApplication::updateInset(Inset const * inset) const bool GuiApplication::searchMenu(FuncRequest const & func, docstring_list & names) const { - BufferView * bv = 0; + BufferView * bv = nullptr; if (current_view_) bv = current_view_->currentBufferView(); return d->menus_.searchMenu(func, names, bv); @@ -3278,6 +3390,36 @@ void GuiApplication::onLastWindowClosed() } +#if (QT_VERSION >= QT_VERSION_CHECK(5, 1, 0)) +void GuiApplication::onApplicationStateChanged(Qt::ApplicationState state) +{ + std::string name = "unknown"; + switch (state) { + case Qt::ApplicationSuspended: + name = "ApplicationSuspended"; + break; + case Qt::ApplicationHidden: + name = "ApplicationHidden"; + break; + case Qt::ApplicationInactive: + name = "ApplicationInactive"; + break; + case Qt::ApplicationActive: + name = "ApplicationActive"; + /// The Dock icon click produces 2 sequential QEvent::ApplicationStateChangeEvent events. + /// cmd+tab only one QEvent::ApplicationStateChangeEvent event + if (d->views_.empty() && d->last_state_ == state) { + LYXERR(Debug::GUI, "Open new window..."); + createView(); + } + break; + } + LYXERR(Debug::GUI, "onApplicationStateChanged..." << name); + d->last_state_ = state; +} +#endif + + void GuiApplication::startLongOperation() { d->key_checker_.start(); }