X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiCompare.cpp;h=09139597469be938ccc75fe36574e6d08d32897f;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=b78f63514990a3baac33b6b138ab3f53b78cc59a;hpb=326ab92c213daadec1ab0a9ad726464935e98dfd;p=lyx.git

diff --git a/src/frontends/qt4/GuiCompare.cpp b/src/frontends/qt4/GuiCompare.cpp
index b78f635149..0913959746 100644
--- a/src/frontends/qt4/GuiCompare.cpp
+++ b/src/frontends/qt4/GuiCompare.cpp
@@ -66,6 +66,8 @@ GuiCompare::GuiCompare(GuiView & lv)
 	progressBar->setValue(0);
 	progressBar->setEnabled(false);
 
+	closePB->setCursor(Qt::ArrowCursor);
+
 	bc().setPolicy(ButtonPolicy::OkApplyCancelPolicy);
 	bc().setOK(okPB);
 }
@@ -170,8 +172,12 @@ QString GuiCompare::browse(QString const & in_name) const
 }
 
 
-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);
@@ -192,7 +198,6 @@ void GuiCompare::enableControls(bool enable) const
 void GuiCompare::error()
 {
 	Alert::error(_("Error"), _("Error while comparing documents."));
-	window_title_ = windowTitle();
 	finished(true);
 }
 
@@ -210,7 +215,6 @@ void GuiCompare::finished(bool aborted)
 			dest_buffer_->markClean();
 			theBufferList().release(dest_buffer_);
 		}
-		setWindowTitle(window_title_);
 		progressBar->setValue(0);
 		statusBar->showMessage(qt_("Aborted"), 5000);
 	} else {
@@ -235,7 +239,6 @@ void GuiCompare::progressMax(int max) const
 {
 	progressBar->setMaximum(max);
 }
-	
 
 
 void GuiCompare::setStatusMessage(QString msg)
@@ -255,8 +258,6 @@ void GuiCompare::slotOK()
 void GuiCompare::slotCancel()
 {
 	if (compare_ && compare_->isRunning()) {
-		window_title_ = windowTitle();
-		setWindowTitle(window_title_ + " " + qt_("(cancelling)"));
 		statusBar->showMessage(qt_("Aborting process..."));
 		compare_->abort();
 	} else {