comparison mainwindow.cpp @ 172:b6dd1ee0e486

* Fix failure to recognise local uncommitted changes when an untracked file was selected
 * Win32: Look in installed location (currently just the location of the present .exe) for executables as well as in path
 * Win32: Search for easyhg extension in same way as executables
 * Win32: Set installed location to path when running hg commands (for dependent DLLs)

 #include "logparser.h"
 #include "confirmcommentdialog.h"
 #include "incomingdialog.h"
 
 
-MainWindow::MainWindow()
+MainWindow::MainWindow(QString myDirPath) :
+    m_myDirPath(myDirPath)
 {
     QString wndTitle;
 
     fsWatcher = 0;
     commitsSincePush = 0;

     createActions();
     createMenus();
     createToolBars();
     createStatusBar();
 
-    runner = new HgRunner(this);
+    runner = new HgRunner(myDirPath, this);
     connect(runner, SIGNAL(commandCompleted(HgAction, QString)),
             this, SLOT(commandCompleted(HgAction, QString)));
     connect(runner, SIGNAL(commandFailed(HgAction, QString)),
             this, SLOT(commandFailed(HgAction, QString)));
     statusBar()->addPermanentWidget(runner);

     if (diff == "") {
         QStringList bases;
         bases << "opendiff" << "kompare" << "kdiff3" << "meld";
         bool found = false;
         foreach (QString base, bases) {
-            diff = findExecutable(base);
+            diff = findInPath(base, m_myDirPath, true);
             if (diff != base) {
                 found = true;
                 break;
             }
         }

     if (merge == "") {
         QStringList bases;
         bases << "fmdiff3" << "meld" << "diffuse" << "kdiff3";
         bool found = false;
         foreach (QString base, bases) {
-            merge = findExecutable(base);
+            merge = findInPath(base, m_myDirPath, true);
             if (merge != base) {
                 found = true;
                 break;
             }
         }

 
     connect(hgIncomingAct, SIGNAL(triggered()), this, SLOT(hgIncoming()));
     connect(hgPullAct, SIGNAL(triggered()), this, SLOT(hgPull()));
     connect(hgPushAct, SIGNAL(triggered()), this, SLOT(hgPush()));
 
-//    connect(hgTabs, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
-
-//    connect(hgUpdateToRevAct, SIGNAL(triggered()), this, SLOT(hgUpdateToRev()));
     connect(hgAnnotateAct, SIGNAL(triggered()), this, SLOT(hgAnnotate()));
     connect(hgServeAct, SIGNAL(triggered()), this, SLOT(hgServe()));
     connect(clearSelectionsAct, SIGNAL(triggered()), this, SLOT(clearSelections()));
 }
 

 
     connect(hgTabs, SIGNAL(tag(QString)),
             this, SLOT(hgTag(QString)));
 }    
 
-/*!!!
-void MainWindow::tabChanged(int currTab)
-{
-    tabPage = currTab;
-
-}
-*/
 void MainWindow::enableDisableActions()
 {
     DEBUG << "MainWindow::enableDisableActions" << endl;
 
     //!!! should also do things like set the status texts for the

     }
         
     hgMergeAct->setEnabled(localRepoActionsEnabled &&
                            (canMerge || hgTabs->canResolve()));
     hgUpdateAct->setEnabled(localRepoActionsEnabled &&
-                            (canUpdate && !hgTabs->canRevert()));
+                            (canUpdate && !hgTabs->haveChangesToCommit()));
 
     // Set the state field on the file status widget
 
     QString branchText;
     if (currentBranch == "" || currentBranch == "default") {

     } else if (!hgTabs->getAllUnresolvedFiles().empty()) {
         hgTabs->setState(tr("Have unresolved files following merge on %1").arg(branchText));
     } else if (haveMerge) {
         hgTabs->setState(tr("Have merged but not yet committed on %1").arg(branchText));
     } else if (canUpdate) {
-        if (hgTabs->canRevert()) {
+        if (hgTabs->haveChangesToCommit()) {
             // have uncommitted changes
             hgTabs->setState(tr("On %1. Not at the head of the branch").arg(branchText));
         } else {
             // no uncommitted changes
             hgTabs->setState(tr("On %1. Not at the head of the branch: consider updating").arg(branchText));