eric: comparison eric7/UI/UserInterface.py

-:dac33c7fce07
+:e3642a6a1e71
 from E5Network.E5SslErrorHandler import E5SslErrorHandler, E5SslErrorState
 SSL_AVAILABLE = True
 except ImportError:
 SSL_AVAILABLE = False
-from eric6config import getConfig
+from eric7config import getConfig
 class Redirector(QObject):
 """
 Helper class used to redirect stdout and stderr to the log window.
 LeftSide = 1
 BottomSide = 2
 RightSide = 3
-ErrorLogFileName = "eric6_error.log"
+ErrorLogFileName = "eric7_error.log"
 def __init__(self, app, locale, splash, plugin, disabledPlugins,
 noOpenAtStartup, noCrashOpenAtStartup, disableCrashSession,
 restartArguments, originalPathString):
 """
 """
 import Globals
 installInfoFile = Globals.getInstallInfoFilePath()
 if not os.path.exists(installInfoFile):
-filename = os.path.join(getConfig("ericDir"), "eric6install.json")
+filename = os.path.join(getConfig("ericDir"), "eric7install.json")
 if os.path.exists(filename):
 # eric was installed via the install.py script
 shutil.copy2(filename, installInfoFile)
 else:
 filename = os.path.join(getConfig("ericDir"),
-"eric6installpip.json")
+"eric7installpip.json")
 if os.path.exists(filename):
 # eric was installed via pip (i.e. eric-ide)
 with contextlib.suppress(OSError):
 installDateTime = datetime.datetime.now(tz=None)
 with open(filename, "r") as infoFile:
 if "installed_on" not in installInfo:
 installInfo["installed_on"] = ""
 changed = True
 # 2. merge new data into stored file
-filename = os.path.join(getConfig("ericDir"), "eric6install.json")
+filename = os.path.join(getConfig("ericDir"), "eric7install.json")
 if os.path.exists(filename):
 # eric was updated via the install.py script
 if (
 os.path.getmtime(filename) >
 os.path.getmtime(installInfoFile)
 installInfo2["eric"] = installInfo["eric"]
 installInfo = installInfo2
 changed = True
 else:
 filename = os.path.join(getConfig("ericDir"),
-"eric6installpip.json")
+"eric7installpip.json")
 if os.path.exists(filename):
 # eric was updated via pip (i.e. eric-ide)
 # just update the installation date and time
 installDateTime = datetime.datetime.now(tz=None)
 installInfo["installed_on"] = installDateTime.strftime(
 )
 if res and self.__shutdown():
 e5App().closeAllWindows()
 program = sys.executable
-eric6 = os.path.join(getConfig("ericDir"), "eric6.py")
+eric7 = os.path.join(getConfig("ericDir"), "eric7.py")
-args = [eric6]
+args = [eric7]
 args.append("--start-session")
 args.extend(self.__restartArgs)
 QProcess.startDetached(program, args)
 def __newWindow(self):
 Private slot to start a new instance of eric.
 """
 if not Preferences.getUI("SingleApplicationMode"):
 # start eric without any arguments
 program = sys.executable
-eric6 = os.path.join(getConfig("ericDir"), "eric6.py")
+eric7 = os.path.join(getConfig("ericDir"), "eric7.py")
-args = [eric6]
+args = [eric7]
 QProcess.startDetached(program, args)
 def __initToolsMenus(self, menu):
 """
 Private slot to initialize the various tool menus.
 @param fn filename of the form to be previewed (string)
 """
 proc = QProcess()
-viewer = os.path.join(getConfig("ericDir"), "eric6_uipreviewer.py")
+viewer = os.path.join(getConfig("ericDir"), "eric7_uipreviewer.py")
 args = []
 args.append(viewer)
 if fn is not None:
 @param ignore flag indicating non existing files should be ignored
 (boolean)
 """
 proc = QProcess()
-viewer = os.path.join(getConfig("ericDir"), "eric6_trpreviewer.py")
+viewer = os.path.join(getConfig("ericDir"), "eric7_trpreviewer.py")
 args = []
 args.append(viewer)
 if fileNames is not None:
 """
 Private slot to start the SQL browser tool.
 """
 proc = QProcess()
-browser = os.path.join(getConfig("ericDir"), "eric6_sqlbrowser.py")
+browser = os.path.join(getConfig("ericDir"), "eric7_sqlbrowser.py")
 args = []
 args.append(browser)
 if (
 """
 Private slot to start the snapshot tool.
 """
 proc = QProcess()
-snap = os.path.join(getConfig("ericDir"), "eric6_snap.py")
+snap = os.path.join(getConfig("ericDir"), "eric7_snap.py")
 args = []
 args.append(snap)
 if (
 clientArgs.append("--search={0}".format(searchWord))
 if self.__webBrowserProcess is None:
 webBrowsers = [
 os.path.join(
-os.path.dirname(__file__), "..", "eric6_browser.py"),
+os.path.dirname(__file__), "..", "eric7_browser.py"),
 # QtWebEngine based web browser
 ]
 process = QProcess()
 for browser in webBrowsers:
 args = [
 def __writeTasks(self):
 """
 Private slot to write the tasks data to a JSON file (.etj).
 """
-fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.etj")
+fn = os.path.join(Utilities.getConfigDir(), "eric7tasks.etj")
 self.__tasksFile.writeFile(fn)
 def __readTasks(self):
 """
 Private slot to read in the tasks file (.etj or .e6t).
 """
-fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.etj")
+fn = os.path.join(Utilities.getConfigDir(), "eric7tasks.etj")
 if os.path.exists(fn):
 # try new style JSON file first
 self.__tasksFile.readFile(fn)
 else:
 # try old style XML file second
-fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.e6t")
+fn = os.path.join(Utilities.getConfigDir(), "eric7tasks.e6t")
 if os.path.exists(fn):
 f = QFile(fn)
 if f.open(QIODevice.OpenModeFlag.ReadOnly):
 from E5XML.TasksReader import TasksReader
 reader = TasksReader(f, viewer=self.taskViewer)
 """
 if filename:
 fn = filename
 elif crashSession:
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6_crash_session.esj")
+"eric7_crash_session.esj")
 else:
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6session.esj")
+"eric7session.esj")
 if fn.endswith(".esj"):
 res = self.__sessionFile.writeFile(fn)
 else:
 f = QFile(fn)
 """
 if filename:
 fn = filename
 else:
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6session.esj")
+"eric7session.esj")
 if not os.path.exists(fn):
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6session.e5s")
+"eric7session.e5s")
 if not os.path.exists(fn):
 E5MessageBox.critical(
 self,
 self.tr("Read Session"),
 self.tr("<p>The session file <b>{0}</b> could not"
 """
 Private slot to delete the crash session file.
 """
 for ext in (".esj", ".e5s"):
 fn = os.path.join(Utilities.getConfigDir(),
-f"eric6_crash_session{ext}")
+f"eric7_crash_session{ext}")
 if os.path.exists(fn):
 with contextlib.suppress(OSError):
 os.remove(fn)
 def __writeCrashSession(self):
 not self.__disableCrashSession and
 not self.__noCrashOpenAtStartup and
 Preferences.getUI("OpenCrashSessionOnStartup")
 ):
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6_crash_session.esj")
+"eric7_crash_session.esj")
 if os.path.exists(fn):
 yes = E5MessageBox.yesNo(
 self,
 self.tr("Crash Session found!"),
 self.tr("""A session file of a crashed session was"""

Mercurial Repositories > eric / file comparison

comparison: eric7/UI/UserInterface.py

eric7/UI/UserInterface.py