Mercurial Repositories > eric / changeset
changeset
Changed the Project and MultiProject configuration option "XMLTimestamp" to "TimestampFile". A configuration check is suggested.
Sat, 30 Jan 2021 16:19:25 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 30 Jan 2021 16:19:25 +0100
- branch
- jsonfiles
- changeset 8031
- ce5858a237d2
- parent 8028
- a4f1b68c0737
- child 8045
- 4d5209dc6eb4
- child 8046
- f4a86aff5f48
Changed the Project and MultiProject configuration option "XMLTimestamp" to "TimestampFile". A configuration check is suggested.
--- a/eric6/E5XML/DebuggerPropertiesWriter.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/E5XML/DebuggerPropertiesWriter.py Sat Jan 30 16:19:25 2021 +0100 @@ -52,7 +52,7 @@ self.name)) self.writeComment( " This file was generated automatically, do not edit. ") - if Preferences.getProject("XMLTimestamp"): + if Preferences.getProject("TimestampFile"): self.writeComment( " Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S')))
--- a/eric6/E5XML/MultiProjectWriter.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/E5XML/MultiProjectWriter.py Sat Jan 30 16:19:25 2021 +0100 @@ -47,7 +47,7 @@ # add some generation comments self.writeComment(" eric multi project file for multi project {0} " .format(self.name)) - if Preferences.getMultiProject("XMLTimestamp"): + if Preferences.getMultiProject("TimestampFile"): self.writeComment( " Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S'))) self.writeComment(
--- a/eric6/E5XML/ProjectWriter.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/E5XML/ProjectWriter.py Sat Jan 30 16:19:25 2021 +0100 @@ -67,7 +67,7 @@ # add some generation comments self.writeComment( " eric project file for project {0} ".format(self.name)) - if Preferences.getProject("XMLTimestamp"): + if Preferences.getProject("TimestampFile"): self.writeComment( " Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S'))) self.writeComment(" Copyright (C) {0} {1}, {2} ".format(
--- a/eric6/E5XML/SessionWriter.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/E5XML/SessionWriter.py Sat Jan 30 16:19:25 2021 +0100 @@ -58,7 +58,7 @@ " eric session file for project {0} ".format(self.name)) self.writeComment( " This file was generated automatically, do not edit. ") - if Preferences.getProject("XMLTimestamp") or isGlobal: + if Preferences.getProject("TimestampFile") or isGlobal: self.writeComment( " Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S')))
--- a/eric6/E5XML/TasksWriter.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/E5XML/TasksWriter.py Sat Jan 30 16:19:25 2021 +0100 @@ -48,7 +48,7 @@ if self.forProject: self.writeComment( " eric tasks file for project {0} ".format(self.name)) - if Preferences.getProject("XMLTimestamp"): + if Preferences.getProject("TimestampFile"): self.writeComment(" Saved: {0} ".format( time.strftime('%Y-%m-%d, %H:%M:%S'))) else:
--- a/eric6/E5XML/UserProjectWriter.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/E5XML/UserProjectWriter.py Sat Jan 30 16:19:25 2021 +0100 @@ -49,7 +49,7 @@ # add some generation comments self.writeComment( " eric user project file for project {0} ".format(self.name)) - if Preferences.getProject("XMLTimestamp"): + if Preferences.getProject("TimestampFile"): self.writeComment( " Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S'))) self.writeComment(" Copyright (C) {0} {1}, {2} ".format(
--- a/eric6/MultiProject/MultiProjectFile.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/MultiProject/MultiProjectFile.py Sat Jan 30 16:19:25 2021 +0100 @@ -55,8 +55,7 @@ "comment": f"eric multi project file for multi project {name}", } - # TODO: replace 'XMLTimestamp' by 'Timestamp' - if Preferences.getMultiProject("XMLTimestamp"): + if Preferences.getMultiProject("TimestampFile"): multiProjectDict["header"]["saved"] = ( time.strftime('%Y-%m-%d, %H:%M:%S') )
--- a/eric6/Preferences/ConfigurationPages/MultiProjectPage.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/Preferences/ConfigurationPages/MultiProjectPage.py Sat Jan 30 16:19:25 2021 +0100 @@ -34,7 +34,7 @@ self.openMasterAutomaticallyCheckBox.setChecked( Preferences.getMultiProject("OpenMasterAutomatically")) self.multiProjectTimestampCheckBox.setChecked( - Preferences.getMultiProject("XMLTimestamp")) + Preferences.getMultiProject("TimestampFile")) self.multiProjectRecentSpinBox.setValue( Preferences.getMultiProject("RecentNumber")) self.workspacePicker.setText( @@ -50,7 +50,7 @@ "OpenMasterAutomatically", self.openMasterAutomaticallyCheckBox.isChecked()) Preferences.setMultiProject( - "XMLTimestamp", + "TimestampFile", self.multiProjectTimestampCheckBox.isChecked()) Preferences.setMultiProject( "RecentNumber",
--- a/eric6/Preferences/ConfigurationPages/MultiProjectPage.ui Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/Preferences/ConfigurationPages/MultiProjectPage.ui Sat Jan 30 16:19:25 2021 +0100 @@ -78,16 +78,16 @@ <item> <widget class="QGroupBox" name="groupBox_6"> <property name="title"> - <string>XML</string> + <string>Files</string> </property> <layout class="QVBoxLayout"> <item> <widget class="QCheckBox" name="multiProjectTimestampCheckBox"> <property name="toolTip"> - <string>Select, if a timestamp should be written to all multiproject related XML files</string> + <string>Select, if a timestamp should be written to all Multi Project files</string> </property> <property name="text"> - <string>Include timestamp in multiproject related XML files</string> + <string>Include timestamp in Multi Project files</string> </property> </widget> </item>
--- a/eric6/Preferences/ConfigurationPages/ProjectPage.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/Preferences/ConfigurationPages/ProjectPage.py Sat Jan 30 16:19:25 2021 +0100 @@ -49,7 +49,7 @@ self.projectAutoMakeCheckBox.setChecked( Preferences.getProject("AutoExecuteMake")) self.projectTimestampCheckBox.setChecked( - Preferences.getProject("XMLTimestamp")) + Preferences.getProject("TimestampFile")) self.projectRecentSpinBox.setValue( Preferences.getProject("RecentNumber")) self.pythonVariantCheckBox.setChecked( @@ -99,7 +99,7 @@ "AutoExecuteMake", self.projectAutoMakeCheckBox.isChecked()) Preferences.setProject( - "XMLTimestamp", + "TimestampFile", self.projectTimestampCheckBox.isChecked()) Preferences.setProject( "RecentNumber",
--- a/eric6/Preferences/ConfigurationPages/ProjectPage.ui Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/Preferences/ConfigurationPages/ProjectPage.ui Sat Jan 30 16:19:25 2021 +0100 @@ -34,16 +34,16 @@ <item> <widget class="QGroupBox" name="groupBox_6"> <property name="title"> - <string>XML</string> + <string>Files</string> </property> <layout class="QVBoxLayout"> <item> <widget class="QCheckBox" name="projectTimestampCheckBox"> <property name="toolTip"> - <string>Select, if a timestamp should be written to all project related XML files</string> + <string>Select, if a timestamp should be written to all Project files</string> </property> <property name="text"> - <string>Include timestamp in project related XML files</string> + <string>Include timestamp in Project files</string> </property> </widget> </item>
--- a/eric6/Preferences/__init__.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/Preferences/__init__.py Sat Jan 30 16:19:25 2021 +0100 @@ -782,7 +782,7 @@ "AutoLoadSession": False, "AutoSaveSession": False, "SessionAllBreakpoints": False, - "XMLTimestamp": True, + "TimestampFile": True, "AutoCompileForms": False, "AutoCompileResources": False, "AutoExecuteMake": False, @@ -804,7 +804,7 @@ # defaults for the multi project settings multiProjectDefaults = { "OpenMasterAutomatically": True, - "XMLTimestamp": True, + "TimestampFile": True, "RecentNumber": 9, "Workspace": "", } @@ -2637,7 +2637,7 @@ if key in ["RecentNumber"]: return int(prefClass.settings.value( "MultiProject/" + key, prefClass.multiProjectDefaults[key])) - elif key in ["OpenMasterAutomatically", "XMLTimestamp"]: + elif key in ["OpenMasterAutomatically", "TimestampFile"]: return toBool(prefClass.settings.value( "MultiProject/" + key, prefClass.multiProjectDefaults[key])) else:
--- a/eric6/Project/DebuggerPropertiesFile.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/Project/DebuggerPropertiesFile.py Sat Jan 30 16:19:25 2021 +0100 @@ -55,8 +55,7 @@ "warning": "This file was generated automatically, do not edit.", } - # TODO: replace 'XMLTimestamp' by 'Timestamp' - if Preferences.getProject("XMLTimestamp"): + if Preferences.getProject("TimestampFile"): debuggerPropertiesDict["header"]["saved"] = ( time.strftime('%Y-%m-%d, %H:%M:%S') )
--- a/eric6/Project/ProjectFile.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/Project/ProjectFile.py Sat Jan 30 16:19:25 2021 +0100 @@ -56,8 +56,7 @@ self.__project.pdata["EMAIL"]) } - # TODO: replace 'XMLTimestamp' by 'Timestamp' - if Preferences.getProject("XMLTimestamp"): + if Preferences.getProject("TimestampFile"): projectDict["header"]["saved"] = ( time.strftime('%Y-%m-%d, %H:%M:%S') )
--- a/eric6/Project/UserProjectFile.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/Project/UserProjectFile.py Sat Jan 30 16:19:25 2021 +0100 @@ -53,8 +53,7 @@ self.__project.getProjectName()), } - # TODO: replace 'XMLTimestamp' by 'Timestamp' - if Preferences.getProject("XMLTimestamp"): + if Preferences.getProject("TimestampFile"): userProjectDict["header"]["saved"] = ( time.strftime('%Y-%m-%d, %H:%M:%S') )
--- a/eric6/Sessions/SessionFile.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/Sessions/SessionFile.py Sat Jan 30 16:19:25 2021 +0100 @@ -66,8 +66,7 @@ "This file was generated automatically, do not edit." ) - # TODO: replace 'XMLTimestamp' by 'Timestamp' - if Preferences.getProject("XMLTimestamp") or self.__isGlobal: + if Preferences.getProject("TimestampFile") or self.__isGlobal: sessionDict["header"]["saved"] = ( time.strftime('%Y-%m-%d, %H:%M:%S') )
--- a/eric6/Tasks/TasksFile.py Fri Jan 29 19:31:47 2021 +0100 +++ b/eric6/Tasks/TasksFile.py Sat Jan 30 16:19:25 2021 +0100 @@ -71,8 +71,7 @@ "This file was generated automatically, do not edit." ), } - # TODO: replace 'XMLTimestamp' by 'Timestamp' - if Preferences.getProject("XMLTimestamp"): + if Preferences.getProject("TimestampFile"): tasksDict["header"]["saved"] = ( time.strftime('%Y-%m-%d, %H:%M:%S') )
