this, SLOT(changeAdaptor()));
newSettingsRB->setChecked(true);
-
- progressBar->setValue(0);
- progressBar->setEnabled(false);
+ trackingCB->setChecked(true);
closePB->setCursor(Qt::ArrowCursor);
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();
if (dest_buffer_) {
dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
dest_buffer_->absFileName()));
+ if (trackingCB->isChecked()) {
+ dispatch(FuncRequest(LFUN_CHANGES_OUTPUT));
+ dispatch(FuncRequest(LFUN_CHANGES_TRACK));
+ }
}
statusBar->showMessage(qt_("Finished"), 5000);
}
newFileCB->setEditText(toqstr(cmd.getArg(2)));
slotOK();
}
+
+ progressBar->setValue(0);
+ progressBar->setEnabled(false);
+ progressBar->setMaximum(1);
+
return true;
}