Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- changeset 2596
- 32c4afbe0801
- parent 2560
- cb82017d4dac
- child 2606
- f9592e331194
equal
deleted
inserted
replaced
| 2595:921067c38243 | 2596:32c4afbe0801 |
|---|---|
| 10 import os | 10 import os |
| 11 import sys | 11 import sys |
| 12 import logging | 12 import logging |
| 13 | 13 |
| 14 from PyQt4.QtCore import QTimer, QFile, QFileInfo, pyqtSignal, PYQT_VERSION_STR, QDate, \ | 14 from PyQt4.QtCore import QTimer, QFile, QFileInfo, pyqtSignal, PYQT_VERSION_STR, QDate, \ |
| 15 QIODevice, qVersion, QProcess, QSize, QUrl, QObject, Qt | 15 QIODevice, qVersion, QProcess, QSize, QUrl, QObject, Qt, QLibraryInfo |
| 16 from PyQt4.QtGui import QSizePolicy, QWidget, QKeySequence, QDesktopServices, \ | 16 from PyQt4.QtGui import QSizePolicy, QWidget, QKeySequence, QDesktopServices, \ |
| 17 QWhatsThis, QToolBar, QDialog, QSplitter, QApplication, QMenu, QProgressDialog, \ | 17 QWhatsThis, QToolBar, QDialog, QSplitter, QApplication, QMenu, QProgressDialog, \ |
| 18 QVBoxLayout, QDockWidget, QAction, QLabel | 18 QVBoxLayout, QDockWidget, QAction, QLabel |
| 19 from PyQt4.Qsci import QSCINTILLA_VERSION_STR | 19 from PyQt4.Qsci import QSCINTILLA_VERSION_STR |
| 20 from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ | 20 from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ |
| 1600 designerExe = "{0}.exe".format(Utilities.generateQtToolName("designer")) | 1600 designerExe = "{0}.exe".format(Utilities.generateQtToolName("designer")) |
| 1601 elif Utilities.isMacPlatform(): | 1601 elif Utilities.isMacPlatform(): |
| 1602 designerExe = Utilities.getQtMacBundle("designer") | 1602 designerExe = Utilities.getQtMacBundle("designer") |
| 1603 else: | 1603 else: |
| 1604 designerExe = Utilities.generateQtToolName("designer") | 1604 designerExe = Utilities.generateQtToolName("designer") |
| 1605 if Utilities.isinpath(designerExe): | 1605 if Utilities.isinpath(designerExe) or \ |
| 1606 os.path.exists(os.path.join( | |
| 1607 QLibraryInfo.location(QLibraryInfo.BinariesPath), designerExe)): | |
| 1606 self.designer4Act = E5Action(self.trUtf8('Qt-Designer'), | 1608 self.designer4Act = E5Action(self.trUtf8('Qt-Designer'), |
| 1607 UI.PixmapCache.getIcon("designer4.png"), | 1609 UI.PixmapCache.getIcon("designer4.png"), |
| 1608 self.trUtf8('Qt-&Designer...'), 0, 0, self, 'qt_designer4') | 1610 self.trUtf8('Qt-&Designer...'), 0, 0, self, 'qt_designer4') |
| 1609 self.designer4Act.setStatusTip(self.trUtf8('Start Qt-Designer')) | 1611 self.designer4Act.setStatusTip(self.trUtf8('Start Qt-Designer')) |
| 1610 self.designer4Act.setWhatsThis(self.trUtf8( | 1612 self.designer4Act.setWhatsThis(self.trUtf8( |
| 1620 linguistExe = "{0}.exe".format(Utilities.generateQtToolName("linguist")) | 1622 linguistExe = "{0}.exe".format(Utilities.generateQtToolName("linguist")) |
| 1621 elif Utilities.isMacPlatform(): | 1623 elif Utilities.isMacPlatform(): |
| 1622 linguistExe = Utilities.getQtMacBundle("linguist") | 1624 linguistExe = Utilities.getQtMacBundle("linguist") |
| 1623 else: | 1625 else: |
| 1624 linguistExe = Utilities.generateQtToolName("linguist") | 1626 linguistExe = Utilities.generateQtToolName("linguist") |
| 1625 if Utilities.isinpath(linguistExe): | 1627 if Utilities.isinpath(linguistExe) or \ |
| 1628 os.path.exists(os.path.join( | |
| 1629 QLibraryInfo.location(QLibraryInfo.BinariesPath), linguistExe)): | |
| 1626 self.linguist4Act = E5Action(self.trUtf8('Qt-Linguist'), | 1630 self.linguist4Act = E5Action(self.trUtf8('Qt-Linguist'), |
| 1627 UI.PixmapCache.getIcon("linguist4.png"), | 1631 UI.PixmapCache.getIcon("linguist4.png"), |
| 1628 self.trUtf8('Qt-&Linguist...'), 0, 0, self, 'qt_linguist4') | 1632 self.trUtf8('Qt-&Linguist...'), 0, 0, self, 'qt_linguist4') |
| 1629 self.linguist4Act.setStatusTip(self.trUtf8('Start Qt-Linguist')) | 1633 self.linguist4Act.setStatusTip(self.trUtf8('Start Qt-Linguist')) |
| 1630 self.linguist4Act.setWhatsThis(self.trUtf8( | 1634 self.linguist4Act.setWhatsThis(self.trUtf8( |
| 3749 | 3753 |
| 3750 if Utilities.isMacPlatform(): | 3754 if Utilities.isMacPlatform(): |
| 3751 designer, args = Utilities.prepareQtMacBundle("designer", version, args) | 3755 designer, args = Utilities.prepareQtMacBundle("designer", version, args) |
| 3752 else: | 3756 else: |
| 3753 if version == 4: | 3757 if version == 4: |
| 3754 designer = Utilities.generateQtToolName("designer") | 3758 designer = os.path.join( |
| 3759 QLibraryInfo.location(QLibraryInfo.BinariesPath), | |
| 3760 Utilities.generateQtToolName("designer")) | |
| 3755 if Utilities.isWindowsPlatform(): | 3761 if Utilities.isWindowsPlatform(): |
| 3756 designer = designer + '.exe' | 3762 designer += '.exe' |
| 3757 | 3763 |
| 3758 proc = QProcess() | 3764 proc = QProcess() |
| 3759 if not proc.startDetached(designer, args): | 3765 if not proc.startDetached(designer, args): |
| 3760 E5MessageBox.critical(self, | 3766 E5MessageBox.critical(self, |
| 3761 self.trUtf8('Process Generation Error'), | 3767 self.trUtf8('Process Generation Error'), |
| 3806 | 3812 |
| 3807 if Utilities.isMacPlatform(): | 3813 if Utilities.isMacPlatform(): |
| 3808 linguist, args = Utilities.prepareQtMacBundle("linguist", version, args) | 3814 linguist, args = Utilities.prepareQtMacBundle("linguist", version, args) |
| 3809 else: | 3815 else: |
| 3810 if version == 4: | 3816 if version == 4: |
| 3811 linguist = Utilities.generateQtToolName("linguist") | 3817 linguist = os.path.join( |
| 3818 QLibraryInfo.location(QLibraryInfo.BinariesPath), | |
| 3819 Utilities.generateQtToolName("linguist")) | |
| 3812 if Utilities.isWindowsPlatform(): | 3820 if Utilities.isWindowsPlatform(): |
| 3813 linguist = linguist + '.exe' | 3821 linguist += '.exe' |
| 3814 | 3822 |
| 3815 proc = QProcess() | 3823 proc = QProcess() |
| 3816 if not proc.startDetached(linguist, args): | 3824 if not proc.startDetached(linguist, args): |
| 3817 E5MessageBox.critical(self, | 3825 E5MessageBox.critical(self, |
| 3818 self.trUtf8('Process Generation Error'), | 3826 self.trUtf8('Process Generation Error'), |
| 3850 | 3858 |
| 3851 if Utilities.isMacPlatform(): | 3859 if Utilities.isMacPlatform(): |
| 3852 assistant, args = Utilities.prepareQtMacBundle("assistant", version, args) | 3860 assistant, args = Utilities.prepareQtMacBundle("assistant", version, args) |
| 3853 else: | 3861 else: |
| 3854 if version == 4: | 3862 if version == 4: |
| 3855 assistant = Utilities.generateQtToolName("assistant") | 3863 assistant = os.path.join( |
| 3864 QLibraryInfo.location(QLibraryInfo.BinariesPath), | |
| 3865 Utilities.generateQtToolName("assistant")) | |
| 3856 if Utilities.isWindowsPlatform(): | 3866 if Utilities.isWindowsPlatform(): |
| 3857 assistant = assistant + '.exe' | 3867 assistant += '.exe' |
| 3858 | 3868 |
| 3859 proc = QProcess() | 3869 proc = QProcess() |
| 3860 if not proc.startDetached(assistant, args): | 3870 if not proc.startDetached(assistant, args): |
| 3861 E5MessageBox.critical(self, | 3871 E5MessageBox.critical(self, |
| 3862 self.trUtf8('Process Generation Error'), | 3872 self.trUtf8('Process Generation Error'), |
