From ebd2144dde412355367fb1bcd78495bca76db65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Frimberger?= <github@frimberger.de>
Date: Thu, 20 Sep 2012 21:20:04 +0200
Subject: [PATCH] Added label for displaying errors to progressbar widget.

Also improved error handling a bit. Closing a tab before download
finished does no longer show a message box.
---
 partwin.cpp        | 15 +++++++
 progresswidget.cpp | 17 ++++++++
 progresswidget.h   |  4 ++
 progresswidget.ui  | 98 ++++++++++++++++++++++++++++++++++++----------
 4 files changed, 114 insertions(+), 20 deletions(-)

diff --git a/partwin.cpp b/partwin.cpp
index ba32e79..841708a 100644
--- a/partwin.cpp
+++ b/partwin.cpp
@@ -137,6 +137,21 @@ PartWin::~PartWin()
 bool PartWin::readData(QIODevice *source, const QString &format)
 {
   
+  // NPRES_NETWORK_ERR:
+  if (source->errorString() == "Network error during download.") {
+    // this error message is also set when user aborts download before it finished.
+    m_progressWidget->resetProgressBar();
+    m_progressWidget->setErrorMessage("Error occurred during download. Reload tab to retry.");
+    return false;
+  }
+
+  // NPRES_USER_BREAK:
+  if (source->errorString() == "User cancelled operation.") {
+    m_progressWidget->resetProgressBar();
+    m_progressWidget->setErrorMessage("Error occurred during download. Reload tab to retry.");    
+    return false;
+  }  
+  
   // Download finished
   m_progressWidget->setValue(m_progressWidget->getMaximum());
   
diff --git a/progresswidget.cpp b/progresswidget.cpp
index 6e51523..e042868 100644
--- a/progresswidget.cpp
+++ b/progresswidget.cpp
@@ -26,6 +26,7 @@ ProgressWidget::ProgressWidget(QWidget *parent) : QWidget(parent),  m_ui(new Ui:
 {
   m_ui->setupUi(this);
   
+  m_ui->lblErrorMessage->setText("");
   m_ui->lblDownloadSpeed->setText("");
   m_ui->lblRemainingDlTime->setText("");
   
@@ -140,6 +141,22 @@ void ProgressWidget::setFileName(const QString& fileName)
   m_fileName = fileName;
 }
 
+void ProgressWidget::setErrorMessage ( const QString& errMsg )
+{
+  m_ui->lblErrorMessage->setText(errMsg);
+}
+
+void ProgressWidget::resetProgressBar() {
+  m_timer->stop();
+  m_ui->progressBar->setValue(m_ui->progressBar->minimum());
+  m_ui->lblDownloadSpeed->setText("");
+  m_ui->lblRemainingDlTime->setText("");
+  m_vecDownloadSpeeds.clear();
+  m_lastTimestamp = 0;
+  m_bytesDownloadedTotalLastInterval = 0;
+  m_avgDownloadSpeedWeighted = 0;
+}
+
 ProgressWidget::~ProgressWidget()
 {
   m_timer->stop();
diff --git a/progresswidget.h b/progresswidget.h
index 63f2564..2ef6ed1 100644
--- a/progresswidget.h
+++ b/progresswidget.h
@@ -41,12 +41,16 @@ class ProgressWidget : public QWidget
     ProgressWidget(QWidget *parent);
     ~ProgressWidget();
     
+    void setErrorMessage(const QString &errMsg);
+    
     void setFileName(const QString &fileName);
     
     void setMinimum(int size);
     void setMaximum(int size);
     int getMaximum();
     
+    void resetProgressBar();
+    
     void setValue(int size);
     int getValue();
     
diff --git a/progresswidget.ui b/progresswidget.ui
index 2d09036..56fcf59 100644
--- a/progresswidget.ui
+++ b/progresswidget.ui
@@ -14,9 +14,9 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
+   <item row="3" column="0">
     <layout class="QGridLayout" name="gridLayout">
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QLabel" name="lblFilename">
        <property name="enabled">
         <bool>true</bool>
@@ -29,7 +29,7 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="3" column="1">
       <widget class="QLabel" name="lblRemainingDlTime">
        <property name="text">
         <string>00:00:00</string>
@@ -39,20 +39,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="0">
-      <spacer name="verticalSpacerTop">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="4" column="1">
+     <item row="5" column="1">
       <widget class="QLabel" name="lblDownloadSpeed">
        <property name="text">
         <string>0 KB/s</string>
@@ -62,17 +49,46 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0" colspan="2">
+     <item row="4" column="0" colspan="2">
       <widget class="QProgressBar" name="progressBar">
        <property name="value">
         <number>0</number>
        </property>
       </widget>
      </item>
+     <item row="6" column="1">
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="2" column="1">
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </item>
-   <item row="3" column="0">
-    <spacer name="verticalSpacerBottom">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout_5"/>
+   </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer_3">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
@@ -84,6 +100,48 @@
      </property>
     </spacer>
    </item>
+   <item row="4" column="0">
+    <spacer name="verticalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout_6"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="lblErrorMessage">
+     <property name="font">
+      <font>
+       <pointsize>14</pointsize>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="scaledContents">
+      <bool>false</bool>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>