Merged with branch 'eric7' in order to prevent deviating too much. mpy_network

Tue, 28 Feb 2023 17:58:54 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 28 Feb 2023 17:58:54 +0100
branch
mpy_network
changeset 9829
cafb132fe3bb
parent 9828
32c8a5b57332 (current diff)
parent 9825
d657c9bc8cb0 (diff)
child 9830
6c91fdb0e55b

Merged with branch 'eric7' in order to prevent deviating too much.

src/eric7/APIs/Python3/eric7.api file | annotate | diff | comparison | revisions
src/eric7/Documentation/Help/source.qch file | annotate | diff | comparison | revisions
src/eric7/Documentation/Source/eric7.MicroPython.Devices.DeviceBase.html file | annotate | diff | comparison | revisions
src/eric7/MicroPython/Devices/DeviceBase.py file | annotate | diff | comparison | revisions
src/eric7/MicroPython/Devices/MicrobitDevices.py file | annotate | diff | comparison | revisions
src/eric7/MicroPython/MicroPythonWidget.py file | annotate | diff | comparison | revisions
src/eric7/MicroPython/UF2FlashDialog.py file | annotate | diff | comparison | revisions
--- a/scripts/install.py	Tue Feb 28 17:54:33 2023 +0100
+++ b/scripts/install.py	Tue Feb 28 17:58:54 2023 +0100
@@ -921,9 +921,6 @@
         if os.access(cfg["apidir"], os.W_OK):
             for progLanguage in progLanguages:
                 apidir = os.path.join(cfg["apidir"], progLanguage)
-                print(
-                    "\nInstalling {0} API files to '{1}'.".format(progLanguage, apidir)
-                )
                 if not os.path.exists(apidir):
                     os.makedirs(apidir)
                 for apiName in glob.glob(
--- a/src/eric7/APIs/Python3/eric7.api	Tue Feb 28 17:54:33 2023 +0100
+++ b/src/eric7/APIs/Python3/eric7.api	Tue Feb 28 17:58:54 2023 +0100
@@ -2605,7 +2605,7 @@
 eric7.MicroPython.Devices.DeviceBase.BaseDevice.canStartPlotter?4()
 eric7.MicroPython.Devices.DeviceBase.BaseDevice.canStartRepl?4()
 eric7.MicroPython.Devices.DeviceBase.BaseDevice.cd?4(dirname)
-eric7.MicroPython.Devices.DeviceBase.BaseDevice.checkDeviceData?4()
+eric7.MicroPython.Devices.DeviceBase.BaseDevice.checkDeviceData?4(quiet=True)
 eric7.MicroPython.Devices.DeviceBase.BaseDevice.checkInternet?4()
 eric7.MicroPython.Devices.DeviceBase.BaseDevice.connectWifi?4(ssid, password)
 eric7.MicroPython.Devices.DeviceBase.BaseDevice.deactivateInterface?4(interface)
--- a/src/eric7/Documentation/Source/eric7.MicroPython.Devices.DeviceBase.html	Tue Feb 28 17:54:33 2023 +0100
+++ b/src/eric7/Documentation/Source/eric7.MicroPython.Devices.DeviceBase.html	Tue Feb 28 17:58:54 2023 +0100
@@ -607,13 +607,21 @@
 </dl>
 <a NAME="BaseDevice.checkDeviceData" ID="BaseDevice.checkDeviceData"></a>
 <h4>BaseDevice.checkDeviceData</h4>
-<b>checkDeviceData</b>(<i></i>)
+<b>checkDeviceData</b>(<i>quiet=True</i>)
 
 <p>
         Public method to check the validity of the device data determined during
         connecting the device.
 </p>
 <dl>
+
+<dt><i>quiet</i> (bool (optional))</dt>
+<dd>
+flag indicating to not show an info message, if the data is
+            not available (defaults to True)
+</dd>
+</dl>
+<dl>
 <dt>Return:</dt>
 <dd>
 flag indicating valid device data
--- a/src/eric7/UI/Previewers/PreviewerHTML.py	Tue Feb 28 17:54:33 2023 +0100
+++ b/src/eric7/UI/Previewers/PreviewerHTML.py	Tue Feb 28 17:58:54 2023 +0100
@@ -158,7 +158,7 @@
         self.jsCheckBox.setChecked(enable)
 
         settings = self.previewView.settings()
-        settings.setAttribute(settings.JavascriptEnabled, enable)
+        settings.setAttribute(settings.WebAttribute.JavascriptEnabled, enable)
 
         self.processEditor()
 
--- a/src/eric7/ViewManager/ViewManager.py	Tue Feb 28 17:54:33 2023 +0100
+++ b/src/eric7/ViewManager/ViewManager.py	Tue Feb 28 17:58:54 2023 +0100
@@ -5789,6 +5789,10 @@
         self.currentEditor.highlightVisible()
         self._checkActions(self.currentEditor, False)
 
+        if newWin:
+            # insert filename into list of recently opened files
+            self.addToRecentList(fn)
+
     def __setSbFile(
         self,
         fn=None,

eric ide

mercurial