Mercurial Repositories > eric / file comparison
comparison: Helpviewer/UserAgent/UserAgentManager.py
Helpviewer/UserAgent/UserAgentManager.py
- changeset 2403
- e3d7a861547c
- parent 2302
- f29e9405c851
- child 2525
- 8b507a9a2d40
- child 3002
- 6ffc581f00f1
equal
deleted
inserted
replaced
| 2402:304fcefd3b04 | 2403:e3d7a861547c |
|---|---|
| 10 import os | 10 import os |
| 11 | 11 |
| 12 from PyQt4.QtCore import pyqtSignal, QObject, QXmlStreamReader | 12 from PyQt4.QtCore import pyqtSignal, QObject, QXmlStreamReader |
| 13 | 13 |
| 14 from E5Gui import E5MessageBox | 14 from E5Gui import E5MessageBox |
| 15 | |
| 16 from .UserAgentWriter import UserAgentWriter | |
| 17 from .UserAgentReader import UserAgentReader | |
| 18 | 15 |
| 19 from Utilities.AutoSaver import AutoSaver | 16 from Utilities.AutoSaver import AutoSaver |
| 20 import Utilities | 17 import Utilities |
| 21 | 18 |
| 22 | 19 |
| 57 Public slot to save the user agent entries to disk. | 54 Public slot to save the user agent entries to disk. |
| 58 """ | 55 """ |
| 59 if not self.__loaded: | 56 if not self.__loaded: |
| 60 return | 57 return |
| 61 | 58 |
| 59 from .UserAgentWriter import UserAgentWriter | |
| 62 agentFile = self.getFileName() | 60 agentFile = self.getFileName() |
| 63 writer = UserAgentWriter() | 61 writer = UserAgentWriter() |
| 64 if not writer.write(agentFile, self.__agents): | 62 if not writer.write(agentFile, self.__agents): |
| 65 E5MessageBox.critical(None, | 63 E5MessageBox.critical(None, |
| 66 self.trUtf8("Saving user agent data"), | 64 self.trUtf8("Saving user agent data"), |
| 75 """ | 73 """ |
| 76 agentFile = self.getFileName() | 74 agentFile = self.getFileName() |
| 77 if not os.path.exists(agentFile): | 75 if not os.path.exists(agentFile): |
| 78 self.__loadNonXml(os.path.splitext(agentFile)[0]) | 76 self.__loadNonXml(os.path.splitext(agentFile)[0]) |
| 79 else: | 77 else: |
| 78 from .UserAgentReader import UserAgentReader | |
| 80 reader = UserAgentReader() | 79 reader = UserAgentReader() |
| 81 self.__agents = reader.read(agentFile) | 80 self.__agents = reader.read(agentFile) |
| 82 if reader.error() != QXmlStreamReader.NoError: | 81 if reader.error() != QXmlStreamReader.NoError: |
| 83 E5MessageBox.warning(None, | 82 E5MessageBox.warning(None, |
| 84 self.trUtf8("Loading user agent data"), | 83 self.trUtf8("Loading user agent data"), |
