Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Download/DownloadItem.py
Helpviewer/Download/DownloadItem.py
- changeset 3778
- 0c5bc18da740
- parent 3664
- 78e522719af3
- child 3788
- 195dd519bf29
equal
deleted
inserted
replaced
| 3777:0c47cbb5b199 | 3778:0c5bc18da740 |
|---|---|
| 12 str = unicode | 12 str = unicode |
| 13 except NameError: | 13 except NameError: |
| 14 pass | 14 pass |
| 15 | 15 |
| 16 from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QTime, QFile, QFileInfo, \ | 16 from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QTime, QFile, QFileInfo, \ |
| 17 QUrl, QIODevice, QCryptographicHash, QStandardPaths | 17 QUrl, QIODevice, QCryptographicHash, PYQT_VERSION_STR |
| 18 from PyQt5.QtGui import QPalette, QDesktopServices | 18 from PyQt5.QtGui import QPalette, QDesktopServices |
| 19 from PyQt5.QtWidgets import QWidget, QStyle, QDialog | 19 from PyQt5.QtWidgets import QWidget, QStyle, QDialog |
| 20 from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply | 20 from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply |
| 21 | 21 |
| 22 from E5Gui import E5FileDialog | 22 from E5Gui import E5FileDialog |
| 208 QFileInfo(defaultFileName).fileName())) | 208 QFileInfo(defaultFileName).fileName())) |
| 209 self.__canceledFileSelect = True | 209 self.__canceledFileSelect = True |
| 210 return | 210 return |
| 211 | 211 |
| 212 self.__autoOpen = dlg.getAction() == "open" | 212 self.__autoOpen = dlg.getAction() == "open" |
| 213 fileName = QStandardPaths.storageLocation( | 213 if PYQT_VERSION_STR >= "5.0.0": |
| 214 QStandardPaths.TempLocation) + \ | 214 from PyQt5.QtCore import QStandardPaths |
| 215 '/' + QFileInfo(fileName).completeBaseName() | 215 tempLocation = QStandardPaths.storageLocation( |
| 216 QStandardPaths.TempLocation) | |
| 217 else: | |
| 218 from PyQt5.QtGui import QDesktopServices | |
| 219 tempLocation = QDesktopServices.storageLocation( | |
| 220 QDesktopServices.TempLocation) | |
| 221 fileName = tempLocation + '/' + \ | |
| 222 QFileInfo(fileName).completeBaseName() | |
| 216 | 223 |
| 217 if ask and not self.__autoOpen and self.__requestFilename: | 224 if ask and not self.__autoOpen and self.__requestFilename: |
| 218 self.__gettingFileName = True | 225 self.__gettingFileName = True |
| 219 fileName = E5FileDialog.getSaveFileName( | 226 fileName = E5FileDialog.getSaveFileName( |
| 220 None, | 227 None, |
