this, SLOT(changeAdaptor()));
newSettingsRB->setChecked(true);
+ trackingCB->setChecked(true);
- progressBar->setValue(0);
- progressBar->setEnabled(false);
+ closePB->setCursor(Qt::ArrowCursor);
bc().setPolicy(ButtonPolicy::OkApplyCancelPolicy);
bc().setOK(okPB);
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);
}
}
-void GuiCompare::enableControls(bool enable) const
+void GuiCompare::enableControls(bool enable)
{
+ // Set the hourglass cursor for the dialog, but
+ // never for the cancel button.
+ setCursor(enable ? Qt::ArrowCursor : Qt::WaitCursor);
+
newFileLA->setEnabled(enable);
newFilePB->setEnabled(enable);
newFileCB->setEnabled(enable);
void GuiCompare::error()
{
Alert::error(_("Error"), _("Error while comparing documents."));
- window_title_ = windowTitle();
finished(true);
}
dest_buffer_->markClean();
theBufferList().release(dest_buffer_);
}
- setWindowTitle(window_title_);
progressBar->setValue(0);
- statusBar->showMessage(qt_("Aborted"));
+ statusBar->showMessage(qt_("Aborted"), 5000);
} else {
hideView();
bc().ok();
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"));
+ statusBar->showMessage(qt_("Finished"), 5000);
}
}
{
progressBar->setMaximum(max);
}
-
void GuiCompare::setStatusMessage(QString msg)
void GuiCompare::slotCancel()
{
if (compare_ && compare_->isRunning()) {
- window_title_ = windowTitle();
- setWindowTitle(window_title_ + " " + qt_("(cancelling)"));
statusBar->showMessage(qt_("Aborting process..."));
compare_->abort();
} else {
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); }