X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiView.cpp;h=fe0c201b8dc3fe26d20f4ab403dcc02555094797;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=779ad7d95460e00a70053f695126624037148ba1;hpb=a66b8d03c464a82cade45b4fa7592145990b027f;p=lyx.git diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 779ad7d954..fe0c201b8d 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -16,15 +16,16 @@ #include "GuiView.h" #include "Dialog.h" +#include "DispatchResult.h" #include "FileDialog.h" #include "FontLoader.h" #include "GuiApplication.h" #include "GuiCommandBuffer.h" #include "GuiCompleter.h" -#include "GuiWorkArea.h" #include "GuiKeySymbol.h" #include "GuiToc.h" #include "GuiToolbar.h" +#include "GuiWorkArea.h" #include "LayoutBox.h" #include "Menus.h" #include "TocModel.h" @@ -107,6 +108,7 @@ #define EXPORT_in_THREAD 1 + // QtConcurrent was introduced in Qt 4.4 #if (QT_VERSION >= 0x040400) #include @@ -153,6 +155,7 @@ public: font.setPointSize(int(toqstr(lyxrc.font_sizes[FONT_SIZE_LARGE]).toDouble())); pain.setFont(font); pain.drawText(260, 15, text); + setFocusPolicy(Qt::StrongFocus); } void paintEvent(QPaintEvent *) @@ -163,6 +166,18 @@ public: pain.drawPixmap(x, y, splash_); } + void keyPressEvent(QKeyEvent * ev) + { + KeySymbol sym; + setKeySymbol(&sym, ev); + if (sym.isOK()) { + guiApp->processKeySym(sym, q_key_state(ev->modifiers())); + ev->accept(); + } else { + ev->ignore(); + } + } + private: QPixmap splash_; }; @@ -247,6 +262,7 @@ struct GuiView::GuiViewPrivate { stack_widget_->setCurrentWidget(bg_widget_); bg_widget_->setUpdatesEnabled(true); + bg_widget_->setFocus(); } TabWorkArea * tabWorkArea(int i) @@ -270,14 +286,17 @@ struct GuiView::GuiViewPrivate return tabWorkArea(0); } +#if (QT_VERSION >= 0x040400) void setPreviewFuture(QFuture const & f) { - if (preview_watcher_.isRunning()) - preview_watcher_.waitForFinished(); + if (preview_watcher_.isRunning()) { + // we prefer to cancel this preview in order to keep a snappy + // interface. + return; + } preview_watcher_.setFuture(f); - connect(&preview_watcher_, SIGNAL(finished()), gv_, - SLOT(threadFinished())); } +#endif public: GuiView * gv_; @@ -320,6 +339,9 @@ public: /// QFutureWatcher autosave_watcher_; QFutureWatcher preview_watcher_; +#else + struct DummyWatcher { bool isRunning(){return false;} }; + DummyWatcher preview_watcher_; #endif }; @@ -359,10 +381,27 @@ GuiView::GuiView(int id) setWindowIcon(getPixmap("images/", "lyx", "png")); #endif +#if (QT_VERSION >= 0x040300) + // use tabbed dock area for multiple docks + // (such as "source" and "messages") + setDockOptions(QMainWindow::ForceTabbedDocks); +#endif + // For Drag&Drop. setAcceptDrops(true); statusBar()->setSizeGripEnabled(true); + updateStatusBar(); + +#if (QT_VERSION >= 0x040400) + connect(&d.autosave_watcher_, SIGNAL(finished()), this, + SLOT(threadFinished())); + connect(&d.preview_watcher_, SIGNAL(finished()), this, + SLOT(threadFinished())); +#endif + + connect(this, SIGNAL(triggerShowDialog(QString const &, QString const &, Inset *)), + SLOT(doShowDialog(QString const &, QString const &, Inset *))); // Forbid too small unresizable window because it can happen // with some window manager under X11. @@ -381,14 +420,6 @@ GuiView::GuiView(int id) // clear session data if any. QSettings settings; settings.remove("views"); - -#if (QT_VERSION >= 0x040400) - connect(&d.autosave_watcher_, SIGNAL(finished()), this, - SLOT(threadFinished())); -#endif - - connect(this, SIGNAL(triggerShowDialog(QString const &, QString const &, Inset *)), - SLOT(doShowDialog(QString const &, QString const &, Inset *))); } @@ -459,6 +490,8 @@ bool GuiView::restoreLayout() dialog->prepareView(); if ((dialog = findOrBuild("view-source", true))) dialog->prepareView(); + if ((dialog = findOrBuild("progress", true))) + dialog->prepareView(); if (!restoreState(settings.value("layout").toByteArray(), 0)) initToolbars(); @@ -510,7 +543,7 @@ void GuiView::initToolbars() if (!tb) continue; int const visibility = guiApp->toolbars().defaultVisibility(cit->name); - bool newline = true; + bool newline = !(visibility & Toolbars::SAMEROW); tb->setVisible(false); tb->setVisibility(visibility); @@ -523,7 +556,8 @@ void GuiView::initToolbars() if (visibility & Toolbars::BOTTOM) { // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock. #if (QT_VERSION >= 0x040202) - addToolBarBreak(Qt::BottomToolBarArea); + if (newline) + addToolBarBreak(Qt::BottomToolBarArea); #endif addToolBar(Qt::BottomToolBarArea, tb); } @@ -531,7 +565,8 @@ void GuiView::initToolbars() if (visibility & Toolbars::LEFT) { // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock. #if (QT_VERSION >= 0x040202) - addToolBarBreak(Qt::LeftToolBarArea); + if (newline) + addToolBarBreak(Qt::LeftToolBarArea); #endif addToolBar(Qt::LeftToolBarArea, tb); } @@ -539,7 +574,8 @@ void GuiView::initToolbars() if (visibility & Toolbars::RIGHT) { // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock. #if (QT_VERSION >= 0x040202) - addToolBarBreak(Qt::RightToolBarArea); + if (newline) + addToolBarBreak(Qt::RightToolBarArea); #endif addToolBar(Qt::RightToolBarArea, tb); } @@ -559,11 +595,22 @@ TocModels & GuiView::tocModels() void GuiView::setFocus() { LYXERR(Debug::DEBUG, "GuiView::setFocus()" << this); + QMainWindow::setFocus(); +} + + +void GuiView::focusInEvent(QFocusEvent * e) +{ + LYXERR(Debug::DEBUG, "GuiView::focusInEvent()" << this); + QMainWindow::focusInEvent(e); // Make sure LyXFunc points to the correct view. guiApp->setCurrentView(this); - QMainWindow::setFocus(); - if (d.current_work_area_) - d.current_work_area_->setFocus(); + if (currentMainWorkArea()) + currentMainWorkArea()->setFocus(); + else if (currentWorkArea()) + currentWorkArea()->setFocus(); + else + d.bg_widget_->setFocus(); } @@ -688,7 +735,7 @@ void GuiView::dropEvent(QDropEvent * event) cmd = FuncRequest(LFUN_FILE_OPEN, file); } - // Asynchronously post the event. DropEvent usually come + // Asynchronously post the event. DropEvent usually comes // from the BufferView. But reloading a file might close // the BufferView from within its own event handler. guiApp->dispatchDelayed(cmd); @@ -735,8 +782,11 @@ void GuiView::bigSizedIcons() void GuiView::clearMessage() { - if (!hasFocus()) - return; + // FIXME: This code was introduced in r19643 to fix bug #4123. However, + // the hasFocus function mostly returns false, even if the focus is on + // a workarea in this view. + //if (!hasFocus()) + // return; showMessage(); d.statusbar_timer_.stop(); } @@ -744,7 +794,8 @@ void GuiView::clearMessage() void GuiView::updateWindowTitle(GuiWorkArea * wa) { - if (wa != d.current_work_area_) + if (wa != d.current_work_area_ + || wa->bufferView().buffer().isInternal()) return; setWindowTitle(qt_("LyX: ") + wa->windowTitle()); setWindowIconText(wa->windowIconText()); @@ -789,6 +840,7 @@ void GuiView::on_lastWorkAreaRemoved() updateDialogs(); resetWindowTitleAndIconText(); + updateStatusBar(); if (lyxrc.open_buffers_in_tabs) // Nothing more to do, the window should stay open. @@ -896,25 +948,7 @@ bool GuiView::event(QEvent * e) } } #endif - - if (d.current_work_area_) - // Nothing special to do. - return QMainWindow::event(e); - - QKeyEvent * ke = static_cast(e); - // Let Qt handle menu access and the Tab keys to navigate keys to navigate - // between controls. - if (ke->modifiers() & Qt::AltModifier || ke->key() == Qt::Key_Tab - || ke->key() == Qt::Key_Backtab) - return QMainWindow::event(e); - - // Allow processing of shortcuts that are allowed even when no Buffer - // is viewed. - KeySymbol sym; - setKeySymbol(&sym, ke); - guiApp->processKeySym(sym, q_key_state(ke->modifiers())); - e->accept(); - return true; + return QMainWindow::event(e); } default: @@ -1251,6 +1285,7 @@ BufferView const * GuiView::currentBufferView() const } +#if (QT_VERSION >= 0x040400) static docstring saveAndDestroyBuffer(Buffer * buffer, FileName const & fname) { bool failed = true; @@ -1268,6 +1303,7 @@ static docstring saveAndDestroyBuffer(Buffer * buffer, FileName const & fname) ? _("Automatic save failed!") : _("Automatic save done."); } +#endif void GuiView::autoSave() @@ -1435,6 +1471,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag) || name == "file" //FIXME: should be removed. || name == "prefs" || name == "texinfo" + || name == "progress" || name == "compare"; else if (name == "print") enable = doc_buffer->isExportable("dvi") @@ -2107,6 +2144,7 @@ bool GuiView::closeWorkArea(GuiWorkArea * wa) bool GuiView::closeBuffer() { GuiWorkArea * wa = currentMainWorkArea(); + setCurrentWorkArea(wa); Buffer & buf = wa->bufferView().buffer(); return wa && closeWorkArea(wa, !buf.parent()); } @@ -2295,7 +2333,7 @@ bool GuiView::saveBufferIfNeeded(Buffer & buf, bool hiding) buf.removeAutosaveFile(); if (hiding) // revert all changes - buf.loadLyXFile(buf.fileName()); + buf.reload(); buf.markClean(); break; case 2: @@ -2392,34 +2430,7 @@ static bool ensureBufferClean(Buffer * buffer) void GuiView::reloadBuffer() { Buffer * buf = &documentBufferView()->buffer(); - reloadBuffer(buf); -} - - -void GuiView::reloadBuffer(Buffer * buf) -{ - FileName filename = buf->fileName(); - Buffer const * master = buf->masterBuffer(); - bool const is_child = master != buf; - // The user has already confirmed that the changes, if any, should - // be discarded. So we just release the Buffer and don't call closeBuffer(); - theBufferList().release(buf); - buf = loadDocument(filename); - docstring const disp_fn = makeDisplayPath(filename.absFilename()); - docstring str; - if (buf) { - // re-allocate master if necessary - if (is_child && theBufferList().isLoaded(master) - && buf->masterBuffer() != master) - buf->setParent(master); - buf->updateLabels(); - setBuffer(buf); - buf->errors("Parse"); - str = bformat(_("Document %1$s reloaded."), disp_fn); - } else { - str = bformat(_("Could not reload document %1$s"), disp_fn); - } - message(str); + buf->reload(); } @@ -2428,21 +2439,25 @@ void GuiView::checkExternallyModifiedBuffers() BufferList::iterator bit = theBufferList().begin(); BufferList::iterator const bend = theBufferList().end(); for (; bit != bend; ++bit) { - if ((*bit)->isExternallyModified(Buffer::checksum_method)) { + if ((*bit)->fileName().exists() + && (*bit)->isExternallyModified(Buffer::checksum_method)) { docstring text = bformat(_("Document \n%1$s\n has been externally modified." " Reload now? Any local changes will be lost."), from_utf8((*bit)->absFileName())); int const ret = Alert::prompt(_("Reload externally changed document?"), text, 0, 1, _("&Reload"), _("&Cancel")); if (!ret) - reloadBuffer(*bit); + (*bit)->reload(); } } } +//FIXME use a DispatchResult object to transmit messages void GuiView::dispatchVC(FuncRequest const & cmd) { + // message for statusbar + string msg; Buffer * buffer = documentBufferView() ? &(documentBufferView()->buffer()) : 0; @@ -2460,8 +2475,9 @@ void GuiView::dispatchVC(FuncRequest const & cmd) if (!buffer || !ensureBufferClean(buffer)) break; if (buffer->lyxvc().inUse() && !buffer->isReadonly()) { - message(from_utf8(buffer->lyxvc().checkIn())); - reloadBuffer(); + msg = buffer->lyxvc().checkIn(); + if (!msg.empty()) + reloadBuffer(); } break; @@ -2469,7 +2485,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd) if (!buffer || !ensureBufferClean(buffer)) break; if (buffer->lyxvc().inUse()) { - message(from_utf8(buffer->lyxvc().checkOut())); + msg = buffer->lyxvc().checkOut(); reloadBuffer(); } break; @@ -2484,7 +2500,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd) frontend::Alert::error(_("Revision control error."), _("Error when setting the locking property.")); } else { - message(from_utf8(res)); + msg = res; reloadBuffer(); } } @@ -2505,8 +2521,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd) case LFUN_VC_REPO_UPDATE: LASSERT(buffer, return); if (ensureBufferClean(buffer)) { - string res = buffer->lyxvc().repoUpdate(); - message(from_utf8(res)); + msg = buffer->lyxvc().repoUpdate(); checkExternallyModifiedBuffers(); } break; @@ -2555,6 +2570,9 @@ void GuiView::dispatchVC(FuncRequest const & cmd) default: break; } + + if (!msg.empty()) + message(from_utf8(msg)); } @@ -2592,9 +2610,18 @@ bool GuiView::goToFileRow(string const & argument) { string file_name; int row; - istringstream is(argument); - is >> file_name >> row; - file_name = os::internal_path(file_name); + size_t i = argument.find_last_of(' '); + if (i != string::npos) { + file_name = os::internal_path(trim(argument.substr(0, i))); + istringstream is(argument.substr(i + 1)); + is >> row; + if (is.fail()) + i = string::npos; + } + if (i == string::npos) { + LYXERR0("Wrong argument: " << argument); + return false; + } Buffer * buf = 0; string const abstmp = package().temp_dir().absFilename(); string const realtmp = package().temp_dir().realPath(); @@ -2635,9 +2662,13 @@ bool GuiView::goToFileRow(string const & argument) } +#if (QT_VERSION >= 0x040400) static docstring exportAndDestroy(Buffer * buffer, string const & format) { - bool const success = buffer->doExport(format, true); + bool const update_unincluded = + buffer->params().maintain_unincluded_children + && !buffer->params().getIncludedChildren().empty(); + bool const success = buffer->doExport(format, true, update_unincluded); delete buffer; return success ? bformat(_("Successful export to format: %1$s"), from_utf8(format)) @@ -2647,30 +2678,34 @@ static docstring exportAndDestroy(Buffer * buffer, string const & format) static docstring previewAndDestroy(Buffer * buffer, string const & format) { - bool const success = buffer->preview(format); + bool const update_unincluded = + buffer->params().maintain_unincluded_children + && !buffer->params().getIncludedChildren().empty(); + bool const success = buffer->preview(format, update_unincluded); delete buffer; return success ? bformat(_("Successful preview of format: %1$s"), from_utf8(format)) : bformat(_("Error previewing format: %1$s"), from_utf8(format)); } +#endif -bool GuiView::dispatch(FuncRequest const & cmd) +void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) { BufferView * bv = currentBufferView(); // By default we won't need any update. - if (bv) - bv->cursor().updateFlags(Update::None); + dr.update(Update::None); + // assume cmd will be dispatched + dr.dispatched(true); Buffer * doc_buffer = documentBufferView() ? &(documentBufferView()->buffer()) : 0; - bool dispatched = true; - if (cmd.origin == FuncRequest::TOC) { GuiToc * toc = static_cast(findOrBuild("toc", false)); + // FIXME: do we need to pass a DispatchResult object here? toc->doDispatch(bv->cursor(), cmd); - return true; + return; } string const argument = to_utf8(cmd.argument()); @@ -2688,11 +2723,13 @@ bool GuiView::dispatch(FuncRequest const & cmd) if (!doc_buffer) break; if (cmd.argument() == "custom") { - lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto")); + dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"), + dr); break; } if (doc_buffer->doExport(argument, false)) { - message(bformat(_("Error exporting to format: %1$s."), + dr.setError(true); + dr.setMessage(bformat(_("Error exporting to format: %1$s."), cmd.argument())); } break; @@ -2705,14 +2742,16 @@ bool GuiView::dispatch(FuncRequest const & cmd) if (argument.empty()) format = doc_buffer->getDefaultOutputFormat(); #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400) - ProgressInterface::instance()->clearMessages(); - QString time = QTime::currentTime().toString(Qt::SystemLocaleShortDate); - ProgressInterface::instance()->appendMessage(time + ": Exporting ...\n"); + d.progress_->clearMessages(); + message(_("Exporting ...")); QFuture f = QtConcurrent::run(exportAndDestroy, doc_buffer->clone(), format); d.setPreviewFuture(f); #else - doc_buffer->doExport(format, true); + bool const update_unincluded = + doc_buffer->params().maintain_unincluded_children + && !doc_buffer->params().getIncludedChildren().empty(); + doc_buffer->doExport(format, true, update_unincluded); #endif break; } @@ -2723,14 +2762,16 @@ bool GuiView::dispatch(FuncRequest const & cmd) if (argument.empty()) format = doc_buffer->getDefaultOutputFormat(); #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400) - ProgressInterface::instance()->clearMessages(); - QString time = QTime::currentTime().toString(Qt::SystemLocaleShortDate); - ProgressInterface::instance()->appendMessage(time + ": Previewing ...\n"); + d.progress_->clearMessages(); + message(_("Previewing ...")); QFuture f = QtConcurrent::run(previewAndDestroy, doc_buffer->clone(), format); d.setPreviewFuture(f); #else - doc_buffer->preview(format); + bool const update_unincluded = + doc_buffer->params().maintain_unincluded_children + && !doc_buffer->params().getIncludedChildren().empty(); + doc_buffer->preview(format, update_unincluded); #endif break; } @@ -2746,6 +2787,9 @@ bool GuiView::dispatch(FuncRequest const & cmd) master->clone(), format); d.setPreviewFuture(f); #else + bool const update_unincluded = + master->params().maintain_unincluded_children + && !master->params().getIncludedChildren().empty(); master->doExport(format, true); #endif break; @@ -2770,8 +2814,10 @@ bool GuiView::dispatch(FuncRequest const & cmd) theBufferList().getBuffer(FileName(to_utf8(cmd.argument()))); if (buffer) setBuffer(buffer); - else - message(_("Document not loaded")); + else { + dr.setError(true); + dr.setMessage(_("Document not loaded")); + } } break; @@ -2882,6 +2928,7 @@ bool GuiView::dispatch(FuncRequest const & cmd) // FIXME: get rid of this indirection; GuiView ask the inset // if he is kind enough to update itself... FuncRequest fr(LFUN_INSET_DIALOG_UPDATE, cmd.argument()); + //FIXME: pass DispatchResult here? inset->dispatch(currentBufferView()->cursor(), fr); } else if (name == "paragraph") { lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE)); @@ -2893,9 +2940,9 @@ bool GuiView::dispatch(FuncRequest const & cmd) case LFUN_DIALOG_TOGGLE: { if (isDialogVisible(cmd.getArg(0))) - dispatch(FuncRequest(LFUN_DIALOG_HIDE, cmd.argument())); + dispatch(FuncRequest(LFUN_DIALOG_HIDE, cmd.argument()), dr); else - dispatch(FuncRequest(LFUN_DIALOG_SHOW, cmd.argument())); + dispatch(FuncRequest(LFUN_DIALOG_SHOW, cmd.argument()), dr); break; } @@ -3048,7 +3095,7 @@ bool GuiView::dispatch(FuncRequest const & cmd) break; default: - dispatched = false; + dr.dispatched(false); break; } @@ -3060,7 +3107,7 @@ bool GuiView::dispatch(FuncRequest const & cmd) statusBar()->hide(); } - return dispatched; + return; } @@ -3195,7 +3242,7 @@ char const * const dialognames[] = { "mathmatrix", "mathspace", "nomenclature", "nomencl_print", "note", "paragraph", "phantom", "prefs", "print", "ref", "sendto", "space", "spellchecker", "symbols", "tabular", "tabularcreate", "thesaurus", "texinfo", -"toc", "view-source", "vspace", "wrap"}; +"toc", "view-source", "vspace", "wrap", "progress"}; char const * const * const end_dialognames = dialognames + (sizeof(dialognames) / sizeof(char *)); @@ -3345,8 +3392,12 @@ void GuiView::updateDialogs() for(; it != end; ++it) { Dialog * dialog = it->second.get(); - if (dialog && dialog->isVisibleView()) - dialog->checkStatus(); + if (dialog) { + if (dialog->isBufferDependent() && !documentBufferView()) + hideDialog(fromqstr(dialog->name()), 0); + else if (dialog->isVisibleView()) + dialog->checkStatus(); + } } updateToolbars(); updateLayoutList(); @@ -3403,6 +3454,7 @@ Dialog * createGuiHyperlink(GuiView & lv); Dialog * createGuiVSpace(GuiView & lv); Dialog * createGuiViewSource(GuiView & lv); Dialog * createGuiWrap(GuiView & lv); +Dialog * createGuiProgressView(GuiView & lv); @@ -3508,6 +3560,8 @@ Dialog * GuiView::build(string const & name) return createGuiVSpace(*this); if (name == "wrap") return createGuiWrap(*this); + if (name == "progress") + return createGuiProgressView(*this); return 0; }