#include "qt_helpers.h"
#include "frontends/alert.h"
+#include "frontends/KeySymbol.h"
#include "buffer_funcs.h"
#include "Buffer.h"
#include "LyXVC.h"
#include "Paragraph.h"
#include "SpellChecker.h"
+#include "Session.h"
#include "TexRow.h"
#include "TextClass.h"
#include "Text.h"
#include "support/lstrings.h"
#include "support/os.h"
#include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
#include "support/Systemcall.h"
#include "support/Timeout.h"
#include "support/ProgressInterface.h"
#include <QDesktopWidget>
#include <QDragEnterEvent>
#include <QDropEvent>
+#include <QFuture>
+#include <QFutureWatcher>
#include <QLabel>
#include <QList>
#include <QMenu>
#include <QMenuBar>
+#include <QMimeData>
#include <QMovie>
#include <QPainter>
#include <QPixmap>
#include <QPixmapCache>
#include <QPoint>
#include <QPushButton>
+#include <QScrollBar>
#include <QSettings>
#include <QShowEvent>
#include <QSplitter>
#include <QStackedWidget>
#include <QStatusBar>
+#include <QtConcurrentRun>
#include <QTime>
#include <QTimer>
#include <QToolBar>
#include <QUrl>
-#include <QScrollBar>
#define EXPORT_in_THREAD 1
-// QtConcurrent was introduced in Qt 4.4
-#if (QT_VERSION >= 0x040400)
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QtConcurrentRun>
-#endif
#include "support/bind.h"
// TODO cleanup, remove the singleton, handle multiple Windows?
progress_ = ProgressInterface::instance();
if (!dynamic_cast<GuiProgress*>(progress_)) {
- progress_ = new GuiProgress(); // TODO who deletes it
+ progress_ = new GuiProgress; // TODO who deletes it
ProgressInterface::setInstance(progress_);
}
QObject::connect(
return tabWorkArea(0);
}
-#if (QT_VERSION >= 0x040400)
+ int countWorkAreasOf(Buffer & buf)
+ {
+ int areas = tabWorkAreaCount();
+ int count = 0;
+ for (int i = 0; i != areas; ++i) {
+ TabWorkArea * twa = tabWorkArea(i);
+ if (twa->workArea(buf))
+ ++count;
+ }
+ return count;
+ }
+
void setPreviewFuture(QFuture<Buffer::ExportStatus> const & f)
{
if (processing_thread_watcher_.isRunning()) {
}
processing_thread_watcher_.setFuture(f);
}
-#endif
public:
GuiView * gv_;
///
TocModels toc_models_;
-#if (QT_VERSION >= 0x040400)
///
QFutureWatcher<docstring> autosave_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 Buffer::ExportStatus previewAndDestroy(Buffer const * orig, Buffer * buffer, string const & format);
#endif
#endif
+ resetWindowTitleAndIconText();
-#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);
-#if (QT_VERSION >= 0x040400)
-
// add busy indicator to statusbar
QLabel * busylabel = new QLabel(statusBar());
statusBar()->addPermanentWidget(busylabel);
connect(&d.processing_thread_watcher_, SIGNAL(finished()), this,
SLOT(processingThreadFinished()));
-#endif
-
connect(this, SIGNAL(triggerShowDialog(QString const &, QString const &, Inset *)),
SLOT(doShowDialog(QString const &, QString const &, Inset *)));
}
-#if QT_VERSION >= 0x040400
-
void GuiView::processingThreadStarted()
{
}
updateToolbars();
}
-#else
-
-void GuiView::processingThreadStarted()
-{
-}
-
-
-void GuiView::processingThreadFinished()
-{
-}
-
-
-void GuiView::autoSaveThreadFinished()
-{
-}
-#endif
-
void GuiView::saveLayout() const
{
dialog->prepareView();
if ((dialog = findOrBuild("progress", true)))
dialog->prepareView();
- if ((dialog = findOrBuild("findreplaceadv", true)))
- dialog->prepareView();
if (!restoreState(settings.value("layout").toByteArray(), 0))
initToolbars();
+
+ // init the toolbars that have not been restored
+ Toolbars::Infos::iterator cit = guiApp->toolbars().begin();
+ Toolbars::Infos::iterator end = guiApp->toolbars().end();
+ for (; cit != end; ++cit) {
+ GuiToolbar * tb = toolbar(cit->name);
+ if (tb && !tb->isRestored())
+ initToolbar(cit->name);
+ }
+
updateDialogs();
return true;
}
// extracts the toolbars from the backend
Toolbars::Infos::iterator cit = guiApp->toolbars().begin();
Toolbars::Infos::iterator end = guiApp->toolbars().end();
- for (; cit != end; ++cit) {
- GuiToolbar * tb = toolbar(cit->name);
- if (!tb)
- continue;
- int const visibility = guiApp->toolbars().defaultVisibility(cit->name);
- bool newline = !(visibility & Toolbars::SAMEROW);
- tb->setVisible(false);
- tb->setVisibility(visibility);
-
- if (visibility & Toolbars::TOP) {
- if (newline)
- addToolBarBreak(Qt::TopToolBarArea);
- addToolBar(Qt::TopToolBarArea, tb);
- }
+ for (; cit != end; ++cit)
+ initToolbar(cit->name);
+}
- if (visibility & Toolbars::BOTTOM) {
- // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
-#if (QT_VERSION >= 0x040202)
- 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)
- if (newline)
- addToolBarBreak(Qt::LeftToolBarArea);
-#endif
- addToolBar(Qt::LeftToolBarArea, tb);
- }
+void GuiView::initToolbar(string const & name)
+{
+ GuiToolbar * tb = toolbar(name);
+ if (!tb)
+ return;
+ int const visibility = guiApp->toolbars().defaultVisibility(name);
+ bool newline = !(visibility & Toolbars::SAMEROW);
+ tb->setVisible(false);
+ tb->setVisibility(visibility);
+
+ if (visibility & Toolbars::TOP) {
+ if (newline)
+ addToolBarBreak(Qt::TopToolBarArea);
+ addToolBar(Qt::TopToolBarArea, tb);
+ }
- if (visibility & Toolbars::RIGHT) {
- // Qt < 4.2.2 cannot handle ToolBarBreak on non-TOP dock.
-#if (QT_VERSION >= 0x040202)
- if (newline)
- addToolBarBreak(Qt::RightToolBarArea);
-#endif
- addToolBar(Qt::RightToolBarArea, tb);
- }
+ if (visibility & Toolbars::BOTTOM) {
+ if (newline)
+ addToolBarBreak(Qt::BottomToolBarArea);
+ addToolBar(Qt::BottomToolBarArea, tb);
+ }
- if (visibility & Toolbars::ON)
- tb->setVisible(true);
+ if (visibility & Toolbars::LEFT) {
+ if (newline)
+ addToolBarBreak(Qt::LeftToolBarArea);
+ addToolBar(Qt::LeftToolBarArea, tb);
}
+
+ if (visibility & Toolbars::RIGHT) {
+ if (newline)
+ addToolBarBreak(Qt::RightToolBarArea);
+ addToolBar(Qt::RightToolBarArea, tb);
+ }
+
+ if (visibility & Toolbars::ON)
+ tb->setVisible(true);
}
return;
setWindowTitle(qt_("LyX: ") + wa->windowTitle());
setWindowIconText(wa->windowIconText());
+#if (QT_VERSION >= 0x040400)
+ // Sets the path for the window: this is used by OSX to
+ // allow a context click on the title bar showing a menu
+ // with the path up to the file
+ setWindowFilePath(toqstr(wa->bufferView().buffer().absFileName()));
+#endif
}
void GuiView::on_currentWorkAreaChanged(GuiWorkArea * wa)
{
- QObject::disconnect(d.current_work_area_, SIGNAL(busy(bool)),
- this, SLOT(setBusy(bool)));
+ if (d.current_work_area_)
+ QObject::disconnect(d.current_work_area_, SIGNAL(busy(bool)),
+ this, SLOT(setBusy(bool)));
disconnectBuffer();
disconnectBufferView();
connectBufferView(wa->bufferView());
void GuiView::showMessage()
{
+ if (busy_)
+ return;
QString msg = toqstr(theGuiApp()->viewStatusMessage());
if (msg.isEmpty()) {
BufferView const * bv = currentBufferView();
}
case QEvent::ShortcutOverride: {
-
-// See bug 4888
-#if (!defined Q_WS_X11) || (QT_VERSION >= 0x040500)
+ // See bug 4888
if (isFullScreen() && menuBar()->isHidden()) {
QKeyEvent * ke = static_cast<QKeyEvent*>(e);
// FIXME: we should also try to detect special LyX shortcut such as
return QMainWindow::event(e);
}
}
-#endif
return QMainWindow::event(e);
}
// It is not a tabbed work area (i.e., the search work area), so it
// should be deleted by other means.
- LASSERT(found_twa, /* */);
+ LASSERT(found_twa, return);
if (d.current_work_area_ == 0) {
if (d.splitter_->count() != 0) {
lyx::getStatus(FuncRequest(LFUN_CHANGES_TRACK)).onOff(true);
bool const mathmacrotemplate =
lyx::getStatus(FuncRequest(LFUN_IN_MATHMACROTEMPLATE)).enabled();
+ bool const ipa =
+ lyx::getStatus(FuncRequest(LFUN_IN_IPA)).enabled();
for (ToolbarMap::iterator it = d.toolbars_.begin(); it != end; ++it)
- it->second->update(math, table, review, mathmacrotemplate);
+ it->second->update(math, table, review, mathmacrotemplate, ipa);
} else
for (ToolbarMap::iterator it = d.toolbars_.begin(); it != end; ++it)
- it->second->update(false, false, false, false);
+ it->second->update(false, false, false, false, false);
}
if (!bv)
return;
-#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+#if EXPORT_in_THREAD
// 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 (QT_VERSION >= 0x040400)
docstring GuiView::GuiViewPrivate::autosaveAndDestroy(
Buffer const * orig, Buffer * clone)
{
? _("Automatic save done.")
: _("Automatic save failed!");
}
-#endif
void GuiView::autoSave()
return;
}
-#if (QT_VERSION >= 0x040400)
GuiViewPrivate::busyBuffers.insert(buffer);
QFuture<docstring> f = QtConcurrent::run(GuiViewPrivate::autosaveAndDestroy,
buffer, buffer->cloneBufferOnly());
d.autosave_watcher_.setFuture(f);
-#else
- buffer->autoSave();
-#endif
resetAutosaveTimers();
}
case LFUN_MASTER_BUFFER_UPDATE:
case LFUN_MASTER_BUFFER_VIEW:
- enable = doc_buffer && doc_buffer->parent() != 0
+ enable = doc_buffer
+ && (doc_buffer->parent() != 0
+ || doc_buffer->hasChildren())
&& !d.processing_thread_watcher_.isRunning();
break;
break;
case LFUN_BUFFER_CLOSE:
+ case LFUN_VIEW_CLOSE:
enable = doc_buffer;
break;
enable = theBufferList().last() != theBufferList().first();
break;
- case LFUN_SPLIT_VIEW:
+ case LFUN_VIEW_SPLIT:
if (cmd.getArg(0) == "vertical")
enable = doc_buffer && (d.splitter_->count() == 1 ||
d.splitter_->orientation() == Qt::Vertical);
d.splitter_->orientation() == Qt::Horizontal);
break;
- case LFUN_CLOSE_TAB_GROUP:
- enable = d.currentTabWorkArea();
+ case LFUN_TAB_GROUP_CLOSE:
+ enable = d.tabWorkAreaCount() > 1;
break;
case LFUN_TOOLBAR_TOGGLE: {
else if (name == "print")
enable = doc_buffer->params().isExportable("dvi")
&& lyxrc.print_command != "none";
- else if (name == "character" || name == "symbols") {
+ else if (name == "character" || name == "symbols"
+ || name == "mathdelimiter" || name == "mathmatrix") {
if (!buf || buf->isReadonly())
enable = false;
else {
else if (name == "latexlog")
enable = FileName(doc_buffer->logName()).isReadableFile();
else if (name == "spellchecker")
- enable = theSpellChecker() && !doc_buffer->isReadonly();
+ enable = theSpellChecker()
+ && !doc_buffer->isReadonly()
+ && !doc_buffer->text().empty();
else if (name == "vclog")
enable = doc_buffer->lyxvc().inUse();
break;
enable = false;
break;
- case LFUN_COMPLETION_COMPLETE:
+ case LFUN_COMPLETE:
if (!d.current_work_area_
|| !d.current_work_area_->completer().inlinePossible(
currentBufferView()->cursor()))
case LFUN_VC_REGISTER:
enable = doc_buffer && !doc_buffer->lyxvc().inUse();
break;
+ case LFUN_VC_RENAME:
+ enable = doc_buffer && doc_buffer->lyxvc().renameEnabled();
+ break;
+ case LFUN_VC_COPY:
+ enable = doc_buffer && doc_buffer->lyxvc().copyEnabled();
+ break;
case LFUN_VC_CHECK_IN:
enable = doc_buffer && doc_buffer->lyxvc().checkInEnabled();
break;
enable = documentBufferView() && documentBufferView()->cursor().inTexted();
break;
+ case LFUN_SPELLING_CONTINUOUSLY:
+ flag.setOnOff(lyxrc.spellcheck_continuously);
+ break;
+
default:
return false;
}
string filename;
if (fname.empty()) {
- FileDialog dlg(qt_("Select document to open"), LFUN_FILE_OPEN);
+ FileDialog dlg(qt_("Select document to open"));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Examples|#E#e"),
toqstr(addPath(package().system_support().absFileName(), "examples")));
- QStringList filter(qt_("LyX Documents (*.lyx)"));
- filter << qt_("LyX-1.3.x Documents (*.lyx13)")
- << qt_("LyX-1.4.x Documents (*.lyx14)")
- << qt_("LyX-1.5.x Documents (*.lyx15)")
- << qt_("LyX-1.6.x Documents (*.lyx16)");
+ QStringList const filter(qt_("LyX Documents (*.lyx)"));
FileDialog::Result result =
dlg.open(toqstr(initpath), filter);
// if the file doesn't exist and isn't already open (bug 6645),
// let the user create one
- if (!fullname.exists() && !theBufferList().exists(fullname)) {
+ if (!fullname.exists() && !theBufferList().exists(fullname) &&
+ !LyXVC::file_not_found_hook(fullname)) {
// the user specifically chose this name. Believe him.
Buffer * const b = newFile(filename, string(), true);
if (b)
string loader_format;
vector<string> loaders = theConverters().loaders();
if (find(loaders.begin(), loaders.end(), format) == loaders.end()) {
- for (vector<string>::const_iterator it = loaders.begin();
- it != loaders.end(); ++it) {
+ vector<string>::const_iterator it = loaders.begin();
+ vector<string>::const_iterator en = loaders.end();
+ for (; it != en; ++it) {
if (!theConverters().isReachable(format, *it))
continue;
docstring const text = bformat(_("Select %1$s file to import"),
formats.prettyName(format));
- FileDialog dlg(toqstr(text), LFUN_BUFFER_IMPORT);
+ FileDialog dlg(toqstr(text));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Examples|#E#e"),
toqstr(addPath(package().system_support().absFileName(), "examples")));
// get absolute path of file
FileName const fullname(support::makeAbsPath(filename));
+ // Can happen if the user entered a path into the dialog
+ // (see bug #7437)
+ if (fullname.onlyFileName().empty()) {
+ docstring msg = bformat(_("The file name '%1$s' is invalid!\n"
+ "Aborting import."),
+ from_utf8(fullname.absFileName()));
+ frontend::Alert::error(_("File name error"), msg);
+ message(_("Canceled."));
+ return;
+ }
+
+
FileName const lyxfile(support::changeExtension(fullname.absFileName(), ".lyx"));
// Check if the document already is open
initpath = trypath;
// FIXME UNICODE
- FileDialog dlg(qt_("Select LyX document to insert"), LFUN_FILE_INSERT);
+ FileDialog dlg(qt_("Select LyX document to insert"));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Examples|#E#e"),
toqstr(addPath(package().system_support().absFileName(),
}
-bool GuiView::renameBuffer(Buffer & b, docstring const & newname)
+bool GuiView::renameBuffer(Buffer & b, docstring const & newname, RenameKind kind)
{
FileName fname = b.fileName();
FileName const oldname = fname;
// No argument? Ask user through dialog.
// FIXME UNICODE
- FileDialog dlg(qt_("Choose a filename to save document as"),
- LFUN_BUFFER_WRITE_AS);
+ FileDialog dlg(qt_("Choose a filename to save document as"));
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
dlg.setButton2(qt_("Templates|#T#t"), toqstr(lyxrc.template_path));
}
// 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"));
+
+ // if there is already a Buffer open with this name, we do not want
+ // to have another one. (the second test makes sure we're not just
+ // trying to overwrite ourselves, which is fine.)
+ if (theBufferList().exists(fname) && fname != oldname
+ && theBufferList().getBuffer(fname) != &b) {
+ docstring const text =
+ bformat(_("The file\n%1$s\nis already open in your current session.\n"
+ "Please close it before attempting to overwrite it.\n"
+ "Do you want to choose a new filename?"),
+ from_utf8(fname.absFileName()));
+ int const ret = Alert::prompt(_("Chosen File Already Open"),
+ text, 0, 1, _("&Rename"), _("&Cancel"));
switch (ret) {
- case 0: break;
- case 1: return renameBuffer(b, docstring());
- case 2: return false;
+ case 0: return renameBuffer(b, docstring(), kind);
+ case 1: return false;
+ }
+ //return false;
+ }
+
+ bool const existsLocal = fname.exists();
+ bool const existsInVC = LyXVC::fileInVC(fname);
+ if (existsLocal || existsInVC) {
+ docstring const file = makeDisplayPath(fname.absFileName(), 30);
+ if (kind != LV_WRITE_AS && existsInVC) {
+ // renaming to a name that is already in VC
+ // would not work
+ docstring text = bformat(_("The document %1$s "
+ "is already registered.\n\n"
+ "Do you want to choose a new name?"),
+ file);
+ docstring const title = (kind == LV_VC_RENAME) ?
+ _("Rename document?") : _("Copy document?");
+ docstring const button = (kind == LV_VC_RENAME) ?
+ _("&Rename") : _("&Copy");
+ int const ret = Alert::prompt(title, text, 0, 1,
+ button, _("&Cancel"));
+ switch (ret) {
+ case 0: return renameBuffer(b, docstring(), kind);
+ case 1: return false;
+ }
+ }
+
+ if (existsLocal) {
+ docstring text = bformat(_("The document %1$s "
+ "already exists.\n\n"
+ "Do 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 renameBuffer(b, docstring(), kind);
+ case 2: return false;
+ }
}
}
- return saveBuffer(b, fname);
+ switch (kind) {
+ case LV_VC_RENAME: {
+ string msg = b.lyxvc().rename(fname);
+ if (msg.empty())
+ return false;
+ message(from_utf8(msg));
+ break;
+ }
+ case LV_VC_COPY: {
+ string msg = b.lyxvc().copy(fname);
+ if (msg.empty())
+ return false;
+ message(from_utf8(msg));
+ break;
+ }
+ case LV_WRITE_AS:
+ break;
+ }
+ // LyXVC created the file already in case of LV_VC_RENAME or
+ // LV_VC_COPY, but call saveBuffer() nevertheless to get
+ // relative paths of included stuff right if we moved e.g. from
+ // /a/b.lyx to /a/c/b.lyx.
+
+ bool const saved = saveBuffer(b, fname);
+ if (saved)
+ b.reload();
+ return saved;
}
struct PrettyNameComparator
{
bool operator()(Format const *first, Format const *second) const {
- return compare_ascii_no_case(first->prettyname(), second->prettyname()) <= 0;
+ return compare_no_case(translateIfPossible(from_ascii(first->prettyname())),
+ translateIfPossible(from_ascii(second->prettyname()))) <= 0;
}
};
-bool GuiView::exportBufferAs(Buffer & b)
+bool GuiView::exportBufferAs(Buffer & b, docstring const & iformat)
{
FileName fname = b.fileName();
dlg.setButton1(qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
QStringList types;
- types << "Any supported format (*.*)";
+ QString const anyformat = qt_("Guess from extension (*.*)");
+ types << anyformat;
Formats::const_iterator it = formats.begin();
vector<Format const *> export_formats;
for (; it != formats.end(); ++it)
- if (it->documentFormat() && it->inExportMenu())
+ if (it->documentFormat())
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() + ")");
+ map<QString, string> fmap;
QString filter;
+ string ext;
+ for (; fit != export_formats.end(); ++fit) {
+ docstring const loc_prettyname =
+ translateIfPossible(from_utf8((*fit)->prettyname()));
+ QString const loc_filter = toqstr(bformat(from_ascii("%1$s (*.%2$s)"),
+ loc_prettyname,
+ from_ascii((*fit)->extension())));
+ types << loc_filter;
+ fmap[loc_filter] = (*fit)->name();
+ if (from_ascii((*fit)->name()) == iformat) {
+ filter = loc_filter;
+ ext = (*fit)->extension();
+ }
+ }
+ string ofname = fname.onlyFileName();
+ if (!ext.empty())
+ ofname = support::changeExtension(ofname, ext);
FileDialog::Result result =
dlg.save(toqstr(fname.onlyPath().absFileName()),
types,
- toqstr(fname.onlyFileName()),
+ toqstr(ofname),
&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")
+ if (filter == anyformat)
fmt_name = formats.getFormatFromExtension(fname.extension());
else
- fmt_name = formats.getFormatFromPrettyName(fmt_prettyname);
- LYXERR(Debug::FILES, "fmt_prettyname=" << fmt_prettyname
+ fmt_name = fmap[filter];
+ LYXERR(Debug::FILES, "filter=" << fromqstr(filter)
<< ", fmt_name=" << fmt_name << ", fname=" << fname.absFileName());
if (fmt_name.empty() || fname.empty())
text, 0, 2, _("&Overwrite"), _("&Rename"), _("&Cancel"));
switch (ret) {
case 0: break;
- case 1: return exportBufferAs(b);
+ case 1: return exportBufferAs(b, from_ascii(fmt_name));
case 2: return false;
}
}
}
-bool GuiView::saveBuffer(Buffer & b) {
+bool GuiView::saveBuffer(Buffer & b)
+{
return saveBuffer(b, FileName());
}
return true;
if (fn.empty() && b.isUnnamed())
- return renameBuffer(b, docstring());
+ return renameBuffer(b, docstring());
- bool success;
- if (fn.empty())
- success = b.save();
- else
- success = b.saveAs(fn);
-
+ bool const success = (fn.empty() ? b.save() : b.saveAs(fn));
if (success) {
theSession().lastFiles().add(b.fileName());
return true;
return false;
}
- return saveBuffer(b);
+ return saveBuffer(b, fn);
}
}
+// We only want to close the buffer if it is not visible in other workareas
+// of the same view, nor in other views, and if this is not a child
bool GuiView::closeWorkArea(GuiWorkArea * wa)
{
Buffer & buf = wa->bufferView().buffer();
- return closeWorkArea(wa, !buf.parent());
+
+ bool last_wa = d.countWorkAreasOf(buf) == 1
+ && !inOtherView(buf) && !buf.parent();
+
+ bool close_buffer = last_wa;
+
+ if (last_wa) {
+ if (lyxrc.close_buffer_with_last_view == "yes")
+ ; // Nothing to do
+ else if (lyxrc.close_buffer_with_last_view == "no")
+ close_buffer = false;
+ else {
+ docstring file;
+ if (buf.isUnnamed())
+ file = from_utf8(buf.fileName().onlyFileName());
+ else
+ file = buf.fileName().displayName(30);
+ docstring const text = bformat(
+ _("Last view on document %1$s is being closed.\n"
+ "Would you like to close or hide the document?\n"
+ "\n"
+ "Hidden documents can be displayed back through\n"
+ "the menu: View->Hidden->...\n"
+ "\n"
+ "To remove this question, set your preference in:\n"
+ " Tools->Preferences->Look&Feel->UserInterface\n"
+ ), file);
+ int ret = Alert::prompt(_("Close or hide document?"),
+ text, 0, 1, _("&Close"), _("&Hide"));
+ close_buffer = (ret == 0);
+ }
+ }
+
+ return closeWorkArea(wa, close_buffer);
}
if (!buffer->lyxvc().inUse()) {
if (buffer->lyxvc().registrer()) {
reloadBuffer(*buffer);
- dr.suppressMessageUpdate();
+ dr.clearMessageUpdate();
+ }
+ }
+ break;
+
+ case LFUN_VC_RENAME:
+ case LFUN_VC_COPY: {
+ if (!buffer || !ensureBufferClean(buffer))
+ break;
+ if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
+ if (buffer->lyxvc().isCheckInWithConfirmation()) {
+ // Some changes are not yet committed.
+ // We test here and not in getStatus(), since
+ // this test is expensive.
+ string log;
+ LyXVC::CommandResult ret =
+ buffer->lyxvc().checkIn(log);
+ dr.setMessage(log);
+ if (ret == LyXVC::ErrorCommand ||
+ ret == LyXVC::VCSuccess)
+ reloadBuffer(*buffer);
+ if (buffer->lyxvc().isCheckInWithConfirmation()) {
+ frontend::Alert::error(
+ _("Revision control error."),
+ _("Document could not be checked in."));
+ break;
+ }
}
+ RenameKind const kind = (cmd.action() == LFUN_VC_RENAME) ?
+ LV_VC_RENAME : LV_VC_COPY;
+ renameBuffer(*buffer, cmd.argument(), kind);
}
break;
+ }
case LFUN_VC_CHECK_IN:
if (!buffer || !ensureBufferClean(buffer))
break;
if (buffer->lyxvc().inUse() && !buffer->isReadonly()) {
- dr.setMessage(buffer->lyxvc().checkIn());
- if (!dr.message().empty())
+ string log;
+ LyXVC::CommandResult ret = buffer->lyxvc().checkIn(log);
+ dr.setMessage(log);
+ // Only skip reloading if the checkin was cancelled or
+ // an error occured before the real checkin VCS command
+ // was executed, since the VCS might have changed the
+ // file even if it could not checkin successfully.
+ if (ret == LyXVC::ErrorCommand || ret == LyXVC::VCSuccess)
reloadBuffer(*buffer);
}
break;
LASSERT(buffer, return);
if (buffer->lyxvc().revert()) {
reloadBuffer(*buffer);
- dr.suppressMessageUpdate();
+ dr.clearMessageUpdate();
}
break;
LASSERT(buffer, return);
buffer->lyxvc().undoLast();
reloadBuffer(*buffer);
- dr.suppressMessageUpdate();
+ dr.clearMessageUpdate();
break;
case LFUN_VC_REPO_UPDATE:
}
-#if (QT_VERSION >= 0x040400)
template<class T>
Buffer::ExportStatus GuiView::GuiViewPrivate::runAndDestroy(const T& func, Buffer const * orig, Buffer * clone, string const & format)
{
Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(Buffer const * orig, Buffer * clone, string const & format)
{
Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
- return runAndDestroy(bind(mem_func, clone, _1, true), orig, clone, format);
+ return runAndDestroy(lyx::bind(mem_func, clone, _1, true), orig, clone, format);
}
Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(Buffer const * orig, Buffer * clone, string const & format)
{
Buffer::ExportStatus (Buffer::* mem_func)(std::string const &, bool) const = &Buffer::doExport;
- return runAndDestroy(bind(mem_func, clone, _1, false), orig, clone, format);
+ return runAndDestroy(lyx::bind(mem_func, clone, _1, false), orig, clone, format);
}
Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(Buffer const * orig, Buffer * clone, string const & format)
{
Buffer::ExportStatus (Buffer::* mem_func)(std::string const &) const = &Buffer::preview;
- return runAndDestroy(bind(mem_func, clone, _1), orig, clone, format);
-}
-
-#else
-
-// not used, but the linker needs them
-
-Buffer::ExportStatus GuiView::GuiViewPrivate::compileAndDestroy(
- Buffer const *, Buffer *, string const &)
-{
- return Buffer::ExportSuccess;
-}
-
-
-Buffer::ExportStatus GuiView::GuiViewPrivate::exportAndDestroy(
- Buffer const *, Buffer *, string const &)
-{
- return Buffer::ExportSuccess;
-}
-
-
-Buffer::ExportStatus GuiView::GuiViewPrivate::previewAndDestroy(
- Buffer const *, Buffer *, string const &)
-{
- return Buffer::ExportSuccess;
+ return runAndDestroy(lyx::bind(mem_func, clone, _1), orig, clone, format);
}
-#endif
-
bool GuiView::GuiViewPrivate::asyncBufferProcessing(
string const & argument,
if (format.empty())
format = used_buffer->params().getDefaultOutputFormat();
processing_format = format;
-#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
+#if EXPORT_in_THREAD
if (!msg.empty()) {
progress_->clearMessages();
gv_->message(msg);
}
GuiViewPrivate::busyBuffers.insert(used_buffer);
+ Buffer * cloned_buffer = used_buffer->cloneFromMaster();
+ if (!cloned_buffer) {
+ Alert::error(_("Export Error"),
+ _("Error cloning the Buffer."));
+ return false;
+ }
QFuture<Buffer::ExportStatus> f = QtConcurrent::run(
asyncFunc,
used_buffer,
- used_buffer->cloneFromMaster(),
+ cloned_buffer,
format);
setPreviewFuture(f);
last_export_format = used_buffer->params().bufferFormat();
void GuiView::dispatchToBufferView(FuncRequest const & cmd, DispatchResult & dr)
{
BufferView * bv = currentBufferView();
- LASSERT(bv, /**/);
+ LASSERT(bv, return);
// Let the current BufferView dispatch its own actions.
bv->dispatch(cmd, dr);
case LFUN_BUFFER_EXPORT: {
if (!doc_buffer)
break;
+ FileName target_dir = doc_buffer->fileName().onlyPath();
+ string const dest = cmd.getArg(1);
+ if (!dest.empty() && FileName::isAbsolute(dest))
+ target_dir = FileName(support::onlyPath(dest));
// GCC only sees strfwd.h when building merged
if (::lyx::operator==(cmd.argument(), "custom")) {
dispatch(FuncRequest(LFUN_DIALOG_SHOW, "sendto"), dr);
break;
}
-#if QT_VERSION < 0x040400
- if (!doc_buffer->doExport(argument, false)) {
- dr.setError(true);
- dr.setMessage(bformat(_("Error exporting to format: %1$s"),
- cmd.argument()));
+ if (!target_dir.isDirWritable()) {
+ exportBufferAs(*doc_buffer, cmd.argument());
+ break;
}
-#else
/* TODO/Review: Is it a problem to also export the children?
See the update_unincluded flag */
d.asyncBufferProcessing(argument,
&Buffer::doExport,
0);
// TODO Inform user about success
-#endif
break;
}
- case LFUN_BUFFER_EXPORT_AS:
+ case LFUN_BUFFER_EXPORT_AS: {
LASSERT(doc_buffer, break);
- exportBufferAs(*doc_buffer);
+ docstring f = cmd.argument();
+ if (f.empty())
+ f = from_ascii(doc_buffer->params().getDefaultOutputFormat());
+ exportBufferAs(*doc_buffer, f);
break;
+ }
case LFUN_BUFFER_UPDATE: {
d.asyncBufferProcessing(argument,
case LFUN_FILE_INSERT_PLAINTEXT:
case LFUN_FILE_INSERT_PLAINTEXT_PARA: {
- bool const as_paragraph = (cmd.action() == LFUN_FILE_INSERT_PLAINTEXT_PARA);
string const fname = to_utf8(cmd.argument());
if (!fname.empty() && !FileName::isAbsolute(fname)) {
dr.setMessage(_("Absolute filename expected."));
FileName filename(fname);
if (fname.empty()) {
- FileDialog dlg(qt_("Select file to insert"), (as_paragraph ?
- LFUN_FILE_INSERT_PLAINTEXT_PARA : LFUN_FILE_INSERT_PLAINTEXT));
+ FileDialog dlg(qt_("Select file to insert"));
FileDialog::Result result = dlg.open(toqstr(bv->buffer().filePath()),
QStringList(qt_("All Files (*)")));
break;
}
- case LFUN_SPLIT_VIEW: {
+ case LFUN_VIEW_SPLIT: {
LASSERT(doc_buffer, break);
string const orientation = cmd.getArg(0);
d.splitter_->setOrientation(orientation == "vertical"
setCurrentWorkArea(wa);
break;
}
- case LFUN_CLOSE_TAB_GROUP:
+ case LFUN_TAB_GROUP_CLOSE:
if (TabWorkArea * twa = d.currentTabWorkArea()) {
closeTabWorkArea(twa);
d.current_work_area_ = 0;
}
break;
+ case LFUN_VIEW_CLOSE:
+ if (TabWorkArea * twa = d.currentTabWorkArea()) {
+ closeWorkArea(twa->currentWorkArea());
+ d.current_work_area_ = 0;
+ twa = d.currentTabWorkArea();
+ // Switch to the next GuiWorkArea in the found TabWorkArea.
+ if (twa) {
+ // Make sure the work area is up to date.
+ setCurrentWorkArea(twa->currentWorkArea());
+ } else {
+ setCurrentWorkArea(0);
+ }
+ }
+ break;
+
case LFUN_COMPLETION_INLINE:
if (d.current_work_area_)
d.current_work_area_->completer().showInline();
break;
- case LFUN_COMPLETION_COMPLETE:
+ case LFUN_COMPLETE:
if (d.current_work_area_)
d.current_work_area_->completer().tab();
break;
break;
case LFUN_VC_REGISTER:
+ case LFUN_VC_RENAME:
+ case LFUN_VC_COPY:
case LFUN_VC_CHECK_IN:
case LFUN_VC_CHECK_OUT:
case LFUN_VC_REPO_UPDATE:
doc_buffer->absFileName(),
"tex")).mangledFileName()
: doc_buffer->latexName();
+ string const fulltexname =
+ support::makeAbsPath(texname, doc_master->temppath()).absFileName();
string const mastername =
removeExtension(doc_master->latexName());
FileName const dviname(addName(path.absFileName(),
command = lyxrc.forward_search_pdf;
}
- int row = doc_buffer->texrow().getRowFromIdPos(bv->cursor().paragraph().id(), bv->cursor().pos());
+ DocIterator tmpcur = bv->cursor();
+ // Leave math first
+ while (tmpcur.inMathed())
+ tmpcur.pop_back();
+ int row = tmpcur.inMathed() ? 0 : doc_buffer->texrow().getRowFromIdPos(
+ tmpcur.paragraph().id(), tmpcur.pos());
LYXERR(Debug::ACTION, "Forward search: row:" << row
- << " id:" << bv->cursor().paragraph().id());
+ << " id:" << tmpcur.paragraph().id());
if (!row || command.empty()) {
dr.setMessage(_("Couldn't proceed."));
break;
string texrow = convert<string>(row);
command = subst(command, "$$n", texrow);
+ command = subst(command, "$$f", fulltexname);
command = subst(command, "$$t", texname);
command = subst(command, "$$o", outname);
one.startscript(Systemcall::DontWait, command);
break;
}
+
+ case LFUN_SPELLING_CONTINUOUSLY:
+ lyxrc.spellcheck_continuously = !lyxrc.spellcheck_continuously;
+ dr.screenUpdate(Update::Force | Update::FitCursor);
+ break;
+
default:
// The LFUN must be for one of BufferView, Buffer or Cursor;
// let's try that:
if (isFullScreen()) {
if (menuBar()->isVisible() && lyxrc.full_screen_menubar)
menuBar()->hide();
- if (statusBar()->isVisible())
- statusBar()->hide();
}
}
} else if (ui_component == "menubar") {
menuBar()->setVisible(!menuBar()->isVisible());
} else
-#if QT_VERSION >= 0x040300
if (ui_component == "frame") {
int l, t, r, b;
getContentsMargins(&l, &t, &r, &b);
setContentsMargins(0, 0, 0, 0);
}
} else
-#endif
if (ui_component == "fullscreen") {
toggleFullScreen();
} else
if (isFullScreen()) {
for (int i = 0; i != d.splitter_->count(); ++i)
d.tabWorkArea(i)->setFullScreen(false);
-#if QT_VERSION >= 0x040300
setContentsMargins(0, 0, 0, 0);
-#endif
setWindowState(windowState() ^ Qt::WindowFullScreen);
restoreLayout();
menuBar()->show();
hideDialogs("prefs", 0);
for (int i = 0; i != d.splitter_->count(); ++i)
d.tabWorkArea(i)->setFullScreen(true);
-#if QT_VERSION >= 0x040300
setContentsMargins(-2, -2, -2, -2);
-#endif
saveLayout();
setWindowState(windowState() ^ Qt::WindowFullScreen);
- statusBar()->hide();
+ if (lyxrc.full_screen_statusbar)
+ statusBar()->hide();
if (lyxrc.full_screen_menubar)
menuBar()->hide();
if (lyxrc.full_screen_toolbars) {
projects / lyx.git / blobdiff