Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- branch
- Py2 comp.
- changeset 3080
- 6c0a430b19df
- parent 3060
- 5883ce99ee12
- parent 3071
- 83d066710d60
- child 3142
- 55030c09e142
equal
deleted
inserted
replaced
| 3079:0233bbe9a9c4 | 3080:6c0a430b19df |
|---|---|
| 20 from PyQt4.QtCore import QTimer, QFile, QFileInfo, pyqtSignal, \ | 20 from PyQt4.QtCore import QTimer, QFile, QFileInfo, pyqtSignal, \ |
| 21 PYQT_VERSION_STR, QDate, QIODevice, qVersion, QProcess, QSize, QUrl, \ | 21 PYQT_VERSION_STR, QDate, QIODevice, qVersion, QProcess, QSize, QUrl, \ |
| 22 QObject, Qt | 22 QObject, Qt |
| 23 from PyQt4.QtGui import QSizePolicy, QWidget, QKeySequence, QDesktopServices, \ | 23 from PyQt4.QtGui import QSizePolicy, QWidget, QKeySequence, QDesktopServices, \ |
| 24 QWhatsThis, QToolBar, QDialog, QSplitter, QApplication, QMenu, \ | 24 QWhatsThis, QToolBar, QDialog, QSplitter, QApplication, QMenu, \ |
| 25 QProgressDialog, QVBoxLayout, QDockWidget, QAction, QLabel | 25 QVBoxLayout, QDockWidget, QAction, QLabel |
| 26 from PyQt4.Qsci import QSCINTILLA_VERSION_STR | 26 from PyQt4.Qsci import QSCINTILLA_VERSION_STR |
| 27 from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ | 27 from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ |
| 28 QNetworkRequest, QNetworkReply | 28 QNetworkRequest, QNetworkReply |
| 29 | 29 |
| 30 from .Info import Version, BugAddress, Program, FeatureAddress | 30 from .Info import Version, BugAddress, Program, FeatureAddress |
| 35 from E5Gui.E5ToolBarManager import E5ToolBarManager | 35 from E5Gui.E5ToolBarManager import E5ToolBarManager |
| 36 from E5Gui import E5MessageBox, E5FileDialog, E5ErrorMessage | 36 from E5Gui import E5MessageBox, E5FileDialog, E5ErrorMessage |
| 37 from E5Gui.E5Application import e5App | 37 from E5Gui.E5Application import e5App |
| 38 from E5Gui.E5MainWindow import E5MainWindow | 38 from E5Gui.E5MainWindow import E5MainWindow |
| 39 from E5Gui.E5ZoomWidget import E5ZoomWidget | 39 from E5Gui.E5ZoomWidget import E5ZoomWidget |
| 40 from E5Gui.E5ProgressDialog import E5ProgressDialog | |
| 40 | 41 |
| 41 import Preferences | 42 import Preferences |
| 42 import Utilities | 43 import Utilities |
| 43 | 44 |
| 44 import UI.PixmapCache | 45 import UI.PixmapCache |
| 5769 self.httpAlternative = alternative | 5770 self.httpAlternative = alternative |
| 5770 url = QUrl(self.__httpAlternatives[alternative]) | 5771 url = QUrl(self.__httpAlternatives[alternative]) |
| 5771 self.__versionCheckCanceled = False | 5772 self.__versionCheckCanceled = False |
| 5772 if manual: | 5773 if manual: |
| 5773 if self.__versionCheckProgress is None: | 5774 if self.__versionCheckProgress is None: |
| 5774 self.__versionCheckProgress = \ | 5775 self.__versionCheckProgress = E5ProgressDialog( |
| 5775 QProgressDialog("", self.trUtf8("&Cancel"), | 5776 "", self.trUtf8("&Cancel"), |
| 5776 0, len(self.__httpAlternatives), self) | 5777 0, len(self.__httpAlternatives), |
| 5778 self.trUtf8("%v/%m"), self) | |
| 5777 self.__versionCheckProgress.setMinimumDuration(0) | 5779 self.__versionCheckProgress.setMinimumDuration(0) |
| 5778 self.__versionCheckProgress.canceled.connect( | 5780 self.__versionCheckProgress.canceled.connect( |
| 5779 self.__versionsDownloadCanceled) | 5781 self.__versionsDownloadCanceled) |
| 5780 self.__versionCheckProgress.setLabelText( | 5782 self.__versionCheckProgress.setLabelText( |
| 5781 self.trUtf8("Trying host {0}").format(url.host())) | 5783 self.trUtf8("Trying host {0}").format(url.host())) |
