Mercurial Repositories > eric / changeset

changeset

Did some visual improvements.

Sun, 31 Jan 2021 17:50:31 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 31 Jan 2021 17:50:31 +0100
changeset 8039
13fed1ed06e8
parent 8038
73ec029d4107
child 8040
da76e49572b1

Did some visual improvements.

eric6/APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
eric6/APIs/Python3/eric6.bas file | annotate | diff | comparison | revisions
eric6/Documentation/Help/source.qch file | annotate | diff | comparison | revisions
eric6/Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
eric6/Documentation/Source/eric6.E5Gui.E5ListSelectionDialog.html file | annotate | diff | comparison | revisions
eric6/Documentation/Source/eric6.MicroPython.MicroPythonDevices.html file | annotate | diff | comparison | revisions
eric6/Documentation/Source/eric6.MicroPython.MicroPythonWidget.html file | annotate | diff | comparison | revisions
eric6/Documentation/Source/eric6.MicroPython.MicrobitDevices.html file | annotate | diff | comparison | revisions
eric6/Documentation/Source/eric6.ViewManager.ViewManager.html file | annotate | diff | comparison | revisions
eric6/Documentation/Source/index-eric6.E5Gui.html file | annotate | diff | comparison | revisions
eric6/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui file | annotate | diff | comparison | revisions
eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui file | annotate | diff | comparison | revisions 
--- a/eric6/APIs/Python3/eric6.api	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/APIs/Python3/eric6.api	Sun Jan 31 17:50:31 2021 +0100
@@ -1079,6 +1079,9 @@
 eric6.E5Gui.E5ComboBox.E5ComboBox.inactiveText?4()
 eric6.E5Gui.E5ComboBox.E5ComboBox.setInactiveText?4(inactiveText)
 eric6.E5Gui.E5ComboBox.E5ComboBox?1(parent=None, inactiveText="")
+eric6.E5Gui.E5ComboSelectionDialog.E5ComboSelectionDialog.getSelection?4()
+eric6.E5Gui.E5ComboSelectionDialog.E5ComboSelectionDialog.on_selectionComboBox_currentTextChanged?4(txt)
+eric6.E5Gui.E5ComboSelectionDialog.E5ComboSelectionDialog?1(entries, title="", message="", parent=None)
 eric6.E5Gui.E5Completers.E5DirCompleter.rootPath?4()
 eric6.E5Gui.E5Completers.E5DirCompleter.setRootPath?4(path)
 eric6.E5Gui.E5Completers.E5DirCompleter?1(parent=None, completionMode=QCompleter.PopupCompletion, showHidden=False)
@@ -2399,6 +2402,7 @@
 eric6.MicroPython.MicroPythonDevices.MicroPythonDevice.canStartPlotter?4()
 eric6.MicroPython.MicroPythonDevices.MicroPythonDevice.canStartRepl?4()
 eric6.MicroPython.MicroPythonDevices.MicroPythonDevice.deviceName?4()
+eric6.MicroPython.MicroPythonDevices.MicroPythonDevice.downloadFirmware?4()
 eric6.MicroPython.MicroPythonDevices.MicroPythonDevice.forceInterrupt?4()
 eric6.MicroPython.MicroPythonDevices.MicroPythonDevice.getDocumentationUrl?4()
 eric6.MicroPython.MicroPythonDevices.MicroPythonDevice.getFirmwareUrl?4()
@@ -2512,9 +2516,10 @@
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.canStartPlotter?4()
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.canStartRepl?4()
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.deviceName?4()
+eric6.MicroPython.MicrobitDevices.MicrobitDevice.downloadFirmware?4()
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.forceInterrupt?4()
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.getDocumentationUrl?4()
-eric6.MicroPython.MicrobitDevices.MicrobitDevice.getFirmwareUrl?4()
+eric6.MicroPython.MicrobitDevices.MicrobitDevice.getFirmwareUrl?4(fwtype="mpy")
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.getWorkspace?4()
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.hasTimeCommands?4()
 eric6.MicroPython.MicrobitDevices.MicrobitDevice.runScript?4(script)
@@ -9862,7 +9867,7 @@
 eric6.ViewManager.ViewManager.ViewManager.setEditorName?4(editor, newName)
 eric6.ViewManager.ViewManager.ViewManager.setFileLine?4(fn, line, error=False, syntaxError=False)
 eric6.ViewManager.ViewManager.ViewManager.setReferences?4(ui, dbs)
-eric6.ViewManager.ViewManager.ViewManager.setSbInfo?4(sbLine: QLabel, sbPos: QLabel, sbWritable, sbEncoding, sbLanguage, sbEol, sbZoom)
+eric6.ViewManager.ViewManager.ViewManager.setSbInfo?4(sbLine, sbPos, sbWritable, sbEncoding, sbLanguage, sbEol, sbZoom)
 eric6.ViewManager.ViewManager.ViewManager.setSplitCount?4(count)
 eric6.ViewManager.ViewManager.ViewManager.setSplitOrientation?4(orientation)
 eric6.ViewManager.ViewManager.ViewManager.shareConnected?4(connected)
--- a/eric6/APIs/Python3/eric6.bas	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/APIs/Python3/eric6.bas	Sun Jan 31 17:50:31 2021 +0100
@@ -170,6 +170,7 @@
 E5ClickableLed E5Led
 E5ComboBox QComboBox
 E5ComboPathPicker E5PathPickerBase
+E5ComboSelectionDialog QDialog Ui_E5ComboSelectionDialog
 E5DirCompleter QCompleter
 E5DnDTabBar E5WheelTabBar
 E5ErrorMessage QErrorMessage
Binary file eric6/Documentation/Help/source.qch has changed
--- a/eric6/Documentation/Help/source.qhp	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/Documentation/Help/source.qhp	Sun Jan 31 17:50:31 2021 +0100
@@ -102,6 +102,7 @@
             <section title="eric6.E5Gui.E5Application" ref="eric6.E5Gui.E5Application.html" />
             <section title="eric6.E5Gui.E5ClickableLabel" ref="eric6.E5Gui.E5ClickableLabel.html" />
             <section title="eric6.E5Gui.E5ComboBox" ref="eric6.E5Gui.E5ComboBox.html" />
+            <section title="eric6.E5Gui.E5ComboSelectionDialog" ref="eric6.E5Gui.E5ComboSelectionDialog.html" />
             <section title="eric6.E5Gui.E5Completers" ref="eric6.E5Gui.E5Completers.html" />
             <section title="eric6.E5Gui.E5ErrorMessage" ref="eric6.E5Gui.E5ErrorMessage.html" />
             <section title="eric6.E5Gui.E5ErrorMessageFilterDialog" ref="eric6.E5Gui.E5ErrorMessageFilterDialog.html" />
@@ -3989,6 +3990,11 @@
       <keyword name="E5ComboPathPicker" id="E5ComboPathPicker" ref="eric6.E5Gui.E5PathPicker.html#E5ComboPathPicker" />
       <keyword name="E5ComboPathPicker (Constructor)" id="E5ComboPathPicker (Constructor)" ref="eric6.E5Gui.E5PathPicker.html#E5ComboPathPicker.__init__" />
       <keyword name="E5ComboPathPicker.getPathItems" id="E5ComboPathPicker.getPathItems" ref="eric6.E5Gui.E5PathPicker.html#E5ComboPathPicker.getPathItems" />
+      <keyword name="E5ComboSelectionDialog" id="E5ComboSelectionDialog" ref="eric6.E5Gui.E5ComboSelectionDialog.html#E5ComboSelectionDialog" />
+      <keyword name="E5ComboSelectionDialog (Constructor)" id="E5ComboSelectionDialog (Constructor)" ref="eric6.E5Gui.E5ComboSelectionDialog.html#E5ComboSelectionDialog.__init__" />
+      <keyword name="E5ComboSelectionDialog (Module)" id="E5ComboSelectionDialog (Module)" ref="eric6.E5Gui.E5ComboSelectionDialog.html" />
+      <keyword name="E5ComboSelectionDialog.getSelection" id="E5ComboSelectionDialog.getSelection" ref="eric6.E5Gui.E5ComboSelectionDialog.html#E5ComboSelectionDialog.getSelection" />
+      <keyword name="E5ComboSelectionDialog.on_selectionComboBox_currentTextChanged" id="E5ComboSelectionDialog.on_selectionComboBox_currentTextChanged" ref="eric6.E5Gui.E5ComboSelectionDialog.html#E5ComboSelectionDialog.on_selectionComboBox_currentTextChanged" />
       <keyword name="E5Completers (Module)" id="E5Completers (Module)" ref="eric6.E5Gui.E5Completers.html" />
       <keyword name="E5DirCompleter" id="E5DirCompleter" ref="eric6.E5Gui.E5Completers.html#E5DirCompleter" />
       <keyword name="E5DirCompleter (Constructor)" id="E5DirCompleter (Constructor)" ref="eric6.E5Gui.E5Completers.html#E5DirCompleter.__init__" />
@@ -9809,6 +9815,7 @@
       <keyword name="MicroPythonDevice.canStartPlotter" id="MicroPythonDevice.canStartPlotter" ref="eric6.MicroPython.MicroPythonDevices.html#MicroPythonDevice.canStartPlotter" />
       <keyword name="MicroPythonDevice.canStartRepl" id="MicroPythonDevice.canStartRepl" ref="eric6.MicroPython.MicroPythonDevices.html#MicroPythonDevice.canStartRepl" />
       <keyword name="MicroPythonDevice.deviceName" id="MicroPythonDevice.deviceName" ref="eric6.MicroPython.MicroPythonDevices.html#MicroPythonDevice.deviceName" />
+      <keyword name="MicroPythonDevice.downloadFirmware" id="MicroPythonDevice.downloadFirmware" ref="eric6.MicroPython.MicroPythonDevices.html#MicroPythonDevice.downloadFirmware" />
       <keyword name="MicroPythonDevice.forceInterrupt" id="MicroPythonDevice.forceInterrupt" ref="eric6.MicroPython.MicroPythonDevices.html#MicroPythonDevice.forceInterrupt" />
       <keyword name="MicroPythonDevice.getDocumentationUrl" id="MicroPythonDevice.getDocumentationUrl" ref="eric6.MicroPython.MicroPythonDevices.html#MicroPythonDevice.getDocumentationUrl" />
       <keyword name="MicroPythonDevice.getFirmwareUrl" id="MicroPythonDevice.getFirmwareUrl" ref="eric6.MicroPython.MicroPythonDevices.html#MicroPythonDevice.getFirmwareUrl" />
@@ -9972,6 +9979,7 @@
       <keyword name="MicrobitDevice.canStartPlotter" id="MicrobitDevice.canStartPlotter" ref="eric6.MicroPython.MicrobitDevices.html#MicrobitDevice.canStartPlotter" />
       <keyword name="MicrobitDevice.canStartRepl" id="MicrobitDevice.canStartRepl" ref="eric6.MicroPython.MicrobitDevices.html#MicrobitDevice.canStartRepl" />
       <keyword name="MicrobitDevice.deviceName" id="MicrobitDevice.deviceName" ref="eric6.MicroPython.MicrobitDevices.html#MicrobitDevice.deviceName" />
+      <keyword name="MicrobitDevice.downloadFirmware" id="MicrobitDevice.downloadFirmware" ref="eric6.MicroPython.MicrobitDevices.html#MicrobitDevice.downloadFirmware" />
       <keyword name="MicrobitDevice.forceInterrupt" id="MicrobitDevice.forceInterrupt" ref="eric6.MicroPython.MicrobitDevices.html#MicrobitDevice.forceInterrupt" />
       <keyword name="MicrobitDevice.getDocumentationUrl" id="MicrobitDevice.getDocumentationUrl" ref="eric6.MicroPython.MicrobitDevices.html#MicrobitDevice.getDocumentationUrl" />
       <keyword name="MicrobitDevice.getFirmwareUrl" id="MicrobitDevice.getFirmwareUrl" ref="eric6.MicroPython.MicrobitDevices.html#MicrobitDevice.getFirmwareUrl" />
@@ -18306,6 +18314,7 @@
       <file>eric6.E5Gui.E5Application.html</file>
       <file>eric6.E5Gui.E5ClickableLabel.html</file>
       <file>eric6.E5Gui.E5ComboBox.html</file>
+      <file>eric6.E5Gui.E5ComboSelectionDialog.html</file>
       <file>eric6.E5Gui.E5Completers.html</file>
       <file>eric6.E5Gui.E5ErrorMessage.html</file>
       <file>eric6.E5Gui.E5ErrorMessageFilterDialog.html</file>
--- a/eric6/Documentation/Source/eric6.E5Gui.E5ListSelectionDialog.html	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/Documentation/Source/eric6.E5Gui.E5ListSelectionDialog.html	Sun Jan 31 17:50:31 2021 +0100
@@ -110,7 +110,7 @@
 </dd>
 <dt><i>title</i> (str)</dt>
 <dd>
-tirle of the dialog
+title of the dialog
 </dd>
 <dt><i>message</i> (str)</dt>
 <dd>
--- a/eric6/Documentation/Source/eric6.MicroPython.MicroPythonDevices.html	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/Documentation/Source/eric6.MicroPython.MicroPythonDevices.html	Sun Jan 31 17:50:31 2021 +0100
@@ -114,6 +114,10 @@
 <td>Public method to get the name of the device.</td>
 </tr>
 <tr>
+<td><a href="#MicroPythonDevice.downloadFirmware">downloadFirmware</a></td>
+<td>Public method to download the device firmware.</td>
+</tr>
+<tr>
 <td><a href="#MicroPythonDevice.forceInterrupt">forceInterrupt</a></td>
 <td>Public method to determine the need for an interrupt when opening the serial connection.</td>
 </tr>
@@ -311,6 +315,13 @@
 str
 </dd>
 </dl>
+<a NAME="MicroPythonDevice.downloadFirmware" ID="MicroPythonDevice.downloadFirmware"></a>
+<h4>MicroPythonDevice.downloadFirmware</h4>
+<b>downloadFirmware</b>(<i></i>)
+
+<p>
+        Public method to download the device firmware.
+</p>
 <a NAME="MicroPythonDevice.forceInterrupt" ID="MicroPythonDevice.forceInterrupt"></a>
 <h4>MicroPythonDevice.forceInterrupt</h4>
 <b>forceInterrupt</b>(<i></i>)
--- a/eric6/Documentation/Source/eric6.MicroPython.MicroPythonWidget.html	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/Documentation/Source/eric6.MicroPython.MicroPythonWidget.html	Sun Jan 31 17:50:31 2021 +0100
@@ -223,7 +223,7 @@
 </tr>
 <tr>
 <td><a href="#MicroPythonWidget.isMicrobit">isMicrobit</a></td>
-<td>Public method to check, if the connected/selected device is a BBC micro:bit.</td>
+<td>Public method to check, if the connected/selected device is a BBC micro:bit or Calliope mini.</td>
 </tr>
 <tr>
 <td><a href="#MicroPythonWidget.on_chartButton_clicked">on_chartButton_clicked</a></td>
@@ -755,7 +755,7 @@
 
 <p>
         Public method to check, if the connected/selected device is a
-        BBC micro:bit.
+        BBC micro:bit or Calliope mini.
 </p>
 <dl>
 <dt>Return:</dt>
--- a/eric6/Documentation/Source/eric6.MicroPython.MicrobitDevices.html	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/Documentation/Source/eric6.MicroPython.MicrobitDevices.html	Sun Jan 31 17:50:31 2021 +0100
@@ -114,6 +114,10 @@
 <td>Public method to get the name of the device.</td>
 </tr>
 <tr>
+<td><a href="#MicrobitDevice.downloadFirmware">downloadFirmware</a></td>
+<td>Public method to download the device firmware.</td>
+</tr>
+<tr>
 <td><a href="#MicrobitDevice.forceInterrupt">forceInterrupt</a></td>
 <td>Public method to determine the need for an interrupt when opening the serial connection.</td>
 </tr>
@@ -328,6 +332,13 @@
 str
 </dd>
 </dl>
+<a NAME="MicrobitDevice.downloadFirmware" ID="MicrobitDevice.downloadFirmware"></a>
+<h4>MicrobitDevice.downloadFirmware</h4>
+<b>downloadFirmware</b>(<i></i>)
+
+<p>
+        Public method to download the device firmware.
+</p>
 <a NAME="MicrobitDevice.forceInterrupt" ID="MicrobitDevice.forceInterrupt"></a>
 <h4>MicrobitDevice.forceInterrupt</h4>
 <b>forceInterrupt</b>(<i></i>)
@@ -369,12 +380,20 @@
 </dl>
 <a NAME="MicrobitDevice.getFirmwareUrl" ID="MicrobitDevice.getFirmwareUrl"></a>
 <h4>MicrobitDevice.getFirmwareUrl</h4>
-<b>getFirmwareUrl</b>(<i></i>)
+<b>getFirmwareUrl</b>(<i>fwtype="mpy"</i>)
 
 <p>
         Public method to get the device firmware download URL.
 </p>
 <dl>
+
+<dt><i>fwtype</i> (str (optional))</dt>
+<dd>
+type of firmware to download
+            (valid values are "mpy" and "dap"; defaults to "mpy")
+</dd>
+</dl>
+<dl>
 <dt>Return:</dt>
 <dd>
 firmware download URL of the device
--- a/eric6/Documentation/Source/eric6.ViewManager.ViewManager.html	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/Documentation/Source/eric6.ViewManager.ViewManager.html	Sun Jan 31 17:50:31 2021 +0100
@@ -4477,7 +4477,7 @@
 </dl>
 <a NAME="ViewManager.setSbInfo" ID="ViewManager.setSbInfo"></a>
 <h4>ViewManager.setSbInfo</h4>
-<b>setSbInfo</b>(<i>sbLine: QLabel, sbPos: QLabel, sbWritable, sbEncoding, sbLanguage, sbEol, sbZoom</i>)
+<b>setSbInfo</b>(<i>sbLine, sbPos, sbWritable, sbEncoding, sbLanguage, sbEol, sbZoom</i>)
 
 <p>
         Public method to transfer statusbar info from the user interface to
--- a/eric6/Documentation/Source/index-eric6.E5Gui.html	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/Documentation/Source/index-eric6.E5Gui.html	Sun Jan 31 17:50:31 2021 +0100
@@ -57,6 +57,10 @@
 <td>Module implementing combobox classes using the eric line edits.</td>
 </tr>
 <tr>
+<td><a href="eric6.E5Gui.E5ComboSelectionDialog.html">E5ComboSelectionDialog</a></td>
+<td>Module implementing a dialog to select one entry from a list of strings.</td>
+</tr>
+<tr>
 <td><a href="eric6.E5Gui.E5Completers.html">E5Completers</a></td>
 <td>Module implementing various kinds of completers.</td>
 </tr>
--- a/eric6/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui	Sun Jan 31 17:50:31 2021 +0100
@@ -64,6 +64,9 @@
         <property name="toolTip">
          <string>Select the languages of the  APIs to generate</string>
         </property>
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
         <property name="selectionMode">
          <enum>QAbstractItemView::ExtendedSelection</enum>
         </property>
@@ -183,6 +186,9 @@
         <property name="toolTip">
          <string>List of directory basenames to be ignored</string>
         </property>
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="1" column="0">
--- a/eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui	Sun Jan 31 17:47:55 2021 +0100
+++ b/eric6/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui	Sun Jan 31 17:50:31 2021 +0100
@@ -203,6 +203,9 @@
             <property name="toolTip">
              <string>List of directory basenames to be ignored</string>
             </property>
+            <property name="alternatingRowColors">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
           <item row="1" column="2">

Mercurial Repository: eric

eric ide

mercurial