comparison mainwindow.cpp @ 17:9b52042baf39

Implemented multiple selection to work folder list (and changes to add/commit logic).

 *************************************************************************************/
 
 #include <QtGui>
 #include <QStringList>
 #include <QDir>
+#include <QHostAddress>
+#include <QHostInfo>
 
 #include "mainwindow.h"
 #include "settingsdialog.h"
 
 

     {
         QStringList params;
 
         QString currentFile = hgExp -> getCurrentFileListLine();
 
-        if (isSelectedUntracked(hgExp -> workFolderFileList))
-        {
-            //User wants to add one file
-            params << "add" << currentFile.mid(2);
+        if (areAllSelectedUntracked(hgExp -> workFolderFileList))
+        {
+            //User wants to add selected file(s)
+            params << "add";
+
+            QList <QListWidgetItem *> selList = hgExp -> workFolderFileList -> selectedItems();
+
+            for (int i = 0; i < selList.size(); ++i)
+            {
+                QString tmp = selList.at(i)->text();
+                params.append(tmp.mid(2));
+            }
         }
         else
         {
             //Add all untracked files
             params << "add";

         {
             if (!comment.isEmpty())
             {
                 QString currentFile = hgExp -> getCurrentFileListLine();
 
-                if (isSelectedCommitable(hgExp -> workFolderFileList))
+                if (areAllSelectedCommitable(hgExp -> workFolderFileList))
                 {
-                    //User wants to commit only one file
-                    params << "commit" << "--message" << comment << "--user" << userInfo << currentFile.mid(2);
+                    //User wants to commit selected file(s)
+                    params << "commit" << "--message" << comment << "--user" << userInfo;
+
+                    QList <QListWidgetItem *> selList = hgExp -> workFolderFileList -> selectedItems();
+                    for (int i = 0; i < selList.size(); ++i)
+                    {
+                        QString tmp = selList.at(i)->text();
+                        params.append(tmp.mid(2));
+                    }
                 }
                 else
                 {
                     //Commit all changes
                     params << "commit" << "--message" << comment << "--user" << userInfo;

         runningAction = ACT_PUSH;
     }
 }
 
 
+QString MainWindow::findMyIps()
+{
+    QString ret;
+    QHostInfo info = QHostInfo::fromName(QHostInfo::localHostName());
+    QList <QHostAddress> ipList = info.addresses();
+
+    if (!ipList.isEmpty())
+    {
+        QHostAddress addr = ipList.at(0);
+        ret = addr.toString();
+    }
+    else
+    {
+        ret = "unknown";
+    }
+
+    return ret;
+}
+
 void MainWindow::hgServe()
 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;

         params << "serve";
 
         runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
         runningAction = ACT_SERVE;
 
-        QMessageBox::information(this, "Serve", "Server running on port 8000", QMessageBox::Close);
+        QString msg;
+
+        QTextStream(&msg) << "Server running on http://" << findMyIps() << ":8000/";
+        QMessageBox::information(this, "Serve", msg, QMessageBox::Close);
         runner -> killProc();
     }
 }
 
 

         QMessageBox::information(this, tr("HgExplorer"), tr("Mercurial command did not return any output."));
     }
 }
 
 
-bool MainWindow::isSelectedCommitable(QListWidget *workList)
+bool MainWindow::areAllSelectedCommitable(QListWidget *workList)
+{
+    QList<QListWidgetItem *> selList = workList -> selectedItems();
+    for (int i = 0; i < selList.size(); ++i)
+    {
+        QString tmp = selList.at(i) -> text().mid(0, 1);
+        if (tmp == "A")
+        {
+            //scheduled to be added, ok to commit
+        }
+        else if (tmp == "M")
+        {
+            //locally modified, ok to commit
+        }
+        else if (tmp == "R")
+        {
+            //user wants to remove from repo, ok to commit
+        }
+        else
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool MainWindow::isSelectedDeletable(QListWidget *workList)
 {
     QList<QListWidgetItem *> selList = workList -> selectedItems();
     if (selList.count() == 1)
     {
         QString tmp = selList.at(0)->text().mid(0, 1);
         if (tmp == "A")
         {
-            //scheduled to be added, ok to commit
+            //scheduled to be added, ok to remove (won't go to repo)
             return true;
         }
+        else if (tmp == "C")
+        {
+            //Tracked but unchanged, ok to remove
+            return true;
+        }
         else if (tmp == "M")
         {
-            //locally modified, ok to commit
+            //locally modified, ok to remove from repo
             return true;
         }
+        else if (tmp == "!")
+        {
+            //locally deleted, ok to remove from repo
+            return true;
+        }
     }
     return false;
 }
 
-bool MainWindow::isSelectedDeletable(QListWidget *workList)
+
+bool MainWindow::areAllSelectedUntracked(QListWidget *workList)
+{
+    QList<QListWidgetItem *> selList = workList -> selectedItems();
+    for (int i = 0; i < selList.size(); ++i)
+    {
+        QString tmp = selList.at(i) -> text();
+
+        if (tmp.mid(0,1) != "?")
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+
+bool MainWindow::isSelectedModified(QListWidget *workList)
 {
     QList<QListWidgetItem *> selList = workList -> selectedItems();
     if (selList.count() == 1)
     {
-        QString tmp = selList.at(0)->text().mid(0, 1);
-        if (tmp == "A")
-        {
-            //scheduled to be added, ok to remove (won't go to repo)
+        if (selList.at(0)->text().mid(0, 1) == "M")
+        {
             return true;
         }
-        else if (tmp == "C")
-        {
-            //Tracked but unchanged, ok to remove
-            return true;
-        }
-        else if (tmp == "M")
-        {
-            //locally modified, ok to remove from repo
-            return true;
-        }
-        else if (tmp == "!")
-        {
-            //locally deleted, ok to remove from repo
-            return true;
-        }
     }
     return false;
 }
 
-
-bool MainWindow::isSelectedUntracked(QListWidget *workList)
-{
-    QList<QListWidgetItem *> selList = workList -> selectedItems();
-    if (selList.count() == 1)
-    {
-        if (selList.at(0)->text().mid(0, 1) == "?")
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-
-bool MainWindow::isSelectedModified(QListWidget *workList)
-{
-    QList<QListWidgetItem *> selList = workList -> selectedItems();
-    if (selList.count() == 1)
-    {
-        if (selList.at(0)->text().mid(0, 1) == "M")
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
-void MainWindow::countAMRNModifications(QListWidget *workList, int& a, int& m, int& r, int& n)
+void MainWindow::countModifications(QListWidget *workList, int& added, int& modified, int& removed, int& notTracked,
+                                    int& selected,
+                                    int& selectedAdded, int& selectedModified, int& selectedRemoved, int& selectedNotTracked)
 {
     int itemCount = workList -> count();
     if (itemCount > 0)
     {
         int A= 0;
         int M=0;
         int R=0;
         int N=0;
+        int S=0;
+        int SA=0;
+        int SM=0;
+        int SR=0;
+        int SN=0;
+
         for (int i = 0; i < workList -> count(); i++)
         {
             QListWidgetItem *currItem = workList -> item(i);
 
             QString tmp = currItem->text().mid(0, 1);

             {
                 N++;
             }
         }
 
-        a = A;
-        m = M;
-        r = R;
-        n = N;
+        added = A;
+        modified = M;
+        removed = R;
+        notTracked = N;
+
+        QList <QListWidgetItem *> selList = workList -> selectedItems();
+
+        S = selList.size();
+        for (int i = 0; i < selList.size(); ++i)
+        {
+            QString tmp = selList.at(i) -> text();
+
+            if (tmp.mid(0,1) == "A")
+            {
+                SA++;
+            }
+            else if (tmp.mid(0,1) == "M")
+            {
+                SM++;
+            }
+            else if (tmp.mid(0,1) == "R")
+            {
+                SR++;
+            }
+            else if (tmp.mid(0,1) == "?")
+            {
+                SN++;
+            }
+        }
+
+        selected = S;
+        selectedAdded = SA;
+        selectedModified = SM;
+        selectedRemoved = SR;
+        selectedNotTracked = SN;
     }
     else
     {
-        a = 0;
-        m = 0;
-        r = 0;
-        n = 0;
+        added = 0;
+        modified = 0;
+        removed = 0;
+        notTracked = 0;
+        selected = 0;
+        selectedAdded = 0;
+        selectedModified = 0;
+        selectedRemoved = 0;
+        selectedNotTracked = 0;
     }
 }
 
 
 void MainWindow::timerEvent(QTimerEvent *)

     hgAnnotateAct -> setEnabled(localRepoActionsEnabled);
     hgServeAct -> setEnabled(localRepoActionsEnabled);
 
     hgExp -> enableDisableOtherTabs();
 
-    int a, m, r, n;
-    countAMRNModifications(hgExp -> workFolderFileList, a, m, r, n);
+    int added, modified, removed, notTracked, selected, selectedAdded, selectedModified, selectedRemoved, selectedNotTracked;
+
+    countModifications(hgExp -> workFolderFileList,
+        added, modified, removed, notTracked,
+        selected,
+        selectedAdded, selectedModified, selectedRemoved, selectedNotTracked);
 
     if (tabPage == WORKTAB)
     {
         //Enable / disable actions according to workFolderFileList selections / currentSelection / count
         hgChgSetDiffAct -> setEnabled(false);
         hgUpdateToRevAct -> setEnabled(false);
 
         if (localRepoActionsEnabled)
         {
-            if ((a == 0) && (m == 0) && (r == 0))
+            if ((added == 0) && (modified == 0) && (removed == 0))
             {
                 hgCommitAct -> setEnabled(false);
                 hgRevertAct -> setEnabled(false);
             }
-
-            if (m == 0)
+            else if (selected != 0)
+            {
+                if (selectedNotTracked != 0)
+                {
+                    hgCommitAct -> setEnabled(false);
+                }
+                else if ((selectedAdded == 0) && (selectedModified == 0) && (selectedRemoved == 0))
+                {
+                    hgCommitAct -> setEnabled(false);
+                }
+            }
+
+            if (modified == 0)
             {
                 hgFolderDiffAct -> setEnabled(false);
             }
 
             if (!isSelectedModified(hgExp -> workFolderFileList))

                 hgFileDiffAct -> setEnabled(false);
                 hgRevertAct -> setEnabled(false);
             }
 
             //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)
+            if (notTracked == 0)
             {
                 hgAddAct -> setEnabled(false);
             }
 
             if (!isSelectedDeletable(hgExp -> workFolderFileList))

         else
         {
             hgChgSetDiffAct -> setEnabled(false);
         }
 
-        if ((a == 0) && (m == 0) && (r == 0))
+        if ((added == 0) && (modified == 0) && (removed == 0))
         {
             if (historySelList.count() == 1)
             {
                 hgUpdateToRevAct -> setEnabled(true);
             }

 
     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 (selected one or all yet untracked) to local repository (on next commit)"));
+    hgAddAct -> setStatusTip(tr("Add working folder file(s) (selected 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);
     hgUpdateAct->setStatusTip(tr("Update working folder from local repository"));
 
     hgCommitAct = new QAction(QIcon(":/images/commit.png"), tr("Commit / Save change(s)"), this);
-    hgCommitAct->setStatusTip(tr("Save (selected file or all changed files in working folder (and all subfolders)) to local repository"));
+    hgCommitAct->setStatusTip(tr("Save selected file(s) or all changed files in working folder (and all subfolders)) to local repository"));
 
     hgMergeAct = new QAction(QIcon(":/images/merge.png"), tr("Merge"), this);
     hgMergeAct->setStatusTip(tr("Merge two local repository changesets to working folder"));
 
     //Advanced actions

     initialFileTypesBits = (unsigned char) settings.value("viewFileTypes", QVariant(DEFAULT_HG_STAT_BITS)).toInt();
     resize(size);
     move(pos);
 }
 
+
 void MainWindow::writeSettings()
 {
     QSettings settings("hgexplorer", "hgexplorer");
     settings.setValue("pos", pos());
     settings.setValue("size", size());