Mercurial Repositories > eric / changeset

--- a/eric7/APIs/Python3/eric7.api	Fri Dec 31 17:22:45 2021 +0100
+++ b/eric7/APIs/Python3/eric7.api	Fri Dec 31 17:24:10 2021 +0100
@@ -1213,7 +1213,7 @@
 eric7.EricWidgets.EricApplication.EricApplication.getPluginObject?4(name)
 eric7.EricWidgets.EricApplication.EricApplication.getPluginObjectType?4(name)
 eric7.EricWidgets.EricApplication.EricApplication.getPluginObjects?4()
-eric7.EricWidgets.EricApplication.EricApplication.getStyleIconsPath?4()
+eric7.EricWidgets.EricApplication.EricApplication.getStyleIconsPath?4(universal=False)
 eric7.EricWidgets.EricApplication.EricApplication.registerObject?4(name, objectRef)
 eric7.EricWidgets.EricApplication.EricApplication.registerPluginObject?4(name, objectRef, pluginType=None)
 eric7.EricWidgets.EricApplication.EricApplication.setStyleSheetFile?4(filename)
@@ -6642,6 +6642,7 @@
 eric7.Preferences.ConfigurationDialog.ConfigurationDialog.showConfigurationPageByName?4(pageName)
 eric7.Preferences.ConfigurationDialog.ConfigurationDialog?1(parent=None, name=None, modal=False, fromEric=True, displayMode=ConfigurationMode.DEFAULTMODE, expandedEntries=None)
 eric7.Preferences.ConfigurationDialog.ConfigurationMode.DEFAULTMODE?7
+eric7.Preferences.ConfigurationDialog.ConfigurationMode.EDITORMODE?7
 eric7.Preferences.ConfigurationDialog.ConfigurationMode.HEXEDITORMODE?7
 eric7.Preferences.ConfigurationDialog.ConfigurationMode.TRAYSTARTERMODE?7
 eric7.Preferences.ConfigurationDialog.ConfigurationMode.WEBBROWSERMODE?7

Binary file eric7/Documentation/Help/source.qch has changed

--- a/eric7/Documentation/Help/source.qhp	Fri Dec 31 17:22:45 2021 +0100
+++ b/eric7/Documentation/Help/source.qhp	Fri Dec 31 17:24:10 2021 +0100
@@ -10454,6 +10454,7 @@
       <keyword name="MiniEditor.__contextMenuRequested" id="MiniEditor.__contextMenuRequested" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__contextMenuRequested" />
       <keyword name="MiniEditor.__convertTabs" id="MiniEditor.__convertTabs" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__convertTabs" />
       <keyword name="MiniEditor.__createActions" id="MiniEditor.__createActions" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__createActions" />
+      <keyword name="MiniEditor.__createConfigActions" id="MiniEditor.__createConfigActions" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__createConfigActions" />
       <keyword name="MiniEditor.__createEditActions" id="MiniEditor.__createEditActions" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__createEditActions" />
       <keyword name="MiniEditor.__createFileActions" id="MiniEditor.__createFileActions" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__createFileActions" />
       <keyword name="MiniEditor.__createHelpActions" id="MiniEditor.__createHelpActions" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__createHelpActions" />
@@ -10473,6 +10474,7 @@
       <keyword name="MiniEditor.__initContextMenu" id="MiniEditor.__initContextMenu" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__initContextMenu" />
       <keyword name="MiniEditor.__initContextMenuLanguages" id="MiniEditor.__initContextMenuLanguages" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__initContextMenuLanguages" />
       <keyword name="MiniEditor.__languageMenuTriggered" id="MiniEditor.__languageMenuTriggered" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__languageMenuTriggered" />
+      <keyword name="MiniEditor.__loadConfiguration" id="MiniEditor.__loadConfiguration" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__loadConfiguration" />
       <keyword name="MiniEditor.__loadEditorConfig" id="MiniEditor.__loadEditorConfig" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__loadEditorConfig" />
       <keyword name="MiniEditor.__loadEditorConfigObject" id="MiniEditor.__loadEditorConfigObject" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__loadEditorConfigObject" />
       <keyword name="MiniEditor.__loadFile" id="MiniEditor.__loadFile" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__loadFile" />
@@ -10481,6 +10483,7 @@
       <keyword name="MiniEditor.__modificationChanged" id="MiniEditor.__modificationChanged" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__modificationChanged" />
       <keyword name="MiniEditor.__newFile" id="MiniEditor.__newFile" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__newFile" />
       <keyword name="MiniEditor.__open" id="MiniEditor.__open" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__open" />
+      <keyword name="MiniEditor.__preferencesChanged" id="MiniEditor.__preferencesChanged" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__preferencesChanged" />
       <keyword name="MiniEditor.__printFile" id="MiniEditor.__printFile" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__printFile" />
       <keyword name="MiniEditor.__printPreview" id="MiniEditor.__printPreview" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__printPreview" />
       <keyword name="MiniEditor.__printPreviewFile" id="MiniEditor.__printPreviewFile" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__printPreviewFile" />
@@ -10508,6 +10511,7 @@
       <keyword name="MiniEditor.__setTextDisplay" id="MiniEditor.__setTextDisplay" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__setTextDisplay" />
       <keyword name="MiniEditor.__showContextMenuLanguages" id="MiniEditor.__showContextMenuLanguages" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__showContextMenuLanguages" />
       <keyword name="MiniEditor.__showLanguagesMenu" id="MiniEditor.__showLanguagesMenu" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__showLanguagesMenu" />
+      <keyword name="MiniEditor.__showPreferences" id="MiniEditor.__showPreferences" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__showPreferences" />
       <keyword name="MiniEditor.__strippedName" id="MiniEditor.__strippedName" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__strippedName" />
       <keyword name="MiniEditor.__styleNeeded" id="MiniEditor.__styleNeeded" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__styleNeeded" />
       <keyword name="MiniEditor.__undo" id="MiniEditor.__undo" ref="eric7.QScintilla.MiniEditor.html#MiniEditor.__undo" />

--- a/eric7/Documentation/Source/eric7.EricWidgets.EricApplication.html	Fri Dec 31 17:22:45 2021 +0100
+++ b/eric7/Documentation/Source/eric7.EricWidgets.EricApplication.html	Fri Dec 31 17:24:10 2021 +0100
@@ -262,12 +262,20 @@
 </dl>
 <a NAME="EricApplication.getStyleIconsPath" ID="EricApplication.getStyleIconsPath"></a>
 <h4>EricApplication.getStyleIconsPath</h4>
-<b>getStyleIconsPath</b>(<i></i>)
+<b>getStyleIconsPath</b>(<i>universal=False</i>)
 
 <p>
         Public method to get the path for the style icons.
 </p>
 <dl>
+
+<dt><i>universal</i> (bool (optional))</dt>
+<dd>
+flag indicating a universal file path (defaults to
+            False)
+</dd>
+</dl>
+<dl>
 <dt>Return:</dt>
 <dd>
 directory path containing the style icons

--- a/eric7/Documentation/Source/eric7.Preferences.ConfigurationDialog.html	Fri Dec 31 17:22:45 2021 +0100
+++ b/eric7/Documentation/Source/eric7.Preferences.ConfigurationDialog.html	Fri Dec 31 17:24:10 2021 +0100
@@ -251,7 +251,7 @@
 <h3>Class Attributes</h3>
 
 <table>
-<tr><td>DEFAULTMODE</td></tr><tr><td>HEXEDITORMODE</td></tr><tr><td>TRAYSTARTERMODE</td></tr><tr><td>WEBBROWSERMODE</td></tr>
+<tr><td>DEFAULTMODE</td></tr><tr><td>EDITORMODE</td></tr><tr><td>HEXEDITORMODE</td></tr><tr><td>TRAYSTARTERMODE</td></tr><tr><td>WEBBROWSERMODE</td></tr>
 </table>
 <h3>Class Methods</h3>
 

--- a/eric7/Documentation/Source/eric7.QScintilla.MiniEditor.html	Fri Dec 31 17:22:45 2021 +0100
+++ b/eric7/Documentation/Source/eric7.QScintilla.MiniEditor.html	Fri Dec 31 17:24:10 2021 +0100
@@ -125,6 +125,10 @@
 <td>Private method to create the actions.</td>
 </tr>
 <tr>
+<td><a href="#MiniEditor.__createConfigActions">__createConfigActions</a></td>
+<td>Private method to create the Settings actions.</td>
+</tr>
+<tr>
 <td><a href="#MiniEditor.__createEditActions">__createEditActions</a></td>
 <td>Private method to create the Edit actions.</td>
 </tr>
@@ -201,6 +205,10 @@
 <td>Private method to handle the selection of a lexer language.</td>
 </tr>
 <tr>
+<td><a href="#MiniEditor.__loadConfiguration">__loadConfiguration</a></td>
+<td>Private slot to load the configuration.</td>
+</tr>
+<tr>
 <td><a href="#MiniEditor.__loadEditorConfig">__loadEditorConfig</a></td>
 <td>Private method to load the EditorConfig properties.</td>
 </tr>
@@ -233,6 +241,10 @@
 <td>Private slot to open a file.</td>
 </tr>
 <tr>
+<td><a href="#MiniEditor.__preferencesChanged">__preferencesChanged</a></td>
+<td>Private slot to handle a configuration change.</td>
+</tr>
+<tr>
 <td><a href="#MiniEditor.__printFile">__printFile</a></td>
 <td>Private slot to print the text.</td>
 </tr>
@@ -341,6 +353,10 @@
 <td>Private slot to show the Languages menu of the status bar.</td>
 </tr>
 <tr>
+<td><a href="#MiniEditor.__showPreferences">__showPreferences</a></td>
+<td>Private slot to set the preferences.</td>
+</tr>
+<tr>
 <td><a href="#MiniEditor.__strippedName">__strippedName</a></td>
 <td>Private method to return the filename part of the given path.</td>
 </tr>
@@ -578,6 +594,13 @@
 <p>
         Private method to create the actions.
 </p>
+<a NAME="MiniEditor.__createConfigActions" ID="MiniEditor.__createConfigActions"></a>
+<h4>MiniEditor.__createConfigActions</h4>
+<b>__createConfigActions</b>(<i></i>)
+
+<p>
+        Private method to create the Settings actions.
+</p>
 <a NAME="MiniEditor.__createEditActions" ID="MiniEditor.__createEditActions"></a>
 <h4>MiniEditor.__createEditActions</h4>
 <b>__createEditActions</b>(<i></i>)
@@ -819,6 +842,13 @@
 reference to the action that was triggered (QAction)
 </dd>
 </dl>
+<a NAME="MiniEditor.__loadConfiguration" ID="MiniEditor.__loadConfiguration"></a>
+<h4>MiniEditor.__loadConfiguration</h4>
+<b>__loadConfiguration</b>(<i></i>)
+
+<p>
+        Private slot to load the configuration.
+</p>
 <a NAME="MiniEditor.__loadEditorConfig" ID="MiniEditor.__loadEditorConfig"></a>
 <h4>MiniEditor.__loadEditorConfig</h4>
 <b>__loadEditorConfig</b>(<i>fileName=""</i>)
@@ -926,6 +956,13 @@
 <p>
         Private slot to open a file.
 </p>
+<a NAME="MiniEditor.__preferencesChanged" ID="MiniEditor.__preferencesChanged"></a>
+<h4>MiniEditor.__preferencesChanged</h4>
+<b>__preferencesChanged</b>(<i></i>)
+
+<p>
+        Private slot to handle a configuration change.
+</p>
 <a NAME="MiniEditor.__printFile" ID="MiniEditor.__printFile"></a>
 <h4>MiniEditor.__printFile</h4>
 <b>__printFile</b>(<i></i>)
@@ -1218,6 +1255,13 @@
 position the menu should be shown at (QPoint)
 </dd>
 </dl>
+<a NAME="MiniEditor.__showPreferences" ID="MiniEditor.__showPreferences"></a>
+<h4>MiniEditor.__showPreferences</h4>
+<b>__showPreferences</b>(<i></i>)
+
+<p>
+        Private slot to set the preferences.
+</p>
 <a NAME="MiniEditor.__strippedName" ID="MiniEditor.__strippedName"></a>
 <h4>MiniEditor.__strippedName</h4>
 <b>__strippedName</b>(<i>fullFileName</i>)