eric: comparison eric6/UI/UserInterface.py

-:10554f5fac78
+:096b3ebc1409
 """
 Module implementing the main user interface.
 """
 import os
 import sys
 import logging
+import shutil
+import json
+import datetime
+import getpass
 from PyQt5.QtCore import (
 pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, PYQT_VERSION_STR, QDate,
 QIODevice, qVersion, QProcess, QSize, QUrl, QObject, Qt, QUuid, QThread,
 QUrlQuery
 from E5Gui.E5ProgressDialog import E5ProgressDialog
 from E5Gui.E5ClickableLabel import E5ClickableLabel
 import Preferences
 import Utilities
+import Globals
 import UI.PixmapCache
 from E5Network.E5NetworkIcon import E5NetworkIcon
 from E5Network.E5NetworkProxyFactory import (
 if opens == 0:
 # no files, project or multiproject was given
 if not self.__noOpenAtStartup:
 self.__openOnStartup()
+def processInstallInfoFile(self):
+"""
+Public method to process the file containing installation information.
+"""
+import Globals
+installInfoFile = Globals.getInstallInfoFilePath()
+if not os.path.exists(installInfoFile):
+filename = os.path.join(getConfig("ericDir"), "eric6install.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")
+if os.path.exists(filename):
+# eric was installed via pip (i.e. eric-ide)
+try:
+installDateTime = datetime.datetime.now(tz=None)
+with open(filename, "r") as infoFile:
+installInfo = json.load(infoFile)
+installInfo["guessed"] = True
+installInfo["eric"] = getConfig("ericDir")
+installInfo["virtualenv"] = (
+installInfo["eric"].startswith(
+os.path.expanduser("~"))
+)
+if installInfo["virtualenv"]:
+installInfo["user"] = getpass.getuser()
+installInfo["exe"] = sys.executable
+installInfo["installed"] = True
+installInfo["installed_on"] = installDateTime.strftime(
+"%Y-%m-%d %H:%M:%S")
+installInfo["sudo"] = not os.access(
+installInfo["eric"], os.W_OK)
+with open(installInfoFile, "w") as infoFile:
+json.dump(installInfo, infoFile, indent=2)
+except EnvironmentError:
+# ignore this
+pass
+else:
+changed = False
+with open(installInfoFile, "r") as infoFile:
+installInfo = json.load(infoFile)
+# 1. adapt stored file to latest format
+if "install_cwd" not in installInfo:
+installInfo["install_cwd"] = ""
+installInfo["install_cwd_edited"] = False
+changed = True
+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")
+if os.path.exists(filename):
+# eric was updated via the install.py script
+if (
+os.path.getmtime(filename) >
+os.path.getmtime(installInfoFile)
+):
+if not installInfo["edited"]:
+shutil.copy2(filename, installInfoFile)
+else:
+with open(filename, "r") as infoFile:
+installInfo2 = json.load(infoFile)
+if not installInfo["install_cwd_edited"]:
+installInfo2["install_cwd"] = installInfo[
+"install_cwd"]
+if not installInfo["exe_edited"]:
+installInfo2["exe"] = installInfo["exe"]
+if not installInfo["argv_edited"]:
+installInfo2["argv"] = installInfo["argv"]
+if not installInfo["eric_edited"]:
+installInfo2["eric"] = installInfo["eric"]
+installInfo = installInfo2
+changed = True
+else:
+filename = os.path.join(getConfig("ericDir"),
+"eric6installpip.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(
+"%Y-%m-%d %H:%M:%S")
+changed = True
+if changed:
+with open(installInfoFile, "w") as infoFile:
+json.dump(installInfo, infoFile, indent=2)
 def __createDockWindow(self, name):
 """
 Private method to create a dock window with common properties.
 @param name object name of the new dock window (string)
 """<b>Show Error Log...</b>"""
 """<p>Opens a dialog showing the most recent error log.</p>"""
 ))
 self.showErrorLogAct.triggered.connect(self.__showErrorLog)
 self.actions.append(self.showErrorLogAct)
+self.showInstallInfoAct = E5Action(
+self.tr('Show Install Info'),
+self.tr('Show Install &Info...'),
+0, 0, self, 'show_install_info')
+self.showInstallInfoAct.setStatusTip(self.tr(
+'Show Installation Information'))
+self.showInstallInfoAct.setWhatsThis(self.tr(
+"""<b>Show Install Info...</b>"""
+"""<p>Opens a dialog showing some information about the"""
+""" installation process.</p>"""
+))
+self.showInstallInfoAct.triggered.connect(self.__showInstallInfo)
+self.actions.append(self.showInstallInfoAct)
 self.reportBugAct = E5Action(
 self.tr('Report Bug'),
 self.tr('Report &Bug...'),
 0, 0, self, 'report_bug')
 self.__menus["help"].addAction(self.versionAct)
 self.__menus["help"].addSeparator()
 self.__menus["help"].addAction(self.checkUpdateAct)
 self.__menus["help"].addAction(self.showVersionsAct)
 self.__menus["help"].addSeparator()
+self.__menus["help"].addAction(self.showInstallInfoAct)
+self.__menus["help"].addSeparator()
 self.__menus["help"].addAction(self.showErrorLogAct)
 self.__menus["help"].addAction(self.reportBugAct)
 self.__menus["help"].addAction(self.requestFeatureAct)
 self.__menus["help"].addSeparator()
 self.__menus["help"].addAction(self.whatsThisAct)
 Private slot to display the Help menu.
 """
 self.checkUpdateAct.setEnabled(not self.__inVersionCheck)
 self.showVersionsAct.setEnabled(not self.__inVersionCheck)
 self.showErrorLogAct.setEnabled(self.__hasErrorLog())
+infoFileName = Globals.getInstallInfoFilePath()
+self.showInstallInfoAct.setEnabled(os.path.exists(infoFileName))
 self.showMenu.emit("Help", self.__menus["help"])
 def __showSettingsMenu(self):
 """
 address = FeatureAddress
 else:
 address = BugAddress
 subject = "[eric6] "
 if attachFile is not None:
-f = open(attachFile, "r", encoding="utf-8")
+with open(attachFile, "r", encoding="utf-8") as f:
 body = f.read()
-f.close()
 if deleteAttachFile:
 os.remove(attachFile)
 else:
 body = "\r\n----\r\n{0}\r\n----\r\n{1}\r\n----\r\n{2}".format(
 Utilities.generateVersionInfo("\r\n"),
 logFile = os.path.join(Utilities.getConfigDir(),
 self.ErrorLogFileName)
 if os.path.exists(logFile):
 from .ErrorLogDialog import ErrorLogDialog
 dlg = ErrorLogDialog(logFile, False, self)
-dlg.exec_()
+dlg.exec()
 def __hasErrorLog(self):
 """
 Private method to check, if an error log file exists.
 self.ErrorLogFileName)
 if os.path.exists(logFile):
 from .ErrorLogDialog import ErrorLogDialog
 dlg = ErrorLogDialog(logFile, True, self)
 dlg.show()
+def __showInstallInfo(self):
+"""
+Private slot to show a dialog containing information about the
+installation process.
+"""
+from .InstallInfoDialog import InstallInfoDialog
+dlg = InstallInfoDialog(self)
+if dlg.wasLoaded():
+dlg.exec()
 def __compareFiles(self):
 """
 Private slot to handle the Compare Files dialog.
 """
 aw = self.viewmanager.activeWindow()
 Private slot to handle the tools configuration menu entry.
 """
 from Preferences.ToolConfigurationDialog import ToolConfigurationDialog
 dlg = ToolConfigurationDialog(
 self.toolGroups[self.currentToolGroup][1], self)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 self.toolGroups[self.currentToolGroup][1] = dlg.getToollist()
 self.__updateExternalToolsActions()
 def __toolGroupsConfiguration(self):
 """
 from Preferences.ToolGroupConfigurationDialog import (
 ToolGroupConfigurationDialog
 )
 dlg = ToolGroupConfigurationDialog(
 self.toolGroups, self.currentToolGroup, self)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 self.toolGroups, self.currentToolGroup = dlg.getToolGroups()
 def __createUnitTestDialog(self):
 """
 Private slot to generate the unit test dialog on demand.
 elif self.__lastConfigurationPageName:
 self.__configurationDialog.showConfigurationPageByName(
 self.__lastConfigurationPageName)
 else:
 self.__configurationDialog.showConfigurationPageByName("empty")
-self.__configurationDialog.exec_()
+self.__configurationDialog.exec()
 QApplication.processEvents()
 if self.__configurationDialog.result() == QDialog.Accepted:
 self.__configurationDialog.setPreferences()
 Preferences.syncPreferences()
 self.__preferencesChanged()
 Private slot to configure the various view profiles.
 """
 from Preferences.ViewProfileDialog import ViewProfileDialog
 dlg = ViewProfileDialog(self.__layoutType, self.profiles['edit'][1],
 self.profiles['debug'][1])
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 edit, debug = dlg.getVisibilities()
 self.profiles['edit'][1] = edit
 self.profiles['debug'][1] = debug
 Preferences.setUI("ViewProfiles2", self.profiles)
 if self.currentProfile == "edit":
 """
 Private slot to configure the various toolbars.
 """
 from E5Gui.E5ToolBarDialog import E5ToolBarDialog
 dlg = E5ToolBarDialog(self.toolbarManager)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 Preferences.setUI(
 "ToolbarManagerState", self.toolbarManager.saveState())
 def __configShortcuts(self):
 """
 Private slot to show the certificates management dialog.
 """
 from E5Network.E5SslCertificatesDialog import E5SslCertificatesDialog
 dlg = E5SslCertificatesDialog(self)
-dlg.exec_()
+dlg.exec()
 def __clearPrivateData(self):
 """
 Private slot to clear the private data lists.
 """
 from .ClearPrivateDataDialog import ClearPrivateDataDialog
 dlg = ClearPrivateDataDialog(self)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 # recent files, recent projects, recent multi  projects,
 # debug histories, shell histories
 (files, projects, multiProjects, debug, shell, vcs, plugins) = (
 dlg.getData()
 )
 from PluginManager.PluginInstallDialog import PluginInstallDialog
 dlg = PluginInstallDialog(
 self.pluginManager,
 [] if pluginFileNames is None else pluginFileNames[:],
 self)
-dlg.exec_()
+dlg.exec()
 if dlg.restartNeeded():
 self.__restart(ask=True)
 def __deinstallPlugin(self):
 """
 Private slot to show a dialog to uninstall a plugin.
 """
 from PluginManager.PluginUninstallDialog import PluginUninstallDialog
 dlg = PluginUninstallDialog(self.pluginManager, self)
-dlg.exec_()
+dlg.exec()
 def showPluginsAvailable(self):
 """
 Public slot to show the plugins available for download.
 """
 from PluginManager.PluginRepositoryDialog import PluginRepositoryDialog
 dlg = PluginRepositoryDialog(self.pluginManager, self)
-res = dlg.exec_()
+res = dlg.exec()
 if res == (QDialog.Accepted + 1):
 self.__installPlugins(dlg.getDownloadedPlugins())
 def __pluginsConfigure(self):
 """

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/UserInterface.py

eric6/UI/UserInterface.py