this, SLOT(changeAdaptor()));
newSettingsRB->setChecked(true);
-
- progressBar->setValue(0);
- progressBar->setEnabled(false);
+ trackingCB->setChecked(true);
closePB->setCursor(Qt::ArrowCursor);
newFileCB->addItem(filename);
oldFileCB->addItem(filename);
}
- if (lyxview().documentBufferView())
- newFileCB->setEditText(toqstr(buffer().absFileName()));
- else
+ if (!restore_filename1.isEmpty())
newFileCB->setEditText(restore_filename1);
+ else if (lyxview().documentBufferView())
+ newFileCB->setEditText(toqstr(buffer().absFileName()));
if (!restore_filename2.isEmpty())
oldFileCB->setEditText(restore_filename2);
QString filename;
if (lyxview().documentBufferView()) {
- QString path = bufferFilepath();
- filename = browseRelFile(in_name, path, title, filters, false,
+ QString path = bufferFilePath();
+ 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);
}
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);
}
if (FileName::isAbsolute(file))
fname.set(file);
else if (lyxview().documentBufferView())
- fname = support::makeAbsPath(file, fromqstr(bufferFilepath()));
+ fname = support::makeAbsPath(file, fromqstr(bufferFilePath()));
if (fname.empty()
|| (!fname.exists() && !theBufferList().getBuffer(fname))) {
return 1;
}
+bool GuiCompare::initialiseParams(std::string const &par)
+{
+ //just for the sake of parsing arguments
+ FuncRequest cmd(LFUN_UNKNOWN_ACTION, par);
+ if (cmd.getArg(0) == "run") {
+ oldFileCB->setEditText(toqstr(cmd.getArg(1)));
+ newFileCB->setEditText(toqstr(cmd.getArg(2)));
+ slotOK();
+ }
+
+ progressBar->setValue(0);
+ progressBar->setEnabled(false);
+ progressBar->setMaximum(1);
+
+ return true;
+}
Dialog * createGuiCompare(GuiView & lv) { return new GuiCompare(lv); }