Mercurial Repositories > eric / changeset
changeset
Shell Window
Tue, 25 Jul 2023 16:41:52 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 25 Jul 2023 16:41:52 +0200
- branch
- eric7
- changeset 10135
- 36839e2c6945
- parent 10134
- 08ca9b336a43
- child 10136
- ae09a4a9b0d1
Shell Window
- Added more pages to the Shell window configuration dialog.
--- a/docs/changelog.md Tue Jul 25 13:14:27 2023 +0200 +++ b/docs/changelog.md Tue Jul 25 16:41:52 2023 +0200 @@ -12,6 +12,8 @@ - Updated the list of known UF2 capable boards. - pip Interface - Added the capability to repair all dependencies with one button click. +- Shell Window + - Added more pages to the Shell window configuration dialog. ### Version 23.7 - bug fixes
--- a/src/eric7/APIs/Python3/eric7.api Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/APIs/Python3/eric7.api Tue Jul 25 16:41:52 2023 +0200 @@ -7260,6 +7260,7 @@ eric7.Preferences.ConfigurationPages.EditorAutoCompletionJediPage.EditorAutoCompletionJediPage?1() eric7.Preferences.ConfigurationPages.EditorAutoCompletionJediPage.create?4(dlg) eric7.Preferences.ConfigurationPages.EditorAutocompletionPage.EditorAutocompletionPage.save?4() +eric7.Preferences.ConfigurationPages.EditorAutocompletionPage.EditorAutocompletionPage.setMode?4(displayMode) eric7.Preferences.ConfigurationPages.EditorAutocompletionPage.EditorAutocompletionPage?1() eric7.Preferences.ConfigurationPages.EditorAutocompletionPage.create?4(dlg) eric7.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.EditorAutocompletionQScintillaPage.save?4() @@ -7269,6 +7270,7 @@ eric7.Preferences.ConfigurationPages.EditorCallTipsJediPage.EditorCallTipsJediPage?1() eric7.Preferences.ConfigurationPages.EditorCallTipsJediPage.create?4(dlg) eric7.Preferences.ConfigurationPages.EditorCalltipsPage.EditorCalltipsPage.save?4() +eric7.Preferences.ConfigurationPages.EditorCalltipsPage.EditorCalltipsPage.setMode?4(displayMode) eric7.Preferences.ConfigurationPages.EditorCalltipsPage.EditorCalltipsPage?1() eric7.Preferences.ConfigurationPages.EditorCalltipsPage.create?4(dlg) eric7.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.EditorCalltipsQScintillaPage.save?4() @@ -7298,6 +7300,7 @@ eric7.Preferences.ConfigurationPages.EditorGeneralPage.EditorGeneralPage.on_languageOverrideWidget_itemSelectionChanged?4() eric7.Preferences.ConfigurationPages.EditorGeneralPage.EditorGeneralPage.on_tabforindentationCheckBox_toggled?4(checked) eric7.Preferences.ConfigurationPages.EditorGeneralPage.EditorGeneralPage.save?4() +eric7.Preferences.ConfigurationPages.EditorGeneralPage.EditorGeneralPage.setMode?4(displayMode) eric7.Preferences.ConfigurationPages.EditorGeneralPage.EditorGeneralPage?1() eric7.Preferences.ConfigurationPages.EditorGeneralPage.create?4(dlg) eric7.Preferences.ConfigurationPages.EditorHighlightersPage.EditorHighlightersPage.on_addLexerButton_clicked?4() @@ -7335,6 +7338,7 @@ eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.save?4() eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.saveState?4() eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setFont?4(style, substyle, familyOnly, sizeOnly) +eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setMode?4(displayMode) eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setSampleFont?4(familyOnly, sizeOnly) eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setState?4(state) eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage?1(lexers) @@ -7349,6 +7353,7 @@ eric7.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage.on_languageCombo_activated?4(index) eric7.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage.on_setSpinBox_valueChanged?4(kwSet) eric7.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage.save?4() +eric7.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage.setMode?4(displayMode) eric7.Preferences.ConfigurationPages.EditorKeywordsPage.EditorKeywordsPage?1() eric7.Preferences.ConfigurationPages.EditorKeywordsPage.create?4(dlg) eric7.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.EditorLanguageTabIndentOverrideDialog.PygmentsMarker?7 @@ -7364,9 +7369,11 @@ eric7.Preferences.ConfigurationPages.EditorMouseClickHandlerPage.EditorMouseClickHandlerPage?1() eric7.Preferences.ConfigurationPages.EditorMouseClickHandlerPage.create?4(dlg) eric7.Preferences.ConfigurationPages.EditorPropertiesPage.EditorPropertiesPage.save?4() +eric7.Preferences.ConfigurationPages.EditorPropertiesPage.EditorPropertiesPage.setMode?4(displayMode) eric7.Preferences.ConfigurationPages.EditorPropertiesPage.EditorPropertiesPage?1(lexers) eric7.Preferences.ConfigurationPages.EditorPropertiesPage.create?4(dlg) eric7.Preferences.ConfigurationPages.EditorSearchPage.EditorSearchPage.save?4() +eric7.Preferences.ConfigurationPages.EditorSearchPage.EditorSearchPage.setMode?4(displayMode) eric7.Preferences.ConfigurationPages.EditorSearchPage.EditorSearchPage?1() eric7.Preferences.ConfigurationPages.EditorSearchPage.create?4(dlg) eric7.Preferences.ConfigurationPages.EditorSpellCheckingPage.EditorSpellCheckingPage.save?4() @@ -7383,6 +7390,7 @@ eric7.Preferences.ConfigurationPages.EditorStylesPage.EditorStylesPage.on_monospacedFontButton_clicked?4() eric7.Preferences.ConfigurationPages.EditorStylesPage.EditorStylesPage.polishPage?4() eric7.Preferences.ConfigurationPages.EditorStylesPage.EditorStylesPage.save?4() +eric7.Preferences.ConfigurationPages.EditorStylesPage.EditorStylesPage.setMode?4(displayMode) eric7.Preferences.ConfigurationPages.EditorStylesPage.EditorStylesPage?1() eric7.Preferences.ConfigurationPages.EditorStylesPage.create?4(dlg) eric7.Preferences.ConfigurationPages.EditorSyntaxPage.EditorSyntaxPage.save?4()
--- a/src/eric7/Documentation/Help/source.qhp Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Help/source.qhp Tue Jul 25 16:41:52 2023 +0200 @@ -4970,6 +4970,7 @@ <keyword name="EditorAutocompletionPage (Constructor)" id="EditorAutocompletionPage (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorAutocompletionPage.html#EditorAutocompletionPage.__init__" /> <keyword name="EditorAutocompletionPage (Module)" id="EditorAutocompletionPage (Module)" ref="eric7.Preferences.ConfigurationPages.EditorAutocompletionPage.html" /> <keyword name="EditorAutocompletionPage.save" id="EditorAutocompletionPage.save" ref="eric7.Preferences.ConfigurationPages.EditorAutocompletionPage.html#EditorAutocompletionPage.save" /> + <keyword name="EditorAutocompletionPage.setMode" id="EditorAutocompletionPage.setMode" ref="eric7.Preferences.ConfigurationPages.EditorAutocompletionPage.html#EditorAutocompletionPage.setMode" /> <keyword name="EditorAutocompletionQScintillaPage" id="EditorAutocompletionQScintillaPage" ref="eric7.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html#EditorAutocompletionQScintillaPage" /> <keyword name="EditorAutocompletionQScintillaPage (Constructor)" id="EditorAutocompletionQScintillaPage (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html#EditorAutocompletionQScintillaPage.__init__" /> <keyword name="EditorAutocompletionQScintillaPage (Module)" id="EditorAutocompletionQScintillaPage (Module)" ref="eric7.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html" /> @@ -4999,6 +5000,7 @@ <keyword name="EditorCalltipsPage (Constructor)" id="EditorCalltipsPage (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorCalltipsPage.html#EditorCalltipsPage.__init__" /> <keyword name="EditorCalltipsPage (Module)" id="EditorCalltipsPage (Module)" ref="eric7.Preferences.ConfigurationPages.EditorCalltipsPage.html" /> <keyword name="EditorCalltipsPage.save" id="EditorCalltipsPage.save" ref="eric7.Preferences.ConfigurationPages.EditorCalltipsPage.html#EditorCalltipsPage.save" /> + <keyword name="EditorCalltipsPage.setMode" id="EditorCalltipsPage.setMode" ref="eric7.Preferences.ConfigurationPages.EditorCalltipsPage.html#EditorCalltipsPage.setMode" /> <keyword name="EditorCalltipsQScintillaPage" id="EditorCalltipsQScintillaPage" ref="eric7.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.html#EditorCalltipsQScintillaPage" /> <keyword name="EditorCalltipsQScintillaPage (Constructor)" id="EditorCalltipsQScintillaPage (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.html#EditorCalltipsQScintillaPage.__init__" /> <keyword name="EditorCalltipsQScintillaPage (Module)" id="EditorCalltipsQScintillaPage (Module)" ref="eric7.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.html" /> @@ -5040,6 +5042,7 @@ <keyword name="EditorGeneralPage.on_languageOverrideWidget_itemSelectionChanged" id="EditorGeneralPage.on_languageOverrideWidget_itemSelectionChanged" ref="eric7.Preferences.ConfigurationPages.EditorGeneralPage.html#EditorGeneralPage.on_languageOverrideWidget_itemSelectionChanged" /> <keyword name="EditorGeneralPage.on_tabforindentationCheckBox_toggled" id="EditorGeneralPage.on_tabforindentationCheckBox_toggled" ref="eric7.Preferences.ConfigurationPages.EditorGeneralPage.html#EditorGeneralPage.on_tabforindentationCheckBox_toggled" /> <keyword name="EditorGeneralPage.save" id="EditorGeneralPage.save" ref="eric7.Preferences.ConfigurationPages.EditorGeneralPage.html#EditorGeneralPage.save" /> + <keyword name="EditorGeneralPage.setMode" id="EditorGeneralPage.setMode" ref="eric7.Preferences.ConfigurationPages.EditorGeneralPage.html#EditorGeneralPage.setMode" /> <keyword name="EditorHighlightersPage" id="EditorHighlightersPage" ref="eric7.Preferences.ConfigurationPages.EditorHighlightersPage.html#EditorHighlightersPage" /> <keyword name="EditorHighlightersPage (Constructor)" id="EditorHighlightersPage (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorHighlightersPage.html#EditorHighlightersPage.__init__" /> <keyword name="EditorHighlightersPage (Module)" id="EditorHighlightersPage (Module)" ref="eric7.Preferences.ConfigurationPages.EditorHighlightersPage.html" /> @@ -5059,6 +5062,7 @@ <keyword name="EditorHighlightingStylesPage.__exportStyles" id="EditorHighlightingStylesPage.__exportStyles" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__exportStyles" /> <keyword name="EditorHighlightingStylesPage.__fontButtonMenuTriggered" id="EditorHighlightingStylesPage.__fontButtonMenuTriggered" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__fontButtonMenuTriggered" /> <keyword name="EditorHighlightingStylesPage.__importStyles" id="EditorHighlightingStylesPage.__importStyles" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__importStyles" /> + <keyword name="EditorHighlightingStylesPage.__populateLanguages" id="EditorHighlightingStylesPage.__populateLanguages" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__populateLanguages" /> <keyword name="EditorHighlightingStylesPage.__setToDefault" id="EditorHighlightingStylesPage.__setToDefault" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__setToDefault" /> <keyword name="EditorHighlightingStylesPage.__styleAllItems" id="EditorHighlightingStylesPage.__styleAllItems" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__styleAllItems" /> <keyword name="EditorHighlightingStylesPage.__styleOneItem" id="EditorHighlightingStylesPage.__styleOneItem" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__styleOneItem" /> @@ -5085,6 +5089,7 @@ <keyword name="EditorHighlightingStylesPage.save" id="EditorHighlightingStylesPage.save" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.save" /> <keyword name="EditorHighlightingStylesPage.saveState" id="EditorHighlightingStylesPage.saveState" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.saveState" /> <keyword name="EditorHighlightingStylesPage.setFont" id="EditorHighlightingStylesPage.setFont" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.setFont" /> + <keyword name="EditorHighlightingStylesPage.setMode" id="EditorHighlightingStylesPage.setMode" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.setMode" /> <keyword name="EditorHighlightingStylesPage.setSampleFont" id="EditorHighlightingStylesPage.setSampleFont" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.setSampleFont" /> <keyword name="EditorHighlightingStylesPage.setState" id="EditorHighlightingStylesPage.setState" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.setState" /> <keyword name="EditorHighlightingStylesSelectionDialog" id="EditorHighlightingStylesSelectionDialog" ref="eric7.Preferences.ConfigurationPages.EditorHighlightingStylesSelectionDialog.html#EditorHighlightingStylesSelectionDialog" /> @@ -5097,11 +5102,13 @@ <keyword name="EditorKeywordsPage" id="EditorKeywordsPage" ref="eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html#EditorKeywordsPage" /> <keyword name="EditorKeywordsPage (Constructor)" id="EditorKeywordsPage (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html#EditorKeywordsPage.__init__" /> <keyword name="EditorKeywordsPage (Module)" id="EditorKeywordsPage (Module)" ref="eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html" /> + <keyword name="EditorKeywordsPage.__populateLanguages" id="EditorKeywordsPage.__populateLanguages" ref="eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html#EditorKeywordsPage.__populateLanguages" /> <keyword name="EditorKeywordsPage.on_allDefaultButton_clicked" id="EditorKeywordsPage.on_allDefaultButton_clicked" ref="eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html#EditorKeywordsPage.on_allDefaultButton_clicked" /> <keyword name="EditorKeywordsPage.on_defaultButton_clicked" id="EditorKeywordsPage.on_defaultButton_clicked" ref="eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html#EditorKeywordsPage.on_defaultButton_clicked" /> <keyword name="EditorKeywordsPage.on_languageCombo_activated" id="EditorKeywordsPage.on_languageCombo_activated" ref="eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html#EditorKeywordsPage.on_languageCombo_activated" /> <keyword name="EditorKeywordsPage.on_setSpinBox_valueChanged" id="EditorKeywordsPage.on_setSpinBox_valueChanged" ref="eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html#EditorKeywordsPage.on_setSpinBox_valueChanged" /> <keyword name="EditorKeywordsPage.save" id="EditorKeywordsPage.save" ref="eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html#EditorKeywordsPage.save" /> + <keyword name="EditorKeywordsPage.setMode" id="EditorKeywordsPage.setMode" ref="eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html#EditorKeywordsPage.setMode" /> <keyword name="EditorLanguageTabIndentOverrideDialog" id="EditorLanguageTabIndentOverrideDialog" ref="eric7.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html#EditorLanguageTabIndentOverrideDialog" /> <keyword name="EditorLanguageTabIndentOverrideDialog (Constructor)" id="EditorLanguageTabIndentOverrideDialog (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html#EditorLanguageTabIndentOverrideDialog.__init__" /> <keyword name="EditorLanguageTabIndentOverrideDialog (Module)" id="EditorLanguageTabIndentOverrideDialog (Module)" ref="eric7.Preferences.ConfigurationPages.EditorLanguageTabIndentOverrideDialog.html" /> @@ -5171,10 +5178,12 @@ <keyword name="EditorPropertiesPage (Constructor)" id="EditorPropertiesPage (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorPropertiesPage.html#EditorPropertiesPage.__init__" /> <keyword name="EditorPropertiesPage (Module)" id="EditorPropertiesPage (Module)" ref="eric7.Preferences.ConfigurationPages.EditorPropertiesPage.html" /> <keyword name="EditorPropertiesPage.save" id="EditorPropertiesPage.save" ref="eric7.Preferences.ConfigurationPages.EditorPropertiesPage.html#EditorPropertiesPage.save" /> + <keyword name="EditorPropertiesPage.setMode" id="EditorPropertiesPage.setMode" ref="eric7.Preferences.ConfigurationPages.EditorPropertiesPage.html#EditorPropertiesPage.setMode" /> <keyword name="EditorSearchPage" id="EditorSearchPage" ref="eric7.Preferences.ConfigurationPages.EditorSearchPage.html#EditorSearchPage" /> <keyword name="EditorSearchPage (Constructor)" id="EditorSearchPage (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorSearchPage.html#EditorSearchPage.__init__" /> <keyword name="EditorSearchPage (Module)" id="EditorSearchPage (Module)" ref="eric7.Preferences.ConfigurationPages.EditorSearchPage.html" /> <keyword name="EditorSearchPage.save" id="EditorSearchPage.save" ref="eric7.Preferences.ConfigurationPages.EditorSearchPage.html#EditorSearchPage.save" /> + <keyword name="EditorSearchPage.setMode" id="EditorSearchPage.setMode" ref="eric7.Preferences.ConfigurationPages.EditorSearchPage.html#EditorSearchPage.setMode" /> <keyword name="EditorSpellCheckingPage" id="EditorSpellCheckingPage" ref="eric7.Preferences.ConfigurationPages.EditorSpellCheckingPage.html#EditorSpellCheckingPage" /> <keyword name="EditorSpellCheckingPage (Constructor)" id="EditorSpellCheckingPage (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorSpellCheckingPage.html#EditorSpellCheckingPage.__init__" /> <keyword name="EditorSpellCheckingPage (Module)" id="EditorSpellCheckingPage (Module)" ref="eric7.Preferences.ConfigurationPages.EditorSpellCheckingPage.html" /> @@ -5194,6 +5203,7 @@ <keyword name="EditorStylesPage.on_monospacedFontButton_clicked" id="EditorStylesPage.on_monospacedFontButton_clicked" ref="eric7.Preferences.ConfigurationPages.EditorStylesPage.html#EditorStylesPage.on_monospacedFontButton_clicked" /> <keyword name="EditorStylesPage.polishPage" id="EditorStylesPage.polishPage" ref="eric7.Preferences.ConfigurationPages.EditorStylesPage.html#EditorStylesPage.polishPage" /> <keyword name="EditorStylesPage.save" id="EditorStylesPage.save" ref="eric7.Preferences.ConfigurationPages.EditorStylesPage.html#EditorStylesPage.save" /> + <keyword name="EditorStylesPage.setMode" id="EditorStylesPage.setMode" ref="eric7.Preferences.ConfigurationPages.EditorStylesPage.html#EditorStylesPage.setMode" /> <keyword name="EditorSyntaxPage" id="EditorSyntaxPage" ref="eric7.Preferences.ConfigurationPages.EditorSyntaxPage.html#EditorSyntaxPage" /> <keyword name="EditorSyntaxPage (Constructor)" id="EditorSyntaxPage (Constructor)" ref="eric7.Preferences.ConfigurationPages.EditorSyntaxPage.html#EditorSyntaxPage.__init__" /> <keyword name="EditorSyntaxPage (Module)" id="EditorSyntaxPage (Module)" ref="eric7.Preferences.ConfigurationPages.EditorSyntaxPage.html" />
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorAutocompletionPage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorAutocompletionPage.html Tue Jul 25 16:41:52 2023 +0200 @@ -66,6 +66,10 @@ <td><a href="#EditorAutocompletionPage.save">save</a></td> <td>Public slot to save the Editor Autocompletion configuration.</td> </tr> +<tr> +<td><a href="#EditorAutocompletionPage.setMode">setMode</a></td> +<td>Public method to perform mode dependent setups.</td> +</tr> </table> <h3>Static Methods</h3> @@ -87,6 +91,20 @@ <p> Public slot to save the Editor Autocompletion configuration. </p> +<a NAME="EditorAutocompletionPage.setMode" ID="EditorAutocompletionPage.setMode"></a> +<h4>EditorAutocompletionPage.setMode</h4> +<b>setMode</b>(<i>displayMode</i>) + +<p> + Public method to perform mode dependent setups. +</p> +<dl> + +<dt><i>displayMode</i> (ConfigurationMode)</dt> +<dd> +mode of the configuration dialog +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> <hr />
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorCalltipsPage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorCalltipsPage.html Tue Jul 25 16:41:52 2023 +0200 @@ -66,6 +66,10 @@ <td><a href="#EditorCalltipsPage.save">save</a></td> <td>Public slot to save the EditorCalltips configuration.</td> </tr> +<tr> +<td><a href="#EditorCalltipsPage.setMode">setMode</a></td> +<td>Public method to perform mode dependent setups.</td> +</tr> </table> <h3>Static Methods</h3> @@ -87,6 +91,20 @@ <p> Public slot to save the EditorCalltips configuration. </p> +<a NAME="EditorCalltipsPage.setMode" ID="EditorCalltipsPage.setMode"></a> +<h4>EditorCalltipsPage.setMode</h4> +<b>setMode</b>(<i>displayMode</i>) + +<p> + Public method to perform mode dependent setups. +</p> +<dl> + +<dt><i>displayMode</i> (ConfigurationMode)</dt> +<dd> +mode of the configuration dialog +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> <hr />
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorGeneralPage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorGeneralPage.html Tue Jul 25 16:41:52 2023 +0200 @@ -102,6 +102,10 @@ <td><a href="#EditorGeneralPage.save">save</a></td> <td>Public slot to save the Editor General configuration.</td> </tr> +<tr> +<td><a href="#EditorGeneralPage.setMode">setMode</a></td> +<td>Public method to perform mode dependent setups.</td> +</tr> </table> <h3>Static Methods</h3> @@ -210,6 +214,20 @@ <p> Public slot to save the Editor General configuration. </p> +<a NAME="EditorGeneralPage.setMode" ID="EditorGeneralPage.setMode"></a> +<h4>EditorGeneralPage.setMode</h4> +<b>setMode</b>(<i>displayMode</i>) + +<p> + Public method to perform mode dependent setups. +</p> +<dl> + +<dt><i>displayMode</i> (ConfigurationMode)</dt> +<dd> +mode of the configuration dialog +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> <hr />
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html Tue Jul 25 16:41:52 2023 +0200 @@ -91,6 +91,10 @@ <td>Private method to import the styles of lexers to be selected.</td> </tr> <tr> +<td><a href="#EditorHighlightingStylesPage.__populateLanguages">__populateLanguages</a></td> +<td>Private method to populate the language selection box.</td> +</tr> +<tr> <td><a href="#EditorHighlightingStylesPage.__setToDefault">__setToDefault</a></td> <td>Private method to set a specific style to its default values.</td> </tr> @@ -195,6 +199,10 @@ <td>Local function to set the font.</td> </tr> <tr> +<td><a href="#EditorHighlightingStylesPage.setMode">setMode</a></td> +<td>Public method to perform mode dependent setups.</td> +</tr> +<tr> <td><a href="#EditorHighlightingStylesPage.setSampleFont">setSampleFont</a></td> <td>Local function to set the font of the sample text.</td> </tr> @@ -342,6 +350,20 @@ (defaults to False) </dd> </dl> +<a NAME="EditorHighlightingStylesPage.__populateLanguages" ID="EditorHighlightingStylesPage.__populateLanguages"></a> +<h4>EditorHighlightingStylesPage.__populateLanguages</h4> +<b>__populateLanguages</b>(<i>languages</i>) + +<p> + Private method to populate the language selection box. +</p> +<dl> + +<dt><i>languages</i> (list of str)</dt> +<dd> +list of languages to include in the language selector +</dd> +</dl> <a NAME="EditorHighlightingStylesPage.__setToDefault" ID="EditorHighlightingStylesPage.__setToDefault"></a> <h4>EditorHighlightingStylesPage.__setToDefault</h4> <b>__setToDefault</b>(<i>style, substyle</i>) @@ -651,6 +673,20 @@ flag indicating to set the font size only </dd> </dl> +<a NAME="EditorHighlightingStylesPage.setMode" ID="EditorHighlightingStylesPage.setMode"></a> +<h4>EditorHighlightingStylesPage.setMode</h4> +<b>setMode</b>(<i>displayMode</i>) + +<p> + Public method to perform mode dependent setups. +</p> +<dl> + +<dt><i>displayMode</i> (ConfigurationMode)</dt> +<dd> +mode of the configuration dialog +</dd> +</dl> <a NAME="EditorHighlightingStylesPage.setSampleFont" ID="EditorHighlightingStylesPage.setSampleFont"></a> <h4>EditorHighlightingStylesPage.setSampleFont</h4> <b>setSampleFont</b>(<i>familyOnly, sizeOnly</i>)
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorKeywordsPage.html Tue Jul 25 16:41:52 2023 +0200 @@ -63,6 +63,10 @@ <td>Constructor</td> </tr> <tr> +<td><a href="#EditorKeywordsPage.__populateLanguages">__populateLanguages</a></td> +<td>Private method to populate the language selection box.</td> +</tr> +<tr> <td><a href="#EditorKeywordsPage.on_allDefaultButton_clicked">on_allDefaultButton_clicked</a></td> <td>Private slot to set all keyword sets of the current language to default values.</td> </tr> @@ -82,6 +86,10 @@ <td><a href="#EditorKeywordsPage.save">save</a></td> <td>Public slot to save the editor highlighter keywords configuration.</td> </tr> +<tr> +<td><a href="#EditorKeywordsPage.setMode">setMode</a></td> +<td>Public method to perform mode dependent setups.</td> +</tr> </table> <h3>Static Methods</h3> @@ -96,6 +104,20 @@ <p> Constructor </p> +<a NAME="EditorKeywordsPage.__populateLanguages" ID="EditorKeywordsPage.__populateLanguages"></a> +<h4>EditorKeywordsPage.__populateLanguages</h4> +<b>__populateLanguages</b>(<i>languages</i>) + +<p> + Private method to populate the language selection box. +</p> +<dl> + +<dt><i>languages</i> (list of str)</dt> +<dd> +list of languages to include in the language selector +</dd> +</dl> <a NAME="EditorKeywordsPage.on_allDefaultButton_clicked" ID="EditorKeywordsPage.on_allDefaultButton_clicked"></a> <h4>EditorKeywordsPage.on_allDefaultButton_clicked</h4> <b>on_allDefaultButton_clicked</b>(<i></i>) @@ -146,6 +168,20 @@ <p> Public slot to save the editor highlighter keywords configuration. </p> +<a NAME="EditorKeywordsPage.setMode" ID="EditorKeywordsPage.setMode"></a> +<h4>EditorKeywordsPage.setMode</h4> +<b>setMode</b>(<i>displayMode</i>) + +<p> + Public method to perform mode dependent setups. +</p> +<dl> + +<dt><i>displayMode</i> (ConfigurationMode)</dt> +<dd> +mode of the configuration dialog +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> <hr />
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorPropertiesPage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorPropertiesPage.html Tue Jul 25 16:41:52 2023 +0200 @@ -66,6 +66,10 @@ <td><a href="#EditorPropertiesPage.save">save</a></td> <td>Public slot to save the Editor Properties (1) configuration.</td> </tr> +<tr> +<td><a href="#EditorPropertiesPage.setMode">setMode</a></td> +<td>Public method to perform mode dependent setups.</td> +</tr> </table> <h3>Static Methods</h3> @@ -94,6 +98,20 @@ <p> Public slot to save the Editor Properties (1) configuration. </p> +<a NAME="EditorPropertiesPage.setMode" ID="EditorPropertiesPage.setMode"></a> +<h4>EditorPropertiesPage.setMode</h4> +<b>setMode</b>(<i>displayMode</i>) + +<p> + Public method to perform mode dependent setups. +</p> +<dl> + +<dt><i>displayMode</i> (ConfigurationMode)</dt> +<dd> +mode of the configuration dialog +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> <hr />
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorSearchPage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorSearchPage.html Tue Jul 25 16:41:52 2023 +0200 @@ -66,6 +66,10 @@ <td><a href="#EditorSearchPage.save">save</a></td> <td>Public slot to save the Editor Search configuration.</td> </tr> +<tr> +<td><a href="#EditorSearchPage.setMode">setMode</a></td> +<td>Public method to perform mode dependent setups.</td> +</tr> </table> <h3>Static Methods</h3> @@ -87,6 +91,20 @@ <p> Public slot to save the Editor Search configuration. </p> +<a NAME="EditorSearchPage.setMode" ID="EditorSearchPage.setMode"></a> +<h4>EditorSearchPage.setMode</h4> +<b>setMode</b>(<i>displayMode</i>) + +<p> + Public method to perform mode dependent setups. +</p> +<dl> + +<dt><i>displayMode</i> (ConfigurationMode)</dt> +<dd> +mode of the configuration dialog +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> <hr />
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorStylesPage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.EditorStylesPage.html Tue Jul 25 16:41:52 2023 +0200 @@ -110,6 +110,10 @@ <td><a href="#EditorStylesPage.save">save</a></td> <td>Public slot to save the Editor Styles configuration.</td> </tr> +<tr> +<td><a href="#EditorStylesPage.setMode">setMode</a></td> +<td>Public method to perform mode dependent setups.</td> +</tr> </table> <h3>Static Methods</h3> @@ -225,6 +229,20 @@ <p> Public slot to save the Editor Styles configuration. </p> +<a NAME="EditorStylesPage.setMode" ID="EditorStylesPage.setMode"></a> +<h4>EditorStylesPage.setMode</h4> +<b>setMode</b>(<i>displayMode</i>) + +<p> + Public method to perform mode dependent setups. +</p> +<dl> + +<dt><i>displayMode</i> (ConfigurationMode)</dt> +<dd> +mode of the configuration dialog +</dd> +</dl> <div align="right"><a href="#top">Up</a></div> <hr /> <hr />
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.NetworkPage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.NetworkPage.html Tue Jul 25 16:41:52 2023 +0200 @@ -137,11 +137,9 @@ </p> <dl> -<dt><i>displayMode</i></dt> +<dt><i>displayMode</i> (ConfigurationMode)</dt> <dd> mode of the configuration dialog - (ConfigurationMode.DEFAULTMODE, - ConfigurationMode.WEBBROWSERMODE) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.SecurityPage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.SecurityPage.html Tue Jul 25 16:41:52 2023 +0200 @@ -137,11 +137,9 @@ </p> <dl> -<dt><i>displayMode</i></dt> +<dt><i>displayMode</i> (ConfigurationMode)</dt> <dd> mode of the configuration dialog - (ConfigurationMode.DEFAULTMODE, - ConfigurationMode.WEBBROWSERMODE) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.WebBrowserAppearancePage.html Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Documentation/Source/eric7.Preferences.ConfigurationPages.WebBrowserAppearancePage.html Tue Jul 25 16:41:52 2023 +0200 @@ -100,11 +100,9 @@ </p> <dl> -<dt><i>displayMode</i></dt> +<dt><i>displayMode</i> (ConfigurationMode)</dt> <dd> mode of the configuration dialog - (ConfigurationMode.DEFAULTMODE, - ConfigurationMode.WEBBROWSERMODE) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/src/eric7/Preferences/ConfigurationDialog.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationDialog.py Tue Jul 25 16:41:52 2023 +0200 @@ -960,13 +960,90 @@ None, None, ], - "shellPage": [ + "0shellPage": [ self.tr("Shell"), "preferences-shell", "ShellPage", None, None, ], + "editorGeneralPage": [ + self.tr("General"), + "preferences-general", + "EditorGeneralPage", + "0shellPage", + None, + ], + "editorSearchPage": [ + self.tr("Searching"), + "preferences-search", + "EditorSearchPage", + "0shellPage", + None, + ], + "editorStylesPage": [ + self.tr("Style"), + "preferences-styles", + "EditorStylesPage", + "0shellPage", + None, + ], + "1editorAutocompletionPage": [ + self.tr("Autocompletion"), + "preferences-autocompletion", + "EditorAutocompletionPage", + "0shellPage", + None, + ], + "editorAutocompletionQScintillaPage": [ + self.tr("QScintilla"), + "qscintilla", + "EditorAutocompletionQScintillaPage", + "1editorAutocompletionPage", + None, + ], + "1editorCalltipsPage": [ + self.tr("Calltips"), + "preferences-calltips", + "EditorCalltipsPage", + "0shellPage", + None, + ], + "editorCalltipsQScintillaPage": [ + self.tr("QScintilla"), + "qscintilla", + "EditorCalltipsQScintillaPage", + "1editorCalltipsPage", + None, + ], + "1editorLexerPage": [ + self.tr("Highlighters"), + "preferences-highlighting-styles", + None, + "0shellPage", + None, + ], + "editorHighlightingStylesPage": [ + self.tr("Styles"), + "preferences-highlighting-styles", + "EditorHighlightingStylesPage", + "1editorLexerPage", + None, + ], + "editorKeywordsPage": [ + self.tr("Keywords"), + "preferences-keywords", + "EditorKeywordsPage", + "1editorLexerPage", + None, + ], + "editorPropertiesPage": [ + self.tr("Properties"), + "preferences-properties", + "EditorPropertiesPage", + "1editorLexerPage", + None, + ], } else:
--- a/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionPage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionPage.py Tue Jul 25 16:41:52 2023 +0200 @@ -61,6 +61,19 @@ self.acLinesSlider.setValue(Preferences.getEditor("AutoCompletionMaxLines")) self.acCharSlider.setValue(Preferences.getEditor("AutoCompletionMaxChars")) + def setMode(self, displayMode): + """ + Public method to perform mode dependent setups. + + @param displayMode mode of the configuration dialog + @type ConfigurationMode + """ + from ..ConfigurationDialog import ConfigurationMode + + if displayMode in (ConfigurationMode.SHELLMODE,): + self.pluginGroupBox.hide() + self.acCacheGroup.hide() + def save(self): """ Public slot to save the Editor Autocompletion configuration.
--- a/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionPage.ui Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionPage.ui Tue Jul 25 16:41:52 2023 +0200 @@ -32,7 +32,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox"> + <widget class="QGroupBox" name="generalGroupBox"> <property name="title"> <string>General</string> </property> @@ -319,7 +319,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3"> + <widget class="QGroupBox" name="pluginGroupBox"> <property name="title"> <string>Plug-In Behavior</string> </property>
--- a/src/eric7/Preferences/ConfigurationPages/EditorCalltipsPage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorCalltipsPage.py Tue Jul 25 16:41:52 2023 +0200 @@ -64,6 +64,18 @@ self.positionComboBox.findData(Preferences.getEditor("CallTipsPosition")) ) + def setMode(self, displayMode): + """ + Public method to perform mode dependent setups. + + @param displayMode mode of the configuration dialog + @type ConfigurationMode + """ + from ..ConfigurationDialog import ConfigurationMode + + if displayMode in (ConfigurationMode.SHELLMODE,): + self.pluginsBox.hide() + def save(self): """ Public slot to save the EditorCalltips configuration.
--- a/src/eric7/Preferences/ConfigurationPages/EditorCalltipsPage.ui Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorCalltipsPage.ui Tue Jul 25 16:41:52 2023 +0200 @@ -63,7 +63,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_4"> + <widget class="QGroupBox" name="calltipsVisibleBox"> <property name="title"> <string>Visible Calltips</string> </property> @@ -117,7 +117,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2"> + <widget class="QGroupBox" name="calltipsColorsBox"> <property name="title"> <string>Colors</string> </property> @@ -208,7 +208,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox"> + <widget class="QGroupBox" name="pluginsBox"> <property name="title"> <string>Plug-In Behavior</string> </property>
--- a/src/eric7/Preferences/ConfigurationPages/EditorGeneralPage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorGeneralPage.py Tue Jul 25 16:41:52 2023 +0200 @@ -89,6 +89,22 @@ self.__populateLanguageOverrideWidget() + def setMode(self, displayMode): + """ + Public method to perform mode dependent setups. + + @param displayMode mode of the configuration dialog + @type ConfigurationMode + """ + from ..ConfigurationDialog import ConfigurationMode + + if displayMode in (ConfigurationMode.SHELLMODE,): + self.sourceNavigationGroupBox.hide() + self.commentsGroupBox.hide() + self.docstringGroupBox.hide() + self.mouseHoverHelpGroupBox.hide() + self.virtualSpaceGroupBox.hide() + def save(self): """ Public slot to save the Editor General configuration.
--- a/src/eric7/Preferences/ConfigurationPages/EditorGeneralPage.ui Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorGeneralPage.ui Tue Jul 25 16:41:52 2023 +0200 @@ -385,7 +385,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox"> + <widget class="QGroupBox" name="commentsGroupBox"> <property name="title"> <string>Comments</string> </property> @@ -407,7 +407,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3"> + <widget class="QGroupBox" name="docstringGroupBox"> <property name="title"> <string>Docstring</string> </property> @@ -509,7 +509,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2"> + <widget class="QGroupBox" name="virtualSpaceGroupBox"> <property name="title"> <string>Virtual Space</string> </property>
--- a/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Tue Jul 25 16:41:52 2023 +0200 @@ -93,11 +93,19 @@ # set initial values languages = sorted([""] + list(self.lexers.keys())) - for language in languages: - self.lexerLanguageComboBox.addItem( - Lexers.getLanguageIcon(language, False), language - ) - self.on_lexerLanguageComboBox_activated(0) + self.__populateLanguages(languages) + + def setMode(self, displayMode): + """ + Public method to perform mode dependent setups. + + @param displayMode mode of the configuration dialog + @type ConfigurationMode + """ + from ..ConfigurationDialog import ConfigurationMode + + if displayMode in (ConfigurationMode.SHELLMODE,): + self.__populateLanguages(["Python3"]) def save(self): """ @@ -106,6 +114,20 @@ for lexer in list(self.lexers.values()): lexer.writeSettings() + def __populateLanguages(self, languages): + """ + Private method to populate the language selection box. + + @param languages list of languages to include in the language selector + @type list of str + """ + self.lexerLanguageComboBox.clear() + for language in languages: + self.lexerLanguageComboBox.addItem( + Lexers.getLanguageIcon(language, False), language + ) + self.on_lexerLanguageComboBox_activated(0) + @pyqtSlot(int) def on_lexerLanguageComboBox_activated(self, index): """
--- a/src/eric7/Preferences/ConfigurationPages/EditorKeywordsPage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorKeywordsPage.py Tue Jul 25 16:41:52 2023 +0200 @@ -43,6 +43,39 @@ } languages = sorted([""] + list(Lexers.getSupportedLanguages().keys())) + self.__populateLanguages(languages) + + def setMode(self, displayMode): + """ + Public method to perform mode dependent setups. + + @param displayMode mode of the configuration dialog + @type ConfigurationMode + """ + from ..ConfigurationDialog import ConfigurationMode + + if displayMode in (ConfigurationMode.SHELLMODE,): + self.__populateLanguages(["Python3"]) + + def save(self): + """ + Public slot to save the editor highlighter keywords configuration. + """ + lang = self.languageCombo.currentText() + kwSet = self.setSpinBox.value() + self.__keywords[lang]["Sets"][kwSet] = self.keywordsEdit.toPlainText() + + for lang, keywords in self.__keywords.items(): + Preferences.setEditorKeywords(lang, keywords["Sets"]) + + def __populateLanguages(self, languages): + """ + Private method to populate the language selection box. + + @param languages list of languages to include in the language selector + @type list of str + """ + self.languageCombo.clear() for lang in languages: if lang: lex = Lexers.getLexer(lang) @@ -87,17 +120,6 @@ self.currentSet = 1 self.on_languageCombo_activated(0) - def save(self): - """ - Public slot to save the editor highlighter keywords configuration. - """ - lang = self.languageCombo.currentText() - kwSet = self.setSpinBox.value() - self.__keywords[lang]["Sets"][kwSet] = self.keywordsEdit.toPlainText() - - for lang, keywords in self.__keywords.items(): - Preferences.setEditorKeywords(lang, keywords["Sets"]) - @pyqtSlot(int) def on_languageCombo_activated(self, index): """
--- a/src/eric7/Preferences/ConfigurationPages/EditorPropertiesPage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorPropertiesPage.py Tue Jul 25 16:41:52 2023 +0200 @@ -289,6 +289,37 @@ Preferences.getEditor("YAMLFoldComment") ) + def setMode(self, displayMode): + """ + Public method to perform mode dependent setups. + + @param displayMode mode of the configuration dialog + @type ConfigurationMode + """ + from ..ConfigurationDialog import ConfigurationMode + + if displayMode in (ConfigurationMode.SHELLMODE,): + self.bashGroup.hide() + self.cppGroup.hide() + self.cmakeGroup.hide() + self.coffeeScriptGroup.hide() + self.cssGroup.hide() + self.dGroup.hide() + self.gettextGroup.hide() + self.htmlGroup.hide() + self.jsonGroup.hide() + self.pascalGroup.hide() + self.perlGroup.hide() + self.postscriptGroup.hide() + self.povrayGroup.hide() + self.propertiesGroup.hide() + self.rubyGroup.hide() + self.sqlGroup.hide() + self.tclGroup.hide() + self.texGroup.hide() + self.vhdlGroup.hide() + self.yamlGroup.hide() + def save(self): """ Public slot to save the Editor Properties (1) configuration.
--- a/src/eric7/Preferences/ConfigurationPages/EditorPropertiesPage.ui Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorPropertiesPage.ui Tue Jul 25 16:41:52 2023 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>558</width> - <height>2649</height> + <height>2826</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> @@ -32,7 +32,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2"> + <widget class="QGroupBox" name="allGroup"> <property name="title"> <string>All Lexers Properties</string> </property> @@ -51,7 +51,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox"> + <widget class="QGroupBox" name="bashGroup"> <property name="title"> <string>Bash Lexer Properties</string> </property> @@ -70,7 +70,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3"> + <widget class="QGroupBox" name="cppGroup"> <property name="title"> <string>C++ , C# , IDL, Java and JavaScript Lexer Properties</string> </property> @@ -209,7 +209,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_7"> + <widget class="QGroupBox" name="cmakeGroup"> <property name="title"> <string>CMake Lexer Properties</string> </property> @@ -267,7 +267,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_4"> + <widget class="QGroupBox" name="cssGroup"> <property name="title"> <string>CSS Lexer Properties</string> </property> @@ -316,7 +316,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_6"> + <widget class="QGroupBox" name="dGroup"> <property name="title"> <string>D Lexer Properties</string> </property> @@ -384,7 +384,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_10"> + <widget class="QGroupBox" name="htmlGroup"> <property name="title"> <string>HTML Lexer Properties</string> </property> @@ -540,7 +540,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_9"> + <widget class="QGroupBox" name="perlGroup"> <property name="title"> <string>Perl Lexer Properties</string> </property> @@ -661,7 +661,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_5"> + <widget class="QGroupBox" name="povrayGroup"> <property name="title"> <string>Povray Lexer Properties</string> </property> @@ -690,7 +690,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_13"> + <widget class="QGroupBox" name="propertiesGroup"> <property name="title"> <string>Properties Lexer Properties</string> </property> @@ -709,7 +709,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_8"> + <widget class="QGroupBox" name="pythonGroup"> <property name="title"> <string>Python Lexer Properties</string> </property> @@ -832,7 +832,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_14"> + <widget class="QGroupBox" name="rubyGroup"> <property name="title"> <string>Ruby Lexer Properties</string> </property> @@ -851,7 +851,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_12"> + <widget class="QGroupBox" name="sqlGroup"> <property name="title"> <string>SQL Lexer Properties</string> </property> @@ -930,7 +930,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_15"> + <widget class="QGroupBox" name="tclGroup"> <property name="title"> <string>TCL Lexer Properties</string> </property> @@ -949,7 +949,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_16"> + <widget class="QGroupBox" name="texGroup"> <property name="title"> <string>TeX Lexer Properties</string> </property> @@ -988,7 +988,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_11"> + <widget class="QGroupBox" name="vhdlGroup"> <property name="title"> <string>VHDL Lexer Properties</string> </property> @@ -1055,6 +1055,19 @@ </layout> </widget> </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </widget> <tabstops>
--- a/src/eric7/Preferences/ConfigurationPages/EditorSearchPage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorSearchPage.py Tue Jul 25 16:41:52 2023 +0200 @@ -62,6 +62,21 @@ hasAlpha=True, ) + def setMode(self, displayMode): + """ + Public method to perform mode dependent setups. + + @param displayMode mode of the configuration dialog + @type ConfigurationMode + """ + from ..ConfigurationDialog import ConfigurationMode + + if displayMode in (ConfigurationMode.SHELLMODE,): + self.quicksearchCheckBox.hide() + self.searckMarkersBox.hide() + self.highlightingBackgroundLabel.hide() + self.highlightingBackgroundButton.hide() + def save(self): """ Public slot to save the Editor Search configuration.
--- a/src/eric7/Preferences/ConfigurationPages/EditorSearchPage.ui Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorSearchPage.ui Tue Jul 25 16:41:52 2023 +0200 @@ -42,7 +42,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_4"> + <widget class="QGroupBox" name="searckMarkersBox"> <property name="title"> <string>Search Markers</string> </property> @@ -210,7 +210,7 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout_8"> <item> - <widget class="QLabel" name="label_20"> + <widget class="QLabel" name="highlightingBackgroundLabel"> <property name="text"> <string>Search Area Highlighting:</string> </property>
--- a/src/eric7/Preferences/ConfigurationPages/EditorStylesPage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorStylesPage.py Tue Jul 25 16:41:52 2023 +0200 @@ -369,6 +369,30 @@ hasAlpha=True, ) + def setMode(self, displayMode): + """ + Public method to perform mode dependent setups. + + @param displayMode mode of the configuration dialog + @type ConfigurationMode + """ + from ..ConfigurationDialog import ConfigurationMode + + if displayMode in (ConfigurationMode.SHELLMODE,): + self.foldMarginGroup.hide() + self.caretLineGroup.hide() + self.debuggingGroup.hide() + self.wrapLongLinesGroup.hide() + self.edgeModeGroup.hide() + self.zoomGroup.hide() + self.annotationsGroup.hide() + self.changeTracingGroup.hide() + self.indentationsGroup.hide() + self.markerMapGroup.hide() + self.variousGroup.hide() + self.fontsGroup.hide() + self.lineNumbersGroup.hide() + def save(self): """ Public slot to save the Editor Styles configuration.
--- a/src/eric7/Preferences/ConfigurationPages/EditorStylesPage.ui Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/EditorStylesPage.ui Tue Jul 25 16:41:52 2023 +0200 @@ -7,10 +7,10 @@ <x>0</x> <y>0</y> <width>578</width> - <height>3217</height> + <height>3473</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_5"> + <layout class="QVBoxLayout" name="verticalLayout_13"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -42,7 +42,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_12"> + <widget class="QGroupBox" name="colorsGroup"> <property name="title"> <string>Colors</string> </property> @@ -171,7 +171,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_5"> + <widget class="QGroupBox" name="fontsGroup"> <property name="title"> <string>Fonts</string> </property> @@ -242,57 +242,185 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox"> + <widget class="QGroupBox" name="marginsGroup"> <property name="title"> <string>Margins</string> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QVBoxLayout" name="verticalLayout_12"> <item> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QCheckBox" name="linenoCheckBox"> - <property name="toolTip"> - <string>Select whether line numbers margin should be shown.</string> - </property> - <property name="text"> - <string>Show Line Numbers Margin</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="foldingCheckBox"> - <property name="toolTip"> - <string>Select whether the fold margin should be shown.</string> - </property> - <property name="text"> - <string>Show Fold Margin</string> - </property> - </widget> - </item> - </layout> + <widget class="QGroupBox" name="marginsGeneralGroup"> + <property name="title"> + <string>General</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel2_2_2_2_2_6"> + <property name="text"> + <string>Margins foreground:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="marginsForegroundButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the foreground color for the margins</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_7"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>266</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="TextLabel2_2_2_2_2_7"> + <property name="text"> + <string>Margins background:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="marginsBackgroundButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background color for the margins</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </widget> </item> <item> - <layout class="QHBoxLayout"> - <item> - <widget class="QLabel" name="TextLabel1_4_2_2"> - <property name="text"> - <string>Folding style:</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="foldingStyleComboBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Select the folding style to be used in the folding margin</string> - </property> - <property name="whatsThis"> - <string><b>Folding style</b> + <widget class="QGroupBox" name="lineNumbersGroup"> + <property name="title"> + <string>Line Numbers Margin</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <widget class="QCheckBox" name="linenoCheckBox"> + <property name="toolTip"> + <string>Select whether line numbers margin should be shown.</string> + </property> + <property name="text"> + <string>Show Line Numbers Margin</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="linenumbersFontButton"> + <property name="toolTip"> + <string>Press to select the font for the editor line numbers</string> + </property> + <property name="text"> + <string>Line Numbers Font</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="marginsFontSample"> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="text"> + <string>2345</string> + </property> + <property name="alignment"> + <set>Qt::AlignHCenter</set> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="foldMarginGroup"> + <property name="title"> + <string>Fold Margin</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="foldingCheckBox"> + <property name="toolTip"> + <string>Select whether the fold margin should be shown.</string> + </property> + <property name="text"> + <string>Show Fold Margin</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout"> + <item> + <widget class="QLabel" name="TextLabel1_4_2_2"> + <property name="text"> + <string>Folding style:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="foldingStyleComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the folding style to be used in the folding margin</string> + </property> + <property name="whatsThis"> + <string><b>Folding style</b> <p>Select the desired folding style to be used in the folding margin.</p> <p>The available styles are: <ul> @@ -303,232 +431,140 @@ <li>Boxed Tree - boxed plus and minus symbols and flattened tree with rectangled corners</li> </ul> </p></string> - </property> - <item> - <property name="text"> - <string>Plain</string> - </property> - </item> - <item> - <property name="text"> - <string>Circled</string> - </property> - </item> - <item> - <property name="text"> - <string>Boxed</string> - </property> - </item> - <item> - <property name="text"> - <string>Circled Tree</string> - </property> - </item> - <item> - <property name="text"> - <string>Boxed Tree</string> - </property> - </item> - <item> - <property name="text"> - <string>Arrow</string> - </property> - </item> - <item> - <property name="text"> - <string>Arrow Tree</string> - </property> - </item> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QGridLayout" name="gridLayout"> - <item row="3" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Foldmarkers foreground:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QPushButton" name="marginsForegroundButton"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Select the foreground color for the margins</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="TextLabel2_2_2_2_2_8"> - <property name="text"> - <string>Foldmargin background:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QPushButton" name="foldmarginBackgroundButton"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Select the background color for the foldmargin</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="TextLabel2_2_2_2_2_7"> - <property name="text"> - <string>Margins background:</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QPushButton" name="foldmarkersForegroundButton"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Select the foreground color of the foldmarkers</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="TextLabel2_2_2_2_2_6"> - <property name="text"> - <string>Margins foreground:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QPushButton" name="marginsBackgroundButton"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Select the background color for the margins</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Foldmarkers background:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QPushButton" name="foldmarkersBackgroundButton"> - <property name="minimumSize"> - <size> - <width>100</width> - <height>0</height> - </size> - </property> - <property name="toolTip"> - <string>Select the background color of the foldmarkers</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer_7"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QPushButton" name="linenumbersFontButton"> - <property name="toolTip"> - <string>Press to select the font for the editor line numbers</string> - </property> - <property name="text"> - <string>Line Numbers Font</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="marginsFontSample"> - <property name="minimumSize"> - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> - <property name="text"> - <string>2345</string> - </property> - <property name="alignment"> - <set>Qt::AlignHCenter</set> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> + </property> + <item> + <property name="text"> + <string>Plain</string> + </property> + </item> + <item> + <property name="text"> + <string>Circled</string> + </property> + </item> + <item> + <property name="text"> + <string>Boxed</string> + </property> + </item> + <item> + <property name="text"> + <string>Circled Tree</string> + </property> + </item> + <item> + <property name="text"> + <string>Boxed Tree</string> + </property> + </item> + <item> + <property name="text"> + <string>Arrow</string> + </property> + </item> + <item> + <property name="text"> + <string>Arrow Tree</string> + </property> + </item> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QGridLayout" name="gridLayout_16"> + <item row="0" column="0"> + <widget class="QLabel" name="TextLabel2_2_2_2_2_8"> + <property name="text"> + <string>Foldmargin background:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QPushButton" name="foldmarginBackgroundButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background color for the foldmargin</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_14"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Foldmarkers foreground:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="foldmarkersForegroundButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the foreground color of the foldmarkers</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Foldmarkers background:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QPushButton" name="foldmarkersBackgroundButton"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Select the background color of the foldmarkers</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> </item> </layout> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3"> + <widget class="QGroupBox" name="selectionGroup"> <property name="title"> <string>Selection</string> </property> @@ -637,13 +673,13 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_4"> + <widget class="QGroupBox" name="caretGroup"> <property name="title"> <string>Caret</string> </property> <layout class="QVBoxLayout" name="verticalLayout_9"> <item> - <widget class="QGroupBox" name="groupBox_18"> + <widget class="QGroupBox" name="caretGeneralGroup"> <property name="title"> <string>Caret</string> </property> @@ -711,7 +747,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_19"> + <widget class="QGroupBox" name="caretLineGroup"> <property name="title"> <string>Caret Line</string> </property> @@ -826,7 +862,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_2"> + <widget class="QGroupBox" name="debuggingGroup"> <property name="title"> <string>Debugging Line Markers</string> </property> @@ -904,7 +940,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_6"> + <widget class="QGroupBox" name="bracesGroup"> <property name="title"> <string>Braces</string> </property> @@ -1028,7 +1064,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_7"> + <widget class="QGroupBox" name="eolGroup"> <property name="title"> <string>End of Line</string> </property> @@ -1140,7 +1176,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_9"> + <widget class="QGroupBox" name="edgeModeGroup"> <property name="title"> <string>Edge Mode</string> </property> @@ -1296,7 +1332,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_8"> + <widget class="QGroupBox" name="zoomGroup"> <property name="title"> <string>Zoom</string> </property> @@ -1504,7 +1540,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_13"> + <widget class="QGroupBox" name="changeTracingGroup"> <property name="title"> <string>Change Tracing</string> </property> @@ -1638,7 +1674,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_11"> + <widget class="QGroupBox" name="whitespaceGroup"> <property name="title"> <string>Whitespace</string> </property> @@ -1760,7 +1796,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_15"> + <widget class="QGroupBox" name="indentationsGroup"> <property name="title"> <string>Indentation Guides</string> </property> @@ -1838,7 +1874,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_14"> + <widget class="QGroupBox" name="markerMapGroup"> <property name="title"> <string>Marker Map</string> </property> @@ -2172,7 +2208,7 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_10"> + <widget class="QGroupBox" name="variousGroup"> <property name="title"> <string>Various</string> </property> @@ -2200,6 +2236,19 @@ </layout> </widget> </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </widget> <tabstops> @@ -2210,15 +2259,15 @@ <tabstop>defaultFontButton</tabstop> <tabstop>monospacedFontButton</tabstop> <tabstop>monospacedCheckBox</tabstop> + <tabstop>marginsForegroundButton</tabstop> + <tabstop>marginsBackgroundButton</tabstop> <tabstop>linenoCheckBox</tabstop> + <tabstop>linenumbersFontButton</tabstop> <tabstop>foldingCheckBox</tabstop> <tabstop>foldingStyleComboBox</tabstop> - <tabstop>marginsForegroundButton</tabstop> - <tabstop>marginsBackgroundButton</tabstop> <tabstop>foldmarginBackgroundButton</tabstop> <tabstop>foldmarkersForegroundButton</tabstop> <tabstop>foldmarkersBackgroundButton</tabstop> - <tabstop>linenumbersFontButton</tabstop> <tabstop>customSelColourCheckBox</tabstop> <tabstop>colourizeSelTextCheckBox</tabstop> <tabstop>extentSelEolCheckBox</tabstop>
--- a/src/eric7/Preferences/ConfigurationPages/NetworkPage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/NetworkPage.py Tue Jul 25 16:41:52 2023 +0200 @@ -108,8 +108,7 @@ Public method to perform mode dependent setups. @param displayMode mode of the configuration dialog - (ConfigurationMode.DEFAULTMODE, - ConfigurationMode.WEBBROWSERMODE) + @type ConfigurationMode """ from ..ConfigurationDialog import ConfigurationMode
--- a/src/eric7/Preferences/ConfigurationPages/SecurityPage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/SecurityPage.py Tue Jul 25 16:41:52 2023 +0200 @@ -52,8 +52,7 @@ Public method to perform mode dependent setups. @param displayMode mode of the configuration dialog - (ConfigurationMode.DEFAULTMODE, - ConfigurationMode.WEBBROWSERMODE) + @type ConfigurationMode """ from ..ConfigurationDialog import ConfigurationMode
--- a/src/eric7/Preferences/ConfigurationPages/WebBrowserAppearancePage.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/WebBrowserAppearancePage.py Tue Jul 25 16:41:52 2023 +0200 @@ -138,8 +138,7 @@ Public method to perform mode dependent setups. @param displayMode mode of the configuration dialog - (ConfigurationMode.DEFAULTMODE, - ConfigurationMode.WEBBROWSERMODE) + @type ConfigurationMode """ from ..ConfigurationDialog import ConfigurationMode
--- a/src/eric7/QScintilla/ShellWindow.py Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/QScintilla/ShellWindow.py Tue Jul 25 16:41:52 2023 +0200 @@ -1565,7 +1565,7 @@ displayMode=ConfigurationMode.SHELLMODE, ) dlg.show() - dlg.showConfigurationPageByName("shellPage") + dlg.showConfigurationPageByName("0shellPage") dlg.exec() if dlg.result() == QDialog.DialogCode.Accepted: dlg.setPreferences()
--- a/src/eric7/i18n/eric7_cs.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_cs.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7736,7 +7736,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7851,6 +7851,7 @@ <translation>Debugger</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7885,6 +7886,7 @@ <translation>Manažer souborů</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7899,6 +7901,7 @@ <translation>Kontrola pravopisu</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7921,11 +7924,14 @@ <translation>Exportery</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7939,11 +7945,13 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation>Rychlé tipy</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -7956,18 +7964,21 @@ <translation>Asociace typů souborů</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation>Styly</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation>Klíčová slova</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -8011,7 +8022,7 @@ <translation>Multiprojekt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -8052,28 +8063,28 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation>Předvolby</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Pro zobrazení strany s konfigurací vyberte položku ze seznamu.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation>Chyba na straně konfigurace</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>Konfigurační stranu <b>{0}</b> nelze načíst.</p></translation> </message> @@ -14999,12 +15010,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation type="unfinished" /> </message> @@ -15168,7 +15179,7 @@ <translation>Výběr výplně konce řádku.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation>Vyplnit do konce řádku</translation> @@ -15302,74 +15313,74 @@ <translation>Jen velikost</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation>Zapnuto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation>Vypnuto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation>Vybrat pro doplnit do konce řádku pro všechny styly</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation>Export stylů zvýraznění</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation>Importovat styly zvýraznění</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation type="unfinished" /> </message> @@ -15450,22 +15461,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation type="unfinished" /> </message> @@ -16859,6 +16870,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished">Hlavní</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation>Barva textu okrajů:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation>Barva pozadí okrajů:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation>Vybrat má-li se zobrazovat sloupec s čísly řádků.</translation> </message> @@ -16869,6 +16910,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation>Stisknout pro výběr fontu pro na čísla řádků v editoru</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation>Font čísel řádek</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation>Vybrat, jestliže se mají zobrazovat značky skládání.</translation> </message> @@ -16939,16 +17000,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation>Barava pozadí okraje skládání:</translation> </message> @@ -16959,8 +17010,8 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> - <translation>Barva pozadí okrajů:</translation> + <source>Foldmarkers foreground:</source> + <translation type="unfinished" /> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> @@ -16969,16 +17020,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation>Barva textu okrajů:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation type="unfinished" /> </message> @@ -16989,21 +17030,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation>Stisknout pro výběr fontu pro na čísla řádků v editoru</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation>Font čísel řádek</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation>Výběr</translation> </message>
--- a/src/eric7/i18n/eric7_de.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_de.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7682,7 +7682,7 @@ <translation>Hex-Editor</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7797,6 +7797,7 @@ <translation>Debugger</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7831,6 +7832,7 @@ <translation>Dateibehandlung</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7845,6 +7847,7 @@ <translation>Rechtschreibprüfung</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7867,11 +7870,14 @@ <translation>Exporter</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation>Automatische Vervollständigung</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7885,11 +7891,13 @@ <translation>Jedi</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation>Calltips</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -7902,18 +7910,21 @@ <translation>Dateitypzuordnungen</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation>Stile</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation>Schlüsselwörter</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -7957,7 +7968,7 @@ <translation>Mehrfachprojekt</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -7998,29 +8009,29 @@ <translation>VirusTotal-Schnittstelle</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation>Suchtext eingeben...</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Wähle einen Listeneintrag aus, um die Konfigurationsseite anzuzeigen.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation>Konfigurationsseitenfehler</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>Die Konfigurationsseite <b>{0}</b> konnte nicht geladen werden.</p></translation> </message> @@ -14912,12 +14923,12 @@ <translation>Einfügemarke in den virtuellen Bereich bewegen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation>Tabulator und Einrückung Änderung</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation>Sollen die ausgewählten Einträge wirklich gelöscht werden?</translation> </message> @@ -15081,7 +15092,7 @@ <translation>Wähle den Modus „Füllen bis zum Zeilenende“.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation>Füllen bis zum Zeilenende</translation> @@ -15215,74 +15226,74 @@ <translation>nur Größe</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation>Eingeschaltet</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation>Ausgeschaltet</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation>Wähle Füllen bis Zeilenende für alle Stile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation>Hervorhebungsstile exportieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation>Dateien für Hervorhebungsstile (*.ehj)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei für Hervorhebungsstile <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation>Hervorhebungsstile importieren</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation>Dateien für Hervorhebungsstile (*.ehj);;XML Dateien für Hervorhebungsstile (*.e6h *.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Die Hervorhebungsstile konnten nicht von der Datei <b>{0}</b> gelesen werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation>Unterstil löschen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation><p>Soll der Unterstil <b>{0}</b> wirklich gelöscht werden?</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation>{0} - Kopie</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation>Unterstile auf Standardwerte setzen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation><p>Sollen wirklich alle definierten Unterstile von <b>{0}</b> auf Standardwerte zurückgesetzt werden?</p></translation> </message> @@ -15363,22 +15374,22 @@ <translation>Alle auf Standardwert</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation>Auf Standard zurücksetzen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation>Soll die aktuelle Schlüsselwortliste wirklich auf Standardwert zurückgesetzt werden?</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation>Alle auf Standardwert setzen</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation>Sollen wirklich alle Schlüsselwortlisten der aktuellen Sprache auf Standardwerte zurückgesetzt werden?</translation> </message> @@ -16773,6 +16784,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation>Allgemein</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation>Spaltenvordergrund:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation>Wähle die Textfarbe der Ränder</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation>Spaltenhintergrund:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation>Wähle die Hintergrundfarbe der Ränder</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation>Zeilennummernspalte</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation>Wähle aus, ob die Zeilennummernspalte angezeigt werden soll.</translation> </message> @@ -16783,6 +16824,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation>Drücken, um den Font für die Zeilennummern des Editors zu wählen</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation>Zeilennummernfont</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation>2345</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation>Faltungsspalte</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation>Wähle aus, ob die Faltungsspalte angezeigt werden soll.</translation> </message> @@ -16853,16 +16914,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation>Faltmarkenvordergrund:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation>Wähle die Textfarbe der Ränder</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation>Hintergrund der Faltungsspalte:</translation> </message> @@ -16873,8 +16924,8 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> - <translation>Spaltenhintergrund:</translation> + <source>Foldmarkers foreground:</source> + <translation>Faltmarkenvordergrund:</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> @@ -16883,16 +16934,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation>Spaltenvordergrund:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation>Wähle die Hintergrundfarbe der Ränder</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation>Faltmarkenhintergrund:</translation> </message> @@ -16903,21 +16944,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation>Drücken, um den Font für die Zeilennummern des Editors zu wählen</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation>Zeilennummernfont</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation>2345</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation>Auswahl</translation> </message>
--- a/src/eric7/i18n/eric7_empty.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_empty.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7624,7 +7624,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7739,6 +7739,7 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7773,6 +7774,7 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7787,6 +7789,7 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7809,11 +7812,14 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7827,11 +7833,13 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -7844,18 +7852,21 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -7899,7 +7910,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -7940,28 +7951,28 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> - <source>Please select an entry of the list -to display the configuration page.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <source>Please select an entry of the list +to display the configuration page.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished" /> </message> @@ -14821,12 +14832,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation type="unfinished" /> </message> @@ -14990,7 +15001,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation type="unfinished" /> @@ -15124,74 +15135,74 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation type="unfinished" /> </message> @@ -15272,22 +15283,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation type="unfinished" /> </message> @@ -16681,6 +16692,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation type="unfinished" /> </message> @@ -16691,6 +16732,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation type="unfinished" /> </message> @@ -16761,16 +16822,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation type="unfinished" /> </message> @@ -16781,7 +16832,7 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> + <source>Foldmarkers foreground:</source> <translation type="unfinished" /> </message> <message> @@ -16791,16 +16842,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation type="unfinished" /> </message> @@ -16811,21 +16852,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_en.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_en.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7633,7 +7633,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7748,6 +7748,7 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7782,6 +7783,7 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7796,6 +7798,7 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7818,11 +7821,14 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7836,11 +7842,13 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -7853,18 +7861,21 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -7908,7 +7919,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -7949,28 +7960,28 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> - <source>Please select an entry of the list -to display the configuration page.</source> - <translation type="unfinished" /> - </message> - <message> <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <source>Please select an entry of the list +to display the configuration page.</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished" /> </message> @@ -14837,12 +14848,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation type="unfinished" /> </message> @@ -15006,7 +15017,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation type="unfinished" /> @@ -15140,74 +15151,74 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation type="unfinished" /> </message> @@ -15288,22 +15299,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation type="unfinished" /> </message> @@ -16697,6 +16708,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation type="unfinished" /> </message> @@ -16707,6 +16748,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation type="unfinished" /> </message> @@ -16777,16 +16838,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation type="unfinished" /> </message> @@ -16797,7 +16848,7 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> + <source>Foldmarkers foreground:</source> <translation type="unfinished" /> </message> <message> @@ -16807,16 +16858,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation type="unfinished" /> </message> @@ -16827,21 +16868,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation type="unfinished" /> </message>
--- a/src/eric7/i18n/eric7_es.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_es.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7678,7 +7678,7 @@ <translation>Editor Hexadecimal</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7793,6 +7793,7 @@ <translation>Depurador</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7827,6 +7828,7 @@ <translation>Gestión de archivos</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7841,6 +7843,7 @@ <translation>Corrección ortográfica</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7863,11 +7866,14 @@ <translation>Exportadores</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7881,11 +7887,13 @@ <translation>Jedi</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation>Consejos de llamada (calltips)</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -7898,18 +7906,21 @@ <translation>Asociación de tipos de archivo</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation>Estilos</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation>Palabras clave</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -7953,7 +7964,7 @@ <translation>Multiproyecto</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -7994,29 +8005,29 @@ <translation>Interfaz de VirusTotal</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation>Introducir texto de búsqueda...</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation>Preferencias</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Por favor, seleccione una entrada de la lista para visualizar la página de configuración.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation>Error de Configuración de Página</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>La página de configuración <b>{0}</b> no puede ser cargada.</p></translation> </message> @@ -14909,12 +14920,12 @@ <translation>El cursor se puede mover dentro del espacio virtual</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation>Sobreescritura de Tabulación e Indentación</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation>¿Desea eliminar las entradas seleccionadas?</translation> </message> @@ -15078,7 +15089,7 @@ <translation>Selecciona llenar hasta el fin de la línea.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation>Llenar hasta el final de la línea</translation> @@ -15212,74 +15223,74 @@ <translation>Tamaño solamente</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation>Habilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation>Deshabilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation>Selecciona llenar hasta el final de línea para todos los estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation>Exportar Estilos de Resaltado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation>Archivo de Estilos de Resaltado (*.ehj)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo de resaltados de estilo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation>Importar Estilos de Resaltado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation>Archivo de Estilos de Resaltado (*.ehj);;Archivo XML de Estilos de Resaltado (*.e6h *.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>El archivo de resaltados de estilo <b>{0}</b> no se puede leer. </p><p>Razón: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation>Borrar Subestilo</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation><p>¿Desea realmente borrar el subestilo<b>{0}</b>?</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation>{0} Copiar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation>Restablecer Subestilos por Defecto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation><p>¿Desea realmente restablecer todos los subestilos definidos de <b>{0}</b> a sus valores por defecto?</p></translation> </message> @@ -15360,22 +15371,22 @@ <translation>Todo a por Defecto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation>Restablecer a Por Defecto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation>¿Realmente desea restablecer el actual conjunto de palabras clave a su valor por defecto?</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation>Restablecer todo a Por Defecto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation>¿Realmente desea restablecer todos los conjuntos de palabras clave a su valores por defecto?</translation> </message> @@ -16770,6 +16781,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished">General</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation>Color de primer plano para márgenes:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation>Seleccionar el color de primer plano para los márgenes</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation>Color de fondo para los márgenes:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation>Seleccione el color de fondo para los márgenes</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation>Seleccionar si el margen para números de línea debe ser mostrado.</translation> </message> @@ -16780,6 +16821,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation>Pulse para seleccionar la fuente para números de línea en el editor</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation>Fuente para números de Línea</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation>2345</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation>Seleccionar si el margen de plegado debe ser mostrado.</translation> </message> @@ -16860,16 +16921,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation>Color de primer plano para marcadores de plegado:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation>Seleccionar el color de primer plano para los márgenes</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation>Color de fondo para los pliegues de los márgenes:</translation> </message> @@ -16880,8 +16931,8 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> - <translation>Color de fondo para los márgenes:</translation> + <source>Foldmarkers foreground:</source> + <translation>Color de primer plano para marcadores de plegado:</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> @@ -16890,16 +16941,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation>Color de primer plano para márgenes:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation>Seleccione el color de fondo para los márgenes</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation>Color de fondo para marcadores de plegado:</translation> </message> @@ -16910,21 +16951,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation>Pulse para seleccionar la fuente para números de línea en el editor</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation>Fuente para números de Línea</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation>2345</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation>Selección</translation> </message>
--- a/src/eric7/i18n/eric7_fr.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_fr.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7781,7 +7781,7 @@ <translation>Hex Editor</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7896,6 +7896,7 @@ <translation>Débogueur</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7930,6 +7931,7 @@ <translation>Gestion des fichiers</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7944,6 +7946,7 @@ <translation>Correction orthographique</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7966,11 +7969,14 @@ <translation>Exportation</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation>Autocomplétion</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7984,11 +7990,13 @@ <translation type="unfinished">Jedi</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation>Calltips</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -8001,18 +8009,21 @@ <translation>Types de fichiers</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation>Styles</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation>Mots-clef</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -8056,7 +8067,7 @@ <translation>Multi-projet</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -8097,29 +8108,29 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation>Entrer le texte de recherche...</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation>Préférences</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Choisir une entrée dans la liste pour afficher la page de configuration.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation>Erreur de la page de configuration</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>La page de configuration <b>{0}</b> n'a pas pu être chargée.</p></translation> </message> @@ -15064,12 +15075,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation type="unfinished" /> </message> @@ -15233,7 +15244,7 @@ <translation>Cocher pour appliquer le style jusqu'en fin de ligne.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation>Appliquer jusqu'à la fin de ligne</translation> @@ -15367,74 +15378,74 @@ <translation>Taille uniquement</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation>Activé</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation>Désactivé</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation>Sélectionner pour appliquer tous les styles jusqu'en fin de lignes</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation>Exportation des styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation>Importation des styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation>Supprimer le sous-style</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation><p>Faut-il vraiment supprimer le sous-style <b>{0}</b> ?</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation>{0} - Copie</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation>Réinitialiser les sous-styles</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation><p>Voulez-vous vraiment réinitialiser les sous-styles de <b>{0}</b> aux valeurs par défaut ?</p></translation> </message> @@ -15515,22 +15526,22 @@ <translation>Tous par défaut</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation>Remettre par défaut</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation>Faut-il remettre l'actuel mot-clef à la valeur par défaut ?</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation>Remettre tout par défaut</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation>Faut-il remettre les mots-clefs à la valeur par défaut ?</translation> </message> @@ -16925,6 +16936,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished">Général</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation>Couleur des numéros de ligne :</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation>Couleur de fond des marges :</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation>Indique si la colonne donnant les numéros de ligne doit être affichée.</translation> </message> @@ -16935,6 +16976,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation>Cliquer pour choisir une police pour les numéros de ligne</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation>Police des numéros de ligne</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation>2345</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation>Sélectionne si la marge de pliage de code doit être affichée.</translation> </message> @@ -17015,16 +17076,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation>Couleur de la marge de pliage de code :</translation> </message> @@ -17035,8 +17086,8 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> - <translation>Couleur de fond des marges :</translation> + <source>Foldmarkers foreground:</source> + <translation type="unfinished" /> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> @@ -17045,16 +17096,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation>Couleur des numéros de ligne :</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation type="unfinished" /> </message> @@ -17065,21 +17106,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation>Cliquer pour choisir une police pour les numéros de ligne</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation>Police des numéros de ligne</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation>2345</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation>Sélection</translation> </message>
--- a/src/eric7/i18n/eric7_it.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_it.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7750,7 +7750,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7865,6 +7865,7 @@ <translation>Debugger</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7899,6 +7900,7 @@ <translation>Gestione file</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7913,6 +7915,7 @@ <translation>Correzione automatica</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7935,11 +7938,14 @@ <translation>Esportatori</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation>Autocompletamento</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7953,11 +7959,13 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation>Calltips</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -7970,18 +7978,21 @@ <translation>Associazione tipi file</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation>Stili</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation>Parole chiave</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -8025,7 +8036,7 @@ <translation>Multiprogetto</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -8066,29 +8077,29 @@ <translation>Interfaccia VirusTotal</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation>Preferenze</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Selezionare un elemento della lista da mostrare nella pagina di configurazione.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation>Configurazione pagine errore</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>La pagina di configurazione <b>{0}</b> non può essere caricata.</p></translation> </message> @@ -15036,12 +15047,12 @@ <translation>Il cursore può muoversi nello Spazio Virtuale</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation type="unfinished" /> </message> @@ -15205,7 +15216,7 @@ <translation>Seleziona il riempimento di fine linea.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation>Riempi fino a fine linea</translation> @@ -15339,74 +15350,74 @@ <translation>Solo dimensione</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation>Abilitato</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation>Disabilitato</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation>Seleziona il riempimento fino a fine linea per tutti gli stili</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation>Esporta stili di evidenziazione</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation>Importa gli stili di evidenziazione</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation type="unfinished" /> </message> @@ -15487,22 +15498,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation type="unfinished" /> </message> @@ -16896,6 +16907,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished">Generale</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation>Primo piano per i margini:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation>Sfondo margini:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation>Seleziona nel caso il margine per i numeri di linea debba essere mostrato.</translation> </message> @@ -16906,6 +16947,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation>Premi per selezionare il font per i numeri di linea dell'editor</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation>Font Numeri linea</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation>2345</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation>Seleziona se il margine per la compressione deve essere mostrato.</translation> </message> @@ -16986,16 +17047,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation>Foldmarkers in primo piano:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation>Sfondo margine di compressione:</translation> </message> @@ -17006,8 +17057,8 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> - <translation>Sfondo margini:</translation> + <source>Foldmarkers foreground:</source> + <translation>Foldmarkers in primo piano:</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> @@ -17016,16 +17067,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation>Primo piano per i margini:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation>Foldmarkers in secondo piano:</translation> </message> @@ -17036,21 +17077,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation>Premi per selezionare il font per i numeri di linea dell'editor</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation>Font Numeri linea</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation>2345</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation>Selezione</translation> </message>
--- a/src/eric7/i18n/eric7_pt.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_pt.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7765,7 +7765,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7880,6 +7880,7 @@ <translation>Depurador</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7914,6 +7915,7 @@ <translation>Tratamento de Ficheiros</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7928,6 +7930,7 @@ <translation>Verificação ortográfica</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7950,11 +7953,14 @@ <translation>Exportadores</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation>Autocompletar</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7968,11 +7974,13 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation>Dicas</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -7985,18 +7993,21 @@ <translation>Associações de Tipos de Ficheiros</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation>Estilos</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation>Palavras Chave</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -8040,7 +8051,7 @@ <translation>Multiprojeto</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -8081,29 +8092,29 @@ <translation>Interface de VirusTotal</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation>Preferências</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Por favor selecione uma entrada da lista para mostrar a página de configuração.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation>Erro na Página de Configuração</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>A página de configuração <b>{0}</b> não pôde ser carregada.</p></translation> </message> @@ -15055,12 +15066,12 @@ <translation>Cursor pode mover-se dentro do espaço virtual</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation type="unfinished" /> </message> @@ -15224,7 +15235,7 @@ <translation>Selecionar preenchimento até ao fim de linha.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation>Preencher até fim de linha</translation> @@ -15358,74 +15369,74 @@ <translation>Apenas Tamanho</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation>Habilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation>Inabilitado</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation>Selecionar encher até ao fim de linha para todos os estilos</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation>Exportar Estilos de Realce</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation>Importar Estilos de Realce</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation type="unfinished" /> </message> @@ -15506,22 +15517,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation type="unfinished" /> </message> @@ -16915,6 +16926,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished">Geral</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation>Texto das Margens:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation>Fundo de Margens:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation>Selecionar para mostrar os números das linhas.</translation> </message> @@ -16925,6 +16966,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation>Pressionar para selecionar o tipo de letra dos números das linhas do editor</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation>Letra dos Números de Linha</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation>2345</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation>Selecionar para mostrar a margem do dobrado.</translation> </message> @@ -17005,16 +17066,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation>Marcadores de Dobrado:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation>Fundo da Margem de Dobrado:</translation> </message> @@ -17025,8 +17076,8 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> - <translation>Fundo de Margens:</translation> + <source>Foldmarkers foreground:</source> + <translation>Marcadores de Dobrado:</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> @@ -17035,16 +17086,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation>Texto das Margens:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation>Fundo de marcadores de dobrado:</translation> </message> @@ -17055,21 +17096,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation>Pressionar para selecionar o tipo de letra dos números das linhas do editor</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation>Letra dos Números de Linha</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation>2345</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation>Seleção</translation> </message>
--- a/src/eric7/i18n/eric7_ru.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_ru.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7691,7 +7691,7 @@ <translation>Hex-редактор</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7806,6 +7806,7 @@ <translation>Отладка</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7840,6 +7841,7 @@ <translation>Работа с файлами</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7854,6 +7856,7 @@ <translation>Проверка орфографии</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7876,11 +7879,14 @@ <translation>Экспортёры</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation>Автодополнение</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7894,11 +7900,13 @@ <translation>Jedi</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation>Подсказки</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -7911,18 +7919,21 @@ <translation>Ассоциации типов файлов</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation>Стили</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation>Ключевые слова</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -7966,7 +7977,7 @@ <translation>Мультипроект</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -8007,29 +8018,29 @@ <translation>Интерфейс VirusTotal</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation>Введите искомый текст...</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation>Предпочтения</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Выберите пункт в списке слева для отображения страницы его настроек.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation>Ошибка страницы конфигурации</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>Страница конфигурации <b>{0}</b> не может быть загружена.</p></translation> </message> @@ -14948,12 +14959,12 @@ <translation>Курсор может заходить в виртуальное пространство</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation>Переопределение табуляции и отступа</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation>Действительно ли выбранные записи должны быть удалены?</translation> </message> @@ -15117,7 +15128,7 @@ <translation>Разрешить заливку фона до конца строки.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation>Заливка до конца строки</translation> @@ -15251,74 +15262,74 @@ <translation>Только размер</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation>Разрешена</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation>Отключена</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation>Заливка до конца строки для всех стилей</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation>Экспорт стилей подсветки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation>Файл стилей подсветки (*.ehj)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл стилей подсветки <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation>Импорт стилей подсветки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation>Файл стилей подсветки (*.ehj);;XML-файл стилей подсветки (*.e6h *.e4h)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл стилей подсветки <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation>Удалить подстиль</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation><p>Действительно ли подстиль <b>{0}</b> должен быть удален?</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation>{0} - Copy</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation>Сбросить подстили к значениям по умолчанию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation><p>Вы действительно хотите сбросить все определенные подстили <b>{0}</b> к значениям по умолчанию? </ p></translation> </message> @@ -15399,22 +15410,22 @@ <translation>Все к значениям по умолчанию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation>Сбросить к значениям по умолчанию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation>Действительно ли текущий набор ключевых слов должен быть сброшен к значениям по умолчанию?</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation>Сбросить все к значениям по умолчанию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation>Действительно ли все наборы ключевых слов текущего языка должны быть сброшены к значениям по умолчанию?</translation> </message> @@ -16809,6 +16820,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished">Основные параметры</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation>Цвет панелей:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation>Выберите цвет боковых панелей</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation>Цвет фона панелей:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation>Выберите цвет фона боковых панелей</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation>Разрешить показывать панель номеров строк.</translation> </message> @@ -16819,6 +16860,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation>Задайте шрифт номеров строк редактора</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation>Шрифт номеров строк</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation>2345</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation>Разрешить показывать панель свёрток.</translation> </message> @@ -16899,16 +16960,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation>Цвет маркеров свертки:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation>Выберите цвет боковых панелей</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation>Цвет фона панели свертки:</translation> </message> @@ -16919,8 +16970,8 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> - <translation>Цвет фона панелей:</translation> + <source>Foldmarkers foreground:</source> + <translation>Цвет маркеров свертки:</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> @@ -16929,16 +16980,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation>Цвет панелей:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation>Выберите цвет фона боковых панелей</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation>Цвет фона маркеров свертки:</translation> </message> @@ -16949,21 +16990,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation>Задайте шрифт номеров строк редактора</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation>Шрифт номеров строк</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation>2345</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation>Выделение</translation> </message>
--- a/src/eric7/i18n/eric7_tr.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_tr.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7727,7 +7727,7 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7842,6 +7842,7 @@ <translation>Hata Ayıklayıcı</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7876,6 +7877,7 @@ <translation>Dosyaişleme</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7890,6 +7892,7 @@ <translation>Yazım Kontrolü</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7912,11 +7915,14 @@ <translation>Dışaaktarım</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation>Otomatik tamamlama</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7930,11 +7936,13 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation>İpuçları</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -7947,18 +7955,21 @@ <translation>Dosyatipi Birleştirme</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation>Stiller</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation>Anahtar Sözcükler</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -8002,7 +8013,7 @@ <translation>Çokluproje</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -8043,29 +8054,29 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation>Seçenekler</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>Lütfen ayarlama sayfasını göstermek için gelen listeyi seçiniz.</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation>Ayarlama Sayfası Hatası</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>TAyarlama sayfası <b>{0}</b> yüklenemiyor.</p></translation> </message> @@ -14990,12 +15001,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation type="unfinished" /> </message> @@ -15159,7 +15170,7 @@ <translation>Satır sonuna kadar dolrurmak için seç.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation>Satırın sonuna kadar doldur</translation> @@ -15293,74 +15304,74 @@ <translation>Yalnızca boyut</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation>Etkinleştirilmiş</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation>Onaylanmamış</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation>Tüm stiller için satır sonunu doldurmayı seç</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation>Vurgulama stillerini dışa aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation>Vurgulama stillerini içe aktar</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation type="unfinished" /> </message> @@ -15441,22 +15452,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation type="unfinished" /> </message> @@ -16850,6 +16861,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished">Genel</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation>Önalan sınırları:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation>Arkaalan sınırları:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation>Satır numaralarının gösterilip gösterilmeyeceğini seç.</translation> </message> @@ -16860,6 +16901,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation>Satır Numaralarının Yazı Tipi</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation>2345</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation>katlama sınırının gösterilip göbterilmeyeceğini seçiniz.</translation> </message> @@ -16930,16 +16991,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation type="unfinished" /> </message> @@ -16950,8 +17001,8 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> - <translation>Arkaalan sınırları:</translation> + <source>Foldmarkers foreground:</source> + <translation type="unfinished" /> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> @@ -16960,16 +17011,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation>Önalan sınırları:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation type="unfinished" /> </message> @@ -16980,21 +17021,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation>Satır Numaralarının Yazı Tipi</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation>2345</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation>Seçim</translation> </message>
--- a/src/eric7/i18n/eric7_zh_CN.ts Tue Jul 25 13:14:27 2023 +0200 +++ b/src/eric7/i18n/eric7_zh_CN.ts Tue Jul 25 16:41:52 2023 +0200 @@ -7783,7 +7783,7 @@ <translation type="unfinished">十六进制编辑器</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="982" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1059" /> <location filename="../Preferences/ConfigurationDialog.py" line="950" /> <location filename="../Preferences/ConfigurationDialog.py" line="919" /> <location filename="../Preferences/ConfigurationDialog.py" line="888" /> @@ -7898,6 +7898,7 @@ <translation>调试器</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="971" /> <location filename="../Preferences/ConfigurationDialog.py" line="673" /> <location filename="../Preferences/ConfigurationDialog.py" line="380" /> <location filename="../Preferences/ConfigurationDialog.py" line="345" /> @@ -7932,6 +7933,7 @@ <translation>文件处理</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="978" /> <location filename="../Preferences/ConfigurationDialog.py" line="687" /> <location filename="../Preferences/ConfigurationDialog.py" line="394" /> <source>Searching</source> @@ -7946,6 +7948,7 @@ <translation>拼写检查</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="985" /> <location filename="../Preferences/ConfigurationDialog.py" line="701" /> <location filename="../Preferences/ConfigurationDialog.py" line="408" /> <source>Style</source> @@ -7968,11 +7971,14 @@ <translation>输出器</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="992" /> <location filename="../Preferences/ConfigurationDialog.py" line="436" /> <source>Autocompletion</source> <translation>自动完成</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1013" /> + <location filename="../Preferences/ConfigurationDialog.py" line="999" /> <location filename="../Preferences/ConfigurationDialog.py" line="464" /> <location filename="../Preferences/ConfigurationDialog.py" line="443" /> <source>QScintilla</source> @@ -7986,11 +7992,13 @@ <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1006" /> <location filename="../Preferences/ConfigurationDialog.py" line="457" /> <source>Calltips</source> <translation>调用提示</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1020" /> <location filename="../Preferences/ConfigurationDialog.py" line="715" /> <location filename="../Preferences/ConfigurationDialog.py" line="478" /> <source>Highlighters</source> @@ -8003,18 +8011,21 @@ <translation>文件类型关联</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1027" /> <location filename="../Preferences/ConfigurationDialog.py" line="729" /> <location filename="../Preferences/ConfigurationDialog.py" line="492" /> <source>Styles</source> <translation>风格</translation> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1034" /> <location filename="../Preferences/ConfigurationDialog.py" line="736" /> <location filename="../Preferences/ConfigurationDialog.py" line="499" /> <source>Keywords</source> <translation type="unfinished" /> </message> <message> + <location filename="../Preferences/ConfigurationDialog.py" line="1041" /> <location filename="../Preferences/ConfigurationDialog.py" line="743" /> <location filename="../Preferences/ConfigurationDialog.py" line="506" /> <source>Properties</source> @@ -8058,7 +8069,7 @@ <translation>多重项目</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="989" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1066" /> <location filename="../Preferences/ConfigurationDialog.py" line="957" /> <location filename="../Preferences/ConfigurationDialog.py" line="926" /> <location filename="../Preferences/ConfigurationDialog.py" line="895" /> @@ -8099,28 +8110,28 @@ <translation>VirusTotal 界面</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1081" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1158" /> <source>Enter search text...</source> <translation>输入搜索内容…</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1156" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1233" /> <source>Preferences</source> <translation>首选项</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1162" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> <source>Please select an entry of the list to display the configuration page.</source> <translation>请在左边选择一个列表项以显示配置页面。</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1239" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1316" /> <source>Configuration Page Error</source> <translation>配置页面错误</translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="1240" /> + <location filename="../Preferences/ConfigurationDialog.py" line="1317" /> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation><p>配置页面 <b>{0}</b> 无法载入。</p></translation> </message> @@ -15061,12 +15072,12 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="246" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="262" /> <source>Tab and Indent Override</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="247" /> + <location filename="../Preferences/ConfigurationPages/EditorGeneralPage.py" line="263" /> <source>Shall the selected entries really be removed?</source> <translation type="unfinished" /> </message> @@ -15230,7 +15241,7 @@ <translation>选择行尾填充。</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="442" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="464" /> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="0" /> <source>Fill to end of line</source> <translation>填充到行尾</translation> @@ -15364,74 +15375,74 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="438" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="460" /> <source>Enabled</source> <translation>已开启</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="439" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="461" /> <source>Disabled</source> <translation>已禁用</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="443" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="465" /> <source>Select fill to end of line for all styles</source> <translation>为所有风格选择行尾填充</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="589" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="570" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="611" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="592" /> <source>Export Highlighting Styles</source> <translation>导出高亮风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="572" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="594" /> <source>Highlighting Styles File (*.ehj)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="590" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="612" /> <source><p>The highlighting styles file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="646" /> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="617" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="668" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="639" /> <source>Import Highlighting Styles</source> <translation>导入高亮风格</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="619" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="641" /> <source>Highlighting Styles File (*.ehj);;XML Highlighting Styles File (*.e6h *.e4h)</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="647" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="669" /> <source><p>The highlighting styles file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="786" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="808" /> <source>Delete Sub-Style</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="787" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="809" /> <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="823" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="845" /> <source>{0} - Copy</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="850" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="872" /> <source>Reset Sub-Styles to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="851" /> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="873" /> <source><p>Do you really want to reset all defined sub-styles of <b>{0}</b> to the default values?</p></source> <translation type="unfinished" /> </message> @@ -15512,22 +15523,22 @@ <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="170" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="192" /> <source>Reset to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="171" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="193" /> <source>Shall the current keyword set really be reset to default values?</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="195" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="217" /> <source>Reset All to Default</source> <translation type="unfinished" /> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="196" /> + <location filename="../Preferences/ConfigurationPages/EditorKeywordsPage.py" line="218" /> <source>Shall all keyword sets of the current language really be reset to default values?</source> <translation type="unfinished" /> </message> @@ -16921,6 +16932,36 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>General</source> + <translation type="unfinished">通用</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins foreground:</source> + <translation>页边空白前景色：</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the foreground color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Margins background:</source> + <translation>页边空白背景色：</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Select the background color for the margins</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether line numbers margin should be shown.</source> <translation>选择是否显示行号。</translation> </message> @@ -16931,6 +16972,26 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Press to select the font for the editor line numbers</source> + <translation>点击为编辑器行号选择字体</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Line Numbers Font</source> + <translation>行号字体</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>2345</source> + <translation>2345</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> + <source>Fold Margin</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Select whether the fold margin should be shown.</source> <translation>选择是否显示折叠符号</translation> </message> @@ -17011,16 +17072,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Foldmarkers foreground:</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the foreground color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmargin background:</source> <translation>折叠符区域背景色：</translation> </message> @@ -17031,8 +17082,8 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins background:</source> - <translation>页边空白背景色：</translation> + <source>Foldmarkers foreground:</source> + <translation type="unfinished" /> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> @@ -17041,16 +17092,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Margins foreground:</source> - <translation>页边空白前景色：</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Select the background color for the margins</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Foldmarkers background:</source> <translation type="unfinished" /> </message> @@ -17061,21 +17102,6 @@ </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Press to select the font for the editor line numbers</source> - <translation>点击为编辑器行号选择字体</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>Line Numbers Font</source> - <translation>行号字体</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> - <source>2345</source> - <translation>2345</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="0" /> <source>Selection</source> <translation>选区</translation> </message>
