Mercurial Repositories > eric / file diff

--- a/eric6.e4p	Sat Feb 13 16:12:11 2021 +0100
+++ b/eric6.e4p	Sat Feb 13 19:22:22 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,6 +277,8 @@
     <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>
@@ -767,7 +770,6 @@
     <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>
@@ -1420,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>
@@ -1683,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>
@@ -1954,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>
@@ -2050,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>
@@ -2321,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>
@@ -2731,10 +2727,10 @@
               <string>BlankLines</string>
             </key>
             <value>
-              <tuple>
+              <list>
                 <int>2</int>
                 <int>1</int>
-              </tuple>
+              </list>
             </value>
             <key>
               <string>BuiltinsChecker</string>