comparison src/hgrunner.cpp @ 561:1ff2a1bf0a40

Add a cancel button to the progress bar

 #include "hgrunner.h"
 #include "common.h"
 #include "debug.h"
 #include "settingsdialog.h"
 
-#include <QPushButton>
-#include <QListWidget>
-#include <QDialog>
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QSettings>
 #include <QInputDialog>
 #include <QDesktopServices>
 #include <QTemporaryFile>
 #include <QDir>
+#include <QProgressBar>
+#include <QToolButton>
+#include <QGridLayout>
 
 #include <iostream>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

 #include <fcntl.h>
 #else
 #include <process.h>
 #endif
 
-HgRunner::HgRunner(QString myDirPath, QWidget * parent) :
-    QProgressBar(parent),
+HgRunner::HgRunner(QString myDirPath, QWidget *parent) :
+    QWidget(parent),
     m_myDirPath(myDirPath)
 {
+    QGridLayout *layout = new QGridLayout(this);
+    layout->setMargin(0);
+
+    m_progress = new QProgressBar;
+    layout->addWidget(m_progress, 0, 0);
+
+    m_cancel = new QToolButton;
+    m_cancel->setIcon(QIcon(":images/cancel-small.png"));
+    m_cancel->setToolButtonStyle(Qt::ToolButtonIconOnly);
+    m_cancel->setAutoRaise(true);
+    connect(m_cancel, SIGNAL(clicked()), this, SLOT(killCurrentActions()));
+    layout->addWidget(m_cancel, 0, 1);
+
     m_proc = 0;
 
     // Always unbundle the extension: even if it already exists (in
     // case we're upgrading) and even if we're not going to use it (so
     // that it's available in case someone wants to use it later,

     // prefer is the one in the settings first, if it exists; then the
     // unbundled one; then anything in the path if for some reason
     // unbundling failed
     unbundleExtension();
 
-    setTextVisible(false);
-    setVisible(false);
+    m_progress->setTextVisible(false);
+    hide();
     m_isRunning = false;
 }
 
 HgRunner::~HgRunner()
 {

 
         //!!! want an option to use the mercurial_keyring extension as well
     }
 
     m_isRunning = true;
-    setRange(0, 0);
+    m_progress->setRange(0, 0);
     if (!action.shouldBeFast()) show();
     m_stdout.clear();
     m_stderr.clear();
     m_realm = "";
     m_userName = "";