Sat, 29 Jun 2013 17:32:25 +0200
Added code to the speed dial reader to cope with a potential error during opening a speed dial file.
Helpviewer/SpeedDial/SpeedDialReader.py | file | annotate | diff | comparison | revisions | |
i18n/eric5_cs.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_de.qm | 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/Helpviewer/SpeedDial/SpeedDialReader.py Sat Jun 29 16:44:19 2013 +0200 +++ b/Helpviewer/SpeedDial/SpeedDialReader.py Sat Jun 29 17:32:25 2013 +0200 @@ -40,7 +40,13 @@ f = QFile(fileNameOrDevice) if not f.exists(): return self.__pages, self.__pagesPerRow, self.__sdSize - f.open(QFile.ReadOnly) + opened = f.open(QFile.ReadOnly) + if not opened: + self.raiseError(QCoreApplication.translate( + "SpeedDialReader", + "The file {0} could not be opened. Error: {1}").format( + fileNameOrDevice, f.errorString())) + return self.__pages, self.__pagesPerRow, self.__sdSize self.setDevice(f) while not self.atEnd():
--- a/i18n/eric5_cs.ts Sat Jun 29 16:44:19 2013 +0200 +++ b/i18n/eric5_cs.ts Sat Jun 29 17:32:25 2013 +0200 @@ -44148,10 +44148,15 @@ <context> <name>SpeedDialReader</name> <message> - <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="54"/> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="60"/> <source>The file is not a SpeedDial version 1.0 file.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="45"/> + <source>The file {0} could not be opened. Error: {1}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SpellCheckingDialog</name>
--- a/i18n/eric5_de.ts Sat Jun 29 16:44:19 2013 +0200 +++ b/i18n/eric5_de.ts Sat Jun 29 17:32:25 2013 +0200 @@ -42433,10 +42433,15 @@ <context> <name>SpeedDialReader</name> <message> - <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="54"/> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="60"/> <source>The file is not a SpeedDial version 1.0 file.</source> <translation>Die Datei ist keine Schnellwahl Datei der Version 1.0.</translation> </message> + <message> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="45"/> + <source>The file {0} could not be opened. Error: {1}</source> + <translation>Die Datei {0} konnte nicht geöffnet werden. Fehler: {1}</translation> + </message> </context> <context> <name>SpellCheckingDialog</name>
--- a/i18n/eric5_en.ts Sat Jun 29 16:44:19 2013 +0200 +++ b/i18n/eric5_en.ts Sat Jun 29 17:32:25 2013 +0200 @@ -42032,10 +42032,15 @@ <context> <name>SpeedDialReader</name> <message> - <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="54"/> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="60"/> <source>The file is not a SpeedDial version 1.0 file.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="45"/> + <source>The file {0} could not be opened. Error: {1}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SpellCheckingDialog</name>
--- a/i18n/eric5_es.ts Sat Jun 29 16:44:19 2013 +0200 +++ b/i18n/eric5_es.ts Sat Jun 29 17:32:25 2013 +0200 @@ -42436,10 +42436,15 @@ <context> <name>SpeedDialReader</name> <message> - <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="54"/> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="60"/> <source>The file is not a SpeedDial version 1.0 file.</source> <translation>El archivo no es un archivo de versión 1.0 de Marcación Rápida.</translation> </message> + <message> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="45"/> + <source>The file {0} could not be opened. Error: {1}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SpellCheckingDialog</name>
--- a/i18n/eric5_fr.ts Sat Jun 29 16:44:19 2013 +0200 +++ b/i18n/eric5_fr.ts Sat Jun 29 17:32:25 2013 +0200 @@ -46637,10 +46637,15 @@ <context> <name>SpeedDialReader</name> <message> - <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="54"/> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="60"/> <source>The file is not a SpeedDial version 1.0 file.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="45"/> + <source>The file {0} could not be opened. Error: {1}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SpellCheckingDialog</name>
--- a/i18n/eric5_it.ts Sat Jun 29 16:44:19 2013 +0200 +++ b/i18n/eric5_it.ts Sat Jun 29 17:32:25 2013 +0200 @@ -43920,10 +43920,15 @@ <context> <name>SpeedDialReader</name> <message> - <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="54"/> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="60"/> <source>The file is not a SpeedDial version 1.0 file.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="45"/> + <source>The file {0} could not be opened. Error: {1}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SpellCheckingDialog</name>
--- a/i18n/eric5_ru.ts Sat Jun 29 16:44:19 2013 +0200 +++ b/i18n/eric5_ru.ts Sat Jun 29 17:32:25 2013 +0200 @@ -44035,10 +44035,15 @@ <context> <name>SpeedDialReader</name> <message> - <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="54"/> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="60"/> <source>The file is not a SpeedDial version 1.0 file.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="45"/> + <source>The file {0} could not be opened. Error: {1}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SpellCheckingDialog</name>
--- a/i18n/eric5_tr.ts Sat Jun 29 16:44:19 2013 +0200 +++ b/i18n/eric5_tr.ts Sat Jun 29 17:32:25 2013 +0200 @@ -43733,10 +43733,15 @@ <context> <name>SpeedDialReader</name> <message> - <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="54"/> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="60"/> <source>The file is not a SpeedDial version 1.0 file.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="45"/> + <source>The file {0} could not be opened. Error: {1}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SpellCheckingDialog</name>
--- a/i18n/eric5_zh_CN.GB2312.ts Sat Jun 29 16:44:19 2013 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Sat Jun 29 17:32:25 2013 +0200 @@ -46581,10 +46581,15 @@ <context> <name>SpeedDialReader</name> <message> - <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="54"/> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="60"/> <source>The file is not a SpeedDial version 1.0 file.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SpeedDial/SpeedDialReader.py" line="45"/> + <source>The file {0} could not be opened. Error: {1}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SpellCheckingDialog</name>