#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"
#include "BufferList.h"
#include "BufferParams.h"
#include "BufferView.h"
+#include "Compare.h"
#include "Converter.h"
#include "Cursor.h"
#include "CutAndPaste.h"
#include "Layout.h"
#include "Lexer.h"
#include "LyXAction.h"
-#include "LyXFunc.h"
#include "LyX.h"
#include "LyXRC.h"
#include "LyXVC.h"
#include "support/Path.h"
#include "support/Systemcall.h"
#include "support/Timeout.h"
+#include "support/ProgressInterface.h"
+#include "GuiProgress.h"
#include <QAction>
#include <QApplication>
#include <QSplitter>
#include <QStackedWidget>
#include <QStatusBar>
+#include <QTime>
#include <QTimer>
#include <QToolBar>
#include <QUrl>
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 *)
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_;
};
/// Toolbar store providing access to individual toolbars by name.
-typedef std::map<std::string, GuiToolbar *> ToolbarMap;
+typedef map<string, GuiToolbar *> ToolbarMap;
typedef boost::shared_ptr<Dialog> DialogPtr;
stack_widget_->addWidget(bg_widget_);
stack_widget_->addWidget(splitter_);
setBackground();
+ progress_ = new GuiProgress(gv);
}
~GuiViewPrivate()
delete splitter_;
delete bg_widget_;
delete stack_widget_;
+ delete progress_;
}
QMenu * toolBarPopup(GuiView * parent)
{
stack_widget_->setCurrentWidget(bg_widget_);
bg_widget_->setUpdatesEnabled(true);
+ bg_widget_->setFocus();
}
TabWorkArea * tabWorkArea(int i)
return tabWorkArea(0);
}
+#if (QT_VERSION >= 0x040400)
void setPreviewFuture(QFuture<docstring> const & f)
{
+ 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_;
BackgroundWidget * bg_widget_;
/// view's toolbars
ToolbarMap toolbars_;
+ ProgressInterface* progress_;
/// The main layout box.
/**
* \warning Don't Delete! The layout box is actually owned by
///
QFutureWatcher<docstring> autosave_watcher_;
QFutureWatcher<docstring> preview_watcher_;
+#else
+ struct DummyWatcher { bool isRunning(){return false;} };
+ DummyWatcher preview_watcher_;
#endif
};
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.
// clear session data if any.
QSettings settings;
settings.remove("views");
-
-#if (QT_VERSION >= 0x040400)
- connect(&d.autosave_watcher_, SIGNAL(finished()), this,
- SLOT(threadFinished()));
-#endif
}
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();
return it->second;
LYXERR(Debug::GUI, "Toolbar::display: no toolbar named " << name);
- message(bformat(_("Unknown toolbar \"%1$s\""), from_utf8(name)));
return 0;
}
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);
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);
}
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);
}
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);
}
void GuiView::setFocus()
{
LYXERR(Debug::DEBUG, "GuiView::setFocus()" << this);
- // Make sure LyXFunc points to the correct view.
- guiApp->setCurrentView(this);
QMainWindow::setFocus();
- if (d.current_work_area_)
- d.current_work_area_->setFocus();
+}
+
+
+void GuiView::focusInEvent(QFocusEvent * e)
+{
+ LYXERR(Debug::DEBUG, "GuiView::focusInEvent()" << this);
+ QMainWindow::focusInEvent(e);
+ // Make sure guiApp points to the correct view.
+ guiApp->setCurrentView(this);
+ if (currentMainWorkArea())
+ currentMainWorkArea()->setFocus();
+ else if (currentWorkArea())
+ currentWorkArea()->setFocus();
+ else
+ d.bg_widget_->setFocus();
}
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);
{
if (ForkedProcess::iAmAChild())
return;
+
+ // call is moved to GUI-thread by GuiProgress
+ d.progress_->appendMessage(toqstr(str));
+}
- statusBar()->showMessage(toqstr(str));
+
+void GuiView::updateMessage(QString const & str)
+{
+ statusBar()->showMessage(str);
d.statusbar_timer_.stop();
d.statusbar_timer_.start(3000);
}
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();
}
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());
updateDialogs();
resetWindowTitleAndIconText();
+ updateStatusBar();
if (lyxrc.open_buffers_in_tabs)
// Nothing more to do, the window should stay open.
}
}
#endif
-
- if (d.current_work_area_)
- // Nothing special to do.
- return QMainWindow::event(e);
-
- QKeyEvent * ke = static_cast<QKeyEvent*>(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:
GuiWorkArea const * GuiView::currentMainWorkArea() const
{
- if (d.currentTabWorkArea() == NULL)
- return NULL;
+ if (!d.currentTabWorkArea())
+ return 0;
return d.currentTabWorkArea()->currentWorkArea();
}
GuiWorkArea * GuiView::currentMainWorkArea()
{
- if (d.currentTabWorkArea() == NULL)
- return NULL;
+ if (!d.currentTabWorkArea())
+ return 0;
return d.currentTabWorkArea()->currentWorkArea();
}
void GuiView::setCurrentWorkArea(GuiWorkArea * wa)
{
LYXERR(Debug::DEBUG, "Setting current wa: " << wa << endl);
- if (wa == NULL) {
- d.current_work_area_ = NULL;
+ if (!wa) {
+ d.current_work_area_ = 0;
d.setBackground();
return;
}
- GuiWorkArea * old_gwa = theGuiApp()->currentView()->currentWorkArea();
- if (old_gwa == wa)
+
+ // 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)
return;
if (currentBufferView())
void GuiView::setBuffer(Buffer * newBuffer)
{
- LYXERR(Debug::DEBUG, "Setting buffer: " << newBuffer << std::endl);
+ LYXERR(Debug::DEBUG, "Setting buffer: " << newBuffer << endl);
LASSERT(newBuffer, return);
setBusy(true);
GuiWorkArea * wa = workArea(*newBuffer);
if (wa == 0) {
- newBuffer->masterBuffer()->updateLabels();
+ newBuffer->masterBuffer()->updateBuffer();
wa = addWorkArea(*newBuffer);
} else {
//Disconnect the old buffer...there's no new one.
}
-void GuiView::updateTocItem(std::string const & type, DocIterator const & dit)
+void GuiView::updateTocItem(string const & type, DocIterator const & dit)
{
d.toc_models_.updateItem(toqstr(type), dit);
}
}
+#if (QT_VERSION >= 0x040400)
static docstring saveAndDestroyBuffer(Buffer * buffer, FileName const & fname)
{
bool failed = true;
? _("Automatic save failed!")
: _("Automatic save done.");
}
+#endif
void GuiView::autoSave()
case LFUN_MASTER_BUFFER_UPDATE:
case LFUN_MASTER_BUFFER_VIEW:
- enable = doc_buffer && doc_buffer->parent() != 0;
+ enable = doc_buffer && doc_buffer->parent() != 0
+ && !d.preview_watcher_.isRunning();
break;
case LFUN_BUFFER_UPDATE:
case LFUN_BUFFER_VIEW: {
- if (!doc_buffer) {
+ if (!doc_buffer || d.preview_watcher_.isRunning()) {
enable = false;
break;
}
enable = d.currentTabWorkArea();
break;
- case LFUN_TOOLBAR_TOGGLE:
- if (GuiToolbar * t = toolbar(cmd.getArg(0)))
+ case LFUN_TOOLBAR_TOGGLE: {
+ string const name = cmd.getArg(0);
+ if (GuiToolbar * t = toolbar(name))
flag.setOnOff(t->isVisible());
+ else {
+ enable = false;
+ docstring const msg =
+ bformat(_("Unknown toolbar \"%1$s\""), from_utf8(name));
+ flag.message(msg);
+ }
break;
+ }
case LFUN_DROP_LAYOUTS_CHOICE:
enable = buf;
|| name == "file" //FIXME: should be removed.
|| name == "prefs"
|| name == "texinfo"
+ || name == "progress"
|| name == "compare";
else if (name == "print")
enable = doc_buffer->isExportable("dvi")
case LFUN_VC_LOCKING_TOGGLE:
enable = doc_buffer && !doc_buffer->isReadonly()
&& doc_buffer->lyxvc().lockingToggleEnabled();
- flag.setOnOff(enable && !doc_buffer->lyxvc().locker().empty());
+ flag.setOnOff(enable && doc_buffer->lyxvc().locking());
break;
case LFUN_VC_REVERT:
enable = doc_buffer && doc_buffer->lyxvc().inUse();
enable = false;
break;
}
+ case LFUN_VC_COMPARE:
+ enable = doc_buffer && !cmd.argument().empty()
+ && doc_buffer->lyxvc().prepareFileRevisionEnabled();
+ break;
case LFUN_SERVER_GOTO_FILE_ROW:
break;
docstring str2;
Buffer * buf = loadDocument(fullname);
if (buf) {
- buf->updateLabels();
+ buf->updateBuffer();
setBuffer(buf);
buf->errors("Parse");
str2 = bformat(_("Document %1$s opened."), disp_fn);
Buffer * buf = lv->loadDocument(lyxfile);
if (!buf)
return false;
- buf->updateLabels();
+ buf->updateBuffer();
lv->setBuffer(buf);
buf->errors("Parse");
} else {
bool GuiView::closeBuffer()
{
GuiWorkArea * wa = currentMainWorkArea();
+ setCurrentWorkArea(wa);
Buffer & buf = wa->bufferView().buffer();
return wa && closeWorkArea(wa, !buf.parent());
}
//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)
- theLyXFunc().gotoBookmark(i+1, false, false);
+ guiApp->gotoBookmark(i+1, false, false);
if (saveBufferIfNeeded(buf, false)) {
theBufferList().release(&buf);
buf.removeAutosaveFile();
if (hiding)
// revert all changes
- buf.loadLyXFile(buf.fileName());
+ buf.reload();
buf.markClean();
break;
case 2:
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();
}
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;
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;
if (!buffer || !ensureBufferClean(buffer))
break;
if (buffer->lyxvc().inUse()) {
- message(from_utf8(buffer->lyxvc().checkOut()));
+ msg = buffer->lyxvc().checkOut();
reloadBuffer();
}
break;
frontend::Alert::error(_("Revision control error."),
_("Error when setting the locking property."));
} else {
- message(from_utf8(res));
+ msg = res;
reloadBuffer();
}
}
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;
break;
}
+
+ case LFUN_VC_COMPARE: {
+
+ string rev1 = cmd.getArg(0);
+ string f1, f2;
+
+ // f1
+ if (!buffer->lyxvc().prepareFileRevision(rev1, f1))
+ break;
+
+ if (isStrInt(rev1) && convert<int>(rev1) <= 0) {
+ f2 = buffer->absFileName();
+ } else {
+ string rev2 = cmd.getArg(1);
+ if (rev2.empty())
+ break;
+ // 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()));
+ */
+ break;
+ }
+
default:
break;
}
+
+ if (!msg.empty())
+ message(from_utf8(msg));
}
// This makes insertion of citations and references in the child work,
// when the target is in the parent or another child document.
child->setParent(&buffer);
- child->masterBuffer()->updateLabels();
+ child->masterBuffer()->updateBuffer();
setBuffer(child);
if (parsed)
child->errors("Parse");
{
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();
buf = theBufferList().getBuffer(s);
else if (s.exists()) {
buf = loadDocument(s);
- buf->updateLabels();
+ buf->updateBuffer();
buf->errors("Parse");
} else {
message(bformat(
}
-static docstring exportAndDestroy(Buffer * buffer, docstring const & format)
+#if (QT_VERSION >= 0x040400)
+static docstring exportAndDestroy(Buffer * buffer, string const & format)
{
- bool const success = buffer->doExport(to_utf8(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."), format)
- : bformat(_("Error exporting to format: %1$s."), format);
+ ? bformat(_("Successful export to format: %1$s"), from_utf8(format))
+ : bformat(_("Error exporting to format: %1$s"), from_utf8(format));
}
-static docstring previewAndDestroy(Buffer * buffer, docstring const & format)
+static docstring previewAndDestroy(Buffer * buffer, string const & format)
{
- bool const success = buffer->preview(to_utf8(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."), format)
- : bformat(_("Error previewing format: %1$s."), format);
+ ? 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<GuiToc*>(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());
case LFUN_BUFFER_EXPORT: {
if (!doc_buffer)
break;
- if (cmd.argument() == "custom") {
- lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"));
+ // GCC only sees strfwd.h when building merged
+ if (::lyx::operator==(cmd.argument(), "custom")) {
+ dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"),
+ dr);
break;
}
- if (doc_buffer->doExport(argument, false)) {
- message(bformat(_("Error exporting to format: %1$s."),
+ if (!doc_buffer->doExport(argument, false)) {
+ dr.setError(true);
+ dr.setMessage(bformat(_("Error exporting to format: %1$s."),
cmd.argument()));
}
break;
if (argument.empty())
format = doc_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+ d.progress_->clearMessages();
+ message(_("Exporting ..."));
QFuture<docstring> f = QtConcurrent::run(exportAndDestroy,
- doc_buffer->clone(), from_utf8(format));
+ 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;
}
if (argument.empty())
format = doc_buffer->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+ d.progress_->clearMessages();
+ message(_("Previewing ..."));
QFuture<docstring> f = QtConcurrent::run(previewAndDestroy,
- doc_buffer->clone(), from_utf8(format));
+ 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;
}
format = master->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
QFuture<docstring> f = QtConcurrent::run(exportAndDestroy,
- master->clone(), from_utf8(format));
+ 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;
format = master->getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
QFuture<docstring> f = QtConcurrent::run(previewAndDestroy,
- master->clone(), from_utf8(format));
+ master->clone(), format);
d.setPreviewFuture(f);
#else
master->preview(format);
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;
}
b = theBufferList().next(b);
} while (b != first);
- message(_("All documents saved."));
+ dr.setMessage(_("All documents saved."));
break;
}
// 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));
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;
}
showDialog("symbols", data);
// bug 5274
} else if (name == "prefs" && isFullScreen()) {
- FuncRequest fr(LFUN_INSET_INSERT, "fullscreen");
- lfunUiToggle(fr);
+ lfunUiToggle("fullscreen");
showDialog("prefs", data);
} else
showDialog(name, data);
}
case LFUN_MESSAGE:
- message(cmd.argument());
+ dr.setMessage(cmd.argument());
break;
- case LFUN_UI_TOGGLE:
- lfunUiToggle(cmd);
+ case LFUN_UI_TOGGLE: {
+ string arg = cmd.getArg(0);
+ if (!lfunUiToggle(arg)) {
+ docstring const msg = "ui-toggle " + _("%1$s unknown command!");
+ dr.setMessage(bformat(msg, from_utf8(arg)));
+ }
// Make sure the keyboard focus stays in the work area.
setFocus();
break;
+ }
case LFUN_SPLIT_VIEW: {
LASSERT(doc_buffer, break);
case LFUN_VC_REVERT:
case LFUN_VC_UNDO_LAST:
case LFUN_VC_COMMAND:
+ case LFUN_VC_COMPARE:
dispatchVC(cmd);
break;
break;
default:
- dispatched = false;
+ dr.dispatched(false);
break;
}
statusBar()->hide();
}
- return dispatched;
+ return;
}
-void GuiView::lfunUiToggle(FuncRequest const & cmd)
+bool GuiView::lfunUiToggle(string const & ui_component)
{
- string const arg = cmd.getArg(0);
- if (arg == "scrollbar") {
+ if (ui_component == "scrollbar") {
// hide() is of no help
if (d.current_work_area_->verticalScrollBarPolicy() ==
Qt::ScrollBarAlwaysOff)
else
d.current_work_area_->setVerticalScrollBarPolicy(
Qt::ScrollBarAlwaysOff);
- return;
- }
- if (arg == "statusbar") {
+ } else if (ui_component == "statusbar") {
statusBar()->setVisible(!statusBar()->isVisible());
- return;
- }
- if (arg == "menubar") {
+ } else if (ui_component == "menubar") {
menuBar()->setVisible(!menuBar()->isVisible());
- return;
- }
+ } else
#if QT_VERSION >= 0x040300
- if (arg == "frame") {
+ if (ui_component == "frame") {
int l, t, r, b;
getContentsMargins(&l, &t, &r, &b);
//are the frames in default state?
} else {
setContentsMargins(0, 0, 0, 0);
}
- return;
- }
+ } else
#endif
- if (arg == "fullscreen") {
+ if (ui_component == "fullscreen") {
toggleFullScreen();
- return;
- }
-
- message(bformat("LFUN_UI_TOGGLE " + _("%1$s unknown command!"), from_utf8(arg)));
+ } else
+ return false;
+ return true;
}
"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 *));
void GuiView::resetDialogs()
{
- // Make sure that no LFUN uses any LyXView.
+ // Make sure that no LFUN uses any GuiView.
guiApp->setCurrentView(0);
saveLayout();
menuBar()->clear();
void GuiView::showDialog(string const & name, string const & data,
Inset * inset)
+{
+ triggerShowDialog(toqstr(name), toqstr(data), inset);
+}
+
+
+void GuiView::doShowDialog(QString const & qname, QString const & qdata,
+ Inset * inset)
{
if (d.in_show_)
return;
+ const string name = fromqstr(qname);
+ const string data = fromqstr(qdata);
+
d.in_show_ = true;
try {
Dialog * dialog = findOrBuild(name, false);
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();
}
+Dialog * createDialog(GuiView & lv, string const & name);
// will be replaced by a proper factory...
Dialog * createGuiAbout(GuiView & lv);
-Dialog * createGuiBibitem(GuiView & lv);
Dialog * createGuiBibtex(GuiView & lv);
-Dialog * createGuiBox(GuiView & lv);
-Dialog * createGuiBranch(GuiView & lv);
Dialog * createGuiChanges(GuiView & lv);
Dialog * createGuiCharacter(GuiView & lv);
Dialog * createGuiCitation(GuiView & lv);
Dialog * createGuiDelimiter(GuiView & lv);
Dialog * createGuiDocument(GuiView & lv);
Dialog * createGuiErrorList(GuiView & lv);
-Dialog * createGuiERT(GuiView & lv);
Dialog * createGuiExternal(GuiView & lv);
-Dialog * createGuiFloat(GuiView & lv);
Dialog * createGuiGraphics(GuiView & lv);
Dialog * createGuiInclude(GuiView & lv);
Dialog * createGuiIndex(GuiView & lv);
-Dialog * createGuiInfo(GuiView & lv);
Dialog * createGuiLabel(GuiView & lv);
Dialog * createGuiListings(GuiView & lv);
Dialog * createGuiLog(GuiView & lv);
-Dialog * createGuiMathHSpace(GuiView & lv);
Dialog * createGuiMathMatrix(GuiView & lv);
Dialog * createGuiNomenclature(GuiView & lv);
Dialog * createGuiNote(GuiView & lv);
Dialog * createGuiSpellchecker(GuiView & lv);
Dialog * createGuiSymbols(GuiView & lv);
Dialog * createGuiTabularCreate(GuiView & lv);
-Dialog * createGuiTabular(GuiView & lv);
Dialog * createGuiTexInfo(GuiView & lv);
-Dialog * createGuiTextHSpace(GuiView & lv);
Dialog * createGuiToc(GuiView & lv);
Dialog * createGuiThesaurus(GuiView & lv);
Dialog * createGuiHyperlink(GuiView & lv);
-Dialog * createGuiVSpace(GuiView & lv);
Dialog * createGuiViewSource(GuiView & lv);
Dialog * createGuiWrap(GuiView & lv);
+Dialog * createGuiProgressView(GuiView & lv);
+
Dialog * GuiView::build(string const & name)
{
LASSERT(isValidName(name), return 0);
+ Dialog * dialog = createDialog(*this, name);
+ if (dialog)
+ return dialog;
+
if (name == "aboutlyx")
return createGuiAbout(*this);
- if (name == "bibitem")
- return createGuiBibitem(*this);
if (name == "bibtex")
return createGuiBibtex(*this);
- if (name == "box")
- return createGuiBox(*this);
- if (name == "branch")
- return createGuiBranch(*this);
if (name == "changes")
return createGuiChanges(*this);
if (name == "character")
return createGuiDocument(*this);
if (name == "errorlist")
return createGuiErrorList(*this);
- if (name == "ert")
- return createGuiERT(*this);
if (name == "external")
return createGuiExternal(*this);
if (name == "file")
return createGuiSearch(*this);
if (name == "findreplaceadv")
return createGuiSearchAdv(*this);
- if (name == "float")
- return createGuiFloat(*this);
if (name == "graphics")
return createGuiGraphics(*this);
if (name == "href")
return createGuiIndex(*this);
if (name == "index_print")
return createGuiPrintindex(*this);
- if (name == "info")
- return createGuiInfo(*this);
if (name == "label")
return createGuiLabel(*this);
if (name == "listings")
return createGuiLog(*this);
if (name == "mathdelimiter")
return createGuiDelimiter(*this);
- if (name == "mathspace")
- return createGuiMathHSpace(*this);
if (name == "mathmatrix")
return createGuiMathMatrix(*this);
if (name == "nomenclature")
return createGuiRef(*this);
if (name == "sendto")
return createGuiSendTo(*this);
- if (name == "space")
- return createGuiTextHSpace(*this);
if (name == "spellchecker")
return createGuiSpellchecker(*this);
if (name == "symbols")
return createGuiSymbols(*this);
- if (name == "tabular")
- return createGuiTabular(*this);
if (name == "tabularcreate")
return createGuiTabularCreate(*this);
if (name == "texinfo")
return createGuiToc(*this);
if (name == "view-source")
return createGuiViewSource(*this);
- if (name == "vspace")
- return createGuiVSpace(*this);
if (name == "wrap")
return createGuiWrap(*this);
+ if (name == "progress")
+ return createGuiProgressView(*this);
return 0;
}
projects / features.git / blobdiff