Mercurial > hg > easyhg

changeset 309:978b8c03118a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make a further couple of dialogs use MoreInformationDialog
author Chris Cannam
date Mon, 28 Feb 2011 14:31:57 +0000
parents 7708149d252a
children b8ed12c2035f
files mainwindow.cpp
diffstat 1 files changed, 7 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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("<qt><h3>Command failed</h3>"
-                         "<p>The following command failed:</p>"
-                         "<code>%1</code>"
-                         "%2</qt>")
-        .arg(command)
-        .arg((output.trimmed() != "") ?
-             tr("<p>Its output said:</p><code>%1</code>")
-             .arg(xmlEncode(output.left(800))
-                  .replace("\n", "<br>"))
-             : "");
-
-    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.<br><br>See &ldquo;More Details&rdquo; for the command output."),
+         output);
 }
 
 void MainWindow::commandCompleted(HgAction completedAction, QString output)