16 from PyQt6.Qsci import QSCINTILLA_VERSION_STR |
16 from PyQt6.Qsci import QSCINTILLA_VERSION_STR |
17 from PyQt6.QtCore import PYQT_VERSION_STR, QProcess, QSettings, qVersion |
17 from PyQt6.QtCore import PYQT_VERSION_STR, QProcess, QSettings, qVersion |
18 from PyQt6.QtGui import QCursor |
18 from PyQt6.QtGui import QCursor |
19 from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QSystemTrayIcon |
19 from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QSystemTrayIcon |
20 |
20 |
21 from eric7 import Globals, Preferences |
21 from eric7 import EricUtilities, Globals, Preferences |
22 from eric7.__version__ import Version |
22 from eric7.__version__ import Version |
23 from eric7.EricGui import EricPixmapCache |
23 from eric7.EricGui import EricPixmapCache |
24 from eric7.EricWidgets import EricMessageBox |
24 from eric7.EricWidgets import EricMessageBox |
25 from eric7.EricWidgets.EricApplication import ericApp |
25 from eric7.EricWidgets.EricApplication import ericApp |
26 from eric7.SystemUtilities import DesktopUtilities, FileSystemUtilities, PythonUtilities |
26 from eric7.SystemUtilities import DesktopUtilities, FileSystemUtilities, PythonUtilities |
315 proc = QProcess() |
315 proc = QProcess() |
316 applPath = os.path.join(os.path.dirname(__file__), "..", applName) |
316 applPath = os.path.join(os.path.dirname(__file__), "..", applName) |
317 |
317 |
318 args = [] |
318 args = [] |
319 args.append(applPath) |
319 args.append(applPath) |
320 args.append("--config={0}".format(Globals.getConfigDir())) |
320 args.append("--config={0}".format(EricUtilities.getConfigDir())) |
321 if self.settingsDir: |
321 if self.settingsDir: |
322 args.append("--settings={0}".format(self.settingsDir)) |
322 args.append("--settings={0}".format(self.settingsDir)) |
323 for arg in applArgs: |
323 for arg in applArgs: |
324 args.append(arg) |
324 args.append(arg) |
325 |
325 |