Mercurial Repositories > eric / file comparison
comparison: Preferences/ConfigurationDialog.py
Preferences/ConfigurationDialog.py
- changeset 53
- c3eb7cc1ff8b
- parent 15
- f6ccc31d6e72
- child 55
- b5c84934de9c
equal
deleted
inserted
replaced
| 52:ba69827929ee | 53:c3eb7cc1ff8b |
|---|---|
| 11 import types | 11 import types |
| 12 | 12 |
| 13 from PyQt4.QtCore import * | 13 from PyQt4.QtCore import * |
| 14 from PyQt4.QtGui import * | 14 from PyQt4.QtGui import * |
| 15 | 15 |
| 16 from E4Gui.E4Application import e4App | 16 from E4Gui.E4Application import e5App |
| 17 | 17 |
| 18 import QScintilla.Lexers | 18 import QScintilla.Lexers |
| 19 | 19 |
| 20 import Preferences | 20 import Preferences |
| 21 | 21 |
| 75 self.itmDict = {} | 75 self.itmDict = {} |
| 76 | 76 |
| 77 if not fromEric: | 77 if not fromEric: |
| 78 from PluginManager.PluginManager import PluginManager | 78 from PluginManager.PluginManager import PluginManager |
| 79 try: | 79 try: |
| 80 self.pluginManager = e4App().getObject("PluginManager") | 80 self.pluginManager = e5App().getObject("PluginManager") |
| 81 except KeyError: | 81 except KeyError: |
| 82 self.pluginManager = PluginManager(self) | 82 self.pluginManager = PluginManager(self) |
| 83 e4App().registerObject("PluginManager", self.pluginManager) | 83 e5App().registerObject("PluginManager", self.pluginManager) |
| 84 | 84 |
| 85 if not helpBrowserMode: | 85 if not helpBrowserMode: |
| 86 self.configItems = { | 86 self.configItems = { |
| 87 # key : [display string, pixmap name, dialog module name or | 87 # key : [display string, pixmap name, dialog module name or |
| 88 # page creation function, parent key, | 88 # page creation function, parent key, |
| 248 [self.trUtf8("Viewmanager"), "preferences-viewmanager.png", | 248 [self.trUtf8("Viewmanager"), "preferences-viewmanager.png", |
| 249 "ViewmanagerPage", "0interfacePage", None], | 249 "ViewmanagerPage", "0interfacePage", None], |
| 250 } | 250 } |
| 251 | 251 |
| 252 self.configItems.update( | 252 self.configItems.update( |
| 253 e4App().getObject("PluginManager").getPluginConfigData()) | 253 e5App().getObject("PluginManager").getPluginConfigData()) |
| 254 else: | 254 else: |
| 255 self.configItems = { | 255 self.configItems = { |
| 256 # key : [display string, pixmap name, dialog module name or | 256 # key : [display string, pixmap name, dialog module name or |
| 257 # page creation function, parent key, | 257 # page creation function, parent key, |
| 258 # reference to configuration page (must always be last)] | 258 # reference to configuration page (must always be last)] |
