diff -r dac33c7fce07 -r e3642a6a1e71 eric7/UI/UserInterface.py
--- a/eric7/UI/UserInterface.py Sat May 15 19:01:16 2021 +0200
+++ b/eric7/UI/UserInterface.py Sat May 15 20:08:03 2021 +0200
@@ -65,7 +65,7 @@
except ImportError:
SSL_AVAILABLE = False
-from eric6config import getConfig
+from eric7config import getConfig
class Redirector(QObject):
@@ -157,7 +157,7 @@
BottomSide = 2
RightSide = 3
- ErrorLogFileName = "eric6_error.log"
+ ErrorLogFileName = "eric7_error.log"
def __init__(self, app, locale, splash, plugin, disabledPlugins,
noOpenAtStartup, noCrashOpenAtStartup, disableCrashSession,
@@ -1470,13 +1470,13 @@
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):
@@ -1514,7 +1514,7 @@
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 (
@@ -1539,7 +1539,7 @@
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
@@ -4137,8 +4137,8 @@
if res and self.__shutdown():
e5App().closeAllWindows()
program = sys.executable
- eric6 = os.path.join(getConfig("ericDir"), "eric6.py")
- args = [eric6]
+ eric7 = os.path.join(getConfig("ericDir"), "eric7.py")
+ args = [eric7]
args.append("--start-session")
args.extend(self.__restartArgs)
QProcess.startDetached(program, args)
@@ -4150,8 +4150,8 @@
if not Preferences.getUI("SingleApplicationMode"):
# start eric without any arguments
program = sys.executable
- eric6 = os.path.join(getConfig("ericDir"), "eric6.py")
- args = [eric6]
+ eric7 = os.path.join(getConfig("ericDir"), "eric7.py")
+ args = [eric7]
QProcess.startDetached(program, args)
def __initToolsMenus(self, menu):
@@ -5264,7 +5264,7 @@
"""
proc = QProcess()
- viewer = os.path.join(getConfig("ericDir"), "eric6_uipreviewer.py")
+ viewer = os.path.join(getConfig("ericDir"), "eric7_uipreviewer.py")
args = []
args.append(viewer)
@@ -5318,7 +5318,7 @@
"""
proc = QProcess()
- viewer = os.path.join(getConfig("ericDir"), "eric6_trpreviewer.py")
+ viewer = os.path.join(getConfig("ericDir"), "eric7_trpreviewer.py")
args = []
args.append(viewer)
@@ -5367,7 +5367,7 @@
"""
proc = QProcess()
- browser = os.path.join(getConfig("ericDir"), "eric6_sqlbrowser.py")
+ browser = os.path.join(getConfig("ericDir"), "eric7_sqlbrowser.py")
args = []
args.append(browser)
@@ -5452,7 +5452,7 @@
"""
proc = QProcess()
- snap = os.path.join(getConfig("ericDir"), "eric6_snap.py")
+ snap = os.path.join(getConfig("ericDir"), "eric7_snap.py")
args = []
args.append(snap)
@@ -5969,7 +5969,7 @@
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()
@@ -6502,20 +6502,20 @@
"""
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):
@@ -6547,10 +6547,10 @@
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)
@@ -6585,10 +6585,10 @@
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,
@@ -6674,7 +6674,7 @@
"""
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)
@@ -6704,7 +6704,7 @@
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,
