Mercurial Repositories > eric / file comparison
comparison: Helpviewer/UserAgent/UserAgentManager.py
Helpviewer/UserAgent/UserAgentManager.py
- changeset 3190
- a9a94491c4fd
- parent 3160
- 209a07d7e401
- child 3484
- 645c12de6b0c
equal
deleted
inserted
replaced
| 3189:9a21c547de5f | 3190:a9a94491c4fd |
|---|---|
| 63 agentFile = self.getFileName() | 63 agentFile = self.getFileName() |
| 64 writer = UserAgentWriter() | 64 writer = UserAgentWriter() |
| 65 if not writer.write(agentFile, self.__agents): | 65 if not writer.write(agentFile, self.__agents): |
| 66 E5MessageBox.critical( | 66 E5MessageBox.critical( |
| 67 None, | 67 None, |
| 68 self.trUtf8("Saving user agent data"), | 68 self.tr("Saving user agent data"), |
| 69 self.trUtf8( | 69 self.tr( |
| 70 """<p>User agent data could not be saved to""" | 70 """<p>User agent data could not be saved to""" |
| 71 """ <b>{0}</b></p>""").format(agentFile)) | 71 """ <b>{0}</b></p>""").format(agentFile)) |
| 72 else: | 72 else: |
| 73 self.userAgentSettingsSaved.emit() | 73 self.userAgentSettingsSaved.emit() |
| 74 | 74 |
| 84 reader = UserAgentReader() | 84 reader = UserAgentReader() |
| 85 self.__agents = reader.read(agentFile) | 85 self.__agents = reader.read(agentFile) |
| 86 if reader.error() != QXmlStreamReader.NoError: | 86 if reader.error() != QXmlStreamReader.NoError: |
| 87 E5MessageBox.warning( | 87 E5MessageBox.warning( |
| 88 None, | 88 None, |
| 89 self.trUtf8("Loading user agent data"), | 89 self.tr("Loading user agent data"), |
| 90 self.trUtf8("""Error when loading user agent data on""" | 90 self.tr("""Error when loading user agent data on""" |
| 91 """ line {0}, column {1}:\n{2}""") | 91 """ line {0}, column {1}:\n{2}""") |
| 92 .format(reader.lineNumber(), | 92 .format(reader.lineNumber(), |
| 93 reader.columnNumber(), | 93 reader.columnNumber(), |
| 94 reader.errorString())) | 94 reader.errorString())) |
| 95 | 95 |
| 96 self.__loaded = True | 96 self.__loaded = True |
| 110 lines = f.read() | 110 lines = f.read() |
| 111 f.close() | 111 f.close() |
| 112 except IOError as err: | 112 except IOError as err: |
| 113 E5MessageBox.critical( | 113 E5MessageBox.critical( |
| 114 None, | 114 None, |
| 115 self.trUtf8("Loading user agent data"), | 115 self.tr("Loading user agent data"), |
| 116 self.trUtf8("""<p>User agent data could not be loaded """ | 116 self.tr("""<p>User agent data could not be loaded """ |
| 117 """from <b>{0}</b></p>""" | 117 """from <b>{0}</b></p>""" |
| 118 """<p>Reason: {1}</p>""") | 118 """<p>Reason: {1}</p>""") |
| 119 .format(agentFile, str(err))) | 119 .format(agentFile, str(err))) |
| 120 return | 120 return |
| 121 | 121 |
| 122 for line in lines.splitlines(): | 122 for line in lines.splitlines(): |
| 123 if not line or \ | 123 if not line or \ |
