statusbar stuff added

2 files changed, 8 insertions, 1 deletions

diff --git a/mainwindow.cpp b/mainwindow.cpp
index a5f5a770..d49bb700 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -141,6 +141,7 @@ void MainWindow::config() {
  */
 void MainWindow::on_updateButton_clicked()
 {
+    currentAction = GIT;
     if (usePass) {
         executePass("git pull");
     } else {
@@ -154,6 +155,7 @@ void MainWindow::on_updateButton_clicked()
  */
 void MainWindow::on_treeView_clicked(const QModelIndex &index)
 {
+    currentAction = GPG;
     if (model.fileInfo(index).isFile()){
         QString passFile = model.filePath(index);
         if (usePass) {
@@ -209,6 +211,7 @@ void MainWindow::clearClipboard()
 {
     QClipboard *clipboard = QApplication::clipboard();
     clipboard->clear();
+    ui->statusBar->showMessage(tr("Clipboard cleared"), 3000);
 }
 
 /**
@@ -222,11 +225,12 @@ void MainWindow::processFinished(int exitCode, QProcess::ExitStatus exitStatus)
     }
     readyRead();
     enableUiElements(true);
-    if (useClipboard) {
+    if (currentAction == GPG && useClipboard) {
         //Copy first line to clipboard
         QClipboard *clip = QApplication::clipboard();
         QStringList tokens =  ui->textBrowser->document()->toPlainText().split("\n",QString::SkipEmptyParts);
         clip->setText(tokens[0]);
+        ui->statusBar->showMessage(tr("Password copied to clipboard"), 3000);
         if (useAutoclear) {
               QTimer::singleShot(1000*autoclearSeconds, this, SLOT(clearClipboard()));
         }
diff --git a/mainwindow.h b/mainwindow.h
index 7f7db983..db4a9089 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -16,6 +16,8 @@ class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
+enum actionType { GPG, GIT };
+
 public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
@@ -51,6 +53,7 @@ private:
     void executeWrapper(QString, QString);
     void config();
     void enableUiElements(bool);
+    actionType currentAction;
 };
 
 #endif // MAINWINDOW_H