# HG changeset patch
# User Chris Cannam
# Date 1293196572 0
# Node ID dbc8d97caaf408af4d8bc32f059926a96222f1c1
# Parent  ff0d76dcb3b8ef94d15702b6411f9c278b102c37
 * Avoid showing hard hyphen on Windows (I had thought this was in previous commit)

diff -r ff0d76dcb3b8 -r dbc8d97caaf4 mainwindow.cpp
--- a/mainwindow.cpp	Fri Dec 24 13:14:45 2010 +0000
+++ b/mainwindow.cpp	Fri Dec 24 13:16:12 2010 +0000
@@ -1285,7 +1285,12 @@
 
 QString MainWindow::format3(QString head, QString intro, QString code)
 {
-    code = xmlEncode(code).replace("\n", "<br>").replace("-", "&#8209;").replace(" ", "&nbsp;");
+    code = xmlEncode(code).replace("\n", "<br>")
+#ifndef Q_OS_WIN32
+           // The hard hyphen comes out funny on Windows
+           .replace("-", "&#8209;")
+#endif
+           .replace(" ", "&nbsp;");
     if (intro == "") {
         return QString("<qt><h3>%1</h3><p><code>%2</code></p>")
             .arg(head).arg(code);
@@ -1622,7 +1627,8 @@
         break;
         
     case ACT_MERGE:
-        QMessageBox::information(this, tr("Update"), tr("<qt><h3>Merge successful</h3><p>%1</p>").arg(xmlEncode(output)));
+        //!!! use format3?
+        QMessageBox::information(this, tr("Merge"), tr("<qt><h3>Merge successful</h3><pre>%1</pre>").arg(xmlEncode(output)));
         shouldHgStat = true;
         justMerged = true;
         break;