void GuiCompare::closeEvent(QCloseEvent *)
{
- slotCancel();
+ slotCancel();
}
QString const title = qt_("Select document");
QStringList const & filters = fileFilters(qt_("LyX Documents (*.lyx)"));
-
+
QString filename;
if (lyxview().documentBufferView()) {
QString path = bufferFilePath();
- filename = browseRelFile(in_name, path, title, filters, false,
+ filename = browseRelToParent(in_name, path, title, filters, false,
qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
} else {
QString path = toqstr(lyxrc.document_path);
- QString rel_filename = browseRelFile(in_name, path, title, filters, false,
+ QString rel_filename = browseRelToParent(in_name, path, title, filters, false,
qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
filename = makeAbsPath(rel_filename, path);
}
- return filename;
+ return filename;
}
delete compare_;
compare_ = 0;
}
-
+
if (aborted) {
if (dest_buffer_) {
dest_buffer_->markClean();
progressBar->setValue(0);
progressBar->setEnabled(false);
- progressBar->setMaximum(100);
+ progressBar->setMaximum(1);
return true;
}