eric: comparison eric6/UI/UserInterface.py

-:874fdd14d3a2
+:43248bafe9b2
 import Preferences
 import Utilities
 import Globals
 import UI.PixmapCache
+from Sessions.SessionFile import SessionFile
+from Tasks.TasksFile import TasksFile
 from E5Network.E5NetworkProxyFactory import (
 E5NetworkProxyFactory, proxyAuthenticationRequired
 )
 try:
 from VirtualEnv.VirtualenvManager import VirtualenvManager
 self.virtualenvManager = VirtualenvManager(self)
 # register it early because it is needed very soon
 e5App().registerObject("VirtualEnvManager", self.virtualenvManager)
-# Generate the debug server object
-from Debugger.DebugServer import DebugServer
-debugServer = DebugServer(self.__originalPathString)
-# Create the background service object
-from Utilities.BackgroundService import BackgroundService
-self.backgroundService = BackgroundService()
 # Generate an empty project object and multi project object
 from Project.Project import Project
 self.project = Project(self)
 e5App().registerObject("Project", self.project)
 from MultiProject.MultiProject import MultiProject
 self.multiProject = MultiProject(self.project, self)
+# Generate the debug server object
+from Debugger.DebugServer import DebugServer
+debugServer = DebugServer(self.__originalPathString,
+project=self.project)
+# Create the background service object
+from Utilities.BackgroundService import BackgroundService
+self.backgroundService = BackgroundService()
 splash.showMessage(self.tr("Initializing Plugin Manager..."))
 # Initialize the Plugin Manager (Plugins are initialized later
 from PluginManager.PluginManager import PluginManager
 # list of web addresses serving the versions file
 self.__httpAlternatives = Preferences.getUI("VersionsUrls6")
 self.__inVersionCheck = False
 self.__versionCheckProgress = None
+# create the various JSON file interfaces
+self.__sessionFile = SessionFile(True)
+self.__tasksFile = TasksFile(True)
 # Initialize the actions, menus, toolbars and statusbar
 splash.showMessage(self.tr("Initializing Actions..."))
 self.__initActions()
 splash.showMessage(self.tr("Initializing Menus..."))
 self.__initMenus()
 @param args list of files to open<br />
 The args are processed one at a time. All arguments after a
 '--' option are considered debug arguments to the program
 for the debugger. All files named before the '--' option
 are opened in a text editor, unless the argument ends in
-.e4p, then it is opened as a project file. If it ends in
+.epj or .e4p, then it is opened as a project file. If it
-.e4m or .e5m, it is opened as a multiproject.
+ends in .emj, .e4m or .e5m, it is opened as a multi project.
 """
 # check and optionally read a crash session and ignore any arguments
 if self.__readCrashSession():
 return
 ext = os.path.splitext(arg)[1]
 ext = os.path.normcase(ext)
 except IndexError:
 ext = ""
-if ext in ['.e4p']:
+if ext in ('.epj', '.e4p'):
 self.project.openProject(arg)
 opens += 1
-elif ext in ['.e4m', '.e5m']:
+elif ext in ('.emj', '.e4m', '.e5m'):
 self.multiProject.openMultiProject(arg)
 opens += 1
 else:
 self.viewmanager.openFiles(arg)
 opens += 1
 """
 Private slot to create the toolbars.
 """
 filetb = self.viewmanager.initFileToolbar(self.toolbarManager)
 edittb = self.viewmanager.initEditToolbar(self.toolbarManager)
-searchtb, quicksearchtb = self.viewmanager.initSearchToolbars(
+searchtb = self.viewmanager.initSearchToolbar(self.toolbarManager)
-self.toolbarManager)
 viewtb = self.viewmanager.initViewToolbar(self.toolbarManager)
 starttb, debugtb = self.debuggerUI.initToolbars(self.toolbarManager)
 multiprojecttb = self.multiProject.initToolbar(self.toolbarManager)
 projecttb, vcstb = self.project.initToolbars(self.toolbarManager)
 toolstb = QToolBar(self.tr("Tools"), self)
 # add the various toolbars
 self.addToolBar(filetb)
 self.addToolBar(edittb)
 self.addToolBar(searchtb)
-self.addToolBar(quicksearchtb)
 self.addToolBar(viewtb)
 self.addToolBar(starttb)
 self.addToolBar(debugtb)
 self.addToolBar(multiprojecttb)
 self.addToolBar(projecttb)
 self.addToolBar(profilestb)
 self.addToolBar(pluginstb)
 # hide toolbars not wanted in the initial layout
 searchtb.hide()
-quicksearchtb.hide()
 viewtb.hide()
 debugtb.hide()
 multiprojecttb.hide()
 helptb.hide()
 spellingtb.hide()
 self.__toolbars["unittest"] = [unittesttb.windowTitle(), unittesttb,
 ""]
 self.__toolbars["view_profiles"] = [profilestb.windowTitle(),
 profilestb, ""]
 self.__toolbars["plugins"] = [pluginstb.windowTitle(), pluginstb, ""]
-self.__toolbars["quicksearch"] = [quicksearchtb.windowTitle(),
-quicksearchtb, ""]
 self.__toolbars["multiproject"] = [multiprojecttb.windowTitle(),
 multiprojecttb, ""]
 self.__toolbars["spelling"] = [spellingtb.windowTitle(), spellingtb,
 ""]
 self.__toolbars["vcs"] = [vcstb.windowTitle(), vcstb, "vcs"]
 # connection unsuccessful
 return False
 elif res == 0:
 # successful
 break
+elif res == -1:
+# web browser did not start
+continue
 else:
 return False
 process.finished.connect(self.__webBrowserFinished)
 self.__webBrowserProcess = process
 else:
 clientArgs.append("--newtab={0}".format(home))
-if clientArgs:
+if clientArgs and self.__webBrowserClient:
 self.__webBrowserClient.processArgs(clientArgs, disconnect=False)
 return True
 def __connectToWebBrowser(self, process):
 """
 fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
 None,
 self.tr("Export Keyboard Shortcuts"),
 "",
-self.tr("Keyboard shortcut file (*.e4k)"),
+self.tr("Keyboard Shortcuts File (*.ekj);;"
+"XML Keyboard Shortcuts File (*.e4k)"),
 "",
 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
 if not fn:
 return
 if not ext:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
 fn += ex
-from Preferences import Shortcuts
+if os.path.exists(fn):
-Shortcuts.exportShortcuts(fn)
+ok = E5MessageBox.yesNo(
+self,
+self.tr("Export Keyboard Shortcuts"),
+self.tr("""<p>The keyboard shortcuts file <b>{0}</b> exists"""
+""" already. Overwrite it?</p>""").format(fn))
+else:
+ok = True
+if ok:
+from Preferences import Shortcuts
+Shortcuts.exportShortcuts(fn)
 def __importShortcuts(self):
 """
 Private slot to import the keyboard shortcuts.
 """
 fn = E5FileDialog.getOpenFileName(
 None,
 self.tr("Import Keyboard Shortcuts"),
 "",
-self.tr("Keyboard shortcut file (*.e4k)"))
+self.tr("Keyboard Shortcuts File (*.ekj);;"
+"XML Keyboard shortcut file (*.e4k)"))
 if fn:
 from Preferences import Shortcuts
 Shortcuts.importShortcuts(fn)
 self.utScriptAct.setEnabled(False)
 def __writeTasks(self):
 """
-Private slot to write the tasks data to an XML file (.e6t).
+Private slot to write the tasks data to a JSON file (.etj).
 """
-fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.e6t")
+fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.etj")
-f = QFile(fn)
+self.__tasksFile.writeFile(fn)
-ok = f.open(QIODevice.WriteOnly)
-if not ok:
-E5MessageBox.critical(
-self,
-self.tr("Save tasks"),
-self.tr(
-"<p>The tasks file <b>{0}</b> could not be written.</p>")
-.format(fn))
-return
-from E5XML.TasksWriter import TasksWriter
-TasksWriter(f, False).writeXML()
-f.close()
 def __readTasks(self):
 """
-Private slot to read in the tasks file (.e6t).
+Private slot to read in the tasks file (.etj or .e6t).
 """
-fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.e6t")
+fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.etj")
-if not os.path.exists(fn):
+if os.path.exists(fn):
-# try again with the old extension
+# try new style JSON file first
-fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.e4t")
+self.__tasksFile.readFile(fn)
-if not os.path.exists(fn):
-return
-f = QFile(fn)
-if f.open(QIODevice.ReadOnly):
-from E5XML.TasksReader import TasksReader
-reader = TasksReader(f, viewer=self.taskViewer)
-reader.readXML()
-f.close()
 else:
-E5MessageBox.critical(
+# try old style XML file second
-self,
+fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.e6t")
-self.tr("Read tasks"),
+if os.path.exists(fn):
-self.tr(
+f = QFile(fn)
-"<p>The tasks file <b>{0}</b> could not be read.</p>")
+if f.open(QIODevice.ReadOnly):
-.format(fn))
+from E5XML.TasksReader import TasksReader
+reader = TasksReader(f, viewer=self.taskViewer)
+reader.readXML()
+f.close()
+else:
+E5MessageBox.critical(
+self,
+self.tr("Read Tasks"),
+self.tr(
+"<p>The tasks file <b>{0}</b> could not be"
+" read.</p>")
+.format(fn))
 def __writeSession(self, filename="", crashSession=False):
 """
-Private slot to write the session data to an XML file (.e5s).
+Private slot to write the session data to a JSON file (.esj).
 @param filename name of a session file to write
 @type str
 @param crashSession flag indicating to write a crash session file
 @type bool
 @return flag indicating success
 @rtype bool
 """
-res = False
 if filename:
 fn = filename
 elif crashSession:
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6_crash_session.e5s")
+"eric6_crash_session.esj")
 else:
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6session.e5s")
+"eric6session.esj")
-f = QFile(fn)
-if f.open(QIODevice.WriteOnly):
+if fn.endswith(".esj"):
-from E5XML.SessionWriter import SessionWriter
+res = self.__sessionFile.writeFile(fn)
-SessionWriter(f, None).writeXML()
-f.close()
-res = True
 else:
-E5MessageBox.critical(
-self,
-self.tr("Save session"),
-self.tr("<p>The session file <b>{0}</b> could not be"
-" written.</p>")
-.format(fn))
-return res
-def __readSession(self, filename=""):
-"""
-Private slot to read in the session file (.e5s or .e4s).
-@param filename name of a session file to read
-@type str
-@return flag indicating success
-@rtype bool
-"""
-if filename:
-fn = filename
-else:
-fn = os.path.join(Utilities.getConfigDir(),
-"eric6session.e5s")
-if not os.path.exists(fn):
-fn = os.path.join(Utilities.getConfigDir(),
-"eric6session.e4s")
-if not os.path.exists(fn):
-E5MessageBox.critical(
-self,
-self.tr("Read session"),
-self.tr("<p>The session file <b>{0}</b> could not"
-" be read.</p>")
-.format(fn))
-fn = ""
-res = False
-if fn:
 f = QFile(fn)
-if f.open(QIODevice.ReadOnly):
+if f.open(QIODevice.WriteOnly):
-from E5XML.SessionReader import SessionReader
+from E5XML.SessionWriter import SessionWriter
-self.__readingSession = True
+SessionWriter(f, None).writeXML()
-reader = SessionReader(f, True)
-reader.readXML()
-self.__readingSession = False
 f.close()
 res = True
 else:
 E5MessageBox.critical(
 self,
-self.tr("Read session"),
+self.tr("Save Session"),
 self.tr("<p>The session file <b>{0}</b> could not be"
-" read.</p>")
+" written.</p>")
 .format(fn))
+res = False
+return res
+def __readSession(self, filename=""):
+"""
+Private slot to read in the session file (.esj or .e5s).
+@param filename name of a session file to read
+@type str
+@return flag indicating success
+@rtype bool
+"""
+if filename:
+fn = filename
+else:
+fn = os.path.join(Utilities.getConfigDir(),
+"eric6session.esj")
+if not os.path.exists(fn):
+fn = os.path.join(Utilities.getConfigDir(),
+"eric6session.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"
+" be read.</p>")
+.format(fn))
+fn = ""
+res = False
+if fn:
+if fn.endswith(".esj"):
+# new JSON based format
+self.__readingSession = True
+res = self.__sessionFile.readFile(fn)
+self.__readingSession = False
+else:
+# old XML based format
+f = QFile(fn)
+if f.open(QIODevice.ReadOnly):
+from E5XML.SessionReader import SessionReader
+self.__readingSession = True
+reader = SessionReader(f, True)
+reader.readXML()
+self.__readingSession = False
+f.close()
+res = True
+else:
+E5MessageBox.critical(
+self,
+self.tr("Read session"),
+self.tr("<p>The session file <b>{0}</b> could not be"
+" read.</p>")
+.format(fn))
 # Write a crash session after a session was read.
 self.__writeCrashSession()
 return res
 """
 Private slot to save a session to disk.
 """
 sessionFile, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
 self,
-self.tr("Save session"),
+self.tr("Save Session"),
 Utilities.getHomeDir(),
-self.tr("eric Session Files (*.e5s)"),
+self.tr("eric Session Files (*.esj);;"
+"eric XML Session Files (*.e5s)"),
 "")
 if not sessionFile:
 return
 """
 sessionFile = E5FileDialog.getOpenFileName(
 self,
 self.tr("Load session"),
 Utilities.getHomeDir(),
-self.tr("eric Session Files (*.e5s)"))
+self.tr("eric Session Files (*.esj);;"
+"eric XML Session Files (*.e5s)"))
 if not sessionFile:
 return
 self.__readSession(filename=sessionFile)
 def __deleteCrashSession(self):
 """
 Private slot to delete the crash session file.
 """
-fn = os.path.join(Utilities.getConfigDir(),
+for ext in (".esj", ".e5s"):
-"eric6_crash_session.e5s")
+fn = os.path.join(Utilities.getConfigDir(),
-if os.path.exists(fn):
+f"eric6_crash_session{ext}")
-try:
+if os.path.exists(fn):
-os.remove(fn)
+try:
-except OSError:
+os.remove(fn)
-# ignore it silently
+except OSError:
-pass
+# ignore it silently
+pass
 def __writeCrashSession(self):
 """
 Private slot to write a crash session file.
 """
 not self.__disableCrashSession and
 not self.__noCrashOpenAtStartup and
 Preferences.getUI("OpenCrashSessionOnStartup")
 ):
 fn = os.path.join(Utilities.getConfigDir(),
-"eric6_crash_session.e5s")
+"eric6_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: eric6/UI/UserInterface.py

eric6/UI/UserInterface.py