Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- changeset 3071
- 83d066710d60
- parent 3039
- 8dd0165d805d
- child 3080
- 6c0a430b19df
- child 3092
- f7ec7a3e7270
equal
deleted
inserted
replaced
| 3070:04e342ebf697 | 3071:83d066710d60 |
|---|---|
| 14 from PyQt4.QtCore import QTimer, QFile, QFileInfo, pyqtSignal, \ | 14 from PyQt4.QtCore import QTimer, QFile, QFileInfo, pyqtSignal, \ |
| 15 PYQT_VERSION_STR, QDate, QIODevice, qVersion, QProcess, QSize, QUrl, \ | 15 PYQT_VERSION_STR, QDate, QIODevice, qVersion, QProcess, QSize, QUrl, \ |
| 16 QObject, Qt | 16 QObject, Qt |
| 17 from PyQt4.QtGui import QSizePolicy, QWidget, QKeySequence, QDesktopServices, \ | 17 from PyQt4.QtGui import QSizePolicy, QWidget, QKeySequence, QDesktopServices, \ |
| 18 QWhatsThis, QToolBar, QDialog, QSplitter, QApplication, QMenu, \ | 18 QWhatsThis, QToolBar, QDialog, QSplitter, QApplication, QMenu, \ |
| 19 QProgressDialog, QVBoxLayout, QDockWidget, QAction, QLabel | 19 QVBoxLayout, QDockWidget, QAction, QLabel |
| 20 from PyQt4.Qsci import QSCINTILLA_VERSION_STR | 20 from PyQt4.Qsci import QSCINTILLA_VERSION_STR |
| 21 from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ | 21 from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ |
| 22 QNetworkRequest, QNetworkReply | 22 QNetworkRequest, QNetworkReply |
| 23 | 23 |
| 24 from .Info import Version, BugAddress, Program, FeatureAddress | 24 from .Info import Version, BugAddress, Program, FeatureAddress |
| 29 from E5Gui.E5ToolBarManager import E5ToolBarManager | 29 from E5Gui.E5ToolBarManager import E5ToolBarManager |
| 30 from E5Gui import E5MessageBox, E5FileDialog, E5ErrorMessage | 30 from E5Gui import E5MessageBox, E5FileDialog, E5ErrorMessage |
| 31 from E5Gui.E5Application import e5App | 31 from E5Gui.E5Application import e5App |
| 32 from E5Gui.E5MainWindow import E5MainWindow | 32 from E5Gui.E5MainWindow import E5MainWindow |
| 33 from E5Gui.E5ZoomWidget import E5ZoomWidget | 33 from E5Gui.E5ZoomWidget import E5ZoomWidget |
| 34 from E5Gui.E5ProgressDialog import E5ProgressDialog | |
| 34 | 35 |
| 35 import Preferences | 36 import Preferences |
| 36 import Utilities | 37 import Utilities |
| 37 | 38 |
| 38 import UI.PixmapCache | 39 import UI.PixmapCache |
| 5763 self.httpAlternative = alternative | 5764 self.httpAlternative = alternative |
| 5764 url = QUrl(self.__httpAlternatives[alternative]) | 5765 url = QUrl(self.__httpAlternatives[alternative]) |
| 5765 self.__versionCheckCanceled = False | 5766 self.__versionCheckCanceled = False |
| 5766 if manual: | 5767 if manual: |
| 5767 if self.__versionCheckProgress is None: | 5768 if self.__versionCheckProgress is None: |
| 5768 self.__versionCheckProgress = \ | 5769 self.__versionCheckProgress = E5ProgressDialog( |
| 5769 QProgressDialog("", self.trUtf8("&Cancel"), | 5770 "", self.trUtf8("&Cancel"), |
| 5770 0, len(self.__httpAlternatives), self) | 5771 0, len(self.__httpAlternatives), |
| 5772 self.trUtf8("%v/%m"), self) | |
| 5771 self.__versionCheckProgress.setMinimumDuration(0) | 5773 self.__versionCheckProgress.setMinimumDuration(0) |
| 5772 self.__versionCheckProgress.canceled.connect( | 5774 self.__versionCheckProgress.canceled.connect( |
| 5773 self.__versionsDownloadCanceled) | 5775 self.__versionsDownloadCanceled) |
| 5774 self.__versionCheckProgress.setLabelText( | 5776 self.__versionCheckProgress.setLabelText( |
| 5775 self.trUtf8("Trying host {0}").format(url.host())) | 5777 self.trUtf8("Trying host {0}").format(url.host())) |
