Mercurial Repositories > eric / file diff

--- a/eric6.e4p	Sat Mar 02 11:17:15 2019 +0100
+++ b/eric6.e4p	Fri Apr 05 19:06:39 2019 +0200
@@ -162,6 +162,7 @@
     <Source>E5Gui/__init__.py</Source>
     <Source>E5Network/E5Ftp.py</Source>
     <Source>E5Network/E5GoogleMail.py</Source>
+    <Source>E5Network/E5GoogleMailHelpers.py</Source>
     <Source>E5Network/E5NetworkHeaderDetailsDialog.py</Source>
     <Source>E5Network/E5NetworkIcon.py</Source>
     <Source>E5Network/E5NetworkMonitor.py</Source>
@@ -914,6 +915,7 @@
     <Source>Preferences/ShortcutDialog.py</Source>
     <Source>Preferences/Shortcuts.py</Source>
     <Source>Preferences/ShortcutsDialog.py</Source>
+    <Source>Preferences/SubstyleDefinitionDialog.py</Source>
     <Source>Preferences/ToolConfigurationDialog.py</Source>
     <Source>Preferences/ToolGroupConfigurationDialog.py</Source>
     <Source>Preferences/ViewProfileDialog.py</Source>
@@ -1008,6 +1010,7 @@
     <Source>QScintilla/Lexers/LexerVHDL.py</Source>
     <Source>QScintilla/Lexers/LexerXML.py</Source>
     <Source>QScintilla/Lexers/LexerYAML.py</Source>
+    <Source>QScintilla/Lexers/SubstyledLexer.py</Source>
     <Source>QScintilla/Lexers/__init__.py</Source>
     <Source>QScintilla/MarkupProviders/HtmlProvider.py</Source>
     <Source>QScintilla/MarkupProviders/HyperlinkMarkupDialog.py</Source>
@@ -2088,6 +2091,7 @@
     <Form>Preferences/ProgramsDialog.ui</Form>
     <Form>Preferences/ShortcutDialog.ui</Form>
     <Form>Preferences/ShortcutsDialog.ui</Form>
+    <Form>Preferences/SubstyleDefinitionDialog.ui</Form>
     <Form>Preferences/ToolConfigurationDialog.ui</Form>
     <Form>Preferences/ToolGroupConfigurationDialog.ui</Form>
     <Form>Preferences/ViewProfileSidebarsDialog.ui</Form>
@@ -2255,14 +2259,14 @@
   </Resources>
   <Others>
     <Other>.hgignore</Other>
+    <Other>APIs/Python/zope-2.10.7.api</Other>
+    <Other>APIs/Python/zope-2.11.2.api</Other>
+    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/Python3/PyQt4.bas</Other>
     <Other>APIs/Python3/PyQt5.bas</Other>
     <Other>APIs/Python3/QScintilla2.bas</Other>
     <Other>APIs/Python3/eric6.api</Other>
     <Other>APIs/Python3/eric6.bas</Other>
-    <Other>APIs/Python/zope-2.10.7.api</Other>
-    <Other>APIs/Python/zope-2.11.2.api</Other>
-    <Other>APIs/Python/zope-3.3.1.api</Other>
     <Other>APIs/QSS/qss.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.api</Other>
     <Other>APIs/Ruby/Ruby-1.8.7.bas</Other>
@@ -2431,16 +2435,19 @@
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Google_Im_Feeling_Lucky.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/LEO_DeuEng.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/LinuxMagazin.xml</Other>
+    <Other>WebBrowser/OpenSearch/DefaultSearchEngines/MetaGer_MetaGer2.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/PyPI.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Qwant.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Reddit.xml</Other>
-    <Other>WebBrowser/OpenSearch/DefaultSearchEngines/StartPage.xml</Other>
+    <Other>WebBrowser/OpenSearch/DefaultSearchEngines/StartPage_de.xml</Other>
+    <Other>WebBrowser/OpenSearch/DefaultSearchEngines/StartPage_en.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Wikia.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Wikia_en.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Wikipedia.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Wiktionary.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Yahoo.xml</Other>
     <Other>WebBrowser/OpenSearch/DefaultSearchEngines/YouTube.xml</Other>
+    <Other>WebBrowser/OpenSearch/DefaultSearchEngines/searxme.xml</Other>
     <Other>WebBrowser/UserAgent/UserAgentDefaults.xml</Other>
     <Other>WebBrowser/data/html/adblockPage.html</Other>
     <Other>WebBrowser/data/html/authenticationErrorPage.html</Other>
@@ -2834,6 +2841,15 @@
         <value>
           <dict>
             <key>
+              <string>BlankLines</string>
+            </key>
+            <value>
+              <tuple>
+                <int>2</int>
+                <int>1</int>
+              </tuple>
+            </value>
+            <key>
               <string>BuiltinsChecker</string>
             </key>
             <value>
@@ -2892,7 +2908,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>C101, E265, E266, E305, E402, W504, M811, N802, N803, N807, N808, N821, W293, M201</string>
+              <string>C101, E265, E266, E305, E402, M201, M811, M834, N802, N803, N807, N808, N821, W293, W504</string>
             </value>
             <key>
               <string>FixCodes</string>
@@ -2943,6 +2959,12 @@
               <int>10</int>
             </value>
             <key>
+              <string>MaxDocLineLength</string>
+            </key>
+            <value>
+              <int>79</int>
+            </value>
+            <key>
               <string>MaxLineLength</string>
             </key>
             <value>