77 |
77 |
78 DefaultMode = 0 |
78 DefaultMode = 0 |
79 HelpBrowserMode = 1 |
79 HelpBrowserMode = 1 |
80 TrayStarterMode = 2 |
80 TrayStarterMode = 2 |
81 HexEditorMode = 3 |
81 HexEditorMode = 3 |
|
82 WebBrowserMode = 4 |
82 |
83 |
83 def __init__(self, parent=None, fromEric=True, displayMode=DefaultMode, |
84 def __init__(self, parent=None, fromEric=True, displayMode=DefaultMode, |
84 expandedEntries=[]): |
85 expandedEntries=[]): |
85 """ |
86 """ |
86 Constructor |
87 Constructor |
87 |
88 |
88 @param parent The parent widget of this dialog. (QWidget) |
89 @param parent The parent widget of this dialog. (QWidget) |
89 @keyparam fromEric flag indicating a dialog generation from within the |
90 @keyparam fromEric flag indicating a dialog generation from within the |
90 eric6 ide (boolean) |
91 eric6 ide (boolean) |
91 @keyparam displayMode mode of the configuration dialog |
92 @keyparam displayMode mode of the configuration dialog |
92 (DefaultMode, HelpBrowserMode, TrayStarterMode, HexEditorMode) |
93 (DefaultMode, HelpBrowserMode, TrayStarterMode, HexEditorMode, |
|
94 WebBrowserMode) |
93 @exception RuntimeError raised to indicate an invalid dialog mode |
95 @exception RuntimeError raised to indicate an invalid dialog mode |
94 @keyparam expandedEntries list of entries to be shown expanded |
96 @keyparam expandedEntries list of entries to be shown expanded |
95 (list of strings) |
97 (list of strings) |
96 """ |
98 """ |
97 assert displayMode in ( |
99 assert displayMode in ( |
98 ConfigurationWidget.DefaultMode, |
100 ConfigurationWidget.DefaultMode, |
99 ConfigurationWidget.HelpBrowserMode, |
101 ConfigurationWidget.HelpBrowserMode, |
100 ConfigurationWidget.TrayStarterMode, |
102 ConfigurationWidget.TrayStarterMode, |
101 ConfigurationWidget.HexEditorMode, |
103 ConfigurationWidget.HexEditorMode, |
|
104 ConfigurationWidget.WebBrowserMode, |
102 ) |
105 ) |
103 |
106 |
104 super(ConfigurationWidget, self).__init__(parent) |
107 super(ConfigurationWidget, self).__init__(parent) |
105 self.fromEric = fromEric |
108 self.fromEric = fromEric |
106 self.displayMode = displayMode |
109 self.displayMode = displayMode |
116 except KeyError: |
119 except KeyError: |
117 self.pluginManager = PluginManager(self) |
120 self.pluginManager = PluginManager(self) |
118 e5App().registerObject("PluginManager", self.pluginManager) |
121 e5App().registerObject("PluginManager", self.pluginManager) |
119 |
122 |
120 if displayMode == ConfigurationWidget.DefaultMode: |
123 if displayMode == ConfigurationWidget.DefaultMode: |
|
124 # TODO: add QtWebEngine based browser config pages to default mode |
121 self.configItems = { |
125 self.configItems = { |
122 # key : [display string, pixmap name, dialog module name or |
126 # key : [display string, pixmap name, dialog module name or |
123 # page creation function, parent key, |
127 # page creation function, parent key, |
124 # reference to configuration page (must always be last)] |
128 # reference to configuration page (must always be last)] |
125 # The dialog module must have the module function 'create' to |
129 # The dialog module must have the module function 'create' to |
385 "HelpWebBrowserPage", "0helpPage", None], |
389 "HelpWebBrowserPage", "0helpPage", None], |
386 }) |
390 }) |
387 except ImportError: |
391 except ImportError: |
388 pass |
392 pass |
389 |
393 |
|
394 elif displayMode == ConfigurationWidget.WebBrowserMode: |
|
395 # TODO: Check config pages for QWebKit and add QWebEngine |
|
396 self.configItems = { |
|
397 # key : [display string, pixmap name, dialog module name or |
|
398 # page creation function, parent key, |
|
399 # reference to configuration page (must always be last)] |
|
400 # The dialog module must have the module function 'create' to |
|
401 # create the configuration page. This must have the method |
|
402 # 'save' to save the settings. |
|
403 "networkPage": |
|
404 [self.tr("Network"), "preferences-network.png", |
|
405 "NetworkPage", None, None], |
|
406 "printerPage": |
|
407 [self.tr("Printer"), "preferences-printer.png", |
|
408 "PrinterPage", None, None], |
|
409 "securityPage": |
|
410 [self.tr("Security"), "preferences-security.png", |
|
411 "SecurityPage", None, None], |
|
412 |
|
413 "helpFlashCookieManagerPage": |
|
414 [self.tr("Flash Cookie Manager"), |
|
415 "flashCookie16.png", |
|
416 "HelpFlashCookieManagerPage", None, None], |
|
417 "helpVirusTotalPage": |
|
418 [self.tr("VirusTotal Interface"), "virustotal.png", |
|
419 "HelpVirusTotalPage", None, None], |
|
420 } |
|
421 |
390 elif displayMode == ConfigurationWidget.TrayStarterMode: |
422 elif displayMode == ConfigurationWidget.TrayStarterMode: |
391 self.configItems = { |
423 self.configItems = { |
392 # key : [display string, pixmap name, dialog module name or |
424 # key : [display string, pixmap name, dialog module name or |
393 # page creation function, parent key, |
425 # page creation function, parent key, |
394 # reference to configuration page (must always be last)] |
426 # reference to configuration page (must always be last)] |
444 self.buttonBox.accepted.connect(self.accept) |
476 self.buttonBox.accepted.connect(self.accept) |
445 self.buttonBox.rejected.connect(self.rejected) |
477 self.buttonBox.rejected.connect(self.rejected) |
446 |
478 |
447 if displayMode in [ConfigurationWidget.HelpBrowserMode, |
479 if displayMode in [ConfigurationWidget.HelpBrowserMode, |
448 ConfigurationWidget.TrayStarterMode, |
480 ConfigurationWidget.TrayStarterMode, |
449 ConfigurationWidget.HexEditorMode]: |
481 ConfigurationWidget.HexEditorMode, |
|
482 ConfigurationWidget.WebBrowserMode]: |
450 self.configListSearch.hide() |
483 self.configListSearch.hide() |
451 |
484 |
452 if displayMode not in [ConfigurationWidget.TrayStarterMode, |
485 if displayMode not in [ConfigurationWidget.TrayStarterMode, |
453 ConfigurationWidget.HexEditorMode]: |
486 ConfigurationWidget.HexEditorMode]: |
454 self.__initLexers() |
487 self.__initLexers() |
852 |
885 |
853 DefaultMode = ConfigurationWidget.DefaultMode |
886 DefaultMode = ConfigurationWidget.DefaultMode |
854 HelpBrowserMode = ConfigurationWidget.HelpBrowserMode |
887 HelpBrowserMode = ConfigurationWidget.HelpBrowserMode |
855 TrayStarterMode = ConfigurationWidget.TrayStarterMode |
888 TrayStarterMode = ConfigurationWidget.TrayStarterMode |
856 HexEditorMode = ConfigurationWidget.HexEditorMode |
889 HexEditorMode = ConfigurationWidget.HexEditorMode |
|
890 WebBrowserMode = ConfigurationWidget.WebBrowserMode |
857 |
891 |
858 def __init__(self, parent=None, name=None, modal=False, |
892 def __init__(self, parent=None, name=None, modal=False, |
859 fromEric=True, displayMode=ConfigurationWidget.DefaultMode, |
893 fromEric=True, displayMode=ConfigurationWidget.DefaultMode, |
860 expandedEntries=[]): |
894 expandedEntries=[]): |
861 """ |
895 """ |
865 @param name The name of this dialog. string |
899 @param name The name of this dialog. string |
866 @param modal Flag indicating a modal dialog. (boolean) |
900 @param modal Flag indicating a modal dialog. (boolean) |
867 @keyparam fromEric flag indicating a dialog generation from within the |
901 @keyparam fromEric flag indicating a dialog generation from within the |
868 eric6 ide (boolean) |
902 eric6 ide (boolean) |
869 @keyparam displayMode mode of the configuration dialog |
903 @keyparam displayMode mode of the configuration dialog |
870 (DefaultMode, HelpBrowserMode, TrayStarterMode, HexEditorMode) |
904 (DefaultMode, HelpBrowserMode, TrayStarterMode, HexEditorMode, |
|
905 WebBrowserMode) |
871 @keyparam expandedEntries list of entries to be shown expanded |
906 @keyparam expandedEntries list of entries to be shown expanded |
872 (list of strings) |
907 (list of strings) |
873 """ |
908 """ |
874 super(ConfigurationDialog, self).__init__(parent) |
909 super(ConfigurationDialog, self).__init__(parent) |
875 if name: |
910 if name: |