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