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);
}
{
// hardcode here the platform specific icon size
smallIconSize = 16; // scaling problems
- normalIconSize = 22; // ok, default
+ 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;
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();
// No work area, switch to the background widget.
d.setBackground();
+ updateToolbars();
QMainWindow::showEvent(e);
}
= 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;
return;
if (d.current_work_area_) {
- d.current_work_area_->setUpdatesEnabled(!busy);
+ //Why would we want to stop updates only for one workarea and
+ //not for the others ? This leads to problems as in #7314 (vfr).
+ //d.current_work_area_->setUpdatesEnabled(!busy);
if (busy)
d.current_work_area_->stopBlinkingCursor();
else
{
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);
}
if (!bv)
return;
- ErrorList & el = from_master ?
+#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 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())
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());
}
return false;
}
}
+ if (!buf) {
+ message(bformat(
+ _("No buffer for file: %1$s."),
+ makeDisplayPath(file_name))
+ );
+ return false;
+ }
setBuffer(buf);
documentBufferView()->setCursorFromRow(row);
return true;
buffer->params().maintain_unincluded_children
&& !buffer->params().getIncludedChildren().empty();
bool const success = func(format, update_unincluded);
- delete buffer;
+
+ // 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
string format = argument;
if (format.empty())
- format = used_buffer->getDefaultOutputFormat();
+ format = used_buffer->params().getDefaultOutputFormat();
#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
if (!msg.empty()) {
used_buffer->clone(),
format);
setPreviewFuture(f);
- last_export_format = used_buffer->bufferFormat();
+ last_export_format = used_buffer->params().bufferFormat();
(void) syncFunc;
(void) previewFunc;
// We are asynchronous, so we don't know here anything about the success
// 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,
addExtension(mastername, "dvi")));
FileName const pdfname(addName(path.absFileName(),
addExtension(mastername, "pdf")));
- if (!dviname.exists() && !pdfname.exists()) {
+ 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;
}
projects / lyx.git / blobdiff