comparison mainwindow.cpp @ 5:7189e9994a60

Ver 0.3.8: Fixed confusing add- button. Remove does no backup. Merge- button enable fixed.

 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;
 
-        params << "add";
+        QString currentFile = hgExp -> getCurrentFileListLine();
+
+        if (isSelectedUntracked(hgExp -> workFolderFileList))
+        {
+            //User wants to add one file
+            params << "add" << currentFile.mid(2);
+        }
+        else
+        {
+            //Add all untracked files
+            params << "add";
+        }
 
         runner -> startProc(getHgBinaryName(), workFolderPath, params);
         runningAction = ACT_ADD;
     }
 }

     if (runningAction == ACT_NONE)
     {
         QStringList params;
         QString currentFile = hgExp -> getCurrentFileListLine();
 
-        params << "revert" << currentFile.mid(2);
+        params << "revert" << "--no-backup" << currentFile.mid(2);
 
         runner -> startProc(getHgBinaryName(), workFolderPath, params);
         runningAction = ACT_REVERT;
     }
 }

         }
     }
     return false;
 }
 
-void MainWindow::countAMRModifications(QListWidget *workList, int& a, int& m, int& r)
+void MainWindow::countAMRNModifications(QListWidget *workList, int& a, int& m, int& r, int& n)
 {
     int itemCount = workList -> count();
     if (itemCount > 0)
     {
         int A= 0;
         int M=0;
         int R=0;
+        int N=0;
         for (int i = 0; i < workList -> count(); i++)
         {
             QListWidgetItem *currItem = workList -> item(i);
 
             QString tmp = currItem->text().mid(0, 1);

                 R++;
             }
             else if (tmp == "A")
             {
                 A++;
+            }
+            else if (tmp == "?")
+            {
+                N++;
             }
         }
 
         a = A;
         m = M;
         r = R;
+        n = N;
     }
     else
     {
         a = 0;
         m = 0;
         r = 0;
+        n = 0;
     }
 }
 
 
 void MainWindow::timerEvent(QTimerEvent *)

     hgResolveMarkAct -> setEnabled(localRepoActionsEnabled);
     hgAnnotateAct -> setEnabled(localRepoActionsEnabled);
 
     hgExp -> enableDisableOtherTabs();
 
-    int a, m, r;
-    countAMRModifications(hgExp -> workFolderFileList, a, m, r);
+    int a, m, r, n;
+    countAMRNModifications(hgExp -> workFolderFileList, a, m, r, n);
 
     if (tabPage == WORKTAB)
     {
         //Enable / disable actions according to workFolderFileList selections / currentSelection / count
         hgChgSetDiffAct -> setEnabled(false);

             {
                 hgFileDiffAct -> setEnabled(false);
                 hgRevertAct -> setEnabled(false);
             }
 
-            if (!isSelectedUntracked(hgExp -> workFolderFileList))
+            //JK 14.5.2010: Fixed confusing add button. Now this is simple: If we have something to add (any non-tracked files), add is enabled.
+            if (n == 0)
             {
                 hgAddAct -> setEnabled(false);
             }
 
             if (!isSelectedLocallyDeleted(hgExp -> workFolderFileList))

                 hgRemoveAct -> setEnabled(false);
             }
 
             hgResolveListAct -> setEnabled(true);
 
-            if (hgExp -> localRepoHeadsList->count() == 1)
+            if (hgExp -> localRepoHeadsList->count() < 2)
             {
                 hgMergeAct -> setEnabled(false);
             }
 
             QString currentFile = hgExp -> getCurrentFileListLine();

 
     hgRevertAct = new QAction(QIcon(":/images/undo.png"), tr("Undo changes"), this);
     hgRevertAct->setStatusTip(tr("Undo selected working folder file changes (return to local repository version)"));
 
     hgAddAct = new QAction(QIcon(":/images/add.png"), tr("Add files"), this);
-    hgAddAct -> setStatusTip(tr("Add working folder files to local repository (on next commit)"));
+    hgAddAct -> setStatusTip(tr("Add working folder files (selected one or all yet untracked) to local repository (on next commit)"));
 
     hgRemoveAct = new QAction(QIcon(":/images/remove.png"), tr("Remove file"), this);
     hgRemoveAct -> setStatusTip(tr("Remove selected working folder file from local repository (on next commit)"));
 
     hgUpdateAct = new QAction(QIcon(":/images/update.png"), tr("Update working folder"), this);