Mercurial Repositories > eric / file diff

--- a/eric6.e4p	Mon Feb 01 10:38:43 2021 +0100
+++ b/eric6.e4p	Tue Mar 02 17:12:08 2021 +0100
@@ -259,11 +259,12 @@
     <Source>eric6/IconEditor/IconSizeDialog.py</Source>
     <Source>eric6/IconEditor/__init__.py</Source>
     <Source>eric6/IconEditor/cursors/__init__.py</Source>
+    <Source>eric6/MicroPython/AddEditDevicesDialog.py</Source>
     <Source>eric6/MicroPython/CircuitPythonDevices.py</Source>
-    <Source>eric6/MicroPython/CircuitPythonFirmwareSelectionDialog.py</Source>
     <Source>eric6/MicroPython/EspBackupRestoreFirmwareDialog.py</Source>
     <Source>eric6/MicroPython/EspDevices.py</Source>
     <Source>eric6/MicroPython/EspFirmwareSelectionDialog.py</Source>
+    <Source>eric6/MicroPython/GenericMicroPythonDevices.py</Source>
     <Source>eric6/MicroPython/IgnoredDevicesDialog.py</Source>
     <Source>eric6/MicroPython/MicroPythonCommandsInterface.py</Source>
     <Source>eric6/MicroPython/MicroPythonDevices.py</Source>
@@ -276,10 +277,13 @@
     <Source>eric6/MicroPython/MicroPythonWidget.py</Source>
     <Source>eric6/MicroPython/MicrobitDevices.py</Source>
     <Source>eric6/MicroPython/PyBoardDevices.py</Source>
+    <Source>eric6/MicroPython/UF2FlashDialog.py</Source>
+    <Source>eric6/MicroPython/UnknownDevicesDialog.py</Source>
     <Source>eric6/MicroPython/__init__.py</Source>
     <Source>eric6/MultiProject/AddProjectDialog.py</Source>
     <Source>eric6/MultiProject/MultiProject.py</Source>
     <Source>eric6/MultiProject/MultiProjectBrowser.py</Source>
+    <Source>eric6/MultiProject/MultiProjectFile.py</Source>
     <Source>eric6/MultiProject/PropertiesDialog.py</Source>
     <Source>eric6/MultiProject/__init__.py</Source>
     <Source>eric6/Network/IRC/IrcChannelEditDialog.py</Source>
@@ -724,6 +728,7 @@
     <Source>eric6/Preferences/ConfigurationPages/EditorGeneralPage.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/EditorHighlightersPage.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py</Source>
+    <Source>eric6/Preferences/ConfigurationPages/EditorHighlightingStylesSelectionDialog.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/EditorKeywordsPage.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/EditorMouseClickHandlerPage.py</Source>
@@ -765,18 +770,19 @@
     <Source>eric6/Preferences/ConfigurationPages/VcsPage.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/ViewmanagerPage.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.py</Source>
-    <Source>eric6/Preferences/ConfigurationPages/WebBrowserFlashCookieManagerPage.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/WebBrowserInterfacePage.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/WebBrowserPage.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py</Source>
     <Source>eric6/Preferences/ConfigurationPages/__init__.py</Source>
+    <Source>eric6/Preferences/HighlightingStylesFile.py</Source>
     <Source>eric6/Preferences/MouseClickDialog.py</Source>
     <Source>eric6/Preferences/PreferencesLexer.py</Source>
     <Source>eric6/Preferences/ProgramsDialog.py</Source>
     <Source>eric6/Preferences/ShortcutDialog.py</Source>
     <Source>eric6/Preferences/Shortcuts.py</Source>
     <Source>eric6/Preferences/ShortcutsDialog.py</Source>
+    <Source>eric6/Preferences/ShortcutsFile.py</Source>
     <Source>eric6/Preferences/SubstyleDefinitionDialog.py</Source>
     <Source>eric6/Preferences/ToolConfigurationDialog.py</Source>
     <Source>eric6/Preferences/ToolGroupConfigurationDialog.py</Source>
@@ -788,6 +794,7 @@
     <Source>eric6/Project/AddLanguageDialog.py</Source>
     <Source>eric6/Project/CreateDialogCodeDialog.py</Source>
     <Source>eric6/Project/DebuggerPropertiesDialog.py</Source>
+    <Source>eric6/Project/DebuggerPropertiesFile.py</Source>
     <Source>eric6/Project/FiletypeAssociationDialog.py</Source>
     <Source>eric6/Project/IdlCompilerDefineNameDialog.py</Source>
     <Source>eric6/Project/IdlCompilerOptionsDialog.py</Source>
@@ -801,6 +808,7 @@
     <Source>eric6/Project/ProjectBrowserFlags.py</Source>
     <Source>eric6/Project/ProjectBrowserModel.py</Source>
     <Source>eric6/Project/ProjectBrowserSortFilterProxyModel.py</Source>
+    <Source>eric6/Project/ProjectFile.py</Source>
     <Source>eric6/Project/ProjectFormsBrowser.py</Source>
     <Source>eric6/Project/ProjectInterfacesBrowser.py</Source>
     <Source>eric6/Project/ProjectOthersBrowser.py</Source>
@@ -816,6 +824,7 @@
     <Source>eric6/Project/UicCompilerOptionsDialog.py</Source>
     <Source>eric6/Project/UicLoadUi5.py</Source>
     <Source>eric6/Project/UicLoadUi6.py</Source>
+    <Source>eric6/Project/UserProjectFile.py</Source>
     <Source>eric6/Project/UserPropertiesDialog.py</Source>
     <Source>eric6/Project/__init__.py</Source>
     <Source>eric6/PyUnit/UnittestDialog.py</Source>
@@ -909,6 +918,8 @@
     <Source>eric6/QScintilla/TypingCompleters/__init__.py</Source>
     <Source>eric6/QScintilla/ZoomDialog.py</Source>
     <Source>eric6/QScintilla/__init__.py</Source>
+    <Source>eric6/Sessions/SessionFile.py</Source>
+    <Source>eric6/Sessions/__init__.py</Source>
     <Source>eric6/Snapshot/SnapWidget.py</Source>
     <Source>eric6/Snapshot/SnapshotDefaultGrabber.py</Source>
     <Source>eric6/Snapshot/SnapshotFreehandGrabber.py</Source>
@@ -928,11 +939,13 @@
     <Source>eric6/Tasks/TaskFilterConfigDialog.py</Source>
     <Source>eric6/Tasks/TaskPropertiesDialog.py</Source>
     <Source>eric6/Tasks/TaskViewer.py</Source>
+    <Source>eric6/Tasks/TasksFile.py</Source>
     <Source>eric6/Tasks/__init__.py</Source>
     <Source>eric6/Templates/TemplateMultipleVariablesDialog.py</Source>
     <Source>eric6/Templates/TemplatePropertiesDialog.py</Source>
     <Source>eric6/Templates/TemplateSingleVariableDialog.py</Source>
     <Source>eric6/Templates/TemplateViewer.py</Source>
+    <Source>eric6/Templates/TemplatesFile.py</Source>
     <Source>eric6/Templates/__init__.py</Source>
     <Source>eric6/ThirdParty/CharDet/__init__.py</Source>
     <Source>eric6/ThirdParty/CharDet/chardet/__init__.py</Source>
@@ -1409,13 +1422,6 @@
     <Source>eric6/WebBrowser/Feeds/FeedsDialog.py</Source>
     <Source>eric6/WebBrowser/Feeds/FeedsManager.py</Source>
     <Source>eric6/WebBrowser/Feeds/__init__.py</Source>
-    <Source>eric6/WebBrowser/FlashCookieManager/FlashCookie.py</Source>
-    <Source>eric6/WebBrowser/FlashCookieManager/FlashCookieManager.py</Source>
-    <Source>eric6/WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py</Source>
-    <Source>eric6/WebBrowser/FlashCookieManager/FlashCookieNotification.py</Source>
-    <Source>eric6/WebBrowser/FlashCookieManager/FlashCookieReader.py</Source>
-    <Source>eric6/WebBrowser/FlashCookieManager/FlashCookieUtilities.py</Source>
-    <Source>eric6/WebBrowser/FlashCookieManager/__init__.py</Source>
     <Source>eric6/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py</Source>
     <Source>eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py</Source>
     <Source>eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py</Source>
@@ -1672,13 +1678,15 @@
     <Form>eric6/HexEdit/HexEditReplaceWidget.ui</Form>
     <Form>eric6/HexEdit/HexEditSearchWidget.ui</Form>
     <Form>eric6/IconEditor/IconSizeDialog.ui</Form>
-    <Form>eric6/MicroPython/CircuitPythonFirmwareSelectionDialog.ui</Form>
+    <Form>eric6/MicroPython/AddEditDevicesDialog.ui</Form>
     <Form>eric6/MicroPython/EspBackupRestoreFirmwareDialog.ui</Form>
     <Form>eric6/MicroPython/EspFirmwareSelectionDialog.ui</Form>
     <Form>eric6/MicroPython/IgnoredDevicesDialog.ui</Form>
     <Form>eric6/MicroPython/MicroPythonFileManagerWidget.ui</Form>
     <Form>eric6/MicroPython/MicroPythonProgressInfoDialog.ui</Form>
     <Form>eric6/MicroPython/MicroPythonWidget.ui</Form>
+    <Form>eric6/MicroPython/UF2FlashDialog.ui</Form>
+    <Form>eric6/MicroPython/UnknownDevicesDialog.ui</Form>
     <Form>eric6/MultiProject/AddProjectDialog.ui</Form>
     <Form>eric6/MultiProject/PropertiesDialog.ui</Form>
     <Form>eric6/Network/IRC/IrcChannelEditDialog.ui</Form>
@@ -1901,6 +1909,7 @@
     <Form>eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui</Form>
     <Form>eric6/Preferences/ConfigurationPages/EditorHighlightersPage.ui</Form>
     <Form>eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui</Form>
+    <Form>eric6/Preferences/ConfigurationPages/EditorHighlightingStylesSelectionDialog.ui</Form>
     <Form>eric6/Preferences/ConfigurationPages/EditorKeywordsPage.ui</Form>
     <Form>eric6/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.ui</Form>
     <Form>eric6/Preferences/ConfigurationPages/EditorMouseClickHandlerPage.ui</Form>
@@ -1942,7 +1951,6 @@
     <Form>eric6/Preferences/ConfigurationPages/VcsPage.ui</Form>
     <Form>eric6/Preferences/ConfigurationPages/ViewmanagerPage.ui</Form>
     <Form>eric6/Preferences/ConfigurationPages/WebBrowserAppearancePage.ui</Form>
-    <Form>eric6/Preferences/ConfigurationPages/WebBrowserFlashCookieManagerPage.ui</Form>
     <Form>eric6/Preferences/ConfigurationPages/WebBrowserInterfacePage.ui</Form>
     <Form>eric6/Preferences/ConfigurationPages/WebBrowserPage.ui</Form>
     <Form>eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.ui</Form>
@@ -2038,7 +2046,6 @@
     <Form>eric6/WebBrowser/Feeds/FeedEditDialog.ui</Form>
     <Form>eric6/WebBrowser/Feeds/FeedsDialog.ui</Form>
     <Form>eric6/WebBrowser/Feeds/FeedsManager.ui</Form>
-    <Form>eric6/WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui</Form>
     <Form>eric6/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui</Form>
     <Form>eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.ui</Form>
     <Form>eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.ui</Form>
@@ -2115,6 +2122,7 @@
     <Other>docs/THANKS</Other>
     <Other>docs/changelog</Other>
     <Other>eric6.e4p</Other>
+    <Other>eric6.epj</Other>
     <Other>eric6/APIs/MicroPython/calliope.api</Other>
     <Other>eric6/APIs/MicroPython/circuitpython.api</Other>
     <Other>eric6/APIs/MicroPython/microbit.api</Other>
@@ -2308,6 +2316,7 @@
     <Other>linux/eric6_browser.desktop</Other>
     <Other>linux/eric6_browser.desktop.in</Other>
     <Other>others/default.e4k</Other>
+    <Other>others/default.ekj</Other>
     <Other>others/default_Mac.e4k</Other>
     <Other>others/pylint.rc</Other>
   </Others>
@@ -2718,10 +2727,10 @@
               <string>BlankLines</string>
             </key>
             <value>
-              <tuple>
+              <list>
                 <int>2</int>
                 <int>1</int>
-              </tuple>
+              </list>
             </value>
             <key>
               <string>BuiltinsChecker</string>