#include <QDesktopWidget>
#include <QDragEnterEvent>
#include <QDropEvent>
+#include <QLabel>
#include <QList>
#include <QMenu>
#include <QMenuBar>
+#include <QMovie>
#include <QPainter>
#include <QPixmap>
#include <QPixmapCache>
using namespace lyx::support;
namespace lyx {
+
+using support::addExtension;
+using support::changeExtension;
+using support::removeExtension;
+
namespace frontend {
namespace {
bool (Buffer::*syncFunc)(string const &, bool, bool) const,
bool (Buffer::*previewFunc)(string const &, bool) const);
- QTimer processing_cursor_timer_;
- bool indicates_processing_;
- QMap<GuiWorkArea*, Qt::CursorShape> orig_cursors_;
QVector<GuiWorkArea*> guiWorkAreas();
};
// For Drag&Drop.
setAcceptDrops(true);
+#if (QT_VERSION >= 0x040400)
+
+ // add busy indicator to statusbar
+ QLabel * busylabel = new QLabel(statusBar());
+ statusBar()->addPermanentWidget(busylabel);
+ QString fn = toqstr(lyx::libFileSearch("images", "busy.gif").absFileName());
+ QMovie * busyanim = new QMovie(fn, QByteArray(), busylabel);
+ busylabel->setMovie(busyanim);
+ busyanim->start();
+ busylabel->hide();
+
+ connect(&d.processing_thread_watcher_, SIGNAL(started()),
+ busylabel, SLOT(show()));
+ connect(&d.processing_thread_watcher_, SIGNAL(finished()),
+ busylabel, SLOT(hide()));
+
statusBar()->setSizeGripEnabled(true);
updateStatusBar();
-#if (QT_VERSION >= 0x040400)
connect(&d.autosave_watcher_, SIGNAL(finished()), this,
SLOT(autoSaveThreadFinished()));
+
+ connect(&d.processing_thread_watcher_, SIGNAL(started()), this,
+ SLOT(processingThreadStarted()));
connect(&d.processing_thread_watcher_, SIGNAL(finished()), this,
SLOT(processingThreadFinished()));
- d.processing_cursor_timer_.setInterval(1000 * 3);
- connect(&d.processing_cursor_timer_, SIGNAL(timeout()), this,
- SLOT(indicateProcessing()));
#endif
connect(this, SIGNAL(triggerShowDialog(QString const &, QString const &, Inset *)),
#if QT_VERSION >= 0x040400
-void GuiView::setCursorShapes(Qt::CursorShape shape)
-{
- QVector<GuiWorkArea*> areas = d.guiWorkAreas();
- Q_FOREACH(GuiWorkArea* wa, areas) {
- wa->setCursorShape(shape);
- }
-}
-
-
-void GuiView::restoreCursorShapes()
-{
- QVector<GuiWorkArea*> areas = d.guiWorkAreas();
- Q_FOREACH(GuiWorkArea* wa, areas) {
- if (d.orig_cursors_.contains(wa)) {
- wa->setCursorShape(d.orig_cursors_[wa]);
- }
- }
-}
-
-
-void GuiView::saveCursorShapes()
-{
- d.orig_cursors_.clear();
- QVector<GuiWorkArea*> areas = d.guiWorkAreas();
- Q_FOREACH(GuiWorkArea* wa, areas) {
- d.orig_cursors_[wa] = wa->cursorShape();
- }
-}
-
-
-void GuiView::indicateProcessing()
-{
- if (d.indicates_processing_) {
- restoreCursorShapes();
- } else {
- setCursorShapes(Qt::BusyCursor);
- }
- d.indicates_processing_ = !d.indicates_processing_;
-}
-
void GuiView::processingThreadStarted()
{
- saveCursorShapes();
- d.indicates_processing_ = false;
- indicateProcessing();
- d.processing_cursor_timer_.start();
}
if (show_errors) {
errors(d.last_export_format);
}
- d.processing_cursor_timer_.stop();
- restoreCursorShapes();
- d.indicates_processing_ = false;
}
+
void GuiView::processingThreadFinished()
{
processingThreadFinished(true);
}
+
void GuiView::autoSaveThreadFinished()
{
processingThreadFinished(false);
#else
-void GuiView::setCursorShapes(Qt::CursorShape)
-{
-}
-
-
-void GuiView::restoreCursorShapes()
-{
-}
-
-
-void GuiView::saveCursorShapes()
-{
-}
-
-
-void GuiView::indicateProcessing()
-{
-}
-
void GuiView::processingThreadStarted()
{
}
+void GuiView::saveUISettings() const
+{
+ // Save the toolbar private states
+ ToolbarMap::iterator end = d.toolbars_.end();
+ for (ToolbarMap::iterator it = d.toolbars_.begin(); it != end; ++it)
+ it->second->saveSession();
+ // Now take care of all other dialogs
+ map<string, DialogPtr>::const_iterator it = d.dialogs_.begin();
+ for (; it!= d.dialogs_.end(); ++it)
+ it->second->saveSession();
+}
+
+
bool GuiView::restoreLayout()
{
QSettings settings;
dialog->prepareView();
if ((dialog = findOrBuild("progress", true)))
dialog->prepareView();
+ if ((dialog = findOrBuild("findreplaceadv", true)))
+ dialog->prepareView();
if (!restoreState(settings.value("layout").toByteArray(), 0))
initToolbars();
QMainWindow::focusInEvent(e);
// Make sure guiApp points to the correct view.
guiApp->setCurrentView(this);
- if (currentMainWorkArea())
- currentMainWorkArea()->setFocus();
- else if (currentWorkArea())
+ if (currentWorkArea())
currentWorkArea()->setFocus();
+ else if (currentMainWorkArea())
+ currentMainWorkArea()->setFocus();
else
d.bg_widget_->setFocus();
}
// Saving fullscreen requires additional tweaks in the toolbar code.
// It wouldn't also work under linux natively.
if (lyxrc.allow_geometry_session) {
- // Save this window geometry and layout.
saveLayout();
- // Then the toolbar private states.
- ToolbarMap::iterator end = d.toolbars_.end();
- for (ToolbarMap::iterator it = d.toolbars_.begin(); it != end; ++it)
- it->second->saveSession();
- // Now take care of all other dialogs:
- map<string, DialogPtr>::const_iterator it = d.dialogs_.begin();
- for (; it!= d.dialogs_.end(); ++it)
- it->second->saveSession();
+ saveUISettings();
}
close_event->accept();
void GuiView::errors(string const & error_type, bool from_master)
{
+ BufferView const * const bv = currentBufferView();
+ if (!bv)
+ return;
+
ErrorList & el = from_master ?
- currentBufferView()->buffer().masterBuffer()->errorList(error_type)
- : currentBufferView()->buffer().errorList(error_type);
+ bv->buffer().masterBuffer()->errorList(error_type) :
+ bv->buffer().errorList(error_type);
+ if (el.empty())
+ return;
+
string data = error_type;
if (from_master)
data = "from_master|" + error_type;
- if (!el.empty())
- showDialog("errorlist", data);
+ showDialog("errorlist", data);
}
if (!buf || buf->isReadonly())
enable = false;
else {
- // FIXME we should consider passthru
- // paragraphs too.
- Inset const & in = currentBufferView()->cursor().inset();
- enable = !in.getLayout().isPassThru();
+ Cursor const & cur = currentBufferView()->cursor();
+ enable = !(cur.inTexted() && cur.paragraph().isPassThru());
}
}
else if (name == "latexlog")
// so no need to do it here. This will ensure that the children end up
// in the session file in the correct order. If we close the master
// buffer, we can close or release the child buffers here too.
+ bool success = true;
if (!closing_) {
ListOfBuffers clist = buf.getChildren();
ListOfBuffers::const_iterator it = clist.begin();
Buffer * child_buf = *it;
GuiWorkArea * child_wa = workArea(*child_buf);
if (child_wa) {
- if (!closeWorkArea(child_wa, true))
- return false;
+ if (!closeWorkArea(child_wa, true)) {
+ success = false;
+ break;
+ }
} else
theBufferList().releaseChild(&buf, child_buf);
}
}
- // goto bookmark to update bookmark pit.
- //FIXME: we should update only the bookmarks related to this buffer!
- LYXERR(Debug::DEBUG, "GuiView::closeBuffer()");
- for (size_t i = 0; i < theSession().bookmarks().size(); ++i)
- guiApp->gotoBookmark(i+1, false, false);
-
- if (saveBufferIfNeeded(buf, false)) {
- buf.removeAutosaveFile();
- theBufferList().release(&buf);
- return true;
+ if (success) {
+ // goto bookmark to update bookmark pit.
+ //FIXME: we should update only the bookmarks related to this buffer!
+ LYXERR(Debug::DEBUG, "GuiView::closeBuffer()");
+ for (size_t i = 0; i < theSession().bookmarks().size(); ++i)
+ guiApp->gotoBookmark(i+1, false, false);
+
+ if (saveBufferIfNeeded(buf, false)) {
+ buf.removeAutosaveFile();
+ theBufferList().release(&buf);
+ return true;
+ }
}
- // open all children again to avoid a crash (bug 6603)
- // FIXME updateMacros() does more than needed
- buf.updateMacros();
- // get rid of dangling inset pointers in TOC (bug 6603)
- buf.tocBackend().update();
+ // open all children again to avoid a crash because of dangling
+ // pointers (bug 6603)
+ buf.updateBuffer();
return false;
}
// in another view, and if this is not a child and if we are closing
// a view (not a tabgroup).
bool const close_buffer =
- !inMultiViews(wa) && !b.parent() && closing_;
+ !inOtherView(b) && !b.parent() && closing_;
if (!closeWorkArea(wa, close_buffer))
return false;
if (wa_ && wa_ != wa)
return true;
}
- return inMultiViews(wa);
+ return inOtherView(buf);
}
-bool GuiView::inMultiViews(GuiWorkArea * wa)
+bool GuiView::inOtherView(Buffer & buf)
{
QList<int> const ids = guiApp->viewIds();
- Buffer & buf = wa->bufferView().buffer();
- int found_twa = 0;
- for (int i = 0; i != ids.size() && found_twa <= 1; ++i) {
+ for (int i = 0; i != ids.size(); ++i) {
if (id_ == ids[i])
continue;
format = used_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
- gv_->processingThreadStarted();
if (!msg.empty()) {
progress_->clearMessages();
gv_->message(msg);
}
case LFUN_DIALOG_TOGGLE: {
- if (isDialogVisible(cmd.getArg(0)))
- dispatch(FuncRequest(LFUN_DIALOG_HIDE, cmd.argument()), dr);
- else
- dispatch(FuncRequest(LFUN_DIALOG_SHOW, cmd.argument()), dr);
+ FuncCode const func_code = isDialogVisible(cmd.getArg(0))
+ ? LFUN_DIALOG_HIDE : LFUN_DIALOG_SHOW;
+ dispatch(FuncRequest(func_code, cmd.argument()), dr);
break;
}
break;
case LFUN_FORWARD_SEARCH: {
- FileName const path(doc_buffer->temppath());
- string const texname = doc_buffer->latexName();
+ Buffer const * doc_master = doc_buffer->masterBuffer();
+ FileName const path(doc_master->temppath());
+ string const texname = doc_master->isChild(doc_buffer)
+ ? DocFileName(changeExtension(
+ doc_buffer->absFileName(),
+ "tex")).mangledFileName()
+ : doc_buffer->latexName();
+ string const mastername =
+ removeExtension(doc_master->latexName());
FileName const dviname(addName(path.absFileName(),
- support::changeExtension(texname, "dvi")));
+ addExtension(mastername, "dvi")));
FileName const pdfname(addName(path.absFileName(),
- support::changeExtension(texname, "pdf")));
+ addExtension(mastername, "pdf")));
if (!dviname.exists() && !pdfname.exists()) {
dr.setMessage(_("Please, preview the document first."));
break;
// Make sure that no LFUN uses any GuiView.
guiApp->setCurrentView(0);
saveLayout();
+ saveUISettings();
menuBar()->clear();
constructToolbars();
guiApp->menus().fillMenuBar(menuBar(), this, false);
if (it == d.dialogs_.end())
return;
- if (inset && currentBufferView()
- && inset != currentBufferView()->editedInset(name))
- return;
+ if (inset) {
+ if (!currentBufferView())
+ return;
+ if (inset != currentBufferView()->editedInset(name))
+ return;
+ }
Dialog * const dialog = it->second.get();
if (dialog->isVisibleView())