diff mainwindow.cpp @ 275:1244dc3107cb more_information_dialog

* Some work on separating out the "more information" component from dialog messages.  Will need work on layouts

--- a/mainwindow.cpp	Tue Jan 25 16:41:40 2011 +0000
+++ b/mainwindow.cpp	Mon Jan 31 17:23:10 2011 +0000
@@ -43,6 +43,7 @@
 #include "confirmcommentdialog.h"
 #include "incomingdialog.h"
 #include "settingsdialog.h"
+#include "moreinformationdialog.h"
 #include "version.h"
 
 
@@ -1529,6 +1530,11 @@
     }
 }
 
+QString MainWindow::format1(QString head)
+{
+    return QString("<qt><h3>%1</h3></qt>").arg(head);
+}    
+
 QString MainWindow::format3(QString head, QString intro, QString code)
 {
     code = xmlEncode(code).replace("\n", "<br>")
@@ -1596,12 +1602,19 @@
     } else {
         report = tr("Pull complete");
     }
+
+    runner->hide();
+
+    MoreInformationDialog::information(this, tr("Pull complete"),
+                                       format1(report), output);
+
+/*!!!
     report = format3(report, tr("The pull command output was:"), output);
-    runner->hide();
-
-    //!!! and something about updating
+
+    //!!! and something about updating?
 
     QMessageBox::information(this, "Pull complete", report);
+*/
 }
 
 void MainWindow::reportNewRemoteHeads(QString output)