Sun, 17 Mar 2019 11:58:28 +0100
Merged with the sub_style branch.
--- a/APIs/Python3/eric6.api Sun Mar 10 19:31:06 2019 +0100 +++ b/APIs/Python3/eric6.api Sun Mar 17 11:58:28 2019 +0100 @@ -7396,22 +7396,28 @@ eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.FAMILYONLY?7 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.FONT?7 eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.SIZEONLY?7 +eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.StyleRole?7 +eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.SubstyleRole?7 +eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_addSubstyleButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_allDefaultButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_allEolFillButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_backgroundButton_clicked?4() +eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_copySubstyleButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_defaultButton_clicked?4() -eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_eolfillCheckBox_toggled?4(on) +eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked?4() +eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_editSubstyleButton_clicked?4() +eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_eolfillCheckBox_clicked?4(on) eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_exportAllButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_exportCurrentButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_foregroundButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_importAllButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_importCurrentButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_lexerLanguageComboBox_activated?4(language) -eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_styleElementList_currentRowChanged?4(index) +eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.on_styleElementList_currentItemChanged?4(current, previous) eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.save?4() eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.saveState?4() -eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setFont?4(style, familyOnly, sizeOnly) +eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setFont?4(style, substyle, familyOnly, sizeOnly) eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setSampleFont?4(familyOnly, sizeOnly) eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage.setState?4(state) eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.EditorHighlightingStylesPage?1(lexers) @@ -7642,20 +7648,31 @@ eric6.Preferences.MouseClickDialog.MouseClickDialog.getClick?4() eric6.Preferences.MouseClickDialog.MouseClickDialog.on_clearButton_clicked?4() eric6.Preferences.MouseClickDialog.MouseClickDialog?1(modifiers, button, parent=None) -eric6.Preferences.PreferencesLexer.PreferencesLexer.color?4(style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.defaulEolFill?4(style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultColor?4(style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultFont?4(style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultPaper?4(style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.description?4(style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.eolFill?4(style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.font?4(style) +eric6.Preferences.PreferencesLexer.PreferencesLexer.addSubstyle?4(style) +eric6.Preferences.PreferencesLexer.PreferencesLexer.color?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultColor?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultDescription?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultEolFill?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultFont?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultPaper?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.defaultWords?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.delSubstyle?4(style, substyle) +eric6.Preferences.PreferencesLexer.PreferencesLexer.description?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.eolFill?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.font?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.getStyles?4() +eric6.Preferences.PreferencesLexer.PreferencesLexer.hasStyle?4(style, substyle) +eric6.Preferences.PreferencesLexer.PreferencesLexer.isBaseStyle?4(style) eric6.Preferences.PreferencesLexer.PreferencesLexer.language?4() -eric6.Preferences.PreferencesLexer.PreferencesLexer.paper?4(style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.setColor?4(c, style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.setEolFill?4(eolfill, style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.setFont?4(f, style) -eric6.Preferences.PreferencesLexer.PreferencesLexer.setPaper?4(c, style) +eric6.Preferences.PreferencesLexer.PreferencesLexer.paper?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.setColor?4(c, style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.setDescription?4(description, style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.setEolFill?4(eolfill, style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.setFont?4(f, style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.setPaper?4(c, style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.setWords?4(words, style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.words?4(style, substyle=-1) +eric6.Preferences.PreferencesLexer.PreferencesLexer.writeSettings?4() eric6.Preferences.PreferencesLexer.PreferencesLexer?1(language, parent=None) eric6.Preferences.PreferencesLexer.PreferencesLexerError?1() eric6.Preferences.PreferencesLexer.PreferencesLexerLanguageError?1(language) @@ -7730,6 +7747,12 @@ eric6.Preferences.ShortcutsDialog.ShortcutsDialog.populate?4(helpViewer=None) eric6.Preferences.ShortcutsDialog.ShortcutsDialog.updateShortcuts?7 eric6.Preferences.ShortcutsDialog.ShortcutsDialog?1(parent=None) +eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog.getData?4() +eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog.on_defaultButton_clicked?4() +eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog.on_descriptionEdit_textChanged?4(txt) +eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog.on_resetButton_clicked?4() +eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog.on_wordsEdit_textChanged?4() +eric6.Preferences.SubstyleDefinitionDialog.SubstyleDefinitionDialog?1(lexer, style, substyle, parent=None) eric6.Preferences.ToolConfigurationDialog.ToolConfigurationDialog.getToollist?4() eric6.Preferences.ToolConfigurationDialog.ToolConfigurationDialog.on_addButton_clicked?4() eric6.Preferences.ToolConfigurationDialog.ToolConfigurationDialog.on_argumentsEdit_textChanged?4(text) @@ -8715,6 +8738,7 @@ eric6.QScintilla.Lexers.Lexer.Lexer.canStreamComment?4() eric6.QScintilla.Lexers.Lexer.Lexer.commentStr?4() eric6.QScintilla.Lexers.Lexer.Lexer.hasSmartIndent?4() +eric6.QScintilla.Lexers.Lexer.Lexer.hasSubstyles?4() eric6.QScintilla.Lexers.Lexer.Lexer.initProperties?4() eric6.QScintilla.Lexers.Lexer.Lexer.isCommentStyle?4(style) eric6.QScintilla.Lexers.Lexer.Lexer.isStringStyle?4(style) @@ -8996,6 +9020,36 @@ eric6.QScintilla.Lexers.LexerYAML.LexerYAML.isCommentStyle?4(style) eric6.QScintilla.Lexers.LexerYAML.LexerYAML.isStringStyle?4(style) eric6.QScintilla.Lexers.LexerYAML.LexerYAML?1(parent=None) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.addSubstyle?4(style) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.delSubstyle?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.getBaseStyles?4() +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.hasSubstyle?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.hasSubstyles?4() +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.isBaseStyle?4(style) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.loadDefaultSubStyles?4() +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.loadSubstyles?4() +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.readSubstyles?4(editor) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstyleColor?4(color, style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstyleDescription?4(description, style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstyleEolFill?4(eolFill, style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstyleFont?4(font, style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstylePaper?4(color, style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.setSubstyleWords?4(words, style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleColor?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultColor?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultDescription?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultEolFill?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultFont?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultPaper?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDefaultWords?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleDescription?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleEolFill?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleFont?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substylePaper?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substyleWords?4(style, substyle) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.substylesCount?4(style) +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer.writeSubstyles?4() +eric6.QScintilla.Lexers.SubstyledLexer.SubstyledLexer?1() eric6.QScintilla.Lexers.getDefaultLexerAssociations?4() eric6.QScintilla.Lexers.getLanguageIcon?4(language, pixmap) eric6.QScintilla.Lexers.getLexer?4(language, parent=None, pyname="") @@ -9182,7 +9236,8 @@ eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.extendSelectionToEOL?4() eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.extendSelectionWordLeft?4() eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.extendSelectionWordRight?4() -eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findFirstTarget?4(expr_, re_, cs_, wo_, begline=-1, begindex=-1, endline=-1, endindex=-1, ws_=False) +eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findFirst?4(expression, regexp, caseSensitive, word, wrap, forward=True, line=-1, index=-1, show=True, posix=False, cxx11=False) +eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findFirstTarget?4(expr_, re_, cs_, wo_, begline=-1, begindex=-1, endline=-1, endindex=-1, ws_=False, posix=False, cxx11=False) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.findNextTarget?4() eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.flashFindIndicator?4(sline, sindex, eline, eindex) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.focusOutEvent?4(event) @@ -9251,6 +9306,7 @@ eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setRectangularSelection?4(startLine, startIndex, endLine, endIndex) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setStyling?4(length, style) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setVirtualSpaceOptions?4(options) +eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setWrapStartIndent?4(indent) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showFindIndicator?4(sline, sindex, eline, eindex) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showUserList?4(listId, lst) eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.startStyling?4(pos, mask)
--- a/APIs/Python3/eric6.bas Sun Mar 10 19:31:06 2019 +0100 +++ b/APIs/Python3/eric6.bas Sun Mar 17 11:58:28 2019 +0100 @@ -558,7 +558,7 @@ LexerBash Lexer QsciLexerBash LexerBatch Lexer QsciLexerBatch LexerCMake Lexer QsciLexerCMake -LexerCPP Lexer QsciLexerCPP +LexerCPP QsciLexerCPP SubstyledLexer LexerCSS Lexer QsciLexerCSS LexerCSharp Lexer QsciLexerCSharp LexerCoffeeScript Lexer QsciLexerCoffeeScript @@ -584,7 +584,7 @@ LexerPostScript Lexer QsciLexerPostScript LexerProperties Lexer QsciLexerProperties LexerPygments LexerContainer -LexerPython Lexer QsciLexerPython +LexerPython QsciLexerPython SubstyledLexer LexerQSS Lexer QsciLexerCSS LexerRuby Lexer QsciLexerRuby LexerSQL Lexer QsciLexerSQL @@ -705,7 +705,7 @@ PluginUninstallWidget QWidget Ui_PluginUninstallDialog PluginUninstallWindow E5MainWindow PluginWizardDialog QDialog Ui_PluginWizardDialog -PreferencesLexer QsciLexer +PreferencesLexer QObject PreferencesLexerError Exception PreferencesLexerLanguageError PreferencesLexerError PreviewProcessingThread QThread @@ -863,6 +863,8 @@ StatusMonitorLedWidget QWidget Strip HgExtension StripProjectHelper HgExtensionProjectHelper +SubstyleDefinitionDialog QDialog Ui_SubstyleDefinitionDialog +SubstyledLexer Lexer Subversion VersionControl SubversionPage ConfigurationPageBase Ui_SubversionPage SvgDiagram E5MainWindow
--- a/DTDs/HighlightingStyles-4.3.dtd Sun Mar 10 19:31:06 2019 +0100 +++ b/DTDs/HighlightingStyles-4.3.dtd Sun Mar 17 11:58:28 2019 +0100 @@ -1,4 +1,4 @@ -<!-- This is the DTD for eric4's highlightings styles file version 4.3 --> +<!-- This is the DTD for eric4's highlighting styles file version 4.3 --> <!ELEMENT Style (#PCDATA)> <!ATTLIST Style
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/DTDs/HighlightingStyles-6.0.dtd Sun Mar 17 11:58:28 2019 +0100 @@ -0,0 +1,23 @@ +<!-- This is the DTD for eric6's highlighting styles file version 6.0 --> + +<!ELEMENT Description (#PCDATA)> + +<!ELEMENT Words (#PCDATA)> + +<!ELEMENT Style (Description, + Words?)> +<!ATTLIST Style + style CDATA #REQUIRED + substyle CDATA #REQUIRED + color CDATA #REQUIRED + paper CDATA #REQUIRED + font CDATA #REQUIRED + eolfill CDATA #REQUIRED> + +<!ELEMENT Lexer (Style+)> +<!ATTLIST Lexer + name CDATA #REQUIRED> + +<!ELEMENT HighlightingStyles (Lexer+)> +<!ATTLIST HighlightingStyles + version CDATA #REQUIRED>
--- a/Documentation/Help/source.qhp Sun Mar 10 19:31:06 2019 +0100 +++ b/Documentation/Help/source.qhp Sun Mar 17 11:58:28 2019 +0100 @@ -970,6 +970,7 @@ <section title="eric6.Preferences.ShortcutDialog" ref="eric6.Preferences.ShortcutDialog.html" /> <section title="eric6.Preferences.Shortcuts" ref="eric6.Preferences.Shortcuts.html" /> <section title="eric6.Preferences.ShortcutsDialog" ref="eric6.Preferences.ShortcutsDialog.html" /> + <section title="eric6.Preferences.SubstyleDefinitionDialog" ref="eric6.Preferences.SubstyleDefinitionDialog.html" /> <section title="eric6.Preferences.ToolConfigurationDialog" ref="eric6.Preferences.ToolConfigurationDialog.html" /> <section title="eric6.Preferences.ToolGroupConfigurationDialog" ref="eric6.Preferences.ToolGroupConfigurationDialog.html" /> <section title="eric6.Preferences.ViewProfileDialog" ref="eric6.Preferences.ViewProfileDialog.html" /> @@ -1064,6 +1065,7 @@ <section title="eric6.QScintilla.Lexers.LexerVHDL" ref="eric6.QScintilla.Lexers.LexerVHDL.html" /> <section title="eric6.QScintilla.Lexers.LexerXML" ref="eric6.QScintilla.Lexers.LexerXML.html" /> <section title="eric6.QScintilla.Lexers.LexerYAML" ref="eric6.QScintilla.Lexers.LexerYAML.html" /> + <section title="eric6.QScintilla.Lexers.SubstyledLexer" ref="eric6.QScintilla.Lexers.SubstyledLexer.html" /> <section title="eric6.QScintilla.Lexers.__init__" ref="eric6.QScintilla.Lexers.__init__.html" /> </section> <section title="eric6.QScintilla.MarkupProviders" ref="index-eric6.QScintilla.MarkupProviders.html"> @@ -5829,24 +5831,31 @@ <keyword name="EditorHighlightingStylesPage (Module)" id="EditorHighlightingStylesPage (Module)" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html" /> <keyword name="EditorHighlightingStylesPage.__allFontsButtonMenuTriggered" id="EditorHighlightingStylesPage.__allFontsButtonMenuTriggered" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__allFontsButtonMenuTriggered" /> <keyword name="EditorHighlightingStylesPage.__changeFont" id="EditorHighlightingStylesPage.__changeFont" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__changeFont" /> + <keyword name="EditorHighlightingStylesPage.__currentStyles" id="EditorHighlightingStylesPage.__currentStyles" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__currentStyles" /> <keyword name="EditorHighlightingStylesPage.__exportStyles" id="EditorHighlightingStylesPage.__exportStyles" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__exportStyles" /> <keyword name="EditorHighlightingStylesPage.__fontButtonMenuTriggered" id="EditorHighlightingStylesPage.__fontButtonMenuTriggered" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__fontButtonMenuTriggered" /> <keyword name="EditorHighlightingStylesPage.__importStyles" id="EditorHighlightingStylesPage.__importStyles" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__importStyles" /> <keyword name="EditorHighlightingStylesPage.__setToDefault" id="EditorHighlightingStylesPage.__setToDefault" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__setToDefault" /> <keyword name="EditorHighlightingStylesPage.__styleAllItems" id="EditorHighlightingStylesPage.__styleAllItems" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__styleAllItems" /> + <keyword name="EditorHighlightingStylesPage.__styleOneItem" id="EditorHighlightingStylesPage.__styleOneItem" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__styleOneItem" /> + <keyword name="EditorHighlightingStylesPage.__stylesForItem" id="EditorHighlightingStylesPage.__stylesForItem" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.__stylesForItem" /> + <keyword name="EditorHighlightingStylesPage.on_addSubstyleButton_clicked" id="EditorHighlightingStylesPage.on_addSubstyleButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_addSubstyleButton_clicked" /> <keyword name="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" id="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" /> <keyword name="EditorHighlightingStylesPage.on_allDefaultButton_clicked" id="EditorHighlightingStylesPage.on_allDefaultButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_allDefaultButton_clicked" /> <keyword name="EditorHighlightingStylesPage.on_allEolFillButton_clicked" id="EditorHighlightingStylesPage.on_allEolFillButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_allEolFillButton_clicked" /> <keyword name="EditorHighlightingStylesPage.on_backgroundButton_clicked" id="EditorHighlightingStylesPage.on_backgroundButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_backgroundButton_clicked" /> + <keyword name="EditorHighlightingStylesPage.on_copySubstyleButton_clicked" id="EditorHighlightingStylesPage.on_copySubstyleButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_copySubstyleButton_clicked" /> <keyword name="EditorHighlightingStylesPage.on_defaultButton_clicked" id="EditorHighlightingStylesPage.on_defaultButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_defaultButton_clicked" /> - <keyword name="EditorHighlightingStylesPage.on_eolfillCheckBox_toggled" id="EditorHighlightingStylesPage.on_eolfillCheckBox_toggled" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_eolfillCheckBox_toggled" /> + <keyword name="EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked" id="EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked" /> + <keyword name="EditorHighlightingStylesPage.on_editSubstyleButton_clicked" id="EditorHighlightingStylesPage.on_editSubstyleButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_editSubstyleButton_clicked" /> + <keyword name="EditorHighlightingStylesPage.on_eolfillCheckBox_clicked" id="EditorHighlightingStylesPage.on_eolfillCheckBox_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_eolfillCheckBox_clicked" /> <keyword name="EditorHighlightingStylesPage.on_exportAllButton_clicked" id="EditorHighlightingStylesPage.on_exportAllButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_exportAllButton_clicked" /> <keyword name="EditorHighlightingStylesPage.on_exportCurrentButton_clicked" id="EditorHighlightingStylesPage.on_exportCurrentButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_exportCurrentButton_clicked" /> <keyword name="EditorHighlightingStylesPage.on_foregroundButton_clicked" id="EditorHighlightingStylesPage.on_foregroundButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_foregroundButton_clicked" /> <keyword name="EditorHighlightingStylesPage.on_importAllButton_clicked" id="EditorHighlightingStylesPage.on_importAllButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_importAllButton_clicked" /> <keyword name="EditorHighlightingStylesPage.on_importCurrentButton_clicked" id="EditorHighlightingStylesPage.on_importCurrentButton_clicked" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_importCurrentButton_clicked" /> <keyword name="EditorHighlightingStylesPage.on_lexerLanguageComboBox_activated" id="EditorHighlightingStylesPage.on_lexerLanguageComboBox_activated" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_lexerLanguageComboBox_activated" /> - <keyword name="EditorHighlightingStylesPage.on_styleElementList_currentRowChanged" id="EditorHighlightingStylesPage.on_styleElementList_currentRowChanged" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_styleElementList_currentRowChanged" /> + <keyword name="EditorHighlightingStylesPage.on_styleElementList_currentItemChanged" id="EditorHighlightingStylesPage.on_styleElementList_currentItemChanged" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.on_styleElementList_currentItemChanged" /> <keyword name="EditorHighlightingStylesPage.save" id="EditorHighlightingStylesPage.save" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.save" /> <keyword name="EditorHighlightingStylesPage.saveState" id="EditorHighlightingStylesPage.saveState" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.saveState" /> <keyword name="EditorHighlightingStylesPage.setFont" id="EditorHighlightingStylesPage.setFont" ref="eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html#EditorHighlightingStylesPage.setFont" /> @@ -10698,6 +10707,7 @@ <keyword name="Lexer.canStreamComment" id="Lexer.canStreamComment" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.canStreamComment" /> <keyword name="Lexer.commentStr" id="Lexer.commentStr" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.commentStr" /> <keyword name="Lexer.hasSmartIndent" id="Lexer.hasSmartIndent" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.hasSmartIndent" /> + <keyword name="Lexer.hasSubstyles" id="Lexer.hasSubstyles" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.hasSubstyles" /> <keyword name="Lexer.initProperties" id="Lexer.initProperties" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.initProperties" /> <keyword name="Lexer.isCommentStyle" id="Lexer.isCommentStyle" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.isCommentStyle" /> <keyword name="Lexer.isStringStyle" id="Lexer.isStringStyle" ref="eric6.QScintilla.Lexers.Lexer.html#Lexer.isStringStyle" /> @@ -12683,20 +12693,31 @@ <keyword name="PreferencesLexer" id="PreferencesLexer" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer" /> <keyword name="PreferencesLexer (Constructor)" id="PreferencesLexer (Constructor)" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.__init__" /> <keyword name="PreferencesLexer (Module)" id="PreferencesLexer (Module)" ref="eric6.Preferences.PreferencesLexer.html" /> + <keyword name="PreferencesLexer.addSubstyle" id="PreferencesLexer.addSubstyle" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.addSubstyle" /> <keyword name="PreferencesLexer.color" id="PreferencesLexer.color" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.color" /> - <keyword name="PreferencesLexer.defaulEolFill" id="PreferencesLexer.defaulEolFill" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaulEolFill" /> <keyword name="PreferencesLexer.defaultColor" id="PreferencesLexer.defaultColor" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultColor" /> + <keyword name="PreferencesLexer.defaultDescription" id="PreferencesLexer.defaultDescription" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultDescription" /> + <keyword name="PreferencesLexer.defaultEolFill" id="PreferencesLexer.defaultEolFill" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultEolFill" /> <keyword name="PreferencesLexer.defaultFont" id="PreferencesLexer.defaultFont" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultFont" /> <keyword name="PreferencesLexer.defaultPaper" id="PreferencesLexer.defaultPaper" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultPaper" /> + <keyword name="PreferencesLexer.defaultWords" id="PreferencesLexer.defaultWords" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.defaultWords" /> + <keyword name="PreferencesLexer.delSubstyle" id="PreferencesLexer.delSubstyle" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.delSubstyle" /> <keyword name="PreferencesLexer.description" id="PreferencesLexer.description" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.description" /> <keyword name="PreferencesLexer.eolFill" id="PreferencesLexer.eolFill" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.eolFill" /> <keyword name="PreferencesLexer.font" id="PreferencesLexer.font" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.font" /> + <keyword name="PreferencesLexer.getStyles" id="PreferencesLexer.getStyles" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.getStyles" /> + <keyword name="PreferencesLexer.hasStyle" id="PreferencesLexer.hasStyle" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.hasStyle" /> + <keyword name="PreferencesLexer.isBaseStyle" id="PreferencesLexer.isBaseStyle" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.isBaseStyle" /> <keyword name="PreferencesLexer.language" id="PreferencesLexer.language" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.language" /> <keyword name="PreferencesLexer.paper" id="PreferencesLexer.paper" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.paper" /> <keyword name="PreferencesLexer.setColor" id="PreferencesLexer.setColor" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setColor" /> + <keyword name="PreferencesLexer.setDescription" id="PreferencesLexer.setDescription" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setDescription" /> <keyword name="PreferencesLexer.setEolFill" id="PreferencesLexer.setEolFill" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setEolFill" /> <keyword name="PreferencesLexer.setFont" id="PreferencesLexer.setFont" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setFont" /> <keyword name="PreferencesLexer.setPaper" id="PreferencesLexer.setPaper" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setPaper" /> + <keyword name="PreferencesLexer.setWords" id="PreferencesLexer.setWords" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.setWords" /> + <keyword name="PreferencesLexer.words" id="PreferencesLexer.words" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.words" /> + <keyword name="PreferencesLexer.writeSettings" id="PreferencesLexer.writeSettings" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexer.writeSettings" /> <keyword name="PreferencesLexerError" id="PreferencesLexerError" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexerError" /> <keyword name="PreferencesLexerError (Constructor)" id="PreferencesLexerError (Constructor)" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexerError.__init__" /> <keyword name="PreferencesLexerError.__repr__" id="PreferencesLexerError.__repr__" ref="eric6.Preferences.PreferencesLexer.html#PreferencesLexerError.__repr__" /> @@ -13720,6 +13741,7 @@ <keyword name="QsciScintillaCompat.extendSelectionToEOL" id="QsciScintillaCompat.extendSelectionToEOL" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.extendSelectionToEOL" /> <keyword name="QsciScintillaCompat.extendSelectionWordLeft" id="QsciScintillaCompat.extendSelectionWordLeft" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.extendSelectionWordLeft" /> <keyword name="QsciScintillaCompat.extendSelectionWordRight" id="QsciScintillaCompat.extendSelectionWordRight" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.extendSelectionWordRight" /> + <keyword name="QsciScintillaCompat.findFirst" id="QsciScintillaCompat.findFirst" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.findFirst" /> <keyword name="QsciScintillaCompat.findFirstTarget" id="QsciScintillaCompat.findFirstTarget" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.findFirstTarget" /> <keyword name="QsciScintillaCompat.findNextTarget" id="QsciScintillaCompat.findNextTarget" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.findNextTarget" /> <keyword name="QsciScintillaCompat.flashFindIndicator" id="QsciScintillaCompat.flashFindIndicator" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.flashFindIndicator" /> @@ -13789,6 +13811,7 @@ <keyword name="QsciScintillaCompat.setRectangularSelection" id="QsciScintillaCompat.setRectangularSelection" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setRectangularSelection" /> <keyword name="QsciScintillaCompat.setStyling" id="QsciScintillaCompat.setStyling" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setStyling" /> <keyword name="QsciScintillaCompat.setVirtualSpaceOptions" id="QsciScintillaCompat.setVirtualSpaceOptions" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setVirtualSpaceOptions" /> + <keyword name="QsciScintillaCompat.setWrapStartIndent" id="QsciScintillaCompat.setWrapStartIndent" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setWrapStartIndent" /> <keyword name="QsciScintillaCompat.showFindIndicator" id="QsciScintillaCompat.showFindIndicator" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.showFindIndicator" /> <keyword name="QsciScintillaCompat.showUserList" id="QsciScintillaCompat.showUserList" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.showUserList" /> <keyword name="QsciScintillaCompat.startStyling" id="QsciScintillaCompat.startStyling" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.startStyling" /> @@ -15138,6 +15161,47 @@ <keyword name="StyleGuide.init_report" id="StyleGuide.init_report" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.init_report" /> <keyword name="StyleGuide.input_dir" id="StyleGuide.input_dir" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.input_dir" /> <keyword name="StyleGuide.input_file" id="StyleGuide.input_file" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.input_file" /> + <keyword name="SubstyleDefinitionDialog" id="SubstyleDefinitionDialog" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog" /> + <keyword name="SubstyleDefinitionDialog (Constructor)" id="SubstyleDefinitionDialog (Constructor)" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.__init__" /> + <keyword name="SubstyleDefinitionDialog (Module)" id="SubstyleDefinitionDialog (Module)" ref="eric6.Preferences.SubstyleDefinitionDialog.html" /> + <keyword name="SubstyleDefinitionDialog.__updateOk" id="SubstyleDefinitionDialog.__updateOk" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.__updateOk" /> + <keyword name="SubstyleDefinitionDialog.getData" id="SubstyleDefinitionDialog.getData" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.getData" /> + <keyword name="SubstyleDefinitionDialog.on_defaultButton_clicked" id="SubstyleDefinitionDialog.on_defaultButton_clicked" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.on_defaultButton_clicked" /> + <keyword name="SubstyleDefinitionDialog.on_descriptionEdit_textChanged" id="SubstyleDefinitionDialog.on_descriptionEdit_textChanged" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.on_descriptionEdit_textChanged" /> + <keyword name="SubstyleDefinitionDialog.on_resetButton_clicked" id="SubstyleDefinitionDialog.on_resetButton_clicked" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.on_resetButton_clicked" /> + <keyword name="SubstyleDefinitionDialog.on_wordsEdit_textChanged" id="SubstyleDefinitionDialog.on_wordsEdit_textChanged" ref="eric6.Preferences.SubstyleDefinitionDialog.html#SubstyleDefinitionDialog.on_wordsEdit_textChanged" /> + <keyword name="SubstyledLexer" id="SubstyledLexer" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer" /> + <keyword name="SubstyledLexer (Constructor)" id="SubstyledLexer (Constructor)" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.__init__" /> + <keyword name="SubstyledLexer (Module)" id="SubstyledLexer (Module)" ref="eric6.QScintilla.Lexers.SubstyledLexer.html" /> + <keyword name="SubstyledLexer.addSubstyle" id="SubstyledLexer.addSubstyle" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.addSubstyle" /> + <keyword name="SubstyledLexer.delSubstyle" id="SubstyledLexer.delSubstyle" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.delSubstyle" /> + <keyword name="SubstyledLexer.getBaseStyles" id="SubstyledLexer.getBaseStyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.getBaseStyles" /> + <keyword name="SubstyledLexer.hasSubstyle" id="SubstyledLexer.hasSubstyle" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.hasSubstyle" /> + <keyword name="SubstyledLexer.hasSubstyles" id="SubstyledLexer.hasSubstyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.hasSubstyles" /> + <keyword name="SubstyledLexer.isBaseStyle" id="SubstyledLexer.isBaseStyle" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.isBaseStyle" /> + <keyword name="SubstyledLexer.loadDefaultSubStyles" id="SubstyledLexer.loadDefaultSubStyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.loadDefaultSubStyles" /> + <keyword name="SubstyledLexer.loadSubstyles" id="SubstyledLexer.loadSubstyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.loadSubstyles" /> + <keyword name="SubstyledLexer.readSubstyles" id="SubstyledLexer.readSubstyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.readSubstyles" /> + <keyword name="SubstyledLexer.setSubstyleColor" id="SubstyledLexer.setSubstyleColor" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstyleColor" /> + <keyword name="SubstyledLexer.setSubstyleDescription" id="SubstyledLexer.setSubstyleDescription" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstyleDescription" /> + <keyword name="SubstyledLexer.setSubstyleEolFill" id="SubstyledLexer.setSubstyleEolFill" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstyleEolFill" /> + <keyword name="SubstyledLexer.setSubstyleFont" id="SubstyledLexer.setSubstyleFont" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstyleFont" /> + <keyword name="SubstyledLexer.setSubstylePaper" id="SubstyledLexer.setSubstylePaper" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstylePaper" /> + <keyword name="SubstyledLexer.setSubstyleWords" id="SubstyledLexer.setSubstyleWords" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.setSubstyleWords" /> + <keyword name="SubstyledLexer.substyleColor" id="SubstyledLexer.substyleColor" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleColor" /> + <keyword name="SubstyledLexer.substyleDefaultColor" id="SubstyledLexer.substyleDefaultColor" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultColor" /> + <keyword name="SubstyledLexer.substyleDefaultDescription" id="SubstyledLexer.substyleDefaultDescription" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultDescription" /> + <keyword name="SubstyledLexer.substyleDefaultEolFill" id="SubstyledLexer.substyleDefaultEolFill" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultEolFill" /> + <keyword name="SubstyledLexer.substyleDefaultFont" id="SubstyledLexer.substyleDefaultFont" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultFont" /> + <keyword name="SubstyledLexer.substyleDefaultPaper" id="SubstyledLexer.substyleDefaultPaper" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultPaper" /> + <keyword name="SubstyledLexer.substyleDefaultWords" id="SubstyledLexer.substyleDefaultWords" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDefaultWords" /> + <keyword name="SubstyledLexer.substyleDescription" id="SubstyledLexer.substyleDescription" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleDescription" /> + <keyword name="SubstyledLexer.substyleEolFill" id="SubstyledLexer.substyleEolFill" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleEolFill" /> + <keyword name="SubstyledLexer.substyleFont" id="SubstyledLexer.substyleFont" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleFont" /> + <keyword name="SubstyledLexer.substylePaper" id="SubstyledLexer.substylePaper" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substylePaper" /> + <keyword name="SubstyledLexer.substyleWords" id="SubstyledLexer.substyleWords" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substyleWords" /> + <keyword name="SubstyledLexer.substylesCount" id="SubstyledLexer.substylesCount" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.substylesCount" /> + <keyword name="SubstyledLexer.writeSubstyles" id="SubstyledLexer.writeSubstyles" ref="eric6.QScintilla.Lexers.SubstyledLexer.html#SubstyledLexer.writeSubstyles" /> <keyword name="Subversion" id="Subversion" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion" /> <keyword name="Subversion" id="Subversion" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion" /> <keyword name="Subversion (Constructor)" id="Subversion (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__init__" /> @@ -20462,6 +20526,7 @@ <file>eric6.Preferences.ShortcutDialog.html</file> <file>eric6.Preferences.Shortcuts.html</file> <file>eric6.Preferences.ShortcutsDialog.html</file> + <file>eric6.Preferences.SubstyleDefinitionDialog.html</file> <file>eric6.Preferences.ToolConfigurationDialog.html</file> <file>eric6.Preferences.ToolGroupConfigurationDialog.html</file> <file>eric6.Preferences.ViewProfileDialog.html</file> @@ -20554,6 +20619,7 @@ <file>eric6.QScintilla.Lexers.LexerVHDL.html</file> <file>eric6.QScintilla.Lexers.LexerXML.html</file> <file>eric6.QScintilla.Lexers.LexerYAML.html</file> + <file>eric6.QScintilla.Lexers.SubstyledLexer.html</file> <file>eric6.QScintilla.Lexers.__init__.html</file> <file>eric6.QScintilla.MarkupProviders.HtmlProvider.html</file> <file>eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html</file>
--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html Sun Mar 10 19:31:06 2019 +0100 +++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorHighlightingStylesPage.html Sun Mar 17 11:58:28 2019 +0100 @@ -51,7 +51,7 @@ ConfigurationPageBase, Ui_EditorHighlightingStylesPage <h3>Class Attributes</h3> <table> -<tr><td>FAMILYANDSIZE</td></tr><tr><td>FAMILYONLY</td></tr><tr><td>FONT</td></tr><tr><td>SIZEONLY</td></tr> +<tr><td>FAMILYANDSIZE</td></tr><tr><td>FAMILYONLY</td></tr><tr><td>FONT</td></tr><tr><td>SIZEONLY</td></tr><tr><td>StyleRole</td></tr><tr><td>SubstyleRole</td></tr> </table> <h3>Class Methods</h3> <table> @@ -69,6 +69,9 @@ <td><a href="#EditorHighlightingStylesPage.__changeFont">__changeFont</a></td> <td>Private slot to change the highlighter font.</td> </tr><tr> +<td><a href="#EditorHighlightingStylesPage.__currentStyles">__currentStyles</a></td> +<td>Private method to get the styles of the current item.</td> +</tr><tr> <td><a href="#EditorHighlightingStylesPage.__exportStyles">__exportStyles</a></td> <td>Private method to export the styles of the given lexers.</td> </tr><tr> @@ -84,6 +87,15 @@ <td><a href="#EditorHighlightingStylesPage.__styleAllItems">__styleAllItems</a></td> <td>Private method to style all items of the style element list.</td> </tr><tr> +<td><a href="#EditorHighlightingStylesPage.__styleOneItem">__styleOneItem</a></td> +<td>Private method to style one item of the style element list.</td> +</tr><tr> +<td><a href="#EditorHighlightingStylesPage.__stylesForItem">__stylesForItem</a></td> +<td>Private method to get the style and sub-style number of the given item.</td> +</tr><tr> +<td><a href="#EditorHighlightingStylesPage.on_addSubstyleButton_clicked">on_addSubstyleButton_clicked</a></td> +<td>Private slot to add a new sub-style.</td> +</tr><tr> <td><a href="#EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked">on_allBackgroundColoursButton_clicked</a></td> <td>Private method used to select the background colour of all styles of a selected lexer.</td> </tr><tr> @@ -96,10 +108,19 @@ <td><a href="#EditorHighlightingStylesPage.on_backgroundButton_clicked">on_backgroundButton_clicked</a></td> <td>Private method used to select the background colour of the selected style and lexer.</td> </tr><tr> +<td><a href="#EditorHighlightingStylesPage.on_copySubstyleButton_clicked">on_copySubstyleButton_clicked</a></td> +<td>Private slot to copy the selected sub-style.</td> +</tr><tr> <td><a href="#EditorHighlightingStylesPage.on_defaultButton_clicked">on_defaultButton_clicked</a></td> <td>Private method to set the current style to its default values.</td> </tr><tr> -<td><a href="#EditorHighlightingStylesPage.on_eolfillCheckBox_toggled">on_eolfillCheckBox_toggled</a></td> +<td><a href="#EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked">on_deleteSubstyleButton_clicked</a></td> +<td>Private slot to delete the selected sub-style.</td> +</tr><tr> +<td><a href="#EditorHighlightingStylesPage.on_editSubstyleButton_clicked">on_editSubstyleButton_clicked</a></td> +<td>Private slot to edit the selected sub-style entry.</td> +</tr><tr> +<td><a href="#EditorHighlightingStylesPage.on_eolfillCheckBox_clicked">on_eolfillCheckBox_clicked</a></td> <td>Private method used to set the eolfill for the selected style and lexer.</td> </tr><tr> <td><a href="#EditorHighlightingStylesPage.on_exportAllButton_clicked">on_exportAllButton_clicked</a></td> @@ -120,8 +141,8 @@ <td><a href="#EditorHighlightingStylesPage.on_lexerLanguageComboBox_activated">on_lexerLanguageComboBox_activated</a></td> <td>Private slot to fill the style combo of the source page.</td> </tr><tr> -<td><a href="#EditorHighlightingStylesPage.on_styleElementList_currentRowChanged">on_styleElementList_currentRowChanged</a></td> -<td>Private method to set up the style element part of the source page.</td> +<td><a href="#EditorHighlightingStylesPage.on_styleElementList_currentItemChanged">on_styleElementList_currentItemChanged</a></td> +<td>Private method to handle a change of the current row.</td> </tr><tr> <td><a href="#EditorHighlightingStylesPage.save">save</a></td> <td>Public slot to save the Editor Highlighting Styles configuration.</td> @@ -180,6 +201,21 @@ <dd> flag indicating to set the font size only (boolean </dd> +</dl><a NAME="EditorHighlightingStylesPage.__currentStyles" ID="EditorHighlightingStylesPage.__currentStyles"></a> +<h4>EditorHighlightingStylesPage.__currentStyles</h4> +<b>__currentStyles</b>(<i></i>) +<p> + Private method to get the styles of the current item. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing the style and sub-style numbers +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (int, int) +</dd> </dl><a NAME="EditorHighlightingStylesPage.__exportStyles" ID="EditorHighlightingStylesPage.__exportStyles"></a> <h4>EditorHighlightingStylesPage.__exportStyles</h4> <b>__exportStyles</b>(<i>lexers</i>) @@ -213,19 +249,63 @@ </dd> </dl><a NAME="EditorHighlightingStylesPage.__setToDefault" ID="EditorHighlightingStylesPage.__setToDefault"></a> <h4>EditorHighlightingStylesPage.__setToDefault</h4> -<b>__setToDefault</b>(<i>style</i>) +<b>__setToDefault</b>(<i>style, substyle</i>) <p> Private method to set a specific style to its default values. </p><dl> -<dt><i>style</i></dt> +<dt><i>style</i> (int)</dt> <dd> -style to be reset (integer) +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number </dd> </dl><a NAME="EditorHighlightingStylesPage.__styleAllItems" ID="EditorHighlightingStylesPage.__styleAllItems"></a> <h4>EditorHighlightingStylesPage.__styleAllItems</h4> <b>__styleAllItems</b>(<i></i>) <p> Private method to style all items of the style element list. +</p><a NAME="EditorHighlightingStylesPage.__styleOneItem" ID="EditorHighlightingStylesPage.__styleOneItem"></a> +<h4>EditorHighlightingStylesPage.__styleOneItem</h4> +<b>__styleOneItem</b>(<i>item, style, substyle</i>) +<p> + Private method to style one item of the style element list. +</p><dl> +<dt><i>item</i> (QTreeWidgetItem)</dt> +<dd> +reference to the item to be styled +</dd><dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><a NAME="EditorHighlightingStylesPage.__stylesForItem" ID="EditorHighlightingStylesPage.__stylesForItem"></a> +<h4>EditorHighlightingStylesPage.__stylesForItem</h4> +<b>__stylesForItem</b>(<i>itm</i>) +<p> + Private method to get the style and sub-style number of the given item. +</p><dl> +<dt><i>itm</i> (QTreeWidgetItem)</dt> +<dd> +reference to the item to extract the styles from +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple containing the style and sub-style numbers +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (int, int) +</dd> +</dl><a NAME="EditorHighlightingStylesPage.on_addSubstyleButton_clicked" ID="EditorHighlightingStylesPage.on_addSubstyleButton_clicked"></a> +<h4>EditorHighlightingStylesPage.on_addSubstyleButton_clicked</h4> +<b>on_addSubstyleButton_clicked</b>(<i></i>) +<p> + Private slot to add a new sub-style. </p><a NAME="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked" ID="EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked"></a> <h4>EditorHighlightingStylesPage.on_allBackgroundColoursButton_clicked</h4> <b>on_allBackgroundColoursButton_clicked</b>(<i></i>) @@ -249,14 +329,29 @@ <p> Private method used to select the background colour of the selected style and lexer. +</p><a NAME="EditorHighlightingStylesPage.on_copySubstyleButton_clicked" ID="EditorHighlightingStylesPage.on_copySubstyleButton_clicked"></a> +<h4>EditorHighlightingStylesPage.on_copySubstyleButton_clicked</h4> +<b>on_copySubstyleButton_clicked</b>(<i></i>) +<p> + Private slot to copy the selected sub-style. </p><a NAME="EditorHighlightingStylesPage.on_defaultButton_clicked" ID="EditorHighlightingStylesPage.on_defaultButton_clicked"></a> <h4>EditorHighlightingStylesPage.on_defaultButton_clicked</h4> <b>on_defaultButton_clicked</b>(<i></i>) <p> Private method to set the current style to its default values. -</p><a NAME="EditorHighlightingStylesPage.on_eolfillCheckBox_toggled" ID="EditorHighlightingStylesPage.on_eolfillCheckBox_toggled"></a> -<h4>EditorHighlightingStylesPage.on_eolfillCheckBox_toggled</h4> -<b>on_eolfillCheckBox_toggled</b>(<i>on</i>) +</p><a NAME="EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked" ID="EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked"></a> +<h4>EditorHighlightingStylesPage.on_deleteSubstyleButton_clicked</h4> +<b>on_deleteSubstyleButton_clicked</b>(<i></i>) +<p> + Private slot to delete the selected sub-style. +</p><a NAME="EditorHighlightingStylesPage.on_editSubstyleButton_clicked" ID="EditorHighlightingStylesPage.on_editSubstyleButton_clicked"></a> +<h4>EditorHighlightingStylesPage.on_editSubstyleButton_clicked</h4> +<b>on_editSubstyleButton_clicked</b>(<i></i>) +<p> + Private slot to edit the selected sub-style entry. +</p><a NAME="EditorHighlightingStylesPage.on_eolfillCheckBox_clicked" ID="EditorHighlightingStylesPage.on_eolfillCheckBox_clicked"></a> +<h4>EditorHighlightingStylesPage.on_eolfillCheckBox_clicked</h4> +<b>on_eolfillCheckBox_clicked</b>(<i>on</i>) <p> Private method used to set the eolfill for the selected style and lexer. @@ -301,15 +396,18 @@ <dd> The lexer language (string) </dd> -</dl><a NAME="EditorHighlightingStylesPage.on_styleElementList_currentRowChanged" ID="EditorHighlightingStylesPage.on_styleElementList_currentRowChanged"></a> -<h4>EditorHighlightingStylesPage.on_styleElementList_currentRowChanged</h4> -<b>on_styleElementList_currentRowChanged</b>(<i>index</i>) +</dl><a NAME="EditorHighlightingStylesPage.on_styleElementList_currentItemChanged" ID="EditorHighlightingStylesPage.on_styleElementList_currentItemChanged"></a> +<h4>EditorHighlightingStylesPage.on_styleElementList_currentItemChanged</h4> +<b>on_styleElementList_currentItemChanged</b>(<i>current, previous</i>) <p> - Private method to set up the style element part of the source page. + Private method to handle a change of the current row. </p><dl> -<dt><i>index</i></dt> +<dt><i>current</i> (QTreeWidgetItem)</dt> <dd> -the style index. +reference to the current item +</dd><dt><i>previous</i> (QTreeWidgetItem)</dt> +<dd> +reference to the previous item </dd> </dl><a NAME="EditorHighlightingStylesPage.save" ID="EditorHighlightingStylesPage.save"></a> <h4>EditorHighlightingStylesPage.save</h4> @@ -324,28 +422,36 @@ </p><dl> <dt>Returns:</dt> <dd> -array containing the index of the selected lexer language - (integer) and the index of the selected lexer entry (integer) +list containing the index of the selected lexer language + and a tuple containing the index of the parent selected lexer + entry and the index of the selected entry +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of int and tuple of (int, int) </dd> </dl><a NAME="EditorHighlightingStylesPage.setFont" ID="EditorHighlightingStylesPage.setFont"></a> <h4>EditorHighlightingStylesPage.setFont</h4> -<b>setFont</b>(<i>style, familyOnly, sizeOnly</i>) +<b>setFont</b>(<i>style, substyle, familyOnly, sizeOnly</i>) <p> Local function to set the font. </p><dl> -<dt><i>font</i></dt> +<dt><i>font</i> (QFont)</dt> +<dd> +font to be set +</dd><dt><i>style</i> (int)</dt> <dd> -font to be set (QFont) -</dd><dt><i>style</i></dt> +style number +</dd><dt><i>substyle</i> (int)</dt> <dd> -style to set the font for (integer) -</dd><dt><i>familyOnly</i></dt> +sub-style number +</dd><dt><i>familyOnly</i> (bool)</dt> <dd> flag indicating to set the font family only - (boolean) -</dd><dt><i>sizeOnly</i></dt> +</dd><dt><i>sizeOnly</i> (bool)</dt> <dd> -flag indicating to set the font size only (boolean +flag indicating to set the font size only </dd> </dl><a NAME="EditorHighlightingStylesPage.setSampleFont" ID="EditorHighlightingStylesPage.setSampleFont"></a> <h4>EditorHighlightingStylesPage.setSampleFont</h4>
--- a/Documentation/Source/eric6.Preferences.PreferencesLexer.html Sun Mar 10 19:31:06 2019 +0100 +++ b/Documentation/Source/eric6.Preferences.PreferencesLexer.html Sun Mar 17 11:58:28 2019 +0100 @@ -21,7 +21,7 @@ <body><a NAME="top" ID="top"></a> <h1>eric6.Preferences.PreferencesLexer</h1> <p> -Module implementing a special QextScintilla lexer to handle the preferences. +Module implementing a special QScintilla lexer to handle the preferences. </p> <h3>Global Attributes</h3> <table> @@ -31,7 +31,7 @@ <table> <tr> <td><a href="#PreferencesLexer">PreferencesLexer</a></td> -<td>Subclass of QsciLexer to implement preferences specific lexer methods.</td> +<td>Class implementing a Lexer facade for the highlighting styles configuration.</td> </tr><tr> <td><a href="#PreferencesLexerError">PreferencesLexerError</a></td> <td>Class defining a special error for the PreferencesLexer class.</td> @@ -48,10 +48,11 @@ <a NAME="PreferencesLexer" ID="PreferencesLexer"></a> <h2>PreferencesLexer</h2> <p> - Subclass of QsciLexer to implement preferences specific lexer methods. + Class implementing a Lexer facade for the highlighting styles + configuration. </p> <h3>Derived from</h3> -QsciLexer +QObject <h3>Class Attributes</h3> <table> <tr><td>None</td></tr> @@ -66,14 +67,20 @@ <td><a href="#PreferencesLexer.__init__">PreferencesLexer</a></td> <td>Constructor</td> </tr><tr> -<td><a href="#PreferencesLexer.color">color</a></td> -<td>Public method to get the colour of a style.</td> +<td><a href="#PreferencesLexer.addSubstyle">addSubstyle</a></td> +<td>Public method to add an empty sub-style to a given style.</td> </tr><tr> -<td><a href="#PreferencesLexer.defaulEolFill">defaulEolFill</a></td> -<td>Public method to get the default eolFill flag for a style.</td> +<td><a href="#PreferencesLexer.color">color</a></td> +<td>Public method to get the color of a style.</td> </tr><tr> <td><a href="#PreferencesLexer.defaultColor">defaultColor</a></td> -<td>Public method to get the default colour of a style.</td> +<td>Public method to get the default color of a style.</td> +</tr><tr> +<td><a href="#PreferencesLexer.defaultDescription">defaultDescription</a></td> +<td>Public method to get the default descriptive string for a style.</td> +</tr><tr> +<td><a href="#PreferencesLexer.defaultEolFill">defaultEolFill</a></td> +<td>Public method to get the default eolFill flag for a style.</td> </tr><tr> <td><a href="#PreferencesLexer.defaultFont">defaultFont</a></td> <td>Public method to get the default font for a style.</td> @@ -81,6 +88,12 @@ <td><a href="#PreferencesLexer.defaultPaper">defaultPaper</a></td> <td>Public method to get the default background for a style.</td> </tr><tr> +<td><a href="#PreferencesLexer.defaultWords">defaultWords</a></td> +<td>Public method to get the default list of words for a style.</td> +</tr><tr> +<td><a href="#PreferencesLexer.delSubstyle">delSubstyle</a></td> +<td>Public method to delete a given sub-style definition.</td> +</tr><tr> <td><a href="#PreferencesLexer.description">description</a></td> <td>Public method to get a descriptive string for a style.</td> </tr><tr> @@ -90,6 +103,15 @@ <td><a href="#PreferencesLexer.font">font</a></td> <td>Public method to get the font for a style.</td> </tr><tr> +<td><a href="#PreferencesLexer.getStyles">getStyles</a></td> +<td>Public method to get a list of all supported styles.</td> +</tr><tr> +<td><a href="#PreferencesLexer.hasStyle">hasStyle</a></td> +<td>Public method to test for a given style definition.</td> +</tr><tr> +<td><a href="#PreferencesLexer.isBaseStyle">isBaseStyle</a></td> +<td>Public method to test, if a given style may have sub-styles.</td> +</tr><tr> <td><a href="#PreferencesLexer.language">language</a></td> <td>Public method to get the lexers programming language.</td> </tr><tr> @@ -97,7 +119,10 @@ <td>Public method to get the background for a style.</td> </tr><tr> <td><a href="#PreferencesLexer.setColor">setColor</a></td> -<td>Public method to set the colour for a style.</td> +<td>Public method to set the color for a style.</td> +</tr><tr> +<td><a href="#PreferencesLexer.setDescription">setDescription</a></td> +<td>Public method to set a descriptive string for a style.</td> </tr><tr> <td><a href="#PreferencesLexer.setEolFill">setEolFill</a></td> <td>Public method to set the eolFill flag for a style.</td> @@ -107,6 +132,15 @@ </tr><tr> <td><a href="#PreferencesLexer.setPaper">setPaper</a></td> <td>Public method to set the background for a style.</td> +</tr><tr> +<td><a href="#PreferencesLexer.setWords">setWords</a></td> +<td>Public method to set the list of words for a style.</td> +</tr><tr> +<td><a href="#PreferencesLexer.words">words</a></td> +<td>Public method to get the list of words for a style.</td> +</tr><tr> +<td><a href="#PreferencesLexer.writeSettings">writeSettings</a></td> +<td>Public method to write the lexer settings.</td> </tr> </table> <h3>Static Methods</h3> @@ -119,12 +153,12 @@ <p> Constructor </p><dl> -<dt><i>language</i></dt> +<dt><i>language</i> (str)</dt> <dd> -The lexer language. (string) +language of the lexer </dd><dt><i>parent</i></dt> <dd> -The parent widget of this lexer. (QextScintilla) +parent widget of this lexer (QWidget) </dd> </dl><dl> <dt>Raises <b>PreferencesLexerLanguageError</b>:</dt> @@ -132,125 +166,332 @@ raised to indicate an invalid lexer language </dd> +</dl><a NAME="PreferencesLexer.addSubstyle" ID="PreferencesLexer.addSubstyle"></a> +<h4>PreferencesLexer.addSubstyle</h4> +<b>addSubstyle</b>(<i>style</i>) +<p> + Public method to add an empty sub-style to a given style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +allocated sub-style number or -1 to indicate an error +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> </dl><a NAME="PreferencesLexer.color" ID="PreferencesLexer.color"></a> <h4>PreferencesLexer.color</h4> -<b>color</b>(<i>style</i>) +<b>color</b>(<i>style, substyle=-1</i>) <p> - Public method to get the colour of a style. + Public method to get the color of a style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +color +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QColor +</dd> +</dl><a NAME="PreferencesLexer.defaultColor" ID="PreferencesLexer.defaultColor"></a> +<h4>PreferencesLexer.defaultColor</h4> +<b>defaultColor</b>(<i>style, substyle=-1</i>) +<p> + Public method to get the default color of a style. </p><dl> -<dt><i>style</i></dt> +<dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +default color +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QColor +</dd> +</dl><a NAME="PreferencesLexer.defaultDescription" ID="PreferencesLexer.defaultDescription"></a> +<h4>PreferencesLexer.defaultDescription</h4> +<b>defaultDescription</b>(<i>style, substyle=-1</i>) +<p> + Public method to get the default descriptive string for a style. +</p><dl> +<dt><i>style</i> (int)</dt> <dd> -the style number (int) +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +default description of the style +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="PreferencesLexer.defaultEolFill" ID="PreferencesLexer.defaultEolFill"></a> +<h4>PreferencesLexer.defaultEolFill</h4> +<b>defaultEolFill</b>(<i>style, substyle=-1</i>) +<p> + Public method to get the default eolFill flag for a style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number </dd> </dl><dl> <dt>Returns:</dt> <dd> -colour +default eolFill flag +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="PreferencesLexer.defaultFont" ID="PreferencesLexer.defaultFont"></a> +<h4>PreferencesLexer.defaultFont</h4> +<b>defaultFont</b>(<i>style, substyle=-1</i>) +<p> + Public method to get the default font for a style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +default font </dd> -</dl><a NAME="PreferencesLexer.defaulEolFill" ID="PreferencesLexer.defaulEolFill"></a> -<h4>PreferencesLexer.defaulEolFill</h4> -<b>defaulEolFill</b>(<i>style</i>) +</dl><dl> +<dt>Return Type:</dt> +<dd> +QFont +</dd> +</dl><a NAME="PreferencesLexer.defaultPaper" ID="PreferencesLexer.defaultPaper"></a> +<h4>PreferencesLexer.defaultPaper</h4> +<b>defaultPaper</b>(<i>style, substyle=-1</i>) +<p> + Public method to get the default background for a style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +default background color +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QColor +</dd> +</dl><a NAME="PreferencesLexer.defaultWords" ID="PreferencesLexer.defaultWords"></a> +<h4>PreferencesLexer.defaultWords</h4> +<b>defaultWords</b>(<i>style, substyle=-1</i>) <p> - Public method to get the default eolFill flag for a style. + Public method to get the default list of words for a style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +whitespace separated default list of words +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="PreferencesLexer.delSubstyle" ID="PreferencesLexer.delSubstyle"></a> +<h4>PreferencesLexer.delSubstyle</h4> +<b>delSubstyle</b>(<i>style, substyle</i>) +<p> + Public method to delete a given sub-style definition. </p><dl> -<dt><i>style</i></dt> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating successful deletion +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="PreferencesLexer.description" ID="PreferencesLexer.description"></a> +<h4>PreferencesLexer.description</h4> +<b>description</b>(<i>style, substyle=-1</i>) +<p> + Public method to get a descriptive string for a style. +</p><dl> +<dt><i>style</i> (int)</dt> <dd> -the style number (int) +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +description of the style +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="PreferencesLexer.eolFill" ID="PreferencesLexer.eolFill"></a> +<h4>PreferencesLexer.eolFill</h4> +<b>eolFill</b>(<i>style, substyle=-1</i>) +<p> + Public method to get the eolFill flag for a style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number </dd> </dl><dl> <dt>Returns:</dt> <dd> eolFill flag </dd> -</dl><a NAME="PreferencesLexer.defaultColor" ID="PreferencesLexer.defaultColor"></a> -<h4>PreferencesLexer.defaultColor</h4> -<b>defaultColor</b>(<i>style</i>) -<p> - Public method to get the default colour of a style. -</p><dl> -<dt><i>style</i></dt> +</dl><dl> +<dt>Return Type:</dt> <dd> -the style number (int) +bool </dd> -</dl><dl> -<dt>Returns:</dt> +</dl><a NAME="PreferencesLexer.font" ID="PreferencesLexer.font"></a> +<h4>PreferencesLexer.font</h4> +<b>font</b>(<i>style, substyle=-1</i>) +<p> + Public method to get the font for a style. +</p><dl> +<dt><i>style</i> (int)</dt> <dd> -colour -</dd> -</dl><a NAME="PreferencesLexer.defaultFont" ID="PreferencesLexer.defaultFont"></a> -<h4>PreferencesLexer.defaultFont</h4> -<b>defaultFont</b>(<i>style</i>) -<p> - Public method to get the default font for a style. -</p><dl> -<dt><i>style</i></dt> +style number +</dd><dt><i>substyle</i> (int)</dt> <dd> -the style number (int) +sub-style number </dd> </dl><dl> <dt>Returns:</dt> <dd> font </dd> -</dl><a NAME="PreferencesLexer.defaultPaper" ID="PreferencesLexer.defaultPaper"></a> -<h4>PreferencesLexer.defaultPaper</h4> -<b>defaultPaper</b>(<i>style</i>) +</dl><dl> +<dt>Return Type:</dt> +<dd> +QFont +</dd> +</dl><a NAME="PreferencesLexer.getStyles" ID="PreferencesLexer.getStyles"></a> +<h4>PreferencesLexer.getStyles</h4> +<b>getStyles</b>(<i></i>) <p> - Public method to get the default background for a style. + Public method to get a list of all supported styles. </p><dl> -<dt><i>style</i></dt> -<dd> -the style number (int) -</dd> -</dl><dl> <dt>Returns:</dt> <dd> -colour +list of tuples each containing the description of the style, + style number and sub-style number (or -1 for no sub-style) </dd> -</dl><a NAME="PreferencesLexer.description" ID="PreferencesLexer.description"></a> -<h4>PreferencesLexer.description</h4> -<b>description</b>(<i>style</i>) +</dl><a NAME="PreferencesLexer.hasStyle" ID="PreferencesLexer.hasStyle"></a> +<h4>PreferencesLexer.hasStyle</h4> +<b>hasStyle</b>(<i>style, substyle</i>) <p> - Public method to get a descriptive string for a style. + Public method to test for a given style definition. </p><dl> -<dt><i>style</i></dt> +<dt><i>style</i> (int)</dt> <dd> -the style number (int) +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number </dd> </dl><dl> <dt>Returns:</dt> <dd> -description of the style (string) +flag indicating the existence of a style definition </dd> -</dl><a NAME="PreferencesLexer.eolFill" ID="PreferencesLexer.eolFill"></a> -<h4>PreferencesLexer.eolFill</h4> -<b>eolFill</b>(<i>style</i>) +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="PreferencesLexer.isBaseStyle" ID="PreferencesLexer.isBaseStyle"></a> +<h4>PreferencesLexer.isBaseStyle</h4> +<b>isBaseStyle</b>(<i>style</i>) <p> - Public method to get the eolFill flag for a style. + Public method to test, if a given style may have sub-styles. </p><dl> -<dt><i>style</i></dt> +<dt><i>style</i> (int)</dt> <dd> -the style number (int) +base style number </dd> </dl><dl> <dt>Returns:</dt> <dd> -eolFill flag -</dd> -</dl><a NAME="PreferencesLexer.font" ID="PreferencesLexer.font"></a> -<h4>PreferencesLexer.font</h4> -<b>font</b>(<i>style</i>) -<p> - Public method to get the font for a style. -</p><dl> -<dt><i>style</i></dt> -<dd> -the style number (int) +flag indicating that the style may have sub-styles </dd> </dl><dl> -<dt>Returns:</dt> +<dt>Return Type:</dt> <dd> -font +bool </dd> </dl><a NAME="PreferencesLexer.language" ID="PreferencesLexer.language"></a> <h4>PreferencesLexer.language</h4> @@ -260,76 +501,161 @@ </p><dl> <dt>Returns:</dt> <dd> -language +lexer programming language +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl><a NAME="PreferencesLexer.paper" ID="PreferencesLexer.paper"></a> <h4>PreferencesLexer.paper</h4> -<b>paper</b>(<i>style</i>) +<b>paper</b>(<i>style, substyle=-1</i>) <p> Public method to get the background for a style. </p><dl> -<dt><i>style</i></dt> +<dt><i>style</i> (int)</dt> <dd> -the style number (int) +the style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number </dd> </dl><dl> <dt>Returns:</dt> <dd> -colour +background color +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QColor </dd> </dl><a NAME="PreferencesLexer.setColor" ID="PreferencesLexer.setColor"></a> <h4>PreferencesLexer.setColor</h4> -<b>setColor</b>(<i>c, style</i>) +<b>setColor</b>(<i>c, style, substyle=-1</i>) <p> - Public method to set the colour for a style. + Public method to set the color for a style. </p><dl> -<dt><i>c</i></dt> +<dt><i>c</i> (QColor)</dt> +<dd> +color +</dd><dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> <dd> -colour (int) -</dd><dt><i>style</i></dt> +sub-style number +</dd> +</dl><a NAME="PreferencesLexer.setDescription" ID="PreferencesLexer.setDescription"></a> +<h4>PreferencesLexer.setDescription</h4> +<b>setDescription</b>(<i>description, style, substyle=-1</i>) +<p> + Public method to set a descriptive string for a style. +</p><dl> +<dt><i>description</i> (str)</dt> <dd> -the style number (int) +description for the style +</dd><dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number </dd> </dl><a NAME="PreferencesLexer.setEolFill" ID="PreferencesLexer.setEolFill"></a> <h4>PreferencesLexer.setEolFill</h4> -<b>setEolFill</b>(<i>eolfill, style</i>) +<b>setEolFill</b>(<i>eolfill, style, substyle=-1</i>) <p> Public method to set the eolFill flag for a style. </p><dl> -<dt><i>eolfill</i></dt> +<dt><i>eolfill</i> (bool)</dt> +<dd> +eolFill flag +</dd><dt><i>style</i> (int)</dt> <dd> -eolFill flag (boolean) -</dd><dt><i>style</i></dt> +style number +</dd><dt><i>substyle</i> (int)</dt> <dd> -the style number (int) +sub-style number </dd> </dl><a NAME="PreferencesLexer.setFont" ID="PreferencesLexer.setFont"></a> <h4>PreferencesLexer.setFont</h4> -<b>setFont</b>(<i>f, style</i>) +<b>setFont</b>(<i>f, style, substyle=-1</i>) <p> Public method to set the font for a style. </p><dl> -<dt><i>f</i></dt> +<dt><i>f</i> (QFont)</dt> <dd> font -</dd><dt><i>style</i></dt> +</dd><dt><i>style</i> (int)</dt> <dd> -the style number (int) +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number </dd> </dl><a NAME="PreferencesLexer.setPaper" ID="PreferencesLexer.setPaper"></a> <h4>PreferencesLexer.setPaper</h4> -<b>setPaper</b>(<i>c, style</i>) +<b>setPaper</b>(<i>c, style, substyle=-1</i>) <p> Public method to set the background for a style. </p><dl> -<dt><i>c</i></dt> +<dt><i>c</i> (QColor)</dt> +<dd> +background color +</dd><dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><a NAME="PreferencesLexer.setWords" ID="PreferencesLexer.setWords"></a> +<h4>PreferencesLexer.setWords</h4> +<b>setWords</b>(<i>words, style, substyle=-1</i>) +<p> + Public method to set the list of words for a style. +</p><dl> +<dt><i>words</i> (str)</dt> +<dd> +whitespace separated list of words +</dd><dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> <dd> -colour (int) -</dd><dt><i>style</i></dt> +sub-style number +</dd> +</dl><a NAME="PreferencesLexer.words" ID="PreferencesLexer.words"></a> +<h4>PreferencesLexer.words</h4> +<b>words</b>(<i>style, substyle=-1</i>) +<p> + Public method to get the list of words for a style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> <dd> -the style number (int) +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +whitespace separated list of words </dd> -</dl> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="PreferencesLexer.writeSettings" ID="PreferencesLexer.writeSettings"></a> +<h4>PreferencesLexer.writeSettings</h4> +<b>writeSettings</b>(<i></i>) +<p> + Public method to write the lexer settings. +</p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> <a NAME="PreferencesLexerError" ID="PreferencesLexerError"></a> @@ -379,6 +705,11 @@ <dd> string representing the error message </dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> </dl><a NAME="PreferencesLexerError.__str__" ID="PreferencesLexerError.__str__"></a> <h4>PreferencesLexerError.__str__</h4> <b>__str__</b>(<i></i>) @@ -389,6 +720,11 @@ <dd> string representing the error message </dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> @@ -424,9 +760,9 @@ <p> Constructor </p><dl> -<dt><i>language</i></dt> +<dt><i>language</i> (str)</dt> <dd> -lexer language (string) +lexer language </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.Preferences.SubstyleDefinitionDialog.html Sun Mar 17 11:58:28 2019 +0100 @@ -0,0 +1,153 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.Preferences.SubstyleDefinitionDialog</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.Preferences.SubstyleDefinitionDialog</h1> +<p> +Module implementing the sub-style definition dialog. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#SubstyleDefinitionDialog">SubstyleDefinitionDialog</a></td> +<td>Class implementing the sub-style definition dialog.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="SubstyleDefinitionDialog" ID="SubstyleDefinitionDialog"></a> +<h2>SubstyleDefinitionDialog</h2> +<p> + Class implementing the sub-style definition dialog. +</p> +<h3>Derived from</h3> +QDialog, Ui_SubstyleDefinitionDialog +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#SubstyleDefinitionDialog.__init__">SubstyleDefinitionDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#SubstyleDefinitionDialog.__updateOk">__updateOk</a></td> +<td>Private slot to update the state of the OK button.</td> +</tr><tr> +<td><a href="#SubstyleDefinitionDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#SubstyleDefinitionDialog.on_defaultButton_clicked">on_defaultButton_clicked</a></td> +<td>Private slot to set the dialog contents to default values.</td> +</tr><tr> +<td><a href="#SubstyleDefinitionDialog.on_descriptionEdit_textChanged">on_descriptionEdit_textChanged</a></td> +<td>Private slot handling changes of the description.</td> +</tr><tr> +<td><a href="#SubstyleDefinitionDialog.on_resetButton_clicked">on_resetButton_clicked</a></td> +<td>Private slot to reset the dialog contents.</td> +</tr><tr> +<td><a href="#SubstyleDefinitionDialog.on_wordsEdit_textChanged">on_wordsEdit_textChanged</a></td> +<td>Private slot handling changes of the word list.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="SubstyleDefinitionDialog.__init__" ID="SubstyleDefinitionDialog.__init__"></a> +<h4>SubstyleDefinitionDialog (Constructor)</h4> +<b>SubstyleDefinitionDialog</b>(<i>lexer, style, substyle, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>lexer</i> (PreferencesLexer)</dt> +<dd> +reference to the lexer object +</dd><dt><i>style</i> (int)</dt> +<dd> +style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="SubstyleDefinitionDialog.__updateOk" ID="SubstyleDefinitionDialog.__updateOk"></a> +<h4>SubstyleDefinitionDialog.__updateOk</h4> +<b>__updateOk</b>(<i></i>) +<p> + Private slot to update the state of the OK button. +</p><a NAME="SubstyleDefinitionDialog.getData" ID="SubstyleDefinitionDialog.getData"></a> +<h4>SubstyleDefinitionDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing the sub-style description and words list. +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str) +</dd> +</dl><a NAME="SubstyleDefinitionDialog.on_defaultButton_clicked" ID="SubstyleDefinitionDialog.on_defaultButton_clicked"></a> +<h4>SubstyleDefinitionDialog.on_defaultButton_clicked</h4> +<b>on_defaultButton_clicked</b>(<i></i>) +<p> + Private slot to set the dialog contents to default values. +</p><a NAME="SubstyleDefinitionDialog.on_descriptionEdit_textChanged" ID="SubstyleDefinitionDialog.on_descriptionEdit_textChanged"></a> +<h4>SubstyleDefinitionDialog.on_descriptionEdit_textChanged</h4> +<b>on_descriptionEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling changes of the description. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +text of the description +</dd> +</dl><a NAME="SubstyleDefinitionDialog.on_resetButton_clicked" ID="SubstyleDefinitionDialog.on_resetButton_clicked"></a> +<h4>SubstyleDefinitionDialog.on_resetButton_clicked</h4> +<b>on_resetButton_clicked</b>(<i></i>) +<p> + Private slot to reset the dialog contents. +</p><a NAME="SubstyleDefinitionDialog.on_wordsEdit_textChanged" ID="SubstyleDefinitionDialog.on_wordsEdit_textChanged"></a> +<h4>SubstyleDefinitionDialog.on_wordsEdit_textChanged</h4> +<b>on_wordsEdit_textChanged</b>(<i></i>) +<p> + Private slot handling changes of the word list. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.QScintilla.Lexers.Lexer.html Sun Mar 10 19:31:06 2019 +0100 +++ b/Documentation/Source/eric6.QScintilla.Lexers.Lexer.html Sun Mar 17 11:58:28 2019 +0100 @@ -84,6 +84,9 @@ <td><a href="#Lexer.hasSmartIndent">hasSmartIndent</a></td> <td>Public method indicating whether lexer can do smart indentation.</td> </tr><tr> +<td><a href="#Lexer.hasSubstyles">hasSubstyles</a></td> +<td>Public method to indicate the support of sub-styles.</td> +</tr><tr> <td><a href="#Lexer.initProperties">initProperties</a></td> <td>Public slot to initialize the properties.</td> </tr><tr> @@ -205,6 +208,21 @@ flag indicating availability of smartIndentLine and smartIndentSelection methods (boolean) </dd> +</dl><a NAME="Lexer.hasSubstyles" ID="Lexer.hasSubstyles"></a> +<h4>Lexer.hasSubstyles</h4> +<b>hasSubstyles</b>(<i></i>) +<p> + Public method to indicate the support of sub-styles. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating sub-styling support +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> </dl><a NAME="Lexer.initProperties" ID="Lexer.initProperties"></a> <h4>Lexer.initProperties</h4> <b>initProperties</b>(<i></i>)
--- a/Documentation/Source/eric6.QScintilla.Lexers.LexerCPP.html Sun Mar 10 19:31:06 2019 +0100 +++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerCPP.html Sun Mar 17 11:58:28 2019 +0100 @@ -45,7 +45,7 @@ Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3> -Lexer, QsciLexerCPP +SubstyledLexer, QsciLexerCPP <h3>Class Attributes</h3> <table> <tr><td>None</td></tr>
--- a/Documentation/Source/eric6.QScintilla.Lexers.LexerPython.html Sun Mar 10 19:31:06 2019 +0100 +++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerPython.html Sun Mar 17 11:58:28 2019 +0100 @@ -45,7 +45,7 @@ Subclass to implement some additional lexer dependant methods. </p> <h3>Derived from</h3> -Lexer, QsciLexerPython +SubstyledLexer, QsciLexerPython <h3>Class Attributes</h3> <table> <tr><td>None</td></tr> @@ -58,7 +58,7 @@ <table> <tr> <td><a href="#LexerPython.__init__">LexerPython</a></td> -<td>Constructor</td> +<td>__future__ with_statement unicode_literals print_function division absolute_import generator_stop annotations</td> </tr><tr> <td><a href="#LexerPython.autoCompletionWordSeparators">autoCompletionWordSeparators</a></td> <td>Public method to return the list of separators for autocompletion.</td> @@ -93,16 +93,9 @@ <h4>LexerPython (Constructor)</h4> <b>LexerPython</b>(<i>variant="", parent=None</i>) <p> - Constructor -</p><dl> -<dt><i>variant</i></dt> -<dd> -name of the language variant (string) -</dd><dt><i>parent</i></dt> -<dd> -parent widget of this lexer -</dd> -</dl><a NAME="LexerPython.autoCompletionWordSeparators" ID="LexerPython.autoCompletionWordSeparators"></a> +__future__ with_statement unicode_literals print_function division + absolute_import generator_stop annotations +</p><a NAME="LexerPython.autoCompletionWordSeparators" ID="LexerPython.autoCompletionWordSeparators"></a> <h4>LexerPython.autoCompletionWordSeparators</h4> <b>autoCompletionWordSeparators</b>(<i></i>) <p>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.Lexers.SubstyledLexer.html Sun Mar 17 11:58:28 2019 +0100 @@ -0,0 +1,696 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.Lexers.SubstyledLexer</title> +<meta charset="UTF-8"> +<style> +body { + background: #EDECE6; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #85774A; } +h2 { color: white; background: #85774A; } +h3 { color: white; background: #9D936E; } +h4 { color: white; background: #9D936E; } + +a { color: #BA6D36; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric6.QScintilla.Lexers.SubstyledLexer</h1> +<p> +Module implementing the lexer mixin class. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#SubstyledLexer">SubstyledLexer</a></td> +<td>Class to implement the sub-styled lexer mixin class.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="SubstyledLexer" ID="SubstyledLexer"></a> +<h2>SubstyledLexer</h2> +<p> + Class to implement the sub-styled lexer mixin class. +</p> +<h3>Derived from</h3> +Lexer +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#SubstyledLexer.__init__">SubstyledLexer</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#SubstyledLexer.addSubstyle">addSubstyle</a></td> +<td>Public method to add an empty sub-style to a given base style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.delSubstyle">delSubstyle</a></td> +<td>Public method to delete a given sub-style definition.</td> +</tr><tr> +<td><a href="#SubstyledLexer.getBaseStyles">getBaseStyles</a></td> +<td>Public method to get the list of supported base styles.</td> +</tr><tr> +<td><a href="#SubstyledLexer.hasSubstyle">hasSubstyle</a></td> +<td>Public method to test for a given sub-style definition.</td> +</tr><tr> +<td><a href="#SubstyledLexer.hasSubstyles">hasSubstyles</a></td> +<td>Public method to indicate the support of sub-styles.</td> +</tr><tr> +<td><a href="#SubstyledLexer.isBaseStyle">isBaseStyle</a></td> +<td>Public method to test, if a given style may have sub-styles.</td> +</tr><tr> +<td><a href="#SubstyledLexer.loadDefaultSubStyles">loadDefaultSubStyles</a></td> +<td>Public method to load the default sub-style definitions.</td> +</tr><tr> +<td><a href="#SubstyledLexer.loadSubstyles">loadSubstyles</a></td> +<td>Public method to load the sub-styles from the settings file.</td> +</tr><tr> +<td><a href="#SubstyledLexer.readSubstyles">readSubstyles</a></td> +<td>Public method to load the sub-styles and configure the editor.</td> +</tr><tr> +<td><a href="#SubstyledLexer.setSubstyleColor">setSubstyleColor</a></td> +<td>Public method to set the foreground color of a sub-style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.setSubstyleDescription">setSubstyleDescription</a></td> +<td>Public method to set the description for a sub-style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.setSubstyleEolFill">setSubstyleEolFill</a></td> +<td>Public method to set the eolfill flag of a sub-style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.setSubstyleFont">setSubstyleFont</a></td> +<td>Public method to set the font of a sub-style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.setSubstylePaper">setSubstylePaper</a></td> +<td>Public method to set the background color of a sub-style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.setSubstyleWords">setSubstyleWords</a></td> +<td>Public method to set the words for a sub-style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleColor">substyleColor</a></td> +<td>Public method to get the sub-style foreground color.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleDefaultColor">substyleDefaultColor</a></td> +<td>Public method to get the sub-style default foreground color.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleDefaultDescription">substyleDefaultDescription</a></td> +<td>Public method to get the default description of a sub-style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleDefaultEolFill">substyleDefaultEolFill</a></td> +<td>Public method to get the default eolfill flag.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleDefaultFont">substyleDefaultFont</a></td> +<td>Public method to get the default sub-style font.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleDefaultPaper">substyleDefaultPaper</a></td> +<td>Public method to get the sub-style default background color.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleDefaultWords">substyleDefaultWords</a></td> +<td>Public method to get the default words of a sub-style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleDescription">substyleDescription</a></td> +<td>Public method to get the description of a sub-style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleEolFill">substyleEolFill</a></td> +<td>Public method to get the eolfill flag.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleFont">substyleFont</a></td> +<td>Public method to get the sub-style font.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substylePaper">substylePaper</a></td> +<td>Public method to get the sub-style background color.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substyleWords">substyleWords</a></td> +<td>Public method to get the words of a sub-style.</td> +</tr><tr> +<td><a href="#SubstyledLexer.substylesCount">substylesCount</a></td> +<td>Public method to get the number of defined sub-styles.</td> +</tr><tr> +<td><a href="#SubstyledLexer.writeSubstyles">writeSubstyles</a></td> +<td>Public method to save the sub-styles.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="SubstyledLexer.__init__" ID="SubstyledLexer.__init__"></a> +<h4>SubstyledLexer (Constructor)</h4> +<b>SubstyledLexer</b>(<i></i>) +<p> + Constructor +</p><a NAME="SubstyledLexer.addSubstyle" ID="SubstyledLexer.addSubstyle"></a> +<h4>SubstyledLexer.addSubstyle</h4> +<b>addSubstyle</b>(<i>style</i>) +<p> + Public method to add an empty sub-style to a given base style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +allocated sub-style number or -1 to indicate an error +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="SubstyledLexer.delSubstyle" ID="SubstyledLexer.delSubstyle"></a> +<h4>SubstyledLexer.delSubstyle</h4> +<b>delSubstyle</b>(<i>style, substyle</i>) +<p> + Public method to delete a given sub-style definition. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating successful deletion +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="SubstyledLexer.getBaseStyles" ID="SubstyledLexer.getBaseStyles"></a> +<h4>SubstyledLexer.getBaseStyles</h4> +<b>getBaseStyles</b>(<i></i>) +<p> + Public method to get the list of supported base styles. +</p><dl> +<dt>Returns:</dt> +<dd> +list of base styles +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of int +</dd> +</dl><a NAME="SubstyledLexer.hasSubstyle" ID="SubstyledLexer.hasSubstyle"></a> +<h4>SubstyledLexer.hasSubstyle</h4> +<b>hasSubstyle</b>(<i>style, substyle</i>) +<p> + Public method to test for a given sub-style definition. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating the existence of a sub-style definition +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="SubstyledLexer.hasSubstyles" ID="SubstyledLexer.hasSubstyles"></a> +<h4>SubstyledLexer.hasSubstyles</h4> +<b>hasSubstyles</b>(<i></i>) +<p> + Public method to indicate the support of sub-styles. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating sub-styling support +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="SubstyledLexer.isBaseStyle" ID="SubstyledLexer.isBaseStyle"></a> +<h4>SubstyledLexer.isBaseStyle</h4> +<b>isBaseStyle</b>(<i>style</i>) +<p> + Public method to test, if a given style may have sub-styles. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating that the style may have sub-styles +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="SubstyledLexer.loadDefaultSubStyles" ID="SubstyledLexer.loadDefaultSubStyles"></a> +<h4>SubstyledLexer.loadDefaultSubStyles</h4> +<b>loadDefaultSubStyles</b>(<i></i>) +<p> + Public method to load the default sub-style definitions. +</p><a NAME="SubstyledLexer.loadSubstyles" ID="SubstyledLexer.loadSubstyles"></a> +<h4>SubstyledLexer.loadSubstyles</h4> +<b>loadSubstyles</b>(<i></i>) +<p> + Public method to load the sub-styles from the settings file. +</p><a NAME="SubstyledLexer.readSubstyles" ID="SubstyledLexer.readSubstyles"></a> +<h4>SubstyledLexer.readSubstyles</h4> +<b>readSubstyles</b>(<i>editor</i>) +<p> + Public method to load the sub-styles and configure the editor. +</p><dl> +<dt><i>editor</i> (QsciScintilla)</dt> +<dd> +reference to the editor object +</dd> +</dl><a NAME="SubstyledLexer.setSubstyleColor" ID="SubstyledLexer.setSubstyleColor"></a> +<h4>SubstyledLexer.setSubstyleColor</h4> +<b>setSubstyleColor</b>(<i>color, style, substyle</i>) +<p> + Public method to set the foreground color of a sub-style. +</p><dl> +<dt><i>color</i> (QColor)</dt> +<dd> +foreground color to be set +</dd><dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><a NAME="SubstyledLexer.setSubstyleDescription" ID="SubstyledLexer.setSubstyleDescription"></a> +<h4>SubstyledLexer.setSubstyleDescription</h4> +<b>setSubstyleDescription</b>(<i>description, style, substyle</i>) +<p> + Public method to set the description for a sub-style. +</p><dl> +<dt><i>description</i> (str)</dt> +<dd> +description to be set +</dd><dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><a NAME="SubstyledLexer.setSubstyleEolFill" ID="SubstyledLexer.setSubstyleEolFill"></a> +<h4>SubstyledLexer.setSubstyleEolFill</h4> +<b>setSubstyleEolFill</b>(<i>eolFill, style, substyle</i>) +<p> + Public method to set the eolfill flag of a sub-style. +</p><dl> +<dt><i>eolFill</i> (bool)</dt> +<dd> +eolfill flag to be set +</dd><dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><a NAME="SubstyledLexer.setSubstyleFont" ID="SubstyledLexer.setSubstyleFont"></a> +<h4>SubstyledLexer.setSubstyleFont</h4> +<b>setSubstyleFont</b>(<i>font, style, substyle</i>) +<p> + Public method to set the font of a sub-style. +</p><dl> +<dt><i>font</i> (QFont)</dt> +<dd> +font to be set +</dd><dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><a NAME="SubstyledLexer.setSubstylePaper" ID="SubstyledLexer.setSubstylePaper"></a> +<h4>SubstyledLexer.setSubstylePaper</h4> +<b>setSubstylePaper</b>(<i>color, style, substyle</i>) +<p> + Public method to set the background color of a sub-style. +</p><dl> +<dt><i>color</i> (QColor)</dt> +<dd> +background color to be set +</dd><dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><a NAME="SubstyledLexer.setSubstyleWords" ID="SubstyledLexer.setSubstyleWords"></a> +<h4>SubstyledLexer.setSubstyleWords</h4> +<b>setSubstyleWords</b>(<i>words, style, substyle</i>) +<p> + Public method to set the words for a sub-style. +</p><dl> +<dt><i>words</i> (str)</dt> +<dd> +words to be set separated by white-space +</dd><dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><a NAME="SubstyledLexer.substyleColor" ID="SubstyledLexer.substyleColor"></a> +<h4>SubstyledLexer.substyleColor</h4> +<b>substyleColor</b>(<i>style, substyle</i>) +<p> + Public method to get the sub-style foreground color. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +foreground color +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QColor +</dd> +</dl><a NAME="SubstyledLexer.substyleDefaultColor" ID="SubstyledLexer.substyleDefaultColor"></a> +<h4>SubstyledLexer.substyleDefaultColor</h4> +<b>substyleDefaultColor</b>(<i>style, substyle</i>) +<p> + Public method to get the sub-style default foreground color. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +default foreground color +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QColor +</dd> +</dl><a NAME="SubstyledLexer.substyleDefaultDescription" ID="SubstyledLexer.substyleDefaultDescription"></a> +<h4>SubstyledLexer.substyleDefaultDescription</h4> +<b>substyleDefaultDescription</b>(<i>style, substyle</i>) +<p> + Public method to get the default description of a sub-style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +sub-style default description +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="SubstyledLexer.substyleDefaultEolFill" ID="SubstyledLexer.substyleDefaultEolFill"></a> +<h4>SubstyledLexer.substyleDefaultEolFill</h4> +<b>substyleDefaultEolFill</b>(<i>style, substyle</i>) +<p> + Public method to get the default eolfill flag. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +default eolfill flag +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="SubstyledLexer.substyleDefaultFont" ID="SubstyledLexer.substyleDefaultFont"></a> +<h4>SubstyledLexer.substyleDefaultFont</h4> +<b>substyleDefaultFont</b>(<i>style, substyle</i>) +<p> + Public method to get the default sub-style font. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +default font +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QFont +</dd> +</dl><a NAME="SubstyledLexer.substyleDefaultPaper" ID="SubstyledLexer.substyleDefaultPaper"></a> +<h4>SubstyledLexer.substyleDefaultPaper</h4> +<b>substyleDefaultPaper</b>(<i>style, substyle</i>) +<p> + Public method to get the sub-style default background color. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +default background color +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QColor +</dd> +</dl><a NAME="SubstyledLexer.substyleDefaultWords" ID="SubstyledLexer.substyleDefaultWords"></a> +<h4>SubstyledLexer.substyleDefaultWords</h4> +<b>substyleDefaultWords</b>(<i>style, substyle</i>) +<p> + Public method to get the default words of a sub-style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +white-space separated default word list +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="SubstyledLexer.substyleDescription" ID="SubstyledLexer.substyleDescription"></a> +<h4>SubstyledLexer.substyleDescription</h4> +<b>substyleDescription</b>(<i>style, substyle</i>) +<p> + Public method to get the description of a sub-style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +sub-style description +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="SubstyledLexer.substyleEolFill" ID="SubstyledLexer.substyleEolFill"></a> +<h4>SubstyledLexer.substyleEolFill</h4> +<b>substyleEolFill</b>(<i>style, substyle</i>) +<p> + Public method to get the eolfill flag. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +eolfill flag +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="SubstyledLexer.substyleFont" ID="SubstyledLexer.substyleFont"></a> +<h4>SubstyledLexer.substyleFont</h4> +<b>substyleFont</b>(<i>style, substyle</i>) +<p> + Public method to get the sub-style font. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +font +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QFont +</dd> +</dl><a NAME="SubstyledLexer.substylePaper" ID="SubstyledLexer.substylePaper"></a> +<h4>SubstyledLexer.substylePaper</h4> +<b>substylePaper</b>(<i>style, substyle</i>) +<p> + Public method to get the sub-style background color. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +background color +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QColor +</dd> +</dl><a NAME="SubstyledLexer.substyleWords" ID="SubstyledLexer.substyleWords"></a> +<h4>SubstyledLexer.substyleWords</h4> +<b>substyleWords</b>(<i>style, substyle</i>) +<p> + Public method to get the words of a sub-style. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd><dt><i>substyle</i> (int)</dt> +<dd> +sub-style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +white-space separated word list +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="SubstyledLexer.substylesCount" ID="SubstyledLexer.substylesCount"></a> +<h4>SubstyledLexer.substylesCount</h4> +<b>substylesCount</b>(<i>style</i>) +<p> + Public method to get the number of defined sub-styles. +</p><dl> +<dt><i>style</i> (int)</dt> +<dd> +base style number +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +number of defined sub-styles +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="SubstyledLexer.writeSubstyles" ID="SubstyledLexer.writeSubstyles"></a> +<h4>SubstyledLexer.writeSubstyles</h4> +<b>writeSubstyles</b>(<i></i>) +<p> + Public method to save the sub-styles. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.QScintilla.Printer.html Sun Mar 10 19:31:06 2019 +0100 +++ b/Documentation/Source/eric6.QScintilla.Printer.html Sun Mar 17 11:58:28 2019 +0100 @@ -31,7 +31,7 @@ <table> <tr> <td><a href="#Printer">Printer</a></td> -<td>Class implementing the QextScintillaPrinter with a header.</td> +<td>Class implementing the QsciPrinter with a header.</td> </tr> </table> <h3>Functions</h3> @@ -42,7 +42,7 @@ <a NAME="Printer" ID="Printer"></a> <h2>Printer</h2> <p> - Class implementing the QextScintillaPrinter with a header. + Class implementing the QsciPrinter with a header. </p> <h3>Derived from</h3> QsciPrinter
--- a/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html Sun Mar 10 19:31:06 2019 +0100 +++ b/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html Sun Mar 17 11:58:28 2019 +0100 @@ -178,6 +178,9 @@ <td><a href="#QsciScintillaCompat.extendSelectionWordRight">extendSelectionWordRight</a></td> <td>Public method to extend the selection one word to the right.</td> </tr><tr> +<td><a href="#QsciScintillaCompat.findFirst">findFirst</a></td> +<td>Public method to search in the current editor text.</td> +</tr><tr> <td><a href="#QsciScintillaCompat.findFirstTarget">findFirstTarget</a></td> <td>Public method to search in a specified range of text without setting the selection.</td> </tr><tr> @@ -385,6 +388,9 @@ <td><a href="#QsciScintillaCompat.setVirtualSpaceOptions">setVirtualSpaceOptions</a></td> <td>Public method to set the virtual space usage options.</td> </tr><tr> +<td><a href="#QsciScintillaCompat.setWrapStartIndent">setWrapStartIndent</a></td> +<td>Public method to set a the amount of characters wrapped sublines shall be indented.</td> +</tr><tr> <td><a href="#QsciScintillaCompat.showFindIndicator">showFindIndicator</a></td> <td>Public method to show the find indicator for the given range.</td> </tr><tr> @@ -757,49 +763,109 @@ <b>extendSelectionWordRight</b>(<i></i>) <p> Public method to extend the selection one word to the right. -</p><a NAME="QsciScintillaCompat.findFirstTarget" ID="QsciScintillaCompat.findFirstTarget"></a> +</p><a NAME="QsciScintillaCompat.findFirst" ID="QsciScintillaCompat.findFirst"></a> +<h4>QsciScintillaCompat.findFirst</h4> +<b>findFirst</b>(<i>expression, regexp, caseSensitive, word, wrap, forward=True, line=-1, index=-1, show=True, posix=False, cxx11=False</i>) +<p> + Public method to search in the current editor text. +</p><dl> +<dt><i>expression</i> (str)</dt> +<dd> +search expression +</dd><dt><i>regexp</i> (bool)</dt> +<dd> +flag indicating a regular expression +</dd><dt><i>caseSensitive</i> (bool)</dt> +<dd> +flag indicating a case sensitive search +</dd><dt><i>word</i> (bool)</dt> +<dd> +flag indicating a word only search +</dd><dt><i>wrap</i> (bool)</dt> +<dd> +flag indicating to warp around +</dd><dt><i>forward</i> (bool)</dt> +<dd> +flag indicating the search direction +</dd><dt><i>line</i> (int)</dt> +<dd> +line to start the search on +</dd><dt><i>index</i> (int)</dt> +<dd> +index to start the search on +</dd><dt><i>show</i> (bool)</dt> +<dd> +flag indicating to set the selection to the found + expression +</dd><dt><i>posix</i> (bool)</dt> +<dd> +flag indicating the POSIX regular expression search mode +</dd><dt><i>cxx11</i> (bool)</dt> +<dd> +flag indicating the CXX11 regular expression search mode +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a successful search +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="QsciScintillaCompat.findFirstTarget" ID="QsciScintillaCompat.findFirstTarget"></a> <h4>QsciScintillaCompat.findFirstTarget</h4> -<b>findFirstTarget</b>(<i>expr_, re_, cs_, wo_, begline=-1, begindex=-1, endline=-1, endindex=-1, ws_=False</i>) +<b>findFirstTarget</b>(<i>expr_, re_, cs_, wo_, begline=-1, begindex=-1, endline=-1, endindex=-1, ws_=False, posix=False, cxx11=False</i>) <p> Public method to search in a specified range of text without setting the selection. </p><dl> -<dt><i>expr_</i></dt> +<dt><i>expr_</i> (str)</dt> <dd> -search expression (string) -</dd><dt><i>re_</i></dt> +search expression +</dd><dt><i>re_</i> (bool)</dt> <dd> -flag indicating a regular expression (boolean) -</dd><dt><i>cs_</i></dt> +flag indicating a regular expression +</dd><dt><i>cs_</i> (bool)</dt> <dd> -flag indicating a case sensitive search (boolean) -</dd><dt><i>wo_</i></dt> +flag indicating a case sensitive search +</dd><dt><i>wo_</i> (bool)</dt> <dd> -flag indicating a word only search (boolean) -</dd><dt><i>begline=</i></dt> +flag indicating a word only search +</dd><dt><i>begline</i> (int)</dt> <dd> line number to start from (-1 to indicate current - position) (integer) -</dd><dt><i>begindex=</i></dt> + position) +</dd><dt><i>begindex</i> (int)</dt> <dd> -index to start from (-1 to indicate current - position) (integer) -</dd><dt><i>endline=</i></dt> +index to start from (-1 to indicate current position) +</dd><dt><i>endline</i> (int)</dt> <dd> -line number to stop at (-1 to indicate end of - document) (integer) -</dd><dt><i>endindex=</i></dt> +line number to stop at (-1 to indicate end of document) +</dd><dt><i>endindex</i> (int)</dt> <dd> index number to stop at (-1 to indicate end of - document) (integer) -</dd><dt><i>ws_=</i></dt> + document) +</dd><dt><i>ws_</i> (bool)</dt> <dd> flag indicating a word start search (boolean) +</dd><dt><i>posix</i> (bool)</dt> +<dd> + +</dd><dt><i>cxx11</i> (bool)</dt> +<dd> + </dd> </dl><dl> <dt>Returns:</dt> <dd> -flag indicating a successful search (boolean) +flag indicating a successful search +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl><a NAME="QsciScintillaCompat.findNextTarget" ID="QsciScintillaCompat.findNextTarget"></a> <h4>QsciScintillaCompat.findNextTarget</h4> @@ -1705,6 +1771,17 @@ <dd> usage options to set (integer, 0 to 3) </dd> +</dl><a NAME="QsciScintillaCompat.setWrapStartIndent" ID="QsciScintillaCompat.setWrapStartIndent"></a> +<h4>QsciScintillaCompat.setWrapStartIndent</h4> +<b>setWrapStartIndent</b>(<i>indent</i>) +<p> + Public method to set a the amount of characters wrapped sublines + shall be indented. +</p><dl> +<dt><i>indent</i> (int)</dt> +<dd> +amount of characters to indent +</dd> </dl><a NAME="QsciScintillaCompat.showFindIndicator" ID="QsciScintillaCompat.showFindIndicator"></a> <h4>QsciScintillaCompat.showFindIndicator</h4> <b>showFindIndicator</b>(<i>sline, sindex, eline, eindex</i>)
--- a/Documentation/Source/index-eric6.Preferences.html Sun Mar 10 19:31:06 2019 +0100 +++ b/Documentation/Source/index-eric6.Preferences.html Sun Mar 17 11:58:28 2019 +0100 @@ -51,7 +51,7 @@ <td>Module implementing a dialog for the configuration of a mouse click sequence.</td> </tr><tr> <td><a href="eric6.Preferences.PreferencesLexer.html">PreferencesLexer</a></td> -<td>Module implementing a special QextScintilla lexer to handle the preferences.</td> +<td>Module implementing a special QScintilla lexer to handle the preferences.</td> </tr><tr> <td><a href="eric6.Preferences.ProgramsDialog.html">ProgramsDialog</a></td> <td>Module implementing the Programs page.</td> @@ -65,6 +65,9 @@ <td><a href="eric6.Preferences.ShortcutsDialog.html">ShortcutsDialog</a></td> <td>Module implementing a dialog for the configuration of eric6's keyboard shortcuts.</td> </tr><tr> +<td><a href="eric6.Preferences.SubstyleDefinitionDialog.html">SubstyleDefinitionDialog</a></td> +<td>Module implementing the sub-style definition dialog.</td> +</tr><tr> <td><a href="eric6.Preferences.ToolConfigurationDialog.html">ToolConfigurationDialog</a></td> <td>Module implementing a configuration dialog for the tools menu.</td> </tr><tr>
--- a/Documentation/Source/index-eric6.QScintilla.Lexers.html Sun Mar 10 19:31:06 2019 +0100 +++ b/Documentation/Source/index-eric6.QScintilla.Lexers.html Sun Mar 17 11:58:28 2019 +0100 @@ -145,6 +145,9 @@ <td><a href="eric6.QScintilla.Lexers.LexerYAML.html">LexerYAML</a></td> <td>Module implementing a YAML lexer with some additional methods.</td> </tr><tr> +<td><a href="eric6.QScintilla.Lexers.SubstyledLexer.html">SubstyledLexer</a></td> +<td>Module implementing the lexer mixin class.</td> +</tr><tr> <td><a href="eric6.QScintilla.Lexers.__init__.html">Lexers</a></td> <td>Package implementing lexers for the various supported programming languages.</td> </tr>
--- a/E5XML/Config.py Sun Mar 10 19:31:06 2019 +0100 +++ b/E5XML/Config.py Sun Mar 17 11:58:28 2019 +0100 @@ -40,7 +40,7 @@ pluginRepositoryFileFormatVersion = "4.2" # version number of the highlighting styles file -highlightingStylesFileFormatVersion = "4.3" +highlightingStylesFileFormatVersion = "6.0" # version number of the web browser spell check dictionaries list file dictionariesListFileFormatVersion = "1.0"
--- a/E5XML/HighlightingStylesReader.py Sun Mar 10 19:31:06 2019 +0100 +++ b/E5XML/HighlightingStylesReader.py Sun Mar 17 11:58:28 2019 +0100 @@ -20,7 +20,7 @@ """ Class for reading a highlighting styles XML file. """ - supportedVersions = ["4.3"] + supportedVersions = ["4.3", "6.0"] def __init__(self, device, lexers): """ @@ -86,42 +86,65 @@ style = self.attribute("style") if style: style = int(style) + substyle = int(self.attribute("substyle", "-1")) + # -1 is default for base styles + + # add sub-style if not already there + if not lexer.hasStyle(style, substyle): + substyle = lexer.addSubstyle(style) color = self.attribute("color") if color: color = QColor(color) else: - color = lexer.defaultColor(style) - lexer.setColor(color, style) + color = lexer.defaultColor(style, substyle) + lexer.setColor(color, style, substyle) paper = self.attribute("paper") if paper: paper = QColor(paper) else: - paper = lexer.defaultPaper(style) - lexer.setPaper(paper, style) + paper = lexer.defaultPaper(style, substyle) + lexer.setPaper(paper, style, substyle) fontStr = self.attribute("font") if fontStr: font = QFont() font.fromString(fontStr) else: - font = lexer.defaultFont(style) - lexer.setFont(font, style) + font = lexer.defaultFont(style, substyle) + lexer.setFont(font, style, substyle) eolfill = self.attribute("eolfill") if eolfill: eolfill = self.toBool(eolfill) if eolfill is None: - eolfill = lexer.defaulEolFill(style) + eolfill = lexer.defaulEolFill(style, substyle) else: - eolfill = lexer.defaulEolFill(style) - lexer.setEolFill(eolfill, style) + eolfill = lexer.defaulEolFill(style, substyle) + lexer.setEolFill(eolfill, style, substyle) + + while not self.atEnd(): + self.readNext() + if self.isStartElement(): + if self.name() == "Description" and substyle >= 0: + # description can only be set for sub-styles + description = self.readElementText().strip() + if not description: + description = lexer.defaultDescription( + style, substyle) + lexer.setDescription(description, style, substyle) + elif self.name() == "Words" and substyle >= 0: + # words can only be set for sub-styles + words = self.readElementText().strip() + if not words: + words = lexer.defaultWords(style, substyle) + lexer.setWords(words, style, substyle) + + if self.isEndElement() and self.name() == "Style": + return while not self.atEnd(): self.readNext() if self.isEndElement() and self.name() == "Style": break - - if self.isStartElement(): - self.raiseUnexpectedStartTag(self.name())
--- a/E5XML/HighlightingStylesWriter.py Sun Mar 10 19:31:06 2019 +0100 +++ b/E5XML/HighlightingStylesWriter.py Sun Mar 17 11:58:28 2019 +0100 @@ -59,16 +59,27 @@ for lexer in self.lexers: self.writeStartElement("Lexer") self.writeAttribute("name", lexer.language()) - for style in lexer.descriptions: + for description, style, substyle in lexer.getStyles(): self.writeStartElement("Style") self.writeAttribute("style", str(style)) - self.writeAttribute("color", lexer.color(style).name()) - self.writeAttribute("paper", lexer.paper(style).name()) - self.writeAttribute("font", lexer.font(style).toString()) - self.writeAttribute("eolfill", str(lexer.eolFill(style))) - self.writeCharacters(lexer.description(style)) - self.writeEndElement() - self.writeEndElement() + self.writeAttribute("substyle", str(substyle)) + self.writeAttribute("color", + lexer.color(style, substyle).name()) + self.writeAttribute("paper", + lexer.paper(style, substyle).name()) + self.writeAttribute("font", + lexer.font(style, substyle).toString()) + self.writeAttribute("eolfill", + str(lexer.eolFill(style, substyle))) + self.writeStartElement("Description") + self.writeCharacters(description) + self.writeEndElement() # Description + if substyle >= 0: + self.writeStartElement("Words") + self.writeCharacters(lexer.words(style, substyle).strip()) + self.writeEndElement() # Words + self.writeEndElement() # Style + self.writeEndElement() # Lexer - self.writeEndElement() + self.writeEndElement() # HighlightingStyles self.writeEndDocument()
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sun Mar 10 19:31:06 2019 +0100 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sun Mar 17 11:58:28 2019 +0100 @@ -11,16 +11,19 @@ from PyQt5.QtCore import pyqtSlot, Qt, QFileInfo, QFile, QIODevice from PyQt5.QtGui import QPalette, QFont -from PyQt5.QtWidgets import QColorDialog, QFontDialog, QInputDialog, QMenu +from PyQt5.QtWidgets import QColorDialog, QFontDialog, QInputDialog, QMenu, \ + QTreeWidgetItem, QDialog from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorHighlightingStylesPage import Ui_EditorHighlightingStylesPage +from ..SubstyleDefinitionDialog import SubstyleDefinitionDialog from E5Gui import E5MessageBox, E5FileDialog -import Preferences from Globals import qVersionTuple +import UI.PixmapCache + try: MonospacedFontsOption = QFontDialog.MonospacedFonts except AttributeError: @@ -38,6 +41,9 @@ FAMILYANDSIZE = 2 FONT = 99 + StyleRole = Qt.UserRole + 1 + SubstyleRole = Qt.UserRole + 2 + def __init__(self, lexers): """ Constructor @@ -48,6 +54,11 @@ self.setupUi(self) self.setObjectName("EditorHighlightingStylesPage") + self.addSubstyleButton.setIcon(UI.PixmapCache.getIcon("plus")) + self.deleteSubstyleButton.setIcon(UI.PixmapCache.getIcon("minus")) + self.editSubstyleButton.setIcon(UI.PixmapCache.getIcon("edit")) + self.copySubstyleButton.setIcon(UI.PixmapCache.getIcon("editCopy")) + if qVersionTuple() < (5, 0, 0): self.monospacedButton.setChecked(False) self.monospacedButton.hide() @@ -92,14 +103,14 @@ QScintilla.Lexers.getLanguageIcon(language, False), language) self.on_lexerLanguageComboBox_activated("") - + def save(self): """ Public slot to save the Editor Highlighting Styles configuration. """ for lexer in list(self.lexers.values()): - lexer.writeSettings(Preferences.Prefs.settings, "Scintilla") - + lexer.writeSettings() + @pyqtSlot(str) def on_lexerLanguageComboBox_activated(self, language): """ @@ -123,45 +134,101 @@ return self.styleGroup.setEnabled(True) - self.styleElementList.addItems(self.lexer.styles) + for description, styleNo, subStyleNo in self.lexer.getStyles(): + if subStyleNo >= 0: + parent = self.styleElementList.findItems( + self.lexer.description(styleNo), Qt.MatchExactly)[0] + parent.setExpanded(True) + else: + parent = self.styleElementList + itm = QTreeWidgetItem(parent, [description]) + itm.setData(0, self.StyleRole, styleNo) + itm.setData(0, self.SubstyleRole, subStyleNo) self.__styleAllItems() - self.styleElementList.setCurrentRow(0) + self.styleElementList.setCurrentItem( + self.styleElementList.topLevelItem(0)) + + def __stylesForItem(self, itm): + """ + Private method to get the style and sub-style number of the given item. + + @param itm reference to the item to extract the styles from + @type QTreeWidgetItem + @return tuple containing the style and sub-style numbers + @rtype tuple of (int, int) + """ + style = itm.data(0, self.StyleRole) + substyle = itm.data(0, self.SubstyleRole) + + return (style, substyle) + + def __currentStyles(self): + """ + Private method to get the styles of the current item. + @return tuple containing the style and sub-style numbers + @rtype tuple of (int, int) + """ + itm = self.styleElementList.currentItem() + if itm is None: + styles = (0, -1) # return default style + else: + styles = self.__stylesForItem(itm) + + return styles + + def __styleOneItem(self, item, style, substyle): + """ + Private method to style one item of the style element list. + + @param item reference to the item to be styled + @type QTreeWidgetItem + @param style base style number + @type int + @param substyle sub-style number + @type int + """ + colour = self.lexer.color(style, substyle) + paper = self.lexer.paper(style, substyle) + font = self.lexer.font(style, substyle) + eolfill = self.lexer.eolFill(style, substyle) + + item.setFont(0, font) + item.setBackground(0, paper) + item.setForeground(0, colour) + if eolfill: + item.setCheckState(0, Qt.Checked) + else: + item.setCheckState(0, Qt.Unchecked) + def __styleAllItems(self): """ Private method to style all items of the style element list. """ - for row in range(self.styleElementList.count()): - style = self.lexer.ind2style[row] - colour = self.lexer.color(style) - paper = self.lexer.paper(style) - font = self.lexer.font(style) - eolfill = self.lexer.eolFill(style) - - itm = self.styleElementList.item(row) - itm.setFont(font) - itm.setBackground(paper) - itm.setForeground(colour) - if eolfill: - itm.setCheckState(Qt.Checked) - else: - itm.setCheckState(Qt.Unchecked) + itm = self.styleElementList.topLevelItem(0) + while itm is not None: + style, substyle = self.__stylesForItem(itm) + self.__styleOneItem(itm, style, substyle) + itm = self.styleElementList.itemBelow(itm) + + @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem) + def on_styleElementList_currentItemChanged(self, current, previous): + """ + Private method to handle a change of the current row. - def on_styleElementList_currentRowChanged(self, index): + @param current reference to the current item + @type QTreeWidgetItem + @param previous reference to the previous item + @type QTreeWidgetItem """ - Private method to set up the style element part of the source page. - - @param index the style index. - """ - try: - self.style = self.lexer.ind2style[index] - except KeyError: + if current is None: return - colour = self.lexer.color(self.style) - paper = self.lexer.paper(self.style) - eolfill = self.lexer.eolFill(self.style) - font = self.lexer.font(self.style) + style, substyle = self.__stylesForItem(current) + colour = self.lexer.color(style, substyle) + paper = self.lexer.paper(style, substyle) + eolfill = self.lexer.eolFill(style, substyle) + font = self.lexer.font(style, substyle) self.sampleText.setFont(font) pl = self.sampleText.palette() @@ -171,66 +238,70 @@ self.sampleText.repaint() self.eolfillCheckBox.setChecked(eolfill) + selectedOne = len(self.styleElementList.selectedItems()) == 1 + self.addSubstyleButton.setEnabled( + selectedOne and substyle < 0 and self.lexer.isBaseStyle(style)) + self.deleteSubstyleButton.setEnabled(selectedOne and substyle >= 0) + self.editSubstyleButton.setEnabled(selectedOne and substyle >= 0) + self.copySubstyleButton.setEnabled(selectedOne and substyle >= 0) + @pyqtSlot() def on_foregroundButton_clicked(self): """ Private method used to select the foreground colour of the selected style and lexer. """ - colour = QColorDialog.getColor(self.lexer.color(self.style)) + style, substyle = self.__currentStyles() + colour = QColorDialog.getColor(self.lexer.color(style, substyle)) if colour.isValid(): pl = self.sampleText.palette() pl.setColor(QPalette.Text, colour) self.sampleText.setPalette(pl) self.sampleText.repaint() - if len(self.styleElementList.selectedItems()) > 1: - for selItem in self.styleElementList.selectedItems(): - style = self.lexer.ind2style[ - self.styleElementList.row(selItem)] - self.lexer.setColor(colour, style) - selItem.setForeground(colour) - else: - self.lexer.setColor(colour, self.style) - self.styleElementList.currentItem().setForeground(colour) - + for selItem in self.styleElementList.selectedItems(): + style, substyle = self.__stylesForItem(selItem) + self.lexer.setColor(colour, style, substyle) + selItem.setForeground(0, colour) + @pyqtSlot() def on_backgroundButton_clicked(self): """ Private method used to select the background colour of the selected style and lexer. """ - colour = QColorDialog.getColor(self.lexer.paper(self.style)) + style, substyle = self.__currentStyles() + colour = QColorDialog.getColor(self.lexer.paper(style, substyle)) if colour.isValid(): pl = self.sampleText.palette() pl.setColor(QPalette.Base, colour) self.sampleText.setPalette(pl) self.sampleText.repaint() - if len(self.styleElementList.selectedItems()) > 1: - for selItem in self.styleElementList.selectedItems(): - style = self.lexer.ind2style[ - self.styleElementList.row(selItem)] - self.lexer.setPaper(colour, style) - selItem.setBackground(colour) - else: - self.lexer.setPaper(colour, self.style) - self.styleElementList.currentItem().setBackground(colour) - + for selItem in self.styleElementList.selectedItems(): + style, substyle = self.__stylesForItem(selItem) + self.lexer.setPaper(colour, style, substyle) + selItem.setBackground(0, colour) + @pyqtSlot() def on_allBackgroundColoursButton_clicked(self): """ Private method used to select the background colour of all styles of a selected lexer. """ - colour = QColorDialog.getColor(self.lexer.paper(self.style)) + style, substyle = self.__currentStyles() + colour = QColorDialog.getColor(self.lexer.paper(style, substyle)) if colour.isValid(): pl = self.sampleText.palette() pl.setColor(QPalette.Base, colour) self.sampleText.setPalette(pl) self.sampleText.repaint() - for style in list(self.lexer.ind2style.values()): - self.lexer.setPaper(colour, style) + + itm = self.styleElementList.topLevelItem(0) + while itm is not None: + style, substyle = self.__stylesForItem(itm) + self.lexer.setPaper(colour, style, substyle) + itm = self.styleElementList.itemBelow(itm) self.__styleAllItems() - + def __changeFont(self, doAll, familyOnly, sizeOnly): """ Private slot to change the highlighter font. @@ -240,15 +311,20 @@ @param familyOnly flag indicating to set the font family only (boolean) @param sizeOnly flag indicating to set the font size only (boolean """ - def setFont(font, style, familyOnly, sizeOnly): + def setFont(font, style, substyle, familyOnly, sizeOnly): """ Local function to set the font. - @param font font to be set (QFont) - @param style style to set the font for (integer) + @param font font to be set + @type QFont + @param style style number + @type int + @param substyle sub-style number + @type int @param familyOnly flag indicating to set the font family only - (boolean) - @param sizeOnly flag indicating to set the font size only (boolean + @type bool + @param sizeOnly flag indicating to set the font size only + @type bool """ if familyOnly or sizeOnly: newFont = QFont(self.lexer.font(style)) @@ -256,9 +332,9 @@ newFont.setFamily(font.family()) if sizeOnly: newFont.setPointSize(font.pointSize()) - self.lexer.setFont(newFont, style) + self.lexer.setFont(newFont, style, substyle) else: - self.lexer.setFont(font, style) + self.lexer.setFont(font, style, substyle) def setSampleFont(font, familyOnly, sizeOnly): """ @@ -270,7 +346,8 @@ @param sizeOnly flag indicating to set the font size only (boolean """ if familyOnly or sizeOnly: - newFont = QFont(self.lexer.font(self.style)) + style, substyle = self.__currentStyles() + newFont = QFont(self.lexer.font(style, substyle)) if familyOnly: newFont.setFamily(font.family()) if sizeOnly: @@ -279,30 +356,29 @@ else: self.sampleText.setFont(font) + style, substyle = self.__currentStyles() if self.monospacedButton.isChecked(): options = MonospacedFontsOption else: options = NoFontsOption - font, ok = QFontDialog.getFont(self.lexer.font(self.style), self, + font, ok = QFontDialog.getFont(self.lexer.font(style, substyle), self, "", options) if ok: setSampleFont(font, familyOnly, sizeOnly) if doAll: - for style in list(self.lexer.ind2style.values()): - setFont(font, style, familyOnly, sizeOnly) + itm = self.styleElementList.topLevelItem(0) + while itm is not None: + style, substyle = self.__stylesForItem(itm) + setFont(font, style, substyle, familyOnly, sizeOnly) + itm = self.styleElementList.itemBelow(itm) self.__styleAllItems() - elif len(self.styleElementList.selectedItems()) > 1: + else: for selItem in self.styleElementList.selectedItems(): - style = self.lexer.ind2style[ - self.styleElementList.row(selItem)] - setFont(font, style, familyOnly, sizeOnly) - itmFont = self.lexer.font(style) - selItem.setFont(itmFont) - else: - setFont(font, self.style, familyOnly, sizeOnly) - itmFont = self.lexer.font(self.style) - self.styleElementList.currentItem().setFont(itmFont) - + style, substyle = self.__stylesForItem(selItem) + setFont(font, style, substyle, familyOnly, sizeOnly) + itmFont = self.lexer.font(style, substyle) + selItem.setFont(0, itmFont) + def __fontButtonMenuTriggered(self, act): """ Private slot used to select the font of the selected style and lexer. @@ -315,7 +391,7 @@ familyOnly = act.data() in [self.FAMILYANDSIZE, self.FAMILYONLY] sizeOnly = act.data() in [self.FAMILYANDSIZE, self.SIZEONLY] self.__changeFont(False, familyOnly, sizeOnly) - + def __allFontsButtonMenuTriggered(self, act): """ Private slot used to change the font of all styles of a selected lexer. @@ -328,25 +404,22 @@ familyOnly = act.data() in [self.FAMILYANDSIZE, self.FAMILYONLY] sizeOnly = act.data() in [self.FAMILYANDSIZE, self.SIZEONLY] self.__changeFont(True, familyOnly, sizeOnly) - - def on_eolfillCheckBox_toggled(self, on): + + @pyqtSlot(bool) + def on_eolfillCheckBox_clicked(self, on): """ Private method used to set the eolfill for the selected style and lexer. @param on flag indicating enabled or disabled state (boolean) """ + style, substyle = self.__currentStyles() checkState = Qt.Checked if on else Qt.Unchecked - if len(self.styleElementList.selectedItems()) > 1: - for selItem in self.styleElementList.selectedItems(): - style = self.lexer.ind2style[ - self.styleElementList.row(selItem)] - self.lexer.setEolFill(on, style) - selItem.setCheckState(checkState) - else: - self.lexer.setEolFill(on, self.style) - self.styleElementList.currentItem().setCheckState(checkState) - + for selItem in self.styleElementList.selectedItems(): + style, substyle = self.__stylesForItem(selItem) + self.lexer.setEolFill(on, style, substyle) + selItem.setCheckState(0, checkState) + @pyqtSlot() def on_allEolFillButton_clicked(self): """ @@ -364,87 +437,104 @@ if ok: enabled = selection == on self.eolfillCheckBox.setChecked(enabled) - for style in list(self.lexer.ind2style.values()): - self.lexer.setEolFill(enabled, style) + + itm = self.styleElementList.topLevelItem(0) + while itm is not None: + style, substyle = self.__stylesForItem(itm) + self.lexer.setEolFill(enabled, style, substyle) + itm = self.styleElementList.itemBelow(itm) self.__styleAllItems() - + @pyqtSlot() def on_defaultButton_clicked(self): """ Private method to set the current style to its default values. """ - if len(self.styleElementList.selectedItems()) > 1: - for selItem in self.styleElementList.selectedItems(): - style = self.lexer.ind2style[ - self.styleElementList.row(selItem)] - self.__setToDefault(style) - else: - self.__setToDefault(self.style) - self.on_styleElementList_currentRowChanged( - self.styleElementList.currentRow()) + for selItem in self.styleElementList.selectedItems(): + style, substyle = self.__stylesForItem(selItem) + self.__setToDefault(style, substyle) + self.on_styleElementList_currentItemChanged( + self.styleElementList.currentItem(), None) self.__styleAllItems() - + @pyqtSlot() def on_allDefaultButton_clicked(self): """ Private method to set all styles to their default values. """ - for style in list(self.lexer.ind2style.values()): - self.__setToDefault(style) - self.on_styleElementList_currentRowChanged( - self.styleElementList.currentRow()) + itm = self.styleElementList.topLevelItem(0) + while itm is not None: + style, substyle = self.__stylesForItem(itm) + self.__setToDefault(style, substyle) + itm = self.styleElementList.itemBelow(itm) + self.on_styleElementList_currentItemChanged( + self.styleElementList.currentItem(), None) self.__styleAllItems() - - def __setToDefault(self, style): + + def __setToDefault(self, style, substyle): """ Private method to set a specific style to its default values. - @param style style to be reset (integer) + @param style style number + @type int + @param substyle sub-style number + @type int """ - self.lexer.setColor(self.lexer.defaultColor(style), style) - self.lexer.setPaper(self.lexer.defaultPaper(style), style) - self.lexer.setFont(self.lexer.defaultFont(style), style) - self.lexer.setEolFill(self.lexer.defaultEolFill(style), style) - + self.lexer.setColor(self.lexer.defaultColor(style, substyle), + style, substyle) + self.lexer.setPaper(self.lexer.defaultPaper(style, substyle), + style, substyle) + self.lexer.setFont(self.lexer.defaultFont(style, substyle), + style, substyle) + self.lexer.setEolFill(self.lexer.defaultEolFill(style, substyle), + style, substyle) + + ####################################################################### + ## Importing and exporting of styles + ####################################################################### + @pyqtSlot() def on_importCurrentButton_clicked(self): """ Private slot to import the styles of the current lexer. """ self.__importStyles({self.lexer.language(): self.lexer}) - + @pyqtSlot() def on_exportCurrentButton_clicked(self): """ Private slot to export the styles of the current lexer. """ self.__exportStyles([self.lexer]) - + @pyqtSlot() def on_importAllButton_clicked(self): """ Private slot to import the styles of all lexers. """ self.__importStyles(self.lexers) - + @pyqtSlot() def on_exportAllButton_clicked(self): """ Private slot to export the styles of all lexers. """ self.__exportStyles(list(self.lexers.values())) - + def __exportStyles(self, lexers): """ Private method to export the styles of the given lexers. @param lexers list of lexer objects for which to export the styles """ + from eric6config import getConfig + stylesDir = getConfig("ericStylesDir") + fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( self, self.tr("Export Highlighting Styles"), - "", - self.tr("Highlighting styles file (*.e4h)"), + stylesDir, + self.tr("Highlighting styles file (*.e6h)"), "", E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) @@ -471,7 +561,7 @@ """ to file <b>{0}</b>.</p><p>Reason: {1}</p>""") .format(fn, f.errorString()) ) - + def __importStyles(self, lexers): """ Private method to import the styles of the given lexers. @@ -486,7 +576,7 @@ self, self.tr("Import Highlighting Styles"), stylesDir, - self.tr("Highlighting styles file (*.e4h)")) + self.tr("Highlighting styles file (*.e6h *.e4h)")) if not fn: return @@ -508,35 +598,39 @@ ) return - if self.lexer: - colour = self.lexer.color(self.style) - paper = self.lexer.paper(self.style) - eolfill = self.lexer.eolFill(self.style) - font = self.lexer.font(self.style) - - self.sampleText.setFont(font) - pl = self.sampleText.palette() - pl.setColor(QPalette.Text, colour) - pl.setColor(QPalette.Base, paper) - self.sampleText.setPalette(pl) - self.sampleText.repaint() - self.eolfillCheckBox.setChecked(eolfill) - - self.__styleAllItems() - + self.on_lexerLanguageComboBox_activated( + self.lexerLanguageComboBox.currentText()) + + ####################################################################### + ## Methods to save and restore the state + ####################################################################### + def saveState(self): """ Public method to save the current state of the widget. - @return array containing the index of the selected lexer language - (integer) and the index of the selected lexer entry (integer) + @return list containing the index of the selected lexer language + and a tuple containing the index of the parent selected lexer + entry and the index of the selected entry + @rtype list of int and tuple of (int, int) """ + itm = self.styleElementList.currentItem() + parent = itm.parent() + if parent is None: + currentData = ( + None, self.styleElementList.indexOfTopLevelItem(itm)) + else: + currentData = ( + self.styleElementList.indexOfTopLevelItem(parent), + parent.indexOfChild(itm) + ) + savedState = [ self.lexerLanguageComboBox.currentIndex(), - self.styleElementList.currentRow(), + currentData, ] return savedState - + def setState(self, state): """ Public method to set the state of the widget. @@ -546,7 +640,108 @@ self.lexerLanguageComboBox.setCurrentIndex(state[0]) self.on_lexerLanguageComboBox_activated( self.lexerLanguageComboBox.currentText()) - self.styleElementList.setCurrentRow(state[1]) + + parentIndex, index = state[1] + if parentIndex is None: + itm = self.styleElementList.topLevelItem(index) + else: + parent = self.styleElementList.topLevelItem(parentIndex) + itm = parent.child(index) + self.styleElementList.setCurrentItem(itm) + + ####################################################################### + ## Methods to add, delete and edit sub-styles and their definitions + ####################################################################### + + @pyqtSlot() + def on_addSubstyleButton_clicked(self): + """ + Private slot to add a new sub-style. + """ + style, substyle = self.__currentStyles() + dlg = SubstyleDefinitionDialog( + self.lexer, style, substyle, parent=self) + if dlg.exec_() == QDialog.Accepted: + description, words = dlg.getData() + substyle = self.lexer.addSubstyle(style) + self.lexer.setDescription(description, style, substyle) + self.lexer.setWords(words, style, substyle) + + parent = self.styleElementList.findItems( + self.lexer.description(style), Qt.MatchExactly)[0] + parent.setExpanded(True) + itm = QTreeWidgetItem(parent, [description]) + itm.setData(0, self.StyleRole, style) + itm.setData(0, self.SubstyleRole, substyle) + self.__styleOneItem(itm, style, substyle) + + @pyqtSlot() + def on_deleteSubstyleButton_clicked(self): + """ + Private slot to delete the selected sub-style. + """ + style, substyle = self.__currentStyles() + ok = E5MessageBox.yesNo( + self, + self.tr("Delete Sub-Style"), + self.tr("""<p>Shall the sub-style <b>{0}</b> really be""" + """ deleted?</p>""").format( + self.lexer.description(style, substyle)) + ) + if ok: + self.lexer.delSubstyle(style, substyle) + + itm = self.styleElementList.currentItem() + parent = itm.parent() + index = parent.indexOfChild(itm) + parent.takeChild(index) + del itm + + @pyqtSlot() + def on_editSubstyleButton_clicked(self): + """ + Private slot to edit the selected sub-style entry. + """ + style, substyle = self.__currentStyles() + dlg = SubstyleDefinitionDialog( + self.lexer, style, substyle, parent=self) + if dlg.exec_() == QDialog.Accepted: + description, words = dlg.getData() + self.lexer.setDescription(description, style, substyle) + self.lexer.setWords(words, style, substyle) + + itm = self.styleElementList.currentItem() + itm.setText(0, description) + + @pyqtSlot() + def on_copySubstyleButton_clicked(self): + """ + Private slot to copy the selected sub-style. + """ + style, substyle = self.__currentStyles() + newSubstyle = self.lexer.addSubstyle(style) + + description = self.tr("{0} - Copy").format( + self.lexer.description(style, substyle)) + self.lexer.setDescription(description, style, newSubstyle) + self.lexer.setWords(self.lexer.words(style, substyle), + style, newSubstyle) + self.lexer.setColor(self.lexer.color(style, substyle), + style, newSubstyle) + self.lexer.setPaper(self.lexer.paper(style, substyle), + style, newSubstyle) + self.lexer.setFont(self.lexer.font(style, substyle), + style, newSubstyle) + self.lexer.setEolFill(self.lexer.eolFill(style, substyle), + style, newSubstyle) + + parent = self.styleElementList.findItems( + self.lexer.description(style), Qt.MatchExactly)[0] + parent.setExpanded(True) + itm = QTreeWidgetItem(parent, [description]) + itm.setData(0, self.StyleRole, style) + itm.setData(0, self.SubstyleRole, newSubstyle) + self.__styleOneItem(itm, style, newSubstyle) def create(dlg):
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui Sun Mar 10 19:31:06 2019 +0100 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui Sun Mar 17 11:58:28 2019 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>550</width> - <height>592</height> + <height>700</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout"> @@ -67,160 +67,249 @@ <string>Style Element</string> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" rowspan="14"> - <widget class="QListWidget" name="styleElementList"> + <item row="0" column="0"> + <widget class="QTreeWidget" name="styleElementList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>2</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="selectionMode"> <enum>QAbstractItemView::ExtendedSelection</enum> </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="headerHidden"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string notr="true">1</string> + </property> + </column> </widget> </item> <item row="0" column="1"> - <widget class="QPushButton" name="foregroundButton"> - <property name="toolTip"> - <string>Select the foreground colour.</string> - </property> - <property name="text"> - <string>Foreground Colour</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QPushButton" name="backgroundButton"> - <property name="toolTip"> - <string>Select the background colour.</string> - </property> - <property name="text"> - <string>Background Colour</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QPushButton" name="fontButton"> - <property name="toolTip"> - <string>Select the font.</string> - </property> - <property name="text"> - <string>Font</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QCheckBox" name="eolfillCheckBox"> - <property name="toolTip"> - <string>Select end of line fill.</string> - </property> - <property name="text"> - <string>Fill to end of line</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="Line" name="line"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="5" column="1"> - <widget class="QPushButton" name="defaultButton"> - <property name="toolTip"> - <string>Press to set the current style to its default values</string> - </property> - <property name="text"> - <string>to Default</string> - </property> - </widget> - </item> - <item row="6" column="1"> - <spacer name="spacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>43</height> - </size> - </property> - </spacer> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>13</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QToolButton" name="addSubstyleButton"> + <property name="toolTip"> + <string>Press to add a sub-style to the selected style</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="deleteSubstyleButton"> + <property name="toolTip"> + <string>Press to to delete the selected sub-style</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="editSubstyleButton"> + <property name="toolTip"> + <string>Press to edit the selected sub-style</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="copySubstyleButton"> + <property name="toolTip"> + <string>Press to copy the selected sub-style</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>13</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="Line" name="line_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="foregroundButton"> + <property name="toolTip"> + <string>Select the foreground colour.</string> + </property> + <property name="text"> + <string>Foreground Colour</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="backgroundButton"> + <property name="toolTip"> + <string>Select the background colour.</string> + </property> + <property name="text"> + <string>Background Colour</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="fontButton"> + <property name="toolTip"> + <string>Select the font.</string> + </property> + <property name="text"> + <string>Font</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="eolfillCheckBox"> + <property name="toolTip"> + <string>Select end of line fill.</string> + </property> + <property name="text"> + <string>Fill to end of line</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="defaultButton"> + <property name="toolTip"> + <string>Press to set the current style to its default values</string> + </property> + <property name="text"> + <string>to Default</string> + </property> + </widget> + </item> + <item> + <spacer name="spacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>43</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="monospacedButton"> + <property name="toolTip"> + <string>Press to show only monospaced fonts</string> + </property> + <property name="text"> + <string>Monospaced Fonts Only</string> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>38</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="allBackgroundColoursButton"> + <property name="toolTip"> + <string>Select the background colour for all styles</string> + </property> + <property name="text"> + <string>All Background Colours</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="allFontsButton"> + <property name="toolTip"> + <string>Select the font for all styles.</string> + </property> + <property name="text"> + <string>All Fonts</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="allEolFillButton"> + <property name="toolTip"> + <string>Select the eol fill for all styles</string> + </property> + <property name="text"> + <string>All Fill to end of line</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="allDefaultButton"> + <property name="toolTip"> + <string>Press to set all styles to their default values</string> + </property> + <property name="text"> + <string>All to Default</string> + </property> + </widget> + </item> + </layout> </item> - <item row="7" column="1"> - <widget class="QPushButton" name="monospacedButton"> - <property name="toolTip"> - <string>Press to show only monospaced fonts</string> - </property> - <property name="text"> - <string>Monospaced Fonts Only</string> - </property> - <property name="checkable"> - <bool>true</bool> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="8" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>38</height> - </size> - </property> - </spacer> - </item> - <item row="9" column="1"> - <widget class="QPushButton" name="allBackgroundColoursButton"> - <property name="toolTip"> - <string>Select the background colour for all styles</string> - </property> - <property name="text"> - <string>All Background Colours</string> - </property> - </widget> - </item> - <item row="10" column="1"> - <widget class="QPushButton" name="allFontsButton"> - <property name="toolTip"> - <string>Select the font for all styles.</string> - </property> - <property name="text"> - <string>All Fonts</string> - </property> - </widget> - </item> - <item row="11" column="1"> - <widget class="QPushButton" name="allEolFillButton"> - <property name="toolTip"> - <string>Select the eol fill for all styles</string> - </property> - <property name="text"> - <string>All Fill to end of line</string> - </property> - </widget> - </item> - <item row="12" column="1"> - <widget class="Line" name="line_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="13" column="1"> - <widget class="QPushButton" name="allDefaultButton"> - <property name="toolTip"> - <string>Press to set all styles to their default values</string> - </property> - <property name="text"> - <string>All to Default</string> - </property> - </widget> - </item> - <item row="14" column="0" colspan="2"> + <item row="1" column="0" colspan="2"> <widget class="QLineEdit" name="sampleText"> <property name="focusPolicy"> <enum>Qt::NoFocus</enum> @@ -236,7 +325,7 @@ </property> </widget> </item> - <item row="15" column="0" colspan="2"> + <item row="2" column="0" colspan="2"> <widget class="QLabel" name="label"> <property name="text"> <string><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</string> @@ -304,6 +393,10 @@ <tabstops> <tabstop>lexerLanguageComboBox</tabstop> <tabstop>styleElementList</tabstop> + <tabstop>addSubstyleButton</tabstop> + <tabstop>deleteSubstyleButton</tabstop> + <tabstop>editSubstyleButton</tabstop> + <tabstop>copySubstyleButton</tabstop> <tabstop>foregroundButton</tabstop> <tabstop>backgroundButton</tabstop> <tabstop>fontButton</tabstop>
--- a/Preferences/PreferencesLexer.py Sun Mar 10 19:31:06 2019 +0100 +++ b/Preferences/PreferencesLexer.py Sun Mar 17 11:58:28 2019 +0100 @@ -4,14 +4,13 @@ # """ -Module implementing a special QextScintilla lexer to handle the preferences. +Module implementing a special QScintilla lexer to handle the preferences. """ from __future__ import unicode_literals -from PyQt5.QtCore import QCoreApplication -from PyQt5.QtGui import QColor, QFont -from PyQt5.Qsci import QsciLexer +from PyQt5.QtCore import QCoreApplication, QObject +from PyQt5.Qsci import QsciScintillaBase import Preferences import Globals @@ -34,6 +33,7 @@ Special method returning a representation of the exception. @return string representing the error message + @rtype str """ return repr(self._errorMessage) @@ -42,6 +42,7 @@ Special method returning a string representation of the exception. @return string representing the error message + @rtype str """ return self._errorMessage @@ -54,7 +55,8 @@ """ Constructor - @param language lexer language (string) + @param language lexer language + @type str """ PreferencesLexerError.__init__(self) self._errorMessage = QCoreApplication.translate( @@ -62,16 +64,18 @@ 'Unsupported Lexer Language: {0}').format(language) -class PreferencesLexer(QsciLexer): +class PreferencesLexer(QObject): """ - Subclass of QsciLexer to implement preferences specific lexer methods. + Class implementing a Lexer facade for the highlighting styles + configuration. """ def __init__(self, language, parent=None): """ Constructor - @param language The lexer language. (string) - @param parent The parent widget of this lexer. (QextScintilla) + @param language language of the lexer + @type str + @param parent parent widget of this lexer (QWidget) @exception PreferencesLexerLanguageError raised to indicate an invalid lexer language """ @@ -87,183 +91,413 @@ # instantiate a lexer object for the given language import QScintilla.Lexers - lex = QScintilla.Lexers.getLexer(language) - if lex is None: + self.__lex = QScintilla.Lexers.getLexer(language) + if self.__lex is None: raise PreferencesLexerLanguageError(language) - # define the local store - self.colours = {} - self.defaultColours = {} - self.papers = {} - self.defaultPapers = {} - self.eolFills = {} - self.defaultEolFills = {} - self.fonts = {} - self.defaultFonts = {} - self.descriptions = {} - self.ind2style = {} - self.styles = [] + # read the last stored values from preferences file + self.__lex.readSettings(Preferences.Prefs.settings, "Scintilla") + if self.__lex.hasSubstyles(): + self.__lex.loadSubstyles() + + def writeSettings(self): + """ + Public method to write the lexer settings. + """ + self.__lex.writeSettings(Preferences.Prefs.settings, "Scintilla") + if self.__lex.hasSubstyles(): + self.__lex.writeSubstyles() + + def getStyles(self): + """ + Public method to get a list of all supported styles. - # fill local store with default values from lexer - # and built up styles list and conversion table from index to style - self.__language = lex.language() + @return list of tuples each containing the description of the style, + style number and sub-style number (or -1 for no sub-style) + """ + styles = [] - index = 0 - for i in range(128): - desc = lex.description(i) + for i in range(QsciScintillaBase.STYLE_MAX): + desc = self.__lex.description(i) if desc: - self.descriptions[i] = desc - self.styles.append(desc) - - self.colours[i] = lex.defaultColor(i) - self.papers[i] = lex.defaultPaper(i) - self.eolFills[i] = lex.defaultEolFill(i) - self.fonts[i] = lex.defaultFont(i) - # Override QScintilla's default font family to - # always use a monospaced font - self.fonts[i].setFamily(self.__defaultFontFamily) - - self.defaultColours[i] = lex.defaultColor(i) - self.defaultPapers[i] = lex.defaultPaper(i) - self.defaultEolFills[i] = lex.defaultEolFill(i) - self.defaultFonts[i] = lex.defaultFont(i) - self.defaultFonts[i].setFamily(self.__defaultFontFamily) - - self.ind2style[index] = i - index += 1 + styles.append((desc, i, -1)) + if self.__lex.hasSubstyles(): + for baseStyle in self.__lex.getBaseStyles(): + for subStyle in range(self.__lex.substylesCount(baseStyle)): + desc = self.__lex.substyleDescription(baseStyle, subStyle) + styles.append((desc, baseStyle, subStyle)) + + return styles + + def defaultColor(self, style, substyle=-1): + """ + Public method to get the default color of a style. - self.colorChanged.connect(self.setColor) - self.eolFillChanged.connect(self.setEolFill) - self.fontChanged.connect(self.setFont) - self.paperChanged.connect(self.setPaper) + @param style style number + @type int + @param substyle sub-style number + @type int + @return default color + @rtype QColor + """ + if substyle >= 0: + color = self.__lex.substyleDefaultColor(style, substyle) + else: + color = self.__lex.defaultColor(style) - # read the last stored values from preferences file - self.readSettings(Preferences.Prefs.settings, "Scintilla") + return color + + def color(self, style, substyle=-1): + """ + Public method to get the color of a style. - def defaultColor(self, style): + @param style style number + @type int + @param substyle sub-style number + @type int + @return color + @rtype QColor """ - Public method to get the default colour of a style. - - @param style the style number (int) - @return colour - """ - return self.defaultColours[style] - - def color(self, style): - """ - Public method to get the colour of a style. + if substyle >= 0: + color = self.__lex.substyleColor(style, substyle) + else: + color = self.__lex.color(style) - @param style the style number (int) - @return colour - """ - return self.colours[style] - - def setColor(self, c, style): + return color + + def setColor(self, c, style, substyle=-1): """ - Public method to set the colour for a style. + Public method to set the color for a style. - @param c colour (int) - @param style the style number (int) + @param c color + @type QColor + @param style style number + @type int + @param substyle sub-style number + @type int """ - self.colours[style] = QColor(c) - - def defaultPaper(self, style): + if substyle >= 0: + self.__lex.setSubstyleColor(c, style, substyle) + else: + self.__lex.setColor(c, style) + + def defaultPaper(self, style, substyle=-1): """ Public method to get the default background for a style. - @param style the style number (int) - @return colour + @param style style number + @type int + @param substyle sub-style number + @type int + @return default background color + @rtype QColor """ - return self.defaultPapers[style] + if substyle >= 0: + color = self.__lex.substyleDefaultPaper(style, substyle) + else: + color = self.__lex.defaultPaper(style) - def paper(self, style): + return color + + def paper(self, style, substyle=-1): """ Public method to get the background for a style. - @param style the style number (int) - @return colour + @param style the style number + @type int + @param substyle sub-style number + @type int + @return background color + @rtype QColor """ - return self.papers[style] + if substyle >= 0: + color = self.__lex.substylePaper(style, substyle) + else: + color = self.__lex.paper(style) - def setPaper(self, c, style): + return color + + def setPaper(self, c, style, substyle=-1): """ Public method to set the background for a style. - @param c colour (int) - @param style the style number (int) + @param c background color + @type QColor + @param style style number + @type int + @param substyle sub-style number + @type int """ - self.papers[style] = QColor(c) - - def defaulEolFill(self, style): + if substyle >= 0: + self.__lex.setSubstylePaper(c, style, substyle) + else: + self.__lex.setPaper(c, style) + + def defaultEolFill(self, style, substyle=-1): """ Public method to get the default eolFill flag for a style. - @param style the style number (int) - @return eolFill flag + @param style style number + @type int + @param substyle sub-style number + @type int + @return default eolFill flag + @rtype bool """ - return self.defaultEolFills[style] + if substyle >= 0: + eolFill = self.__lex.substyleDefaultEolFill(style, substyle) + else: + eolFill = self.__lex.defaultEolFill(style) - def eolFill(self, style): + return eolFill + + def eolFill(self, style, substyle=-1): """ Public method to get the eolFill flag for a style. - @param style the style number (int) + @param style style number + @type int + @param substyle sub-style number + @type int @return eolFill flag + @rtype bool """ - return self.eolFills[style] + if substyle >= 0: + eolFill = self.__lex.substyleEolFill(style, substyle) + else: + eolFill = self.__lex.eolFill(style) - def setEolFill(self, eolfill, style): + return eolFill + + def setEolFill(self, eolfill, style, substyle=-1): """ Public method to set the eolFill flag for a style. - @param eolfill eolFill flag (boolean) - @param style the style number (int) + @param eolfill eolFill flag + @type bool + @param style style number + @type int + @param substyle sub-style number + @type int """ - self.eolFills[style] = eolfill - - def defaultFont(self, style): + if substyle >= 0: + self.__lex.setSubstyleEolFill(eolfill, style, substyle) + else: + self.__lex.setEolFill(eolfill, style) + + def defaultFont(self, style, substyle=-1): """ Public method to get the default font for a style. - @param style the style number (int) - @return font + @param style style number + @type int + @param substyle sub-style number + @type int + @return default font + @rtype QFont """ - return self.defaultFonts[style] + if substyle >= 0: + font = self.__lex.substyleDefaultFont(style, substyle) + else: + font = self.__lex.defaultFont(style) - def font(self, style): + return font + + def font(self, style, substyle=-1): """ Public method to get the font for a style. - @param style the style number (int) + @param style style number + @type int + @param substyle sub-style number + @type int @return font + @rtype QFont """ - return self.fonts[style] + if substyle >= 0: + font = self.__lex.substyleFont(style, substyle) + else: + font = self.__lex.font(style) - def setFont(self, f, style): + return font + + def setFont(self, f, style, substyle=-1): """ Public method to set the font for a style. @param f font - @param style the style number (int) + @type QFont + @param style style number + @type int + @param substyle sub-style number + @type int + """ + if substyle >= 0: + self.__lex.setSubstyleFont(f, style, substyle) + else: + self.__lex.setFont(f, style) + + def defaultWords(self, style, substyle=-1): + """ + Public method to get the default list of words for a style. + + @param style style number + @type int + @param substyle sub-style number + @type int + @return whitespace separated default list of words + @rtype str + """ + if substyle >= 0: + words = self.__lex.substyleDefaultWords(style, substyle) + else: + words = "" + + return words + + def words(self, style, substyle=-1): + """ + Public method to get the list of words for a style. + + @param style style number + @type int + @param substyle sub-style number + @type int + @return whitespace separated list of words + @rtype str + """ + if substyle >= 0: + words = self.__lex.substyleWords(style, substyle) + else: + words = "" + + return words + + def setWords(self, words, style, substyle=-1): """ - self.fonts[style] = QFont(f) + Public method to set the list of words for a style. + + @param words whitespace separated list of words + @type str + @param style style number + @type int + @param substyle sub-style number + @type int + """ + if substyle >= 0: + # only supported for sub-styles + self.__lex.setSubstyleWords(words, style, substyle) + + def defaultDescription(self, style, substyle=-1): + """ + Public method to get the default descriptive string for a style. + + @param style style number + @type int + @param substyle sub-style number + @type int + @return default description of the style + @rtype str + """ + if substyle >= 0: + desc = self.__lex.substyleDefaultDescription(style, substyle) + else: + # for base styles return the hard coded description + desc = self.__lex.description(style) + return desc + + def description(self, style, substyle=-1): + """ + Public method to get a descriptive string for a style. + + @param style style number + @type int + @param substyle sub-style number + @type int + @return description of the style + @rtype str + """ + if substyle >= 0: + desc = self.__lex.substyleDescription(style, substyle) + else: + desc = self.__lex.description(style) + + return desc + + def setDescription(self, description, style, substyle=-1): + """ + Public method to set a descriptive string for a style. + + @param description description for the style + @type str + @param style style number + @type int + @param substyle sub-style number + @type int + """ + if substyle >= 0: + # only supported for sub-styles + self.__lex.setSubstyleDescription(description, style, substyle) + def language(self): """ Public method to get the lexers programming language. - @return language + @return lexer programming language + @rtype str """ - return self.__language + return self.__lex.language() + + def hasStyle(self, style, substyle): + """ + Public method to test for a given style definition. - def description(self, style): + @param style style number + @type int + @param substyle sub-style number + @type int + @return flag indicating the existence of a style definition + @rtype bool """ - Public method to get a descriptive string for a style. + if substyle >= 0: + ok = self.__lex.hasSubstyle(style, substyle) + else: + ok = True + + return ok + + def isBaseStyle(self, style): + """ + Public method to test, if a given style may have sub-styles. - @param style the style number (int) - @return description of the style (string) + @param style base style number + @type int + @return flag indicating that the style may have sub-styles + @rtype bool + """ + return self.__lex.hasSubstyles() and self.__lex.isBaseStyle(style) + + def addSubstyle(self, style): """ - if style in self.descriptions: - return self.descriptions[style] - else: - return "" + Public method to add an empty sub-style to a given style. + + @param style style number + @type int + @return allocated sub-style number or -1 to indicate an error + @rtype int + """ + return self.__lex.addSubstyle(style) + + def delSubstyle(self, style, substyle): + """ + Public method to delete a given sub-style definition. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return flag indicating successful deletion + @rtype bool + """ + return self.__lex.delSubstyle(style, substyle)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Preferences/SubstyleDefinitionDialog.py Sun Mar 17 11:58:28 2019 +0100 @@ -0,0 +1,133 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2019 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the sub-style definition dialog. +""" + +from __future__ import unicode_literals + +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox + +from E5Gui import E5MessageBox + +from .Ui_SubstyleDefinitionDialog import Ui_SubstyleDefinitionDialog + + +class SubstyleDefinitionDialog(QDialog, Ui_SubstyleDefinitionDialog): + """ + Class implementing the sub-style definition dialog. + """ + def __init__(self, lexer, style, substyle, parent=None): + """ + Constructor + + @param lexer reference to the lexer object + @type PreferencesLexer + @param style style number + @type int + @param substyle sub-style number + @type int + @param parent reference to the parent widget + @type QWidget + """ + super(SubstyleDefinitionDialog, self).__init__(parent) + self.setupUi(self) + + self.__lexer = lexer + self.__style = style + self.__substyle = substyle + + self.header.setText(self.tr("<h3>{0} - {1}</h3>").format( + self.__lexer.language(), self.__lexer.description(self.__style))) + if self.__substyle >= 0: + # it's an edit operation + self.descriptionEdit.setText( + self.__lexer.description(self.__style, self.__substyle)) + self.wordsEdit.setPlainText( + self.__lexer.words(self.__style, self.__substyle)) + + def __updateOk(self): + """ + Private slot to update the state of the OK button. + """ + self.buttonBox.button(QDialogButtonBox.Ok).setEnabled( + bool(self.descriptionEdit.text().strip()) and + bool(self.wordsEdit.toPlainText().strip()) + ) + + @pyqtSlot(str) + def on_descriptionEdit_textChanged(self, txt): + """ + Private slot handling changes of the description. + + @param txt text of the description + @type str + """ + self.__updateOk() + + @pyqtSlot() + def on_wordsEdit_textChanged(self): + """ + Private slot handling changes of the word list. + """ + self.__updateOk() + + @pyqtSlot() + def on_resetButton_clicked(self): + """ + Private slot to reset the dialog contents. + """ + ok = E5MessageBox.yesNo( + self, + self.tr("Reset Sub-Style Data"), + self.tr("""Shall the entered sub-style data be reset?""")) + if ok: + if self.__substyle >= 0: + self.descriptionEdit.setText( + self.__lexer.description(self.__style, self.__substyle)) + self.wordsEdit.setPlainText( + self.__lexer.words(self.__style, self.__substyle)) + else: + self.descriptionEdit.clear() + self.wordsEdit.clear() + + @pyqtSlot() + def on_defaultButton_clicked(self): + """ + Private slot to set the dialog contents to default values. + """ + filled = bool(self.descriptionEdit.text().strip()) or \ + bool(self.wordsEdit.toPlainText().strip()) + if filled: + ok = E5MessageBox.yesNo( + self, + self.tr("Set Sub-Style Data to Default"), + self.tr("""Shall the sub-style data be set to default""" + """ values?""")) + else: + ok = True + if ok: + if self.__substyle >= 0: + self.descriptionEdit.setText(self.__lexer.defaultDescription( + self.__style, self.__substyle)) + self.wordsEdit.setPlainText(self.__lexer.defaultWords( + self.__style, self.__substyle)) + else: + self.descriptionEdit.clear() + self.wordsEdit.clear() + + def getData(self): + """ + Public method to get the entered data. + + @return tuple containing the sub-style description and words list. + @rtype tuple of (str, str) + """ + return ( + self.descriptionEdit.text().strip(), + self.wordsEdit.toPlainText().strip(), + )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Preferences/SubstyleDefinitionDialog.ui Sun Mar 17 11:58:28 2019 +0100 @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>SubstyleDefinitionDialog</class> + <widget class="QDialog" name="SubstyleDefinitionDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>550</width> + <height>600</height> + </rect> + </property> + <property name="windowTitle"> + <string>Define Sub-Style</string> + </property> + <property name="sizeGripEnabled"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="header"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Description:</string> + </property> + </widget> + </item> + <item> + <widget class="E5ClearableLineEdit" name="descriptionEdit"> + <property name="toolTip"> + <string>Enter a short description for the style</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Words (separated by spaces):</string> + </property> + </widget> + </item> + <item> + <widget class="QPlainTextEdit" name="wordsEdit"> + <property name="toolTip"> + <string>Enter the list of words separated by space</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QPushButton" name="resetButton"> + <property name="toolTip"> + <string>Press to reset the data</string> + </property> + <property name="text"> + <string>Reset</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="defaultButton"> + <property name="toolTip"> + <string>Press to set the data to default values (if available)</string> + </property> + <property name="text"> + <string>Defaults</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>descriptionEdit</tabstop> + <tabstop>wordsEdit</tabstop> + <tabstop>resetButton</tabstop> + <tabstop>defaultButton</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>SubstyleDefinitionDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>SubstyleDefinitionDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>
--- a/QScintilla/Editor.py Sun Mar 10 19:31:06 2019 +0100 +++ b/QScintilla/Editor.py Sun Mar 17 11:58:28 2019 +0100 @@ -1632,6 +1632,8 @@ font = QFont(fdesc[0], int(fdesc[1])) self.lexer_.setDefaultFont(font) self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla") + if self.lexer_.hasSubstyles(): + self.lexer_.readSubstyles(self) # now set the lexer properties self.lexer_.initProperties() @@ -3311,6 +3313,8 @@ if self.lexer_: self.lexer_.readSettings( Preferences.Prefs.settings, "Scintilla") + if self.lexer_.hasSubstyles(): + self.lexer_.readSubstyles(self) self.lexer_.initProperties() self.setMonospaced(False) self.__setMarginsDisplay() @@ -4069,6 +4073,8 @@ # read the lexer settings and reinit the properties if self.lexer_ is not None: self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla") + if self.lexer_.hasSubstyles(): + self.lexer_.readSubstyles(self) self.lexer_.initProperties() self.lexer_.setDefaultColor(self.lexer_.color(0))
--- a/QScintilla/Lexers/Lexer.py Sun Mar 10 19:31:06 2019 +0100 +++ b/QScintilla/Lexers/Lexer.py Sun Mar 17 11:58:28 2019 +0100 @@ -243,3 +243,12 @@ @return lexer name (string) """ return self.lexer() + + def hasSubstyles(self): + """ + Public method to indicate the support of sub-styles. + + @return flag indicating sub-styling support + @rtype bool + """ + return False
--- a/QScintilla/Lexers/LexerCPP.py Sun Mar 10 19:31:06 2019 +0100 +++ b/QScintilla/Lexers/LexerCPP.py Sun Mar 17 11:58:28 2019 +0100 @@ -11,11 +11,11 @@ from PyQt5.Qsci import QsciLexerCPP, QsciScintilla -from .Lexer import Lexer +from .SubstyledLexer import SubstyledLexer import Preferences -class LexerCPP(Lexer, QsciLexerCPP): +class LexerCPP(SubstyledLexer, QsciLexerCPP): """ Subclass to implement some additional lexer dependant methods. """ @@ -28,7 +28,7 @@ insensitive (boolean) """ QsciLexerCPP.__init__(self, parent, caseInsensitiveKeywords) - Lexer.__init__(self) + SubstyledLexer.__init__(self) self.commentString = "//" self.streamCommentString = { @@ -40,6 +40,56 @@ 'middle': ' * ', 'end': ' */' } + + ############################################################## + ## default sub-style definitions + ############################################################## + + diffToSecondary = 0x40 + # This may need to be changed to be in line with Scintilla C++ lexer. + + # list of style numbers, that support sub-styling + self.baseStyles = [11, 17, 11 + diffToSecondary, 17 + diffToSecondary] + + self.defaultSubStyles = { + 11: { + 0: { + "Description": self.tr("Additional Identifier"), + "Words": "std map string vector", + "Style": { + "fore": 0xEE00AA, + } + }, + }, + 17: { + 0: { + "Description": self.tr("Additional JavaDoc keyword"), + "Words": "check", + "Style": { + "fore": 0x00AAEE, + } + }, + }, + 11 + diffToSecondary: { + 0: { + "Description": self.tr("Inactive additional identifier"), + "Words": "std map string vector", + "Style": { + "fore": 0xBB6666, + } + }, + }, + 17 + diffToSecondary: { + 0: { + "Description": self.tr( + "Inactive additional JavaDoc keyword"), + "Words": "check", + "Style": { + "fore": 0x6699AA, + } + }, + }, + } def initProperties(self): """
--- a/QScintilla/Lexers/LexerPygments.py Sun Mar 10 19:31:06 2019 +0100 +++ b/QScintilla/Lexers/LexerPygments.py Sun Mar 17 11:58:28 2019 +0100 @@ -301,7 +301,10 @@ @return language of the lexer (string) """ - return "Guessed" + if self.__pygmentsName: + return self.__pygmentsName + else: + return "Guessed" def description(self, style): """
--- a/QScintilla/Lexers/LexerPython.py Sun Mar 10 19:31:06 2019 +0100 +++ b/QScintilla/Lexers/LexerPython.py Sun Mar 17 11:58:28 2019 +0100 @@ -11,13 +11,14 @@ import re +from PyQt5.QtCore import QCoreApplication from PyQt5.Qsci import QsciLexerPython, QsciScintilla -from .Lexer import Lexer +from .SubstyledLexer import SubstyledLexer import Preferences -class LexerPython(Lexer, QsciLexerPython): +class LexerPython(SubstyledLexer, QsciLexerPython): """ Subclass to implement some additional lexer dependant methods. """ @@ -29,10 +30,62 @@ @param parent parent widget of this lexer """ QsciLexerPython.__init__(self, parent) - Lexer.__init__(self) + SubstyledLexer.__init__(self) self.variant = variant self.commentString = "#" + + ############################################################## + ## default sub-style definitions + ############################################################## + + # list of style numbers, that support sub-styling + self.baseStyles = [11] + + self.defaultSubStyles = { + 11: { + 0: { + "Description": QCoreApplication.translate( + "LexerPython", "Standard Library Modules"), + "Words": """ +__main__ _dummy_thread _thread abc aifc argparse array ast asynchat asyncio + asyncore atexit audioop base64 bdb binascii binhex bisect builtins bz2 + calendar cgi cgitb chunk cmath cmd code codecs codeop collections colorsys + compileall concurrent configparser contextlib copy copyreg crypt csv ctypes + curses datetime dbm decimal difflib dis distutils dummy_threading email + ensurepip enum errno faulthandler fcntl filecmp fileinput fnmatch formatter + fpectl fractions ftplib functools gc getopt getpass gettext glob grp gzip + hashlib heapq hmac html http http imaplib imghdr importlib inspect io + ipaddress itertools json keyword linecache locale logging lzma macpath + mailbox mailcap marshal math mimetypes mmap modulefinder msilib msvcrt + multiprocessing netrc nis nntplib numbers operator os ossaudiodev parser path + pathlib pdb pickle pickletools pipes pkgutil platform plistlib poplib posix + pprint pty pwd py_compile pyclbr queue quopri random re readline reprlib + resource rlcompleter runpy sched select selectors shelve shlex shutil signal + site smtpd smtplib sndhdr socket socketserver spwd sqlite3 ssl stat statistics + string stringprep struct subprocess sunau symbol symtable sys sysconfig syslog + tabnanny tarfile telnetlib tempfile termios textwrap threading time timeit + tkinter token tokenize trace traceback tracemalloc tty turtle types + unicodedata unittest urllib uu uuid venv warnings wave weakref webbrowser + winreg winsound wsgiref xdrlib xml xmlrpc zipfile zipimport zlib""", + "Style": { + "fore": 0xDD9900, + "font_bold": True, + } + }, + 1: { + "Description": QCoreApplication.translate( + "LexerPython", "__future__ Imports"), + "Words": """ +__future__ with_statement unicode_literals print_function division + absolute_import generator_stop annotations""", + "Style": { + "fore": 0xEE00AA, + "font_italic": True, + } + } + }, + } def language(self): """
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QScintilla/Lexers/SubstyledLexer.py Sun Mar 17 11:58:28 2019 +0100 @@ -0,0 +1,781 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2003 - 2019 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing the lexer mixin class. +""" + +from __future__ import unicode_literals + +import copy + +from PyQt5.QtGui import QColor + +from .Lexer import Lexer + +import Preferences + + +class SubstyledLexer(Lexer): + """ + Class to implement the sub-styled lexer mixin class. + """ + def __init__(self): + """ + Constructor + """ + super(SubstyledLexer, self).__init__() + + self.baseStyles = [] + # list of style numbers, that support sub-styling + self.defaultSubStyles = {} + # dictionary with sub-styling data + # main key: base style number, value : dict with + # key: sub-style number, value: dict with + # 'Description': string containing a short description + # 'Words': string of whitespace separated words to be styled + # 'Style': dictionary with styling data (only difference to + # the base style is required + # 'fore': foreground color (int containing RGB values) + # 'paper': background color (int containing RGB values) + # 'eolfill': fill to eol (bool) + # 'font_family': font family (str) + # 'font_size: point size (int) + # 'font_bold: bold font (bool) + # 'font_italic: italic font (bool) + # 'font_underline: underlined font (bool) + + self.__subStyles = {} + self.__subStylesInitialized = False + + def loadSubstyles(self): + """ + Public method to load the sub-styles from the settings file. + """ + settings = Preferences.Prefs.settings + + # Step 1: check if sub-styles were defined and saved + subStylesDefined = False + for baseStyle in self.baseStyles: + key = "Scintilla/{0}/style{1}/SubStyleLength".format( + self.language(), baseStyle) + subStylesDefined |= settings.contains(key) + # Step 2.1: load default sub-styles, if none were defined + if not subStylesDefined: + self.loadDefaultSubStyles() + + # Step 2.2: load from settings file + else: + self.__subStyles = {} + for baseStyle in self.baseStyles: + key = "Scintilla/{0}/style{1}/SubStyleLength".format( + self.language(), baseStyle) + if settings.contains(key): + subStyleLength = int(settings.value(key)) + if subStyleLength: + self.__subStyles[baseStyle] = {} + for subStyle in range(subStyleLength): + substyleKey = \ + "Scintilla/{0}/style{1}/substyle{2}/"\ + .format(self.language(), baseStyle, subStyle) + if settings.contains(substyleKey + "Description"): + subStyleData = {} + subStyleData["Description"] = settings.value( + substyleKey + "Description", "") + subStyleData["Words"] = settings.value( + substyleKey + "Words", "") + style = {} + + key = substyleKey + "fore" + if settings.contains(key): + style["fore"] = int(settings.value(key)) + key = substyleKey + "paper" + if settings.contains(key): + style["paper"] = int(settings.value(key)) + key = substyleKey + "eolfill" + if settings.contains(key): + style["eolfill"] = Preferences.toBool( + settings.value(key)) + key = substyleKey + "font_family" + if settings.contains(key): + style["font_family"] = settings.value(key) + key = substyleKey + "font_size" + if settings.contains(key): + style["font_size"] = \ + int(settings.value(key)) + key = substyleKey + "font_bold" + if settings.contains(key): + style["font_bold"] = Preferences.toBool( + settings.value(key)) + key = substyleKey + "font_italic" + if settings.contains(key): + style["font_italic"] = Preferences.toBool( + settings.value(key)) + key = substyleKey + "font_underline" + if settings.contains(key): + style["font_underline"] = \ + Preferences.toBool(settings.value(key)) + + subStyleData["Style"] = style + + self.__subStyles[baseStyle][subStyle] = \ + subStyleData + + else: + # initialize with default + self.__subStyles[baseStyle][subStyle] = \ + copy.deepcopy(self.defaultSubStyles + [baseStyle][subStyle]) + + self.__subStylesInitialized = True + + def loadDefaultSubStyles(self): + """ + Public method to load the default sub-style definitions. + """ + self.__subStyles = copy.deepcopy(self.defaultSubStyles) + + def readSubstyles(self, editor): + """ + Public method to load the sub-styles and configure the editor. + + @param editor reference to the editor object + @type QsciScintilla + """ + subStyleBasesLength = editor.SendScintilla( + editor.SCI_GETSUBSTYLEBASES, 0, None) + if not subStyleBasesLength: + # lexer does not support sub-styling + return + + self.loadSubstyles() + + # free existing sub-styles first + editor.SendScintilla(editor.SCI_FREESUBSTYLES) + subStyleBases = b"\00" * (subStyleBasesLength + 1) + editor.SendScintilla(editor.SCI_GETSUBSTYLEBASES, 0, subStyleBases) + distanceToSecondary = editor.SendScintilla( + editor.SCI_DISTANCETOSECONDARYSTYLES) + + subStyleBases = [b for b in bytearray(subStyleBases[:-1])] + if distanceToSecondary: + subStyleBases.extend(b + distanceToSecondary + for b in subStyleBases[:]) + for baseStyleNo in subStyleBases: + if baseStyleNo in self.__subStyles: + subStylesData = self.__subStyles[baseStyleNo] + subStyleLength = len(subStylesData) + subStyleStart = editor.SendScintilla( + editor.SCI_ALLOCATESUBSTYLES, baseStyleNo, subStyleLength) + if subStyleStart < 0: + subStyleLength = 0 + subStyleIndex = -1 + for subStyleKey in sorted(subStylesData.keys()): + subStyleIndex += 1 + styleNo = subStyleStart + subStyleIndex + subStyle = subStylesData[subStyleKey] + # set the words + editor.SendScintilla( + editor.SCI_SETIDENTIFIERS, + styleNo, + subStyle["Words"].encode()) + + # set the style + style = subStyle["Style"] + if "fore" in style: + color = QColor( + style["fore"] >> 16 & 0xff, + style["fore"] >> 8 & 0xff, + style["fore"] & 0xff, + ) + else: + color = self.color(baseStyleNo) + self.setColor(color, styleNo) + + if "paper" in style: + color = QColor( + style["paper"] >> 16 & 0xff, + style["paper"] >> 8 & 0xff, + style["paper"] & 0xff, + ) + else: + color = self.paper(baseStyleNo) + self.setPaper(color, styleNo) + + if "eolfill" in style: + eolFill = style["eolfill"] + else: + eolFill = self.eolFill(baseStyleNo) + self.setEolFill(eolFill, styleNo) + + font = self.font(baseStyleNo) + if "font_family" in style: + font.setFamily(style["font_family"]) + if "font_size" in style: + font.setPointSize(style["font_size"]) + if "font_bold" in style: + font.setBold(style["font_bold"]) + if "font_italic" in style: + font.setItalic(style["font_italic"]) + if "font_underline" in style: + font.setUnderline(style["font_underline"]) + self.setFont(font, styleNo) + + def writeSubstyles(self): + """ + Public method to save the sub-styles. + """ + if not self.__subStylesInitialized: + return + + settings = Preferences.Prefs.settings + + # Step 1: remove all sub-style definitions first + for baseStyle in self.baseStyles: + key = "Scintilla/{0}/style{1}/SubStyleLength".format( + self.language(), baseStyle) + if settings.contains(key): + subStyleLength = int(settings.value(key)) + if subStyleLength: + for subStyle in range(subStyleLength): + substyleKey = "Scintilla/{0}/style{1}/substyle{2}/"\ + .format(self.language(), baseStyle, subStyle) + settings.remove(substyleKey) + + # Step 2: save the defined sub-styles + for baseStyle in self.baseStyles: + key = "Scintilla/{0}/style{1}/SubStyleLength".format( + self.language(), baseStyle) + settings.setValue(key, len(self.__subStyles[baseStyle])) + subStyleIndex = -1 + for subStyle in sorted(self.__subStyles[baseStyle].keys()): + subStyleIndex += 1 + substyleKey = "Scintilla/{0}/style{1}/substyle{2}/".format( + self.language(), baseStyle, subStyleIndex) + subStyleData = self.__subStyles[baseStyle][subStyle] + + if not subStyleData["Description"] and \ + not subStyleData["Words"]: + # invalid or incomplete sub-style definition + continue + + settings.setValue(substyleKey + "Description", + subStyleData["Description"]) + settings.setValue(substyleKey + "Words", + subStyleData["Words"]) + + style = subStyleData["Style"] + if "fore" in style: + color = style["fore"] + else: + col = self.color(baseStyle) + color = col.red() << 16 | col.green() << 8 | col.blue() + settings.setValue(substyleKey + "fore", color) + if "paper" in style: + color = style["paper"] + else: + col = self.paper(baseStyle) + color = col.red() << 16 | col.green() << 8 | col.blue() + settings.setValue(substyleKey + "paper", color) + if "eolfill" in style: + eolfill = style["eolfill"] + else: + eolfill = self.eolFill(baseStyle) + settings.setValue(substyleKey + "eolfill", eolfill) + font = self.font(baseStyle) + if "font_family" in style: + family = style["font_family"] + else: + family = font.family() + settings.setValue(substyleKey + "font_family", family) + if "font_size" in style: + size = style["font_size"] + else: + size = font.pointSize() + settings.setValue(substyleKey + "font_size", size) + if "font_bold" in style: + bold = style["font_bold"] + else: + bold = font.bold() + settings.setValue(substyleKey + "font_bold", bold) + if "font_italic" in style: + italic = style["font_italic"] + else: + italic = font.italic() + settings.setValue(substyleKey + "font_italic", italic) + if "font_underline" in style: + underline = style["font_underline"] + else: + underline = font.underline() + settings.setValue(substyleKey + "font_underline", underline) + + def hasSubstyles(self): + """ + Public method to indicate the support of sub-styles. + + @return flag indicating sub-styling support + @rtype bool + """ + return True + + def getBaseStyles(self): + """ + Public method to get the list of supported base styles. + + @return list of base styles + @rtype list of int + """ + return self.baseStyles[:] + + def substylesCount(self, style): + """ + Public method to get the number of defined sub-styles. + + @param style base style number + @type int + @return number of defined sub-styles + @rtype int + """ + if style in self.__subStyles: + count = len(self.__subStyles[style]) + else: + count = 0 + + return count + + def setSubstyleDescription(self, description, style, substyle): + """ + Public method to set the description for a sub-style. + + @param description description to be set + @type str + @param style base style number + @type int + @param substyle sub-style number + @type int + """ + if style in self.__subStyles and substyle in self.__subStyles[style]: + self.__subStyles[style][substyle]["Description"] = \ + description.strip() + + def substyleDescription(self, style, substyle): + """ + Public method to get the description of a sub-style. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return sub-style description + @rtype str + """ + if style in self.__subStyles and substyle in self.__subStyles[style]: + desc = self.__subStyles[style][substyle]["Description"].strip() + else: + desc = "" + + return desc + + def setSubstyleWords(self, words, style, substyle): + """ + Public method to set the words for a sub-style. + + @param words words to be set separated by white-space + @type str + @param style base style number + @type int + @param substyle sub-style number + @type int + """ + if style in self.__subStyles and substyle in self.__subStyles[style]: + self.__subStyles[style][substyle]["Words"] = words.strip() + + def substyleWords(self, style, substyle): + """ + Public method to get the words of a sub-style. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return white-space separated word list + @rtype str + """ + if style in self.__subStyles and substyle in self.__subStyles[style]: + words = self.__subStyles[style][substyle]["Words"].strip() + else: + words = "" + + return words + + def setSubstyleColor(self, color, style, substyle): + """ + Public method to set the foreground color of a sub-style. + + @param color foreground color to be set + @type QColor + @param style base style number + @type int + @param substyle sub-style number + @type int + """ + if style in self.__subStyles and substyle in self.__subStyles[style]: + self.__subStyles[style][substyle]["Style"]["fore"] = \ + color.red() << 16 | color.green() << 8 | color.blue() + + def substyleColor(self, style, substyle): + """ + Public method to get the sub-style foreground color. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return foreground color + @rtype QColor + """ + color = self.color(style) + + if style in self.__subStyles and substyle in self.__subStyles[style]: + styleData = self.__subStyles[style][substyle]["Style"] + if "fore" in styleData: + color = QColor( + styleData["fore"] >> 16 & 0xff, + styleData["fore"] >> 8 & 0xff, + styleData["fore"] & 0xff, + ) + + return color + + def setSubstylePaper(self, color, style, substyle): + """ + Public method to set the background color of a sub-style. + + @param color background color to be set + @type QColor + @param style base style number + @type int + @param substyle sub-style number + @type int + """ + if style in self.__subStyles and substyle in self.__subStyles[style]: + self.__subStyles[style][substyle]["Style"]["paper"] = \ + color.red() << 16 | color.green() << 8 | color.blue() + + def substylePaper(self, style, substyle): + """ + Public method to get the sub-style background color. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return background color + @rtype QColor + """ + color = self.paper(style) + + if style in self.__subStyles and substyle in self.__subStyles[style]: + styleData = self.__subStyles[style][substyle]["Style"] + if "paper" in styleData: + color = QColor( + styleData["paper"] >> 16 & 0xff, + styleData["paper"] >> 8 & 0xff, + styleData["paper"] & 0xff, + ) + + return color + + def setSubstyleEolFill(self, eolFill, style, substyle): + """ + Public method to set the eolfill flag of a sub-style. + + @param eolFill eolfill flag to be set + @type bool + @param style base style number + @type int + @param substyle sub-style number + @type int + """ + if style in self.__subStyles and substyle in self.__subStyles[style]: + self.__subStyles[style][substyle]["Style"]["eolfill"] = \ + eolFill + + def substyleEolFill(self, style, substyle): + """ + Public method to get the eolfill flag. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return eolfill flag + @rtype bool + """ + eolFill = self.eolFill(style) + + if style in self.__subStyles and substyle in self.__subStyles[style]: + styleData = self.__subStyles[style][substyle]["Style"] + if "eolfill" in styleData: + eolFill = styleData["eolfill"] + + return eolFill + + def setSubstyleFont(self, font, style, substyle): + """ + Public method to set the font of a sub-style. + + @param font font to be set + @type QFont + @param style base style number + @type int + @param substyle sub-style number + @type int + """ + if style in self.__subStyles and substyle in self.__subStyles[style]: + self.__subStyles[style][substyle]["Style"]["font_family"] = \ + font.family() + self.__subStyles[style][substyle]["Style"]["font_size"] = \ + font.pointSize() + self.__subStyles[style][substyle]["Style"]["font_bold"] = \ + font.bold() + self.__subStyles[style][substyle]["Style"]["font_italic"] = \ + font.italic() + self.__subStyles[style][substyle]["Style"]["font_underline"] = \ + font.underline() + + def substyleFont(self, style, substyle): + """ + Public method to get the sub-style font. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return font + @rtype QFont + """ + font = self.font(style) + + if style in self.__subStyles and substyle in self.__subStyles[style]: + styleData = self.__subStyles[style][substyle]["Style"] + if "font_family" in styleData: + font.setFamily(styleData["font_family"]) + if "font_size" in styleData: + font.setPointSize(styleData["font_size"]) + if "font_bold" in styleData: + font.setBold(styleData["font_bold"]) + if "font_italic" in styleData: + font.setItalic(styleData["font_italic"]) + if "font_underline" in styleData: + font.setUnderline(styleData["font_underline"]) + + return font + + def substyleDefaultDescription(self, style, substyle): + """ + Public method to get the default description of a sub-style. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return sub-style default description + @rtype str + """ + description = "" + + if style in self.defaultSubStyles and \ + substyle in self.defaultSubStyles[style]: + substyleData = self.defaultSubStyles[style][substyle] + description = substyleData["Description"].strip() + + return description + + def substyleDefaultWords(self, style, substyle): + """ + Public method to get the default words of a sub-style. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return white-space separated default word list + @rtype str + """ + words = "" + + if style in self.defaultSubStyles and \ + substyle in self.defaultSubStyles[style]: + substyleData = self.defaultSubStyles[style][substyle] + words = substyleData["Words"].strip() + + return words + + def substyleDefaultColor(self, style, substyle): + """ + Public method to get the sub-style default foreground color. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return default foreground color + @rtype QColor + """ + color = self.defaultColor(style) + + if style in self.defaultSubStyles and \ + substyle in self.defaultSubStyles[style]: + styleData = self.defaultSubStyles[style][substyle]["Style"] + if "fore" in styleData: + color = QColor( + styleData["fore"] >> 16 & 0xff, + styleData["fore"] >> 8 & 0xff, + styleData["fore"] & 0xff, + ) + + return color + + def substyleDefaultPaper(self, style, substyle): + """ + Public method to get the sub-style default background color. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return default background color + @rtype QColor + """ + color = self.defaultPaper(style) + + if style in self.defaultSubStyles and \ + substyle in self.defaultSubStyles[style]: + styleData = self.defaultSubStyles[style][substyle]["Style"] + if "paper" in styleData: + color = QColor( + styleData["paper"] >> 16 & 0xff, + styleData["paper"] >> 8 & 0xff, + styleData["paper"] & 0xff, + ) + + return color + + def substyleDefaultEolFill(self, style, substyle): + """ + Public method to get the default eolfill flag. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return default eolfill flag + @rtype bool + """ + eolFill = self.defaultEolFill(style) + + if style in self.defaultSubStyles and \ + substyle in self.defaultSubStyles[style]: + styleData = self.defaultSubStyles[style][substyle]["Style"] + if "eolfill" in styleData: + eolFill = styleData["eolfill"] + + return eolFill + + def substyleDefaultFont(self, style, substyle): + """ + Public method to get the default sub-style font. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return default font + @rtype QFont + """ + font = self.defaultFont(style) + + if style in self.defaultSubStyles and \ + substyle in self.defaultSubStyles[style]: + styleData = self.defaultSubStyles[style][substyle]["Style"] + if "font_family" in styleData: + font.setFamily(styleData["font_family"]) + if "font_size" in styleData: + font.setPointSize(styleData["font_size"]) + if "font_bold" in styleData: + font.setBold(styleData["font_bold"]) + if "font_italic" in styleData: + font.setItalic(styleData["font_italic"]) + if "font_underline" in styleData: + font.setUnderline(styleData["font_underline"]) + + return font + + def addSubstyle(self, style): + """ + Public method to add an empty sub-style to a given base style. + + @param style base style number + @type int + @return allocated sub-style number or -1 to indicate an error + @rtype int + """ + if style in self.__subStyles: + lastSubStyle = sorted(self.__subStyles[style].keys())[-1] + subStyle = lastSubStyle + 1 + self.__subStyles[style][subStyle] = { + "Description": "", + "Words": "", + "Style": {}, + } + else: + subStyle = -1 + + return subStyle + + def delSubstyle(self, style, substyle): + """ + Public method to delete a given sub-style definition. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return flag indicating successful deletion + @rtype bool + """ + ok = False + + if style in self.__subStyles and substyle in self.__subStyles[style]: + del self.__subStyles[style][substyle] + ok = True + + return ok + + def hasSubstyle(self, style, substyle): + """ + Public method to test for a given sub-style definition. + + @param style base style number + @type int + @param substyle sub-style number + @type int + @return flag indicating the existence of a sub-style definition + @rtype bool + """ + return (style in self.__subStyles and + substyle in self.__subStyles[style]) + + def isBaseStyle(self, style): + """ + Public method to test, if a given style may have sub-styles. + + @param style base style number + @type int + @return flag indicating that the style may have sub-styles + @rtype bool + """ + return style in self.baseStyles
--- a/QScintilla/MiniEditor.py Sun Mar 10 19:31:06 2019 +0100 +++ b/QScintilla/MiniEditor.py Sun Mar 17 11:58:28 2019 +0100 @@ -3044,6 +3044,8 @@ font = QFont(fdesc[0], int(fdesc[1])) self.lexer_.setDefaultFont(font) self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla") + if self.lexer_.hasSubstyles(): + self.lexer_.readSubstyles(self.__textEdit) # now set the lexer properties self.lexer_.initProperties()
--- a/QScintilla/Printer.py Sun Mar 10 19:31:06 2019 +0100 +++ b/QScintilla/Printer.py Sun Mar 17 11:58:28 2019 +0100 @@ -19,7 +19,7 @@ class Printer(QsciPrinter): """ - Class implementing the QextScintillaPrinter with a header. + Class implementing the QsciPrinter with a header. """ def __init__(self, mode=QPrinter.ScreenResolution): """
--- a/QScintilla/Shell.py Sun Mar 10 19:31:06 2019 +0100 +++ b/QScintilla/Shell.py Sun Mar 17 11:58:28 2019 +0100 @@ -437,6 +437,8 @@ self.lexer_.setDefaultFont(font) self.setLexer(self.lexer_) self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla") + if self.lexer_.hasSubstyles(): + self.lexer_.readSubstyles(self) # initialize the lexer APIs settings api = self.vm.getAPIsManager().getAPIs(self.language)
--- a/eric6.e4p Sun Mar 10 19:31:06 2019 +0100 +++ b/eric6.e4p Sun Mar 17 11:58:28 2019 +0100 @@ -915,6 +915,7 @@ <Source>Preferences/ShortcutDialog.py</Source> <Source>Preferences/Shortcuts.py</Source> <Source>Preferences/ShortcutsDialog.py</Source> + <Source>Preferences/SubstyleDefinitionDialog.py</Source> <Source>Preferences/ToolConfigurationDialog.py</Source> <Source>Preferences/ToolGroupConfigurationDialog.py</Source> <Source>Preferences/ViewProfileDialog.py</Source> @@ -1009,6 +1010,7 @@ <Source>QScintilla/Lexers/LexerVHDL.py</Source> <Source>QScintilla/Lexers/LexerXML.py</Source> <Source>QScintilla/Lexers/LexerYAML.py</Source> + <Source>QScintilla/Lexers/SubstyledLexer.py</Source> <Source>QScintilla/Lexers/__init__.py</Source> <Source>QScintilla/MarkupProviders/HtmlProvider.py</Source> <Source>QScintilla/MarkupProviders/HyperlinkMarkupDialog.py</Source> @@ -2089,6 +2091,7 @@ <Form>Preferences/ProgramsDialog.ui</Form> <Form>Preferences/ShortcutDialog.ui</Form> <Form>Preferences/ShortcutsDialog.ui</Form> + <Form>Preferences/SubstyleDefinitionDialog.ui</Form> <Form>Preferences/ToolConfigurationDialog.ui</Form> <Form>Preferences/ToolGroupConfigurationDialog.ui</Form> <Form>Preferences/ViewProfileSidebarsDialog.ui</Form>
--- a/i18n/eric6_cs.ts Sun Mar 10 19:31:06 2019 +0100 +++ b/i18n/eric6_cs.ts Sun Mar 17 11:58:28 2019 +0100 @@ -9248,27 +9248,27 @@ <context> <name>E5GoogleMail</name> <message> - <location filename="../E5Network/E5GoogleMail.py" line="191"/> + <location filename="../E5Network/E5GoogleMail.py" line="188"/> <source>The client secrets file is not present. Has the Gmail API been enabled?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Network/E5GoogleMail.py" line="228"/> + <location filename="../E5Network/E5GoogleMail.py" line="225"/> <source>OAuth2 Authorization Code</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Network/E5GoogleMail.py" line="228"/> + <location filename="../E5Network/E5GoogleMail.py" line="225"/> <source>Enter the OAuth2 authorization code:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Network/E5GoogleMail.py" line="272"/> + <location filename="../E5Network/E5GoogleMail.py" line="269"/> <source>No authorized session available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../E5Network/E5GoogleMail.py" line="293"/> + <location filename="../E5Network/E5GoogleMail.py" line="290"/> <source>Message #{0} sent.</source> <translation type="unfinished"></translation> </message> @@ -10733,7 +10733,7 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="2942"/> + <location filename="../QScintilla/Editor.py" line="2944"/> <source>Open File</source> <translation>Otevřít soubor</translation> </message> @@ -10983,7 +10983,7 @@ <translation>Editovat breakpoint...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5332"/> + <location filename="../QScintilla/Editor.py" line="5343"/> <source>Enable breakpoint</source> <translation>Aktivovat breakpoint</translation> </message> @@ -11023,237 +11023,237 @@ <translation>Předchozí úloha</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1812"/> + <location filename="../QScintilla/Editor.py" line="1814"/> <source>Modification of Read Only file</source> <translation>Modifikace souboru otevřeného jen pro čtení</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1812"/> + <location filename="../QScintilla/Editor.py" line="1814"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Pokoušíte se změnit soubor, který je otevřen jen pro čtení. Prosím, uložte jej nejdříve do jiného souboru.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2498"/> + <location filename="../QScintilla/Editor.py" line="2500"/> <source>Printing...</source> <translation>Tisk...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2515"/> - <source>Printing completed</source> - <translation>Tisk je hotov</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="2517"/> + <source>Printing completed</source> + <translation>Tisk je hotov</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="2519"/> <source>Error while printing</source> <translation>Chyba během tisku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2520"/> + <location filename="../QScintilla/Editor.py" line="2522"/> <source>Printing aborted</source> <translation>Tisk byl zrušen</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3115"/> + <location filename="../QScintilla/Editor.py" line="3117"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2882"/> + <location filename="../QScintilla/Editor.py" line="2884"/> <source>File Modified</source> <translation>Soubor je modifikován</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4520"/> + <location filename="../QScintilla/Editor.py" line="4531"/> <source>Autocompletion</source> <translation>Autodoplňování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4520"/> + <location filename="../QScintilla/Editor.py" line="4531"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Autodoplňování není dostupné protože zdrojová část autodoplňování nebyla nalezena.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5335"/> + <location filename="../QScintilla/Editor.py" line="5346"/> <source>Disable breakpoint</source> <translation>Deaktivovat breakpoint</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5692"/> + <location filename="../QScintilla/Editor.py" line="5703"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5692"/> + <location filename="../QScintilla/Editor.py" line="5703"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor s pokrytím kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5755"/> + <location filename="../QScintilla/Editor.py" line="5766"/> <source>Show Code Coverage Annotations</source> <translation>Zobrazit poznámky pokrytí kódu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5748"/> + <location filename="../QScintilla/Editor.py" line="5759"/> <source>All lines have been covered.</source> <translation>Všechny řádky byly pokryty.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5755"/> + <location filename="../QScintilla/Editor.py" line="5766"/> <source>There is no coverage file available.</source> <translation>Soubor s pokrytím není dostupný.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5870"/> + <location filename="../QScintilla/Editor.py" line="5881"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5870"/> + <location filename="../QScintilla/Editor.py" line="5881"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6030"/> + <location filename="../QScintilla/Editor.py" line="6041"/> <source>Syntax Error</source> <translation>Chyba syntaxe</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6030"/> + <location filename="../QScintilla/Editor.py" line="6041"/> <source>No syntax error message available.</source> <translation>Hlášení syntaktické chyby není dostupné.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6416"/> + <location filename="../QScintilla/Editor.py" line="6427"/> <source>Macro Name</source> <translation>Název makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6416"/> + <location filename="../QScintilla/Editor.py" line="6427"/> <source>Select a macro name:</source> <translation>Vyberte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6444"/> + <location filename="../QScintilla/Editor.py" line="6455"/> <source>Load macro file</source> <translation>Načíst soubor makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6487"/> + <location filename="../QScintilla/Editor.py" line="6498"/> <source>Macro files (*.macro)</source> <translation>Macro soubory (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6467"/> + <location filename="../QScintilla/Editor.py" line="6478"/> <source>Error loading macro</source> <translation>Chyba při načítání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6487"/> + <location filename="../QScintilla/Editor.py" line="6498"/> <source>Save macro file</source> <translation>Uložit soubor s makrem</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6504"/> + <location filename="../QScintilla/Editor.py" line="6515"/> <source>Save macro</source> <translation>Uložit makro</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6520"/> + <location filename="../QScintilla/Editor.py" line="6531"/> <source>Error saving macro</source> <translation>Chyba při ukládání makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6533"/> + <location filename="../QScintilla/Editor.py" line="6544"/> <source>Start Macro Recording</source> <translation>Spustit záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6533"/> + <location filename="../QScintilla/Editor.py" line="6544"/> <source>Macro recording is already active. Start new?</source> <translation>Nahrávání makra již probíhá. Spustit nové?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6559"/> + <location filename="../QScintilla/Editor.py" line="6570"/> <source>Macro Recording</source> <translation>Záznam makra</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6559"/> + <location filename="../QScintilla/Editor.py" line="6570"/> <source>Enter name of the macro:</source> <translation>Vložte název makra:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6697"/> + <location filename="../QScintilla/Editor.py" line="6708"/> <source>File changed</source> <translation>Soubor změněn</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7001"/> + <location filename="../QScintilla/Editor.py" line="7012"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7022"/> + <location filename="../QScintilla/Editor.py" line="7033"/> <source>Resources</source> <translation>Zdroje</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7024"/> - <source>Add file...</source> - <translation>Přidat soubor...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7026"/> - <source>Add files...</source> - <translation>Přidat soubory...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7028"/> - <source>Add aliased file...</source> - <translation>Přidat zástupce souboru...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="7031"/> - <source>Add localized resource...</source> - <translation>Přidat lokalizované resource...</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="7035"/> + <source>Add file...</source> + <translation>Přidat soubor...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7037"/> + <source>Add files...</source> + <translation>Přidat soubory...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7039"/> + <source>Add aliased file...</source> + <translation>Přidat zástupce souboru...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7042"/> + <source>Add localized resource...</source> + <translation>Přidat lokalizované resource...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="7046"/> <source>Add resource frame</source> <translation>Přidat resource frame</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7054"/> + <location filename="../QScintilla/Editor.py" line="7065"/> <source>Add file resource</source> <translation>Přidat soubor resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7070"/> + <location filename="../QScintilla/Editor.py" line="7081"/> <source>Add file resources</source> <translation>Přidat soubory resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7098"/> + <location filename="../QScintilla/Editor.py" line="7109"/> <source>Add aliased file resource</source> <translation>Přidat zástupce souboru resource</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7162"/> + <location filename="../QScintilla/Editor.py" line="7173"/> <source>Package Diagram</source> <translation>Diagram balíčku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7162"/> + <location filename="../QScintilla/Editor.py" line="7173"/> <source>Include class attributes?</source> <translation>Včetně atributů třídy?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7196"/> + <location filename="../QScintilla/Editor.py" line="7207"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7196"/> + <location filename="../QScintilla/Editor.py" line="7207"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> @@ -11273,12 +11273,12 @@ <translation>Nebyl zadán forám exportu. Zrušeno....</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7182"/> + <location filename="../QScintilla/Editor.py" line="7193"/> <source>Imports Diagram</source> <translation>Importovat diagram</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7182"/> + <location filename="../QScintilla/Editor.py" line="7193"/> <source>Include imports from external modules?</source> <translation>Zahrnout importy z externích modulů?</translation> </message> @@ -11348,7 +11348,7 @@ <translation>Použít Pygments lexer.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7489"/> + <location filename="../QScintilla/Editor.py" line="7500"/> <source>Check spelling...</source> <translation>Zatrhnout kontrolu...</translation> </message> @@ -11358,12 +11358,12 @@ <translation>Zatrhnout výběr kontroly...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7492"/> + <location filename="../QScintilla/Editor.py" line="7503"/> <source>Add to dictionary</source> <translation>Přidat do slovníku</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7494"/> + <location filename="../QScintilla/Editor.py" line="7505"/> <source>Ignore All</source> <translation>Ignorovat vše</translation> </message> @@ -11388,47 +11388,47 @@ <translation>Alternativy ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2882"/> + <location filename="../QScintilla/Editor.py" line="2884"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>Soubor <b>{0}</b> obsahuje neuložené změny.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2942"/> + <location filename="../QScintilla/Editor.py" line="2944"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3056"/> + <location filename="../QScintilla/Editor.py" line="3058"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nemůže být přejmenován.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6458"/> + <location filename="../QScintilla/Editor.py" line="6469"/> <source><p>The macro file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s makrem <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6467"/> + <location filename="../QScintilla/Editor.py" line="6478"/> <source><p>The macro file <b>{0}</b> is corrupt.</p></source> <translation><p>Soubor s makrem <b>{0}</b> je poškozen.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6520"/> + <location filename="../QScintilla/Editor.py" line="6531"/> <source><p>The macro file <b>{0}</b> could not be written.</p></source> <translation><p>So souboru s makrem <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6861"/> + <location filename="../QScintilla/Editor.py" line="6872"/> <source>{0} (ro)</source> <translation>{0} (ro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7001"/> + <location filename="../QScintilla/Editor.py" line="7012"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7098"/> + <location filename="../QScintilla/Editor.py" line="7109"/> <source>Alias for file <b>{0}</b>:</source> <translation>Zástupce pro soubor <b>{0}</b>:</translation> </message> @@ -11453,27 +11453,27 @@ <translation>Vyčistit varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="3115"/> + <location filename="../QScintilla/Editor.py" line="3117"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6504"/> + <location filename="../QScintilla/Editor.py" line="6515"/> <source><p>The macro file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6317"/> <source>Warning: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6313"/> + <location filename="../QScintilla/Editor.py" line="6324"/> <source>Error: {0}</source> <translation type="unfinished">Chyby: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6693"/> + <location filename="../QScintilla/Editor.py" line="6704"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation type="unfinished"></translation> </message> @@ -11498,27 +11498,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7906"/> + <location filename="../QScintilla/Editor.py" line="7917"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7906"/> + <location filename="../QScintilla/Editor.py" line="7917"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6242"/> + <location filename="../QScintilla/Editor.py" line="6253"/> <source>Warning</source> <translation type="unfinished">Varování</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6242"/> + <location filename="../QScintilla/Editor.py" line="6253"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6303"/> + <location filename="../QScintilla/Editor.py" line="6314"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> @@ -11543,7 +11543,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6687"/> + <location filename="../QScintilla/Editor.py" line="6698"/> <source><p>The file <b>{0}</b> has been changed while it was opened in eric6. Reread it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> byl změněn po té co již byl načten do eric5. Znovu načíst?</p> {0}?} {6.?}</translation> </message> @@ -11558,32 +11558,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4645"/> + <location filename="../QScintilla/Editor.py" line="4656"/> <source>Auto-Completion Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4645"/> + <location filename="../QScintilla/Editor.py" line="4656"/> <source>The completion list provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4917"/> + <location filename="../QScintilla/Editor.py" line="4928"/> <source>Call-Tips Provider</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4917"/> + <location filename="../QScintilla/Editor.py" line="4928"/> <source>The call-tips provider '{0}' was already registered. Ignoring duplicate request.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7993"/> + <location filename="../QScintilla/Editor.py" line="8004"/> <source>Register Mouse Click Handler</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7993"/> + <location filename="../QScintilla/Editor.py" line="8004"/> <source>A mouse click handler for "{0}" was already registered by "{1}". Aborting request by "{2}"...</source> <translation type="unfinished"></translation> </message> @@ -11613,12 +11613,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8114"/> + <location filename="../QScintilla/Editor.py" line="8125"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="8114"/> + <location filename="../QScintilla/Editor.py" line="8125"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -13041,210 +13041,255 @@ <translation>Element stylu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="110"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="197"/> <source>Select end of line fill.</source> <translation>Výběr výplně konce řádku.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="358"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="431"/> <source>Fill to end of line</source> <translation>Vyplnit do konce řádku</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="189"/> - <source>Select the font for all styles.</source> - <translation>Výběr fontu pro všechny styly.</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="192"/> - <source>All Fonts</source> - <translation>Všechny fonty</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="179"/> - <source>Select the background colour for all styles</source> - <translation>Výběr barvy pozadí pro všechny styly</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="182"/> - <source>All Background Colours</source> - <translation>Všechny barvy pozadí</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="229"/> - <source>Sample Text</source> - <translation>Ukázka textu</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="90"/> - <source>Select the background colour.</source> - <translation>Výběr barvy pozadí.</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="93"/> - <source>Background Colour</source> - <translation>Barva pozadí</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="100"/> - <source>Select the font.</source> - <translation>Vybrat font.</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="70"/> - <source>Font</source> - <translation></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="80"/> - <source>Select the foreground colour.</source> - <translation>Vybrat barvu popředí.</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="83"/> - <source>Foreground Colour</source> - <translation>Barva popředí</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="199"/> - <source>Select the eol fill for all styles</source> - <translation>Vybrat pro eol vyplní všechny styly</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="202"/> - <source>All Fill to end of line</source> - <translation>Vše Vyplnit do konce řádku</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="356"/> - <source>Enabled</source> - <translation>Zapnuto</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/> - <source>Disabled</source> - <translation>Vypnuto</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="358"/> - <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.ui" line="130"/> - <source>to Default</source> - <translation>na výchozí hodnotu</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="216"/> - <source>Press to set all styles to their default values</source> - <translation>Stisknout pro nastavení všech stylů na výchozí hodnoty</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="219"/> - <source>All to Default</source> - <translation>Vše na výchozí hodnoty</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="260"/> - <source>Imports all styles of the currently selected language</source> - <translation>Importovat všechny styly právě vybraného jazyka</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="263"/> - <source>Import styles</source> - <translation>Import stylů</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="273"/> - <source>Exports all styles of the currently selected language</source> - <translation>Exportovat všechny styly právě vybraného jazyka</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="276"/> - <source>Export styles</source> - <translation>Export stylů</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="283"/> - <source>Imports all styles of all languages</source> - <translation>Importovat všechny styly všech jazyků</translation> + <source>Select the font for all styles.</source> + <translation>Výběr fontu pro všechny styly.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="279"/> + <source>All Fonts</source> + <translation>Všechny fonty</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="266"/> + <source>Select the background colour for all styles</source> + <translation>Výběr barvy pozadí pro všechny styly</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="269"/> + <source>All Background Colours</source> + <translation>Všechny barvy pozadí</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="318"/> + <source>Sample Text</source> + <translation>Ukázka textu</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="177"/> + <source>Select the background colour.</source> + <translation>Výběr barvy pozadí.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="180"/> + <source>Background Colour</source> + <translation>Barva pozadí</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="187"/> + <source>Select the font.</source> + <translation>Vybrat font.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="81"/> + <source>Font</source> + <translation></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="167"/> + <source>Select the foreground colour.</source> + <translation>Vybrat barvu popředí.</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="170"/> + <source>Foreground Colour</source> + <translation>Barva popředí</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="286"/> + <source>Select the eol fill for all styles</source> + <translation>Vybrat pro eol vyplní všechny styly</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="289"/> + <source>All Fill to end of line</source> + <translation>Vše Vyplnit do konce řádku</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="429"/> + <source>Enabled</source> + <translation>Zapnuto</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="430"/> + <source>Disabled</source> + <translation>Vypnuto</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="431"/> + <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.ui" line="217"/> + <source>to Default</source> + <translation>na výchozí hodnotu</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="303"/> + <source>Press to set all styles to their default values</source> + <translation>Stisknout pro nastavení všech stylů na výchozí hodnoty</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="306"/> + <source>All to Default</source> + <translation>Vše na výchozí hodnoty</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="349"/> + <source>Imports all styles of the currently selected language</source> + <translation>Importovat všechny styly právě vybraného jazyka</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="352"/> + <source>Import styles</source> + <translation>Import stylů</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="362"/> + <source>Exports all styles of the currently selected language</source> + <translation>Exportovat všechny styly právě vybraného jazyka</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="365"/> + <source>Export styles</source> + <translation>Export stylů</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="372"/> + <source>Imports all styles of all languages</source> + <translation>Importovat všechny styly všech jazyků</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="375"/> <source>Import all styles</source> <translation>Import všech stylů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="293"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="382"/> <source>Exports all styles of all languages</source> <translation>Exportovat všechny styly všech jazyků</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="296"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="385"/> <source>Export all styles</source> <translation>Export všech stylů</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="466"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="556"/> <source>Export Highlighting Styles</source> <translation>Export stylů zvýraznění</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="501"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="591"/> <source>Import Highlighting Styles</source> <translation>Importovat styly zvýraznění</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="485"/> <source>Highlighting styles file (*.e4h)</source> - <translation>Soubor se styly zvýrazňování (*.e4h)</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="466"/> + <translation type="obsolete">Soubor se styly zvýrazňování (*.e4h)</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="556"/> <source><p>The highlighting styles could not be exported to file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Styly zvýraznění syntaxe se do souboru <b>{0}</b> nepodařilo exportovat.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="501"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="591"/> <source><p>The highlighting styles could not be read from file <b>{0}</b>.</p><p>Reason: {1}</p></source> <translation><p>Styly zvýraznění syntaxe se ze souboru <b>{0}</b> nepodařilo načít.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="73"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="84"/> <source>Family and Size only</source> <translation>Jen rodina a velikost</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="76"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="87"/> <source>Family only</source> <translation>Jen rodina</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="78"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="89"/> <source>Size only</source> <translation>Jen velikost</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="127"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="214"/> <source>Press to set the current style to its default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="242"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="331"/> <source><b>Note:</b> The tick in the list above indicates the entrie's 'fill to end of line' setting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="150"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="237"/> <source>Press to show only monospaced fonts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="153"/> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="240"/> <source>Monospaced Fonts Only</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="117"/> + <source>Press to add a sub-style to the selected style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="124"/> + <source>Press to to delete the selected sub-style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="131"/> + <source>Press to edit the selected sub-style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="138"/> + <source>Press to copy the selected sub-style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="533"/> + <source>Highlighting styles file (*.e6h)</source> + <translation type="unfinished">Soubor se styly zvýrazňování (*.e4h) {6h?}</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="575"/> + <source>Highlighting styles file (*.e6h *.e4h)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="684"/> + <source>Delete Sub-Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="684"/> + <source><p>Shall the sub-style <b>{0}</b> really be deleted?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="724"/> + <source>{0} - Copy</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorKeywordsPage</name> @@ -13951,70 +13996,95 @@ <context> <name>EditorSearchPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="17"/> <source><b>Configure editor search options</b></source> <translation><b>Konfigurace vyhledávání v editoru</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="36"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="37"/> <source>Search Markers</source> <translation>Značky hledání</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="127"/> <source>Marker Colour:</source> <translation>Barva značky:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="139"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="140"/> <source>Select the colour for the search markers.</source> <translation>Vybrat barvu pro značky hledání.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="52"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="53"/> <source>Select, whether search markers shall be shown for a standard search</source> <translation>Vybrat, jestliže značky hledání mají být zobrazeny pro standardní vyhledávání</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="62"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="63"/> <source>Select, whether search markers shall be shown for a quicksearch</source> <translation>Vybrat, jestliže značky hledání mají být zobrazeny pro rychlé hledání</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="42"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="43"/> <source>Select, whether markers for all occurrences of the current word shall be shown</source> <translation>Vybrat, jestliže mají být zobrazeny značky pro všechny výstyky aktuálního slova</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="45"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="46"/> <source>Highlight all occurrences of current word</source> <translation>Zvýraznit všechny výskyty aktuálního slova</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="55"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="56"/> <source>Highlight all occurrences of search text</source> <translation>Zvýraznit všechny výskyty hledaného textu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="65"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="66"/> <source>Highlight all occurrences of quicksearch text</source> <translation>Zvýraznit všechny výskyty rychle hledaného textu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="74"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="75"/> <source>Timeout for current word highlighting:</source> <translation>Timeout pro zvýraznění aktuálního slova:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="81"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="82"/> <source>Enter the time in milliseconds after which occurrences of the current word shall be highlighted</source> <translation>Zadejte čas v milisekundách, po který budou výskyty aktuálního slova zvýrazněny</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="93"/> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="94"/> <source> ms</source> <translation> ms</translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="168"/> + <source>Regular Expression Type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="174"/> + <source>Select to used the QScintilla POSIX alike regular expression mode.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="177"/> + <source>QScintilla Regular Mode (POSIX)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="187"/> + <source>Select to used the QScintilla extended (C++11) regular expression mode.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSearchPage.ui" line="190"/> + <source>QScintilla Extended Mode (C++11)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSpellCheckingPage</name> @@ -14357,177 +14427,177 @@ <translation>Vybrat barvu pozadí pro výběr.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="564"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="570"/> <source>Caret</source> <translation>Karet (textový kurzor)</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="572"/> <source>Select, whether the caretline should be highlighted</source> - <translation>Vybrat, má-li být linka karetu zvýrazněna</translation> + <translation type="obsolete">Vybrat, má-li být linka karetu zvýrazněna</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="575"/> <source>Caretline visible</source> - <translation>Zobrazení textového kurzoru</translation> + <translation type="obsolete">Zobrazení textového kurzoru</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/> <source>Caret width:</source> - <translation>Šířka text.kurzoru:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="616"/> + <translation type="obsolete">Šířka text.kurzoru:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="583"/> <source>Select caret width (1, 2 or 3 pixels)</source> <translation>Výběr délky karetu (1, 2 nebo 3 pixelu)</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="649"/> - <source>Caret foreground:</source> - <translation>Barva karetu:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="662"/> + <source>Caret line visible</source> + <translation type="unfinished">Barva karetu:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="609"/> <source>Select the colour for the caret.</source> <translation>Výběr barvy karetu.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="672"/> <source>Caretline background:</source> - <translation>Pozadí karetu:</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="685"/> + <translation type="obsolete">Pozadí karetu:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="722"/> <source>Select the background colour for the line containing the caret.</source> <translation>Vybrat barvu pozadí pro řádku obsahující karet.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="716"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="769"/> <source>Current line marker:</source> <translation type="unfinished">Značka aktuální řádky:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="729"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="782"/> <source>Select the colour for the current line marker.</source> <translation type="unfinished">Vybrat barvu pro značku aktuální řádky.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="739"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="792"/> <source>Error line marker:</source> <translation type="unfinished">Značka chybné řádky:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="752"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="805"/> <source>Select the colour for the error line marker.</source> <translation type="unfinished">Vybrat barvu pro značku chybné řádky.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="765"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="818"/> <source>Braces</source> <translation>Závorky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="771"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="824"/> <source>Select whether matching and bad braces shall be highlighted.</source> <translation>Vybrat, jestliže se má zkontrolovat párovost závorek a neplatné se mají zvýraznit.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="774"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="827"/> <source>Highlight braces</source> <translation>Zvýraznit závorky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="781"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="834"/> <source>Matched braces:</source> <translation>Párové závorky:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="794"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="847"/> <source>Select the colour for highlighting matching braces.</source> <translation>Výběr barvy pro zvýraznění párových závorek.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="804"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="857"/> <source>Matched braces background:</source> <translation>Pozadí párových závorek:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="817"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="870"/> <source>Select the background colour for highlighting matching braces.</source> <translation>Výběr barvy pozadí pro zvýraznění párových závorek.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="833"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="886"/> <source>Unmatched brace:</source> <translation>Nepárová závorka:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="840"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="893"/> <source>Select the colour for highlighting nonmatching braces.</source> <translation>Výběr barvy pro zvýraznění nepárových závorek.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="856"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="909"/> <source>Unmatched brace background:</source> <translation>Pozadí nepárové závorky:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="863"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="916"/> <source>Select the background colour for highlighting nonmatching braces.</source> <translation>Vybrat barvu pozadí pro zvýraznění nepárových závorek.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="876"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="929"/> <source>End of Line</source> <translation>Konec řádku</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="882"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="935"/> <source>Select whether end of line shall be shown</source> <translation>Vybrat, mají-li se zobrazovat symboly konce řádků</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="885"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="938"/> <source>Show End of Line</source> <translation>Zobrazovat konce řádků</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="895"/> - <source>Wrap long lines</source> - <translation>Zalamovat dlouhé řádky</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="948"/> + <source>Wrap long lines</source> + <translation>Zalamovat dlouhé řádky</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1041"/> <source>Edge Mode</source> <translation>Mód okraje</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="992"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1085"/> <source>Select the colour for the edge marker.</source> <translation>Vybrat barvu pro značku okraje.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1002"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1095"/> <source>Background colour:</source> <translation>Barva pozadí:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1015"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1108"/> <source>Move to set the edge column.</source> <translation>Posunout pro nastavení sloupce okraje.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1043"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1136"/> <source>Displays the selected tab width.</source> <translation>Zobrazuje vybranou šířku tabulátoru.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1059"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1152"/> <source>Column number:</source> <translation>Číslo sloupce:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1066"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1159"/> <source>Mode:</source> <translation>Mód:</translation> </message> @@ -14537,37 +14607,37 @@ <translation>Vypnuto</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1085"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1178"/> <source>Draw Line</source> <translation>Zobrazit linku</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1090"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1183"/> <source>Change Background Colour</source> <translation>Změnit barvu pozadí</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1945"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2038"/> <source>Various</source> <translation>Různé</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1439"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1532"/> <source>Select whether whitspace characters shall be shown</source> <translation>Vybrat, mají-li se zobrazovat prázdné znaky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1442"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1535"/> <source>Show Whitespace</source> <translation>Zobrazit prázdné znaky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1951"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2044"/> <source>Select to show a minimalistic context menu</source> <translation>Vybrat pro zobrazení minimalistického kontextového menu</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1954"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2047"/> <source>Show minimal context menu</source> <translation>Zobrazit minimální kontextové menu</translation> </message> @@ -14602,27 +14672,27 @@ <translation>Vybrat barvu pozadí pro okraj se značkami skládání</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="700"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="753"/> <source>Debugging Line Markers</source> <translation type="unfinished">Značky debugované řádky</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1104"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1197"/> <source>Zoom</source> <translation>Lupa</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1110"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1203"/> <source>Initial zoom factor:</source> <translation>Úvodní nastavení lupy:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1117"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1210"/> <source>Move to set the initial zoom factor</source> <translation>Posunout pro nastavení velikosti lupy</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1139"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1232"/> <source>Displays the selected initial zoom factor</source> <translation>Zobrazuje vybranou velikost lupy</translation> </message> @@ -14662,82 +14732,82 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1158"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1251"/> <source>Annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1164"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1257"/> <source>Select to enable the display of annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1167"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1260"/> <source>Show annotations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1174"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1267"/> <source>Warnings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1270"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1363"/> <source>Press to select the foreground colour</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1273"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1366"/> <source>Foreground</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1280"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1373"/> <source>Press to select the background colour</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1283"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1376"/> <source>Background</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1219"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1312"/> <source>Errors</source> <translation type="unfinished">Chyby</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1433"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1526"/> <source>Whitespace</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1451"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1544"/> <source>Whitespace size:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1458"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> <source>Select the size of the dots used to represent visible whitespace</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1491"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1584"/> <source>Whitespace foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1504"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1597"/> <source>Select the foreground colour for visible whitespace</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1514"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1607"/> <source>Whitespace background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1527"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1620"/> <source>Select the background colour for visible whitespace</source> <translation type="unfinished"></translation> </message> @@ -14772,72 +14842,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1631"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1724"/> <source>Colours</source> <translation type="unfinished">Barvy</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1312"/> - <source>Change Tracing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1318"/> - <source>Select to mark changed lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1321"/> - <source>Mark changed lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1330"/> - <source>Timeout for marking changed lines:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1337"/> - <source>Enter the time in milliseconds after which changed lines will be marked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1349"/> - <source> ms</source> - <translation type="unfinished"> ms</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1382"/> - <source>Unsaved changes colour:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1395"/> - <source>Select the colour for the change marker for unsaved changes.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1405"/> + <source>Change Tracing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1411"/> + <source>Select to mark changed lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1414"/> + <source>Mark changed lines</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1423"/> + <source>Timeout for marking changed lines:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1430"/> + <source>Enter the time in milliseconds after which changed lines will be marked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1442"/> + <source> ms</source> + <translation type="unfinished"> ms</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1475"/> + <source>Unsaved changes colour:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1488"/> + <source>Select the colour for the change marker for unsaved changes.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1498"/> <source>Saved changes colour:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1418"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1511"/> <source>Select the colour for the change marker for saved changes.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="911"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="964"/> <source>Select the wrap mode for long lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="931"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="984"/> <source>Indication:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="938"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="991"/> <source>Select, how wrapped lines are indicated</source> <translation type="unfinished"></translation> </message> @@ -14872,261 +14942,336 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1203"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1296"/> <source>Warning: There might be an issue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1248"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1341"/> <source>Error: There is an issue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1264"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1357"/> <source>Style</source> <translation type="unfinished">Styl</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1293"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1386"/> <source>Style: There is a style issue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="582"/> - <source>Select, whether the caretline should be highlighted even if the editor doesn't have the focus</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="585"/> - <source>Caretline always visible</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1611"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1704"/> <source>Marker Map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1637"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1730"/> <source>Errors:</source> <translation type="unfinished">Chyby:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1650"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1743"/> <source>Select the colour for error markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1660"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1753"/> <source>Warnings:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1673"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1766"/> <source>Select the colour for warning markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1683"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1776"/> <source>Bookmarks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1696"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1789"/> <source>Select the colour for bookmark markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1706"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1799"/> <source>Breakpoints:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1719"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1812"/> <source>Select the colour for breakpoint markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1729"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1822"/> <source>Tasks:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1742"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1835"/> <source>Select the colour for task markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1752"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1845"/> <source>Changes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1765"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1858"/> <source>Select the colour for change markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1775"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1868"/> <source>Coverage:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1788"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1881"/> <source>Select the colour for coverage markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1798"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1891"/> <source>Current Line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1811"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1904"/> <source>Select the colour for the current line marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1867"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1960"/> <source>Background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1880"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1973"/> <source>Select the background colour for the marker map</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1542"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1635"/> <source>Indentation Guides</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1548"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1641"/> <source>Select whether indentation guides should be shown.</source> <translation type="unfinished">Vybrat, jestliže se mají zobrazovat vodítka odsazování.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1551"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1644"/> <source>Show Indentation Guides</source> <translation type="unfinished">Zobrazit vodítka odsazování</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1560"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1653"/> <source>Indentation Guides foreground:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1573"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1666"/> <source>Select the foreground colour for indentation guides</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1583"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1676"/> <source>Indentation Guides background:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1596"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1689"/> <source>Select the background colour for indentation guides</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1821"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1914"/> <source>Search Markers:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1834"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1927"/> <source>Select the colour for the search marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1961"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2054"/> <source>Select to hide the Format Buttons bar when formatting is not supported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1964"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2057"/> <source>Hide Format Buttons bar when not supported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="706"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="759"/> <source>Select to indicate the debug markers using coloured line backgrounds, arrow indicators otherwise</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="709"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="762"/> <source>Use background colours</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1844"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1937"/> <source>Conflict Marker Line:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1857"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1950"/> <source>Select the colour for the conflict marker line marker</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1617"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1710"/> <source>Select to show the marker map right of the editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1620"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1713"/> <source><b>Show Marker Map Right of the Editor</b> <p>If this entry is selected (default), the marker map is show on the right side of the editor. If it is unselected, it is shown on the left side right before the margins.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1624"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1717"/> <source>Show Marker Map Right of the Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1893"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1986"/> <source>Shown Markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1899"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1992"/> <source>Select to show change markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1902"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1995"/> <source>Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1909"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2002"/> <source>Select to show coverage markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1912"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2005"/> <source>Coverage</source> <translation type="unfinished">Pokrytí</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1919"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2012"/> <source>Select to show search markers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1922"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2015"/> <source>Search Markers</source> <translation type="unfinished">Značky hledání</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1929"/> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="2022"/> <source><b>Note</b>: Marker types not listed are always shown.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="576"/> + <source>Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="596"/> + <source>Foreground:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="638"/> + <source>Caret Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="646"/> + <source>Select, whether the caret line should be highlighted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="656"/> + <source>Select, whether the caret line should be highlighted even if the editor doesn't have the focus</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="659"/> + <source>Caret line always visible</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="683"/> + <source>Frame Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="690"/> + <source>Select caret line frame width (off, 1, 2 or 3 pixels)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="693"/> + <source>Off</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="998"/> + <source>Indentation:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1005"/> + <source>Select, how wrapped lines are indented</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1012"/> + <source>Enter the number of characters to indent (only used for 'Fixed')</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1015"/> + <source> characters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="75"/> + <source>Fixed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="77"/> + <source>Aligned</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="79"/> + <source>Aligned plus One</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="83"/> + <source>Aligned plus Two</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -43839,6 +43984,29 @@ </message> </context> <context> + <name>LexerCPP</name> + <message> + <location filename="../QScintilla/Lexers/LexerCPP.py" line="75"/> + <source>Inactive additional identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/LexerCPP.py" line="57"/> + <source>Additional Identifier</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/LexerCPP.py" line="66"/> + <source>Additional JavaDoc keyword</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/LexerCPP.py" line="84"/> + <source>Inactive additional JavaDoc keyword</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>LexerPygments</name> <message> <location filename="../QScintilla/Lexers/LexerPygments.py" line="180"/> @@ -44097,6 +44265,19 @@ </message> </context> <context> + <name>LexerPython</name> + <message> + <location filename="../QScintilla/Lexers/LexerPython.py" line="48"/> + <source>Standard Library Modules</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Lexers/LexerPython.py" line="77"/> + <source>__future__ Imports</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Lexers</name> <message> <location filename="../QScintilla/Lexers/__init__.py" line="87"/> @@ -46056,168 +46237,168 @@ <translation><b>Vyčistit</b><p>Smazat všechnen text v aktuálním editoru.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2118"/> + <location filename="../QScintilla/MiniEditor.py" line="2131"/> <source>About</source> <translation>O aplikaci</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2118"/> + <location filename="../QScintilla/MiniEditor.py" line="2131"/> <source>&About</source> <translation>O &aplikaci</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2122"/> + <location filename="../QScintilla/MiniEditor.py" line="2135"/> <source>Display information about this software</source> <translation>Zobrazit informace a tomto software</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2124"/> + <location filename="../QScintilla/MiniEditor.py" line="2137"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>O aplikaci</b><p>Zobrazí se informace o tomto software.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2130"/> + <location filename="../QScintilla/MiniEditor.py" line="2143"/> <source>About Qt</source> <translation>O Qt</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2130"/> + <location filename="../QScintilla/MiniEditor.py" line="2143"/> <source>About &Qt</source> <translation>O &Qt</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2134"/> + <location filename="../QScintilla/MiniEditor.py" line="2147"/> <source>Display information about the Qt toolkit</source> <translation>Zobrazit informace o Qt toolkitu</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2136"/> + <location filename="../QScintilla/MiniEditor.py" line="2149"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>O Qt</b><p>Zobrazit informace o Qt toolkitu.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2166"/> + <location filename="../QScintilla/MiniEditor.py" line="2179"/> <source>&File</source> <translation>S&oubor</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2178"/> + <location filename="../QScintilla/MiniEditor.py" line="2191"/> <source>&Edit</source> <translation>&Edit</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2198"/> + <location filename="../QScintilla/MiniEditor.py" line="2211"/> <source>&Help</source> <translation>&Nápověda</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2260"/> + <location filename="../QScintilla/MiniEditor.py" line="2273"/> <source><p>This part of the status bar displays the line number of the editor.</p></source> <translation><p>Tato část status baru zobrazuje číslo řádku v editoru.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2267"/> + <location filename="../QScintilla/MiniEditor.py" line="2280"/> <source><p>This part of the status bar displays the cursor position of the editor.</p></source> <translation><p>Tato část status baru zobrazuje pozici kurzoru v editoru.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2272"/> + <location filename="../QScintilla/MiniEditor.py" line="2285"/> <source>Ready</source> <translation>Hotovo</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2367"/> + <location filename="../QScintilla/MiniEditor.py" line="2380"/> <source>File loaded</source> <translation>Soubor načten</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2775"/> + <location filename="../QScintilla/MiniEditor.py" line="2795"/> <source>Untitled</source> <translation>Beze jména</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2465"/> + <location filename="../QScintilla/MiniEditor.py" line="2478"/> <source>Mini Editor</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2816"/> + <location filename="../QScintilla/MiniEditor.py" line="2836"/> <source>Select all</source> <translation>Vybrat vše</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2817"/> + <location filename="../QScintilla/MiniEditor.py" line="2837"/> <source>Deselect all</source> <translation>Zrušit celý výběr</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2831"/> + <location filename="../QScintilla/MiniEditor.py" line="2851"/> <source>Languages</source> <translation>Jazyky</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2834"/> + <location filename="../QScintilla/MiniEditor.py" line="2854"/> <source>No Language</source> <translation>Žádný jazyk</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2328"/> + <location filename="../QScintilla/MiniEditor.py" line="2341"/> <source>Open File</source> <translation>Otevřít soubor</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2436"/> + <location filename="../QScintilla/MiniEditor.py" line="2449"/> <source>File saved</source> <translation>Soubor uložen</translation> </message> <message> + <location filename="../QScintilla/MiniEditor.py" line="2266"/> + <source><p>This part of the status bar displays an indication of the editors files writability.</p></source> + <translation><p>Tato část statusbaru zobrazuje indikátor práva zápisu editoru do souboru.</p></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2156"/> + <source>What's This?</source> + <translation>Co je to?</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2156"/> + <source>&What's This?</source> + <translation>&Co je to?</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2156"/> + <source>Shift+F1</source> + <comment>Help|What's This?'</comment> + <translation></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2162"/> + <source>Context sensitive help</source> + <translation>Kontextově senzitivní nápověda</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2163"/> + <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> + <translation><b>Zobrazit kontextově senzitivní nápovědu</b><p>V režimu "Co je to?" se nad různými prvky aplikace u kurzoru zobrazí otazník. Když pak kliknete na tyto prvky, zobrazí se krátký popis co daný prvek znamená a jak jej použít. V dialogových oknech se tato funkce spustí tlačítkem kontextové nápovědy na horní liště.</p></translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2223"/> + <source>File</source> + <translation>Soubor</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2236"/> + <source>Edit</source> + <translation>Editovat</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2246"/> + <source>Find</source> + <translation>Hledat</translation> + </message> + <message> <location filename="../QScintilla/MiniEditor.py" line="2253"/> - <source><p>This part of the status bar displays an indication of the editors files writability.</p></source> - <translation><p>Tato část statusbaru zobrazuje indikátor práva zápisu editoru do souboru.</p></translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2143"/> - <source>What's This?</source> - <translation>Co je to?</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2143"/> - <source>&What's This?</source> - <translation>&Co je to?</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2143"/> - <source>Shift+F1</source> - <comment>Help|What's This?'</comment> - <translation></translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2149"/> - <source>Context sensitive help</source> - <translation>Kontextově senzitivní nápověda</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2150"/> - <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> - <translation><b>Zobrazit kontextově senzitivní nápovědu</b><p>V režimu "Co je to?" se nad různými prvky aplikace u kurzoru zobrazí otazník. Když pak kliknete na tyto prvky, zobrazí se krátký popis co daný prvek znamená a jak jej použít. V dialogových oknech se tato funkce spustí tlačítkem kontextové nápovědy na horní liště.</p></translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2210"/> - <source>File</source> - <translation>Soubor</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2223"/> - <source>Edit</source> - <translation>Editovat</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2233"/> - <source>Find</source> - <translation>Hledat</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2240"/> <source>Help</source> <translation>Nápověda</translation> </message> @@ -46243,22 +46424,22 @@ <translation>Tisk aktuálního souboru</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2739"/> + <location filename="../QScintilla/MiniEditor.py" line="2759"/> <source>Printing...</source> <translation>Tisk...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2756"/> + <location filename="../QScintilla/MiniEditor.py" line="2776"/> <source>Printing completed</source> <translation>Tisk je hotov</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2758"/> + <location filename="../QScintilla/MiniEditor.py" line="2778"/> <source>Error while printing</source> <translation>Chyba během tisku</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2761"/> + <location filename="../QScintilla/MiniEditor.py" line="2781"/> <source>Printing aborted</source> <translation>Tisk byl zrušen</translation> </message> @@ -46283,22 +46464,22 @@ <translation><b>Náhkled tisku</b><p>Náhkled tisku aktuálního souboru.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2857"/> + <location filename="../QScintilla/MiniEditor.py" line="2877"/> <source>Guessed</source> <translation>Odhadem</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2878"/> + <location filename="../QScintilla/MiniEditor.py" line="2898"/> <source>Alternatives</source> <translation>Alternativy</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2892"/> + <location filename="../QScintilla/MiniEditor.py" line="2912"/> <source>Pygments Lexer</source> <translation>Pygments Lexer</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2892"/> + <location filename="../QScintilla/MiniEditor.py" line="2912"/> <source>Select the Pygments lexer to apply.</source> <translation>Použít Pygments lexer.</translation> </message> @@ -46313,32 +46494,32 @@ <translation>Poz: {0:5}</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2328"/> + <location filename="../QScintilla/MiniEditor.py" line="2341"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nelze otevřít.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2428"/> + <location filename="../QScintilla/MiniEditor.py" line="2441"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2428"/> + <location filename="../QScintilla/MiniEditor.py" line="2441"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2465"/> + <location filename="../QScintilla/MiniEditor.py" line="2478"/> <source>{0}[*] - {1}</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2875"/> + <location filename="../QScintilla/MiniEditor.py" line="2895"/> <source>Alternatives ({0})</source> <translation>Alternativy ({0})</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2299"/> + <location filename="../QScintilla/MiniEditor.py" line="2312"/> <source>The document has unsaved changes.</source> <translation type="unfinished"></translation> </message> @@ -46353,7 +46534,7 @@ <translation type="unfinished">Eric5 Mini editor je odvozen od modulu QScintilla. Lze jej použít pro jednoduché úpravy, kde není nutné mít k dispozici všechny vlastnosti plného editoru. {6 ?}</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2299"/> + <location filename="../QScintilla/MiniEditor.py" line="2312"/> <source>eric6 Mini Editor</source> <translation type="unfinished">eric5 Mini Editor {6 ?}</translation> </message> @@ -46378,17 +46559,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3405"/> + <location filename="../QScintilla/MiniEditor.py" line="3427"/> <source>EditorConfig Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="3405"/> + <location filename="../QScintilla/MiniEditor.py" line="3427"/> <source><p>The EditorConfig properties for file <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2448"/> + <location filename="../QScintilla/MiniEditor.py" line="2461"/> <source>[*] - {0}</source> <translation type="unfinished"></translation> </message> @@ -46725,62 +46906,62 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="615"/> + <location filename="../MultiProject/MultiProject.py" line="616"/> <source>Save File</source> <translation>Uložit soubor</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="694"/> + <location filename="../MultiProject/MultiProject.py" line="695"/> <source>&New...</source> <translation>&Nový...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="708"/> + <location filename="../MultiProject/MultiProject.py" line="709"/> <source>&Open...</source> <translation>&Otevřít...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="721"/> + <location filename="../MultiProject/MultiProject.py" line="722"/> <source>&Close</source> <translation>&Zavřít</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="734"/> + <location filename="../MultiProject/MultiProject.py" line="735"/> <source>&Save</source> <translation>&Uložit</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="746"/> + <location filename="../MultiProject/MultiProject.py" line="747"/> <source>Save &as...</source> <translation>Uložit j&ako...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="760"/> + <location filename="../MultiProject/MultiProject.py" line="761"/> <source>Add &project...</source> <translation>Přidat &projekt...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="775"/> + <location filename="../MultiProject/MultiProject.py" line="776"/> <source>&Properties...</source> <translation>&Natavení...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="802"/> - <source>&Multiproject</source> - <translation>&Multiprojekt</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="803"/> + <source>&Multiproject</source> + <translation>&Multiprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="804"/> <source>Open &Recent Multiprojects</source> <translation>Otevřít poslední multip&rojekty</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="844"/> + <location filename="../MultiProject/MultiProject.py" line="845"/> <source>Multiproject</source> <translation></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="903"/> + <location filename="../MultiProject/MultiProject.py" line="904"/> <source>&Clear</source> <translation>&Vyčistit</translation> </message> @@ -46795,117 +46976,117 @@ <translation>Uložit soubor multiprojektu</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="708"/> + <location filename="../MultiProject/MultiProject.py" line="709"/> <source>Open multiproject</source> <translation>Otevřít multiprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="746"/> + <location filename="../MultiProject/MultiProject.py" line="747"/> <source>Save multiproject as</source> <translation>Uložit multiprojekt jako</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> + <location filename="../MultiProject/MultiProject.py" line="641"/> <source>Close Multiproject</source> <translation>Zavřít multiprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> + <location filename="../MultiProject/MultiProject.py" line="641"/> <source>The current multiproject has unsaved changes.</source> <translation>Aktuální multiprojekt obsahuje neuložené změny.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="694"/> + <location filename="../MultiProject/MultiProject.py" line="695"/> <source>New multiproject</source> <translation>Nový multiprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="699"/> - <source>Generate a new multiproject</source> - <translation>Vygenerovat nový multiprojekt</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="700"/> + <source>Generate a new multiproject</source> + <translation>Vygenerovat nový multiprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="701"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> <translation><b>Nový...</b><p>Otevře se dialogové okno pro zadání informací o novém multiprojektu.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="713"/> - <source>Open an existing multiproject</source> - <translation>Otevřít existující multiprojekt</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="714"/> + <source>Open an existing multiproject</source> + <translation>Otevřít existující multiprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="715"/> <source><b>Open...</b><p>This opens an existing multiproject.</p></source> <translation><b>Otevřít....</b><p>Otevře existující multiprojekt.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="721"/> + <location filename="../MultiProject/MultiProject.py" line="722"/> <source>Close multiproject</source> <translation>Zavřít multiprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="725"/> + <location filename="../MultiProject/MultiProject.py" line="726"/> <source>Close the current multiproject</source> <translation>Uzavře aktuální multiprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="727"/> + <location filename="../MultiProject/MultiProject.py" line="728"/> <source><b>Close</b><p>This closes the current multiproject.</p></source> <translation><b>Zavřít</b><p>Aktuální multiprojekt se uzavře.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="734"/> + <location filename="../MultiProject/MultiProject.py" line="735"/> <source>Save multiproject</source> <translation>Uložit multiprojekt</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="738"/> - <source>Save the current multiproject</source> - <translation>Uložit aktuální multiprojekt</translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="739"/> + <source>Save the current multiproject</source> + <translation>Uložit aktuální multiprojekt</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="740"/> <source><b>Save</b><p>This saves the current multiproject.</p></source> <translation><b>Uložit</b><p>Aktuální multiprojekt se uloží.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="751"/> + <location filename="../MultiProject/MultiProject.py" line="752"/> <source>Save the current multiproject to a new file</source> <translation>Uloží aktuální multiprojekt do nového souboru</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="753"/> + <location filename="../MultiProject/MultiProject.py" line="754"/> <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> <translation><b>Uložit jako</b><p>Uloží aktuální mulktiprojekt do nového souboru.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="760"/> + <location filename="../MultiProject/MultiProject.py" line="761"/> <source>Add project to multiproject</source> <translation>Přidat projekt do multiprojektu</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="765"/> + <location filename="../MultiProject/MultiProject.py" line="766"/> <source>Add a project to the current multiproject</source> <translation>Projekt se přidá do aktuálního multiprojektu</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="767"/> + <location filename="../MultiProject/MultiProject.py" line="768"/> <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> <translation><b>Přidat projekt...</b><p>Otevře dialog pro přidání projektu do aktuálního multiprojektu.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="775"/> + <location filename="../MultiProject/MultiProject.py" line="776"/> <source>Multiproject properties</source> <translation>Nastavení multiprojektu</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="780"/> + <location filename="../MultiProject/MultiProject.py" line="781"/> <source>Show the multiproject properties</source> <translation>Zobrazit nastavení projektu</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="782"/> + <location filename="../MultiProject/MultiProject.py" line="783"/> <source><b>Properties...</b><p>This shows a dialog to edit the multiproject properties.</p></source> <translation><b>Nastavení...</b><p>Zobrazí dialog s editací nastavení multiprojektu.</p></translation> </message> @@ -46920,17 +47101,17 @@ <translation><p>Do souboru multiprojektu <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="615"/> + <location filename="../MultiProject/MultiProject.py" line="616"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="536"/> + <location filename="../MultiProject/MultiProject.py" line="537"/> <source>Multiproject Files (*.e5m *.e4m)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="600"/> + <location filename="../MultiProject/MultiProject.py" line="601"/> <source>Multiproject Files (*.e5m)</source> <translation type="unfinished">Soubory multiprojektu (*.e4m) {5m?}</translation> </message> @@ -46950,7 +47131,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="395"/> + <location filename="../MultiProject/MultiProject.py" line="396"/> <source>{0} - Copy</source> <translation type="unfinished"></translation> </message> @@ -50877,17 +51058,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1736"/> + <location filename="../Preferences/__init__.py" line="1740"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1764"/> + <location filename="../Preferences/__init__.py" line="1768"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1764"/> + <location filename="../Preferences/__init__.py" line="1768"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -50895,12 +51076,12 @@ <context> <name>PreferencesLexerError</name> <message> - <location filename="../Preferences/PreferencesLexer.py" line="28"/> + <location filename="../Preferences/PreferencesLexer.py" line="27"/> <source>Unspecific PreferencesLexer error.</source> <translation>Neznámá chyba v Nastavení Lexeru.</translation> </message> <message> - <location filename="../Preferences/PreferencesLexer.py" line="60"/> + <location filename="../Preferences/PreferencesLexer.py" line="62"/> <source>Unsupported Lexer Language: {0}</source> <translation>Nepodporovaný Lexer jazyk: {0}</translation> </message> @@ -61434,27 +61615,27 @@ <context> <name>SearchReplaceWidget</name> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="793"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="808"/> <source>'{0}' was not found.</source> <translation>'{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="924"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="945"/> <source>Replaced {0} occurrences.</source> <translation>Nahrazeno {0} výskytů.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="929"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="950"/> <source>Nothing replaced because '{0}' was not found.</source> <translation>Nebylo nic nahrazeno, protože '{0}' nebyl nalezen.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="151"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/> <source>Find Next</source> <translation>Najít další</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="158"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="161"/> <source>Find Prev</source> <translation>Najít předchozí</translation> </message> @@ -61478,17 +61659,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="166"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="169"/> <source>Replace and Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="176"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="179"/> <source>Replace Occurrence</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="186"/> + <location filename="../QScintilla/SearchReplaceWidget.py" line="189"/> <source>Replace All</source> <translation type="unfinished"></translation> </message> @@ -61535,6 +61716,9 @@ <td>This matches 1 or more times. For example, <code>Sa+m</code> matches <code>Sam</code>, <code>Saam</code>, <code>Saaam</code> and so on.</td></tr> </table> +<p>When using the Extended (C++11) regular expression mode more features are +available, generally similar to regular expression support in JavaScript. See +the documentation of your C++ runtime for details on what is supported.<p> </source> <translation type="unfinished"></translation> </message> @@ -62491,17 +62675,17 @@ <translation>Vyčistit</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="836"/> + <location filename="../QScintilla/Shell.py" line="838"/> <source>No.</source> <translation>Č.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2140"/> + <location filename="../QScintilla/Shell.py" line="2142"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="832"/> + <location filename="../QScintilla/Shell.py" line="834"/> <source>Passive Debug Mode</source> <translation>Pasivní debug mód</translation> </message> @@ -62521,17 +62705,17 @@ <translation>Zobrazit</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="764"/> + <location filename="../QScintilla/Shell.py" line="766"/> <source>Select History</source> <translation>Vybrat historii</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="764"/> + <location filename="../QScintilla/Shell.py" line="766"/> <source>Select the history entry to execute (most recent shown last).</source> <translation>Vybrat vstup historie pro vykonání (nejaktuálnější zobrazen poslední).</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="833"/> + <location filename="../QScintilla/Shell.py" line="835"/> <source> Not connected</source> <translation>Nepřipojen</translation> @@ -62547,22 +62731,22 @@ <translation>Vyjmout</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="838"/> + <location filename="../QScintilla/Shell.py" line="840"/> <source>{0} on {1}, {2}</source> <translation>{0} na {1}, {2}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1018"/> + <location filename="../QScintilla/Shell.py" line="1020"/> <source>StdOut: {0}</source> <translation>StdOut: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1026"/> + <location filename="../QScintilla/Shell.py" line="1028"/> <source>StdErr: {0}</source> <translation>StdErr: {0}</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2140"/> + <location filename="../QScintilla/Shell.py" line="2142"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> @@ -62572,7 +62756,7 @@ <translation type="unfinished">Hledat</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="883"/> + <location filename="../QScintilla/Shell.py" line="885"/> <source>Exception "{0}" {1} File: {2}, Line: {3} @@ -62580,32 +62764,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="916"/> - <source>Unspecified syntax error. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../QScintilla/Shell.py" line="893"/> - <source>Exception "{0}" -{1} -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../QScintilla/Shell.py" line="918"/> + <source>Unspecified syntax error. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="895"/> + <source>Exception "{0}" +{1} +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../QScintilla/Shell.py" line="920"/> <source>Syntax error "{1}" in file {0} at line {2}, character {3}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="941"/> + <location filename="../QScintilla/Shell.py" line="943"/> <source>Signal "{0}" generated in file {1} at line {2}. Function: {3}({4})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="2000"/> + <location filename="../QScintilla/Shell.py" line="2002"/> <source>Project</source> <translation type="unfinished">Projekt</translation> </message> @@ -62635,14 +62819,14 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1823"/> + <location filename="../QScintilla/Shell.py" line="1825"/> <source>Available Virtual Environments: {0} </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1863"/> + <location filename="../QScintilla/Shell.py" line="1865"/> <source>Current Virtual Environment: '{0}' </source> <translation type="unfinished"></translation> @@ -65695,6 +65879,79 @@ </message> </context> <context> + <name>SubstyleDefinitionDialog</name> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.ui" line="14"/> + <source>Define Sub-Style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.ui" line="32"/> + <source>Description:</source> + <translation type="unfinished">Popisek:</translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.ui" line="39"/> + <source>Enter a short description for the style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.ui" line="48"/> + <source>Words (separated by spaces):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.ui" line="55"/> + <source>Enter the list of words separated by space</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.ui" line="64"/> + <source>Press to reset the data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.ui" line="67"/> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.ui" line="74"/> + <source>Press to set the data to default values (if available)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.ui" line="77"/> + <source>Defaults</source> + <translation type="unfinished">Defaulty</translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.py" line="44"/> + <source><h3>{0} - {1}</h3></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.py" line="84"/> + <source>Reset Sub-Style Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.py" line="84"/> + <source>Shall the entered sub-style data be reset?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.py" line="106"/> + <source>Set Sub-Style Data to Default</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/SubstyleDefinitionDialog.py" line="106"/> + <source>Shall the sub-style data be set to default values?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Subversion</name> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="218"/> @@ -75717,7 +75974,7 @@ <translation><b>Klávesové zkratky</b><p>Nastavení klávesových zkratek aplikace podle zvyklostí uživatele.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6015"/> + <location filename="../UI/UserInterface.py" line="6014"/> <source>Export Keyboard Shortcuts</source> <translation>Exportovat klávesové zkratky</translation> </message> @@ -75737,7 +75994,7 @@ <translation><b>Export klávesových zkratek</b><p>Exportují se klávesové zkratky z aplikace.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6039"/> + <location filename="../UI/UserInterface.py" line="6038"/> <source>Import Keyboard Shortcuts</source> <translation>Import klávesových zkratek</translation> </message> @@ -75877,7 +76134,7 @@ <translation><h3>Čísla verzí</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7004"/> + <location filename="../UI/UserInterface.py" line="7003"/> <source></table></source> <translation></table></translation> </message> @@ -75942,27 +76199,27 @@ <translation type="unfinished"><p>Počátek dokumentace PySide nebyl nastaven.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6208"/> + <location filename="../UI/UserInterface.py" line="6207"/> <source>Save tasks</source> <translation>Uložit úlohy</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6237"/> + <location filename="../UI/UserInterface.py" line="6236"/> <source>Read tasks</source> <translation>Načíst úlohy</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6598"/> + <location filename="../UI/UserInterface.py" line="6597"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <locati