Mercurial Repositories > eric / file diff

--- a/eric5.e4p	Fri Oct 18 23:00:41 2013 +0200
+++ b/eric5.e4p	Fri Nov 01 15:48:48 2013 +0100
@@ -574,7 +574,6 @@
     <Source>Helpviewer/OpenSearch/__init__.py</Source>
     <Source>Helpviewer/OpenSearch/OpenSearchEngineAction.py</Source>
     <Source>Helpviewer/OpenSearch/OpenSearchManager.py</Source>
-    <Source>Helpviewer/OpenSearch/OpenSearchDefaultEngines.py</Source>
     <Source>Helpviewer/OpenSearch/OpenSearchEngine.py</Source>
     <Source>Helpviewer/OpenSearch/OpenSearchReader.py</Source>
     <Source>Helpviewer/OpenSearch/OpenSearchWriter.py</Source>
@@ -591,7 +590,6 @@
     <Source>Helpviewer/Bookmarks/XbelReader.py</Source>
     <Source>Helpviewer/Bookmarks/BookmarksModel.py</Source>
     <Source>Utilities/AutoSaver.py</Source>
-    <Source>Helpviewer/Bookmarks/DefaultBookmarks.py</Source>
     <Source>Helpviewer/Bookmarks/BookmarksManager.py</Source>
     <Source>Helpviewer/Bookmarks/BookmarksMenu.py</Source>
     <Source>Helpviewer/Bookmarks/BookmarksToolBar.py</Source>
@@ -759,7 +757,6 @@
     <Source>E5Gui/E5TextSpinBox.py</Source>
     <Source>Helpviewer/UserAgent/__init__.py</Source>
     <Source>Helpviewer/UserAgent/UserAgentMenu.py</Source>
-    <Source>Helpviewer/UserAgent/UserAgentDefaults.py</Source>
     <Source>E5Gui/E5FileDialog.py</Source>
     <Source>QScintilla/Exporters/ExporterODT.py</Source>
     <Source>E5Gui/E5MessageBox.py</Source>
@@ -1108,6 +1105,10 @@
     <Source>UtilitiesPython2/CodeStyleChecker.py</Source>
     <Source>UtilitiesPython2/DocStyleCheckerPy2.py</Source>
     <Source>UtilitiesPython2/NamingStyleCheckerPy2.py</Source>
+    <Source>Helpviewer/Bookmarks/DefaultBookmarks_rc.py</Source>
+    <Source>Helpviewer/OpenSearch/DefaultSearchEngines/__init__.py</Source>
+    <Source>Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py</Source>
+    <Source>Helpviewer/UserAgent/UserAgentDefaults_rc.py</Source>
   </Sources>
   <Forms>
     <Form>PyUnit/UnittestDialog.ui</Form>
@@ -1454,6 +1455,9 @@
     <Resource>Helpviewer/data/icons.qrc</Resource>
     <Resource>Helpviewer/data/html.qrc</Resource>
     <Resource>Helpviewer/data/javascript.qrc</Resource>
+    <Resource>Helpviewer/Bookmarks/DefaultBookmarks.qrc</Resource>
+    <Resource>Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines.qrc</Resource>
+    <Resource>Helpviewer/UserAgent/UserAgentDefaults.qrc</Resource>
   </Resources>
   <Interfaces/>
   <Others>
@@ -1553,6 +1557,23 @@
     <Other>APIs/Python3/PyQt4.bas</Other>
     <Other>APIs/Python3/QScintilla2.bas</Other>
     <Other>ThirdParty/Jasy/jasy/license.md</Other>
+    <Other>Helpviewer/Bookmarks/DefaultBookmarks.xbel</Other>
+    <Other>Helpviewer/UserAgent/UserAgentDefaults.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Yahoo.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/YouTube.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Amazoncom.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Bing.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/DeEn_Beolingus.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Facebook.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Google_Im_Feeling_Lucky.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Google.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/LEO_DeuEng.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/LinuxMagazin.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Reddit.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Wikia_en.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Wikia.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Wikipedia.xml</Other>
+    <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Wiktionary.xml</Other>
   </Others>
   <MainScript>eric5.py</MainScript>
   <Vcs>
@@ -1906,7 +1927,7 @@
               <string>ExcludeMessages</string>
             </key>
             <value>
-              <string>E24, W293, N, E, W, D</string>
+              <string>E24, D, W293, N802, N803, N807, N808, N821,E,W</string>
             </value>
             <key>
               <string>FixCodes</string>
@@ -1930,7 +1951,7 @@
               <string>IncludeMessages</string>
             </key>
             <value>
-              <string>E501</string>
+              <string>E128</string>
             </value>
             <key>
               <string>MaxLineLength</string>