#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 {
font.setStyleHint(QFont::SansSerif);
font.setWeight(QFont::Bold);
font.setPointSize(int(toqstr(lyxrc.font_sizes[FONT_SIZE_LARGE]).toDouble()));
- int width = QFontMetrics(font).width(text);
pain.setFont(font);
- pain.drawText(397 - width, 15, text);
+ pain.drawText(190, 225, text);
setFocusPolicy(Qt::StrongFocus);
}
in_show_(false)
{
// hardcode here the platform specific icon size
- smallIconSize = 14; // scaling problems
- normalIconSize = 20; // ok, default
+ smallIconSize = 16; // scaling problems
+ normalIconSize = 20; // ok, default if iconsize.png is missing
bigIconSize = 26; // better for some math icons
+ // if it exists, use width of iconsize.png as normal size
+ QString const dir = toqstr(addPath("images", lyxrc.icon_set));
+ FileName const fn = lyx::libFileSearch(dir, "iconsize.png");
+ if (!fn.empty()) {
+ QImage image(toqstr(fn.absFileName()));
+ if (image.width() < int(smallIconSize))
+ normalIconSize = smallIconSize;
+ else if (image.width() > int(bigIconSize))
+ normalIconSize = bigIconSize;
+ else
+ normalIconSize = image.width();
+ }
+
splitter_ = new QSplitter;
bg_widget_ = new BackgroundWidget;
stack_widget_ = new QStackedWidget;
}
#if (QT_VERSION >= 0x040400)
- void setPreviewFuture(QFuture<docstring> const & f)
+ void setPreviewFuture(QFuture<Buffer::ExportStatus> const & f)
{
if (processing_thread_watcher_.isRunning()) {
// we prefer to cancel this preview in order to keep a snappy
#if (QT_VERSION >= 0x040400)
///
QFutureWatcher<docstring> autosave_watcher_;
- QFutureWatcher<docstring> processing_thread_watcher_;
+ QFutureWatcher<Buffer::ExportStatus> processing_thread_watcher_;
///
string last_export_format;
+ string processing_format;
#else
struct DummyWatcher { bool isRunning(){return false;} };
DummyWatcher processing_thread_watcher_;
#endif
static QSet<Buffer const *> busyBuffers;
- static docstring previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
- static docstring exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
- static docstring compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
+ static Buffer::ExportStatus previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
+ static Buffer::ExportStatus exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
+ static Buffer::ExportStatus compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
static docstring autosaveAndDestroy(Buffer const * orig, Buffer * buffer);
template<class T>
- static docstring runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format, string const & msg);
+ static Buffer::ExportStatus runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format, string const & msg);
// TODO syncFunc/previewFunc: use bind
bool asyncBufferProcessing(string const & argument,
Buffer const * used_buffer,
docstring const & msg,
- docstring (*asyncFunc)(Buffer const *, Buffer *, string const &),
- bool (Buffer::*syncFunc)(string const &, bool, bool) const,
- bool (Buffer::*previewFunc)(string const &, bool) const);
+ Buffer::ExportStatus (*asyncFunc)(Buffer const *, Buffer *, string const &),
+ Buffer::ExportStatus (Buffer::*syncFunc)(string const &, bool) const,
+ Buffer::ExportStatus (Buffer::*previewFunc)(string const &) 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(processingThreadFinished()));
+ 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()
+void GuiView::processingThreadStarted()
{
- 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()
+void GuiView::processingThreadFinished(bool show_errors)
{
- d.orig_cursors_.clear();
- QVector<GuiWorkArea*> areas = d.guiWorkAreas();
- Q_FOREACH(GuiWorkArea* wa, areas) {
- d.orig_cursors_[wa] = wa->cursorShape();
- }
-}
-
+ QFutureWatcher<Buffer::ExportStatus> const * watcher =
+ static_cast<QFutureWatcher<Buffer::ExportStatus> const *>(sender());
-void GuiView::indicateProcessing()
-{
- if (d.indicates_processing_) {
- restoreCursorShapes();
- } else {
- setCursorShapes(Qt::BusyCursor);
+ Buffer::ExportStatus const status = watcher->result();
+ docstring msg;
+ switch (status) {
+ case Buffer::ExportSuccess:
+ msg = _("Successful export to format: %1$s");
+ break;
+ case Buffer::ExportError:
+ case Buffer::ExportNoPathToFormat:
+ case Buffer::ExportTexPathHasSpaces:
+ case Buffer::ExportConverterError:
+ msg = _("Error while exporting format: %1$s");
+ break;
+ case Buffer::PreviewSuccess:
+ msg = _("Successful preview of format: %1$s");
+ break;
+ case Buffer::PreviewError:
+ msg = _("Error while previewing format: %1$s");
+ break;
}
- d.indicates_processing_ = !d.indicates_processing_;
-}
-
-
-void GuiView::processingThreadStarted()
-{
- saveCursorShapes();
- d.indicates_processing_ = false;
- indicateProcessing();
- d.processing_cursor_timer_.start();
+ message(bformat(msg, from_utf8(d.processing_format)));
+
+ updateToolbars();
+ if (show_errors) {
+ BufferView const * const bv = currentBufferView();
+ if (bv && !bv->buffer().errorList("Export").empty()) {
+ errors("Export");
+ return;
+ }
+ errors(d.last_export_format);
+ }
}
void GuiView::processingThreadFinished()
{
- QFutureWatcher<docstring> const * watcher =
- static_cast<QFutureWatcher<docstring> const *>(sender());
- message(watcher->result());
- updateToolbars();
- errors(d.last_export_format);
- d.processing_cursor_timer_.stop();
- restoreCursorShapes();
- d.indicates_processing_ = false;
+ processingThreadFinished(true);
}
-#else
-void GuiView::setCursorShapes(Qt::CursorShape)
+void GuiView::autoSaveThreadFinished()
{
+ processingThreadFinished(false);
}
-
-void GuiView::restoreCursorShapes()
-{
-}
+#else
-void GuiView::saveCursorShapes()
+void GuiView::processingThreadStarted()
{
}
-void GuiView::indicateProcessing()
+void GuiView::processingThreadFinished(bool)
{
}
-void GuiView::processingThreadStarted()
+void GuiView::processingThreadFinished()
{
}
-void GuiView::processingThreadFinished()
+void GuiView::autoSaveThreadFinished()
{
}
#endif
}
+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;
return false;
//code below is skipped when when ~/.config/LyX is (re)created
- setIconSize(settings.value(icon_key).toSize());
+ QSize icon_size = settings.value(icon_key).toSize();
+ // Check whether session size changed.
+ if (icon_size.width() != int(d.smallIconSize) &&
+ icon_size.width() != int(d.normalIconSize) &&
+ icon_size.width() != int(d.bigIconSize)) {
+ icon_size.setWidth(d.normalIconSize);
+ icon_size.setHeight(d.normalIconSize);
+ }
+ setIconSize(icon_size);
+
#ifdef Q_WS_X11
QPoint pos = settings.value("pos", QPoint(50, 50)).toPoint();
QSize size = settings.value("size", QSize(690, 510)).toSize();
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();
}
// No work area, switch to the background widget.
d.setBackground();
+ updateToolbars();
QMainWindow::showEvent(e);
}
// 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();
= theConverters().importableFormats();
vector<const Format *>::const_iterator it = import_formats.begin();
for (; it != import_formats.end(); ++it)
- if ((*it)->extension() == ext)
+ if ((*it)->hasExtension(ext))
found_formats.push_back(*it);
FuncRequest cmd;
void GuiView::on_currentWorkAreaChanged(GuiWorkArea * wa)
{
+ QObject::disconnect(d.current_work_area_, SIGNAL(busy(bool)),
+ this, SLOT(setBusy(bool)));
disconnectBuffer();
disconnectBufferView();
connectBufferView(wa->bufferView());
d.current_work_area_ = wa;
QObject::connect(wa, SIGNAL(titleChanged(GuiWorkArea *)),
this, SLOT(updateWindowTitle(GuiWorkArea *)));
+ QObject::connect(wa, SIGNAL(busy(bool)), this, SLOT(setBusy(bool)));
updateWindowTitle(wa);
structureChanged();
// busy state didn't change
return;
- if (d.current_work_area_) {
- d.current_work_area_->setUpdatesEnabled(!busy);
- if (busy)
- d.current_work_area_->stopBlinkingCursor();
- else
- d.current_work_area_->startBlinkingCursor();
- }
-
- if (busy)
+ if (busy) {
QApplication::setOverrideCursor(Qt::WaitCursor);
- else
- QApplication::restoreOverrideCursor();
+ return;
+ }
+ QApplication::restoreOverrideCursor();
+ updateLayoutList();
}
{
LYXERR(Debug::DEBUG, "Setting buffer: " << newBuffer << endl);
LASSERT(newBuffer, return);
- setBusy(true);
-
+
GuiWorkArea * wa = workArea(*newBuffer);
if (wa == 0) {
+ setBusy(true);
newBuffer->masterBuffer()->updateBuffer();
+ setBusy(false);
wa = addWorkArea(*newBuffer);
// scroll to the position when the BufferView was last closed
if (lyxrc.use_lastfilepos) {
connectBuffer(*newBuffer);
connectBufferView(wa->bufferView());
setCurrentWorkArea(wa);
-
- setBusy(false);
}
void GuiView::errors(string const & error_type, bool from_master)
{
- ErrorList & el = from_master ?
- currentBufferView()->buffer().masterBuffer()->errorList(error_type)
- : currentBufferView()->buffer().errorList(error_type);
+ BufferView const * const bv = currentBufferView();
+ if (!bv)
+ return;
+
+#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+ // We are called with from_master == false by default, so we
+ // have to figure out whether that is the case or not.
+ ErrorList & el = bv->buffer().errorList(error_type);
+ if (el.empty()) {
+ el = bv->buffer().masterBuffer()->errorList(error_type);
+ from_master = true;
+ }
+#else
+ ErrorList const & el = from_master ?
+ bv->buffer().masterBuffer()->errorList(error_type) :
+ bv->buffer().errorList(error_type);
+#endif
+
+ 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);
}
Buffer * buffer = documentBufferView()
? &documentBufferView()->buffer() : 0;
- if (!buffer)
+ if (!buffer) {
+ resetAutosaveTimers();
return;
+ }
#if (QT_VERSION >= 0x040400)
GuiViewPrivate::busyBuffers.insert(buffer);
}
string format = to_utf8(cmd.argument());
if (cmd.argument().empty())
- format = doc_buffer->getDefaultOutputFormat();
- enable = doc_buffer->isExportableFormat(format);
+ format = doc_buffer->params().getDefaultOutputFormat();
+ enable = doc_buffer->params().isExportableFormat(format);
break;
}
}
case LFUN_BUFFER_WRITE_AS:
+ case LFUN_BUFFER_EXPORT_AS:
enable = doc_buffer;
break;
|| name == "progress"
|| name == "compare";
else if (name == "print")
- enable = doc_buffer->isExportable("dvi")
+ enable = doc_buffer->params().isExportable("dvi")
&& lyxrc.print_command != "none";
else if (name == "character" || name == "symbols") {
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")
setBusy(false);
throw(e);
}
+ setBusy(false);
if (!newBuffer) {
message(_("Document not loaded."));
- setBusy(false);
return 0;
}
- newBuffer->errors("Parse");
setBuffer(newBuffer);
+ newBuffer->errors("Parse");
if (tolastfiles)
theSession().lastFiles().add(filename);
- setBusy(false);
return newBuffer;
}
toqstr(addPath(package().system_support().absFileName(), "examples")));
docstring filter = formats.prettyName(format);
- filter += " (*.";
+ filter += " (*.{";
// FIXME UNICODE
- filter += from_utf8(formats.extension(format));
- filter += ')';
+ filter += from_utf8(formats.extensions(format));
+ filter += "})";
FileDialog::Result result =
dlg.open(toqstr(initpath), fileFilters(toqstr(filter)));
}
+struct PrettyNameComparator
+{
+ bool operator()(Format const *first, Format const *second) const {
+ return compare_ascii_no_case(first->prettyname(), second->prettyname()) <= 0;
+ }
+};
+
+
+bool GuiView::exportBufferAs(Buffer & b)
+{
+ FileName fname = b.fileName();
+
+ FileDialog dlg(qt_("Choose a filename to export the document as"));
+ dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+
+ QStringList types;
+ types << "Any supported format (*.*)";
+ Formats::const_iterator it = formats.begin();
+ vector<Format const *> export_formats;
+ for (; it != formats.end(); ++it)
+ if (it->documentFormat() && it->inExportMenu())
+ export_formats.push_back(&(*it));
+ PrettyNameComparator cmp;
+ sort(export_formats.begin(), export_formats.end(), cmp);
+ vector<Format const *>::const_iterator fit = export_formats.begin();
+ for (; fit != export_formats.end(); ++fit)
+ types << toqstr((*fit)->prettyname() + " (*." + (*fit)->extension() + ")");
+ QString filter;
+ FileDialog::Result result =
+ dlg.save(toqstr(fname.onlyPath().absFileName()),
+ types,
+ toqstr(fname.onlyFileName()),
+ &filter);
+ if (result.first != FileDialog::Chosen)
+ return false;
+
+ string s = fromqstr(filter);
+ size_t pos = s.find(" (*.");
+ LASSERT(pos != string::npos, /**/);
+ string fmt_prettyname = s.substr(0, pos);
+ string fmt_name;
+ fname.set(fromqstr(result.second));
+ if (fmt_prettyname == "Any supported format")
+ fmt_name = formats.getFormatFromExtension(fname.extension());
+ else
+ fmt_name = formats.getFormatFromPrettyName(fmt_prettyname);
+ LYXERR(Debug::FILES, "fmt_prettyname=" << fmt_prettyname
+ << ", fmt_name=" << fmt_name << ", fname=" << fname.absFileName());
+
+ if (fmt_name.empty() || fname.empty())
+ return false;
+
+ // fname is now the new Buffer location.
+ if (FileName(fname).exists()) {
+ docstring const file = makeDisplayPath(fname.absFileName(), 30);
+ docstring text = bformat(_("The document %1$s already "
+ "exists.\n\nDo you want to "
+ "overwrite that document?"),
+ file);
+ int const ret = Alert::prompt(_("Overwrite document?"),
+ text, 0, 2, _("&Overwrite"), _("&Rename"), _("&Cancel"));
+ switch (ret) {
+ case 0: break;
+ case 1: return exportBufferAs(b);
+ case 2: return false;
+ }
+ }
+
+ FuncRequest cmd(LFUN_BUFFER_EXPORT, fmt_name + " " + fname.absFileName());
+ DispatchResult dr;
+ dispatch(cmd, dr);
+ return dr.dispatched();
+}
+
+
bool GuiView::saveBuffer(Buffer & b) {
return saveBuffer(b, FileName());
}
// 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 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;
return false;
}
}
+ if (!buf) {
+ message(bformat(
+ _("No buffer for file: %1$s."),
+ makeDisplayPath(file_name))
+ );
+ return false;
+ }
setBuffer(buf);
documentBufferView()->setCursorFromRow(row);
return true;
#if (QT_VERSION >= 0x040400)
template<class T>
-docstring GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format, string const & msg)
+Buffer::ExportStatus GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * buffer, string const & format, string const & msg)
{
- bool const update_unincluded =
- buffer->params().maintain_unincluded_children
- && !buffer->params().getIncludedChildren().empty();
- bool const success = func(format, update_unincluded);
- delete buffer;
+ Buffer::ExportStatus const status = func(format);
+
+ // the cloning operation will have produced a clone of the entire set of
+ // documents, starting from the master. so we must delete those.
+ Buffer * mbuf = const_cast<Buffer *>(buffer->masterBuffer());
+ delete mbuf;
busyBuffers.remove(orig);
- if (msg == "preview") {
- return success
- ? bformat(_("Successful preview of format: %1$s"), from_utf8(format))
- : bformat(_("Error while previewing format: %1$s"), from_utf8(format));
- }
- return success
- ? bformat(_("Successful export to format: %1$s"), from_utf8(format))
- : bformat(_("Error while exporting format: %1$s"), from_utf8(format));
+ return status;
}
-docstring GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
{
- bool (Buffer::* mem_func)(std::string const &, bool, bool) const = &Buffer::doExport;
- return runAndDestroy(bind(mem_func, buffer, _1, true, _2), orig, buffer, format, "export");
+ Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
+ return runAndDestroy(bind(mem_func, buffer, _1, true), orig, buffer, format, "export");
}
-docstring GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
{
- bool (Buffer::* mem_func)(std::string const &, bool, bool) const = &Buffer::doExport;
- return runAndDestroy(bind(mem_func, buffer, _1, false, _2), orig, buffer, format, "export");
+ Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
+ return runAndDestroy(bind(mem_func, buffer, _1, false), orig, buffer, format, "export");
}
-docstring GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
+Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format)
{
- bool(Buffer::* mem_func)(std::string const &, bool) const = &Buffer::preview;
- return runAndDestroy(bind(mem_func, buffer, _1, _2), orig, buffer, format, "preview");
+ Buffer::ExportStatus (Buffer::* mem_func)(std::string const &) const = &Buffer::preview;
+ return runAndDestroy(bind(mem_func, buffer, _1), orig, buffer, format, "preview");
}
#else
// not used, but the linker needs them
-docstring GuiView::GuiViewPrivate::compileAndDestroy(
+Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(
Buffer const *, Buffer *, string const &)
{
- return docstring();
+ return Buffer::ExportSuccess;
}
-docstring GuiView::GuiViewPrivate::exportAndDestroy(
+Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(
Buffer const *, Buffer *, string const &)
{
- return docstring();
+ return Buffer::ExportSuccess;
}
-docstring GuiView::GuiViewPrivate::previewAndDestroy(
+Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(
Buffer const *, Buffer *, string const &)
{
- return docstring();
+ return Buffer::ExportSuccess;
}
#endif
string const & argument,
Buffer const * used_buffer,
docstring const & msg,
- docstring (*asyncFunc)(Buffer const *, Buffer *, string const &),
- bool (Buffer::*syncFunc)(string const &, bool, bool) const,
- bool (Buffer::*previewFunc)(string const &, bool) const)
+ Buffer::ExportStatus (*asyncFunc)(Buffer const *, Buffer *, string const &),
+ Buffer::ExportStatus (Buffer::*syncFunc)(string const &, bool) const,
+ Buffer::ExportStatus (Buffer::*previewFunc)(string const &) const)
{
if (!used_buffer)
return false;
string format = argument;
if (format.empty())
- format = used_buffer->getDefaultOutputFormat();
+ format = used_buffer->params().getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
- gv_->processingThreadStarted();
if (!msg.empty()) {
progress_->clearMessages();
gv_->message(msg);
}
GuiViewPrivate::busyBuffers.insert(used_buffer);
- QFuture<docstring> f = QtConcurrent::run(
+ QFuture<Buffer::ExportStatus> f = QtConcurrent::run(
asyncFunc,
used_buffer,
used_buffer->clone(),
format);
setPreviewFuture(f);
- last_export_format = used_buffer->bufferFormat();
+ processing_format = format;
+ last_export_format = used_buffer->params().bufferFormat();
(void) syncFunc;
(void) previewFunc;
// We are asynchronous, so we don't know here anything about the success
#else
if (syncFunc) {
// TODO check here if it breaks exporting with Qt < 4.4
- bool const update_unincluded =
- used_buffer->params().maintain_unincluded_children &&
- !used_buffer->params().getIncludedChildren().empty();
- return (used_buffer->*syncFunc)(format, true, update_unincluded);
+ return (used_buffer->*syncFunc)(format, true);
} else if (previewFunc) {
return (used_buffer->*previewFunc)(format, false);
}
// Try with the document BufferView dispatch if any.
BufferView * doc_bv = documentBufferView();
- if (doc_bv) {
+ if (doc_bv && doc_bv != bv) {
doc_bv->dispatch(cmd, dr);
if (dr.dispatched())
return;
#if QT_VERSION < 0x040400
if (!doc_buffer->doExport(argument, false)) {
dr.setError(true);
- dr.setMessage(bformat(_("Error exporting to format: %1$s."),
+ dr.setMessage(bformat(_("Error exporting to format: %1$s"),
cmd.argument()));
}
#else
break;
}
+ case LFUN_BUFFER_EXPORT_AS:
+ LASSERT(doc_buffer, break);
+ exportBufferAs(*doc_buffer);
+ break;
+
case LFUN_BUFFER_UPDATE: {
d.asyncBufferProcessing(argument,
doc_buffer,
}
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")));
- if (!dviname.exists() && !pdfname.exists()) {
+ addExtension(mastername, "pdf")));
+ bool const have_dvi = dviname.exists();
+ bool const have_pdf = pdfname.exists();
+ if (!have_dvi && !have_pdf) {
dr.setMessage(_("Please, preview the document first."));
break;
}
string outname = dviname.onlyFileName();
string command = lyxrc.forward_search_dvi;
- if (!dviname.exists() ||
- pdfname.lastModified() > dviname.lastModified()) {
+ if (!have_dvi || (have_pdf &&
+ pdfname.lastModified() > dviname.lastModified())) {
outname = pdfname.onlyFileName();
command = lyxrc.forward_search_pdf;
}
// 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())
projects / lyx.git / blobdiff