Fri, 03 Feb 2017 19:20:59 +0100
Merged with default branch to prepare a new release.
--- a/APIs/Python3/eric6.api Fri Jan 27 19:18:52 2017 +0100 +++ b/APIs/Python3/eric6.api Fri Feb 03 19:20:59 2017 +0100 @@ -2985,10 +2985,17 @@ eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_addButton_clicked?4() eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_addPluginButton_clicked?4() eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged?4() +eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_managePluginButton_clicked?4() eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_removeButton_clicked?4() eric6.Helpviewer.QtHelpDocumentationDialog.QtHelpDocumentationDialog?1(engine, parent) +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.AddMode?7 +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.ManageMode?7 eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.getData?4() -eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog?1(helpDocuments, parent=None) +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked?4() +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteButton_clicked?4() +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked?4() +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged?4() +eric6.Helpviewer.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog?1(helpDocuments, mode, parent=None) eric6.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_addButton_clicked?4() eric6.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_attributesList_itemChanged?4(item, column) eric6.Helpviewer.QtHelpFiltersDialog.QtHelpFiltersDialog.on_attributesList_itemSelectionChanged?4() @@ -4090,6 +4097,7 @@ eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._main?5() eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._parse_multi_options?5(options, split_token=', ') eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.ambiguous_identifier?4(logical_line, tokens) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.bare_except?4(logical_line, noqa) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.blank_lines?4(logical_line, blank_lines, indent_level, line_number, blank_before, previous_logical, previous_unindented_logical_line, previous_indent_level, lines) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.break_around_binary_operator?4(logical_line, tokens) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.comparison_negative?4(logical_line) @@ -4876,6 +4884,7 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffP1Button_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffP2Button_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_diffRevisionsButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_downButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_fieldCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_findNextButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_findPrevButton_clicked?4() @@ -4892,16 +4901,10 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_toDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.on_upButton_clicked?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.show?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.start?4(fn, bundle=None, isFile=False) +eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog.start?4(fn, bundle=None, isFile=False, noEntries=0) eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.HgLogBrowserDialog?1(vcs, mode="log", parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.keyPressEvent?4(evt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_passwordCheckBox_toggled?4(isOn) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.on_sendButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog.start?4(fn, noEntries=0, revisions=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.HgLogDialog?1(vcs, mode="log", bundle=None, isFile=False, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.getParameters?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_bookmarkCombo_editTextChanged?4(txt) @@ -4912,17 +4915,6 @@ eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagButton_toggled?4(checked) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog.on_tagCombo_editTextChanged?4(txt) eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.HgMergeDialog?1(tagsList, branchesList, bookmarksList=None, parent=None) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.getRevisions?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_branchButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_changesetsButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged?4() -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_limitGroup_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_tagButton_toggled?4(checked) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged?4(txt) -eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.HgMultiRevisionSelectionDialog?1(tagsList, branchesList, bookmarksList=None, emptyRevsOk=False, showLimit=False, limitDefault=100, parent=None) eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.getData?4() eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_protocolCombo_activated?4(protocol) eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.HgNewProjectOptionsDialog.on_vcsProjectDirPicker_textChanged?4(txt) @@ -5395,7 +5387,6 @@ eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInit?4(vcsDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInitConfig?4(project) -eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLog?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLogBrowser?4(name, isFile=False) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMerge?4(name) eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMove?4(name, project, target=None, noDialog=False) @@ -5490,6 +5481,7 @@ eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_buttonBox_clicked?4(button) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffPreviousButton_clicked?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffRevisionsButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_downButton_clicked?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fieldCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fromDate_dateChanged?4(date) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_logTree_currentItemChanged?4(current, previous) @@ -5498,12 +5490,10 @@ eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_rxEdit_textChanged?4(txt) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_toDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.on_upButton_clicked?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn, isFile=False) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) -eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.on_buttonBox_clicked?4(button) -eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries=0) -eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.SvnLogDialog?1(vcs, isFile=False, parent=None) eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog.getData?4() eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.SvnLoginDialog?1(realm, username, may_save, parent=None) eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.SvnMergeDialog.getParameters?4() @@ -5621,7 +5611,6 @@ eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInitConfig?4(project) -eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsLog?4(name) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsLogBrowser?4(name, isFile=False) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMerge?4(name) eric6.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) @@ -5721,6 +5710,7 @@ eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_buttonBox_clicked?4(button) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffPreviousButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_diffRevisionsButton_clicked?4() +eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_downButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fieldCombo_activated?4(txt) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_fromDate_dateChanged?4(date) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_input_returnPressed?4() @@ -5732,16 +5722,10 @@ eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_sendButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_stopCheckBox_clicked?4(checked) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_toDate_dateChanged?4(date) +eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.on_upButton_clicked?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.show?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog.start?4(fn, isFile=False) eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.SvnLogBrowserDialog?1(vcs, parent=None) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.closeEvent?4(e) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.keyPressEvent?4(evt) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_input_returnPressed?4() -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_passwordCheckBox_toggled?4(isOn) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.on_sendButton_clicked?4() -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog.start?4(fn, noEntries=0) -eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.SvnLogDialog?1(vcs, isFile=False, parent=None) eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.getParameters?4() eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.on_tag1Combo_editTextChanged?4(text) eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.SvnMergeDialog.on_tag2Combo_editTextChanged?4(text) @@ -5865,7 +5849,6 @@ eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInitConfig?4(project) -eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsLog?4(name) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsLogBrowser?4(name, isFile=False) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMerge?4(name) eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) @@ -6364,10 +6347,14 @@ eric6.Preferences.ConfigurationPages.EditorTypingPage.EditorTypingPage.save?4() eric6.Preferences.ConfigurationPages.EditorTypingPage.EditorTypingPage?1() eric6.Preferences.ConfigurationPages.EditorTypingPage.create?4(dlg) -eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailAuthenticationCheckBox_toggled?4(checked) +eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailAuthenticationGroup_toggled?4(checked) eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailPasswordEdit_textChanged?4(txt) +eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailServerEdit_textChanged?4(txt) eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_mailUserEdit_textChanged?4(txt) +eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_noEncryptionButton_toggled?4(checked) eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_testButton_clicked?4() +eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_useSslButton_toggled?4(checked) +eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.on_useTlsButton_toggled?4(checked) eric6.Preferences.ConfigurationPages.EmailPage.EmailPage.save?4() eric6.Preferences.ConfigurationPages.EmailPage.EmailPage?1() eric6.Preferences.ConfigurationPages.EmailPage.create?4(dlg) @@ -7402,6 +7389,7 @@ eric6.QScintilla.Editor.Editor.setNoName?4(noName) eric6.QScintilla.Editor.Editor.setSearchIndicator?4(startPos, indicLength) eric6.QScintilla.Editor.Editor.setSpellingForProject?4() +eric6.QScintilla.Editor.Editor.settingsRead?7 eric6.QScintilla.Editor.Editor.shareConnected?4(connected) eric6.QScintilla.Editor.Editor.shareEditor?4(share) eric6.QScintilla.Editor.Editor.shortenEmptyLines?4() @@ -7437,6 +7425,9 @@ eric6.QScintilla.EditorAssembly.EditorAssembly.getEditor?4() eric6.QScintilla.EditorAssembly.EditorAssembly.shutdownTimer?4() eric6.QScintilla.EditorAssembly.EditorAssembly?1(dbs, fn="", vm=None, filetype="", editor=None, tv=None) +eric6.QScintilla.EditorButtonsWidget.EditorButtonsWidget.resizeEvent?4(evt) +eric6.QScintilla.EditorButtonsWidget.EditorButtonsWidget.show?4() +eric6.QScintilla.EditorButtonsWidget.EditorButtonsWidget?1(editor, parent=None) eric6.QScintilla.EditorMarkerMap.EditorMarkerMap._paintIt?5(painter) eric6.QScintilla.EditorMarkerMap.EditorMarkerMap.initColors?4() eric6.QScintilla.EditorMarkerMap.EditorMarkerMap?1(parent=None) @@ -7609,6 +7600,12 @@ eric6.QScintilla.Lexers.LexerIDL.LexerIDL.isStringStyle?4(style) eric6.QScintilla.Lexers.LexerIDL.LexerIDL.maximumKeywordSet?4() eric6.QScintilla.Lexers.LexerIDL.LexerIDL?1(parent=None) +eric6.QScintilla.Lexers.LexerJSON.LexerJSON.defaultKeywords?4(kwSet) +eric6.QScintilla.Lexers.LexerJSON.LexerJSON.initProperties?4() +eric6.QScintilla.Lexers.LexerJSON.LexerJSON.isCommentStyle?4(style) +eric6.QScintilla.Lexers.LexerJSON.LexerJSON.isStringStyle?4(style) +eric6.QScintilla.Lexers.LexerJSON.LexerJSON.maximumKeywordSet?4() +eric6.QScintilla.Lexers.LexerJSON.LexerJSON?1(parent=None) eric6.QScintilla.Lexers.LexerJava.LexerJava.defaultKeywords?4(kwSet) eric6.QScintilla.Lexers.LexerJava.LexerJava.initProperties?4() eric6.QScintilla.Lexers.LexerJava.LexerJava.isCommentStyle?4(style) @@ -7632,6 +7629,8 @@ eric6.QScintilla.Lexers.LexerMakefile.LexerMakefile.isCommentStyle?4(style) eric6.QScintilla.Lexers.LexerMakefile.LexerMakefile.isStringStyle?4(style) eric6.QScintilla.Lexers.LexerMakefile.LexerMakefile?1(parent=None) +eric6.QScintilla.Lexers.LexerMarkdown.LexerMarkdown.defaultKeywords?4(kwSet) +eric6.QScintilla.Lexers.LexerMarkdown.LexerMarkdown?1(parent=None) eric6.QScintilla.Lexers.LexerMatlab.LexerMatlab.defaultKeywords?4(kwSet) eric6.QScintilla.Lexers.LexerMatlab.LexerMatlab.isCommentStyle?4(style) eric6.QScintilla.Lexers.LexerMatlab.LexerMatlab.isStringStyle?4(style) @@ -7804,6 +7803,124 @@ eric6.QScintilla.Lexers.getSupportedLanguages?4() eric6.QScintilla.Lexers.registerLexer?4(name, displayString, filenameSample, getLexerFunc, openFilters=[], saveFilters=[], defaultAssocs=[], iconFileName="") eric6.QScintilla.Lexers.unregisterLexer?4(name) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.bold?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.bulletedList?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.code?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.codeBlock?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasBold?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasBulletedList?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasCode?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasCodeBlock?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasHyperlink?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasImage?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasItalic?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasLine?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasNumberedList?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasQuote?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hasStrikethrough?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.header?4(editor, level) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.headerLevels?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.hyperlink?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.image?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.italic?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.kind?4() +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.line?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.numberedList?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.quote?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.strikethrough?4(editor) +eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider?1() +eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.HyperlinkMarkupDialog.getData?4() +eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.HyperlinkMarkupDialog.on_targetEdit_textChanged?4(txt) +eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.HyperlinkMarkupDialog.on_textEdit_textChanged?4(txt) +eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.HyperlinkMarkupDialog?1(textMayBeEmpty, targetMayBeEmpty, noTitle=False, parent=None) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.HtmlMode?7 +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.MarkDownMode?7 +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.RestMode?7 +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.getData?4() +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_altTextEdit_textChanged?4(txt) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_aspectRatioCheckBox_toggled?4(checked) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_heightSpinBox_valueChanged?4(height) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_imagePicker_textChanged?4(address) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_sizeCheckBox_toggled?4(checked) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog.on_widthSpinBox_valueChanged?4(width) +eric6.QScintilla.MarkupProviders.ImageMarkupDialog.ImageMarkupDialog?1(mode, parent=None) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.bold?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.bulletedList?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.code?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.codeBlock?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasBold?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasBulletedList?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasCode?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasCodeBlock?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasHyperlink?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasImage?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasItalic?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasLine?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasNumberedList?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasQuote?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hasStrikethrough?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.header?4(editor, level) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.headerLevels?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.hyperlink?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.image?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.italic?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.kind?4() +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.line?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.numberedList?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.quote?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider.strikethrough?4(editor) +eric6.QScintilla.MarkupProviders.MarkdownProvider.MarkdownProvider?1() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.bold?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.bulletedList?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.code?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.codeBlock?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasBold?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasBulletedList?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasCode?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasCodeBlock?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasHyperlink?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasImage?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasItalic?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasLine?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasNumberedList?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasQuote?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hasStrikethrough?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.header?4(editor, level) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.headerLevels?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.hyperlink?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.image?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.italic?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.kind?4() +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.line?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.numberedList?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.quote?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase.strikethrough?4(editor) +eric6.QScintilla.MarkupProviders.MarkupBase.MarkupBase?1() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.bold?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.bulletedList?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.code?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.codeBlock?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasBold?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasBulletedList?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasCode?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasCodeBlock?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasHyperlink?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasImage?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasItalic?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasLine?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasNumberedList?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hasQuote?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.header?4(editor, level) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.headerLevels?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.hyperlink?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.image?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.italic?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.kind?4() +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.line?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.numberedList?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider.quote?4(editor) +eric6.QScintilla.MarkupProviders.RestructuredTextProvider.RestructuredTextProvider?1() +eric6.QScintilla.MarkupProviders.getMarkupProvider?4(editor) eric6.QScintilla.MiniEditor.MiniEditor.activeWindow?4() eric6.QScintilla.MiniEditor.MiniEditor.clearSearchIndicators?4() eric6.QScintilla.MiniEditor.MiniEditor.closeEvent?4(event) @@ -8617,11 +8734,8 @@ eric6.UI.Previewer.Previewer.show?4() eric6.UI.Previewer.Previewer.shutdown?4() eric6.UI.Previewer.Previewer?1(viewmanager, splitter, parent=None) -eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.DefaultStaticPath?7 -eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.StaticRegexp?7 eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.htmlReady?7 eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.process?4(filePath, language, text, ssiEnabled, rootPath, useSphinx) -eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.replace?4() eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread.run?4() eric6.UI.Previewers.PreviewerHTML.PreviewProcessingThread?1(parent=None) eric6.UI.Previewers.PreviewerHTML.PreviewerHTML.on_jsCheckBox_clicked?4(checked) @@ -9187,7 +9301,6 @@ eric6.VCS.VersionControl.VersionControl.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric6.VCS.VersionControl.VersionControl.vcsInit?4(vcsDir, noDialog=False) eric6.VCS.VersionControl.VersionControl.vcsInitConfig?4(project) -eric6.VCS.VersionControl.VersionControl.vcsLog?4(name) eric6.VCS.VersionControl.VersionControl.vcsLogBrowser?4(name, isFile=False) eric6.VCS.VersionControl.VersionControl.vcsMerge?4(name) eric6.VCS.VersionControl.VersionControl.vcsMove?4(name, project, target=None, noDialog=False) @@ -10325,10 +10438,17 @@ eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_addButton_clicked?4() eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_addPluginButton_clicked?4() eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged?4() +eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_managePluginButton_clicked?4() eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog.on_removeButton_clicked?4() eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.QtHelpDocumentationDialog?1(engine, parent) +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.AddMode?7 +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.ManageMode?7 eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.getData?4() -eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog?1(helpDocuments, parent=None) +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked?4() +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteButton_clicked?4() +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked?4() +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged?4() +eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.QtHelpDocumentationSelectionDialog?1(helpDocuments, mode, parent=None) eric6.WebBrowser.QtHelp.QtHelpFiltersDialog.QtHelpFiltersDialog.on_addButton_clicked?4() eric6.WebBrowser.QtHelp.QtHelpFiltersDialog.QtHelpFiltersDialog.on_attributesList_itemChanged?4(item, column) eric6.WebBrowser.QtHelp.QtHelpFiltersDialog.QtHelpFiltersDialog.on_attributesList_itemSelectionChanged?4() @@ -11102,6 +11222,7 @@ eric6.uninstall-debugclients.uninstallEricDebugClients?4() eric6.uninstall-debugclients.usage?4(rcode=2) eric6.uninstall.PythonMarkers?7 +eric6.uninstall.currDir?7 eric6.uninstall.defaultMacAppBundleName?7 eric6.uninstall.defaultMacAppBundlePath?7 eric6.uninstall.exit?4(rcode=0)
--- a/APIs/Python3/eric6.bas Fri Jan 27 19:18:52 2017 +0100 +++ b/APIs/Python3/eric6.bas Fri Feb 03 19:20:59 2017 +0100 @@ -219,6 +219,7 @@ EditorAssembly QWidget EditorAutocompletionPage ConfigurationPageBase Ui_EditorAutocompletionPage EditorAutocompletionQScintillaPage ConfigurationPageBase Ui_EditorAutocompletionQScintillaPage +EditorButtonsWidget QWidget EditorCalltipsPage ConfigurationPageBase Ui_EditorCalltipsPage EditorCalltipsQScintillaPage ConfigurationPageBase Ui_EditorCalltipsQScintillaPage EditorExportersPage ConfigurationPageBase Ui_EditorExportersPage @@ -369,9 +370,7 @@ HgHisteditPlanEditor QDialog Ui_HgHisteditPlanEditor HgImportDialog QDialog Ui_HgImportDialog HgLogBrowserDialog QWidget Ui_HgLogBrowserDialog -HgLogDialog QWidget Ui_HgLogDialog HgMergeDialog QDialog Ui_HgMergeDialog -HgMultiRevisionSelectionDialog QDialog Ui_HgMultiRevisionSelectionDialog HgNewProjectOptionsDialog QDialog Ui_HgNewProjectOptionsDialog HgOptionsDialog QDialog Ui_HgOptionsDialog HgPhaseDialog QDialog Ui_HgPhaseDialog @@ -423,6 +422,8 @@ HistoryMostVisitedMenuModel QSortFilterProxyModel HistoryTreeModel QAbstractProxyModel HtmlImporter BookmarksImporter +HtmlProvider MarkupBase +HyperlinkMarkupDialog QDialog Ui_HyperlinkMarkupDialog IExplorerImporter BookmarksImporter IconEditCommand QUndoCommand IconEditorGrid QWidget @@ -431,6 +432,7 @@ IconSizeDialog QDialog Ui_IconSizeDialog IconsPage ConfigurationPageBase Ui_IconsPage IconsPreviewDialog QDialog Ui_IconsPreviewDialog +ImageMarkupDialog QDialog Ui_ImageMarkupDialog ImageSearchEngine QObject ImagesIcon StatusBarIcon ImportsDiagramBuilder UMLDiagramBuilder @@ -476,10 +478,12 @@ LexerFortran77 Lexer QsciLexerFortran77 LexerHTML Lexer QsciLexerHTML LexerIDL Lexer QsciLexerIDL +LexerJSON Lexer QsciLexerJSON LexerJava Lexer QsciLexerJava LexerJavaScript Lexer QsciLexerJavaScript LexerLua Lexer QsciLexerLua LexerMakefile Lexer QsciLexerMakefile +LexerMarkdown Lexer QsciLexerMarkdown LexerMatlab Lexer QsciLexerMatlab LexerOctave Lexer QsciLexerOctave LexerPO Lexer QsciLexerPO @@ -505,6 +509,7 @@ LogViewer QWidget LogViewerEdit QTextEdit LogViewerPage ConfigurationPageBase Ui_LogViewerPage +MarkdownProvider MarkupBase MasterPasswordEntryDialog QDialog Ui_MasterPasswordEntryDialog MercurialPage ConfigurationPageBase Ui_MercurialPage MessageBoxWizard QObject @@ -668,6 +673,7 @@ RecursionError OverflowError ValueError Redirector QObject RemoveBookmarksCommand QUndoCommand +RestructuredTextProvider MarkupBase SafariImporter BookmarksImporter SchemeAccessHandler QObject SearchReplaceSlidingWidget QWidget @@ -736,7 +742,6 @@ SvnDiffHighlighter E5GenericDiffHighlighter SvnInfoDialog QDialog SvnDialogMixin Ui_VcsRepositoryInfoDialog SvnLogBrowserDialog QWidget Ui_SvnLogBrowserDialog -SvnLogDialog QWidget Ui_SvnLogDialog SvnLoginDialog QDialog Ui_SvnLoginDialog SvnMergeDialog QDialog Ui_SvnMergeDialog SvnNewProjectOptionsDialog QDialog Ui_SvnNewProjectOptionsDialog
--- a/DebugClients/Python/eric6dbgstub.py Fri Jan 27 19:18:52 2017 +0100 +++ b/DebugClients/Python/eric6dbgstub.py Fri Feb 03 19:20:59 2017 +0100 @@ -37,9 +37,6 @@ if kind == "standard": import DebugClient debugger = DebugClient.DebugClient() - elif kind == "threads": - import DebugClientThreads - debugger = DebugClientThreads.DebugClientThreads() else: raise ValueError except ImportError:
--- a/Debugger/ExceptionsFilterDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Debugger/ExceptionsFilterDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -1,113 +1,106 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>ExceptionsFilterDialog</class> - <widget class="QDialog" name="ExceptionsFilterDialog" > - <property name="geometry" > + <widget class="QDialog" name="ExceptionsFilterDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>464</width> - <height>385</height> + <width>450</width> + <height>400</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Exceptions Filter</string> </property> - <property name="whatsThis" > - <string><b>Exception Filter</b> -<p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> -<p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></string> + <property name="whatsThis"> + <string><b>Exception Filter</b> +<p>This dialog is used to enter the exception types, that shall be highlighted during a debugging session. If this list is empty, all exception types will be highlighted. If the exception reporting flag in the "Start Debugging" dialog is unchecked, no exception will be reported at all.</p> +<p>Please note, that unhandled exceptions are always highlighted independent of these settings.</p></string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QListWidget" name="exceptionList" > - <property name="toolTip" > + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="3"> + <widget class="QListWidget" name="exceptionList"> + <property name="toolTip"> <string>List of exceptions that shall be highlighted</string> </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> </widget> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout" > - <item> - <widget class="QPushButton" name="addButton" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="toolTip" > - <string>Press to add the entered exception to the list</string> - </property> - <property name="text" > - <string>Add</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="exceptionEdit" > - <property name="toolTip" > - <string>Enter an exception type that shall be highlighted</string> - </property> - </widget> - </item> - </layout> + <item row="1" column="0"> + <widget class="QPushButton" name="addButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Press to add the entered exception to the list</string> + </property> + <property name="text"> + <string>Add</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QLineEdit" name="exceptionEdit"> + <property name="toolTip"> + <string>Enter an exception type that shall be highlighted</string> + </property> + </widget> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2" > - <item> - <widget class="QPushButton" name="deleteButton" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="toolTip" > - <string>Press to delete the selected exception from the list</string> - </property> - <property name="text" > - <string>Delete</string> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="deleteAllButton" > - <property name="toolTip" > - <string>Press to delete all exceptions from the list</string> - </property> - <property name="text" > - <string>Delete All</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> + <item row="2" column="0"> + <widget class="QPushButton" name="deleteButton"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Press to delete the selected exception from the list</string> + </property> + <property name="text"> + <string>Delete</string> + </property> + </widget> </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <item row="2" column="1"> + <widget class="QPushButton" name="deleteAllButton"> + <property name="toolTip"> + <string>Press to delete all exceptions from the list</string> + </property> + <property name="text"> + <string>Delete All</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <spacer name="horizontalSpacer"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="sizeHint" stdset="0"> + <size> + <width>261</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="0" colspan="3"> + <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> - <layoutdefault spacing="6" margin="11" /> + <layoutdefault spacing="6" margin="11"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>exceptionList</tabstop> @@ -125,11 +118,11 @@ <receiver>ExceptionsFilterDialog</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>26</x> <y>309</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>26</x> <y>325</y> </hint> @@ -141,11 +134,11 @@ <receiver>ExceptionsFilterDialog</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>85</x> <y>310</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>85</x> <y>324</y> </hint>
--- a/Debugger/VariablesFilterDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Debugger/VariablesFilterDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -47,6 +47,9 @@ for varType, varTypeStr in ConfigVarTypeDispStrings.items(): itm = QListWidgetItem(self.tr(varTypeStr), widget) itm.setData(Qt.UserRole, ConfigVarTypeFilters[varType]) + itm.setFlags(Qt.ItemIsEnabled | Qt.ItemIsUserCheckable | + Qt.ItemNeverHasChildren) + itm.setCheckState(Qt.Unchecked) widget.addItem(itm) lDefaultFilter, gDefaultFilter = Preferences.getVarFilters() @@ -62,13 +65,13 @@ lList = [] for row in range(self.localsList.count()): itm = self.localsList.item(row) - if itm.isSelected(): + if itm.checkState() == Qt.Unchecked: lList.append(itm.data(Qt.UserRole)) gList = [] for row in range(self.globalsList.count()): itm = self.globalsList.item(row) - if itm.isSelected(): + if itm.checkState() == Qt.Unchecked: gList.append(itm.data(Qt.UserRole)) return (lList, gList) @@ -81,11 +84,17 @@ """ for row in range(self.localsList.count()): itm = self.localsList.item(row) - itm.setSelected(itm.data(Qt.UserRole) in lList) + if itm.data(Qt.UserRole) in lList: + itm.setCheckState(Qt.Unchecked) + else: + itm.setCheckState(Qt.Checked) for row in range(self.globalsList.count()): itm = self.globalsList.item(row) - itm.setSelected(itm.data(Qt.UserRole) in gList) + if itm.data(Qt.UserRole) in gList: + itm.setCheckState(Qt.Unchecked) + else: + itm.setCheckState(Qt.Checked) def on_buttonBox_clicked(self, button): """
--- a/Debugger/VariablesFilterDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Debugger/VariablesFilterDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -7,8 +7,8 @@ <rect> <x>0</x> <y>0</y> - <width>386</width> - <height>338</height> + <width>400</width> + <height>400</height> </rect> </property> <property name="windowTitle"> @@ -21,45 +21,45 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QGridLayout"> - <item row="2" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="2"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Select the variable types to be shown in the variables viewers:</string> </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <property name="wordWrap"> + <bool>true</bool> </property> </widget> </item> - <item row="0" column="0"> + <item row="1" column="0"> <widget class="QLabel" name="localsLabel"> <property name="text"> - <string>&Locals Filter</string> + <string>&Locals Viewer</string> </property> <property name="buddy"> <cstring>localsList</cstring> </property> </widget> </item> - <item row="0" column="1"> + <item row="1" column="1"> <widget class="QLabel" name="globalsLabel"> <property name="text"> - <string>&Globals Filter</string> + <string>&Globals Viewer</string> </property> <property name="buddy"> <cstring>globalsList</cstring> </property> </widget> </item> - <item row="1" column="0"> + <item row="2" column="0"> <widget class="QListWidget" name="localsList"> <property name="toolTip"> <string>Locals Filter List</string> </property> <property name="whatsThis"> <string><b>Locals Filter List</b> -<p>Select the variable types you want to be filtered out of the locals variables list.</p<</string> +<p>Select the variable types you want to be shown in the local variables viewer.</p<</string> </property> <property name="alternatingRowColors"> <bool>true</bool> @@ -72,14 +72,14 @@ </property> </widget> </item> - <item row="1" column="1"> + <item row="2" column="1"> <widget class="QListWidget" name="globalsList"> <property name="toolTip"> <string>Globals Filter List</string> </property> <property name="whatsThis"> <string><b>Globals Filter List</b> -<p>Select the variable types you want to be filtered out of the globals variables list.</p<</string> +<p>Select the variable types you want to be shown in the global variables viewer.</p<</string> </property> <property name="alternatingRowColors"> <bool>true</bool> @@ -92,6 +92,16 @@ </property> </widget> </item> + <item row="3" column="0" colspan="2"> + <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> <layoutdefault spacing="6" margin="11"/>
--- a/Documentation/Help/source.qhp Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Help/source.qhp Fri Feb 03 19:20:59 2017 +0100 @@ -606,9 +606,7 @@ <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html" /> @@ -648,7 +646,6 @@ <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnDiffHighlighter" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnDiffHighlighter.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html" /> @@ -684,7 +681,6 @@ <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffHighlighter" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffHighlighter.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html" /> - <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html" /> <section title="eric6.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html" /> @@ -901,10 +897,12 @@ <section title="eric6.QScintilla.Lexers.LexerFortran77" ref="eric6.QScintilla.Lexers.LexerFortran77.html" /> <section title="eric6.QScintilla.Lexers.LexerHTML" ref="eric6.QScintilla.Lexers.LexerHTML.html" /> <section title="eric6.QScintilla.Lexers.LexerIDL" ref="eric6.QScintilla.Lexers.LexerIDL.html" /> + <section title="eric6.QScintilla.Lexers.LexerJSON" ref="eric6.QScintilla.Lexers.LexerJSON.html" /> <section title="eric6.QScintilla.Lexers.LexerJava" ref="eric6.QScintilla.Lexers.LexerJava.html" /> <section title="eric6.QScintilla.Lexers.LexerJavaScript" ref="eric6.QScintilla.Lexers.LexerJavaScript.html" /> <section title="eric6.QScintilla.Lexers.LexerLua" ref="eric6.QScintilla.Lexers.LexerLua.html" /> <section title="eric6.QScintilla.Lexers.LexerMakefile" ref="eric6.QScintilla.Lexers.LexerMakefile.html" /> + <section title="eric6.QScintilla.Lexers.LexerMarkdown" ref="eric6.QScintilla.Lexers.LexerMarkdown.html" /> <section title="eric6.QScintilla.Lexers.LexerMatlab" ref="eric6.QScintilla.Lexers.LexerMatlab.html" /> <section title="eric6.QScintilla.Lexers.LexerOctave" ref="eric6.QScintilla.Lexers.LexerOctave.html" /> <section title="eric6.QScintilla.Lexers.LexerPO" ref="eric6.QScintilla.Lexers.LexerPO.html" /> @@ -925,6 +923,15 @@ <section title="eric6.QScintilla.Lexers.LexerYAML" ref="eric6.QScintilla.Lexers.LexerYAML.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"> + <section title="eric6.QScintilla.MarkupProviders.HtmlProvider" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html" /> + <section title="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html" /> + <section title="eric6.QScintilla.MarkupProviders.ImageMarkupDialog" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html" /> + <section title="eric6.QScintilla.MarkupProviders.MarkdownProvider" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html" /> + <section title="eric6.QScintilla.MarkupProviders.MarkupBase" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html" /> + <section title="eric6.QScintilla.MarkupProviders.RestructuredTextProvider" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html" /> + <section title="eric6.QScintilla.MarkupProviders.__init__" ref="eric6.QScintilla.MarkupProviders.__init__.html" /> + </section> <section title="eric6.QScintilla.TypingCompleters" ref="index-eric6.QScintilla.TypingCompleters.html"> <section title="eric6.QScintilla.TypingCompleters.CompleterBase" ref="eric6.QScintilla.TypingCompleters.CompleterBase.html" /> <section title="eric6.QScintilla.TypingCompleters.CompleterPython" ref="eric6.QScintilla.TypingCompleters.CompleterPython.html" /> @@ -934,6 +941,7 @@ <section title="eric6.QScintilla.APIsManager" ref="eric6.QScintilla.APIsManager.html" /> <section title="eric6.QScintilla.Editor" ref="eric6.QScintilla.Editor.html" /> <section title="eric6.QScintilla.EditorAssembly" ref="eric6.QScintilla.EditorAssembly.html" /> + <section title="eric6.QScintilla.EditorButtonsWidget" ref="eric6.QScintilla.EditorButtonsWidget.html" /> <section title="eric6.QScintilla.EditorMarkerMap" ref="eric6.QScintilla.EditorMarkerMap.html" /> <section title="eric6.QScintilla.GotoDialog" ref="eric6.QScintilla.GotoDialog.html" /> <section title="eric6.QScintilla.KeySequenceTranslator" ref="eric6.QScintilla.KeySequenceTranslator.html" /> @@ -5202,6 +5210,23 @@ <keyword name="EditorAutocompletionQScintillaPage (Constructor)" id="EditorAutocompletionQScintillaPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html#EditorAutocompletionQScintillaPage.__init__" /> <keyword name="EditorAutocompletionQScintillaPage (Module)" id="EditorAutocompletionQScintillaPage (Module)" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html" /> <keyword name="EditorAutocompletionQScintillaPage.save" id="EditorAutocompletionQScintillaPage.save" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html#EditorAutocompletionQScintillaPage.save" /> + <keyword name="EditorButtonsWidget" id="EditorButtonsWidget" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget" /> + <keyword name="EditorButtonsWidget (Constructor)" id="EditorButtonsWidget (Constructor)" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__init__" /> + <keyword name="EditorButtonsWidget (Module)" id="EditorButtonsWidget (Module)" ref="eric6.QScintilla.EditorButtonsWidget.html" /> + <keyword name="EditorButtonsWidget.__addButton" id="EditorButtonsWidget.__addButton" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__addButton" /> + <keyword name="EditorButtonsWidget.__addSeparator" id="EditorButtonsWidget.__addSeparator" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__addSeparator" /> + <keyword name="EditorButtonsWidget.__createButtons" id="EditorButtonsWidget.__createButtons" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__createButtons" /> + <keyword name="EditorButtonsWidget.__editorSelectionChanged" id="EditorButtonsWidget.__editorSelectionChanged" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__editorSelectionChanged" /> + <keyword name="EditorButtonsWidget.__editorSettingsRead" id="EditorButtonsWidget.__editorSettingsRead" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__editorSettingsRead" /> + <keyword name="EditorButtonsWidget.__enableScrollerButtons" id="EditorButtonsWidget.__enableScrollerButtons" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__enableScrollerButtons" /> + <keyword name="EditorButtonsWidget.__formatClicked" id="EditorButtonsWidget.__formatClicked" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__formatClicked" /> + <keyword name="EditorButtonsWidget.__headerMenuTriggered" id="EditorButtonsWidget.__headerMenuTriggered" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__headerMenuTriggered" /> + <keyword name="EditorButtonsWidget.__slide" id="EditorButtonsWidget.__slide" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__slide" /> + <keyword name="EditorButtonsWidget.__slideDown" id="EditorButtonsWidget.__slideDown" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__slideDown" /> + <keyword name="EditorButtonsWidget.__slideUp" id="EditorButtonsWidget.__slideUp" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__slideUp" /> + <keyword name="EditorButtonsWidget.__updateButtonStates" id="EditorButtonsWidget.__updateButtonStates" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.__updateButtonStates" /> + <keyword name="EditorButtonsWidget.resizeEvent" id="EditorButtonsWidget.resizeEvent" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.resizeEvent" /> + <keyword name="EditorButtonsWidget.show" id="EditorButtonsWidget.show" ref="eric6.QScintilla.EditorButtonsWidget.html#EditorButtonsWidget.show" /> <keyword name="EditorCalltipsPage" id="EditorCalltipsPage" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsPage.html#EditorCalltipsPage" /> <keyword name="EditorCalltipsPage (Constructor)" id="EditorCalltipsPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsPage.html#EditorCalltipsPage.__init__" /> <keyword name="EditorCalltipsPage (Module)" id="EditorCalltipsPage (Module)" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsPage.html" /> @@ -5341,11 +5366,16 @@ <keyword name="EmailPage" id="EmailPage" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage" /> <keyword name="EmailPage (Constructor)" id="EmailPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.__init__" /> <keyword name="EmailPage (Module)" id="EmailPage (Module)" ref="eric6.Preferences.ConfigurationPages.EmailPage.html" /> + <keyword name="EmailPage.__updatePortSpin" id="EmailPage.__updatePortSpin" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.__updatePortSpin" /> <keyword name="EmailPage.__updateTestButton" id="EmailPage.__updateTestButton" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.__updateTestButton" /> - <keyword name="EmailPage.on_mailAuthenticationCheckBox_toggled" id="EmailPage.on_mailAuthenticationCheckBox_toggled" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_mailAuthenticationCheckBox_toggled" /> + <keyword name="EmailPage.on_mailAuthenticationGroup_toggled" id="EmailPage.on_mailAuthenticationGroup_toggled" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_mailAuthenticationGroup_toggled" /> <keyword name="EmailPage.on_mailPasswordEdit_textChanged" id="EmailPage.on_mailPasswordEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_mailPasswordEdit_textChanged" /> + <keyword name="EmailPage.on_mailServerEdit_textChanged" id="EmailPage.on_mailServerEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_mailServerEdit_textChanged" /> <keyword name="EmailPage.on_mailUserEdit_textChanged" id="EmailPage.on_mailUserEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_mailUserEdit_textChanged" /> + <keyword name="EmailPage.on_noEncryptionButton_toggled" id="EmailPage.on_noEncryptionButton_toggled" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_noEncryptionButton_toggled" /> <keyword name="EmailPage.on_testButton_clicked" id="EmailPage.on_testButton_clicked" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_testButton_clicked" /> + <keyword name="EmailPage.on_useSslButton_toggled" id="EmailPage.on_useSslButton_toggled" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_useSslButton_toggled" /> + <keyword name="EmailPage.on_useTlsButton_toggled" id="EmailPage.on_useTlsButton_toggled" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.on_useTlsButton_toggled" /> <keyword name="EmailPage.save" id="EmailPage.save" ref="eric6.Preferences.ConfigurationPages.EmailPage.html#EmailPage.save" /> <keyword name="EmptyNetworkReply" id="EmptyNetworkReply" ref="eric6.Helpviewer.Network.EmptyNetworkReply.html#EmptyNetworkReply" /> <keyword name="EmptyNetworkReply (Constructor)" id="EmptyNetworkReply (Constructor)" ref="eric6.Helpviewer.Network.EmptyNetworkReply.html#EmptyNetworkReply.__init__" /> @@ -7125,7 +7155,6 @@ <keyword name="Hg.vcsImport" id="Hg.vcsImport" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsImport" /> <keyword name="Hg.vcsInit" id="Hg.vcsInit" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsInit" /> <keyword name="Hg.vcsInitConfig" id="Hg.vcsInitConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsInitConfig" /> - <keyword name="Hg.vcsLog" id="Hg.vcsLog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsLog" /> <keyword name="Hg.vcsLogBrowser" id="Hg.vcsLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsLogBrowser" /> <keyword name="Hg.vcsMerge" id="Hg.vcsMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsMerge" /> <keyword name="Hg.vcsMove" id="Hg.vcsMove" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsMove" /> @@ -7523,6 +7552,7 @@ <keyword name="HgLogBrowserDialog (Constructor)" id="HgLogBrowserDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__init__" /> <keyword name="HgLogBrowserDialog (Module)" id="HgLogBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html" /> <keyword name="HgLogBrowserDialog.__actionMode" id="HgLogBrowserDialog.__actionMode" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__actionMode" /> + <keyword name="HgLogBrowserDialog.__addFinishCallback" id="HgLogBrowserDialog.__addFinishCallback" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__addFinishCallback" /> <keyword name="HgLogBrowserDialog.__bookmarkActTriggered" id="HgLogBrowserDialog.__bookmarkActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__bookmarkActTriggered" /> <keyword name="HgLogBrowserDialog.__bookmarkMoveActTriggered" id="HgLogBrowserDialog.__bookmarkMoveActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__bookmarkMoveActTriggered" /> <keyword name="HgLogBrowserDialog.__branchColor" id="HgLogBrowserDialog.__branchColor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__branchColor" /> @@ -7539,6 +7569,7 @@ <keyword name="HgLogBrowserDialog.__getColor" id="HgLogBrowserDialog.__getColor" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getColor" /> <keyword name="HgLogBrowserDialog.__getLogEntries" id="HgLogBrowserDialog.__getLogEntries" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getLogEntries" /> <keyword name="HgLogBrowserDialog.__getParents" id="HgLogBrowserDialog.__getParents" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getParents" /> + <keyword name="HgLogBrowserDialog.__getRevisionOfTag" id="HgLogBrowserDialog.__getRevisionOfTag" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getRevisionOfTag" /> <keyword name="HgLogBrowserDialog.__graftActTriggered" id="HgLogBrowserDialog.__graftActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__graftActTriggered" /> <keyword name="HgLogBrowserDialog.__identifyProject" id="HgLogBrowserDialog.__identifyProject" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__identifyProject" /> <keyword name="HgLogBrowserDialog.__initActionsMenu" id="HgLogBrowserDialog.__initActionsMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__initActionsMenu" /> @@ -7558,6 +7589,7 @@ <keyword name="HgLogBrowserDialog.__resizeColumnsFiles" id="HgLogBrowserDialog.__resizeColumnsFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resizeColumnsFiles" /> <keyword name="HgLogBrowserDialog.__resizeColumnsLog" id="HgLogBrowserDialog.__resizeColumnsLog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resizeColumnsLog" /> <keyword name="HgLogBrowserDialog.__resortFiles" id="HgLogBrowserDialog.__resortFiles" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__resortFiles" /> + <keyword name="HgLogBrowserDialog.__revisionClicked" id="HgLogBrowserDialog.__revisionClicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__revisionClicked" /> <keyword name="HgLogBrowserDialog.__showError" id="HgLogBrowserDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__showError" /> <keyword name="HgLogBrowserDialog.__stripActTriggered" id="HgLogBrowserDialog.__stripActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__stripActTriggered" /> <keyword name="HgLogBrowserDialog.__switchActTriggered" id="HgLogBrowserDialog.__switchActTriggered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__switchActTriggered" /> @@ -7573,6 +7605,7 @@ <keyword name="HgLogBrowserDialog.on_diffP1Button_clicked" id="HgLogBrowserDialog.on_diffP1Button_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffP1Button_clicked" /> <keyword name="HgLogBrowserDialog.on_diffP2Button_clicked" id="HgLogBrowserDialog.on_diffP2Button_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffP2Button_clicked" /> <keyword name="HgLogBrowserDialog.on_diffRevisionsButton_clicked" id="HgLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_diffRevisionsButton_clicked" /> + <keyword name="HgLogBrowserDialog.on_downButton_clicked" id="HgLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_downButton_clicked" /> <keyword name="HgLogBrowserDialog.on_fieldCombo_activated" id="HgLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_fieldCombo_activated" /> <keyword name="HgLogBrowserDialog.on_findNextButton_clicked" id="HgLogBrowserDialog.on_findNextButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_findNextButton_clicked" /> <keyword name="HgLogBrowserDialog.on_findPrevButton_clicked" id="HgLogBrowserDialog.on_findPrevButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_findPrevButton_clicked" /> @@ -7589,25 +7622,9 @@ <keyword name="HgLogBrowserDialog.on_sendButton_clicked" id="HgLogBrowserDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_sendButton_clicked" /> <keyword name="HgLogBrowserDialog.on_stopCheckBox_clicked" id="HgLogBrowserDialog.on_stopCheckBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_stopCheckBox_clicked" /> <keyword name="HgLogBrowserDialog.on_toDate_dateChanged" id="HgLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_toDate_dateChanged" /> + <keyword name="HgLogBrowserDialog.on_upButton_clicked" id="HgLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.on_upButton_clicked" /> <keyword name="HgLogBrowserDialog.show" id="HgLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.show" /> <keyword name="HgLogBrowserDialog.start" id="HgLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.start" /> - <keyword name="HgLogDialog" id="HgLogDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog" /> - <keyword name="HgLogDialog (Constructor)" id="HgLogDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__init__" /> - <keyword name="HgLogDialog (Module)" id="HgLogDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html" /> - <keyword name="HgLogDialog.__finish" id="HgLogDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__finish" /> - <keyword name="HgLogDialog.__getParents" id="HgLogDialog.__getParents" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__getParents" /> - <keyword name="HgLogDialog.__procFinished" id="HgLogDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__procFinished" /> - <keyword name="HgLogDialog.__processOutputLine" id="HgLogDialog.__processOutputLine" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__processOutputLine" /> - <keyword name="HgLogDialog.__readStderr" id="HgLogDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__readStderr" /> - <keyword name="HgLogDialog.__readStdout" id="HgLogDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__readStdout" /> - <keyword name="HgLogDialog.__showError" id="HgLogDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__showError" /> - <keyword name="HgLogDialog.__sourceChanged" id="HgLogDialog.__sourceChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.__sourceChanged" /> - <keyword name="HgLogDialog.closeEvent" id="HgLogDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.closeEvent" /> - <keyword name="HgLogDialog.keyPressEvent" id="HgLogDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.keyPressEvent" /> - <keyword name="HgLogDialog.on_input_returnPressed" id="HgLogDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_input_returnPressed" /> - <keyword name="HgLogDialog.on_passwordCheckBox_toggled" id="HgLogDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_passwordCheckBox_toggled" /> - <keyword name="HgLogDialog.on_sendButton_clicked" id="HgLogDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.on_sendButton_clicked" /> - <keyword name="HgLogDialog.start" id="HgLogDialog.start" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html#HgLogDialog.start" /> <keyword name="HgMergeDialog" id="HgMergeDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog" /> <keyword name="HgMergeDialog (Constructor)" id="HgMergeDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.__init__" /> <keyword name="HgMergeDialog (Module)" id="HgMergeDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html" /> @@ -7621,20 +7638,6 @@ <keyword name="HgMergeDialog.on_idEdit_textChanged" id="HgMergeDialog.on_idEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_idEdit_textChanged" /> <keyword name="HgMergeDialog.on_tagButton_toggled" id="HgMergeDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_tagButton_toggled" /> <keyword name="HgMergeDialog.on_tagCombo_editTextChanged" id="HgMergeDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html#HgMergeDialog.on_tagCombo_editTextChanged" /> - <keyword name="HgMultiRevisionSelectionDialog" id="HgMultiRevisionSelectionDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog" /> - <keyword name="HgMultiRevisionSelectionDialog (Constructor)" id="HgMultiRevisionSelectionDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.__init__" /> - <keyword name="HgMultiRevisionSelectionDialog (Module)" id="HgMultiRevisionSelectionDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html" /> - <keyword name="HgMultiRevisionSelectionDialog.__updateOK" id="HgMultiRevisionSelectionDialog.__updateOK" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.__updateOK" /> - <keyword name="HgMultiRevisionSelectionDialog.getRevisions" id="HgMultiRevisionSelectionDialog.getRevisions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.getRevisions" /> - <keyword name="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" id="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" /> - <keyword name="HgMultiRevisionSelectionDialog.on_branchButton_toggled" id="HgMultiRevisionSelectionDialog.on_branchButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_branchButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" /> - <keyword name="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" id="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" id="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" /> - <keyword name="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" id="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_limitGroup_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_tagButton_toggled" id="HgMultiRevisionSelectionDialog.on_tagButton_toggled" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_tagButton_toggled" /> - <keyword name="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" id="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html#HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" /> <keyword name="HgNewProjectOptionsDialog" id="HgNewProjectOptionsDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html#HgNewProjectOptionsDialog" /> <keyword name="HgNewProjectOptionsDialog (Constructor)" id="HgNewProjectOptionsDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html#HgNewProjectOptionsDialog.__init__" /> <keyword name="HgNewProjectOptionsDialog (Module)" id="HgNewProjectOptionsDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html" /> @@ -8452,6 +8455,43 @@ <keyword name="HtmlImporter.open" id="HtmlImporter.open" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.open" /> <keyword name="HtmlImporter.setPath" id="HtmlImporter.setPath" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.setPath" /> <keyword name="HtmlImporter.setPath" id="HtmlImporter.setPath" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.html#HtmlImporter.setPath" /> + <keyword name="HtmlProvider" id="HtmlProvider" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider" /> + <keyword name="HtmlProvider (Constructor)" id="HtmlProvider (Constructor)" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.__init__" /> + <keyword name="HtmlProvider (Module)" id="HtmlProvider (Module)" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html" /> + <keyword name="HtmlProvider.__insertMarkup" id="HtmlProvider.__insertMarkup" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.__insertMarkup" /> + <keyword name="HtmlProvider.__makeList" id="HtmlProvider.__makeList" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.__makeList" /> + <keyword name="HtmlProvider.bold" id="HtmlProvider.bold" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.bold" /> + <keyword name="HtmlProvider.bulletedList" id="HtmlProvider.bulletedList" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.bulletedList" /> + <keyword name="HtmlProvider.code" id="HtmlProvider.code" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.code" /> + <keyword name="HtmlProvider.codeBlock" id="HtmlProvider.codeBlock" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.codeBlock" /> + <keyword name="HtmlProvider.hasBold" id="HtmlProvider.hasBold" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasBold" /> + <keyword name="HtmlProvider.hasBulletedList" id="HtmlProvider.hasBulletedList" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasBulletedList" /> + <keyword name="HtmlProvider.hasCode" id="HtmlProvider.hasCode" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasCode" /> + <keyword name="HtmlProvider.hasCodeBlock" id="HtmlProvider.hasCodeBlock" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasCodeBlock" /> + <keyword name="HtmlProvider.hasHyperlink" id="HtmlProvider.hasHyperlink" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasHyperlink" /> + <keyword name="HtmlProvider.hasImage" id="HtmlProvider.hasImage" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasImage" /> + <keyword name="HtmlProvider.hasItalic" id="HtmlProvider.hasItalic" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasItalic" /> + <keyword name="HtmlProvider.hasLine" id="HtmlProvider.hasLine" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasLine" /> + <keyword name="HtmlProvider.hasNumberedList" id="HtmlProvider.hasNumberedList" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasNumberedList" /> + <keyword name="HtmlProvider.hasQuote" id="HtmlProvider.hasQuote" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasQuote" /> + <keyword name="HtmlProvider.hasStrikethrough" id="HtmlProvider.hasStrikethrough" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hasStrikethrough" /> + <keyword name="HtmlProvider.header" id="HtmlProvider.header" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.header" /> + <keyword name="HtmlProvider.headerLevels" id="HtmlProvider.headerLevels" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.headerLevels" /> + <keyword name="HtmlProvider.hyperlink" id="HtmlProvider.hyperlink" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.hyperlink" /> + <keyword name="HtmlProvider.image" id="HtmlProvider.image" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.image" /> + <keyword name="HtmlProvider.italic" id="HtmlProvider.italic" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.italic" /> + <keyword name="HtmlProvider.kind" id="HtmlProvider.kind" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.kind" /> + <keyword name="HtmlProvider.line" id="HtmlProvider.line" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.line" /> + <keyword name="HtmlProvider.numberedList" id="HtmlProvider.numberedList" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.numberedList" /> + <keyword name="HtmlProvider.quote" id="HtmlProvider.quote" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.quote" /> + <keyword name="HtmlProvider.strikethrough" id="HtmlProvider.strikethrough" ref="eric6.QScintilla.MarkupProviders.HtmlProvider.html#HtmlProvider.strikethrough" /> + <keyword name="HyperlinkMarkupDialog" id="HyperlinkMarkupDialog" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog" /> + <keyword name="HyperlinkMarkupDialog (Constructor)" id="HyperlinkMarkupDialog (Constructor)" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog.__init__" /> + <keyword name="HyperlinkMarkupDialog (Module)" id="HyperlinkMarkupDialog (Module)" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html" /> + <keyword name="HyperlinkMarkupDialog.__updateOkButton" id="HyperlinkMarkupDialog.__updateOkButton" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog.__updateOkButton" /> + <keyword name="HyperlinkMarkupDialog.getData" id="HyperlinkMarkupDialog.getData" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog.getData" /> + <keyword name="HyperlinkMarkupDialog.on_targetEdit_textChanged" id="HyperlinkMarkupDialog.on_targetEdit_textChanged" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog.on_targetEdit_textChanged" /> + <keyword name="HyperlinkMarkupDialog.on_textEdit_textChanged" id="HyperlinkMarkupDialog.on_textEdit_textChanged" ref="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html#HyperlinkMarkupDialog.on_textEdit_textChanged" /> <keyword name="IExplorerImporter" id="IExplorerImporter" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter" /> <keyword name="IExplorerImporter" id="IExplorerImporter" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter" /> <keyword name="IExplorerImporter (Constructor)" id="IExplorerImporter (Constructor)" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html#IExplorerImporter.__init__" /> @@ -8597,6 +8637,17 @@ <keyword name="IconsPreviewDialog" id="IconsPreviewDialog" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog" /> <keyword name="IconsPreviewDialog (Constructor)" id="IconsPreviewDialog (Constructor)" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html#IconsPreviewDialog.__init__" /> <keyword name="IconsPreviewDialog (Module)" id="IconsPreviewDialog (Module)" ref="eric6.Preferences.ConfigurationPages.IconsPreviewDialog.html" /> + <keyword name="ImageMarkupDialog" id="ImageMarkupDialog" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog" /> + <keyword name="ImageMarkupDialog (Constructor)" id="ImageMarkupDialog (Constructor)" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.__init__" /> + <keyword name="ImageMarkupDialog (Module)" id="ImageMarkupDialog (Module)" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html" /> + <keyword name="ImageMarkupDialog.__updateOkButton" id="ImageMarkupDialog.__updateOkButton" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.__updateOkButton" /> + <keyword name="ImageMarkupDialog.getData" id="ImageMarkupDialog.getData" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.getData" /> + <keyword name="ImageMarkupDialog.on_altTextEdit_textChanged" id="ImageMarkupDialog.on_altTextEdit_textChanged" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_altTextEdit_textChanged" /> + <keyword name="ImageMarkupDialog.on_aspectRatioCheckBox_toggled" id="ImageMarkupDialog.on_aspectRatioCheckBox_toggled" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_aspectRatioCheckBox_toggled" /> + <keyword name="ImageMarkupDialog.on_heightSpinBox_valueChanged" id="ImageMarkupDialog.on_heightSpinBox_valueChanged" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_heightSpinBox_valueChanged" /> + <keyword name="ImageMarkupDialog.on_imagePicker_textChanged" id="ImageMarkupDialog.on_imagePicker_textChanged" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_imagePicker_textChanged" /> + <keyword name="ImageMarkupDialog.on_sizeCheckBox_toggled" id="ImageMarkupDialog.on_sizeCheckBox_toggled" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_sizeCheckBox_toggled" /> + <keyword name="ImageMarkupDialog.on_widthSpinBox_valueChanged" id="ImageMarkupDialog.on_widthSpinBox_valueChanged" ref="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html#ImageMarkupDialog.on_widthSpinBox_valueChanged" /> <keyword name="ImageSearch (Package)" id="ImageSearch (Package)" ref="index-eric6.WebBrowser.ImageSearch.html" /> <keyword name="ImageSearchEngine" id="ImageSearchEngine" ref="eric6.WebBrowser.ImageSearch.ImageSearchEngine.html#ImageSearchEngine" /> <keyword name="ImageSearchEngine (Constructor)" id="ImageSearchEngine (Constructor)" ref="eric6.WebBrowser.ImageSearch.ImageSearchEngine.html#ImageSearchEngine.__init__" /> @@ -9183,6 +9234,14 @@ <keyword name="LexerIDL.isCommentStyle" id="LexerIDL.isCommentStyle" ref="eric6.QScintilla.Lexers.LexerIDL.html#LexerIDL.isCommentStyle" /> <keyword name="LexerIDL.isStringStyle" id="LexerIDL.isStringStyle" ref="eric6.QScintilla.Lexers.LexerIDL.html#LexerIDL.isStringStyle" /> <keyword name="LexerIDL.maximumKeywordSet" id="LexerIDL.maximumKeywordSet" ref="eric6.QScintilla.Lexers.LexerIDL.html#LexerIDL.maximumKeywordSet" /> + <keyword name="LexerJSON" id="LexerJSON" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON" /> + <keyword name="LexerJSON (Constructor)" id="LexerJSON (Constructor)" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.__init__" /> + <keyword name="LexerJSON (Module)" id="LexerJSON (Module)" ref="eric6.QScintilla.Lexers.LexerJSON.html" /> + <keyword name="LexerJSON.defaultKeywords" id="LexerJSON.defaultKeywords" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.defaultKeywords" /> + <keyword name="LexerJSON.initProperties" id="LexerJSON.initProperties" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.initProperties" /> + <keyword name="LexerJSON.isCommentStyle" id="LexerJSON.isCommentStyle" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.isCommentStyle" /> + <keyword name="LexerJSON.isStringStyle" id="LexerJSON.isStringStyle" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.isStringStyle" /> + <keyword name="LexerJSON.maximumKeywordSet" id="LexerJSON.maximumKeywordSet" ref="eric6.QScintilla.Lexers.LexerJSON.html#LexerJSON.maximumKeywordSet" /> <keyword name="LexerJava" id="LexerJava" ref="eric6.QScintilla.Lexers.LexerJava.html#LexerJava" /> <keyword name="LexerJava (Constructor)" id="LexerJava (Constructor)" ref="eric6.QScintilla.Lexers.LexerJava.html#LexerJava.__init__" /> <keyword name="LexerJava (Module)" id="LexerJava (Module)" ref="eric6.QScintilla.Lexers.LexerJava.html" /> @@ -9214,6 +9273,10 @@ <keyword name="LexerMakefile.defaultKeywords" id="LexerMakefile.defaultKeywords" ref="eric6.QScintilla.Lexers.LexerMakefile.html#LexerMakefile.defaultKeywords" /> <keyword name="LexerMakefile.isCommentStyle" id="LexerMakefile.isCommentStyle" ref="eric6.QScintilla.Lexers.LexerMakefile.html#LexerMakefile.isCommentStyle" /> <keyword name="LexerMakefile.isStringStyle" id="LexerMakefile.isStringStyle" ref="eric6.QScintilla.Lexers.LexerMakefile.html#LexerMakefile.isStringStyle" /> + <keyword name="LexerMarkdown" id="LexerMarkdown" ref="eric6.QScintilla.Lexers.LexerMarkdown.html#LexerMarkdown" /> + <keyword name="LexerMarkdown (Constructor)" id="LexerMarkdown (Constructor)" ref="eric6.QScintilla.Lexers.LexerMarkdown.html#LexerMarkdown.__init__" /> + <keyword name="LexerMarkdown (Module)" id="LexerMarkdown (Module)" ref="eric6.QScintilla.Lexers.LexerMarkdown.html" /> + <keyword name="LexerMarkdown.defaultKeywords" id="LexerMarkdown.defaultKeywords" ref="eric6.QScintilla.Lexers.LexerMarkdown.html#LexerMarkdown.defaultKeywords" /> <keyword name="LexerMatlab" id="LexerMatlab" ref="eric6.QScintilla.Lexers.LexerMatlab.html#LexerMatlab" /> <keyword name="LexerMatlab (Constructor)" id="LexerMatlab (Constructor)" ref="eric6.QScintilla.Lexers.LexerMatlab.html#LexerMatlab.__init__" /> <keyword name="LexerMatlab (Module)" id="LexerMatlab (Module)" ref="eric6.QScintilla.Lexers.LexerMatlab.html" /> @@ -9463,6 +9526,65 @@ <keyword name="LoginForm (Module)" id="LoginForm (Module)" ref="eric6.WebBrowser.Passwords.LoginForm.html" /> <keyword name="LoginForm.isValid" id="LoginForm.isValid" ref="eric6.Helpviewer.Passwords.LoginForm.html#LoginForm.isValid" /> <keyword name="LoginForm.isValid" id="LoginForm.isValid" ref="eric6.WebBrowser.Passwords.LoginForm.html#LoginForm.isValid" /> + <keyword name="MarkdownProvider" id="MarkdownProvider" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider" /> + <keyword name="MarkdownProvider (Constructor)" id="MarkdownProvider (Constructor)" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.__init__" /> + <keyword name="MarkdownProvider (Module)" id="MarkdownProvider (Module)" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html" /> + <keyword name="MarkdownProvider.__insertMarkup" id="MarkdownProvider.__insertMarkup" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.__insertMarkup" /> + <keyword name="MarkdownProvider.__makeList" id="MarkdownProvider.__makeList" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.__makeList" /> + <keyword name="MarkdownProvider.bold" id="MarkdownProvider.bold" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.bold" /> + <keyword name="MarkdownProvider.bulletedList" id="MarkdownProvider.bulletedList" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.bulletedList" /> + <keyword name="MarkdownProvider.code" id="MarkdownProvider.code" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.code" /> + <keyword name="MarkdownProvider.codeBlock" id="MarkdownProvider.codeBlock" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.codeBlock" /> + <keyword name="MarkdownProvider.hasBold" id="MarkdownProvider.hasBold" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasBold" /> + <keyword name="MarkdownProvider.hasBulletedList" id="MarkdownProvider.hasBulletedList" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasBulletedList" /> + <keyword name="MarkdownProvider.hasCode" id="MarkdownProvider.hasCode" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasCode" /> + <keyword name="MarkdownProvider.hasCodeBlock" id="MarkdownProvider.hasCodeBlock" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasCodeBlock" /> + <keyword name="MarkdownProvider.hasHyperlink" id="MarkdownProvider.hasHyperlink" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasHyperlink" /> + <keyword name="MarkdownProvider.hasImage" id="MarkdownProvider.hasImage" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasImage" /> + <keyword name="MarkdownProvider.hasItalic" id="MarkdownProvider.hasItalic" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasItalic" /> + <keyword name="MarkdownProvider.hasLine" id="MarkdownProvider.hasLine" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasLine" /> + <keyword name="MarkdownProvider.hasNumberedList" id="MarkdownProvider.hasNumberedList" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasNumberedList" /> + <keyword name="MarkdownProvider.hasQuote" id="MarkdownProvider.hasQuote" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasQuote" /> + <keyword name="MarkdownProvider.hasStrikethrough" id="MarkdownProvider.hasStrikethrough" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hasStrikethrough" /> + <keyword name="MarkdownProvider.header" id="MarkdownProvider.header" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.header" /> + <keyword name="MarkdownProvider.headerLevels" id="MarkdownProvider.headerLevels" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.headerLevels" /> + <keyword name="MarkdownProvider.hyperlink" id="MarkdownProvider.hyperlink" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.hyperlink" /> + <keyword name="MarkdownProvider.image" id="MarkdownProvider.image" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.image" /> + <keyword name="MarkdownProvider.italic" id="MarkdownProvider.italic" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.italic" /> + <keyword name="MarkdownProvider.kind" id="MarkdownProvider.kind" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.kind" /> + <keyword name="MarkdownProvider.line" id="MarkdownProvider.line" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.line" /> + <keyword name="MarkdownProvider.numberedList" id="MarkdownProvider.numberedList" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.numberedList" /> + <keyword name="MarkdownProvider.quote" id="MarkdownProvider.quote" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.quote" /> + <keyword name="MarkdownProvider.strikethrough" id="MarkdownProvider.strikethrough" ref="eric6.QScintilla.MarkupProviders.MarkdownProvider.html#MarkdownProvider.strikethrough" /> + <keyword name="MarkupBase" id="MarkupBase" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase" /> + <keyword name="MarkupBase (Constructor)" id="MarkupBase (Constructor)" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.__init__" /> + <keyword name="MarkupBase (Module)" id="MarkupBase (Module)" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html" /> + <keyword name="MarkupBase.bold" id="MarkupBase.bold" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.bold" /> + <keyword name="MarkupBase.bulletedList" id="MarkupBase.bulletedList" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.bulletedList" /> + <keyword name="MarkupBase.code" id="MarkupBase.code" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.code" /> + <keyword name="MarkupBase.codeBlock" id="MarkupBase.codeBlock" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.codeBlock" /> + <keyword name="MarkupBase.hasBold" id="MarkupBase.hasBold" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasBold" /> + <keyword name="MarkupBase.hasBulletedList" id="MarkupBase.hasBulletedList" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasBulletedList" /> + <keyword name="MarkupBase.hasCode" id="MarkupBase.hasCode" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasCode" /> + <keyword name="MarkupBase.hasCodeBlock" id="MarkupBase.hasCodeBlock" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasCodeBlock" /> + <keyword name="MarkupBase.hasHyperlink" id="MarkupBase.hasHyperlink" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasHyperlink" /> + <keyword name="MarkupBase.hasImage" id="MarkupBase.hasImage" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasImage" /> + <keyword name="MarkupBase.hasItalic" id="MarkupBase.hasItalic" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasItalic" /> + <keyword name="MarkupBase.hasLine" id="MarkupBase.hasLine" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasLine" /> + <keyword name="MarkupBase.hasNumberedList" id="MarkupBase.hasNumberedList" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasNumberedList" /> + <keyword name="MarkupBase.hasQuote" id="MarkupBase.hasQuote" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasQuote" /> + <keyword name="MarkupBase.hasStrikethrough" id="MarkupBase.hasStrikethrough" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hasStrikethrough" /> + <keyword name="MarkupBase.header" id="MarkupBase.header" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.header" /> + <keyword name="MarkupBase.headerLevels" id="MarkupBase.headerLevels" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.headerLevels" /> + <keyword name="MarkupBase.hyperlink" id="MarkupBase.hyperlink" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.hyperlink" /> + <keyword name="MarkupBase.image" id="MarkupBase.image" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.image" /> + <keyword name="MarkupBase.italic" id="MarkupBase.italic" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.italic" /> + <keyword name="MarkupBase.kind" id="MarkupBase.kind" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.kind" /> + <keyword name="MarkupBase.line" id="MarkupBase.line" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.line" /> + <keyword name="MarkupBase.numberedList" id="MarkupBase.numberedList" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.numberedList" /> + <keyword name="MarkupBase.quote" id="MarkupBase.quote" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.quote" /> + <keyword name="MarkupBase.strikethrough" id="MarkupBase.strikethrough" ref="eric6.QScintilla.MarkupProviders.MarkupBase.html#MarkupBase.strikethrough" /> + <keyword name="MarkupProviders (Package)" id="MarkupProviders (Package)" ref="index-eric6.QScintilla.MarkupProviders.html" /> <keyword name="MasterPasswordEntryDialog" id="MasterPasswordEntryDialog" ref="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html#MasterPasswordEntryDialog" /> <keyword name="MasterPasswordEntryDialog (Constructor)" id="MasterPasswordEntryDialog (Constructor)" ref="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html#MasterPasswordEntryDialog.__init__" /> <keyword name="MasterPasswordEntryDialog (Module)" id="MasterPasswordEntryDialog (Module)" ref="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html" /> @@ -10738,7 +10860,6 @@ <keyword name="PreviewProcessingThread.__getHtml" id="PreviewProcessingThread.__getHtml" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__getHtml" /> <keyword name="PreviewProcessingThread.__processSSI" id="PreviewProcessingThread.__processSSI" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__processSSI" /> <keyword name="PreviewProcessingThread.process" id="PreviewProcessingThread.process" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.process" /> - <keyword name="PreviewProcessingThread.replace" id="PreviewProcessingThread.replace" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.replace" /> <keyword name="PreviewProcessingThread.run" id="PreviewProcessingThread.run" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.run" /> <keyword name="Previewer" id="Previewer" ref="eric6.UI.Previewer.html#Previewer" /> <keyword name="Previewer (Constructor)" id="Previewer (Constructor)" ref="eric6.UI.Previewer.html#Previewer.__init__" /> @@ -11759,6 +11880,8 @@ <keyword name="QtHelpDocumentationDialog.on_addPluginButton_clicked" id="QtHelpDocumentationDialog.on_addPluginButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_addPluginButton_clicked" /> <keyword name="QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" id="QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" ref="eric6.Helpviewer.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" /> <keyword name="QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" id="QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged" /> + <keyword name="QtHelpDocumentationDialog.on_managePluginButton_clicked" id="QtHelpDocumentationDialog.on_managePluginButton_clicked" ref="eric6.Helpviewer.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_managePluginButton_clicked" /> + <keyword name="QtHelpDocumentationDialog.on_managePluginButton_clicked" id="QtHelpDocumentationDialog.on_managePluginButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_managePluginButton_clicked" /> <keyword name="QtHelpDocumentationDialog.on_removeButton_clicked" id="QtHelpDocumentationDialog.on_removeButton_clicked" ref="eric6.Helpviewer.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_removeButton_clicked" /> <keyword name="QtHelpDocumentationDialog.on_removeButton_clicked" id="QtHelpDocumentationDialog.on_removeButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html#QtHelpDocumentationDialog.on_removeButton_clicked" /> <keyword name="QtHelpDocumentationSelectionDialog" id="QtHelpDocumentationSelectionDialog" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog" /> @@ -11767,8 +11890,18 @@ <keyword name="QtHelpDocumentationSelectionDialog (Constructor)" id="QtHelpDocumentationSelectionDialog (Constructor)" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.__init__" /> <keyword name="QtHelpDocumentationSelectionDialog (Module)" id="QtHelpDocumentationSelectionDialog (Module)" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html" /> <keyword name="QtHelpDocumentationSelectionDialog (Module)" id="QtHelpDocumentationSelectionDialog (Module)" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html" /> + <keyword name="QtHelpDocumentationSelectionDialog.__deleteCategory" id="QtHelpDocumentationSelectionDialog.__deleteCategory" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.__deleteCategory" /> + <keyword name="QtHelpDocumentationSelectionDialog.__deleteCategory" id="QtHelpDocumentationSelectionDialog.__deleteCategory" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.__deleteCategory" /> <keyword name="QtHelpDocumentationSelectionDialog.getData" id="QtHelpDocumentationSelectionDialog.getData" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.getData" /> <keyword name="QtHelpDocumentationSelectionDialog.getData" id="QtHelpDocumentationSelectionDialog.getData" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.getData" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" id="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" id="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" ref="eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" /> + <keyword name="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" id="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" ref="eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html#QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" /> <keyword name="QtHelpFiltersDialog" id="QtHelpFiltersDialog" ref="eric6.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog" /> <keyword name="QtHelpFiltersDialog" id="QtHelpFiltersDialog" ref="eric6.WebBrowser.QtHelp.QtHelpFiltersDialog.html#QtHelpFiltersDialog" /> <keyword name="QtHelpFiltersDialog (Constructor)" id="QtHelpFiltersDialog (Constructor)" ref="eric6.Helpviewer.QtHelpFiltersDialog.html#QtHelpFiltersDialog.__init__" /> @@ -11971,6 +12104,34 @@ <keyword name="RemoveBookmarksCommand.undo" id="RemoveBookmarksCommand.undo" ref="eric6.Helpviewer.Bookmarks.BookmarksManager.html#RemoveBookmarksCommand.undo" /> <keyword name="RemoveBookmarksCommand.undo" id="RemoveBookmarksCommand.undo" ref="eric6.WebBrowser.Bookmarks.BookmarksManager.html#RemoveBookmarksCommand.undo" /> <keyword name="RepositoryInfoDialog (Module)" id="RepositoryInfoDialog (Module)" ref="eric6.VCS.RepositoryInfoDialog.html" /> + <keyword name="RestructuredTextProvider" id="RestructuredTextProvider" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider" /> + <keyword name="RestructuredTextProvider (Constructor)" id="RestructuredTextProvider (Constructor)" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.__init__" /> + <keyword name="RestructuredTextProvider (Module)" id="RestructuredTextProvider (Module)" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html" /> + <keyword name="RestructuredTextProvider.__insertMarkup" id="RestructuredTextProvider.__insertMarkup" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.__insertMarkup" /> + <keyword name="RestructuredTextProvider.__makeList" id="RestructuredTextProvider.__makeList" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.__makeList" /> + <keyword name="RestructuredTextProvider.bold" id="RestructuredTextProvider.bold" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.bold" /> + <keyword name="RestructuredTextProvider.bulletedList" id="RestructuredTextProvider.bulletedList" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.bulletedList" /> + <keyword name="RestructuredTextProvider.code" id="RestructuredTextProvider.code" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.code" /> + <keyword name="RestructuredTextProvider.codeBlock" id="RestructuredTextProvider.codeBlock" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.codeBlock" /> + <keyword name="RestructuredTextProvider.hasBold" id="RestructuredTextProvider.hasBold" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasBold" /> + <keyword name="RestructuredTextProvider.hasBulletedList" id="RestructuredTextProvider.hasBulletedList" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasBulletedList" /> + <keyword name="RestructuredTextProvider.hasCode" id="RestructuredTextProvider.hasCode" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasCode" /> + <keyword name="RestructuredTextProvider.hasCodeBlock" id="RestructuredTextProvider.hasCodeBlock" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasCodeBlock" /> + <keyword name="RestructuredTextProvider.hasHyperlink" id="RestructuredTextProvider.hasHyperlink" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasHyperlink" /> + <keyword name="RestructuredTextProvider.hasImage" id="RestructuredTextProvider.hasImage" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasImage" /> + <keyword name="RestructuredTextProvider.hasItalic" id="RestructuredTextProvider.hasItalic" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasItalic" /> + <keyword name="RestructuredTextProvider.hasLine" id="RestructuredTextProvider.hasLine" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasLine" /> + <keyword name="RestructuredTextProvider.hasNumberedList" id="RestructuredTextProvider.hasNumberedList" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasNumberedList" /> + <keyword name="RestructuredTextProvider.hasQuote" id="RestructuredTextProvider.hasQuote" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hasQuote" /> + <keyword name="RestructuredTextProvider.header" id="RestructuredTextProvider.header" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.header" /> + <keyword name="RestructuredTextProvider.headerLevels" id="RestructuredTextProvider.headerLevels" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.headerLevels" /> + <keyword name="RestructuredTextProvider.hyperlink" id="RestructuredTextProvider.hyperlink" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.hyperlink" /> + <keyword name="RestructuredTextProvider.image" id="RestructuredTextProvider.image" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.image" /> + <keyword name="RestructuredTextProvider.italic" id="RestructuredTextProvider.italic" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.italic" /> + <keyword name="RestructuredTextProvider.kind" id="RestructuredTextProvider.kind" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.kind" /> + <keyword name="RestructuredTextProvider.line" id="RestructuredTextProvider.line" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.line" /> + <keyword name="RestructuredTextProvider.numberedList" id="RestructuredTextProvider.numberedList" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.numberedList" /> + <keyword name="RestructuredTextProvider.quote" id="RestructuredTextProvider.quote" ref="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html#RestructuredTextProvider.quote" /> <keyword name="SafariImporter" id="SafariImporter" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html#SafariImporter" /> <keyword name="SafariImporter" id="SafariImporter" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.html#SafariImporter" /> <keyword name="SafariImporter (Constructor)" id="SafariImporter (Constructor)" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html#SafariImporter.__init__" /> @@ -12834,8 +12995,6 @@ <keyword name="Subversion.vcsInit" id="Subversion.vcsInit" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsInit" /> <keyword name="Subversion.vcsInitConfig" id="Subversion.vcsInitConfig" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsInitConfig" /> <keyword name="Subversion.vcsInitConfig" id="Subversion.vcsInitConfig" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsInitConfig" /> - <keyword name="Subversion.vcsLog" id="Subversion.vcsLog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsLog" /> - <keyword name="Subversion.vcsLog" id="Subversion.vcsLog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsLog" /> <keyword name="Subversion.vcsLogBrowser" id="Subversion.vcsLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsLogBrowser" /> <keyword name="Subversion.vcsLogBrowser" id="Subversion.vcsLogBrowser" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsLogBrowser" /> <keyword name="Subversion.vcsMerge" id="Subversion.vcsMerge" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsMerge" /> @@ -13075,6 +13234,7 @@ <keyword name="SvnLogBrowserDialog (Constructor)" id="SvnLogBrowserDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.__init__" /> <keyword name="SvnLogBrowserDialog (Module)" id="SvnLogBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html" /> <keyword name="SvnLogBrowserDialog (Module)" id="SvnLogBrowserDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html" /> + <keyword name="SvnLogBrowserDialog.__addFinishCallback" id="SvnLogBrowserDialog.__addFinishCallback" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.__addFinishCallback" /> <keyword name="SvnLogBrowserDialog.__diffRevisions" id="SvnLogBrowserDialog.__diffRevisions" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.__diffRevisions" /> <keyword name="SvnLogBrowserDialog.__diffRevisions" id="SvnLogBrowserDialog.__diffRevisions" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.__diffRevisions" /> <keyword name="SvnLogBrowserDialog.__filterLogs" id="SvnLogBrowserDialog.__filterLogs" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.__filterLogs" /> @@ -13114,6 +13274,8 @@ <keyword name="SvnLogBrowserDialog.on_diffPreviousButton_clicked" id="SvnLogBrowserDialog.on_diffPreviousButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffPreviousButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" id="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffRevisionsButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" id="SvnLogBrowserDialog.on_diffRevisionsButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_diffRevisionsButton_clicked" /> + <keyword name="SvnLogBrowserDialog.on_downButton_clicked" id="SvnLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_downButton_clicked" /> + <keyword name="SvnLogBrowserDialog.on_downButton_clicked" id="SvnLogBrowserDialog.on_downButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_downButton_clicked" /> <keyword name="SvnLogBrowserDialog.on_fieldCombo_activated" id="SvnLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_fieldCombo_activated" /> <keyword name="SvnLogBrowserDialog.on_fieldCombo_activated" id="SvnLogBrowserDialog.on_fieldCombo_activated" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_fieldCombo_activated" /> <keyword name="SvnLogBrowserDialog.on_fromDate_dateChanged" id="SvnLogBrowserDialog.on_fromDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_fromDate_dateChanged" /> @@ -13133,31 +13295,12 @@ <keyword name="SvnLogBrowserDialog.on_stopCheckBox_clicked" id="SvnLogBrowserDialog.on_stopCheckBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_stopCheckBox_clicked" /> <keyword name="SvnLogBrowserDialog.on_toDate_dateChanged" id="SvnLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_toDate_dateChanged" /> <keyword name="SvnLogBrowserDialog.on_toDate_dateChanged" id="SvnLogBrowserDialog.on_toDate_dateChanged" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_toDate_dateChanged" /> + <keyword name="SvnLogBrowserDialog.on_upButton_clicked" id="SvnLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_upButton_clicked" /> + <keyword name="SvnLogBrowserDialog.on_upButton_clicked" id="SvnLogBrowserDialog.on_upButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.on_upButton_clicked" /> <keyword name="SvnLogBrowserDialog.show" id="SvnLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.show" /> <keyword name="SvnLogBrowserDialog.show" id="SvnLogBrowserDialog.show" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.show" /> <keyword name="SvnLogBrowserDialog.start" id="SvnLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html#SvnLogBrowserDialog.start" /> <keyword name="SvnLogBrowserDialog.start" id="SvnLogBrowserDialog.start" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html#SvnLogBrowserDialog.start" /> - <keyword name="SvnLogDialog" id="SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog" /> - <keyword name="SvnLogDialog" id="SvnLogDialog" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog" /> - <keyword name="SvnLogDialog (Constructor)" id="SvnLogDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__init__" /> - <keyword name="SvnLogDialog (Constructor)" id="SvnLogDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__init__" /> - <keyword name="SvnLogDialog (Module)" id="SvnLogDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html" /> - <keyword name="SvnLogDialog (Module)" id="SvnLogDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html" /> - <keyword name="SvnLogDialog.__finish" id="SvnLogDialog.__finish" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__finish" /> - <keyword name="SvnLogDialog.__procFinished" id="SvnLogDialog.__procFinished" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__procFinished" /> - <keyword name="SvnLogDialog.__readStderr" id="SvnLogDialog.__readStderr" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__readStderr" /> - <keyword name="SvnLogDialog.__readStdout" id="SvnLogDialog.__readStdout" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__readStdout" /> - <keyword name="SvnLogDialog.__showError" id="SvnLogDialog.__showError" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__showError" /> - <keyword name="SvnLogDialog.__sourceChanged" id="SvnLogDialog.__sourceChanged" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.__sourceChanged" /> - <keyword name="SvnLogDialog.__sourceChanged" id="SvnLogDialog.__sourceChanged" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.__sourceChanged" /> - <keyword name="SvnLogDialog.closeEvent" id="SvnLogDialog.closeEvent" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.closeEvent" /> - <keyword name="SvnLogDialog.keyPressEvent" id="SvnLogDialog.keyPressEvent" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.keyPressEvent" /> - <keyword name="SvnLogDialog.on_buttonBox_clicked" id="SvnLogDialog.on_buttonBox_clicked" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.on_buttonBox_clicked" /> - <keyword name="SvnLogDialog.on_input_returnPressed" id="SvnLogDialog.on_input_returnPressed" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.on_input_returnPressed" /> - <keyword name="SvnLogDialog.on_passwordCheckBox_toggled" id="SvnLogDialog.on_passwordCheckBox_toggled" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.on_passwordCheckBox_toggled" /> - <keyword name="SvnLogDialog.on_sendButton_clicked" id="SvnLogDialog.on_sendButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.on_sendButton_clicked" /> - <keyword name="SvnLogDialog.start" id="SvnLogDialog.start" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html#SvnLogDialog.start" /> - <keyword name="SvnLogDialog.start" id="SvnLogDialog.start" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html#SvnLogDialog.start" /> <keyword name="SvnLoginDialog" id="SvnLoginDialog" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html#SvnLoginDialog" /> <keyword name="SvnLoginDialog (Constructor)" id="SvnLoginDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html#SvnLoginDialog.__init__" /> <keyword name="SvnLoginDialog (Module)" id="SvnLoginDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html" /> @@ -14963,7 +15106,6 @@ <keyword name="VersionControl.vcsImport" id="VersionControl.vcsImport" ref="eric6.VCS.VersionControl.html#VersionControl.vcsImport" /> <keyword name="VersionControl.vcsInit" id="VersionControl.vcsInit" ref="eric6.VCS.VersionControl.html#VersionControl.vcsInit" /> <keyword name="VersionControl.vcsInitConfig" id="VersionControl.vcsInitConfig" ref="eric6.VCS.VersionControl.html#VersionControl.vcsInitConfig" /> - <keyword name="VersionControl.vcsLog" id="VersionControl.vcsLog" ref="eric6.VCS.VersionControl.html#VersionControl.vcsLog" /> <keyword name="VersionControl.vcsLogBrowser" id="VersionControl.vcsLogBrowser" ref="eric6.VCS.VersionControl.html#VersionControl.vcsLogBrowser" /> <keyword name="VersionControl.vcsMerge" id="VersionControl.vcsMerge" ref="eric6.VCS.VersionControl.html#VersionControl.vcsMerge" /> <keyword name="VersionControl.vcsMove" id="VersionControl.vcsMove" ref="eric6.VCS.VersionControl.html#VersionControl.vcsMove" /> @@ -16130,6 +16272,7 @@ <keyword name="amendConfig" id="amendConfig" ref="eric6.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.html#amendConfig" /> <keyword name="analyze" id="analyze" ref="eric6.DataViews.CodeMetrics.html#analyze" /> <keyword name="append_PKCS7_padding" id="append_PKCS7_padding" ref="eric6.Utilities.crypto.py3AES.html#append_PKCS7_padding" /> + <keyword name="bare_except" id="bare_except" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#bare_except" /> <keyword name="batchCheck" id="batchCheck" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#batchCheck" /> <keyword name="binplistlib (Module)" id="binplistlib (Module)" ref="eric6.Utilities.binplistlib.html" /> <keyword name="blank_lines" id="blank_lines" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#blank_lines" /> @@ -16431,6 +16574,7 @@ <keyword name="getIrc" id="getIrc" ref="eric6.Preferences.__init__.html#getIrc" /> <keyword name="getLanguageIcon" id="getLanguageIcon" ref="eric6.QScintilla.Lexers.__init__.html#getLanguageIcon" /> <keyword name="getLexer" id="getLexer" ref="eric6.QScintilla.Lexers.__init__.html#getLexer" /> + <keyword name="getMarkupProvider" id="getMarkupProvider" ref="eric6.QScintilla.MarkupProviders.__init__.html#getMarkupProvider" /> <keyword name="getMultiProject" id="getMultiProject" ref="eric6.Preferences.__init__.html#getMultiProject" /> <keyword name="getOpenFileFiltersList" id="getOpenFileFiltersList" ref="eric6.QScintilla.Lexers.__init__.html#getOpenFileFiltersList" /> <keyword name="getOpenFileName" id="getOpenFileName" ref="eric6.E5Gui.E5FileDialog.html#getOpenFileName" /> @@ -17304,9 +17448,7 @@ <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgGraftDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgImportDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgOptionsDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgPhaseDialog.html</file> @@ -17382,7 +17524,6 @@ <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnDiffHighlighter.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnInfoDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsPySvn.SvnNewProjectOptionsDialog.html</file> @@ -17414,7 +17555,6 @@ <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnDiffHighlighter.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html</file> - <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnNewProjectOptionsDialog.html</file> <file>eric6.Plugins.VcsPlugins.vcsSubversion.SvnOptionsDialog.html</file> @@ -17551,6 +17691,7 @@ <file>eric6.QScintilla.APIsManager.html</file> <file>eric6.QScintilla.Editor.html</file> <file>eric6.QScintilla.EditorAssembly.html</file> + <file>eric6.QScintilla.EditorButtonsWidget.html</file> <file>eric6.QScintilla.EditorMarkerMap.html</file> <file>eric6.QScintilla.Exporters.ExporterBase.html</file> <file>eric6.QScintilla.Exporters.ExporterHTML.html</file> @@ -17576,10 +17717,12 @@ <file>eric6.QScintilla.Lexers.LexerFortran77.html</file> <file>eric6.QScintilla.Lexers.LexerHTML.html</file> <file>eric6.QScintilla.Lexers.LexerIDL.html</file> + <file>eric6.QScintilla.Lexers.LexerJSON.html</file> <file>eric6.QScintilla.Lexers.LexerJava.html</file> <file>eric6.QScintilla.Lexers.LexerJavaScript.html</file> <file>eric6.QScintilla.Lexers.LexerLua.html</file> <file>eric6.QScintilla.Lexers.LexerMakefile.html</file> + <file>eric6.QScintilla.Lexers.LexerMarkdown.html</file> <file>eric6.QScintilla.Lexers.LexerMatlab.html</file> <file>eric6.QScintilla.Lexers.LexerOctave.html</file> <file>eric6.QScintilla.Lexers.LexerPO.html</file> @@ -17599,6 +17742,13 @@ <file>eric6.QScintilla.Lexers.LexerXML.html</file> <file>eric6.QScintilla.Lexers.LexerYAML.html</file> <file>eric6.QScintilla.Lexers.__init__.html</file> + <file>eric6.QScintilla.MarkupProviders.HtmlProvider.html</file> + <file>eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html</file> + <file>eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html</file> + <file>eric6.QScintilla.MarkupProviders.MarkdownProvider.html</file> + <file>eric6.QScintilla.MarkupProviders.MarkupBase.html</file> + <file>eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html</file> + <file>eric6.QScintilla.MarkupProviders.__init__.html</file> <file>eric6.QScintilla.MiniEditor.html</file> <file>eric6.QScintilla.Printer.html</file> <file>eric6.QScintilla.QsciScintillaCompat.html</file> @@ -17993,6 +18143,7 @@ <file>index-eric6.PyUnit.html</file> <file>index-eric6.QScintilla.Exporters.html</file> <file>index-eric6.QScintilla.Lexers.html</file> + <file>index-eric6.QScintilla.MarkupProviders.html</file> <file>index-eric6.QScintilla.TypingCompleters.html</file> <file>index-eric6.QScintilla.html</file> <file>index-eric6.Snapshot.html</file>
--- a/Documentation/Source/eric6.Helpviewer.QtHelpDocumentationDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Helpviewer.QtHelpDocumentationDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -78,6 +78,9 @@ <td><a href="#QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged">on_documentsList_itemSelectionChanged</a></td> <td>Private slot handling a change of the documents selection.</td> </tr><tr> +<td><a href="#QtHelpDocumentationDialog.on_managePluginButton_clicked">on_managePluginButton_clicked</a></td> +<td>Private slot to manage the QtHelp documents provided by plug-ins.</td> +</tr><tr> <td><a href="#QtHelpDocumentationDialog.on_removeButton_clicked">on_removeButton_clicked</a></td> <td>Private slot to remove a document from the help database.</td> </tr> @@ -145,6 +148,11 @@ <b>on_documentsList_itemSelectionChanged</b>(<i></i>) <p> Private slot handling a change of the documents selection. +</p><a NAME="QtHelpDocumentationDialog.on_managePluginButton_clicked" ID="QtHelpDocumentationDialog.on_managePluginButton_clicked"></a> +<h4>QtHelpDocumentationDialog.on_managePluginButton_clicked</h4> +<b>on_managePluginButton_clicked</b>(<i></i>) +<p> + Private slot to manage the QtHelp documents provided by plug-ins. </p><a NAME="QtHelpDocumentationDialog.on_removeButton_clicked" ID="QtHelpDocumentationDialog.on_removeButton_clicked"></a> <h4>QtHelpDocumentationDialog.on_removeButton_clicked</h4> <b>on_removeButton_clicked</b>(<i></i>)
--- a/Documentation/Source/eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Helpviewer.QtHelpDocumentationSelectionDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -50,7 +50,7 @@ QDialog, Ui_QtHelpDocumentationSelectionDialog <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>AddMode</td></tr><tr><td>ManageMode</td></tr> </table> <h3>Class Methods</h3> <table> @@ -62,8 +62,23 @@ <td><a href="#QtHelpDocumentationSelectionDialog.__init__">QtHelpDocumentationSelectionDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.__deleteCategory">__deleteCategory</a></td> +<td>Private method to delete a category.</td> +</tr><tr> <td><a href="#QtHelpDocumentationSelectionDialog.getData">getData</a></td> <td>Public method to retrieve the selected help documents.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked">on_deleteAllButton_clicked</a></td> +<td>Private slot to delete all documentation sets.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteButton_clicked">on_deleteButton_clicked</a></td> +<td>Private slot to delete the selected documentation sets.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked">on_deleteCategoryButton_clicked</a></td> +<td>Private slot to delete the selected documentation set categories.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged">on_documentationList_itemSelectionChanged</a></td> +<td>Private slot handling the selection of items.</td> </tr> </table> <h3>Static Methods</h3> @@ -72,7 +87,7 @@ </table> <a NAME="QtHelpDocumentationSelectionDialog.__init__" ID="QtHelpDocumentationSelectionDialog.__init__"></a> <h4>QtHelpDocumentationSelectionDialog (Constructor)</h4> -<b>QtHelpDocumentationSelectionDialog</b>(<i>helpDocuments, parent=None</i>) +<b>QtHelpDocumentationSelectionDialog</b>(<i>helpDocuments, mode, parent=None</i>) <p> Constructor </p><dl> @@ -80,10 +95,23 @@ <dd> dictionary containing the lists of help documents to be shown +</dd><dt><i>mode</i> (str)</dt> +<dd> +mode of the dialog </dd><dt><i>parent</i> (QWidget)</dt> <dd> reference to the parent widget </dd> +</dl><a NAME="QtHelpDocumentationSelectionDialog.__deleteCategory" ID="QtHelpDocumentationSelectionDialog.__deleteCategory"></a> +<h4>QtHelpDocumentationSelectionDialog.__deleteCategory</h4> +<b>__deleteCategory</b>(<i>category</i>) +<p> + Private method to delete a category. +</p><dl> +<dt><i>category</i> (QTreeWidgetItem)</dt> +<dd> +reference to the category item +</dd> </dl><a NAME="QtHelpDocumentationSelectionDialog.getData" ID="QtHelpDocumentationSelectionDialog.getData"></a> <h4>QtHelpDocumentationSelectionDialog.getData</h4> <b>getData</b>(<i></i>) @@ -99,7 +127,27 @@ <dd> list of str </dd> -</dl> +</dl><a NAME="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked</h4> +<b>on_deleteAllButton_clicked</b>(<i></i>) +<p> + Private slot to delete all documentation sets. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteButton_clicked</h4> +<b>on_deleteButton_clicked</b>(<i></i>) +<p> + Private slot to delete the selected documentation sets. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked</h4> +<b>on_deleteCategoryButton_clicked</b>(<i></i>) +<p> + Private slot to delete the selected documentation set categories. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" ID="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged"></a> +<h4>QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged</h4> +<b>on_documentationList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot handling the selection of items. +</p> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html Fri Feb 03 19:20:59 2017 +0100 @@ -71,6 +71,9 @@ <td><a href="#ambiguous_identifier">ambiguous_identifier</a></td> <td>Never use the characters 'l', 'O', or 'I' as variable names.</td> </tr><tr> +<td><a href="#bare_except">bare_except</a></td> +<td>When catching exceptions, mention specific exceptions whenever possible.</td> +</tr><tr> <td><a href="#blank_lines">blank_lines</a></td> <td>Separate top-level function and class definitions with two blank lines.</td> </tr><tr> @@ -759,6 +762,18 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="bare_except" ID="bare_except"></a> +<h2>bare_except</h2> +<b>bare_except</b>(<i>logical_line, noqa</i>) +<p> +When catching exceptions, mention specific exceptions whenever possible. +</p><p> + Okay: except Exception: + Okay: except BaseException: + E722: except: +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="blank_lines" ID="blank_lines"></a> <h2>blank_lines</h2> <b>blank_lines</b>(<i>logical_line, blank_lines, indent_level, line_number, blank_before, previous_logical, previous_unindented_logical_line, previous_indent_level, lines</i>) @@ -1177,8 +1192,11 @@ Okay: # this is a comment\nimport os Okay: '''this is a module docstring'''\nimport os Okay: r'''this is a module docstring'''\nimport os - Okay: try:\n import x\nexcept:\n pass\nelse:\n pass\nimport y - Okay: try:\n import x\nexcept:\n pass\nfinally:\n pass\nimport y + Okay: + try:\n\timport x\nexcept ImportError:\n\tpass\nelse:\n\tpass\nimport y + Okay: + try:\n\timport x\nexcept ImportError:\n\tpass\nfinally:\n\tpass\nimport y +</p><p> E402: a=1\nimport os E402: 'One string'\n"Two string"\nimport os E402: a=1\nfrom sys import x
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -63,6 +63,9 @@ <td><a href="#HgLogBrowserDialog.__actionMode">__actionMode</a></td> <td>Private method to get the selected action mode.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__addFinishCallback">__addFinishCallback</a></td> +<td>Private method to add a method to be called once the process finished.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__bookmarkActTriggered">__bookmarkActTriggered</a></td> <td>Private slot to bookmark the selected revision.</td> </tr><tr> @@ -111,6 +114,9 @@ <td><a href="#HgLogBrowserDialog.__getParents">__getParents</a></td> <td>Private method to get the parents of the currently viewed file/directory.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__getRevisionOfTag">__getRevisionOfTag</a></td> +<td>Private method to get the revision of a tag.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__graftActTriggered">__graftActTriggered</a></td> <td>Private slot to handle the Copy Changesets action.</td> </tr><tr> @@ -168,6 +174,9 @@ <td><a href="#HgLogBrowserDialog.__resortFiles">__resortFiles</a></td> <td>Private method to resort the changed files tree.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__revisionClicked">__revisionClicked</a></td> +<td>Private slot to handle the anchorClicked signal of the changeset details pane.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__showError">__showError</a></td> <td>Private slot to show some error.</td> </tr><tr> @@ -213,6 +222,9 @@ <td><a href="#HgLogBrowserDialog.on_diffRevisionsButton_clicked">on_diffRevisionsButton_clicked</a></td> <td>Private slot to handle the Compare Revisions button.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current item down one entry.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> <td>Private slot called, when a new filter field is selected.</td> </tr><tr> @@ -261,6 +273,9 @@ <td><a href="#HgLogBrowserDialog.on_toDate_dateChanged">on_toDate_dateChanged</a></td> <td>Private slot called, when the from date changes.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current item up one entry.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.show">show</a></td> <td>Public slot to show the dialog.</td> </tr><tr> @@ -298,6 +313,19 @@ <dd> selected action mode (string, one of filter or find) </dd> +</dl><a NAME="HgLogBrowserDialog.__addFinishCallback" ID="HgLogBrowserDialog.__addFinishCallback"></a> +<h4>HgLogBrowserDialog.__addFinishCallback</h4> +<b>__addFinishCallback</b>(<i>callback</i>) +<p> + Private method to add a method to be called once the process finished. +</p><p> + The callback methods are invoke in a FIFO style and are consumed. If + a callback method needs to be called again, it must be added again. +</p><dl> +<dt><i>callback</i> (function)</dt> +<dd> +callback method +</dd> </dl><a NAME="HgLogBrowserDialog.__bookmarkActTriggered" ID="HgLogBrowserDialog.__bookmarkActTriggered"></a> <h4>HgLogBrowserDialog.__bookmarkActTriggered</h4> <b>__bookmarkActTriggered</b>(<i></i>) @@ -447,7 +475,7 @@ </dd> </dl><a NAME="HgLogBrowserDialog.__generateLogItem" ID="HgLogBrowserDialog.__generateLogItem"></a> <h4>HgLogBrowserDialog.__generateLogItem</h4> -<b>__generateLogItem</b>(<i>author, date, message, revision, changedPaths, parents, branches, tags, phase, bookmarks=None</i>) +<b>__generateLogItem</b>(<i>author, date, message, revision, changedPaths, parents, branches, tags, phase, bookmarks, latestTag</i>) <p> Private method to generate a log tree entry. </p><dl> @@ -482,6 +510,10 @@ </dd><dt><i>bookmarks</i></dt> <dd> list of bookmarks (string) +</dd><dt><i>latestTag</i></dt> +<dd> +the latest tag(s) reachable from the changeset + (list of strings) </dd> </dl><dl> <dt>Returns:</dt> @@ -510,13 +542,16 @@ </dd> </dl><a NAME="HgLogBrowserDialog.__getLogEntries" ID="HgLogBrowserDialog.__getLogEntries"></a> <h4>HgLogBrowserDialog.__getLogEntries</h4> -<b>__getLogEntries</b>(<i>startRev=None</i>) +<b>__getLogEntries</b>(<i>startRev=None, noEntries=0</i>) <p> Private method to retrieve log entries from the repository. </p><dl> <dt><i>startRev</i></dt> <dd> revision number to start from (integer, string) +</dd><dt><i>noEntries=</i></dt> +<dd> +number of entries to get (0 = default) (int) </dd> </dl><a NAME="HgLogBrowserDialog.__getParents" ID="HgLogBrowserDialog.__getParents"></a> <h4>HgLogBrowserDialog.__getParents</h4> @@ -534,6 +569,26 @@ <dd> list of parent revisions (list of integers) </dd> +</dl><a NAME="HgLogBrowserDialog.__getRevisionOfTag" ID="HgLogBrowserDialog.__getRevisionOfTag"></a> +<h4>HgLogBrowserDialog.__getRevisionOfTag</h4> +<b>__getRevisionOfTag</b>(<i>tag</i>) +<p> + Private method to get the revision of a tag. +</p><dl> +<dt><i>tag</i> (str)</dt> +<dd> +tag name +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +tuple containing the revision and changeset ID +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str) +</dd> </dl><a NAME="HgLogBrowserDialog.__graftActTriggered" ID="HgLogBrowserDialog.__graftActTriggered"></a> <h4>HgLogBrowserDialog.__graftActTriggered</h4> <b>__graftActTriggered</b>(<i></i>) @@ -659,7 +714,18 @@ <b>__resortFiles</b>(<i></i>) <p> Private method to resort the changed files tree. -</p><a NAME="HgLogBrowserDialog.__showError" ID="HgLogBrowserDialog.__showError"></a> +</p><a NAME="HgLogBrowserDialog.__revisionClicked" ID="HgLogBrowserDialog.__revisionClicked"></a> +<h4>HgLogBrowserDialog.__revisionClicked</h4> +<b>__revisionClicked</b>(<i>url</i>) +<p> + Private slot to handle the anchorClicked signal of the changeset + details pane. +</p><dl> +<dt><i>url</i> (QUrl)</dt> +<dd> +URL that was clicked +</dd> +</dl><a NAME="HgLogBrowserDialog.__showError" ID="HgLogBrowserDialog.__showError"></a> <h4>HgLogBrowserDialog.__showError</h4> <b>__showError</b>(<i>out</i>) <p> @@ -775,6 +841,11 @@ <b>on_diffRevisionsButton_clicked</b>(<i></i>) <p> Private slot to handle the Compare Revisions button. +</p><a NAME="HgLogBrowserDialog.on_downButton_clicked" ID="HgLogBrowserDialog.on_downButton_clicked"></a> +<h4>HgLogBrowserDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item down one entry. </p><a NAME="HgLogBrowserDialog.on_fieldCombo_activated" ID="HgLogBrowserDialog.on_fieldCombo_activated"></a> <h4>HgLogBrowserDialog.on_fieldCombo_activated</h4> <b>on_fieldCombo_activated</b>(<i>txt</i>) @@ -898,14 +969,19 @@ <dd> new date (QDate) </dd> -</dl><a NAME="HgLogBrowserDialog.show" ID="HgLogBrowserDialog.show"></a> +</dl><a NAME="HgLogBrowserDialog.on_upButton_clicked" ID="HgLogBrowserDialog.on_upButton_clicked"></a> +<h4>HgLogBrowserDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item up one entry. +</p><a NAME="HgLogBrowserDialog.show" ID="HgLogBrowserDialog.show"></a> <h4>HgLogBrowserDialog.show</h4> <b>show</b>(<i></i>) <p> Public slot to show the dialog. </p><a NAME="HgLogBrowserDialog.start" ID="HgLogBrowserDialog.start"></a> <h4>HgLogBrowserDialog.start</h4> -<b>start</b>(<i>fn, bundle=None, isFile=False</i>) +<b>start</b>(<i>fn, bundle=None, isFile=False, noEntries=0</i>) <p> Public slot to start the hg log command. </p><dl> @@ -919,6 +995,9 @@ <dd> flag indicating log for a file is to be shown (boolean) +</dd><dt><i>noEntries=</i></dt> +<dd> +number of entries to get (0 = default) (int) </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,275 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog</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.Plugins.VcsPlugins.vcsMercurial.HgLogDialog</h1> -<p> -Module implementing a dialog to show the output of the hg log command process. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgLogDialog">HgLogDialog</a></td> -<td>Class implementing a dialog to show the output of the hg log command process.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="HgLogDialog" ID="HgLogDialog"></a> -<h2>HgLogDialog</h2> -<p> - Class implementing a dialog to show the output of the hg log command - process. -</p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the revisions. -</p> -<h3>Derived from</h3> -QWidget, Ui_HgLogDialog -<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="#HgLogDialog.__init__">HgLogDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#HgLogDialog.__finish">__finish</a></td> -<td>Private slot called when the process finished or the user pressed the button.</td> -</tr><tr> -<td><a href="#HgLogDialog.__getParents">__getParents</a></td> -<td>Private method to get the parents of the currently viewed file/directory.</td> -</tr><tr> -<td><a href="#HgLogDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr><tr> -<td><a href="#HgLogDialog.__processOutputLine">__processOutputLine</a></td> -<td>Private method to process the lines of output.</td> -</tr><tr> -<td><a href="#HgLogDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr><tr> -<td><a href="#HgLogDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr><tr> -<td><a href="#HgLogDialog.__showError">__showError</a></td> -<td>Private slot to show some error.</td> -</tr><tr> -<td><a href="#HgLogDialog.__sourceChanged">__sourceChanged</a></td> -<td>Private slot to handle the sourceChanged signal of the contents pane.</td> -</tr><tr> -<td><a href="#HgLogDialog.closeEvent">closeEvent</a></td> -<td>Protected slot implementing a close event handler.</td> -</tr><tr> -<td><a href="#HgLogDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr><tr> -<td><a href="#HgLogDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr><tr> -<td><a href="#HgLogDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr><tr> -<td><a href="#HgLogDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the hg process.</td> -</tr><tr> -<td><a href="#HgLogDialog.start">start</a></td> -<td>Public slot to start the hg log command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="HgLogDialog.__init__" ID="HgLogDialog.__init__"></a> -<h4>HgLogDialog (Constructor)</h4> -<b>HgLogDialog</b>(<i>vcs, mode="log", bundle=None, isFile=False, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>mode</i></dt> -<dd> -mode of the dialog (string; one of log, incoming, outgoing) -</dd><dt><i>bundle</i></dt> -<dd> -name of a bundle file (string) -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="HgLogDialog.__finish" ID="HgLogDialog.__finish"></a> -<h4>HgLogDialog.__finish</h4> -<b>__finish</b>(<i></i>) -<p> - Private slot called when the process finished or the user pressed - the button. -</p><a NAME="HgLogDialog.__getParents" ID="HgLogDialog.__getParents"></a> -<h4>HgLogDialog.__getParents</h4> -<b>__getParents</b>(<i>rev</i>) -<p> - Private method to get the parents of the currently viewed - file/directory. -</p><dl> -<dt><i>rev</i></dt> -<dd> -revision number to get parents for (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -list of parent revisions (list of strings) -</dd> -</dl><a NAME="HgLogDialog.__procFinished" ID="HgLogDialog.__procFinished"></a> -<h4>HgLogDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) -<p> - Private slot connected to the finished signal. -</p><dl> -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd><dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl><a NAME="HgLogDialog.__processOutputLine" ID="HgLogDialog.__processOutputLine"></a> -<h4>HgLogDialog.__processOutputLine</h4> -<b>__processOutputLine</b>(<i>line</i>) -<p> - Private method to process the lines of output. -</p><dl> -<dt><i>line</i></dt> -<dd> -output line to be processed (string) -</dd> -</dl><a NAME="HgLogDialog.__readStderr" ID="HgLogDialog.__readStderr"></a> -<h4>HgLogDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardError signal. -</p><p> - It reads the error output of the process and inserts it into the - error pane. -</p><a NAME="HgLogDialog.__readStdout" ID="HgLogDialog.__readStdout"></a> -<h4>HgLogDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardOutput signal. -</p><p> - It reads the output of the process and inserts it into a buffer. -</p><a NAME="HgLogDialog.__showError" ID="HgLogDialog.__showError"></a> -<h4>HgLogDialog.__showError</h4> -<b>__showError</b>(<i>out</i>) -<p> - Private slot to show some error. -</p><dl> -<dt><i>out</i></dt> -<dd> -error to be shown (string) -</dd> -</dl><a NAME="HgLogDialog.__sourceChanged" ID="HgLogDialog.__sourceChanged"></a> -<h4>HgLogDialog.__sourceChanged</h4> -<b>__sourceChanged</b>(<i>url</i>) -<p> - Private slot to handle the sourceChanged signal of the contents pane. -</p><dl> -<dt><i>url</i></dt> -<dd> -the url that was clicked (QUrl) -</dd> -</dl><a NAME="HgLogDialog.closeEvent" ID="HgLogDialog.closeEvent"></a> -<h4>HgLogDialog.closeEvent</h4> -<b>closeEvent</b>(<i>e</i>) -<p> - Protected slot implementing a close event handler. -</p><dl> -<dt><i>e</i></dt> -<dd> -close event (QCloseEvent) -</dd> -</dl><a NAME="HgLogDialog.keyPressEvent" ID="HgLogDialog.keyPressEvent"></a> -<h4>HgLogDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) -<p> - Protected slot to handle a key press event. -</p><dl> -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl><a NAME="HgLogDialog.on_input_returnPressed" ID="HgLogDialog.on_input_returnPressed"></a> -<h4>HgLogDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) -<p> - Private slot to handle the press of the return key in the input field. -</p><a NAME="HgLogDialog.on_passwordCheckBox_toggled" ID="HgLogDialog.on_passwordCheckBox_toggled"></a> -<h4>HgLogDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) -<p> - Private slot to handle the password checkbox toggled. -</p><dl> -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl><a NAME="HgLogDialog.on_sendButton_clicked" ID="HgLogDialog.on_sendButton_clicked"></a> -<h4>HgLogDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) -<p> - Private slot to send the input to the hg process. -</p><a NAME="HgLogDialog.start" ID="HgLogDialog.start"></a> -<h4>HgLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries=0, revisions=None</i>) -<p> - Public slot to start the hg log command. -</p><dl> -<dt><i>fn</i></dt> -<dd> -filename to show the log for (string) -</dd><dt><i>noEntries</i></dt> -<dd> -number of entries to show (integer) -</dd><dt><i>revisions</i></dt> -<dd> -revisions to show log for (list of strings) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,234 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog</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.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog</h1> -<p> -Module implementing a dialog to select revisions. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#HgMultiRevisionSelectionDialog">HgMultiRevisionSelectionDialog</a></td> -<td>Class implementing a dialog to select revisions.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="HgMultiRevisionSelectionDialog" ID="HgMultiRevisionSelectionDialog"></a> -<h2>HgMultiRevisionSelectionDialog</h2> -<p> - Class implementing a dialog to select revisions. -</p> -<h3>Derived from</h3> -QDialog, Ui_HgMultiRevisionSelectionDialog -<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="#HgMultiRevisionSelectionDialog.__init__">HgMultiRevisionSelectionDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.__updateOK">__updateOK</a></td> -<td>Private slot to update the OK button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.getRevisions">getRevisions</a></td> -<td>Public method to retrieve the selected revisions.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> -<td>Private slot to handle changes of the Bookmark select button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Bookmark combo.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> -<td>Private slot to handle changes of the Branch select button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Branch combo.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_changesetsButton_toggled">on_changesetsButton_toggled</a></td> -<td>Private slot to handle changes of the Changesets select button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged">on_changesetsEdit_textChanged</a></td> -<td>Private slot to handle changes of the Changesets edit.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_limitGroup_toggled">on_limitGroup_toggled</a></td> -<td>Private slot to handle changes of the Limit Results group status.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> -<td>Private slot to handle changes of the Tag select button.</td> -</tr><tr> -<td><a href="#HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> -<td>Private slot to handle changes of the Tag combo.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="HgMultiRevisionSelectionDialog.__init__" ID="HgMultiRevisionSelectionDialog.__init__"></a> -<h4>HgMultiRevisionSelectionDialog (Constructor)</h4> -<b>HgMultiRevisionSelectionDialog</b>(<i>tagsList, branchesList, bookmarksList=None, emptyRevsOk=False, showLimit=False, limitDefault=100, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>tagsList</i></dt> -<dd> -list of tags (list of strings) -</dd><dt><i>branchesList</i></dt> -<dd> -list of branches (list of strings) -</dd><dt><i>bookmarksList</i></dt> -<dd> -list of bookmarks (list of strings) -</dd><dt><i>emptyRevsOk</i></dt> -<dd> -flag indicating that it is ok to not enter - revisions (boolean) -</dd><dt><i>showLimit</i></dt> -<dd> -flag indicating to show the limit entry (boolean) -</dd><dt><i>limitDefault</i></dt> -<dd> -default value for the limit (integer) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.__updateOK" ID="HgMultiRevisionSelectionDialog.__updateOK"></a> -<h4>HgMultiRevisionSelectionDialog.__updateOK</h4> -<b>__updateOK</b>(<i></i>) -<p> - Private slot to update the OK button. -</p><a NAME="HgMultiRevisionSelectionDialog.getRevisions" ID="HgMultiRevisionSelectionDialog.getRevisions"></a> -<h4>HgMultiRevisionSelectionDialog.getRevisions</h4> -<b>getRevisions</b>(<i></i>) -<p> - Public method to retrieve the selected revisions. -</p><dl> -<dt>Returns:</dt> -<dd> -tuple of selected revisions (list of strings) and number - of entries to be shown (integer) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled" ID="HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_bookmarkButton_toggled</h4> -<b>on_bookmarkButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Bookmark select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged"></a> -<h4>HgMultiRevisionSelectionDialog.on_bookmarkCombo_editTextChanged</h4> -<b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the Bookmark combo. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the combo (string) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_branchButton_toggled" ID="HgMultiRevisionSelectionDialog.on_branchButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_branchButton_toggled</h4> -<b>on_branchButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Branch select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged"></a> -<h4>HgMultiRevisionSelectionDialog.on_branchCombo_editTextChanged</h4> -<b>on_branchCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the Branch combo. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the combo (string) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled" ID="HgMultiRevisionSelectionDialog.on_changesetsButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_changesetsButton_toggled</h4> -<b>on_changesetsButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Changesets select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged" ID="HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged"></a> -<h4>HgMultiRevisionSelectionDialog.on_changesetsEdit_textChanged</h4> -<b>on_changesetsEdit_textChanged</b>(<i></i>) -<p> - Private slot to handle changes of the Changesets edit. -</p><a NAME="HgMultiRevisionSelectionDialog.on_limitGroup_toggled" ID="HgMultiRevisionSelectionDialog.on_limitGroup_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_limitGroup_toggled</h4> -<b>on_limitGroup_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Limit Results group status. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the group (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_tagButton_toggled" ID="HgMultiRevisionSelectionDialog.on_tagButton_toggled"></a> -<h4>HgMultiRevisionSelectionDialog.on_tagButton_toggled</h4> -<b>on_tagButton_toggled</b>(<i>checked</i>) -<p> - Private slot to handle changes of the Tag select button. -</p><dl> -<dt><i>checked</i></dt> -<dd> -state of the button (boolean) -</dd> -</dl><a NAME="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged" ID="HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged"></a> -<h4>HgMultiRevisionSelectionDialog.on_tagCombo_editTextChanged</h4> -<b>on_tagCombo_editTextChanged</b>(<i>txt</i>) -<p> - Private slot to handle changes of the Tag combo. -</p><dl> -<dt><i>txt</i></dt> -<dd> -text of the combo (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Fri Feb 03 19:20:59 2017 +0100 @@ -359,9 +359,6 @@ <td><a href="#Hg.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#Hg.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory from the Mercurial repository.</td> -</tr><tr> <td><a href="#Hg.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Mercurial repository.</td> </tr><tr> @@ -1723,17 +1720,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="Hg.vcsLog" ID="Hg.vcsLog"></a> -<h4>Hg.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory from the - Mercurial repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Hg.vcsLogBrowser" ID="Hg.vcsLogBrowser"></a> <h4>Hg.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -114,6 +114,9 @@ <td><a href="#SvnLogBrowserDialog.on_diffRevisionsButton_clicked">on_diffRevisionsButton_clicked</a></td> <td>Private slot to handle the Compare Revisions button.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current item down one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> <td>Private slot called, when a new filter field is selected.</td> </tr><tr> @@ -138,6 +141,9 @@ <td><a href="#SvnLogBrowserDialog.on_toDate_dateChanged">on_toDate_dateChanged</a></td> <td>Private slot called, when the from date changes.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current item up one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.show">show</a></td> <td>Public slot to show the dialog.</td> </tr><tr> @@ -325,6 +331,11 @@ <b>on_diffRevisionsButton_clicked</b>(<i></i>) <p> Private slot to handle the Compare Revisions button. +</p><a NAME="SvnLogBrowserDialog.on_downButton_clicked" ID="SvnLogBrowserDialog.on_downButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item down one entry. </p><a NAME="SvnLogBrowserDialog.on_fieldCombo_activated" ID="SvnLogBrowserDialog.on_fieldCombo_activated"></a> <h4>SvnLogBrowserDialog.on_fieldCombo_activated</h4> <b>on_fieldCombo_activated</b>(<i>txt</i>) @@ -398,7 +409,12 @@ <dd> new date (QDate) </dd> -</dl><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> +</dl><a NAME="SvnLogBrowserDialog.on_upButton_clicked" ID="SvnLogBrowserDialog.on_upButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item up one entry. +</p><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> <h4>SvnLogBrowserDialog.show</h4> <b>show</b>(<i></i>) <p>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,153 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog</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.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog</h1> -<p> -Module implementing a dialog to show the output of the svn log command process. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#SvnLogDialog">SvnLogDialog</a></td> -<td>Class implementing a dialog to show the output of the svn log command.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="SvnLogDialog" ID="SvnLogDialog"></a> -<h2>SvnLogDialog</h2> -<p> - Class implementing a dialog to show the output of the svn log command. -</p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the versions. -</p> -<h3>Derived from</h3> -QWidget, SvnDialogMixin, Ui_SvnLogDialog -<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="#SvnLogDialog.__init__">SvnLogDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#SvnLogDialog.__finish">__finish</a></td> -<td>Private slot called when the user pressed the button.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__showError">__showError</a></td> -<td>Private slot to show an error message.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__sourceChanged">__sourceChanged</a></td> -<td>Private slot to handle the sourceChanged signal of the contents pane.</td> -</tr><tr> -<td><a href="#SvnLogDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> -<td>Private slot called by a button of the button box clicked.</td> -</tr><tr> -<td><a href="#SvnLogDialog.start">start</a></td> -<td>Public slot to start the svn log command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="SvnLogDialog.__init__" ID="SvnLogDialog.__init__"></a> -<h4>SvnLogDialog (Constructor)</h4> -<b>SvnLogDialog</b>(<i>vcs, isFile=False, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="SvnLogDialog.__finish" ID="SvnLogDialog.__finish"></a> -<h4>SvnLogDialog.__finish</h4> -<b>__finish</b>(<i></i>) -<p> - Private slot called when the user pressed the button. -</p><a NAME="SvnLogDialog.__showError" ID="SvnLogDialog.__showError"></a> -<h4>SvnLogDialog.__showError</h4> -<b>__showError</b>(<i>msg</i>) -<p> - Private slot to show an error message. -</p><dl> -<dt><i>msg</i></dt> -<dd> -error message to show (string) -</dd> -</dl><a NAME="SvnLogDialog.__sourceChanged" ID="SvnLogDialog.__sourceChanged"></a> -<h4>SvnLogDialog.__sourceChanged</h4> -<b>__sourceChanged</b>(<i>url</i>) -<p> - Private slot to handle the sourceChanged signal of the contents pane. -</p><dl> -<dt><i>url</i></dt> -<dd> -the url that was clicked (QUrl) -</dd> -</dl><a NAME="SvnLogDialog.on_buttonBox_clicked" ID="SvnLogDialog.on_buttonBox_clicked"></a> -<h4>SvnLogDialog.on_buttonBox_clicked</h4> -<b>on_buttonBox_clicked</b>(<i>button</i>) -<p> - Private slot called by a button of the button box clicked. -</p><dl> -<dt><i>button</i></dt> -<dd> -button that was clicked (QAbstractButton) -</dd> -</dl><a NAME="SvnLogDialog.start" ID="SvnLogDialog.start"></a> -<h4>SvnLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries=0</i>) -<p> - Public slot to start the svn log command. -</p><dl> -<dt><i>fn</i></dt> -<dd> -filename to show the log for (string) -</dd><dt><i>noEntries</i></dt> -<dd> -number of entries to show (integer) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html Fri Feb 03 19:20:59 2017 +0100 @@ -219,9 +219,6 @@ <td><a href="#Subversion.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#Subversion.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory from the Subversion repository.</td> -</tr><tr> <td><a href="#Subversion.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Subversion repository.</td> </tr><tr> @@ -1075,17 +1072,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="Subversion.vcsLog" ID="Subversion.vcsLog"></a> -<h4>Subversion.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory from the - Subversion repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Subversion.vcsLogBrowser" ID="Subversion.vcsLogBrowser"></a> <h4>Subversion.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -60,6 +60,9 @@ <td><a href="#SvnLogBrowserDialog.__init__">SvnLogBrowserDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.__addFinishCallback">__addFinishCallback</a></td> +<td>Private method to add a method to be called once the process finished.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.__diffRevisions">__diffRevisions</a></td> <td>Private method to do a diff of two revisions.</td> </tr><tr> @@ -123,6 +126,9 @@ <td><a href="#SvnLogBrowserDialog.on_diffRevisionsButton_clicked">on_diffRevisionsButton_clicked</a></td> <td>Private slot to handle the Compare Revisions button.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_downButton_clicked">on_downButton_clicked</a></td> +<td>Private slot to move the current item down one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.on_fieldCombo_activated">on_fieldCombo_activated</a></td> <td>Private slot called, when a new filter field is selected.</td> </tr><tr> @@ -156,6 +162,9 @@ <td><a href="#SvnLogBrowserDialog.on_toDate_dateChanged">on_toDate_dateChanged</a></td> <td>Private slot called, when the from date changes.</td> </tr><tr> +<td><a href="#SvnLogBrowserDialog.on_upButton_clicked">on_upButton_clicked</a></td> +<td>Private slot to move the current item up one entry.</td> +</tr><tr> <td><a href="#SvnLogBrowserDialog.show">show</a></td> <td>Public slot to show the dialog.</td> </tr><tr> @@ -180,6 +189,19 @@ <dd> parent widget (QWidget) </dd> +</dl><a NAME="SvnLogBrowserDialog.__addFinishCallback" ID="SvnLogBrowserDialog.__addFinishCallback"></a> +<h4>SvnLogBrowserDialog.__addFinishCallback</h4> +<b>__addFinishCallback</b>(<i>callback</i>) +<p> + Private method to add a method to be called once the process finished. +</p><p> + The callback methods are invoke in a FIFO style and are consumed. If + a callback method needs to be called again, it must be added again. +</p><dl> +<dt><i>callback</i> (function)</dt> +<dd> +callback method +</dd> </dl><a NAME="SvnLogBrowserDialog.__diffRevisions" ID="SvnLogBrowserDialog.__diffRevisions"></a> <h4>SvnLogBrowserDialog.__diffRevisions</h4> <b>__diffRevisions</b>(<i>rev1, rev2</i>) @@ -369,6 +391,11 @@ <b>on_diffRevisionsButton_clicked</b>(<i></i>) <p> Private slot to handle the Compare Revisions button. +</p><a NAME="SvnLogBrowserDialog.on_downButton_clicked" ID="SvnLogBrowserDialog.on_downButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_downButton_clicked</h4> +<b>on_downButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item down one entry. </p><a NAME="SvnLogBrowserDialog.on_fieldCombo_activated" ID="SvnLogBrowserDialog.on_fieldCombo_activated"></a> <h4>SvnLogBrowserDialog.on_fieldCombo_activated</h4> <b>on_fieldCombo_activated</b>(<i>txt</i>) @@ -462,7 +489,12 @@ <dd> new date (QDate) </dd> -</dl><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> +</dl><a NAME="SvnLogBrowserDialog.on_upButton_clicked" ID="SvnLogBrowserDialog.on_upButton_clicked"></a> +<h4>SvnLogBrowserDialog.on_upButton_clicked</h4> +<b>on_upButton_clicked</b>(<i></i>) +<p> + Private slot to move the current item up one entry. +</p><a NAME="SvnLogBrowserDialog.show" ID="SvnLogBrowserDialog.show"></a> <h4>SvnLogBrowserDialog.show</h4> <b>show</b>(<i></i>) <p>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,212 +0,0 @@ -<!DOCTYPE html> -<html><head> -<title>eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog</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.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog</h1> -<p> -Module implementing a dialog to show the output of the svn log command process. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr> -<td><a href="#SvnLogDialog">SvnLogDialog</a></td> -<td>Class implementing a dialog to show the output of the svn log command process.</td> -</tr> -</table> -<h3>Functions</h3> -<table> -<tr><td>None</td></tr> -</table> -<hr /><hr /> -<a NAME="SvnLogDialog" ID="SvnLogDialog"></a> -<h2>SvnLogDialog</h2> -<p> - Class implementing a dialog to show the output of the svn log command - process. -</p><p> - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the versions. -</p> -<h3>Derived from</h3> -QWidget, Ui_SvnLogDialog -<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="#SvnLogDialog.__init__">SvnLogDialog</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#SvnLogDialog.__procFinished">__procFinished</a></td> -<td>Private slot connected to the finished signal.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__readStderr">__readStderr</a></td> -<td>Private slot to handle the readyReadStandardError signal.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__readStdout">__readStdout</a></td> -<td>Private slot to handle the readyReadStandardOutput signal.</td> -</tr><tr> -<td><a href="#SvnLogDialog.__sourceChanged">__sourceChanged</a></td> -<td>Private slot to handle the sourceChanged signal of the contents pane.</td> -</tr><tr> -<td><a href="#SvnLogDialog.closeEvent">closeEvent</a></td> -<td>Protected slot implementing a close event handler.</td> -</tr><tr> -<td><a href="#SvnLogDialog.keyPressEvent">keyPressEvent</a></td> -<td>Protected slot to handle a key press event.</td> -</tr><tr> -<td><a href="#SvnLogDialog.on_input_returnPressed">on_input_returnPressed</a></td> -<td>Private slot to handle the press of the return key in the input field.</td> -</tr><tr> -<td><a href="#SvnLogDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td> -<td>Private slot to handle the password checkbox toggled.</td> -</tr><tr> -<td><a href="#SvnLogDialog.on_sendButton_clicked">on_sendButton_clicked</a></td> -<td>Private slot to send the input to the subversion process.</td> -</tr><tr> -<td><a href="#SvnLogDialog.start">start</a></td> -<td>Public slot to start the cvs log command.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="SvnLogDialog.__init__" ID="SvnLogDialog.__init__"></a> -<h4>SvnLogDialog (Constructor)</h4> -<b>SvnLogDialog</b>(<i>vcs, isFile=False, parent=None</i>) -<p> - Constructor -</p><dl> -<dt><i>vcs</i></dt> -<dd> -reference to the vcs object -</dd><dt><i>isFile</i></dt> -<dd> -flag indicating log for a file is to be shown (boolean) -</dd><dt><i>parent</i></dt> -<dd> -parent widget (QWidget) -</dd> -</dl><a NAME="SvnLogDialog.__procFinished" ID="SvnLogDialog.__procFinished"></a> -<h4>SvnLogDialog.__procFinished</h4> -<b>__procFinished</b>(<i>exitCode, exitStatus</i>) -<p> - Private slot connected to the finished signal. -</p><dl> -<dt><i>exitCode</i></dt> -<dd> -exit code of the process (integer) -</dd><dt><i>exitStatus</i></dt> -<dd> -exit status of the process (QProcess.ExitStatus) -</dd> -</dl><a NAME="SvnLogDialog.__readStderr" ID="SvnLogDialog.__readStderr"></a> -<h4>SvnLogDialog.__readStderr</h4> -<b>__readStderr</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardError signal. -</p><p> - It reads the error output of the process and inserts it into the - error pane. -</p><a NAME="SvnLogDialog.__readStdout" ID="SvnLogDialog.__readStdout"></a> -<h4>SvnLogDialog.__readStdout</h4> -<b>__readStdout</b>(<i></i>) -<p> - Private slot to handle the readyReadStandardOutput signal. -</p><p> - It reads the output of the process and inserts it into a buffer. -</p><a NAME="SvnLogDialog.__sourceChanged" ID="SvnLogDialog.__sourceChanged"></a> -<h4>SvnLogDialog.__sourceChanged</h4> -<b>__sourceChanged</b>(<i>url</i>) -<p> - Private slot to handle the sourceChanged signal of the contents pane. -</p><dl> -<dt><i>url</i></dt> -<dd> -the url that was clicked (QUrl) -</dd> -</dl><a NAME="SvnLogDialog.closeEvent" ID="SvnLogDialog.closeEvent"></a> -<h4>SvnLogDialog.closeEvent</h4> -<b>closeEvent</b>(<i>e</i>) -<p> - Protected slot implementing a close event handler. -</p><dl> -<dt><i>e</i></dt> -<dd> -close event (QCloseEvent) -</dd> -</dl><a NAME="SvnLogDialog.keyPressEvent" ID="SvnLogDialog.keyPressEvent"></a> -<h4>SvnLogDialog.keyPressEvent</h4> -<b>keyPressEvent</b>(<i>evt</i>) -<p> - Protected slot to handle a key press event. -</p><dl> -<dt><i>evt</i></dt> -<dd> -the key press event (QKeyEvent) -</dd> -</dl><a NAME="SvnLogDialog.on_input_returnPressed" ID="SvnLogDialog.on_input_returnPressed"></a> -<h4>SvnLogDialog.on_input_returnPressed</h4> -<b>on_input_returnPressed</b>(<i></i>) -<p> - Private slot to handle the press of the return key in the input field. -</p><a NAME="SvnLogDialog.on_passwordCheckBox_toggled" ID="SvnLogDialog.on_passwordCheckBox_toggled"></a> -<h4>SvnLogDialog.on_passwordCheckBox_toggled</h4> -<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>) -<p> - Private slot to handle the password checkbox toggled. -</p><dl> -<dt><i>isOn</i></dt> -<dd> -flag indicating the status of the check box (boolean) -</dd> -</dl><a NAME="SvnLogDialog.on_sendButton_clicked" ID="SvnLogDialog.on_sendButton_clicked"></a> -<h4>SvnLogDialog.on_sendButton_clicked</h4> -<b>on_sendButton_clicked</b>(<i></i>) -<p> - Private slot to send the input to the subversion process. -</p><a NAME="SvnLogDialog.start" ID="SvnLogDialog.start"></a> -<h4>SvnLogDialog.start</h4> -<b>start</b>(<i>fn, noEntries=0</i>) -<p> - Public slot to start the cvs log command. -</p><dl> -<dt><i>fn</i></dt> -<dd> -filename to show the log for (string) -</dd><dt><i>noEntries</i></dt> -<dd> -number of entries to show (integer) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html Fri Feb 03 19:20:59 2017 +0100 @@ -210,9 +210,6 @@ <td><a href="#Subversion.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#Subversion.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory from the Subversion repository.</td> -</tr><tr> <td><a href="#Subversion.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to browse the log of a file/directory from the Subversion repository.</td> </tr><tr> @@ -1026,17 +1023,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="Subversion.vcsLog" ID="Subversion.vcsLog"></a> -<h4>Subversion.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory from the - Subversion repository. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log of (string) -</dd> </dl><a NAME="Subversion.vcsLogBrowser" ID="Subversion.vcsLogBrowser"></a> <h4>Subversion.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.EmailPage.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.EmailPage.html Fri Feb 03 19:20:59 2017 +0100 @@ -63,21 +63,36 @@ <td><a href="#EmailPage.__init__">EmailPage</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#EmailPage.__updatePortSpin">__updatePortSpin</a></td> +<td>Private slot to set the value of the port spin box depending upon the selected encryption method.</td> +</tr><tr> <td><a href="#EmailPage.__updateTestButton">__updateTestButton</a></td> <td>Private slot to update the enabled state of the test button.</td> </tr><tr> -<td><a href="#EmailPage.on_mailAuthenticationCheckBox_toggled">on_mailAuthenticationCheckBox_toggled</a></td> -<td>Private slot to handle a change of the state of the authentication selector.</td> +<td><a href="#EmailPage.on_mailAuthenticationGroup_toggled">on_mailAuthenticationGroup_toggled</a></td> +<td>Private slot to handle a change of the state of the authentication group.</td> </tr><tr> <td><a href="#EmailPage.on_mailPasswordEdit_textChanged">on_mailPasswordEdit_textChanged</a></td> <td>Private slot to handle a change of the text of the user edit.</td> </tr><tr> +<td><a href="#EmailPage.on_mailServerEdit_textChanged">on_mailServerEdit_textChanged</a></td> +<td>Private slot to handle a change of the text of the mail server edit.</td> +</tr><tr> <td><a href="#EmailPage.on_mailUserEdit_textChanged">on_mailUserEdit_textChanged</a></td> <td>Private slot to handle a change of the text of the user edit.</td> </tr><tr> +<td><a href="#EmailPage.on_noEncryptionButton_toggled">on_noEncryptionButton_toggled</a></td> +<td>Private slot handling a change of no encryption button.</td> +</tr><tr> <td><a href="#EmailPage.on_testButton_clicked">on_testButton_clicked</a></td> <td>Private slot to test the mail server login data.</td> </tr><tr> +<td><a href="#EmailPage.on_useSslButton_toggled">on_useSslButton_toggled</a></td> +<td>Private slot handling a change of SSL encryption button.</td> +</tr><tr> +<td><a href="#EmailPage.on_useTlsButton_toggled">on_useTlsButton_toggled</a></td> +<td>Private slot handling a change of TLS encryption button.</td> +</tr><tr> <td><a href="#EmailPage.save">save</a></td> <td>Public slot to save the Email configuration.</td> </tr> @@ -91,21 +106,27 @@ <b>EmailPage</b>(<i></i>) <p> Constructor +</p><a NAME="EmailPage.__updatePortSpin" ID="EmailPage.__updatePortSpin"></a> +<h4>EmailPage.__updatePortSpin</h4> +<b>__updatePortSpin</b>(<i></i>) +<p> + Private slot to set the value of the port spin box depending upon + the selected encryption method. </p><a NAME="EmailPage.__updateTestButton" ID="EmailPage.__updateTestButton"></a> <h4>EmailPage.__updateTestButton</h4> <b>__updateTestButton</b>(<i></i>) <p> Private slot to update the enabled state of the test button. -</p><a NAME="EmailPage.on_mailAuthenticationCheckBox_toggled" ID="EmailPage.on_mailAuthenticationCheckBox_toggled"></a> -<h4>EmailPage.on_mailAuthenticationCheckBox_toggled</h4> -<b>on_mailAuthenticationCheckBox_toggled</b>(<i>checked</i>) +</p><a NAME="EmailPage.on_mailAuthenticationGroup_toggled" ID="EmailPage.on_mailAuthenticationGroup_toggled"></a> +<h4>EmailPage.on_mailAuthenticationGroup_toggled</h4> +<b>on_mailAuthenticationGroup_toggled</b>(<i>checked</i>) <p> Private slot to handle a change of the state of the authentication - selector. + group. </p><dl> <dt><i>checked</i></dt> <dd> -state of the checkbox (boolean) +state of the group (boolean) </dd> </dl><a NAME="EmailPage.on_mailPasswordEdit_textChanged" ID="EmailPage.on_mailPasswordEdit_textChanged"></a> <h4>EmailPage.on_mailPasswordEdit_textChanged</h4> @@ -117,6 +138,16 @@ <dd> current text of the edit (string) </dd> +</dl><a NAME="EmailPage.on_mailServerEdit_textChanged" ID="EmailPage.on_mailServerEdit_textChanged"></a> +<h4>EmailPage.on_mailServerEdit_textChanged</h4> +<b>on_mailServerEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot to handle a change of the text of the mail server edit. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +current text of the edit (string) +</dd> </dl><a NAME="EmailPage.on_mailUserEdit_textChanged" ID="EmailPage.on_mailUserEdit_textChanged"></a> <h4>EmailPage.on_mailUserEdit_textChanged</h4> <b>on_mailUserEdit_textChanged</b>(<i>txt</i>) @@ -127,12 +158,42 @@ <dd> current text of the edit (string) </dd> +</dl><a NAME="EmailPage.on_noEncryptionButton_toggled" ID="EmailPage.on_noEncryptionButton_toggled"></a> +<h4>EmailPage.on_noEncryptionButton_toggled</h4> +<b>on_noEncryptionButton_toggled</b>(<i>checked</i>) +<p> + Private slot handling a change of no encryption button. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +current state of the button +</dd> </dl><a NAME="EmailPage.on_testButton_clicked" ID="EmailPage.on_testButton_clicked"></a> <h4>EmailPage.on_testButton_clicked</h4> <b>on_testButton_clicked</b>(<i></i>) <p> Private slot to test the mail server login data. -</p><a NAME="EmailPage.save" ID="EmailPage.save"></a> +</p><a NAME="EmailPage.on_useSslButton_toggled" ID="EmailPage.on_useSslButton_toggled"></a> +<h4>EmailPage.on_useSslButton_toggled</h4> +<b>on_useSslButton_toggled</b>(<i>checked</i>) +<p> + Private slot handling a change of SSL encryption button. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +current state of the button +</dd> +</dl><a NAME="EmailPage.on_useTlsButton_toggled" ID="EmailPage.on_useTlsButton_toggled"></a> +<h4>EmailPage.on_useTlsButton_toggled</h4> +<b>on_useTlsButton_toggled</b>(<i>checked</i>) +<p> + Private slot handling a change of TLS encryption button. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +current state of the button +</dd> +</dl><a NAME="EmailPage.save" ID="EmailPage.save"></a> <h4>EmailPage.save</h4> <b>save</b>(<i></i>) <p>
--- a/Documentation/Source/eric6.QScintilla.Editor.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.QScintilla.Editor.html Fri Feb 03 19:20:59 2017 +0100 @@ -112,6 +112,10 @@ </dd><dt>refreshed()</dt> <dd> emitted to signal a refresh of the editor contents +</dd><dt>settingsRead()</dt> +<dd> +emitted to signal, that the settings have been read + and set </dd><dt>showMenu(str, QMenu, QsciScintillaCompat)</dt> <dd> emitted when a menu is
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.EditorButtonsWidget.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,241 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.EditorButtonsWidget</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.EditorButtonsWidget</h1> +<p> +Module implementing a widget containing various buttons for accessing +editor actions. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#EditorButtonsWidget">EditorButtonsWidget</a></td> +<td>Class implementing a widget containing various buttons for accessing editor actions.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="EditorButtonsWidget" ID="EditorButtonsWidget"></a> +<h2>EditorButtonsWidget</h2> +<p> + Class implementing a widget containing various buttons for accessing + editor actions. +</p> +<h3>Derived from</h3> +QWidget +<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="#EditorButtonsWidget.__init__">EditorButtonsWidget</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__addButton">__addButton</a></td> +<td>Private method to add a format button.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__addSeparator">__addSeparator</a></td> +<td>Private method to add a separator line.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__createButtons">__createButtons</a></td> +<td>Private slot to create the various tool buttons.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__editorSelectionChanged">__editorSelectionChanged</a></td> +<td>Private slot to handle a change of the editor's selection.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__editorSettingsRead">__editorSettingsRead</a></td> +<td>Private slot to handle a change of the editor related settings.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__enableScrollerButtons">__enableScrollerButtons</a></td> +<td>Private method to set the enabled state of the scroll buttons.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__formatClicked">__formatClicked</a></td> +<td>Private slot to handle a format button being clicked.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__headerMenuTriggered">__headerMenuTriggered</a></td> +<td>Private method handling the selection of a header menu entry.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__slide">__slide</a></td> +<td>Private method to move the sliding widget.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__slideDown">__slideDown</a></td> +<td>Private slot to move the widget downwards, i.e.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__slideUp">__slideUp</a></td> +<td>Private slot to move the widget upwards, i.e.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.__updateButtonStates">__updateButtonStates</a></td> +<td>Private slot to change the button states.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.resizeEvent">resizeEvent</a></td> +<td>Protected method to handle resize events.</td> +</tr><tr> +<td><a href="#EditorButtonsWidget.show">show</a></td> +<td>Public slot to show the widget.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="EditorButtonsWidget.__init__" ID="EditorButtonsWidget.__init__"></a> +<h4>EditorButtonsWidget (Constructor)</h4> +<b>EditorButtonsWidget</b>(<i>editor, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="EditorButtonsWidget.__addButton" ID="EditorButtonsWidget.__addButton"></a> +<h4>EditorButtonsWidget.__addButton</h4> +<b>__addButton</b>(<i>format, iconName, toolTip</i>) +<p> + Private method to add a format button. +</p><dl> +<dt><i>format</i> (str)</dt> +<dd> +unique name of the format +</dd><dt><i>iconName</i> (str)</dt> +<dd> +name of the icon for the button +</dd><dt><i>toolTip</i> (str)</dt> +<dd> +text for the tool tip +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +generated button +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QToolButton +</dd> +</dl><a NAME="EditorButtonsWidget.__addSeparator" ID="EditorButtonsWidget.__addSeparator"></a> +<h4>EditorButtonsWidget.__addSeparator</h4> +<b>__addSeparator</b>(<i></i>) +<p> + Private method to add a separator line. +</p><a NAME="EditorButtonsWidget.__createButtons" ID="EditorButtonsWidget.__createButtons"></a> +<h4>EditorButtonsWidget.__createButtons</h4> +<b>__createButtons</b>(<i></i>) +<p> + Private slot to create the various tool buttons. +</p><a NAME="EditorButtonsWidget.__editorSelectionChanged" ID="EditorButtonsWidget.__editorSelectionChanged"></a> +<h4>EditorButtonsWidget.__editorSelectionChanged</h4> +<b>__editorSelectionChanged</b>(<i></i>) +<p> + Private slot to handle a change of the editor's selection. +</p><a NAME="EditorButtonsWidget.__editorSettingsRead" ID="EditorButtonsWidget.__editorSettingsRead"></a> +<h4>EditorButtonsWidget.__editorSettingsRead</h4> +<b>__editorSettingsRead</b>(<i></i>) +<p> + Private slot to handle a change of the editor related settings. +</p><a NAME="EditorButtonsWidget.__enableScrollerButtons" ID="EditorButtonsWidget.__enableScrollerButtons"></a> +<h4>EditorButtonsWidget.__enableScrollerButtons</h4> +<b>__enableScrollerButtons</b>(<i></i>) +<p> + Private method to set the enabled state of the scroll buttons. +</p><a NAME="EditorButtonsWidget.__formatClicked" ID="EditorButtonsWidget.__formatClicked"></a> +<h4>EditorButtonsWidget.__formatClicked</h4> +<b>__formatClicked</b>(<i>format</i>) +<p> + Private slot to handle a format button being clicked. +</p><dl> +<dt><i>format</i> (str)</dt> +<dd> +format type of the button +</dd> +</dl><a NAME="EditorButtonsWidget.__headerMenuTriggered" ID="EditorButtonsWidget.__headerMenuTriggered"></a> +<h4>EditorButtonsWidget.__headerMenuTriggered</h4> +<b>__headerMenuTriggered</b>(<i>act</i>) +<p> + Private method handling the selection of a header menu entry. +</p><dl> +<dt><i>act</i> (QAction)</dt> +<dd> +action of the headers menu that was triggered +</dd> +</dl><a NAME="EditorButtonsWidget.__slide" ID="EditorButtonsWidget.__slide"></a> +<h4>EditorButtonsWidget.__slide</h4> +<b>__slide</b>(<i>up</i>) +<p> + Private method to move the sliding widget. +</p><dl> +<dt><i>up</i></dt> +<dd> +flag indicating to move upwards (boolean) +</dd> +</dl><a NAME="EditorButtonsWidget.__slideDown" ID="EditorButtonsWidget.__slideDown"></a> +<h4>EditorButtonsWidget.__slideDown</h4> +<b>__slideDown</b>(<i></i>) +<p> + Private slot to move the widget downwards, i.e. show contents to + the top. +</p><a NAME="EditorButtonsWidget.__slideUp" ID="EditorButtonsWidget.__slideUp"></a> +<h4>EditorButtonsWidget.__slideUp</h4> +<b>__slideUp</b>(<i></i>) +<p> + Private slot to move the widget upwards, i.e. show contents to the + bottom. +</p><a NAME="EditorButtonsWidget.__updateButtonStates" ID="EditorButtonsWidget.__updateButtonStates"></a> +<h4>EditorButtonsWidget.__updateButtonStates</h4> +<b>__updateButtonStates</b>(<i></i>) +<p> + Private slot to change the button states. +</p><a NAME="EditorButtonsWidget.resizeEvent" ID="EditorButtonsWidget.resizeEvent"></a> +<h4>EditorButtonsWidget.resizeEvent</h4> +<b>resizeEvent</b>(<i>evt</i>) +<p> + Protected method to handle resize events. +</p><dl> +<dt><i>evt</i></dt> +<dd> +reference to the resize event (QResizeEvent) +</dd> +</dl><a NAME="EditorButtonsWidget.show" ID="EditorButtonsWidget.show"></a> +<h4>EditorButtonsWidget.show</h4> +<b>show</b>(<i></i>) +<p> + Public slot to show the widget. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerJSON.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,156 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.Lexers.LexerJSON</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.LexerJSON</h1> +<p> +Module implementing a JSON lexer with some additional methods. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#LexerJSON">LexerJSON</a></td> +<td>Subclass to implement some additional lexer dependent methods.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="LexerJSON" ID="LexerJSON"></a> +<h2>LexerJSON</h2> +<p> + Subclass to implement some additional lexer dependent methods. +</p> +<h3>Derived from</h3> +Lexer, QsciLexerJSON +<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="#LexerJSON.__init__">LexerJSON</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#LexerJSON.defaultKeywords">defaultKeywords</a></td> +<td>Public method to get the default keywords.</td> +</tr><tr> +<td><a href="#LexerJSON.initProperties">initProperties</a></td> +<td>Public slot to initialize the properties.</td> +</tr><tr> +<td><a href="#LexerJSON.isCommentStyle">isCommentStyle</a></td> +<td>Public method to check, if a style is a comment style.</td> +</tr><tr> +<td><a href="#LexerJSON.isStringStyle">isStringStyle</a></td> +<td>Public method to check, if a style is a string style.</td> +</tr><tr> +<td><a href="#LexerJSON.maximumKeywordSet">maximumKeywordSet</a></td> +<td>Public method to get the maximum keyword set.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="LexerJSON.__init__" ID="LexerJSON.__init__"></a> +<h4>LexerJSON (Constructor)</h4> +<b>LexerJSON</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of this lexer +</dd> +</dl><a NAME="LexerJSON.defaultKeywords" ID="LexerJSON.defaultKeywords"></a> +<h4>LexerJSON.defaultKeywords</h4> +<b>defaultKeywords</b>(<i>kwSet</i>) +<p> + Public method to get the default keywords. +</p><dl> +<dt><i>kwSet</i></dt> +<dd> +number of the keyword set (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +string giving the keywords (string) or None +</dd> +</dl><a NAME="LexerJSON.initProperties" ID="LexerJSON.initProperties"></a> +<h4>LexerJSON.initProperties</h4> +<b>initProperties</b>(<i></i>) +<p> + Public slot to initialize the properties. +</p><a NAME="LexerJSON.isCommentStyle" ID="LexerJSON.isCommentStyle"></a> +<h4>LexerJSON.isCommentStyle</h4> +<b>isCommentStyle</b>(<i>style</i>) +<p> + Public method to check, if a style is a comment style. +</p><dl> +<dt><i>style</i></dt> +<dd> +style to check (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a comment style (boolean) +</dd> +</dl><a NAME="LexerJSON.isStringStyle" ID="LexerJSON.isStringStyle"></a> +<h4>LexerJSON.isStringStyle</h4> +<b>isStringStyle</b>(<i>style</i>) +<p> + Public method to check, if a style is a string style. +</p><dl> +<dt><i>style</i></dt> +<dd> +style to check (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating a string style (boolean) +</dd> +</dl><a NAME="LexerJSON.maximumKeywordSet" ID="LexerJSON.maximumKeywordSet"></a> +<h4>LexerJSON.maximumKeywordSet</h4> +<b>maximumKeywordSet</b>(<i></i>) +<p> + Public method to get the maximum keyword set. +</p><dl> +<dt>Returns:</dt> +<dd> +maximum keyword set (integer) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.Lexers.LexerMarkdown.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,99 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.Lexers.LexerMarkdown</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.LexerMarkdown</h1> +<p> +Module implementing a Markdown lexer with some additional methods. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#LexerMarkdown">LexerMarkdown</a></td> +<td>Subclass to implement some additional lexer dependent methods.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="LexerMarkdown" ID="LexerMarkdown"></a> +<h2>LexerMarkdown</h2> +<p> + Subclass to implement some additional lexer dependent methods. +</p> +<h3>Derived from</h3> +Lexer, QsciLexerMarkdown +<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="#LexerMarkdown.__init__">LexerMarkdown</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#LexerMarkdown.defaultKeywords">defaultKeywords</a></td> +<td>Public method to get the default keywords.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="LexerMarkdown.__init__" ID="LexerMarkdown.__init__"></a> +<h4>LexerMarkdown (Constructor)</h4> +<b>LexerMarkdown</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i></dt> +<dd> +parent widget of this lexer +</dd> +</dl><a NAME="LexerMarkdown.defaultKeywords" ID="LexerMarkdown.defaultKeywords"></a> +<h4>LexerMarkdown.defaultKeywords</h4> +<b>defaultKeywords</b>(<i>kwSet</i>) +<p> + Public method to get the default keywords. +</p><dl> +<dt><i>kwSet</i></dt> +<dd> +number of the keyword set (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +string giving the keywords (string) or None +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.HtmlProvider.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,508 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.HtmlProvider</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.MarkupProviders.HtmlProvider</h1> +<p> +Module implementing the HTML markup provider. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HtmlProvider">HtmlProvider</a></td> +<td>Class implementing the HTML markup provider.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HtmlProvider" ID="HtmlProvider"></a> +<h2>HtmlProvider</h2> +<p> + Class implementing the HTML markup provider. +</p> +<h3>Derived from</h3> +MarkupBase +<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="#HtmlProvider.__init__">HtmlProvider</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HtmlProvider.__insertMarkup">__insertMarkup</a></td> +<td>Private method to insert the specified markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.__makeList">__makeList</a></td> +<td>Private method to generate the desired list markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.bold">bold</a></td> +<td>Public method to generate bold text.</td> +</tr><tr> +<td><a href="#HtmlProvider.bulletedList">bulletedList</a></td> +<td>Public method to generate bulleted list text.</td> +</tr><tr> +<td><a href="#HtmlProvider.code">code</a></td> +<td>Public method to generate inline code text.</td> +</tr><tr> +<td><a href="#HtmlProvider.codeBlock">codeBlock</a></td> +<td>Public method to generate code block text.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasBold">hasBold</a></td> +<td>Public method to indicate the availability of bold markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasBulletedList">hasBulletedList</a></td> +<td>Public method to indicate the availability of bulleted list markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasCode">hasCode</a></td> +<td>Public method to indicate the availability of inline code markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasCodeBlock">hasCodeBlock</a></td> +<td>Public method to indicate the availability of code block markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasHyperlink">hasHyperlink</a></td> +<td>Public method to indicate the availability of hyperlink markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasImage">hasImage</a></td> +<td>Public method to indicate the availability of image markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasItalic">hasItalic</a></td> +<td>Public method to indicate the availability of italic markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasLine">hasLine</a></td> +<td>Public method to indicate the availability of a horizontal line markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasNumberedList">hasNumberedList</a></td> +<td>Public method to indicate the availability of numbered list markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasQuote">hasQuote</a></td> +<td>Public method to indicate the availability of block quote markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.hasStrikethrough">hasStrikethrough</a></td> +<td>Public method to indicate the availability of strikethrough markup.</td> +</tr><tr> +<td><a href="#HtmlProvider.header">header</a></td> +<td>Public method to generate a header.</td> +</tr><tr> +<td><a href="#HtmlProvider.headerLevels">headerLevels</a></td> +<td>Public method to determine the available header levels.</td> +</tr><tr> +<td><a href="#HtmlProvider.hyperlink">hyperlink</a></td> +<td>Public method to generate hyperlink text.</td> +</tr><tr> +<td><a href="#HtmlProvider.image">image</a></td> +<td>Public method to generate image text.</td> +</tr><tr> +<td><a href="#HtmlProvider.italic">italic</a></td> +<td>Public method to generate italic text.</td> +</tr><tr> +<td><a href="#HtmlProvider.kind">kind</a></td> +<td>Public method to get the markup kind.</td> +</tr><tr> +<td><a href="#HtmlProvider.line">line</a></td> +<td>Public method to generate a horizontal line text.</td> +</tr><tr> +<td><a href="#HtmlProvider.numberedList">numberedList</a></td> +<td>Public method to generate numbered list text.</td> +</tr><tr> +<td><a href="#HtmlProvider.quote">quote</a></td> +<td>Public method to generate block quote text.</td> +</tr><tr> +<td><a href="#HtmlProvider.strikethrough">strikethrough</a></td> +<td>Public method to generate strikethrough text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HtmlProvider.__init__" ID="HtmlProvider.__init__"></a> +<h4>HtmlProvider (Constructor)</h4> +<b>HtmlProvider</b>(<i></i>) +<p> + Constructor +</p><a NAME="HtmlProvider.__insertMarkup" ID="HtmlProvider.__insertMarkup"></a> +<h4>HtmlProvider.__insertMarkup</h4> +<b>__insertMarkup</b>(<i>markup, editor, addEol=False</i>) +<p> + Private method to insert the specified markup. +</p><p> + If the editor has selected text, this text is enclosed by the given + markup. If no text is selected, the markup is inserted at the cursor + position and the cursor is positioned in between. +</p><dl> +<dt><i>markup</i> (str)</dt> +<dd> +markup string to be inserted +</dd><dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>addEol</i> (bool)</dt> +<dd> +flag indicating to add an eol string after the tag +</dd> +</dl><a NAME="HtmlProvider.__makeList" ID="HtmlProvider.__makeList"></a> +<h4>HtmlProvider.__makeList</h4> +<b>__makeList</b>(<i>editor, listType</i>) +<p> + Private method to generate the desired list markup. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>listType</i> (str)</dt> +<dd> +type of the desired list (should be ul or ol) +</dd> +</dl><a NAME="HtmlProvider.bold" ID="HtmlProvider.bold"></a> +<h4>HtmlProvider.bold</h4> +<b>bold</b>(<i>editor</i>) +<p> + Public method to generate bold text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.bulletedList" ID="HtmlProvider.bulletedList"></a> +<h4>HtmlProvider.bulletedList</h4> +<b>bulletedList</b>(<i>editor</i>) +<p> + Public method to generate bulleted list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.code" ID="HtmlProvider.code"></a> +<h4>HtmlProvider.code</h4> +<b>code</b>(<i>editor</i>) +<p> + Public method to generate inline code text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.codeBlock" ID="HtmlProvider.codeBlock"></a> +<h4>HtmlProvider.codeBlock</h4> +<b>codeBlock</b>(<i>editor</i>) +<p> + Public method to generate code block text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.hasBold" ID="HtmlProvider.hasBold"></a> +<h4>HtmlProvider.hasBold</h4> +<b>hasBold</b>(<i></i>) +<p> + Public method to indicate the availability of bold markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bold markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasBulletedList" ID="HtmlProvider.hasBulletedList"></a> +<h4>HtmlProvider.hasBulletedList</h4> +<b>hasBulletedList</b>(<i></i>) +<p> + Public method to indicate the availability of bulleted list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bulleted list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasCode" ID="HtmlProvider.hasCode"></a> +<h4>HtmlProvider.hasCode</h4> +<b>hasCode</b>(<i></i>) +<p> + Public method to indicate the availability of inline code markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of inline code markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasCodeBlock" ID="HtmlProvider.hasCodeBlock"></a> +<h4>HtmlProvider.hasCodeBlock</h4> +<b>hasCodeBlock</b>(<i></i>) +<p> + Public method to indicate the availability of code block markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of code block markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasHyperlink" ID="HtmlProvider.hasHyperlink"></a> +<h4>HtmlProvider.hasHyperlink</h4> +<b>hasHyperlink</b>(<i></i>) +<p> + Public method to indicate the availability of hyperlink markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of hyperlink markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasImage" ID="HtmlProvider.hasImage"></a> +<h4>HtmlProvider.hasImage</h4> +<b>hasImage</b>(<i></i>) +<p> + Public method to indicate the availability of image markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of image markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasItalic" ID="HtmlProvider.hasItalic"></a> +<h4>HtmlProvider.hasItalic</h4> +<b>hasItalic</b>(<i></i>) +<p> + Public method to indicate the availability of italic markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of italic markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasLine" ID="HtmlProvider.hasLine"></a> +<h4>HtmlProvider.hasLine</h4> +<b>hasLine</b>(<i></i>) +<p> + Public method to indicate the availability of a horizontal line markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of a horizontal line markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasNumberedList" ID="HtmlProvider.hasNumberedList"></a> +<h4>HtmlProvider.hasNumberedList</h4> +<b>hasNumberedList</b>(<i></i>) +<p> + Public method to indicate the availability of numbered list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of numbered list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasQuote" ID="HtmlProvider.hasQuote"></a> +<h4>HtmlProvider.hasQuote</h4> +<b>hasQuote</b>(<i></i>) +<p> + Public method to indicate the availability of block quote markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of block quote markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.hasStrikethrough" ID="HtmlProvider.hasStrikethrough"></a> +<h4>HtmlProvider.hasStrikethrough</h4> +<b>hasStrikethrough</b>(<i></i>) +<p> + Public method to indicate the availability of strikethrough markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of strikethrough markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="HtmlProvider.header" ID="HtmlProvider.header"></a> +<h4>HtmlProvider.header</h4> +<b>header</b>(<i>editor, level</i>) +<p> + Public method to generate a header. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>level</i> (int)</dt> +<dd> +header level +</dd> +</dl><a NAME="HtmlProvider.headerLevels" ID="HtmlProvider.headerLevels"></a> +<h4>HtmlProvider.headerLevels</h4> +<b>headerLevels</b>(<i></i>) +<p> + Public method to determine the available header levels. +</p><dl> +<dt>Returns:</dt> +<dd> +supported header levels +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="HtmlProvider.hyperlink" ID="HtmlProvider.hyperlink"></a> +<h4>HtmlProvider.hyperlink</h4> +<b>hyperlink</b>(<i>editor</i>) +<p> + Public method to generate hyperlink text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.image" ID="HtmlProvider.image"></a> +<h4>HtmlProvider.image</h4> +<b>image</b>(<i>editor</i>) +<p> + Public method to generate image text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.italic" ID="HtmlProvider.italic"></a> +<h4>HtmlProvider.italic</h4> +<b>italic</b>(<i>editor</i>) +<p> + Public method to generate italic text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.kind" ID="HtmlProvider.kind"></a> +<h4>HtmlProvider.kind</h4> +<b>kind</b>(<i></i>) +<p> + Public method to get the markup kind. +</p><dl> +<dt>Returns:</dt> +<dd> +string with markup kind +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="HtmlProvider.line" ID="HtmlProvider.line"></a> +<h4>HtmlProvider.line</h4> +<b>line</b>(<i>editor</i>) +<p> + Public method to generate a horizontal line text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.numberedList" ID="HtmlProvider.numberedList"></a> +<h4>HtmlProvider.numberedList</h4> +<b>numberedList</b>(<i>editor</i>) +<p> + Public method to generate numbered list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.quote" ID="HtmlProvider.quote"></a> +<h4>HtmlProvider.quote</h4> +<b>quote</b>(<i>editor</i>) +<p> + Public method to generate block quote text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="HtmlProvider.strikethrough" ID="HtmlProvider.strikethrough"></a> +<h4>HtmlProvider.strikethrough</h4> +<b>strikethrough</b>(<i>editor</i>) +<p> + Public method to generate strikethrough text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,145 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog</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.MarkupProviders.HyperlinkMarkupDialog</h1> +<p> +Module implementing a dialog to enter data to insert a hyperlink. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#HyperlinkMarkupDialog">HyperlinkMarkupDialog</a></td> +<td>Class implementing a dialog to enter data to insert a hyperlink.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="HyperlinkMarkupDialog" ID="HyperlinkMarkupDialog"></a> +<h2>HyperlinkMarkupDialog</h2> +<p> + Class implementing a dialog to enter data to insert a hyperlink. +</p> +<h3>Derived from</h3> +QDialog, Ui_HyperlinkMarkupDialog +<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="#HyperlinkMarkupDialog.__init__">HyperlinkMarkupDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#HyperlinkMarkupDialog.__updateOkButton">__updateOkButton</a></td> +<td>Private method to update the state of the OK button.</td> +</tr><tr> +<td><a href="#HyperlinkMarkupDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#HyperlinkMarkupDialog.on_targetEdit_textChanged">on_targetEdit_textChanged</a></td> +<td>Private slot handling a change of the link target.</td> +</tr><tr> +<td><a href="#HyperlinkMarkupDialog.on_textEdit_textChanged">on_textEdit_textChanged</a></td> +<td>Private slot handling a change of the link text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="HyperlinkMarkupDialog.__init__" ID="HyperlinkMarkupDialog.__init__"></a> +<h4>HyperlinkMarkupDialog (Constructor)</h4> +<b>HyperlinkMarkupDialog</b>(<i>textMayBeEmpty, targetMayBeEmpty, noTitle=False, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>textMayBeEmpty</i> (bool)</dt> +<dd> +flag indicating, that the link text may + be empty +</dd><dt><i>targetMayBeEmpty</i> (bool)</dt> +<dd> +flag indicating, that the link target may + be empty +</dd><dt><i>noTitle</i> (bool)</dt> +<dd> +flag indicating, that no title is supported +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="HyperlinkMarkupDialog.__updateOkButton" ID="HyperlinkMarkupDialog.__updateOkButton"></a> +<h4>HyperlinkMarkupDialog.__updateOkButton</h4> +<b>__updateOkButton</b>(<i></i>) +<p> + Private method to update the state of the OK button. +</p><a NAME="HyperlinkMarkupDialog.getData" ID="HyperlinkMarkupDialog.getData"></a> +<h4>HyperlinkMarkupDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing the link text, link target and the optional + link title +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str, str) +</dd> +</dl><a NAME="HyperlinkMarkupDialog.on_targetEdit_textChanged" ID="HyperlinkMarkupDialog.on_targetEdit_textChanged"></a> +<h4>HyperlinkMarkupDialog.on_targetEdit_textChanged</h4> +<b>on_targetEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling a change of the link target. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +link target +</dd> +</dl><a NAME="HyperlinkMarkupDialog.on_textEdit_textChanged" ID="HyperlinkMarkupDialog.on_textEdit_textChanged"></a> +<h4>HyperlinkMarkupDialog.on_textEdit_textChanged</h4> +<b>on_textEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling a change of the link text. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +link text +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,189 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.ImageMarkupDialog</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.MarkupProviders.ImageMarkupDialog</h1> +<p> +Module implementing a dialog to enter data for an image markup. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#ImageMarkupDialog">ImageMarkupDialog</a></td> +<td>Class implementing a dialog to enter data for an image markup.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="ImageMarkupDialog" ID="ImageMarkupDialog"></a> +<h2>ImageMarkupDialog</h2> +<p> + Class implementing a dialog to enter data for an image markup. +</p> +<h3>Derived from</h3> +QDialog, Ui_ImageMarkupDialog +<h3>Class Attributes</h3> +<table> +<tr><td>HtmlMode</td></tr><tr><td>MarkDownMode</td></tr><tr><td>RestMode</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#ImageMarkupDialog.__init__">ImageMarkupDialog</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.__updateOkButton">__updateOkButton</a></td> +<td>Private slot to set the state of the OK button.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.getData">getData</a></td> +<td>Public method to get the entered data.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_altTextEdit_textChanged">on_altTextEdit_textChanged</a></td> +<td>Private slot handling changes of the alternative text.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_aspectRatioCheckBox_toggled">on_aspectRatioCheckBox_toggled</a></td> +<td>Private slot to adjust the height to match the original aspect ratio.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_heightSpinBox_valueChanged">on_heightSpinBox_valueChanged</a></td> +<td>Private slot to adjust the width spin box.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_imagePicker_textChanged">on_imagePicker_textChanged</a></td> +<td>Private slot handling changes of the image path.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_sizeCheckBox_toggled">on_sizeCheckBox_toggled</a></td> +<td>Private slot to reset the width and height spin boxes.</td> +</tr><tr> +<td><a href="#ImageMarkupDialog.on_widthSpinBox_valueChanged">on_widthSpinBox_valueChanged</a></td> +<td>Private slot to adjust the height spin box.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="ImageMarkupDialog.__init__" ID="ImageMarkupDialog.__init__"></a> +<h4>ImageMarkupDialog (Constructor)</h4> +<b>ImageMarkupDialog</b>(<i>mode, parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>mode</i> (int)</dt> +<dd> +mode of the dialog +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget +</dd> +</dl><a NAME="ImageMarkupDialog.__updateOkButton" ID="ImageMarkupDialog.__updateOkButton"></a> +<h4>ImageMarkupDialog.__updateOkButton</h4> +<b>__updateOkButton</b>(<i></i>) +<p> + Private slot to set the state of the OK button. +</p><a NAME="ImageMarkupDialog.getData" ID="ImageMarkupDialog.getData"></a> +<h4>ImageMarkupDialog.getData</h4> +<b>getData</b>(<i></i>) +<p> + Public method to get the entered data. +</p><dl> +<dt>Returns:</dt> +<dd> +tuple containing the image address, alternative text, + title text, flag to keep the original size, width and height +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of (str, str, str, bool, int, int) +</dd> +</dl><a NAME="ImageMarkupDialog.on_altTextEdit_textChanged" ID="ImageMarkupDialog.on_altTextEdit_textChanged"></a> +<h4>ImageMarkupDialog.on_altTextEdit_textChanged</h4> +<b>on_altTextEdit_textChanged</b>(<i>txt</i>) +<p> + Private slot handling changes of the alternative text. +</p><dl> +<dt><i>txt</i> (str)</dt> +<dd> +alternative text +</dd> +</dl><a NAME="ImageMarkupDialog.on_aspectRatioCheckBox_toggled" ID="ImageMarkupDialog.on_aspectRatioCheckBox_toggled"></a> +<h4>ImageMarkupDialog.on_aspectRatioCheckBox_toggled</h4> +<b>on_aspectRatioCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot to adjust the height to match the original aspect ratio. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +flag indicating the state of the check box +</dd> +</dl><a NAME="ImageMarkupDialog.on_heightSpinBox_valueChanged" ID="ImageMarkupDialog.on_heightSpinBox_valueChanged"></a> +<h4>ImageMarkupDialog.on_heightSpinBox_valueChanged</h4> +<b>on_heightSpinBox_valueChanged</b>(<i>height</i>) +<p> + Private slot to adjust the width spin box. +</p><dl> +<dt><i>height</i> (int)</dt> +<dd> +height for the image +</dd> +</dl><a NAME="ImageMarkupDialog.on_imagePicker_textChanged" ID="ImageMarkupDialog.on_imagePicker_textChanged"></a> +<h4>ImageMarkupDialog.on_imagePicker_textChanged</h4> +<b>on_imagePicker_textChanged</b>(<i>address</i>) +<p> + Private slot handling changes of the image path. +</p><dl> +<dt><i>address</i> (str)</dt> +<dd> +image address (URL or local path) +</dd> +</dl><a NAME="ImageMarkupDialog.on_sizeCheckBox_toggled" ID="ImageMarkupDialog.on_sizeCheckBox_toggled"></a> +<h4>ImageMarkupDialog.on_sizeCheckBox_toggled</h4> +<b>on_sizeCheckBox_toggled</b>(<i>checked</i>) +<p> + Private slot to reset the width and height spin boxes. +</p><dl> +<dt><i>checked</i> (bool)</dt> +<dd> +flag indicating the state of the check box +</dd> +</dl><a NAME="ImageMarkupDialog.on_widthSpinBox_valueChanged" ID="ImageMarkupDialog.on_widthSpinBox_valueChanged"></a> +<h4>ImageMarkupDialog.on_widthSpinBox_valueChanged</h4> +<b>on_widthSpinBox_valueChanged</b>(<i>width</i>) +<p> + Private slot to adjust the height spin box. +</p><dl> +<dt><i>width</i> (int)</dt> +<dd> +width for the image +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.MarkdownProvider.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,505 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.MarkdownProvider</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.MarkupProviders.MarkdownProvider</h1> +<p> +Module implementing the Markdown markup provider. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#MarkdownProvider">MarkdownProvider</a></td> +<td>Class implementing the Markdown markup provider.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="MarkdownProvider" ID="MarkdownProvider"></a> +<h2>MarkdownProvider</h2> +<p> + Class implementing the Markdown markup provider. +</p> +<h3>Derived from</h3> +MarkupBase +<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="#MarkdownProvider.__init__">MarkdownProvider</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#MarkdownProvider.__insertMarkup">__insertMarkup</a></td> +<td>Private method to insert the specified markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.__makeList">__makeList</a></td> +<td>Private method to generate the desired list markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.bold">bold</a></td> +<td>Public method to generate bold text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.bulletedList">bulletedList</a></td> +<td>Public method to generate bulleted list text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.code">code</a></td> +<td>Public method to generate inline code text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.codeBlock">codeBlock</a></td> +<td>Public method to generate code block text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasBold">hasBold</a></td> +<td>Public method to indicate the availability of bold markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasBulletedList">hasBulletedList</a></td> +<td>Public method to indicate the availability of bulleted list markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasCode">hasCode</a></td> +<td>Public method to indicate the availability of inline code markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasCodeBlock">hasCodeBlock</a></td> +<td>Public method to indicate the availability of code block markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasHyperlink">hasHyperlink</a></td> +<td>Public method to indicate the availability of hyperlink markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasImage">hasImage</a></td> +<td>Public method to indicate the availability of image markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasItalic">hasItalic</a></td> +<td>Public method to indicate the availability of italic markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasLine">hasLine</a></td> +<td>Public method to indicate the availability of a horizontal line markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasNumberedList">hasNumberedList</a></td> +<td>Public method to indicate the availability of numbered list markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasQuote">hasQuote</a></td> +<td>Public method to indicate the availability of block quote markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hasStrikethrough">hasStrikethrough</a></td> +<td>Public method to indicate the availability of strikethrough markup.</td> +</tr><tr> +<td><a href="#MarkdownProvider.header">header</a></td> +<td>Public method to generate a header.</td> +</tr><tr> +<td><a href="#MarkdownProvider.headerLevels">headerLevels</a></td> +<td>Public method to determine the available header levels.</td> +</tr><tr> +<td><a href="#MarkdownProvider.hyperlink">hyperlink</a></td> +<td>Public method to generate hyperlink text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.image">image</a></td> +<td>Public method to generate image text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.italic">italic</a></td> +<td>Public method to generate italic text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.kind">kind</a></td> +<td>Public method to get the markup kind.</td> +</tr><tr> +<td><a href="#MarkdownProvider.line">line</a></td> +<td>Public method to generate a horizontal line text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.numberedList">numberedList</a></td> +<td>Public method to generate numbered list text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.quote">quote</a></td> +<td>Public method to generate block quote text.</td> +</tr><tr> +<td><a href="#MarkdownProvider.strikethrough">strikethrough</a></td> +<td>Public method to generate strikethrough text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="MarkdownProvider.__init__" ID="MarkdownProvider.__init__"></a> +<h4>MarkdownProvider (Constructor)</h4> +<b>MarkdownProvider</b>(<i></i>) +<p> + Constructor +</p><a NAME="MarkdownProvider.__insertMarkup" ID="MarkdownProvider.__insertMarkup"></a> +<h4>MarkdownProvider.__insertMarkup</h4> +<b>__insertMarkup</b>(<i>markup, editor</i>) +<p> + Private method to insert the specified markup. +</p><p> + If the editor has selected text, this text is enclosed by the given + markup. If no text is selected, the markup is inserted at the cursor + position and the cursor is positioned in between. +</p><dl> +<dt><i>markup</i> (str)</dt> +<dd> +markup string to be inserted +</dd><dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.__makeList" ID="MarkdownProvider.__makeList"></a> +<h4>MarkdownProvider.__makeList</h4> +<b>__makeList</b>(<i>editor, numberedList</i>) +<p> + Private method to generate the desired list markup. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>numberedList</i> (bool)</dt> +<dd> +flag indicating the generation of a numbered list +</dd> +</dl><a NAME="MarkdownProvider.bold" ID="MarkdownProvider.bold"></a> +<h4>MarkdownProvider.bold</h4> +<b>bold</b>(<i>editor</i>) +<p> + Public method to generate bold text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.bulletedList" ID="MarkdownProvider.bulletedList"></a> +<h4>MarkdownProvider.bulletedList</h4> +<b>bulletedList</b>(<i>editor</i>) +<p> + Public method to generate bulleted list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.code" ID="MarkdownProvider.code"></a> +<h4>MarkdownProvider.code</h4> +<b>code</b>(<i>editor</i>) +<p> + Public method to generate inline code text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.codeBlock" ID="MarkdownProvider.codeBlock"></a> +<h4>MarkdownProvider.codeBlock</h4> +<b>codeBlock</b>(<i>editor</i>) +<p> + Public method to generate code block text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.hasBold" ID="MarkdownProvider.hasBold"></a> +<h4>MarkdownProvider.hasBold</h4> +<b>hasBold</b>(<i></i>) +<p> + Public method to indicate the availability of bold markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bold markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasBulletedList" ID="MarkdownProvider.hasBulletedList"></a> +<h4>MarkdownProvider.hasBulletedList</h4> +<b>hasBulletedList</b>(<i></i>) +<p> + Public method to indicate the availability of bulleted list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bulleted list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasCode" ID="MarkdownProvider.hasCode"></a> +<h4>MarkdownProvider.hasCode</h4> +<b>hasCode</b>(<i></i>) +<p> + Public method to indicate the availability of inline code markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of inline code markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasCodeBlock" ID="MarkdownProvider.hasCodeBlock"></a> +<h4>MarkdownProvider.hasCodeBlock</h4> +<b>hasCodeBlock</b>(<i></i>) +<p> + Public method to indicate the availability of code block markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of code block markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasHyperlink" ID="MarkdownProvider.hasHyperlink"></a> +<h4>MarkdownProvider.hasHyperlink</h4> +<b>hasHyperlink</b>(<i></i>) +<p> + Public method to indicate the availability of hyperlink markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of hyperlink markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasImage" ID="MarkdownProvider.hasImage"></a> +<h4>MarkdownProvider.hasImage</h4> +<b>hasImage</b>(<i></i>) +<p> + Public method to indicate the availability of image markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of image markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasItalic" ID="MarkdownProvider.hasItalic"></a> +<h4>MarkdownProvider.hasItalic</h4> +<b>hasItalic</b>(<i></i>) +<p> + Public method to indicate the availability of italic markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of italic markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasLine" ID="MarkdownProvider.hasLine"></a> +<h4>MarkdownProvider.hasLine</h4> +<b>hasLine</b>(<i></i>) +<p> + Public method to indicate the availability of a horizontal line markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of a horizontal line markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasNumberedList" ID="MarkdownProvider.hasNumberedList"></a> +<h4>MarkdownProvider.hasNumberedList</h4> +<b>hasNumberedList</b>(<i></i>) +<p> + Public method to indicate the availability of numbered list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of numbered list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasQuote" ID="MarkdownProvider.hasQuote"></a> +<h4>MarkdownProvider.hasQuote</h4> +<b>hasQuote</b>(<i></i>) +<p> + Public method to indicate the availability of block quote markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of block quote markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.hasStrikethrough" ID="MarkdownProvider.hasStrikethrough"></a> +<h4>MarkdownProvider.hasStrikethrough</h4> +<b>hasStrikethrough</b>(<i></i>) +<p> + Public method to indicate the availability of strikethrough markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of strikethrough markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkdownProvider.header" ID="MarkdownProvider.header"></a> +<h4>MarkdownProvider.header</h4> +<b>header</b>(<i>editor, level</i>) +<p> + Public method to generate a header. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>level</i> (int)</dt> +<dd> +header level +</dd> +</dl><a NAME="MarkdownProvider.headerLevels" ID="MarkdownProvider.headerLevels"></a> +<h4>MarkdownProvider.headerLevels</h4> +<b>headerLevels</b>(<i></i>) +<p> + Public method to determine the available header levels. +</p><dl> +<dt>Returns:</dt> +<dd> +supported header levels +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="MarkdownProvider.hyperlink" ID="MarkdownProvider.hyperlink"></a> +<h4>MarkdownProvider.hyperlink</h4> +<b>hyperlink</b>(<i>editor</i>) +<p> + Public method to generate hyperlink text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.image" ID="MarkdownProvider.image"></a> +<h4>MarkdownProvider.image</h4> +<b>image</b>(<i>editor</i>) +<p> + Public method to generate image text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.italic" ID="MarkdownProvider.italic"></a> +<h4>MarkdownProvider.italic</h4> +<b>italic</b>(<i>editor</i>) +<p> + Public method to generate italic text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.kind" ID="MarkdownProvider.kind"></a> +<h4>MarkdownProvider.kind</h4> +<b>kind</b>(<i></i>) +<p> + Public method to get the markup kind. +</p><dl> +<dt>Returns:</dt> +<dd> +string with markup kind +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="MarkdownProvider.line" ID="MarkdownProvider.line"></a> +<h4>MarkdownProvider.line</h4> +<b>line</b>(<i>editor</i>) +<p> + Public method to generate a horizontal line text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.numberedList" ID="MarkdownProvider.numberedList"></a> +<h4>MarkdownProvider.numberedList</h4> +<b>numberedList</b>(<i>editor</i>) +<p> + Public method to generate numbered list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.quote" ID="MarkdownProvider.quote"></a> +<h4>MarkdownProvider.quote</h4> +<b>quote</b>(<i>editor</i>) +<p> + Public method to generate block quote text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkdownProvider.strikethrough" ID="MarkdownProvider.strikethrough"></a> +<h4>MarkdownProvider.strikethrough</h4> +<b>strikethrough</b>(<i>editor</i>) +<p> + Public method to generate strikethrough text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.MarkupBase.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,473 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.MarkupBase</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.MarkupProviders.MarkupBase</h1> +<p> +Module implementing the base class for the markup providers. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#MarkupBase">MarkupBase</a></td> +<td>Class implementing the base class for the markup providers.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="MarkupBase" ID="MarkupBase"></a> +<h2>MarkupBase</h2> +<p> + Class implementing the base class for the markup providers. +</p><p> + Note: Derived classes need only implement those method they provide + functionality for. This base class implements do nothing variants for + all methods. +</p> +<h3>Derived from</h3> +object +<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="#MarkupBase.__init__">MarkupBase</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#MarkupBase.bold">bold</a></td> +<td>Public method to generate bold text.</td> +</tr><tr> +<td><a href="#MarkupBase.bulletedList">bulletedList</a></td> +<td>Public method to generate bulleted list text.</td> +</tr><tr> +<td><a href="#MarkupBase.code">code</a></td> +<td>Public method to generate inline code text.</td> +</tr><tr> +<td><a href="#MarkupBase.codeBlock">codeBlock</a></td> +<td>Public method to generate code block text.</td> +</tr><tr> +<td><a href="#MarkupBase.hasBold">hasBold</a></td> +<td>Public method to indicate the availability of bold markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasBulletedList">hasBulletedList</a></td> +<td>Public method to indicate the availability of bulleted list markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasCode">hasCode</a></td> +<td>Public method to indicate the availability of inline code markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasCodeBlock">hasCodeBlock</a></td> +<td>Public method to indicate the availability of code block markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasHyperlink">hasHyperlink</a></td> +<td>Public method to indicate the availability of hyperlink markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasImage">hasImage</a></td> +<td>Public method to indicate the availability of image markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasItalic">hasItalic</a></td> +<td>Public method to indicate the availability of italic markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasLine">hasLine</a></td> +<td>Public method to indicate the availability of a horizontal line markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasNumberedList">hasNumberedList</a></td> +<td>Public method to indicate the availability of numbered list markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasQuote">hasQuote</a></td> +<td>Public method to indicate the availability of block quote markup.</td> +</tr><tr> +<td><a href="#MarkupBase.hasStrikethrough">hasStrikethrough</a></td> +<td>Public method to indicate the availability of strikethrough markup.</td> +</tr><tr> +<td><a href="#MarkupBase.header">header</a></td> +<td>Public method to generate a header.</td> +</tr><tr> +<td><a href="#MarkupBase.headerLevels">headerLevels</a></td> +<td>Public method to determine the available header levels.</td> +</tr><tr> +<td><a href="#MarkupBase.hyperlink">hyperlink</a></td> +<td>Public method to generate hyperlink text.</td> +</tr><tr> +<td><a href="#MarkupBase.image">image</a></td> +<td>Public method to generate image text.</td> +</tr><tr> +<td><a href="#MarkupBase.italic">italic</a></td> +<td>Public method to generate italic text.</td> +</tr><tr> +<td><a href="#MarkupBase.kind">kind</a></td> +<td>Public method to get the markup kind.</td> +</tr><tr> +<td><a href="#MarkupBase.line">line</a></td> +<td>Public method to generate a horizontal line text.</td> +</tr><tr> +<td><a href="#MarkupBase.numberedList">numberedList</a></td> +<td>Public method to generate numbered list text.</td> +</tr><tr> +<td><a href="#MarkupBase.quote">quote</a></td> +<td>Public method to generate block quote text.</td> +</tr><tr> +<td><a href="#MarkupBase.strikethrough">strikethrough</a></td> +<td>Public method to generate strikethrough text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="MarkupBase.__init__" ID="MarkupBase.__init__"></a> +<h4>MarkupBase (Constructor)</h4> +<b>MarkupBase</b>(<i></i>) +<p> + Constructor +</p><a NAME="MarkupBase.bold" ID="MarkupBase.bold"></a> +<h4>MarkupBase.bold</h4> +<b>bold</b>(<i>editor</i>) +<p> + Public method to generate bold text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.bulletedList" ID="MarkupBase.bulletedList"></a> +<h4>MarkupBase.bulletedList</h4> +<b>bulletedList</b>(<i>editor</i>) +<p> + Public method to generate bulleted list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.code" ID="MarkupBase.code"></a> +<h4>MarkupBase.code</h4> +<b>code</b>(<i>editor</i>) +<p> + Public method to generate inline code text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.codeBlock" ID="MarkupBase.codeBlock"></a> +<h4>MarkupBase.codeBlock</h4> +<b>codeBlock</b>(<i>editor</i>) +<p> + Public method to generate code block text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.hasBold" ID="MarkupBase.hasBold"></a> +<h4>MarkupBase.hasBold</h4> +<b>hasBold</b>(<i></i>) +<p> + Public method to indicate the availability of bold markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bold markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasBulletedList" ID="MarkupBase.hasBulletedList"></a> +<h4>MarkupBase.hasBulletedList</h4> +<b>hasBulletedList</b>(<i></i>) +<p> + Public method to indicate the availability of bulleted list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bulleted list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasCode" ID="MarkupBase.hasCode"></a> +<h4>MarkupBase.hasCode</h4> +<b>hasCode</b>(<i></i>) +<p> + Public method to indicate the availability of inline code markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of inline code markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasCodeBlock" ID="MarkupBase.hasCodeBlock"></a> +<h4>MarkupBase.hasCodeBlock</h4> +<b>hasCodeBlock</b>(<i></i>) +<p> + Public method to indicate the availability of code block markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of code block markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasHyperlink" ID="MarkupBase.hasHyperlink"></a> +<h4>MarkupBase.hasHyperlink</h4> +<b>hasHyperlink</b>(<i></i>) +<p> + Public method to indicate the availability of hyperlink markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of hyperlink markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasImage" ID="MarkupBase.hasImage"></a> +<h4>MarkupBase.hasImage</h4> +<b>hasImage</b>(<i></i>) +<p> + Public method to indicate the availability of image markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of image markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasItalic" ID="MarkupBase.hasItalic"></a> +<h4>MarkupBase.hasItalic</h4> +<b>hasItalic</b>(<i></i>) +<p> + Public method to indicate the availability of italic markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of italic markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasLine" ID="MarkupBase.hasLine"></a> +<h4>MarkupBase.hasLine</h4> +<b>hasLine</b>(<i></i>) +<p> + Public method to indicate the availability of a horizontal line markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of a horizontal line markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasNumberedList" ID="MarkupBase.hasNumberedList"></a> +<h4>MarkupBase.hasNumberedList</h4> +<b>hasNumberedList</b>(<i></i>) +<p> + Public method to indicate the availability of numbered list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of numbered list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasQuote" ID="MarkupBase.hasQuote"></a> +<h4>MarkupBase.hasQuote</h4> +<b>hasQuote</b>(<i></i>) +<p> + Public method to indicate the availability of block quote markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of block quote markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.hasStrikethrough" ID="MarkupBase.hasStrikethrough"></a> +<h4>MarkupBase.hasStrikethrough</h4> +<b>hasStrikethrough</b>(<i></i>) +<p> + Public method to indicate the availability of strikethrough markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of strikethrough markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="MarkupBase.header" ID="MarkupBase.header"></a> +<h4>MarkupBase.header</h4> +<b>header</b>(<i>editor, level</i>) +<p> + Public method to generate a header. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>level</i> (int)</dt> +<dd> +header level +</dd> +</dl><a NAME="MarkupBase.headerLevels" ID="MarkupBase.headerLevels"></a> +<h4>MarkupBase.headerLevels</h4> +<b>headerLevels</b>(<i></i>) +<p> + Public method to determine the available header levels. +</p><dl> +<dt>Returns:</dt> +<dd> +supported header levels +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="MarkupBase.hyperlink" ID="MarkupBase.hyperlink"></a> +<h4>MarkupBase.hyperlink</h4> +<b>hyperlink</b>(<i>editor</i>) +<p> + Public method to generate hyperlink text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.image" ID="MarkupBase.image"></a> +<h4>MarkupBase.image</h4> +<b>image</b>(<i>editor</i>) +<p> + Public method to generate image text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.italic" ID="MarkupBase.italic"></a> +<h4>MarkupBase.italic</h4> +<b>italic</b>(<i>editor</i>) +<p> + Public method to generate italic text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.kind" ID="MarkupBase.kind"></a> +<h4>MarkupBase.kind</h4> +<b>kind</b>(<i></i>) +<p> + Public method to get the markup kind. +</p><dl> +<dt>Returns:</dt> +<dd> +markup kind all lowercased +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="MarkupBase.line" ID="MarkupBase.line"></a> +<h4>MarkupBase.line</h4> +<b>line</b>(<i>editor</i>) +<p> + Public method to generate a horizontal line text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.numberedList" ID="MarkupBase.numberedList"></a> +<h4>MarkupBase.numberedList</h4> +<b>numberedList</b>(<i>editor</i>) +<p> + Public method to generate numbered list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.quote" ID="MarkupBase.quote"></a> +<h4>MarkupBase.quote</h4> +<b>quote</b>(<i>editor</i>) +<p> + Public method to generate block quote text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="MarkupBase.strikethrough" ID="MarkupBase.strikethrough"></a> +<h4>MarkupBase.strikethrough</h4> +<b>strikethrough</b>(<i>editor</i>) +<p> + Public method to generate strikethrough text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,474 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.RestructuredTextProvider</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.MarkupProviders.RestructuredTextProvider</h1> +<p> +Module implementing the reStructured Text markup provider. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#RestructuredTextProvider">RestructuredTextProvider</a></td> +<td>Class implementing the reStructured Text markup provider.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="RestructuredTextProvider" ID="RestructuredTextProvider"></a> +<h2>RestructuredTextProvider</h2> +<p> + Class implementing the reStructured Text markup provider. +</p> +<h3>Derived from</h3> +MarkupBase +<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="#RestructuredTextProvider.__init__">RestructuredTextProvider</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.__insertMarkup">__insertMarkup</a></td> +<td>Private method to insert the specified markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.__makeList">__makeList</a></td> +<td>Private method to generate the desired list markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.bold">bold</a></td> +<td>Public method to generate bold text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.bulletedList">bulletedList</a></td> +<td>Public method to generate bulleted list text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.code">code</a></td> +<td>Public method to generate inline code text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.codeBlock">codeBlock</a></td> +<td>Public method to generate code block text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasBold">hasBold</a></td> +<td>Public method to indicate the availability of bold markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasBulletedList">hasBulletedList</a></td> +<td>Public method to indicate the availability of bulleted list markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasCode">hasCode</a></td> +<td>Public method to indicate the availability of inline code markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasCodeBlock">hasCodeBlock</a></td> +<td>Public method to indicate the availability of code block markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasHyperlink">hasHyperlink</a></td> +<td>Public method to indicate the availability of hyperlink markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasImage">hasImage</a></td> +<td>Public method to indicate the availability of image markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasItalic">hasItalic</a></td> +<td>Public method to indicate the availability of italic markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasLine">hasLine</a></td> +<td>Public method to indicate the availability of a horizontal line markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasNumberedList">hasNumberedList</a></td> +<td>Public method to indicate the availability of numbered list markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hasQuote">hasQuote</a></td> +<td>Public method to indicate the availability of block quote markup.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.header">header</a></td> +<td>Public method to generate a header.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.headerLevels">headerLevels</a></td> +<td>Public method to determine the available header levels.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.hyperlink">hyperlink</a></td> +<td>Public method to generate hyperlink text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.image">image</a></td> +<td>Public method to generate image text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.italic">italic</a></td> +<td>Public method to generate italic text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.kind">kind</a></td> +<td>Public method to get the markup kind.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.line">line</a></td> +<td>Public method to generate a horizontal line text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.numberedList">numberedList</a></td> +<td>Public method to generate numbered list text.</td> +</tr><tr> +<td><a href="#RestructuredTextProvider.quote">quote</a></td> +<td>Public method to generate block quote text.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="RestructuredTextProvider.__init__" ID="RestructuredTextProvider.__init__"></a> +<h4>RestructuredTextProvider (Constructor)</h4> +<b>RestructuredTextProvider</b>(<i></i>) +<p> + Constructor +</p><a NAME="RestructuredTextProvider.__insertMarkup" ID="RestructuredTextProvider.__insertMarkup"></a> +<h4>RestructuredTextProvider.__insertMarkup</h4> +<b>__insertMarkup</b>(<i>markup, editor</i>) +<p> + Private method to insert the specified markup. +</p><p> + If the editor has selected text, this text is enclosed by the given + markup. If no text is selected, the markup is inserted at the cursor + position and the cursor is positioned in between. +</p><dl> +<dt><i>markup</i> (str)</dt> +<dd> +markup string to be inserted +</dd><dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.__makeList" ID="RestructuredTextProvider.__makeList"></a> +<h4>RestructuredTextProvider.__makeList</h4> +<b>__makeList</b>(<i>editor, numberedList</i>) +<p> + Private method to generate the desired list markup. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>numberedList</i> (bool)</dt> +<dd> +flag indicating the generation of a numbered list +</dd> +</dl><a NAME="RestructuredTextProvider.bold" ID="RestructuredTextProvider.bold"></a> +<h4>RestructuredTextProvider.bold</h4> +<b>bold</b>(<i>editor</i>) +<p> + Public method to generate bold text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.bulletedList" ID="RestructuredTextProvider.bulletedList"></a> +<h4>RestructuredTextProvider.bulletedList</h4> +<b>bulletedList</b>(<i>editor</i>) +<p> + Public method to generate bulleted list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.code" ID="RestructuredTextProvider.code"></a> +<h4>RestructuredTextProvider.code</h4> +<b>code</b>(<i>editor</i>) +<p> + Public method to generate inline code text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.codeBlock" ID="RestructuredTextProvider.codeBlock"></a> +<h4>RestructuredTextProvider.codeBlock</h4> +<b>codeBlock</b>(<i>editor</i>) +<p> + Public method to generate code block text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.hasBold" ID="RestructuredTextProvider.hasBold"></a> +<h4>RestructuredTextProvider.hasBold</h4> +<b>hasBold</b>(<i></i>) +<p> + Public method to indicate the availability of bold markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bold markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasBulletedList" ID="RestructuredTextProvider.hasBulletedList"></a> +<h4>RestructuredTextProvider.hasBulletedList</h4> +<b>hasBulletedList</b>(<i></i>) +<p> + Public method to indicate the availability of bulleted list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of bulleted list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasCode" ID="RestructuredTextProvider.hasCode"></a> +<h4>RestructuredTextProvider.hasCode</h4> +<b>hasCode</b>(<i></i>) +<p> + Public method to indicate the availability of inline code markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of inline code markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasCodeBlock" ID="RestructuredTextProvider.hasCodeBlock"></a> +<h4>RestructuredTextProvider.hasCodeBlock</h4> +<b>hasCodeBlock</b>(<i></i>) +<p> + Public method to indicate the availability of code block markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of code block markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasHyperlink" ID="RestructuredTextProvider.hasHyperlink"></a> +<h4>RestructuredTextProvider.hasHyperlink</h4> +<b>hasHyperlink</b>(<i></i>) +<p> + Public method to indicate the availability of hyperlink markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of hyperlink markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasImage" ID="RestructuredTextProvider.hasImage"></a> +<h4>RestructuredTextProvider.hasImage</h4> +<b>hasImage</b>(<i></i>) +<p> + Public method to indicate the availability of image markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of image markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasItalic" ID="RestructuredTextProvider.hasItalic"></a> +<h4>RestructuredTextProvider.hasItalic</h4> +<b>hasItalic</b>(<i></i>) +<p> + Public method to indicate the availability of italic markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of italic markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasLine" ID="RestructuredTextProvider.hasLine"></a> +<h4>RestructuredTextProvider.hasLine</h4> +<b>hasLine</b>(<i></i>) +<p> + Public method to indicate the availability of a horizontal line markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of a horizontal line markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasNumberedList" ID="RestructuredTextProvider.hasNumberedList"></a> +<h4>RestructuredTextProvider.hasNumberedList</h4> +<b>hasNumberedList</b>(<i></i>) +<p> + Public method to indicate the availability of numbered list markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of numbered list markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.hasQuote" ID="RestructuredTextProvider.hasQuote"></a> +<h4>RestructuredTextProvider.hasQuote</h4> +<b>hasQuote</b>(<i></i>) +<p> + Public method to indicate the availability of block quote markup. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the availability of block quote markup +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="RestructuredTextProvider.header" ID="RestructuredTextProvider.header"></a> +<h4>RestructuredTextProvider.header</h4> +<b>header</b>(<i>editor, level</i>) +<p> + Public method to generate a header. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd><dt><i>level</i> (int)</dt> +<dd> +header level +</dd> +</dl><a NAME="RestructuredTextProvider.headerLevels" ID="RestructuredTextProvider.headerLevels"></a> +<h4>RestructuredTextProvider.headerLevels</h4> +<b>headerLevels</b>(<i></i>) +<p> + Public method to determine the available header levels. +</p><dl> +<dt>Returns:</dt> +<dd> +supported header levels +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="RestructuredTextProvider.hyperlink" ID="RestructuredTextProvider.hyperlink"></a> +<h4>RestructuredTextProvider.hyperlink</h4> +<b>hyperlink</b>(<i>editor</i>) +<p> + Public method to generate hyperlink text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.image" ID="RestructuredTextProvider.image"></a> +<h4>RestructuredTextProvider.image</h4> +<b>image</b>(<i>editor</i>) +<p> + Public method to generate image text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.italic" ID="RestructuredTextProvider.italic"></a> +<h4>RestructuredTextProvider.italic</h4> +<b>italic</b>(<i>editor</i>) +<p> + Public method to generate italic text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.kind" ID="RestructuredTextProvider.kind"></a> +<h4>RestructuredTextProvider.kind</h4> +<b>kind</b>(<i></i>) +<p> + Public method to get the markup kind. +</p><dl> +<dt>Returns:</dt> +<dd> +string with markup kind +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="RestructuredTextProvider.line" ID="RestructuredTextProvider.line"></a> +<h4>RestructuredTextProvider.line</h4> +<b>line</b>(<i>editor</i>) +<p> + Public method to generate a horizontal line text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.numberedList" ID="RestructuredTextProvider.numberedList"></a> +<h4>RestructuredTextProvider.numberedList</h4> +<b>numberedList</b>(<i>editor</i>) +<p> + Public method to generate numbered list text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl><a NAME="RestructuredTextProvider.quote" ID="RestructuredTextProvider.quote"></a> +<h4>RestructuredTextProvider.quote</h4> +<b>quote</b>(<i>editor</i>) +<p> + Public method to generate block quote text. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to work on +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.QScintilla.MarkupProviders.__init__.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,65 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders.__init__</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.MarkupProviders.__init__</h1> +<p> +Package providing various markup providers. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Functions</h3> +<table> +<tr> +<td><a href="#getMarkupProvider">getMarkupProvider</a></td> +<td>Public method to get a markup provider for the given editor.</td> +</tr> +</table> +<hr /><hr /> +<a NAME="getMarkupProvider" ID="getMarkupProvider"></a> +<h2>getMarkupProvider</h2> +<b>getMarkupProvider</b>(<i>editor</i>) +<p> + Public method to get a markup provider for the given editor. +</p><dl> +<dt><i>editor</i> (Editor)</dt> +<dd> +reference to the editor to get the markup provider for +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +markup provider +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +MarkupBase +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html Fri Feb 03 19:20:59 2017 +0100 @@ -62,7 +62,7 @@ QThread <h3>Class Attributes</h3> <table> -<tr><td>DefaultStaticPath</td></tr><tr><td>StaticRegexp</td></tr> +<tr><td>None</td></tr> </table> <h3>Class Methods</h3> <table> @@ -95,9 +95,6 @@ <td><a href="#PreviewProcessingThread.process">process</a></td> <td>Public method to convert the given text to HTML.</td> </tr><tr> -<td><a href="#PreviewProcessingThread.replace">replace</a></td> -<td></td> -</tr><tr> <td><a href="#PreviewProcessingThread.run">run</a></td> <td>Public thread method to convert the stored data.</td> </tr> @@ -264,10 +261,7 @@ flag indicating to use Sphinx to generate the ReST preview (boolean) </dd> -</dl><a NAME="PreviewProcessingThread.replace" ID="PreviewProcessingThread.replace"></a> -<h4>PreviewProcessingThread.replace</h4> -<b>replace</b>(<i></i>) -<a NAME="PreviewProcessingThread.run" ID="PreviewProcessingThread.run"></a> +</dl><a NAME="PreviewProcessingThread.run" ID="PreviewProcessingThread.run"></a> <h4>PreviewProcessingThread.run</h4> <b>run</b>(<i></i>) <p>
--- a/Documentation/Source/eric6.VCS.VersionControl.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.VCS.VersionControl.html Fri Feb 03 19:20:59 2017 +0100 @@ -184,9 +184,6 @@ <td><a href="#VersionControl.vcsInitConfig">vcsInitConfig</a></td> <td>Public method to initialize the VCS configuration.</td> </tr><tr> -<td><a href="#VersionControl.vcsLog">vcsLog</a></td> -<td>Public method used to view the log of a file/directory in the vcs.</td> -</tr><tr> <td><a href="#VersionControl.vcsLogBrowser">vcsLogBrowser</a></td> <td>Public method used to view the log of a file/directory in the vcs with a log browser dialog.</td> </tr><tr> @@ -853,22 +850,6 @@ <dd> reference to the project (Project) </dd> -</dl><a NAME="VersionControl.vcsLog" ID="VersionControl.vcsLog"></a> -<h4>VersionControl.vcsLog</h4> -<b>vcsLog</b>(<i>name</i>) -<p> - Public method used to view the log of a file/directory in the vcs. -</p><dl> -<dt><i>name</i></dt> -<dd> -file/directory name to show the log for (string) -</dd> -</dl><dl> -<dt>Raises <b>RuntimeError</b>:</dt> -<dd> -to indicate that this method must be - implemented by a subclass -</dd> </dl><a NAME="VersionControl.vcsLogBrowser" ID="VersionControl.vcsLogBrowser"></a> <h4>VersionControl.vcsLogBrowser</h4> <b>vcsLogBrowser</b>(<i>name, isFile=False</i>)
--- a/Documentation/Source/eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.WebBrowser.QtHelp.QtHelpDocumentationDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -78,6 +78,9 @@ <td><a href="#QtHelpDocumentationDialog.on_documentsList_itemSelectionChanged">on_documentsList_itemSelectionChanged</a></td> <td>Private slot handling a change of the documents selection.</td> </tr><tr> +<td><a href="#QtHelpDocumentationDialog.on_managePluginButton_clicked">on_managePluginButton_clicked</a></td> +<td>Private slot to manage the QtHelp documents provided by plug-ins.</td> +</tr><tr> <td><a href="#QtHelpDocumentationDialog.on_removeButton_clicked">on_removeButton_clicked</a></td> <td>Private slot to remove a document from the help database.</td> </tr> @@ -145,6 +148,11 @@ <b>on_documentsList_itemSelectionChanged</b>(<i></i>) <p> Private slot handling a change of the documents selection. +</p><a NAME="QtHelpDocumentationDialog.on_managePluginButton_clicked" ID="QtHelpDocumentationDialog.on_managePluginButton_clicked"></a> +<h4>QtHelpDocumentationDialog.on_managePluginButton_clicked</h4> +<b>on_managePluginButton_clicked</b>(<i></i>) +<p> + Private slot to manage the QtHelp documents provided by plug-ins. </p><a NAME="QtHelpDocumentationDialog.on_removeButton_clicked" ID="QtHelpDocumentationDialog.on_removeButton_clicked"></a> <h4>QtHelpDocumentationDialog.on_removeButton_clicked</h4> <b>on_removeButton_clicked</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.WebBrowser.QtHelp.QtHelpDocumentationSelectionDialog.html Fri Feb 03 19:20:59 2017 +0100 @@ -50,7 +50,7 @@ QDialog, Ui_QtHelpDocumentationSelectionDialog <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>AddMode</td></tr><tr><td>ManageMode</td></tr> </table> <h3>Class Methods</h3> <table> @@ -62,8 +62,23 @@ <td><a href="#QtHelpDocumentationSelectionDialog.__init__">QtHelpDocumentationSelectionDialog</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.__deleteCategory">__deleteCategory</a></td> +<td>Private method to delete a category.</td> +</tr><tr> <td><a href="#QtHelpDocumentationSelectionDialog.getData">getData</a></td> <td>Public method to retrieve the selected help documents.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked">on_deleteAllButton_clicked</a></td> +<td>Private slot to delete all documentation sets.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteButton_clicked">on_deleteButton_clicked</a></td> +<td>Private slot to delete the selected documentation sets.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked">on_deleteCategoryButton_clicked</a></td> +<td>Private slot to delete the selected documentation set categories.</td> +</tr><tr> +<td><a href="#QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged">on_documentationList_itemSelectionChanged</a></td> +<td>Private slot handling the selection of items.</td> </tr> </table> <h3>Static Methods</h3> @@ -72,7 +87,7 @@ </table> <a NAME="QtHelpDocumentationSelectionDialog.__init__" ID="QtHelpDocumentationSelectionDialog.__init__"></a> <h4>QtHelpDocumentationSelectionDialog (Constructor)</h4> -<b>QtHelpDocumentationSelectionDialog</b>(<i>helpDocuments, parent=None</i>) +<b>QtHelpDocumentationSelectionDialog</b>(<i>helpDocuments, mode, parent=None</i>) <p> Constructor </p><dl> @@ -80,10 +95,23 @@ <dd> dictionary containing the lists of help documents to be shown +</dd><dt><i>mode</i> (str)</dt> +<dd> +mode of the dialog </dd><dt><i>parent</i> (QWidget)</dt> <dd> reference to the parent widget </dd> +</dl><a NAME="QtHelpDocumentationSelectionDialog.__deleteCategory" ID="QtHelpDocumentationSelectionDialog.__deleteCategory"></a> +<h4>QtHelpDocumentationSelectionDialog.__deleteCategory</h4> +<b>__deleteCategory</b>(<i>category</i>) +<p> + Private method to delete a category. +</p><dl> +<dt><i>category</i> (QTreeWidgetItem)</dt> +<dd> +reference to the category item +</dd> </dl><a NAME="QtHelpDocumentationSelectionDialog.getData" ID="QtHelpDocumentationSelectionDialog.getData"></a> <h4>QtHelpDocumentationSelectionDialog.getData</h4> <b>getData</b>(<i></i>) @@ -99,7 +127,27 @@ <dd> list of str </dd> -</dl> +</dl><a NAME="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteAllButton_clicked</h4> +<b>on_deleteAllButton_clicked</b>(<i></i>) +<p> + Private slot to delete all documentation sets. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteButton_clicked</h4> +<b>on_deleteButton_clicked</b>(<i></i>) +<p> + Private slot to delete the selected documentation sets. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked" ID="QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked"></a> +<h4>QtHelpDocumentationSelectionDialog.on_deleteCategoryButton_clicked</h4> +<b>on_deleteCategoryButton_clicked</b>(<i></i>) +<p> + Private slot to delete the selected documentation set categories. +</p><a NAME="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged" ID="QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged"></a> +<h4>QtHelpDocumentationSelectionDialog.on_documentationList_itemSelectionChanged</h4> +<b>on_documentationList_itemSelectionChanged</b>(<i></i>) +<p> + Private slot handling the selection of items. +</p> <div align="right"><a href="#top">Up</a></div> <hr /> </body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.uninstall.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/eric6.uninstall.html Fri Feb 03 19:20:59 2017 +0100 @@ -25,7 +25,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>PythonMarkers</td></tr><tr><td>defaultMacAppBundleName</td></tr><tr><td>defaultMacAppBundlePath</td></tr><tr><td>includePythonVariant</td></tr><tr><td>progLanguages</td></tr><tr><td>progName</td></tr><tr><td>pyModDir</td></tr><tr><td>settingsNameGlobal</td></tr><tr><td>settingsNameOrganization</td></tr> +<tr><td>PythonMarkers</td></tr><tr><td>currDir</td></tr><tr><td>defaultMacAppBundleName</td></tr><tr><td>defaultMacAppBundlePath</td></tr><tr><td>includePythonVariant</td></tr><tr><td>progLanguages</td></tr><tr><td>progName</td></tr><tr><td>pyModDir</td></tr><tr><td>settingsNameGlobal</td></tr><tr><td>settingsNameOrganization</td></tr> </table> <h3>Classes</h3> <table>
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsMercurial.html Fri Feb 03 19:20:59 2017 +0100 @@ -149,15 +149,9 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html">HgLogBrowserDialog</a></td> <td>Module implementing a dialog to browse the log history.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgLogDialog.html">HgLogDialog</a></td> -<td>Module implementing a dialog to show the output of the hg log command process.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html">HgMergeDialog</a></td> <td>Module implementing a dialog to enter the data for a merge operation.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgMultiRevisionSelectionDialog.html">HgMultiRevisionSelectionDialog</a></td> -<td>Module implementing a dialog to select revisions.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsMercurial.HgNewProjectOptionsDialog.html">HgNewProjectOptionsDialog</a></td> <td>Module implementing the Mercurial Options Dialog for a new project from the repository.</td> </tr><tr>
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsPySvn.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsPySvn.html Fri Feb 03 19:20:59 2017 +0100 @@ -83,9 +83,6 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogBrowserDialog.html">SvnLogBrowserDialog</a></td> <td>Module implementing a dialog to browse the log history.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLogDialog.html">SvnLogDialog</a></td> -<td>Module implementing a dialog to show the output of the svn log command process.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsPySvn.SvnLoginDialog.html">SvnLoginDialog</a></td> <td>Module implementing the login dialog for pysvn.</td> </tr><tr>
--- a/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsSubversion.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/index-eric6.Plugins.VcsPlugins.vcsSubversion.html Fri Feb 03 19:20:59 2017 +0100 @@ -74,9 +74,6 @@ <td><a href="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogBrowserDialog.html">SvnLogBrowserDialog</a></td> <td>Module implementing a dialog to browse the log history.</td> </tr><tr> -<td><a href="eric6.Plugins.VcsPlugins.vcsSubversion.SvnLogDialog.html">SvnLogDialog</a></td> -<td>Module implementing a dialog to show the output of the svn log command process.</td> -</tr><tr> <td><a href="eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html">SvnMergeDialog</a></td> <td>Module implementing a dialog to enter the data for a merge operation.</td> </tr><tr>
--- a/Documentation/Source/index-eric6.QScintilla.Lexers.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/index-eric6.QScintilla.Lexers.html Fri Feb 03 19:20:59 2017 +0100 @@ -73,6 +73,9 @@ <td><a href="eric6.QScintilla.Lexers.LexerIDL.html">LexerIDL</a></td> <td>Module implementing an IDL lexer with some additional methods.</td> </tr><tr> +<td><a href="eric6.QScintilla.Lexers.LexerJSON.html">LexerJSON</a></td> +<td>Module implementing a JSON lexer with some additional methods.</td> +</tr><tr> <td><a href="eric6.QScintilla.Lexers.LexerJava.html">LexerJava</a></td> <td>Module implementing a Java lexer with some additional methods.</td> </tr><tr> @@ -85,6 +88,9 @@ <td><a href="eric6.QScintilla.Lexers.LexerMakefile.html">LexerMakefile</a></td> <td>Module implementing a Makefile lexer with some additional methods.</td> </tr><tr> +<td><a href="eric6.QScintilla.Lexers.LexerMarkdown.html">LexerMarkdown</a></td> +<td>Module implementing a Markdown lexer with some additional methods.</td> +</tr><tr> <td><a href="eric6.QScintilla.Lexers.LexerMatlab.html">LexerMatlab</a></td> <td>Module implementing a Matlab lexer with some additional methods.</td> </tr><tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/index-eric6.QScintilla.MarkupProviders.html Fri Feb 03 19:20:59 2017 +0100 @@ -0,0 +1,53 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.QScintilla.MarkupProviders</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> +<h1>eric6.QScintilla.MarkupProviders</h1> +<p> +Package providing various markup providers. +</p> + + +<h3>Modules</h3> +<table> +<tr> +<td><a href="eric6.QScintilla.MarkupProviders.HtmlProvider.html">HtmlProvider</a></td> +<td>Module implementing the HTML markup provider.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.HyperlinkMarkupDialog.html">HyperlinkMarkupDialog</a></td> +<td>Module implementing a dialog to enter data to insert a hyperlink.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.ImageMarkupDialog.html">ImageMarkupDialog</a></td> +<td>Module implementing a dialog to enter data for an image markup.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.MarkdownProvider.html">MarkdownProvider</a></td> +<td>Module implementing the Markdown markup provider.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.MarkupBase.html">MarkupBase</a></td> +<td>Module implementing the base class for the markup providers.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.RestructuredTextProvider.html">RestructuredTextProvider</a></td> +<td>Module implementing the reStructured Text markup provider.</td> +</tr><tr> +<td><a href="eric6.QScintilla.MarkupProviders.__init__.html">MarkupProviders</a></td> +<td>Package providing various markup providers.</td> +</tr> +</table> +</body></html> \ No newline at end of file
--- a/Documentation/Source/index-eric6.QScintilla.html Fri Jan 27 19:18:52 2017 +0100 +++ b/Documentation/Source/index-eric6.QScintilla.html Fri Feb 03 19:20:59 2017 +0100 @@ -42,6 +42,9 @@ <td><a href="index-eric6.QScintilla.Lexers.html">Lexers</a></td> <td>Package implementing lexers for the various supported programming languages.</td> </tr><tr> +<td><a href="index-eric6.QScintilla.MarkupProviders.html">MarkupProviders</a></td> +<td>Package providing various markup providers.</td> +</tr><tr> <td><a href="index-eric6.QScintilla.TypingCompleters.html">TypingCompleters</a></td> <td>Package implementing lexers for the various supported programming languages.</td> </tr> @@ -59,6 +62,9 @@ <td><a href="eric6.QScintilla.EditorAssembly.html">EditorAssembly</a></td> <td>Module implementing the editor assembly widget containing the navigation combos and the editor widget.</td> </tr><tr> +<td><a href="eric6.QScintilla.EditorButtonsWidget.html">EditorButtonsWidget</a></td> +<td>Module implementing a widget containing various buttons for accessing editor actions.</td> +</tr><tr> <td><a href="eric6.QScintilla.EditorMarkerMap.html">EditorMarkerMap</a></td> <td>Module implementing a class for showing an editor marker map.</td> </tr><tr>
--- a/Examples/rhallo.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Examples/rhallo.py Fri Feb 03 19:20:59 2017 +0100 @@ -10,7 +10,6 @@ if __name__ == "__main__": if eric6dbgstub.initDebugger("standard"): -# or if eric6dbgstub.initDebugger("threads"): eric6dbgstub.debugger.startDebugger() main()
--- a/Globals/__init__.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Globals/__init__.py Fri Feb 03 19:20:59 2017 +0100 @@ -79,8 +79,8 @@ # check version of sip try: - import sipconfig - sipVersion = sipconfig.Configuration().sip_version_str + import sip + sipVersion = sip.SIP_VERSION_STR # always assume, that snapshots are good if "snapshot" not in sipVersion: # check for blacklisted versions @@ -91,7 +91,7 @@ .format(vers)) print('Please install another version.') return False - except ImportError: + except (ImportError, AttributeError): pass # check version of PyQt
--- a/Helpviewer/QtHelpDocumentationDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Helpviewer/QtHelpDocumentationDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -85,8 +85,10 @@ """ from .QtHelpDocumentationSelectionDialog import \ QtHelpDocumentationSelectionDialog - dlg = QtHelpDocumentationSelectionDialog(self.__pluginHelpDocuments, - self) + dlg = QtHelpDocumentationSelectionDialog( + self.__pluginHelpDocuments, + QtHelpDocumentationSelectionDialog.AddMode, + self) if dlg.exec_() == QDialog.Accepted: documents = dlg.getData() if not documents: @@ -94,6 +96,19 @@ self.__registerDocumentations(documents) + @pyqtSlot() + def on_managePluginButton_clicked(self): + """ + Private slot to manage the QtHelp documents provided by plug-ins. + """ + from .QtHelpDocumentationSelectionDialog import \ + QtHelpDocumentationSelectionDialog + dlg = QtHelpDocumentationSelectionDialog( + self.__pluginHelpDocuments, + QtHelpDocumentationSelectionDialog.ManageMode, + self) + dlg.exec_() + def __registerDocumentations(self, fileNames): """ Private method to register a given list of documentations.
--- a/Helpviewer/QtHelpDocumentationDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Helpviewer/QtHelpDocumentationDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -26,20 +26,7 @@ </item> <item> <layout class="QGridLayout" name="gridLayout"> - <item row="3" column="1"> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>98</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="0" rowspan="4"> + <item row="0" column="0" rowspan="6"> <widget class="QListWidget" name="documentsList"> <property name="alternatingRowColors"> <bool>true</bool> @@ -62,6 +49,16 @@ </property> </widget> </item> + <item row="1" column="1"> + <widget class="QPushButton" name="addPluginButton"> + <property name="toolTip"> + <string>Press to select QtHelp documents provided by a plug-in to add to the database</string> + </property> + <property name="text"> + <string>Add from Plug-ins...</string> + </property> + </widget> + </item> <item row="2" column="1"> <widget class="QPushButton" name="removeButton"> <property name="toolTip"> @@ -72,16 +69,39 @@ </property> </widget> </item> - <item row="1" column="1"> - <widget class="QPushButton" name="addPluginButton"> + <item row="3" column="1"> + <widget class="Line" name="line"> + <property name="lineWidth"> + <number>2</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QPushButton" name="managePluginButton"> <property name="toolTip"> - <string>Press to select QtHelp documents provided by a plug-in to add to the database</string> + <string>Select to manage the plug-in provided documentation sets</string> </property> <property name="text"> - <string>Add from Plug-ins...</string> + <string>Manage Plug-ins...</string> </property> </widget> </item> + <item row="5" column="1"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>18</height> + </size> + </property> + </spacer> + </item> </layout> </item> <item>
--- a/Helpviewer/QtHelpDocumentationSelectionDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Helpviewer/QtHelpDocumentationSelectionDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -9,11 +9,18 @@ """ from __future__ import unicode_literals +try: + str = unicode +except NameError: + pass import os +import shutil -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import QDialog, QTreeWidgetItem +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem + +from E5Gui import E5MessageBox from .Ui_QtHelpDocumentationSelectionDialog import \ Ui_QtHelpDocumentationSelectionDialog @@ -25,27 +32,139 @@ Class implementing a dialog to select QtHelp documentation sets to be installed. """ - def __init__(self, helpDocuments, parent=None): + AddMode = "Add" + ManageMode = "Manage" + + def __init__(self, helpDocuments, mode, parent=None): """ Constructor @param helpDocuments dictionary containing the lists of help documents to be shown @type dict of lists of str + @param mode mode of the dialog + @type str @param parent reference to the parent widget @type QWidget """ super(QtHelpDocumentationSelectionDialog, self).__init__(parent) self.setupUi(self) + if mode == QtHelpDocumentationSelectionDialog.AddMode: + self.buttonBox.button(QDialogButtonBox.Close).hide() + else: + self.buttonBox.button(QDialogButtonBox.Ok).hide() + self.buttonBox.button(QDialogButtonBox.Cancel).hide() + for category in helpDocuments: parentItem = QTreeWidgetItem(self.documentationList, [category]) for document in helpDocuments[category]: item = QTreeWidgetItem(parentItem, [os.path.basename(document)]) item.setData(0, Qt.UserRole, document) + parentItem.setData(0, Qt.UserRole, os.path.dirname(document)) self.documentationList.sortItems(0, Qt.AscendingOrder) + @pyqtSlot() + def on_documentationList_itemSelectionChanged(self): + """ + Private slot handling the selection of items. + """ + selectedCategoriesCount = 0 + selectedDocumentSetCount = 0 + for itm in self.documentationList.selectedItems(): + if itm.parent() is None: + selectedCategoriesCount += 1 + else: + selectedDocumentSetCount += 1 + + self.deleteButton.setEnabled(selectedDocumentSetCount > 0) + self.deleteCategoryButton.setEnabled(selectedCategoriesCount > 0) + + @pyqtSlot() + def on_deleteButton_clicked(self): + """ + Private slot to delete the selected documentation sets. + """ + yes = E5MessageBox.yesNo( + self, + self.tr("Delete Documentation Sets"), + self.tr("""Shall the selected documentation sets really be""" + """ deleted?""")) + if yes: + for itm in self.documentationList.selectedItems(): + if itm.parent is None: + # it is a category item, skip it + continue + + category = itm.parent() + fileName = itm.data(0, Qt.UserRole) + try: + os.remove(fileName) + except OSError as err: + E5MessageBox.warning( + self, + self.tr("Delete Documentation Sets"), + self.tr("""<p>The documentation set <b>{0}</b> could""" + """ not be deleted.</p><p>Reason: {1}</p>""") + .format(fileName, str(err))) + continue + + category.removeChild(itm) + del itm + + if category.childCount() == 0: + self.__deleteCategory(category) + + @pyqtSlot() + def on_deleteCategoryButton_clicked(self): + """ + Private slot to delete the selected documentation set categories. + """ + yes = E5MessageBox.yesNo( + self, + self.tr("Delete Documentation Sets"), + self.tr("""Shall the selected documentation set categories""" + """ really be deleted?""")) + if yes: + categories = [] + for itm in self.documentationList.selectedItems(): + if itm.parent() is None: + categories.append(itm) + for category in categories: + self.__deleteCategory(category) + + @pyqtSlot() + def on_deleteAllButton_clicked(self): + """ + Private slot to delete all documentation sets. + """ + yes = E5MessageBox.yesNo( + self, + self.tr("Delete Documentation Sets"), + self.tr("""Shall all documentation sets really be deleted?""")) + if yes: + categories = [] + for index in range(self.documentationList.topLevelItemCount()): + categories.append( + self.documentationList.topLevelItem(index)) + for category in categories: + self.__deleteCategory(category) + + def __deleteCategory(self, category): + """ + Private method to delete a category. + + @param category reference to the category item + @type QTreeWidgetItem + """ + categoryDir = category.data(0, Qt.UserRole) + shutil.rmtree(categoryDir, True) + + self.documentationList.takeTopLevelItem( + self.documentationList.indexOfTopLevelItem(category)) + del category + def getData(self): """ Public method to retrieve the selected help documents.
--- a/Helpviewer/QtHelpDocumentationSelectionDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Helpviewer/QtHelpDocumentationSelectionDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -49,17 +49,70 @@ </widget> </item> <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="deleteButton"> + <property name="toolTip"> + <string>Press to delete the selected documentation sets</string> + </property> + <property name="text"> + <string>Delete</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="deleteCategoryButton"> + <property name="toolTip"> + <string>Press to delete the selected category</string> + </property> + <property name="text"> + <string>Delete Categories</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="deleteAllButton"> + <property name="toolTip"> + <string>Press to delete all entries</string> + </property> + <property name="text"> + <string>Delete All</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> <property name="standardButtons"> - <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close|QDialogButtonBox::Ok</set> </property> </widget> </item> </layout> </widget> + <tabstops> + <tabstop>documentationList</tabstop> + <tabstop>deleteButton</tabstop> + <tabstop>deleteCategoryButton</tabstop> + <tabstop>deleteAllButton</tabstop> + </tabstops> <resources/> <connections> <connection>
--- a/IconEditor/IconEditorWindow.py Fri Jan 27 19:18:52 2017 +0100 +++ b/IconEditor/IconEditorWindow.py Fri Feb 03 19:20:59 2017 +0100 @@ -123,8 +123,12 @@ """ filters = { 'bmp': self.tr("Windows Bitmap File (*.bmp)"), + 'cur': self.tr("Windows Cursor File (*.cur)"), + 'dds': self.tr("DirectDraw-Surface File (*.dds)"), 'gif': self.tr("Graphic Interchange Format File (*.gif)"), + 'icns': self.tr("Apple Icon File (*.icns)"), 'ico': self.tr("Windows Icon File (*.ico)"), + 'jp2': self.tr("JPEG2000 File (*.jp2)"), 'jpg': self.tr("JPEG File (*.jpg)"), 'jpeg': self.tr("JPEG File (*.jpeg)"), 'mng': self.tr("Multiple-Image Network Graphics File (*.mng)"), @@ -141,6 +145,7 @@ 'tif': self.tr("TIFF File (*.tif)"), 'tiff': self.tr("TIFF File (*.tiff)"), 'wbmp': self.tr("WAP Bitmap File (*.wbmp)"), + 'webp': self.tr("WebP Image File (*.webp)"), 'xbm': self.tr("X11 Bitmap File (*.xbm)"), 'xpm': self.tr("X11 Pixmap File (*.xpm)"), }
--- a/PluginManager/PluginManager.py Fri Jan 27 19:18:52 2017 +0100 +++ b/PluginManager/PluginManager.py Fri Feb 03 19:20:59 2017 +0100 @@ -1257,7 +1257,7 @@ if version.count(".") >= 3: # cope for extended version numbers by ignoring # the extension - checkVersion = ".".join(version.split(".",3)[:3]) + checkVersion = ".".join(version.split(".", 3)[:3]) else: checkVersion = version if pluginDetails["version"] < checkVersion:
--- a/PluginManager/PluginRepositoryDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/PluginManager/PluginRepositoryDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -648,7 +648,7 @@ if version.count(".") >= 3: # cope for extended version numbers by ignoring # the extension - version = ".".join(version.split(".",3)[:3]) + version = ".".join(version.split(".", 3)[:3]) if pluginDetails["version"] < version: return PluginRepositoryWidget.PluginStatusLocalUpdate
--- a/Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/pycodestyle.py Fri Feb 03 19:20:59 2017 +0100 @@ -79,7 +79,7 @@ except ImportError: from ConfigParser import RawConfigParser # __IGNORE_WARNING__ -__version__ = '2.1.0-eric' +__version__ = '2.2.0-eric' DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox' DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704,W503' @@ -926,8 +926,11 @@ Okay: # this is a comment\nimport os Okay: '''this is a module docstring'''\nimport os Okay: r'''this is a module docstring'''\nimport os - Okay: try:\n import x\nexcept:\n pass\nelse:\n pass\nimport y - Okay: try:\n import x\nexcept:\n pass\nfinally:\n pass\nimport y + Okay: + try:\n\timport x\nexcept ImportError:\n\tpass\nelse:\n\tpass\nimport y + Okay: + try:\n\timport x\nexcept ImportError:\n\tpass\nfinally:\n\tpass\nimport y + E402: a=1\nimport os E402: 'One string'\n"Two string"\nimport os E402: a=1\nfrom sys import x @@ -1196,6 +1199,22 @@ yield match.start(), "E721 do not compare types, use 'isinstance()'" +def bare_except(logical_line, noqa): + r"""When catching exceptions, mention specific exceptions whenever possible. + + Okay: except Exception: + Okay: except BaseException: + E722: except: + """ + if noqa: + return + + regex = re.compile(r"except\s*:") + match = regex.match(logical_line) + if match: + yield match.start(), "E722 do not use bare except'" + + def ambiguous_identifier(logical_line, tokens): r"""Never use the characters 'l', 'O', or 'I' as variable names.
--- a/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Fri Feb 03 19:20:59 2017 +0100 @@ -237,6 +237,9 @@ "E721": QCoreApplication.translate( "pycodestyle", "do not compare types, use 'isinstance()'"), + "E722": QCoreApplication.translate( + "pycodestyle", + "do not use bare except"), "E731": QCoreApplication.translate( "pycodestyle", "do not assign a lambda expression, use a def"),
--- a/Plugins/PluginVcsMercurial.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/PluginVcsMercurial.py Fri Feb 03 19:20:59 2017 +0100 @@ -160,7 +160,6 @@ self.__mercurialDefaults = { "StopLogOnCopy": True, # used in log browser - "UseLogBrowser": True, "LogLimit": 20, "CommitMessages": 20, "Commits": [], @@ -176,6 +175,7 @@ "Encoding": "utf-8", "EncodingMode": "strict", "ConsiderHidden": False, + "LogMessageColumnWidth": 30, } from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper @@ -247,13 +247,12 @@ @param key the key of the value to get @return the requested setting """ - if key in ["StopLogOnCopy", "UseLogBrowser", "PullUpdate", - "PreferUnbundle", "CreateBackup", "InternalMerge", - "ConsiderHidden"]: + if key in ["StopLogOnCopy", "PullUpdate", "PreferUnbundle", + "CreateBackup", "InternalMerge", "ConsiderHidden"]: return Preferences.toBool(Preferences.Prefs.settings.value( "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["LogLimit", "CommitMessages", "CommitAuthorsLimit", - "ServerPort"]: + "ServerPort", "LogMessageColumnWidth"]: return int(Preferences.Prefs.settings.value( "Mercurial/" + key, self.__mercurialDefaults[key])) elif key in ["Commits", "CommitAuthors"]:
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri Feb 03 19:20:59 2017 +0100 @@ -50,14 +50,13 @@ # log self.logSpinBox.setValue( self.__plugin.getPreferences("LogLimit")) + self.logWidthSpinBox.setValue( + self.__plugin.getPreferences("LogMessageColumnWidth")) # commit self.commitSpinBox.setValue( self.__plugin.getPreferences("CommitMessages")) self.commitAuthorsSpinBox.setValue( self.__plugin.getPreferences("CommitAuthorsLimit")) - # incoming/outgoing - self.logBrowserCheckBox.setChecked( - self.__plugin.getPreferences("UseLogBrowser")) # pull self.pullUpdateCheckBox.setChecked( self.__plugin.getPreferences("PullUpdate")) @@ -87,14 +86,13 @@ # log self.__plugin.setPreferences( "LogLimit", self.logSpinBox.value()) + self.__plugin.setPreferences( + "LogMessageColumnWidth", self.logWidthSpinBox.value()) # commit self.__plugin.setPreferences( "CommitMessages", self.commitSpinBox.value()) self.__plugin.setPreferences( "CommitAuthorsLimit", self.commitAuthorsSpinBox.value()) - # incoming/outgoing - self.__plugin.setPreferences( - "UseLogBrowser", self.logBrowserCheckBox.isChecked()) # pull self.__plugin.setPreferences( "PullUpdate", self.pullUpdateCheckBox.isChecked())
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Fri Feb 03 19:20:59 2017 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>609</width> - <height>751</height> + <height>911</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_5"> @@ -92,15 +92,15 @@ <property name="title"> <string>Log</string> </property> - <layout class="QHBoxLayout"> - <item> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="text"> <string>No. of log messages shown:</string> </property> </widget> </item> - <item> + <item row="0" column="1"> <widget class="QSpinBox" name="logSpinBox"> <property name="toolTip"> <string>Enter the number of log messages to be shown</string> @@ -113,7 +113,7 @@ </property> </widget> </item> - <item> + <item row="0" column="2"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -126,6 +126,26 @@ </property> </spacer> </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>No. of message characters shown in list:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="logWidthSpinBox"> + <property name="toolTip"> + <string>Enter the number of characters of the commit message to be shown in the list</string> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + <property name="minimum"> + <number>10</number> + </property> + </widget> + </item> </layout> </widget> </item> @@ -211,25 +231,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3"> - <property name="title"> - <string>Incoming / Outgoing</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QCheckBox" name="logBrowserCheckBox"> - <property name="toolTip"> - <string>Select to show the incoming and outgoing log in a log browser dialog</string> - </property> - <property name="text"> - <string>Use Log Browser for incoming / outgoing log</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> <widget class="QGroupBox" name="groupBox_4"> <property name="title"> <string>Pull</string> @@ -357,9 +358,9 @@ <tabstop>encodingModeComboBox</tabstop> <tabstop>hiddenChangesetsCheckBox</tabstop> <tabstop>logSpinBox</tabstop> + <tabstop>logWidthSpinBox</tabstop> <tabstop>commitSpinBox</tabstop> <tabstop>commitAuthorsSpinBox</tabstop> - <tabstop>logBrowserCheckBox</tabstop> <tabstop>pullUpdateCheckBox</tabstop> <tabstop>preferUnbundleCheckBox</tabstop> <tabstop>internalMergeCheckBox</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Feb 03 19:20:59 2017 +0100 @@ -15,9 +15,10 @@ import os import re +import collections from PyQt5.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ - QSize, QPoint + QSize, QPoint, QUrl from PyQt5.QtGui import QCursor, QColor, QPixmap, QPainter, QPen, QBrush, QIcon from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ QTreeWidgetItem, QApplication, QLineEdit, QMenu, QInputDialog @@ -81,6 +82,9 @@ self.filesTree.headerItem().setText(self.filesTree.columnCount(), "") self.filesTree.header().setSortIndicator(0, Qt.AscendingOrder) + self.upButton.setIcon(UI.PixmapCache.getIcon("1uparrow.png")) + self.downButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png")) + self.refreshButton = self.buttonBox.addButton( self.tr("&Refresh"), QDialogButtonBox.ActionRole) self.refreshButton.setToolTip( @@ -115,12 +119,16 @@ "<tr><td><b>Author</b></td><td>{2}</td></tr>" "<tr><td><b>Branch</b></td><td>{3}</td></tr>" "<tr><td><b>Parents</b></td><td>{4}</td></tr>" - "{5}" + "<tr><td><b>Children</b></td><td>{5}</td></tr>" + "{6}" "</table>" ) self.__tagsTemplate = self.tr( "<tr><td><b>Tags</b></td><td>{0}</td></tr>" ) + self.__latestTagTemplate = self.tr( + "<tr><td><b>Latest Tag</b></td><td>{0}</td></tr>" + ) self.__bookmarksTemplate = self.tr( "<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>" ) @@ -143,6 +151,7 @@ self.__changesRole = Qt.UserRole + 1 self.__edgesRole = Qt.UserRole + 2 self.__parentsRole = Qt.UserRole + 3 + self.__latestTagRole = Qt.UserRole + 4 if self.__hgClient: self.process = None @@ -173,7 +182,29 @@ self.logTree.headerItem().setText( self.BookmarksColumn, self.tr("Bookmarks")) + self.__logTreeNormalFont = self.logTree.font() + self.__logTreeNormalFont.setBold(False) + self.__logTreeBoldFont = self.logTree.font() + self.__logTreeBoldFont.setBold(True) + + self.detailsEdit.anchorClicked.connect(self.__revisionClicked) + self.__initActionsMenu() + + self.__finishCallbacks = [] + + def __addFinishCallback(self, callback): + """ + Private method to add a method to be called once the process finished. + + The callback methods are invoke in a FIFO style and are consumed. If + a callback method needs to be called again, it must be added again. + + @param callback callback method + @type function + """ + if callback not in self.__finishCallbacks: + self.__finishCallbacks.append(callback) def __initActionsMenu(self): """ @@ -284,6 +315,8 @@ self.__projectRevision = -1 self.__projectBranch = "" + + self.__childrenInfo = collections.defaultdict(list) def closeEvent(self, e): """ @@ -671,8 +704,58 @@ self.__closedBranchesRevs.append( parts[-2].split(":", 1)[0]) + def __getRevisionOfTag(self, tag): + """ + Private method to get the revision of a tag. + + @param tag tag name + @type str + @return tuple containing the revision and changeset ID + @rtype tuple of (str, str) + """ + errMsg = "" + + args = self.vcs.initCommand("tags") + + output = "" + if self.__hgClient: + output, errMsg = self.__hgClient.runcommand(args) + else: + process = QProcess() + process.setWorkingDirectory(self.repodir) + process.start('hg', args) + procStarted = process.waitForStarted(5000) + if procStarted: + finished = process.waitForFinished(30000) + if finished and process.exitCode() == 0: + output = str(process.readAllStandardOutput(), + self.vcs.getEncoding(), 'replace') + else: + if not finished: + errMsg = self.tr( + "The hg process did not finish within 30s.") + else: + errMsg = self.tr("Could not start the hg executable.") + + if errMsg: + E5MessageBox.critical( + self, + self.tr("Mercurial Error"), + errMsg) + + res = ("", "") + if output: + for line in output.splitlines(): + name, rev = line.strip().rsplit(None, 1) + if name == tag: + res = tuple(rev.split(":", 1)) + break + + return res + def __generateLogItem(self, author, date, message, revision, changedPaths, - parents, branches, tags, phase, bookmarks=None): + parents, branches, tags, phase, bookmarks, + latestTag): """ Private method to generate a log tree entry. @@ -687,20 +770,27 @@ @param tags list of tags (string) @param phase phase of the entry (string) @param bookmarks list of bookmarks (string) + @param latestTag the latest tag(s) reachable from the changeset + (list of strings) @return reference to the generated item (QTreeWidgetItem) """ - msg = [] + logMessageColumnWidth = self.vcs.getPlugin().getPreferences( + "LogMessageColumnWidth") + msgtxt = "" for line in message: - msg.append(line.strip()) + if ". " in line: + msgtxt += " " + line.strip().split(". ", 1)[0] + "." + break + else: + msgtxt += " " + line.strip() + if len(msgtxt) > logMessageColumnWidth: + msgtxt = "{0}...".format(msgtxt[:logMessageColumnWidth]) rev, node = revision.split(":") if rev in self.__closedBranchesRevs: closedStr = self.ClosedIndicator else: closedStr = "" - msgtxt = msg[0] - if len(msgtxt) > 30: - msgtxt = "{0}...".format(msgtxt[:30]) if phase in self.phases: phaseStr = self.phases[phase] else: @@ -731,10 +821,13 @@ itm.setData(0, self.__messageRole, message) itm.setData(0, self.__changesRole, changedPaths) itm.setData(0, self.__edgesRole, edges) + itm.setData(0, self.__latestTagRole, latestTag) if parents == [-1]: itm.setData(0, self.__parentsRole, []) else: itm.setData(0, self.__parentsRole, parents) + for parent in parents: + self.__childrenInfo[parent].append(int(rev)) if self.logTree.topLevelItemCount() > 1: topedges = \ @@ -774,11 +867,12 @@ return itm - def __getLogEntries(self, startRev=None): + def __getLogEntries(self, startRev=None, noEntries=0): """ Private method to retrieve log entries from the repository. @param startRev revision number to start from (integer, string) + @keyparam noEntries number of entries to get (0 = default) (int) """ self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) @@ -793,12 +887,15 @@ self.errors.clear() self.intercept = False + if noEntries == 0: + noEntries = self.limitSpinBox.value() + preargs = [] args = self.vcs.initCommand(self.commandMode) args.append('--verbose') if self.commandMode not in ("incoming", "outgoing"): args.append('--limit') - args.append(str(self.limitSpinBox.value())) + args.append(str(noEntries)) if self.commandMode in ("incoming", "outgoing"): args.append("--newest-first") if self.vcs.hasSubrepositories(): @@ -858,9 +955,6 @@ self.process.setWorkingDirectory(self.repodir) - self.inputGroup.setEnabled(True) - self.inputGroup.show() - if preargs: process = QProcess() process.setWorkingDirectory(self.repodir) @@ -888,7 +982,7 @@ else: self.__finish() - def start(self, fn, bundle=None, isFile=False): + def start(self, fn, bundle=None, isFile=False, noEntries=0): """ Public slot to start the hg log command. @@ -896,6 +990,7 @@ @keyparam bundle name of a bundle file (string) @keyparam isFile flag indicating log for a file is to be shown (boolean) + @keyparam noEntries number of entries to get (0 = default) (int) """ self.__bundle = bundle self.__isFile = isFile @@ -927,7 +1022,7 @@ self.__started = True self.__identifyProject() self.__getClosedBranches() - self.__getLogEntries() + self.__getLogEntries(noEntries=noEntries) def __procFinished(self, exitCode, exitStatus): """ @@ -959,6 +1054,9 @@ self.inputGroup.setEnabled(False) self.inputGroup.hide() self.refreshButton.setEnabled(True) + + while self.__finishCallbacks: + self.__finishCallbacks.pop(0)() def __modifyForLargeFiles(self, filename): """ @@ -1050,6 +1148,15 @@ log["bookmarks"] = value.strip().split(", ") elif key == "phase": log["phase"] = value.strip() + elif key == "latesttag": + tag = value.strip() + if tag == "null": + log["latesttag"] = [] + elif ":" in tag: + log["latesttag"] = [ + t.strip() for t in tag.split(":") if t.strip()] + else: + log["latesttag"] = [tag] else: if initialText: continue @@ -1061,7 +1168,7 @@ log["author"], log["date"], log["message"], log["revision"], changedPaths, log["parents"], log["branches"], log["tags"], - log["phase"], log["bookmarks"]) + log["phase"], log["bookmarks"], log["latesttag"]) dt = QDate.fromString(log["date"], Qt.ISODate) if not self.__maxDate.isValid() and \ not self.__minDate.isValid(): @@ -1159,6 +1266,11 @@ self.errorGroup.show() self.errors.insertPlainText(out) self.errors.ensureCursorVisible() + + if not self.__hgClient: + # show input in case the process asked for some input + self.inputGroup.setEnabled(True) + self.inputGroup.show() def __diffRevisions(self, rev1, rev2): """ @@ -1320,16 +1432,47 @@ itm.text(self.BookmarksColumn)) else: bookmarksStr = "" + + if itm.data(0, self.__latestTagRole): + latestTagLinks = [] + for tag in itm.data(0, self.__latestTagRole): + url = QUrl() + url.setScheme("rev") + url.setPath(self.__getRevisionOfTag(tag)[0]) + latestTagLinks.append('<a href="{0}">{1}</a>'.format( + url.toString(), tag)) + latestTagStr = self.__latestTagTemplate.format( + ", ".join(latestTagLinks)) + else: + latestTagStr = "" + + rev = int(itm.text(self.RevisionColumn).split(":", 1)[0]) + + parentLinks = [] + for parent in [str(x) for x in itm.data(0, self.__parentsRole)]: + url = QUrl() + url.setScheme("rev") + url.setPath(parent) + parentLinks.append('<a href="{0}">{1}</a>'.format( + url.toString(), parent)) + + childLinks = [] + for child in [str(x) for x in self.__childrenInfo[rev]]: + url = QUrl() + url.setScheme("rev") + url.setPath(child) + childLinks.append('<a href="{0}">{1}</a>'.format( + url.toString(), child)) + self.detailsEdit.setHtml(self.__detailsTemplate.format( itm.text(self.RevisionColumn), itm.text(self.DateColumn), itm.text(self.AuthorColumn), itm.text(self.BranchColumn).replace( self.ClosedIndicator, ""), - ", ".join( - [str(x) for x in itm.data(0, self.__parentsRole)] - ), - tagsStr + bookmarksStr, + ", ".join(parentLinks), + ", ".join(childLinks), + tagsStr + latestTagStr + bookmarksStr, )) for line in itm.data(0, self.__messageRole): @@ -1354,25 +1497,57 @@ self.__updateGui(current) self.__updateDiffButtons() self.__updateToolMenuActions() + + # Highlight the current entry using a bold font + for col in range(self.logTree.columnCount()): + current and current.setFont(col, self.__logTreeBoldFont) + previous and previous.setFont(col, self.__logTreeNormalFont) + + # set the state of the up and down buttons + self.upButton.setEnabled( + current is not None and + self.logTree.indexOfTopLevelItem(current) > 0) + self.downButton.setEnabled( + current is not None and + int(current.text(self.RevisionColumn).split(":")[0]) > 0) @pyqtSlot() def on_logTree_itemSelectionChanged(self): """ Private slot called, when the selection has changed. """ - if len(self.logTree.selectedItems()) == 1: - self.__updateGui(self.logTree.selectedItems()[0]) - self.__updateDiffButtons() self.__updateToolMenuActions() @pyqtSlot() + def on_upButton_clicked(self): + """ + Private slot to move the current item up one entry. + """ + itm = self.logTree.itemAbove(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + + @pyqtSlot() + def on_downButton_clicked(self): + """ + Private slot to move the current item down one entry. + """ + itm = self.logTree.itemBelow(self.logTree.currentItem()) + if itm: + self.logTree.setCurrentItem(itm) + else: + # load the next bunch and try again + self.__addFinishCallback(self.on_downButton_clicked) + self.on_nextButton_clicked() + + @pyqtSlot() def on_nextButton_clicked(self): """ Private slot to handle the Next button. """ if self.__lastRev > 0: - self.__getLogEntries(self.__lastRev - 1) + self.__getLogEntries(startRev=self.__lastRev - 1) @pyqtSlot() def on_diffP1Button_clicked(self): @@ -1586,8 +1761,6 @@ self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) - self.inputGroup.setEnabled(True) - self.inputGroup.show() self.refreshButton.setEnabled(False) # save the current items commit ID @@ -1605,7 +1778,8 @@ self.limitSpinBox.setEnabled(True) self.commandMode = self.initialCommandMode - self.start(self.__filename, isFile=self.__isFile) + self.start(self.__filename, isFile=self.__isFile, + noEntries=self.logTree.topLevelItemCount()) def on_passwordCheckBox_toggled(self, isOn): """ @@ -1632,7 +1806,6 @@ else: self.errors.insertPlainText(input) self.errors.ensureCursorVisible() - self.errorGroup.show() self.process.write(input) @@ -1998,3 +2171,28 @@ self, self.tr("Find Commit"), self.tr("""'{0}' was not found.""").format(self.rxEdit.text())) + + def __revisionClicked(self, url): + """ + Private slot to handle the anchorClicked signal of the changeset + details pane. + + @param url URL that was clicked + @type QUrl + """ + if url.scheme() == "rev": + # a parent or child revision was clicked, show the respective item + rev = url.path() + searchStr = "{0:>7}:".format(rev) + # format must be in sync with item generation format + items = self.logTree.findItems(searchStr, Qt.MatchStartsWith, + self.RevisionColumn) + if items: + itm = items[0] + if itm.isHidden(): + itm.setHidden(False) + self.logTree.setCurrentItem(itm) + else: + # load the next batch and try again + self.on_nextButton_clicked() + self.__revisionClicked(url)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui Fri Feb 03 19:20:59 2017 +0100 @@ -209,84 +209,96 @@ </widget> </item> <item> - <widget class="QSplitter" name="commitSplitter"> + <widget class="QSplitter" name="splitter"> <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <horstretch>0</horstretch> - <verstretch>3</verstretch> + <verstretch>8</verstretch> </sizepolicy> </property> <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Vertical</enum> </property> - <property name="childrenCollapsible"> - <bool>false</bool> - </property> - <widget class="QTextEdit" name="detailsEdit"> + <widget class="QSplitter" name="commitSplitter"> <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>1</horstretch> - <verstretch>3</verstretch> - </sizepolicy> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - <widget class="QTextEdit" name="messageEdit"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>2</horstretch> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> <verstretch>3</verstretch> </sizepolicy> </property> - <property name="readOnly"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="childrenCollapsible"> + <bool>false</bool> + </property> + <widget class="QTextBrowser" name="detailsEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>1</horstretch> + <verstretch>3</verstretch> + </sizepolicy> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="openLinks"> + <bool>false</bool> + </property> + </widget> + <widget class="QTextEdit" name="messageEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>2</horstretch> + <verstretch>3</verstretch> + </sizepolicy> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </widget> + <widget class="QTreeWidget" name="filesTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>4</verstretch> + </sizepolicy> + </property> + <property name="alternatingRowColors"> <bool>true</bool> </property> + <property name="rootIsDecorated"> + <bool>false</bool> + </property> + <property name="itemsExpandable"> + <bool>false</bool> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + <property name="allColumnsShowFocus"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Action</string> + </property> + </column> + <column> + <property name="text"> + <string>Path</string> + </property> + </column> + <column> + <property name="text"> + <string>Copy from</string> + </property> + </column> </widget> </widget> </item> <item> - <widget class="QTreeWidget" name="filesTree"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>4</verstretch> - </sizepolicy> - </property> - <property name="alternatingRowColors"> - <bool>true</bool> - </property> - <property name="rootIsDecorated"> - <bool>false</bool> - </property> - <property name="itemsExpandable"> - <bool>false</bool> - </property> - <property name="sortingEnabled"> - <bool>true</bool> - </property> - <property name="allColumnsShowFocus"> - <bool>true</bool> - </property> - <column> - <property name="text"> - <string>Action</string> - </property> - </column> - <column> - <property name="text"> - <string>Path</string> - </property> - </column> - <column> - <property name="text"> - <string>Copy from</string> - </property> - </column> - </widget> - </item> - <item> <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> <widget class="QPushButton" name="nextButton"> @@ -317,6 +329,16 @@ </property> </widget> </item> + <item row="0" column="2"> + <widget class="QCheckBox" name="stopCheckBox"> + <property name="toolTip"> + <string>Select to stop listing log messages at a copy or move</string> + </property> + <property name="text"> + <string>Stop on Copy/Move</string> + </property> + </widget> + </item> <item row="0" column="3" rowspan="2"> <widget class="Line" name="line"> <property name="frameShadow"> @@ -330,17 +352,27 @@ </property> </widget> </item> - <item row="0" column="2"> - <widget class="QCheckBox" name="stopCheckBox"> + <item row="0" column="4"> + <widget class="QToolButton" name="upButton"> <property name="toolTip"> - <string>Select to stop listing log messages at a copy or move</string> + <string>Press to move up in the log list</string> </property> - <property name="text"> - <string>Stop on Copy/Move</string> + <property name="autoRepeat"> + <bool>true</bool> </property> </widget> </item> - <item row="0" column="4"> + <item row="0" column="5"> + <widget class="QToolButton" name="downButton"> + <property name="toolTip"> + <string>Press to move down in the log list</string> + </property> + <property name="autoRepeat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="6"> <widget class="QPushButton" name="diffP1Button"> <property name="toolTip"> <string>Press to generate a diff to the first parent revision</string> @@ -350,7 +382,7 @@ </property> </widget> </item> - <item row="0" column="5"> + <item row="0" column="7"> <widget class="QPushButton" name="diffP2Button"> <property name="toolTip"> <string>Press to generate a diff to the second parent revision</string> @@ -360,7 +392,7 @@ </property> </widget> </item> - <item row="0" column="6"> + <item row="0" column="8"> <widget class="QPushButton" name="diffRevisionsButton"> <property name="toolTip"> <string>Press to compare two revisions</string> @@ -370,7 +402,7 @@ </property> </widget> </item> - <item row="0" column="7" rowspan="2"> + <item row="0" column="9" rowspan="2"> <widget class="Line" name="phaseLine"> <property name="frameShadow"> <enum>QFrame::Raised</enum> @@ -383,7 +415,17 @@ </property> </widget> </item> - <item row="0" column="9"> + <item row="0" column="10"> + <widget class="QToolButton" name="actionsButton"> + <property name="toolTip"> + <string>Select action from menu</string> + </property> + <property name="popupMode"> + <enum>QToolButton::InstantPopup</enum> + </property> + </widget> + </item> + <item row="0" column="11"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -391,12 +433,12 @@ <property name="sizeHint" stdset="0"> <size> <width>38</width> - <height>29</height> + <height>18</height> </size> </property> </spacer> </item> - <item row="1" column="4" colspan="3"> + <item row="1" column="4" colspan="5"> <widget class="QCheckBox" name="sbsCheckBox"> <property name="toolTip"> <string>Select to show differences side-by-side</string> @@ -406,16 +448,6 @@ </property> </widget> </item> - <item row="0" column="8"> - <widget class="QToolButton" name="actionsButton"> - <property name="toolTip"> - <string>Select action from menu</string> - </property> - <property name="popupMode"> - <enum>QToolButton::InstantPopup</enum> - </property> - </widget> - </item> </layout> </item> <item> @@ -539,6 +571,8 @@ <tabstop>nextButton</tabstop> <tabstop>limitSpinBox</tabstop> <tabstop>stopCheckBox</tabstop> + <tabstop>upButton</tabstop> + <tabstop>downButton</tabstop> <tabstop>diffP1Button</tabstop> <tabstop>diffP2Button</tabstop> <tabstop>diffRevisionsButton</tabstop>
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,551 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2010 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to show the output of the hg log command process. -""" - -from __future__ import unicode_literals -try: - str = unicode -except NameError: - pass - -import os - -from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray, \ - qVersion -from PyQt5.QtGui import QTextCursor -from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QApplication, QLineEdit - -from E5Gui.E5Application import e5App -from E5Gui import E5MessageBox - -from .Ui_HgLogDialog import Ui_HgLogDialog - -import Utilities - - -class HgLogDialog(QWidget, Ui_HgLogDialog): - """ - Class implementing a dialog to show the output of the hg log command - process. - - The dialog is nonmodal. Clicking a link in the upper text pane shows - a diff of the revisions. - """ - def __init__(self, vcs, mode="log", bundle=None, isFile=False, - parent=None): - """ - Constructor - - @param vcs reference to the vcs object - @param mode mode of the dialog (string; one of log, incoming, outgoing) - @param bundle name of a bundle file (string) - @param isFile flag indicating log for a file is to be shown (boolean) - @param parent parent widget (QWidget) - """ - super(HgLogDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) - - self.process = QProcess() - self.vcs = vcs - if mode in ("log", "incoming", "outgoing"): - self.mode = mode - else: - self.mode = "log" - self.bundle = bundle - self.__hgClient = self.vcs.getClient() - - self.contents.setHtml( - self.tr('<b>Processing your request, please wait...</b>')) - - self.process.finished.connect(self.__procFinished) - self.process.readyReadStandardOutput.connect(self.__readStdout) - self.process.readyReadStandardError.connect(self.__readStderr) - - self.contents.anchorClicked.connect(self.__sourceChanged) - - self.revisions = [] # stack of remembered revisions - self.revString = self.tr('Revision') - self.projectMode = False - - self.logEntries = [] # list of log entries - self.lastLogEntry = {} - self.fileCopies = {} - self.endInitialText = False - self.initialText = [] - - self.diff = None - - self.sbsCheckBox.setEnabled(isFile) - self.sbsCheckBox.setVisible(isFile) - - def closeEvent(self, e): - """ - Protected slot implementing a close event handler. - - @param e close event (QCloseEvent) - """ - if self.__hgClient: - if self.__hgClient.isExecuting(): - self.__hgClient.cancel() - else: - if self.process is not None and \ - self.process.state() != QProcess.NotRunning: - self.process.terminate() - QTimer.singleShot(2000, self.process.kill) - self.process.waitForFinished(3000) - - e.accept() - - def start(self, fn, noEntries=0, revisions=None): - """ - Public slot to start the hg log command. - - @param fn filename to show the log for (string) - @param noEntries number of entries to show (integer) - @param revisions revisions to show log for (list of strings) - """ - self.errorGroup.hide() - QApplication.processEvents() - - self.intercept = False - self.filename = fn - self.dname, self.fname = self.vcs.splitPath(fn) - - # find the root of the repo - self.repodir = self.dname - while not os.path.isdir(os.path.join(self.repodir, self.vcs.adminDir)): - self.repodir = os.path.dirname(self.repodir) - if os.path.splitdrive(self.repodir)[1] == os.sep: - return - - self.projectMode = (self.fname == "." and self.dname == self.repodir) - - self.activateWindow() - self.raise_() - - preargs = [] - args = self.vcs.initCommand(self.mode) - if noEntries and self.mode == "log": - args.append('--limit') - args.append(str(noEntries)) - if self.mode in ("incoming", "outgoing"): - args.append("--newest-first") - if self.vcs.hasSubrepositories(): - args.append("--subrepos") - if self.mode == "log": - args.append('--copies') - args.append('--template') - args.append(os.path.join(os.path.dirname(__file__), - "templates", - "logDialogBookmarkPhase.tmpl")) - if self.mode == "incoming": - if self.bundle: - args.append(self.bundle) - elif not self.vcs.hasSubrepositories(): - project = e5App().getObject("Project") - self.vcs.bundleFile = os.path.join( - project.getProjectManagementDir(), "hg-bundle.hg") - if os.path.exists(self.vcs.bundleFile): - os.remove(self.vcs.bundleFile) - preargs = args[:] - preargs.append("--quiet") - preargs.append('--bundle') - preargs.append(self.vcs.bundleFile) - args.append(self.vcs.bundleFile) - if revisions: - for rev in revisions: - args.append("--rev") - args.append(rev) - if not self.projectMode: - args.append(self.filename) - - if self.__hgClient: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - if preargs: - out, err = self.__hgClient.runcommand(preargs) - else: - err = "" - if err: - self.__showError(err) - elif self.mode != "incoming" or \ - (self.vcs.bundleFile and - os.path.exists(self.vcs.bundleFile)) or \ - self.bundle: - out, err = self.__hgClient.runcommand(args) - if err: - self.__showError(err) - if out and self.isVisible(): - for line in out.splitlines(True): - self.__processOutputLine(line) - if self.__hgClient.wasCanceled(): - break - self.__finish() - else: - self.process.kill() - - self.process.setWorkingDirectory(self.repodir) - - if preargs: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - process.waitForFinished(30000) - - if self.mode != "incoming" or \ - (self.vcs.bundleFile and - os.path.exists(self.vcs.bundleFile)) or \ - self.bundle: - self.process.start('hg', args) - procStarted = self.process.waitForStarted(5000) - if not procStarted: - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - E5MessageBox.critical( - self, - self.tr('Process Generation Error'), - self.tr( - 'The process {0} could not be started. ' - 'Ensure, that it is in the search path.' - ).format('hg')) - else: - self.__finish() - - def __getParents(self, rev): - """ - Private method to get the parents of the currently viewed - file/directory. - - @param rev revision number to get parents for (string) - @return list of parent revisions (list of strings) - """ - errMsg = "" - parents = [] - - if int(rev) > 0: - args = self.vcs.initCommand("parents") - if self.mode == "incoming": - if self.bundle: - args.append("--repository") - args.append(self.bundle) - elif self.vcs.bundleFile and \ - os.path.exists(self.vcs.bundleFile): - args.append("--repository") - args.append(self.vcs.bundleFile) - args.append("--template") - args.append("{rev}:{node|short}\n") - args.append("-r") - args.append(rev) - if not self.projectMode: - args.append(self.filename) - - output = "" - if self.__hgClient: - output, errMsg = self.__hgClient.runcommand(args) - else: - process = QProcess() - process.setWorkingDirectory(self.repodir) - process.start('hg', args) - procStarted = process.waitForStarted(5000) - if procStarted: - finished = process.waitForFinished(30000) - if finished and process.exitCode() == 0: - output = str(process.readAllStandardOutput(), - self.vcs.getEncoding(), 'replace') - else: - if not finished: - errMsg = self.tr( - "The hg process did not finish within 30s.") - else: - errMsg = self.tr("Could not start the hg executable.") - - if errMsg: - E5MessageBox.critical( - self, - self.tr("Mercurial Error"), - errMsg) - - if output: - parents = [p for p in output.strip().splitlines()] - - return parents - - def __procFinished(self, exitCode, exitStatus): - """ - Private slot connected to the finished signal. - - @param exitCode exit code of the process (integer) - @param exitStatus exit status of the process (QProcess.ExitStatus) - """ - self.__finish() - - def __finish(self): - """ - Private slot called when the process finished or the user pressed - the button. - """ - self.inputGroup.setEnabled(False) - self.inputGroup.hide() - - self.contents.clear() - - if not self.logEntries: - self.errors.append(self.tr("No log available for '{0}'") - .format(self.filename)) - self.errorGroup.show() - return - - html = "" - - if self.initialText: - for line in self.initialText: - html += Utilities.html_encode(line.strip()) - html += '<br />\n' - html += '{0}<br/>\n'.format(80 * "=") - - for entry in self.logEntries: - fileCopies = {} - if entry["file_copies"]: - for fentry in entry["file_copies"].split(", "): - newName, oldName = fentry[:-1].split(" (") - fileCopies[newName] = oldName - - rev, hexRev = entry["change"].split(":") - dstr = '<p><b>{0} {1}</b>'.format(self.revString, entry["change"]) - if entry["parents"]: - parents = entry["parents"].split() - else: - parents = self.__getParents(rev) - for parent in parents: - url = QUrl() - url.setScheme("file") - url.setPath(self.filename) - if qVersion() >= "5.0.0": - query = parent.split(":")[0] + '_' + rev - url.setQuery(query) - else: - query = QByteArray() - query.append(parent.split(":")[0]).append('_').append(rev) - url.setEncodedQuery(query) - dstr += ' [<a href="{0}" name="{1}" id="{1}">{2}</a>]'.format( - url.toString(), query, - self.tr('diff to {0}').format(parent), - ) - dstr += '<br />\n' - html += dstr - - if "phase" in entry: - html += self.tr("Phase: {0}<br />\n")\ - .format(entry["phase"]) - - html += self.tr("Branch: {0}<br />\n")\ - .format(entry["branches"]) - - html += self.tr("Tags: {0}<br />\n").format(entry["tags"]) - - if "bookmarks" in entry: - html += self.tr("Bookmarks: {0}<br />\n")\ - .format(entry["bookmarks"]) - - html += self.tr("Parents: {0}<br />\n")\ - .format(entry["parents"]) - - html += self.tr('<i>Author: {0}</i><br />\n')\ - .format(Utilities.html_encode(entry["user"])) - - date, time = entry["date"].split()[:2] - html += self.tr('<i>Date: {0}, {1}</i><br />\n')\ - .format(date, time) - - for line in entry["description"]: - html += Utilities.html_encode(line.strip()) - html += '<br />\n' - - if entry["file_adds"]: - html += '<br />\n' - for f in entry["file_adds"].strip().split(", "): - if f in fileCopies: - html += self.tr( - 'Added {0} (copied from {1})<br />\n')\ - .format(Utilities.html_encode(f), - Utilities.html_encode(fileCopies[f])) - else: - html += self.tr('Added {0}<br />\n')\ - .format(Utilities.html_encode(f)) - - if entry["files_mods"]: - html += '<br />\n' - for f in entry["files_mods"].strip().split(", "): - html += self.tr('Modified {0}<br />\n')\ - .format(Utilities.html_encode(f)) - - if entry["file_dels"]: - html += '<br />\n' - for f in entry["file_dels"].strip().split(", "): - html += self.tr('Deleted {0}<br />\n')\ - .format(Utilities.html_encode(f)) - - html += '</p>{0}<br/>\n'.format(60 * "=") - - self.contents.setHtml(html) - tc = self.contents.textCursor() - tc.movePosition(QTextCursor.Start) - self.contents.setTextCursor(tc) - self.contents.ensureCursorVisible() - - def __readStdout(self): - """ - Private slot to handle the readyReadStandardOutput signal. - - It reads the output of the process and inserts it into a buffer. - """ - self.process.setReadChannel(QProcess.StandardOutput) - - while self.process.canReadLine(): - s = str(self.process.readLine(), self.vcs.getEncoding(), 'replace') - self.__processOutputLine(s) - - def __processOutputLine(self, line): - """ - Private method to process the lines of output. - - @param line output line to be processed (string) - """ - if line == "@@@\n": - self.logEntries.append(self.lastLogEntry) - self.lastLogEntry = {} - self.fileCopies = {} - else: - try: - key, value = line.split("|", 1) - except ValueError: - key = "" - value = line - if key == "change": - self.endInitialText = True - if key in ("change", "tags", "parents", "user", "date", - "file_copies", "file_adds", "files_mods", "file_dels", - "bookmarks", "phase"): - self.lastLogEntry[key] = value.strip() - elif key == "branches": - if value.strip(): - self.lastLogEntry[key] = value.strip() - else: - self.lastLogEntry[key] = "default" - elif key == "description": - self.lastLogEntry[key] = [value.strip()] - else: - if self.endInitialText: - self.lastLogEntry["description"].append(value.strip()) - else: - self.initialText.append(value) - - def __readStderr(self): - """ - Private slot to handle the readyReadStandardError signal. - - It reads the error output of the process and inserts it into the - error pane. - """ - if self.process is not None: - s = str(self.process.readAllStandardError(), - self.vcs.getEncoding(), 'replace') - self.__showError(s) - - def __showError(self, out): - """ - Private slot to show some error. - - @param out error to be shown (string) - """ - self.errorGroup.show() - self.errors.insertPlainText(out) - self.errors.ensureCursorVisible() - - def __sourceChanged(self, url): - """ - Private slot to handle the sourceChanged signal of the contents pane. - - @param url the url that was clicked (QUrl) - """ - filename = url.path() - if Utilities.isWindowsPlatform(): - if filename.startswith("/"): - filename = filename[1:] - if qVersion() >= "5.0.0": - ver = url.query() - else: - ver = bytes(url.encodedQuery()).decode() - v1, v2 = ver.split('_') - if v1 == "" or v2 == "": - return - self.contents.scrollToAnchor(ver) - - if self.sbsCheckBox.isEnabled() and self.sbsCheckBox.isChecked(): - self.vcs.hgSbsDiff(filename, revisions=(v1, v2)) - else: - if self.diff is None: - from .HgDiffDialog import HgDiffDialog - self.diff = HgDiffDialog(self.vcs) - self.diff.show() - self.diff.start(filename, [v1, v2], self.bundle) - - def on_passwordCheckBox_toggled(self, isOn): - """ - Private slot to handle the password checkbox toggled. - - @param isOn flag indicating the status of the check box (boolean) - """ - if isOn: - self.input.setEchoMode(QLineEdit.Password) - else: - self.input.setEchoMode(QLineEdit.Normal) - - @pyqtSlot() - def on_sendButton_clicked(self): - """ - Private slot to send the input to the hg process. - """ - input = self.input.text() - input += os.linesep - - if self.passwordCheckBox.isChecked(): - self.errors.insertPlainText(os.linesep) - self.errors.ensureCursorVisible() - else: - self.errors.insertPlainText(input) - self.errors.ensureCursorVisible() - - self.process.write(input) - - self.passwordCheckBox.setChecked(False) - self.input.clear() - - def on_input_returnPressed(self): - """ - Private slot to handle the press of the return key in the input field. - """ - self.intercept = True - self.on_sendButton_clicked() - - def keyPressEvent(self, evt): - """ - Protected slot to handle a key press event. - - @param evt the key press event (QKeyEvent) - """ - if self.intercept: - self.intercept = False - evt.accept() - return - super(HgLogDialog, self).keyPressEvent(evt)
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.ui Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>HgLogDialog</class> - <widget class="QWidget" name="HgLogDialog"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>751</width> - <height>649</height> - </rect> - </property> - <property name="windowTitle"> - <string>Mercurial Log</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QGroupBox" name="contentsGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>3</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Log</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextBrowser" name="contents"> - <property name="whatsThis"> - <string><b>Mercurial Log</b><p>This shows the output of the hg log command. By clicking on the links you may show the difference between revisions.</p></string> - </property> - <property name="openLinks"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QCheckBox" name="sbsCheckBox"> - <property name="toolTip"> - <string>Select to show differences side-by-side</string> - </property> - <property name="text"> - <string>Show differences side-by-side</string> - </property> - </widget> - </item> - <item> - <widget class="QGroupBox" name="errorGroup"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Errors</string> - </property> - <layout class="QVBoxLayout"> - <item> - <widget class="QTextEdit" name="errors"> - <property name="whatsThis"> - <string><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></string> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - <property name="acceptRichText"> - <bool>false</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="inputGroup"> - <property name="title"> - <string>Input</string> - </property> - <layout class="QGridLayout"> - <item row="1" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>327</width> - <height>29</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="2"> - <widget class="QPushButton" name="sendButton"> - <property name="toolTip"> - <string>Press to send the input to the hg process</string> - </property> - <property name="text"> - <string>&Send</string> - </property> - <property name="shortcut"> - <string>Alt+S</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QLineEdit" name="input"> - <property name="toolTip"> - <string>Enter data to be sent to the hg process</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="passwordCheckBox"> - <property name="toolTip"> - <string>Select to switch the input field to password mode</string> - </property> - <property name="text"> - <string>&Password Mode</string> - </property> - <property name="shortcut"> - <string>Alt+P</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="standardButtons"> - <set>QDialogButtonBox::Close</set> - </property> - </widget> - </item> - </layout> - </widget> - <tabstops> - <tabstop>contents</tabstop> - <tabstop>sbsCheckBox</tabstop> - <tabstop>errors</tabstop> - <tabstop>input</tabstop> - <tabstop>passwordCheckBox</tabstop> - <tabstop>sendButton</tabstop> - <tabstop>buttonBox</tabstop> - </tabstops> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>HgLogDialog</receiver> - <slot>close()</slot> - <hints> - <hint type="sourcelabel"> - <x>262</x> - <y>624</y> - </hint> - <hint type="destinationlabel"> - <x>271</x> - <y>647</y> - </hint> - </hints> - </connection> - </connections> -</ui>
--- a/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py Fri Jan 27 19:18:52 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,177 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2011 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a dialog to select revisions. -""" - -from __future__ import unicode_literals - -from PyQt5.QtCore import pyqtSlot -from PyQt5.QtWidgets import QDialog, QDialogButtonBox - -from .Ui_HgMultiRevisionSelectionDialog import \ - Ui_HgMultiRevisionSelectionDialog - - -class HgMultiRevisionSelectionDialog( - QDialog, Ui_HgMultiRevisionSelectionDialog): - """ - Class implementing a dialog to select revisions. - """ - def __init__(self, tagsList, branchesList, bookmarksList=None, - emptyRevsOk=False, showLimit=False, limitDefault=100, - parent=None): - """ - Constructor - - @param tagsList list of tags (list of strings) - @param branchesList list of branches (list of strings) - @param bookmarksList list of bookmarks (list of strings) - @param emptyRevsOk flag indicating that it is ok to not enter - revisions (boolean) - @param showLimit flag indicating to show the limit entry (boolean) - @param limitDefault default value for the limit (integer) - @param parent parent widget (QWidget) - """ - super(HgMultiRevisionSelectionDialog, self).__init__(parent) - self.setupUi(self) - - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False) - - self.__emptyRevsOk = emptyRevsOk - - self.tagCombo.addItems(sorted(tagsList)) - self.branchCombo.addItems(["default"] + sorted(branchesList)) - if bookmarksList is not None: - self.bookmarkCombo.addItems(sorted(bookmarksList)) - else: - self.bookmarkButton.setHidden(True) - self.bookmarkCombo.setHidden(True) - - self.limitSpinBox.setValue(limitDefault) - self.limitGroup.setVisible(showLimit) - - def __updateOK(self): - """ - Private slot to update the OK button. - """ - enabled = True - if self.changesetsButton.isChecked(): - enabled = self.changesetsEdit.toPlainText() != "" - elif self.tagButton.isChecked(): - enabled = self.tagCombo.currentText() != "" - elif self.branchButton.isChecked(): - enabled = self.branchCombo.currentText() != "" - elif self.bookmarkButton.isChecked(): - enabled = self.bookmarkCombo.currentText() != "" - if not enabled and self.__emptyRevsOk: - enabled = self.limitGroup.isChecked() - - self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enabled) - - @pyqtSlot(bool) - def on_changesetsButton_toggled(self, checked): - """ - Private slot to handle changes of the Changesets select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_tagButton_toggled(self, checked): - """ - Private slot to handle changes of the Tag select button. - - @param checked state of the button (boolean) - """ - self.__updateOK() - - @pyqtSlot(bool) - def on_branchButton_toggled(self, checked): - """ - Private slot to handle changes of the Bran