# HG changeset patch # User Chris Cannam # Date 1298903517 0 # Node ID 978b8c03118a303dc200ffa88f351c5510c789ac # Parent 7708149d252a5f6432118fe89bd8111e09c21454 Make a further couple of dialogs use MoreInformationDialog diff -r 7708149d252a -r 978b8c03118a mainwindow.cpp --- a/mainwindow.cpp Sat Feb 26 23:04:05 2011 +0000 +++ b/mainwindow.cpp Mon Feb 28 14:31:57 2011 +0000 @@ -1720,7 +1720,7 @@ settings(); return; case ACT_TEST_HG_EXT: - QMessageBox::warning + MoreInformationDialog::warning (this, tr("Failed to run Mercurial"), tr("Failed to run Mercurial with extension enabled"), @@ -1771,20 +1771,12 @@ command += " " + arg; } - //!!! - - QString message = tr("

Command failed

" - "

The following command failed:

" - "%1" - "%2
") - .arg(command) - .arg((output.trimmed() != "") ? - tr("

Its output said:

%1") - .arg(xmlEncode(output.left(800)) - .replace("\n", "
")) - : ""); - - QMessageBox::warning(this, tr("Command failed"), message); + MoreInformationDialog::warning + (this, + tr("Command failed"), + tr("Command failed"), + tr("A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.

See “More Details” for the command output."), + output); } void MainWindow::commandCompleted(HgAction completedAction, QString output)