Mercurial Repositories > eric / changeset

changeset

Fixed an issue that can cause a crash in the project browser.

Fri, 17 Feb 2012 19:41:56 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 17 Feb 2012 19:41:56 +0100
changeset 1627
f3280c6a04ba
parent 1626
a77c8ea8582c
child 1628
52cf35f6b26a

Fixed an issue that can cause a crash in the project browser.

Project/ProjectBrowser.py file | annotate | diff | comparison | revisions
i18n/eric5_cs.ts file | annotate | diff | comparison | revisions
i18n/eric5_de.ts file | annotate | diff | comparison | revisions
i18n/eric5_en.ts file | annotate | diff | comparison | revisions
i18n/eric5_es.ts file | annotate | diff | comparison | revisions
i18n/eric5_fr.ts file | annotate | diff | comparison | revisions
i18n/eric5_it.ts file | annotate | diff | comparison | revisions
i18n/eric5_ru.ts file | annotate | diff | comparison | revisions
i18n/eric5_tr.ts file | annotate | diff | comparison | revisions
i18n/eric5_zh_CN.GB2312.ts file | annotate | diff | comparison | revisions 
--- a/Project/ProjectBrowser.py	Fri Feb 17 19:39:37 2012 +0100
+++ b/Project/ProjectBrowser.py	Fri Feb 17 19:41:56 2012 +0100
@@ -355,4 +355,7 @@
         else:
             self.vcsStatusIndicator.setColor(
                 Preferences.getProjectBrowserColour(self.vcsStatusColorNames[state]))
-        self.vcsStatusIndicator.setToolTip(self.vcsStatusText[state])
+        if state not in self.vcsStatusText:
+            self.vcsStatusIndicator.setToolTip(self.trUtf8("unknown status"))
+        else:
+            self.vcsStatusIndicator.setToolTip(self.vcsStatusText[state])
--- a/i18n/eric5_cs.ts	Fri Feb 17 19:39:37 2012 +0100
+++ b/i18n/eric5_cs.ts	Fri Feb 17 19:41:56 2012 +0100
@@ -30013,6 +30013,11 @@
         <source>files removed</source>
         <translation>odebráno souborů</translation>
     </message>
+    <message>
+        <location filename="Project/ProjectBrowser.py" line="359"/>
+        <source>unknown status</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectBrowserModel</name>
--- a/i18n/eric5_de.ts	Fri Feb 17 19:39:37 2012 +0100
+++ b/i18n/eric5_de.ts	Fri Feb 17 19:41:56 2012 +0100
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage="">
+<!DOCTYPE TS>
+<TS version="2.0" language="de">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -1640,8 +1641,8 @@
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/>
-        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
-        <translation>In neuem &amp;Register öffnen<byte value="x9"/>Strg+LMK</translation>
+        <source>Open in New &amp;Tab	Ctrl+LMB</source>
+        <translation>In neuem &amp;Register öffnen	Strg+LMK</translation>
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/>
@@ -1859,7 +1860,7 @@
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/>
-        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
+        <source>Open in New &amp;Tab	Ctrl+LMB</source>
         <translation>In neuem &amp;Register öffnen\tStrg+LMK</translation>
     </message>
 </context>
@@ -12933,7 +12934,7 @@
     </message>
     <message>
         <location filename="Helpviewer/HelpBrowserWV.py" line="839"/>
-        <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source>
+        <source>Open Link in New Tab	Ctrl+LMB</source>
         <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation>
     </message>
     <message>
@@ -29128,6 +29129,11 @@
         <source>files removed</source>
         <translation>Dateien entfernt</translation>
     </message>
+    <message>
+        <location filename="Project/ProjectBrowser.py" line="359"/>
+        <source>unknown status</source>
+        <translation>unbekannter Status</translation>
+    </message>
 </context>
 <context>
     <name>ProjectBrowserModel</name>
--- a/i18n/eric5_en.ts	Fri Feb 17 19:39:37 2012 +0100
+++ b/i18n/eric5_en.ts	Fri Feb 17 19:41:56 2012 +0100
@@ -28973,6 +28973,11 @@
         <source>conflict</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Project/ProjectBrowser.py" line="359"/>
+        <source>unknown status</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectBrowserModel</name>
--- a/i18n/eric5_es.ts	Fri Feb 17 19:39:37 2012 +0100
+++ b/i18n/eric5_es.ts	Fri Feb 17 19:41:56 2012 +0100
@@ -29640,6 +29640,11 @@
         <source>files removed</source>
         <translation>archivos eliminados</translation>
     </message>
+    <message>
+        <location filename="Project/ProjectBrowser.py" line="359"/>
+        <source>unknown status</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectBrowserModel</name>
--- a/i18n/eric5_fr.ts	Fri Feb 17 19:39:37 2012 +0100
+++ b/i18n/eric5_fr.ts	Fri Feb 17 19:41:56 2012 +0100
@@ -31932,6 +31932,11 @@
         <source>files removed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Project/ProjectBrowser.py" line="359"/>
+        <source>unknown status</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectBrowserModel</name>
--- a/i18n/eric5_it.ts	Fri Feb 17 19:39:37 2012 +0100
+++ b/i18n/eric5_it.ts	Fri Feb 17 19:41:56 2012 +0100
@@ -29526,6 +29526,11 @@
         <source>files removed</source>
         <translation>file rimossi</translation>
     </message>
+    <message>
+        <location filename="Project/ProjectBrowser.py" line="359"/>
+        <source>unknown status</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectBrowserModel</name>
--- a/i18n/eric5_ru.ts	Fri Feb 17 19:39:37 2012 +0100
+++ b/i18n/eric5_ru.ts	Fri Feb 17 19:41:56 2012 +0100
@@ -29692,6 +29692,11 @@
         <source>files removed</source>
         <translation>файлы удалены</translation>
     </message>
+    <message>
+        <location filename="Project/ProjectBrowser.py" line="359"/>
+        <source>unknown status</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectBrowserModel</name>
--- a/i18n/eric5_tr.ts	Fri Feb 17 19:39:37 2012 +0100
+++ b/i18n/eric5_tr.ts	Fri Feb 17 19:41:56 2012 +0100
@@ -29871,6 +29871,11 @@
         <source>conflict</source>
         <translation>çelişki</translation>
     </message>
+    <message>
+        <location filename="Project/ProjectBrowser.py" line="359"/>
+        <source>unknown status</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectBrowserModel</name>
--- a/i18n/eric5_zh_CN.GB2312.ts	Fri Feb 17 19:39:37 2012 +0100
+++ b/i18n/eric5_zh_CN.GB2312.ts	Fri Feb 17 19:41:56 2012 +0100
@@ -31892,6 +31892,11 @@
         <source>files removed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Project/ProjectBrowser.py" line="359"/>
+        <source>unknown status</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProjectBrowserModel</name>

Mercurial Repository: eric

eric ide

mercurial