30 |
30 |
31 class TrayStarter(QSystemTrayIcon): |
31 class TrayStarter(QSystemTrayIcon): |
32 """ |
32 """ |
33 Class implementing a starter for the system tray. |
33 Class implementing a starter for the system tray. |
34 """ |
34 """ |
35 def __init__(self, usePyQt4, settingsDir, webEngine=False): |
35 def __init__(self, usePyQt4, settingsDir): |
36 """ |
36 """ |
37 Constructor |
37 Constructor |
38 |
38 |
39 @param usePyQt4 flag indicating to use PyQt4 |
39 @param usePyQt4 flag indicating to use PyQt4 |
40 @type bool |
40 @type bool |
41 @param settingsDir directory to be used for the settings files |
41 @param settingsDir directory to be used for the settings files |
42 @type str |
42 @type str |
43 @keyparam webEngine flag indicating QtWebEngine is used |
|
44 @type bool |
|
45 """ |
43 """ |
46 super(TrayStarter, self).__init__( |
44 super(TrayStarter, self).__init__( |
47 UI.PixmapCache.getIcon( |
45 UI.PixmapCache.getIcon( |
48 Preferences.getTrayStarter("TrayStarterIcon"))) |
46 Preferences.getTrayStarter("TrayStarterIcon"))) |
49 |
47 |
50 self.usePyQt4 = usePyQt4 |
48 self.usePyQt4 = usePyQt4 |
51 self.settingsDir = settingsDir |
49 self.settingsDir = settingsDir |
52 self.__webEngine = webEngine |
|
53 |
50 |
54 self.maxMenuFilePathLen = 75 |
51 self.maxMenuFilePathLen = 75 |
55 |
52 |
56 self.rsettings = QSettings( |
53 self.rsettings = QSettings( |
57 QSettings.IniFormat, |
54 QSettings.IniFormat, |
315 |
312 |
316 def __startHelpViewer(self): |
313 def __startHelpViewer(self): |
317 """ |
314 """ |
318 Private slot to start the eric6 web browser. |
315 Private slot to start the eric6 web browser. |
319 """ |
316 """ |
320 if self.__webEngine: |
317 variant = Globals.getWebBrowserSupport() |
|
318 if variant == "QtWebEngine": |
321 self.__startProc("eric6_browser.py") |
319 self.__startProc("eric6_browser.py") |
322 else: |
320 elif variant == "QtWebKit": |
323 self.__startProc("eric6_webbrowser.py") |
321 self.__startProc("eric6_webbrowser.py") |
324 |
322 |
325 def __startUIPreviewer(self): |
323 def __startUIPreviewer(self): |
326 """ |
324 """ |
327 Private slot to start the eric6 UI previewer. |
325 Private slot to start the eric6 UI previewer. |
534 .format(PYQT_VERSION_STR) |
532 .format(PYQT_VERSION_STR) |
535 versionText += """<tr><td><b>sip</b></td><td>{0}</td></tr>"""\ |
533 versionText += """<tr><td><b>sip</b></td><td>{0}</td></tr>"""\ |
536 .format(sip_version_str) |
534 .format(sip_version_str) |
537 versionText += """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""\ |
535 versionText += """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""\ |
538 .format(QSCINTILLA_VERSION_STR) |
536 .format(QSCINTILLA_VERSION_STR) |
539 if self.__webEngine: |
537 try: |
540 from WebBrowser.Tools import WebBrowserTools |
538 from WebBrowser.Tools import WebBrowserTools |
541 chromeVersion = WebBrowserTools.getWebEngineVersions()[0] |
539 chromeVersion = WebBrowserTools.getWebEngineVersions()[0] |
542 versionText += \ |
540 versionText += \ |
543 """<tr><td><b>WebEngine</b></td><td>{0}</td></tr>"""\ |
541 """<tr><td><b>WebEngine</b></td><td>{0}</td></tr>"""\ |
544 .format(chromeVersion) |
542 .format(chromeVersion) |
|
543 except ImportError: |
|
544 pass |
545 try: |
545 try: |
546 from PyQt5.QtWebKit import qWebKitVersion |
546 from PyQt5.QtWebKit import qWebKitVersion |
547 versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\ |
547 versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\ |
548 .format(qWebKitVersion()) |
548 .format(qWebKitVersion()) |
549 except ImportError: |
549 except ImportError: |