Added history dialog upload cancel button

tweaked status visual feedback and fixed empty history entries being
created on upload errors

Author: ckaiser

.gitignore

@@ -1 +1,2 @@
-*.2-pre1
+*.2-pre1
+*.autosave

dialogs/historydialog.cpp

@@ -83,12 +83,23 @@ HistoryDialog::HistoryDialog(QWidget *parent) :
     ui->clearButton->setEnabled(false);
   }
 
-  ui->uploadProgressBar->setValue(Uploader::instance()->progress());
+  if (Uploader::instance()->progress() > 0) {
+    ui->uploadProgressBar->setValue(Uploader::instance()->progress());
+  }
+  else {
+    ui->uploadProgressWidget->setVisible(false);
+  }
+
+  ui->cancelUploadButton->setIcon(os::icon("no"));
 
   connect(Uploader::instance(), SIGNAL(progress(int)), this, SLOT(uploadProgress(int)));
   connect(Uploader::instance(), SIGNAL(done(QString,QString,QString)), this, SLOT(refresh()));
-  connect(ui->uploadButton, SIGNAL(clicked()), this, SLOT(upload()));
-  connect(ui->clearButton , SIGNAL(clicked()), this, SLOT(clear()));
+
+  connect(ui->uploadButton      , SIGNAL(clicked()), this                    , SLOT(upload()));
+  connect(ui->cancelUploadButton, SIGNAL(clicked()), Uploader::instance()    , SLOT(cancel()));
+  connect(ui->cancelUploadButton, SIGNAL(clicked()), ui->uploadProgressWidget, SLOT(hide()));
+
+  connect(ui->clearButton       , SIGNAL(clicked()), this                , SLOT(clear()));
 }
 
 HistoryDialog::~HistoryDialog()
@@ -132,7 +143,6 @@ void HistoryDialog::contextMenu(QPoint point)
 
   if (mContextIndex.column() == 0) {
     connect(&locationAction, SIGNAL(triggered()), this, SLOT(location()));
-
     contextMenu.addAction(&locationAction);
   }
   else {
@@ -216,12 +226,12 @@ void HistoryDialog::selectionChanged(QItemSelection selected, QItemSelection des
 void HistoryDialog::upload()
 {
   Uploader::instance()->upload(mSelectedScreenshot);
-  ui->uploadButton->setEnabled(false);
+  ui->uploadProgressWidget->setVisible(true);
 }
 
 void HistoryDialog::uploadProgress(int progress)
 {
-  ui->uploadProgressBar->setEnabled(true);
+  ui->uploadProgressWidget->setVisible(true);
   ui->uploadProgressBar->setValue(progress);
 }
 
@@ -272,6 +282,5 @@ bool HistoryDialog::event(QEvent *event)
     ScreenshotManager::instance()->settings()->setValue("geometry/historyDialog", saveGeometry());
   }
 
-
   return QDialog::event(event);
 }

dialogs/historydialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>327</width>
-    <height>252</height>
+    <width>352</width>
+    <height>294</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,12 +18,6 @@
     <normaloff>:/icons/view-history</normaloff>:/icons/view-history</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>4</number>
-   </property>
-   <property name="margin">
-    <number>6</number>
-   </property>
    <item>
     <widget class="QLineEdit" name="filterEdit">
      <property name="enabled">
@@ -47,16 +41,50 @@ Right click items to get access to more options.</string>
     </widget>
    </item>
    <item>
-    <widget class="QProgressBar" name="uploadProgressBar">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="value">
-      <number>0</number>
-     </property>
-     <property name="textVisible">
-      <bool>false</bool>
-     </property>
+    <widget class="QWidget" name="uploadProgressWidget" native="true">
+     <layout class="QHBoxLayout" name="uploadProgressLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QProgressBar" name="uploadProgressBar">
+        <property name="value">
+         <number>0</number>
+        </property>
+        <property name="textVisible">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="cancelUploadButton">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+        <property name="flat">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>

lightscreenwindow.cpp

@@ -548,7 +548,6 @@ void LightscreenWindow::screenshotAction(int mode)
 
   options.mode = mode;
 
-  setStatus(tr("Processing..."));
   ScreenshotManager::instance()->take(options);
 }
 
@@ -716,9 +715,12 @@ void LightscreenWindow::updateStatus()
     emit uploading(true);
   }
   else {
-    if (activeCount > 0) {
+    if (activeCount > 1) {
       setStatus(tr("%1 processing").arg(activeCount));
     }
+    else if (activeCount == 1) {
+      setStatus(tr("processing"));
+    }
     else {
       setStatus();
     }

tools/screenshotmanager.cpp

@@ -124,9 +124,6 @@ void ScreenshotManager::updateHistory(QString fileName, QString url, QString del
 
     updateQuery.exec();
   }
-  else {
-    saveHistory(fileName, url, deleteHash);
-  }
 }
 
 void ScreenshotManager::removeHistory(QString fileName, qint64 time)

tools/uploader/uploader.cpp

@@ -56,6 +56,7 @@ QString Uploader::lastUrl() const
 void Uploader::cancel()
 {
   mUploaders.clear();
+  mProgress = 0;
   emit cancelAll();
 }