comparison mainwindow.cpp @ 175:6def8bf3be44

* Start implementing Settings dialog; add Test function to run on startup to make sure hg works

 #include "colourset.h"
 #include "debug.h"
 #include "logparser.h"
 #include "confirmcommentdialog.h"
 #include "incomingdialog.h"
+#include "settingsdialog.h"
 
 
 MainWindow::MainWindow(QString myDirPath) :
     m_myDirPath(myDirPath)
 {

 
     if (workFolderPath == "") {
         open();
     }
 
-    hgQueryPaths();
+    hgTest();
 }
 
 
 void MainWindow::closeEvent(QCloseEvent *)
 {

 {
     clearState();
     hgQueryPaths();
 }
 
+void MainWindow::hgTest()
+{
+    QStringList params;
+    params << "--version";
+    runner->requestAction(HgAction(ACT_TEST_HG, m_myDirPath, params));
+}
+
 void MainWindow::hgStat()
 {
     QStringList params;
     params << "stat" << "-ardum";
 

 }
 
 void MainWindow::findDiffBinaryName()
 {
     QSettings settings;
+    settings.beginGroup("Locations");
     QString diff = settings.value("extdiffbinary", "").toString();
     if (diff == "") {
         QStringList bases;
         bases << "opendiff" << "kompare" << "kdiff3" << "meld";
         bool found = false;

 }
 
 void MainWindow::findMergeBinaryName()
 {
     QSettings settings;
+    settings.beginGroup("Locations");
     QString merge = settings.value("mergebinary", "").toString();
     if (merge == "") {
         QStringList bases;
         bases << "fmdiff3" << "meld" << "diffuse" << "kdiff3";
         bool found = false;

     return true;
 }
 
 void MainWindow::settings()
 {
-/*!!!
     SettingsDialog *settingsDlg = new SettingsDialog(this);
-    settingsDlg->setModal(true);
     settingsDlg->exec();
-    hgTabs -> clearLists();
-    enableDisableActions();
-    hgStat();
-*/
 }
 
 #define STDOUT_NEEDS_BIG_WINDOW 512
 #define SMALL_WND_W     500
 #define SMALL_WND_H     300

     hgStat();
 }
 
 QString MainWindow::format3(QString head, QString intro, QString code)
 {
-    code = xmlEncode(code).replace("\n", "<br>").replace(" ", "&nbsp;");
+    code = xmlEncode(code).replace("\n", "<br>").replace("-", "&#8209;").replace(" ", "&nbsp;");
     if (intro == "") {
         return QString("<qt><h3>%1</h3><p><code>%2</code></p>")
             .arg(head).arg(code);
     } else if (code == "") {
         return QString("<qt><h3>%1</h3><p>%2</p>")

     // Some commands we just have to ignore bad return values from:
 
     switch(action.action) {
     case ACT_NONE:
         // uh huh
+        return;
+    case ACT_TEST_HG:
+        QMessageBox::warning
+            (this, tr("Failed to run Mercurial"),
+             format3(tr("Failed to run Mercurial"),
+                     tr("The Mercurial program either could not be found or failed to run.<br>This may indicate a problem with the Mercurial installation, or with the EasyHg interaction extension.<br><br>The test command said:"),
+                     output));
+        settings();
         return;
     case ACT_INCOMING:
         // returns non-zero code if the check was successful but there
         // are no changes pending
         if (output.trimmed() == "") showIncoming("");

     bool headsChanged = false;
     QStringList oldHeadIds;
 
     switch (action) {
 
+    case ACT_TEST_HG:
+        break;
+
     case ACT_QUERY_PATHS:
     {
         DEBUG << "stdout is " << output << endl;
         LogParser lp(output, "=");
         LogList ll = lp.parse();

     // of whichever sequence is in use.
 
     bool noMore = false;
 
     switch (action) {
+
+    case ACT_TEST_HG:
+        hgQueryPaths();
+        break;
         
     case ACT_QUERY_PATHS:
         hgQueryBranch();
         break;