comparison mainwindow.cpp @ 103:0bd32aedc6f6

* Start to use the confirm-comment dialog for commits; much work still needed

 #include "multichoicedialog.h"
 #include "startupdialog.h"
 #include "colourset.h"
 #include "debug.h"
 #include "logparser.h"
+#include "confirmcommentdialog.h"
 
 
 MainWindow::MainWindow()
 {
     QString wndTitle;

         }
         */
     }
 }
 
-
-bool MainWindow::getCommentOrTag(QString& commentOrTag,
-                                 QString question,
-                                 QString dlgTitle)
-{
-    bool ok = false;
-    QString text = QInputDialog::getText(this, dlgTitle, question, QLineEdit::Normal, commentOrTag, &ok);
-    commentOrTag = text;
-    return ok;
-}
-
 void MainWindow::hgCommit()
 {
     //!!! Now that hg actions can be fired asynchronously (e.g. from
     // the filesystem modified callback) we _really_ need to be able to
     // queue important actions rather than just ignore them if busy!
 
     if (runningAction == ACT_NONE)
     {
         QStringList params;
         QString comment;
-        
-        if (getCommentOrTag(comment, tr("Comment:"), tr("Save (commit)")))
-        {
+
+        QStringList files = hgTabs->getSelectedCommittableFiles();
+        if (files.empty()) files = hgTabs->getAllCommittableFiles();
+
+        if (ConfirmCommentDialog::confirmAndComment(this,
+                                                    tr("Commit files"),
+                                                    tr("About to commit the following files:"),
+                                                    tr("About to commit %1 files."),
+                                                    files,
+                                                    comment)) {
+
             //!!! do something more sensible when the comment is empty
             // (i.e. tell the user about it?)
-
-            QStringList files = hgTabs->getSelectedCommittableFiles();
 
             if ((justMerged == false) && //!!! review usage of justMerged
                 !files.empty()) {
                 // User wants to commit selected file(s) (and this is not merge commit, which would fail if we selected files)
                 params << "commit" << "--message" << comment << "--user" << getUserInfo() << "--" << files;

     if (runningAction == ACT_NONE)
     {
         QStringList params;
         QString tag;
 
-        if (getCommentOrTag(tag, tr("Tag:"), tr("Tag")))
-        {
-            if (!tag.isEmpty())
+        if (ConfirmCommentDialog::confirmAndComment(this,
+                                                    tr("Tag"),
+                                                    tr("Enter tag:"),
+                                                    tag)) {
+            if (!tag.isEmpty()) //!!! do something better if it is empty
             {
                 params << "tag" << "--user" << getUserInfo() << filterTag(tag);
 
                 runner -> startHgCommand(workFolderPath, params);
                 runningAction = ACT_TAG;