// TODO cleanup, remove the singleton, handle multiple Windows?
progress_ = ProgressInterface::instance();
- if (!dynamic_cast<GuiProgress*>(progress_)) {
+ if (!dynamic_cast<GuiProgress*>(progress_)) {
progress_ = new GuiProgress(); // TODO who deletes it
- ProgressInterface::setInstance(progress_);
+ ProgressInterface::setInstance(progress_);
}
QObject::connect(
- dynamic_cast<GuiProgress*>(progress_),
- SIGNAL(updateStatusBarMessage(QString const&)),
+ dynamic_cast<GuiProgress*>(progress_),
+ SIGNAL(updateStatusBarMessage(QString const&)),
gv, SLOT(updateStatusBarMessage(QString const&)));
QObject::connect(
- dynamic_cast<GuiProgress*>(progress_),
- SIGNAL(clearMessageText()),
+ dynamic_cast<GuiProgress*>(progress_),
+ SIGNAL(clearMessageText()),
gv, SLOT(clearMessageText()));
}
ToolbarMap toolbars_;
ProgressInterface* progress_;
/// The main layout box.
- /**
+ /**
* \warning Don't Delete! The layout box is actually owned by
* whichever toolbar contains it. All the GuiView class needs is a
* means of accessing it.
///
string last_export_format;
#else
- struct DummyWatcher { bool isRunning(){return false;} };
+ struct DummyWatcher { bool isRunning(){return false;} };
DummyWatcher preview_watcher_;
#endif
// filling, at least for the static special menu item on Mac. Otherwise
// they are greyed out.
guiApp->setCurrentView(this);
-
+
// Fill up the menu bar.
guiApp->menus().fillMenuBar(menuBar(), this, true);
vector<const Format *> found_formats;
// Find all formats that have the correct extension.
- vector<const Format *> const & import_formats
+ vector<const Format *> const & import_formats
= theConverters().importableFormats();
vector<const Format *>::const_iterator it = import_formats.begin();
for (; it != import_formats.end(); ++it)
}
string const arg = found_formats[0]->name() + " " + file;
cmd = FuncRequest(LFUN_BUFFER_IMPORT, arg);
- }
+ }
else {
//FIXME: do we have to explicitly check whether it's a lyx file?
LYXERR(Debug::FILES,
{
if (ForkedProcess::iAmAChild())
return;
-
+
// call is moved to GUI-thread by GuiProgress
d.progress_->appendMessage(toqstr(str));
}
GuiWorkArea * GuiView::addWorkArea(Buffer & buffer)
{
// Automatically create a TabWorkArea if there are none yet.
- TabWorkArea * tab_widget = d.splitter_->count()
+ TabWorkArea * tab_widget = d.splitter_->count()
? d.currentTabWorkArea() : addTabWorkArea();
return tab_widget->addWorkArea(buffer, *this);
}
// FIXME: I've no clue why this is here and why it accesses
// theGuiApp()->currentView, which might be 0 (bug 6464).
// See also 27525 (vfr).
- if (theGuiApp()->currentView() == this
- && theGuiApp()->currentView()->currentWorkArea() == wa)
+ if (theGuiApp()->currentView() == this
+ && theGuiApp()->currentView()->currentWorkArea() == wa)
return;
if (currentBufferView())
}
-BufferView const * GuiView::documentBufferView() const
+BufferView const * GuiView::documentBufferView() const
{
return currentMainWorkArea()
? ¤tMainWorkArea()->bufferView()
break;
case LFUN_MASTER_BUFFER_UPDATE:
- case LFUN_MASTER_BUFFER_VIEW:
+ case LFUN_MASTER_BUFFER_VIEW:
enable = doc_buffer && doc_buffer->parent() != 0
&& !d.preview_watcher_.isRunning();
break;
break;
}
b = theBufferList().next(b);
- } while (b != first);
+ } while (b != first);
break;
}
flag.setOnOff(t->isVisible());
else {
enable = false;
- docstring const msg =
+ docstring const msg =
bformat(_("Unknown toolbar \"%1$s\""), from_utf8(name));
flag.message(msg);
}
}
case LFUN_DROP_LAYOUTS_CHOICE:
- enable = buf;
+ enable = buf;
break;
case LFUN_UI_TOGGLE:
case LFUN_BUFFER_ZOOM_IN:
enable = doc_buffer;
break;
-
+
case LFUN_BUFFER_NEXT:
case LFUN_BUFFER_PREVIOUS:
// FIXME: should we check is there is an previous or next buffer?
flag.setOnOff(enable && doc_buffer->lyxvc().locking());
break;
case LFUN_VC_REVERT:
- enable = doc_buffer && doc_buffer->lyxvc().inUse();
+ enable = doc_buffer && doc_buffer->lyxvc().inUse() && !doc_buffer->isReadonly();
break;
case LFUN_VC_UNDO_LAST:
enable = doc_buffer && doc_buffer->lyxvc().undoLastEnabled();
break;
case LFUN_VC_REPO_UPDATE:
- enable = doc_buffer && doc_buffer->lyxvc().inUse();
+ enable = doc_buffer && doc_buffer->lyxvc().repoUpdateEnabled();
break;
case LFUN_VC_COMMAND: {
if (cmd.argument().empty())
break;
}
case LFUN_VC_COMPARE:
- enable = doc_buffer && !cmd.argument().empty()
- && doc_buffer->lyxvc().prepareFileRevisionEnabled();
+ enable = doc_buffer && doc_buffer->lyxvc().prepareFileRevisionEnabled();
break;
case LFUN_SERVER_GOTO_FILE_ROW:
{
FileDialog dlg(qt_("Select template file"));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
- dlg.setButton1(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
+ dlg.setButton2(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
FileDialog::Result result = dlg.open(toqstr(lyxrc.template_path),
QStringList(qt_("LyX Documents (*.lyx)")));
setBusy(false);
return 0;
}
-
+
setBuffer(newBuffer);
// scroll to the position when the file was last closed
filename = fname;
// get absolute path of file and add ".lyx" to the filename if
- // necessary.
- FileName const fullname =
+ // necessary.
+ FileName const fullname =
fileSearch(string(), filename, "lyx", support::may_not_exist);
if (!fullname.empty())
filename = fullname.absFileName();
return;
}
- // if the file doesn't exist and isn't already open (bug 6645),
+ // if the file doesn't exist and isn't already open (bug 6645),
// let the user create one
if (!fullname.exists() && !theBufferList().exists(fullname)) {
// the user specifically chose this name. Believe him.
if (templatefile.empty())
return;
}
-
+
Buffer * b;
if (filename.empty())
b = newUnnamedFile(initpath, to_utf8(_("newfile")), templatefile);
if (b)
setBuffer(b);
- // If no new document could be created, it is unsure
+ // If no new document could be created, it is unsure
// whether there is a valid BufferView.
if (currentBufferView())
// Ensure the cursor is correctly positioned on screen.
// FIXME UNICODE
FileName filename(to_utf8(fname));
-
+
if (!filename.empty()) {
bv->insertLyXFile(filename);
return;
// FIXME UNICODE
FileName filename(to_utf8(fname));
-
+
if (!filename.empty()) {
bv->insertPlaintextFile(filename, asParagraph);
return;
docstring const file = makeDisplayPath(fname.absFileName(), 30);
docstring text = bformat(_("The document %1$s already "
"exists.\n\nDo you want to "
- "overwrite that document?"),
+ "overwrite that document?"),
file);
int const ret = Alert::prompt(_("Overwrite document?"),
text, 0, 2, _("&Overwrite"), _("&Rename"), _("&Cancel"));
// bring the autosave file with us, just in case.
b.moveAutosaveFile(oldauto);
-
+
if (!saveBuffer(b)) {
oldauto = b.getAutosaveFileName();
b.setFileName(oldname.absFileName());
setCurrentWorkArea(currentMainWorkArea());
// We might be in a situation that there is still a tabWorkArea, but
- // there are no tabs anymore. This can happen when we get here after a
+ // there are no tabs anymore. This can happen when we get here after a
// TabWorkArea::lastWorkAreaRemoved() signal. Therefore we count how
// many TabWorkArea's have no documents anymore.
int empty_twa = 0;
// in the session file in the correct order. If we close the master
// buffer, we can close or release the child buffers here too.
if (!closing_) {
- vector<Buffer *> clist = buf.getChildren(false);
- for (vector<Buffer *>::const_iterator it = clist.begin();
- it != clist.end(); ++it) {
+ ListOfBuffers clist = buf.getChildren();
+ ListOfBuffers::const_iterator it = clist.begin();
+ ListOfBuffers::const_iterator const bend = clist.end();
+ for (; it != bend; ++it) {
// If a child is dirty, do not close
// without user intervention
//FIXME: should we look in other tabworkareas?
// We only want to close the buffer if the same buffer is not visible
// in another view, and if this is not a child and if we are closing
// a view (not a tabgroup).
- bool const close_buffer =
+ bool const close_buffer =
!inMultiViews(wa) && !b.parent() && closing_;
if (!closeWorkArea(wa, close_buffer))
docstring const text = bformat(_("The document %1$s has not been "
"saved yet.\n\nDo you want to save "
"the document?"), file);
- ret = Alert::prompt(_("Save new document?"),
+ ret = Alert::prompt(_("Save new document?"),
text, 0, 1, _("&Save"), _("&Cancel"));
if (ret == 1)
++ret;
for (int i = 0; i != ids.size() && found_twa <= 1; ++i) {
if (id_ == ids[i])
continue;
-
+
if (guiApp->view(ids[i]).workArea(buf))
return true;
}
"changes.\n\nDo you want to save "
"the document?"), file);
title = _("Save changed document?");
-
+
} else {
text = bformat(_("The document %1$s has not been "
"saved yet.\n\nDo you want to save "
}
-void GuiView::reloadBuffer()
+bool GuiView::reloadBuffer()
{
Buffer * buf = &documentBufferView()->buffer();
- buf->reload();
+ return buf->reload();
}
}
-//FIXME use a DispatchResult object to transmit messages
-void GuiView::dispatchVC(FuncRequest const & cmd)
+void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
{
- // message for statusbar
- string msg;
Buffer * buffer = documentBufferView()
? &(documentBufferView()->buffer()) : 0;
if (!buffer || !ensureBufferClean(buffer))
break;
if (!buffer->lyxvc().inUse()) {
- if (buffer->lyxvc().registrer())
+ if (buffer->lyxvc().registrer()) {
reloadBuffer();
+ dr.suppressMessageUpdate();
+ }
}
break;
if (!buffer || !ensureBufferClean(buffer))
break;
if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
- msg = buffer->lyxvc().checkIn();
- if (!msg.empty())
+ dr.setMessage(buffer->lyxvc().checkIn());
+ if (!dr.message().empty())
reloadBuffer();
}
break;
if (!buffer || !ensureBufferClean(buffer))
break;
if (buffer->lyxvc().inUse()) {
- msg = buffer->lyxvc().checkOut();
+ dr.setMessage(buffer->lyxvc().checkOut());
reloadBuffer();
}
break;
frontend::Alert::error(_("Revision control error."),
_("Error when setting the locking property."));
} else {
- msg = res;
+ dr.setMessage(res);
reloadBuffer();
}
}
LASSERT(buffer, return);
buffer->lyxvc().revert();
reloadBuffer();
+ dr.suppressMessageUpdate();
break;
case LFUN_VC_UNDO_LAST:
LASSERT(buffer, return);
buffer->lyxvc().undoLast();
reloadBuffer();
+ dr.suppressMessageUpdate();
break;
case LFUN_VC_REPO_UPDATE:
LASSERT(buffer, return);
if (ensureBufferClean(buffer)) {
- msg = buffer->lyxvc().repoUpdate();
+ dr.setMessage(buffer->lyxvc().repoUpdate());
checkExternallyModifiedBuffers();
}
break;
case LFUN_VC_COMPARE: {
+ if (cmd.argument().empty()) {
+ lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "comparehistory"));
+ break;
+ }
+
string rev1 = cmd.getArg(0);
string f1, f2;
if (!buffer->lyxvc().prepareFileRevision(rev2, f2))
break;
}
- // FIXME We need to call comparison feature here.
- // This is quick and dirty code for testing VC.
- // We need that comparison feature has some LFUN_COMPARE <FLAG> file1 file1
- // where <FLAG> specifies whether we want GUI dialog or just launch
- // running with defaults.
- /*
- FileName initpath(lyxrc.document_path);
- Buffer * dest = newUnnamedFile(initpath, to_utf8(_("differences")));
- CompareOptions options;
- Compare * compare = new Compare(loadIfNeeded(FileName(f1)), loadIfNeeded(FileName(f2)), dest, options);
- compare->start(QThread::LowPriority);
- Sleep::millisec(200);
- lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH, dest->absFileName()));
- */
+
+ LYXERR(Debug::LYXVC, "Launching comparison for fetched revisions:\n" <<
+ f1 << "\n" << f2 << "\n" );
+ string par = "compare run " + quoteName(f1) + " " + quoteName(f2);
+ lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, par));
break;
}
default:
break;
}
-
- if (!msg.empty())
- message(from_utf8(msg));
}
// when the target is in the parent or another child document.
child->setParent(&buffer);
- // I don't think this is needed, since it will be called in
+ // I don't think this is needed, since it will be called in
// setBuffer().
// child->masterBuffer()->updateBuffer();
setBuffer(child);
#endif
+
void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
{
BufferView * bv = currentBufferView();
// By default we won't need any update.
- dr.update(Update::None);
+ dr.screenUpdate(Update::None);
// assume cmd will be dispatched
dr.dispatched(true);
break;
// GCC only sees strfwd.h when building merged
if (::lyx::operator==(cmd.argument(), "custom")) {
- dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"),
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"),
dr);
break;
}
case LFUN_BUFFER_UPDATE: {
if (!doc_buffer)
break;
+ docstring msg = _("Exporting ...");
+ Buffer const * used_buffer = doc_buffer;
string format = argument;
- if (argument.empty())
- format = doc_buffer->getDefaultOutputFormat();
+ if (format.empty())
+ format = used_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
- d.progress_->clearMessages();
- message(_("Exporting ..."));
- GuiViewPrivate::busyBuffers.insert(doc_buffer);
- QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::exportAndDestroy,
- doc_buffer, doc_buffer->clone(), format);
+ if (!msg.empty()) {
+ d.progress_->clearMessages();
+ message(msg);
+ }
+ GuiViewPrivate::busyBuffers.insert(used_buffer);
+ QFuture<docstring> f = QtConcurrent::run(
+ GuiViewPrivate::exportAndDestroy,
+ used_buffer,
+ used_buffer->clone(),
+ format);
d.setPreviewFuture(f);
- d.last_export_format = doc_buffer->bufferFormat();
+ d.last_export_format = used_buffer->bufferFormat();
#else
bool const update_unincluded =
- doc_buffer->params().maintain_unincluded_children
- && !doc_buffer->params().getIncludedChildren().empty();
- doc_buffer->doExport(format, true, update_unincluded);
+ used_buffer->params().maintain_unincluded_children &&
+ !used_buffer->params().getIncludedChildren().empty();
+ used_buffer->doExport(format, true, update_unincluded);
#endif
break;
}
case LFUN_BUFFER_VIEW: {
if (!doc_buffer)
break;
+ docstring msg = _("Previewing ...");
+ Buffer const * used_buffer = doc_buffer;
string format = argument;
- if (argument.empty())
- format = doc_buffer->getDefaultOutputFormat();
+ if (format.empty())
+ format = used_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
- d.progress_->clearMessages();
- message(_("Previewing ..."));
- GuiViewPrivate::busyBuffers.insert(doc_buffer);
- QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::previewAndDestroy,
- doc_buffer, doc_buffer->clone(), format);
+ if (!msg.empty()) {
+ d.progress_->clearMessages();
+ message(msg);
+ }
+ GuiViewPrivate::busyBuffers.insert(used_buffer);
+ QFuture<docstring> f = QtConcurrent::run(
+ GuiViewPrivate::previewAndDestroy,
+ used_buffer,
+ used_buffer->clone(),
+ format);
d.setPreviewFuture(f);
- d.last_export_format = doc_buffer->bufferFormat();
+ d.last_export_format = used_buffer->bufferFormat();
#else
bool const update_unincluded =
- doc_buffer->params().maintain_unincluded_children
- && !doc_buffer->params().getIncludedChildren().empty();
- doc_buffer->preview(format, update_unincluded);
+ used_buffer->params().maintain_unincluded_children &&
+ !used_buffer->params().getIncludedChildren().empty();
+ used_buffer->preview(format, update_unincluded);
#endif
break;
}
case LFUN_MASTER_BUFFER_UPDATE: {
if (!doc_buffer)
break;
+ Buffer const * used_buffer = doc_buffer->masterBuffer();
string format = argument;
- Buffer const * master = doc_buffer->masterBuffer();
- if (argument.empty())
- format = master->getDefaultOutputFormat();
+ if (format.empty())
+ format = used_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
- GuiViewPrivate::busyBuffers.insert(master);
- QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::exportAndDestroy,
- master, master->clone(), format);
+ GuiViewPrivate::busyBuffers.insert(used_buffer);
+ QFuture<docstring> f = QtConcurrent::run(
+ GuiViewPrivate::exportAndDestroy,
+ used_buffer,
+ used_buffer->clone(),
+ format);
d.setPreviewFuture(f);
- d.last_export_format = doc_buffer->bufferFormat();
+ d.last_export_format = used_buffer->bufferFormat();
#else
bool const update_unincluded =
- master->params().maintain_unincluded_children
- && !master->params().getIncludedChildren().empty();
- master->doExport(format, true);
+ used_buffer->params().maintain_unincluded_children &&
+ !used_buffer->params().getIncludedChildren().empty();
+ used_buffer->doExport(format, update_unincluded);
#endif
break;
}
case LFUN_MASTER_BUFFER_VIEW: {
+ if (!doc_buffer)
+ break;
+ Buffer const * used_buffer = doc_buffer->masterBuffer();
string format = argument;
- Buffer const * master = doc_buffer->masterBuffer();
- if (argument.empty())
- format = master->getDefaultOutputFormat();
+ if (format.empty())
+ format = used_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
- GuiViewPrivate::busyBuffers.insert(master);
- QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::previewAndDestroy,
- master, master->clone(), format);
+ GuiViewPrivate::busyBuffers.insert(used_buffer);
+ QFuture<docstring> f = QtConcurrent::run(
+ GuiViewPrivate::previewAndDestroy,
+ used_buffer,
+ used_buffer->clone(),
+ format);
d.setPreviewFuture(f);
- d.last_export_format = doc_buffer->bufferFormat();
+ // TODO doc_buffer was used used? Was this this a copy & paste error?
+ d.last_export_format = used_buffer->bufferFormat();
#else
- master->preview(format);
+ used_buffer->preview(format);
#endif
break;
}
dr.setError(true);
dr.setMessage(_("Document not loaded"));
break;
- }
+ }
// Do we open or switch to the buffer in this view ?
- if (workArea(*buffer)
+ if (workArea(*buffer)
|| lyxrc.open_buffers_in_tabs || !documentBufferView()) {
setBuffer(buffer);
break;
- }
-
+ }
+
// Look for the buffer in other views
QList<int> const ids = guiApp->viewIds();
int i = 0;
LYXERR(Debug::ACTION, "Saved " << b->absFileName());
}
b = theBufferList().next(b);
- } while (b != first);
+ } while (b != first);
dr.setMessage(_("All documents saved."));
break;
}
if (!data.empty())
showDialog("character", data);
} else if (name == "latexlog") {
- Buffer::LogType type;
+ Buffer::LogType type;
string const logfile = doc_buffer->logName(&type);
switch (type) {
case Buffer::latexlog:
}
}
break;
-
+
case LFUN_COMPLETION_INLINE:
if (d.current_work_area_)
d.current_work_area_->completer().showInline();
if (lyxrc.zoom < 10)
lyxrc.zoom = 10;
-
+
// The global QPixmapCache is used in GuiPainter to cache text
// painting so we must reset it.
QPixmapCache::clear();
case LFUN_VC_UNDO_LAST:
case LFUN_VC_COMMAND:
case LFUN_VC_COMPARE:
- dispatchVC(cmd);
+ dispatchVC(cmd, dr);
break;
case LFUN_SERVER_GOTO_FILE_ROW:
// docs in LyXAction.cpp.
char const * const dialognames[] = {
+
"aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
-"citation", "compare", "document", "errorlist", "ert", "external",
-"file", "findreplace", "findreplaceadv", "float", "graphics", "href",
-"include", "index", "index_print", "info", "listings", "label", "line",
+"citation", "compare", "comparehistory", "document", "errorlist", "ert",
+"external", "file", "findreplace", "findreplaceadv", "float", "graphics",
+"href", "include", "index", "index_print", "info", "listings", "label", "line",
"log", "mathdelimiter", "mathmatrix", "mathspace", "nomenclature",
"nomencl_print", "note", "paragraph", "phantom", "prefs", "print", "ref",
"sendto", "space", "spellchecker", "symbols", "tabular", "tabularcreate",
-"thesaurus", "texinfo", "toc", "view-source", "vspace", "wrap",
-"progress"};
+"thesaurus", "texinfo", "toc", "view-source", "vspace", "wrap", "progress"};
char const * const * const end_dialognames =
dialognames + (sizeof(dialognames) / sizeof(char *));
currentBufferView()->editInset(name, inset);
// We only set the focus to the new dialog if it was not yet
// visible in order not to change the existing previous behaviour
- if (visible) {
+ if (visible) {
// activateWindow is needed for floating dockviews
dialog->asQWidget()->raise();
dialog->asQWidget()->activateWindow();
Dialog * createGuiCharacter(GuiView & lv);
Dialog * createGuiCitation(GuiView & lv);
Dialog * createGuiCompare(GuiView & lv);
+Dialog * createGuiCompareHistory(GuiView & lv);
Dialog * createGuiDelimiter(GuiView & lv);
Dialog * createGuiDocument(GuiView & lv);
Dialog * createGuiErrorList(GuiView & lv);
Dialog * createGuiInclude(GuiView & lv);
Dialog * createGuiIndex(GuiView & lv);
Dialog * createGuiLabel(GuiView & lv);
-Dialog * createGuiLine(GuiView & lv);
Dialog * createGuiListings(GuiView & lv);
Dialog * createGuiLog(GuiView & lv);
Dialog * createGuiMathMatrix(GuiView & lv);
return createGuiCitation(*this);
if (name == "compare")
return createGuiCompare(*this);
+ if (name == "comparehistory")
+ return createGuiCompareHistory(*this);
if (name == "document")
return createGuiDocument(*this);
if (name == "errorlist")
return createGuiPrintindex(*this);
if (name == "label")
return createGuiLabel(*this);
- if (name == "line")
- return createGuiLine(*this);
if (name == "listings")
return createGuiListings(*this);
if (name == "log")
projects / lyx.git / blobdiff