Mercurial Repositories > eric / file diff

--- a/Helpviewer/DownloadDialog.py	Sun May 23 15:09:37 2010 +0200
+++ b/Helpviewer/DownloadDialog.py	Mon May 24 18:38:54 2010 +0200
@@ -122,13 +122,12 @@
         
         defaultFileName = self.__saveFileName(downloadDirectory)
         fileName = defaultFileName
-        baseName = QFileInfo(fileName).completeBaseName()
         self.__autoOpen = False
         if not self.__toDownload:
             res = QMessageBox.question(None,
                 self.trUtf8("Downloading"),
                 self.trUtf8("""<p>You are about to download the file <b>{0}</b>.</p>"""
-                            """<p>What do you want to do?</p>""").format(baseName),
+                            """<p>What do you want to do?</p>""").format(fileName),
                 QMessageBox.StandardButtons(\
                     QMessageBox.Open | \
                     QMessageBox.Save | \
@@ -140,7 +139,7 @@
             
             self.__autoOpen = res == QMessageBox.Open
             fileName = QDesktopServices.storageLocation(QDesktopServices.TempLocation) + \
-                        '/' + baseName
+                        '/' + fileName
         
         if not self.__autoOpen and self.__requestFilename:
             fileName = QFileDialog.getSaveFileName(
@@ -317,12 +316,12 @@
         """
         self.__bytesReceived = received
         if total == -1:
+            self.progressBar.setMaximum(0)
             self.progressBar.setValue(0)
-            self.progressBar.setMaximum(0)
             self.setWindowTitle(self.__windowTitleTemplate.format(""))
         else:
+            self.progressBar.setMaximum(total)
             self.progressBar.setValue(received)
-            self.progressBar.setMaximum(total)
             pc = "{0}%".format(received * 100 // total)
             self.setWindowTitle(self.__windowTitleTemplate.format(pc))
         self.__updateInfoLabel()