--- a/Preferences/ConfigurationDialog.py Sat Oct 19 12:28:12 2013 +0200 +++ b/Preferences/ConfigurationDialog.py Sat Oct 19 13:03:39 2013 +0200 @@ -118,192 +118,192 @@ # The dialog module must have the module function create to # create the configuration page. This must have the method # save to save the settings. - "applicationPage": \ + "applicationPage": [self.trUtf8("Application"), "preferences-application.png", "ApplicationPage", None, None], - "cooperationPage": \ + "cooperationPage": [self.trUtf8("Cooperation"), "preferences-cooperation.png", "CooperationPage", None, None], - "corbaPage": \ + "corbaPage": [self.trUtf8("CORBA"), "preferences-orbit.png", "CorbaPage", None, None], - "emailPage": \ + "emailPage": [self.trUtf8("Email"), "preferences-mail_generic.png", "EmailPage", None, None], - "graphicsPage": \ + "graphicsPage": [self.trUtf8("Graphics"), "preferences-graphics.png", "GraphicsPage", None, None], - "iconsPage": \ + "iconsPage": [self.trUtf8("Icons"), "preferences-icons.png", "IconsPage", None, None], - "ircPage": \ + "ircPage": [self.trUtf8("IRC"), "irc.png", "IrcPage", None, None], - "networkPage": \ + "networkPage": [self.trUtf8("Network"), "preferences-network.png", "NetworkPage", None, None], - "notificationsPage": \ + "notificationsPage": [self.trUtf8("Notifications"), "preferences-notifications.png", "NotificationsPage", None, None], - "pluginManagerPage": \ + "pluginManagerPage": [self.trUtf8("Plugin Manager"), "preferences-pluginmanager.png", "PluginManagerPage", None, None], - "printerPage": \ + "printerPage": [self.trUtf8("Printer"), "preferences-printer.png", "PrinterPage", None, None], - "pythonPage": \ + "pythonPage": [self.trUtf8("Python"), "preferences-python.png", "PythonPage", None, None], - "qtPage": \ + "qtPage": [self.trUtf8("Qt"), "preferences-qtlogo.png", "QtPage", None, None], - "securityPage": \ + "securityPage": [self.trUtf8("Security"), "preferences-security.png", "SecurityPage", None, None], - "shellPage": \ + "shellPage": [self.trUtf8("Shell"), "preferences-shell.png", "ShellPage", None, None], - "tasksPage": \ + "tasksPage": [self.trUtf8("Tasks"), "task.png", "TasksPage", None, None], - "templatesPage": \ + "templatesPage": [self.trUtf8("Templates"), "preferences-template.png", "TemplatesPage", None, None], - "trayStarterPage": \ + "trayStarterPage": [self.trUtf8("Tray Starter"), "erict.png", "TrayStarterPage", None, None], - "vcsPage": \ + "vcsPage": [self.trUtf8("Version Control Systems"), "preferences-vcs.png", "VcsPage", None, None], - "0debuggerPage": \ + "0debuggerPage": [self.trUtf8("Debugger"), "preferences-debugger.png", None, None, None], - "debuggerGeneralPage": \ + "debuggerGeneralPage": [self.trUtf8("General"), "preferences-debugger.png", "DebuggerGeneralPage", "0debuggerPage", None], - "debuggerPythonPage": \ + "debuggerPythonPage": [self.trUtf8("Python"), "preferences-pyDebugger.png", "DebuggerPythonPage", "0debuggerPage", None], - "debuggerPython3Page": \ + "debuggerPython3Page": [self.trUtf8("Python3"), "preferences-pyDebugger.png", "DebuggerPython3Page", "0debuggerPage", None], - "debuggerRubyPage": \ + "debuggerRubyPage": [self.trUtf8("Ruby"), "preferences-rbDebugger.png", "DebuggerRubyPage", "0debuggerPage", None], - "0editorPage": \ + "0editorPage": [self.trUtf8("Editor"), "preferences-editor.png", None, None, None], - "editorAPIsPage": \ + "editorAPIsPage": [self.trUtf8("APIs"), "preferences-api.png", "EditorAPIsPage", "0editorPage", None], - "editorAutocompletionPage": \ + "editorAutocompletionPage": [self.trUtf8("Autocompletion"), "preferences-autocompletion.png", "EditorAutocompletionPage", "0editorPage", None], - "editorAutocompletionQScintillaPage": \ + "editorAutocompletionQScintillaPage": [self.trUtf8("QScintilla"), "qscintilla.png", "EditorAutocompletionQScintillaPage", "editorAutocompletionPage", None], - "editorCalltipsPage": \ + "editorCalltipsPage": [self.trUtf8("Calltips"), "preferences-calltips.png", "EditorCalltipsPage", "0editorPage", None], - "editorCalltipsQScintillaPage": \ + "editorCalltipsQScintillaPage": [self.trUtf8("QScintilla"), "qscintilla.png", "EditorCalltipsQScintillaPage", "editorCalltipsPage", None], - "editorGeneralPage": \ + "editorGeneralPage": [self.trUtf8("General"), "preferences-general.png", "EditorGeneralPage", "0editorPage", None], - "editorFilePage": \ + "editorFilePage": [self.trUtf8("Filehandling"), "preferences-filehandling.png", "EditorFilePage", "0editorPage", None], - "editorSearchPage": \ + "editorSearchPage": [self.trUtf8("Searching"), "preferences-search.png", "EditorSearchPage", "0editorPage", None], - "editorSpellCheckingPage": \ + "editorSpellCheckingPage": [self.trUtf8("Spell checking"), "preferences-spellchecking.png", "EditorSpellCheckingPage", "0editorPage", None], - "editorStylesPage": \ + "editorStylesPage": [self.trUtf8("Style"), "preferences-styles.png", "EditorStylesPage", "0editorPage", None], - "editorSyntaxPage": \ + "editorSyntaxPage": [self.trUtf8("Code Checkers"), "preferences-debugger.png", "EditorSyntaxPage", "0editorPage", None], - "editorTypingPage": \ + "editorTypingPage": [self.trUtf8("Typing"), "preferences-typing.png", "EditorTypingPage", "0editorPage", None], - "editorExportersPage": \ + "editorExportersPage": [self.trUtf8("Exporters"), "preferences-exporters.png", "EditorExportersPage", "0editorPage", None], - "1editorLexerPage": \ + "1editorLexerPage": [self.trUtf8("Highlighters"), "preferences-highlighting-styles.png", None, "0editorPage", None], - "editorHighlightersPage": \ + "editorHighlightersPage": [self.trUtf8("Filetype Associations"), "preferences-highlighter-association.png", "EditorHighlightersPage", "1editorLexerPage", None], - "editorHighlightingStylesPage": \ + "editorHighlightingStylesPage": [self.trUtf8("Styles"), "preferences-highlighting-styles.png", "EditorHighlightingStylesPage", "1editorLexerPage", None], - "editorKeywordsPage": \ + "editorKeywordsPage": [self.trUtf8("Keywords"), "preferences-keywords.png", "EditorKeywordsPage", "1editorLexerPage", None], - "editorPropertiesPage": \ + "editorPropertiesPage": [self.trUtf8("Properties"), "preferences-properties.png", "EditorPropertiesPage", "1editorLexerPage", None], - "0helpPage": \ + "0helpPage": [self.trUtf8("Help"), "preferences-help.png", None, None, None], - "helpAppearancePage": \ + "helpAppearancePage": [self.trUtf8("Appearance"), "preferences-styles.png", "HelpAppearancePage", "0helpPage", None], - "helpDocumentationPage": \ + "helpDocumentationPage": [self.trUtf8("Help Documentation"), "preferences-helpdocumentation.png", "HelpDocumentationPage", "0helpPage", None], - "helpViewersPage": \ + "helpViewersPage": [self.trUtf8("Help Viewers"), "preferences-helpviewers.png", "HelpViewersPage", "0helpPage", None], - "helpVirusTotalPage": \ + "helpVirusTotalPage": [self.trUtf8("VirusTotal Interface"), "virustotal.png", "HelpVirusTotalPage", "0helpPage", None], - "helpWebBrowserPage": \ + "helpWebBrowserPage": [self.trUtf8("eric5 Web Browser"), "ericWeb.png", "HelpWebBrowserPage", "0helpPage", None], - "0projectPage": \ + "0projectPage": [self.trUtf8("Project"), "preferences-project.png", None, None, None], - "projectBrowserPage": \ + "projectBrowserPage": [self.trUtf8("Project Viewer"), "preferences-project.png", "ProjectBrowserPage", "0projectPage", None], - "projectPage": \ + "projectPage": [self.trUtf8("Project"), "preferences-project.png", "ProjectPage", "0projectPage", None], - "multiProjectPage": \ + "multiProjectPage": [self.trUtf8("Multiproject"), "preferences-multiproject.png", "MultiProjectPage", "0projectPage", None], - "0interfacePage": \ + "0interfacePage": [self.trUtf8("Interface"), "preferences-interface.png", None, None, None], - "interfacePage": \ + "interfacePage": [self.trUtf8("Interface"), "preferences-interface.png", "InterfacePage", "0interfacePage", None], - "viewmanagerPage": \ + "viewmanagerPage": [self.trUtf8("Viewmanager"), "preferences-viewmanager.png", "ViewmanagerPage", "0interfacePage", None], } @@ -318,33 +318,33 @@ # The dialog module must have the module function create to # create the configuration page. This must have the method # save to save the settings. - "interfacePage": \ + "interfacePage": [self.trUtf8("Interface"), "preferences-interface.png", "HelpInterfacePage", None, None], - "networkPage": \ + "networkPage": [self.trUtf8("Network"), "preferences-network.png", "NetworkPage", None, None], - "printerPage": \ + "printerPage": [self.trUtf8("Printer"), "preferences-printer.png", "PrinterPage", None, None], - "securityPage": \ + "securityPage": [self.trUtf8("Security"), "preferences-security.png", "SecurityPage", None, None], - "0helpPage": \ + "0helpPage": [self.trUtf8("Help"), "preferences-help.png", None, None, None], - "helpAppearancePage": \ + "helpAppearancePage": [self.trUtf8("Appearance"), "preferences-styles.png", "HelpAppearancePage", "0helpPage", None], - "helpDocumentationPage": \ + "helpDocumentationPage": [self.trUtf8("Help Documentation"), "preferences-helpdocumentation.png", "HelpDocumentationPage", "0helpPage", None], - "helpVirusTotalPage": \ + "helpVirusTotalPage": [self.trUtf8("VirusTotal Interface"), "virustotal.png", "HelpVirusTotalPage", "0helpPage", None], - "helpWebBrowserPage": \ + "helpWebBrowserPage": [self.trUtf8("eric5 Web Browser"), "ericWeb.png", "HelpWebBrowserPage", "0helpPage", None], } @@ -356,7 +356,7 @@ # The dialog module must have the module function create to # create the configuration page. This must have the method # save to save the settings. - "trayStarterPage": \ + "trayStarterPage": [self.trUtf8("Tray Starter"), "erict.png", "TrayStarterPage", None, None], } @@ -470,7 +470,7 @@ self.buttonBox = QDialogButtonBox(self) self.buttonBox.setOrientation(Qt.Horizontal) self.buttonBox.setStandardButtons( - QDialogButtonBox.Apply | QDialogButtonBox.Cancel | \ + QDialogButtonBox.Apply | QDialogButtonBox.Cancel | QDialogButtonBox.Ok | QDialogButtonBox.Reset) self.buttonBox.setObjectName("buttonBox") if not self.fromEric and \ @@ -625,11 +625,11 @@ ssize = self.scrollArea.size() if self.scrollArea.horizontalScrollBar(): ssize.setHeight( - ssize.height() - + ssize.height() - self.scrollArea.horizontalScrollBar().height() - 2) if self.scrollArea.verticalScrollBar(): ssize.setWidth( - ssize.width() - + ssize.width() - self.scrollArea.verticalScrollBar().width() - 2) psize = page.minimumSizeHint() self.configStack.resize(max(ssize.width(), psize.width()),