eric6/UI/UserInterface.py

branch
multi_processing
changeset 7564
787684e6f2f3
parent 7377
cc920e534ac0
parent 7533
88261c96484b
child 7627
812ee8c0a91a
--- a/eric6/UI/UserInterface.py	Sat May 02 14:35:03 2020 +0200
+++ b/eric6/UI/UserInterface.py	Sat May 02 14:45:06 2020 +0200
@@ -225,8 +225,8 @@
         self.capEditor = ""
         self.captionShowsFilename = Preferences.getUI("CaptionShowsFilename")
         
-        QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
-        self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
+        QApplication.setWindowIcon(UI.PixmapCache.getIcon("eric"))
+        self.setWindowIcon(UI.PixmapCache.getIcon("eric"))
         self.__setWindowCaption()
         
         # load the view profiles
@@ -822,7 +822,7 @@
         from Project.ProjectBrowser import ProjectBrowser
         self.projectBrowser = ProjectBrowser(self.project)
         self.lToolbox.addItem(self.projectBrowser,
-                              UI.PixmapCache.getIcon("projectViewer.png"),
+                              UI.PixmapCache.getIcon("projectViewer"),
                               self.tr("Project-Viewer"))
 
         # Create the multi project browser
@@ -831,7 +831,7 @@
         self.multiProjectBrowser = MultiProjectBrowser(self.multiProject,
                                                        self.project)
         self.lToolbox.addItem(self.multiProjectBrowser,
-                              UI.PixmapCache.getIcon("multiProjectViewer.png"),
+                              UI.PixmapCache.getIcon("multiProjectViewer"),
                               self.tr("Multiproject-Viewer"))
         
         if Preferences.getUI("ShowTemplateViewer"):
@@ -841,7 +841,7 @@
             self.templateViewer = TemplateViewer(None,
                                                  self.viewmanager)
             self.lToolbox.addItem(self.templateViewer,
-                                  UI.PixmapCache.getIcon("templateViewer.png"),
+                                  UI.PixmapCache.getIcon("templateViewer"),
                                   self.tr("Template-Viewer"))
         
         ####################################################
@@ -854,7 +854,7 @@
             from .CodeDocumentationViewer import CodeDocumentationViewer
             self.codeDocumentationViewer = CodeDocumentationViewer(self)
             self.rToolbox.addItem(self.codeDocumentationViewer,
-                                  UI.PixmapCache.getIcon("codeDocuViewer.png"),
+                                  UI.PixmapCache.getIcon("codeDocuViewer"),
                                   self.tr("Code Documentation Viewer"))
         
         # Create the debug viewer
@@ -862,7 +862,7 @@
         from Debugger.DebugViewer import DebugViewer
         self.debugViewer = DebugViewer(debugServer)
         self.rToolbox.addItem(self.debugViewer,
-                              UI.PixmapCache.getIcon("debugViewer.png"),
+                              UI.PixmapCache.getIcon("debugViewer"),
                               self.tr("Debug-Viewer"))
         
         if Preferences.getUI("ShowPyPIPackageManager"):
@@ -880,7 +880,7 @@
             from CondaInterface.CondaPackagesWidget import CondaPackagesWidget
             self.condaWidget = CondaPackagesWidget(self.condaInterface)
             self.rToolbox.addItem(self.condaWidget,
-                                  UI.PixmapCache.getIcon("miniconda.png"),
+                                  UI.PixmapCache.getIcon("miniconda"),
                                   self.tr("Conda"))
         
         if Preferences.getUI("ShowCooperation"):
@@ -889,7 +889,7 @@
             from Cooperation.ChatWidget import ChatWidget
             self.cooperation = ChatWidget(self)
             self.rToolbox.addItem(self.cooperation,
-                                  UI.PixmapCache.getIcon("cooperation.png"),
+                                  UI.PixmapCache.getIcon("cooperation"),
                                   self.tr("Cooperation"))
         
         if Preferences.getUI("ShowIrc"):
@@ -898,7 +898,7 @@
             from Network.IRC.IrcWidget import IrcWidget
             self.irc = IrcWidget(self)
             self.rToolbox.addItem(self.irc,
-                                  UI.PixmapCache.getIcon("irc.png"),
+                                  UI.PixmapCache.getIcon("irc"),
                                   self.tr("IRC"))
         
         if Preferences.getUI("ShowMicroPython"):
@@ -919,7 +919,7 @@
         from Tasks.TaskViewer import TaskViewer
         self.taskViewer = TaskViewer(None, self.project)
         self.hToolbox.addItem(self.taskViewer,
-                              UI.PixmapCache.getIcon("task.png"),
+                              UI.PixmapCache.getIcon("task"),
                               self.tr("Task-Viewer"))
 
         # Create the log viewer part of the user interface
@@ -927,7 +927,7 @@
         from .LogView import LogViewer
         self.logViewer = LogViewer(self)
         self.hToolbox.addItem(self.logViewer,
-                              UI.PixmapCache.getIcon("logViewer.png"),
+                              UI.PixmapCache.getIcon("logViewer"),
                               self.tr("Log-Viewer"))
 
         if Preferences.getUI("ShowFileBrowser"):
@@ -936,7 +936,7 @@
             from .Browser import Browser
             self.browser = Browser()
             self.lToolbox.addItem(self.browser,
-                                  UI.PixmapCache.getIcon("browser.png"),
+                                  UI.PixmapCache.getIcon("browser"),
                                   self.tr("File-Browser"))
         
         if Preferences.getUI("ShowSymbolsViewer"):
@@ -945,7 +945,7 @@
             from .SymbolsWidget import SymbolsWidget
             self.symbolsViewer = SymbolsWidget()
             self.lToolbox.addItem(self.symbolsViewer,
-                                  UI.PixmapCache.getIcon("symbols.png"),
+                                  UI.PixmapCache.getIcon("symbols"),
                                   self.tr("Symbols"))
         
         if Preferences.getUI("ShowNumbersViewer"):
@@ -954,7 +954,7 @@
             from .NumbersWidget import NumbersWidget
             self.numbersViewer = NumbersWidget()
             self.hToolbox.addItem(self.numbersViewer,
-                                  UI.PixmapCache.getIcon("numbers.png"),
+                                  UI.PixmapCache.getIcon("numbers"),
                                   self.tr("Numbers"))
         
         ####################################################
@@ -975,7 +975,7 @@
             debugServer, self.viewmanager, self.project, True)
         self.shell = self.shellAssembly.shell()
         self.__shellParent.widget().insertItem(
-            0, self.shellAssembly, UI.PixmapCache.getIcon("shell.png"),
+            0, self.shellAssembly, UI.PixmapCache.getIcon("shell"),
             self.tr("Shell"))
         
         ####################################################
@@ -1016,7 +1016,7 @@
         self.projectBrowser = ProjectBrowser(self.project)
         self.leftSidebar.addTab(
             self.projectBrowser,
-            UI.PixmapCache.getIcon("projectViewer.png"),
+            UI.PixmapCache.getIcon("projectViewer"),
             self.tr("Project-Viewer"))
 
         # Create the multi project browser
@@ -1026,7 +1026,7 @@
                                                        self.project)
         self.leftSidebar.addTab(
             self.multiProjectBrowser,
-            UI.PixmapCache.getIcon("multiProjectViewer.png"),
+            UI.PixmapCache.getIcon("multiProjectViewer"),
             self.tr("Multiproject-Viewer"))
 
         if Preferences.getUI("ShowTemplateViewer"):
@@ -1037,7 +1037,7 @@
                                                  self.viewmanager)
             self.leftSidebar.addTab(
                 self.templateViewer,
-                UI.PixmapCache.getIcon("templateViewer.png"),
+                UI.PixmapCache.getIcon("templateViewer"),
                 self.tr("Template-Viewer"))
 
         ####################################################
@@ -1051,7 +1051,7 @@
             self.codeDocumentationViewer = CodeDocumentationViewer(self)
             self.rightSidebar.addTab(
                 self.codeDocumentationViewer,
-                UI.PixmapCache.getIcon("codeDocuViewer.png"),
+                UI.PixmapCache.getIcon("codeDocuViewer"),
                 self.tr("Code Documentation Viewer"))
         
         # Create the debug viewer
@@ -1059,7 +1059,7 @@
         from Debugger.DebugViewer import DebugViewer
         self.debugViewer = DebugViewer(debugServer)
         self.rightSidebar.addTab(
-            self.debugViewer, UI.PixmapCache.getIcon("debugViewer.png"),
+            self.debugViewer, UI.PixmapCache.getIcon("debugViewer"),
             self.tr("Debug-Viewer"))
 
         if Preferences.getUI("ShowPyPIPackageManager"):
@@ -1077,7 +1077,7 @@
             from CondaInterface.CondaPackagesWidget import CondaPackagesWidget
             self.condaWidget = CondaPackagesWidget(self.condaInterface)
             self.rightSidebar.addTab(
-                self.condaWidget, UI.PixmapCache.getIcon("miniconda.png"),
+                self.condaWidget, UI.PixmapCache.getIcon("miniconda"),
                 self.tr("Conda"))
 
         if Preferences.getUI("ShowCooperation"):
@@ -1086,7 +1086,7 @@
             from Cooperation.ChatWidget import ChatWidget
             self.cooperation = ChatWidget(self)
             self.rightSidebar.addTab(
-                self.cooperation, UI.PixmapCache.getIcon("cooperation.png"),
+                self.cooperation, UI.PixmapCache.getIcon("cooperation"),
                 self.tr("Cooperation"))
         
         if Preferences.getUI("ShowIrc"):
@@ -1095,7 +1095,7 @@
             from Network.IRC.IrcWidget import IrcWidget
             self.irc = IrcWidget(self)
             self.rightSidebar.addTab(
-                self.irc, UI.PixmapCache.getIcon("irc.png"),
+                self.irc, UI.PixmapCache.getIcon("irc"),
                 self.tr("IRC"))
         
         if Preferences.getUI("ShowMicroPython"):
@@ -1116,7 +1116,7 @@
         from Tasks.TaskViewer import TaskViewer
         self.taskViewer = TaskViewer(None, self.project)
         self.bottomSidebar.addTab(self.taskViewer,
-                                  UI.PixmapCache.getIcon("task.png"),
+                                  UI.PixmapCache.getIcon("task"),
                                   self.tr("Task-Viewer"))
 
         # Create the log viewer part of the user interface
@@ -1124,7 +1124,7 @@
         from .LogView import LogViewer
         self.logViewer = LogViewer(self)
         self.bottomSidebar.addTab(self.logViewer,
-                                  UI.PixmapCache.getIcon("logViewer.png"),
+                                  UI.PixmapCache.getIcon("logViewer"),
                                   self.tr("Log-Viewer"))
 
         if Preferences.getUI("ShowFileBrowser"):
@@ -1133,7 +1133,7 @@
             from .Browser import Browser
             self.browser = Browser()
             self.leftSidebar.addTab(self.browser,
-                                    UI.PixmapCache.getIcon("browser.png"),
+                                    UI.PixmapCache.getIcon("browser"),
                                     self.tr("File-Browser"))
         
         if Preferences.getUI("ShowSymbolsViewer"):
@@ -1142,7 +1142,7 @@
             from .SymbolsWidget import SymbolsWidget
             self.symbolsViewer = SymbolsWidget()
             self.leftSidebar.addTab(self.symbolsViewer,
-                                    UI.PixmapCache.getIcon("symbols.png"),
+                                    UI.PixmapCache.getIcon("symbols"),
                                     self.tr("Symbols"))
         
         if Preferences.getUI("ShowNumbersViewer"):
@@ -1151,7 +1151,7 @@
             from .NumbersWidget import NumbersWidget
             self.numbersViewer = NumbersWidget()
             self.bottomSidebar.addTab(self.numbersViewer,
-                                      UI.PixmapCache.getIcon("numbers.png"),
+                                      UI.PixmapCache.getIcon("numbers"),
                                       self.tr("Numbers"))
         
         ####################################################
@@ -1172,7 +1172,7 @@
             debugServer, self.viewmanager, self.project, True)
         self.shell = self.shellAssembly.shell()
         self.__shellParent.insertTab(0, self.shellAssembly,
-                                     UI.PixmapCache.getIcon("shell.png"),
+                                     UI.PixmapCache.getIcon("shell"),
                                      self.tr("Shell"))
         
         ####################################################
@@ -1509,7 +1509,7 @@
         
         self.exitAct = E5Action(
             self.tr('Quit'),
-            UI.PixmapCache.getIcon("exit.png"),
+            UI.PixmapCache.getIcon("exit"),
             self.tr('&Quit'),
             QKeySequence(self.tr("Ctrl+Q", "File|Quit")),
             0, self, 'quit')
@@ -1526,7 +1526,7 @@
 
         self.restartAct = E5Action(
             self.tr('Restart'),
-            UI.PixmapCache.getIcon("restart.png"),
+            UI.PixmapCache.getIcon("restart"),
             self.tr('Restart'),
             QKeySequence(self.tr("Ctrl+Shift+Q", "File|Quit")),
             0, self, 'restart_eric')
@@ -1568,7 +1568,7 @@
 
         self.newWindowAct = E5Action(
             self.tr('New Window'),
-            UI.PixmapCache.getIcon("newWindow.png"),
+            UI.PixmapCache.getIcon("newWindow"),
             self.tr('New &Window'),
             QKeySequence(self.tr("Ctrl+Shift+N", "File|New Window")),
             0, self, 'new_window')
@@ -1587,7 +1587,7 @@
         
         self.setEditProfileAct = E5Action(
             self.tr('Edit Profile'),
-            UI.PixmapCache.getIcon("viewProfileEdit.png"),
+            UI.PixmapCache.getIcon("viewProfileEdit"),
             self.tr('Edit Profile'),
             0, 0,
             self.viewProfileActGrp, 'edit_profile', True)
@@ -1604,7 +1604,7 @@
         
         self.setDebugProfileAct = E5Action(
             self.tr('Debug Profile'),
-            UI.PixmapCache.getIcon("viewProfileDebug.png"),
+            UI.PixmapCache.getIcon("viewProfileDebug"),
             self.tr('Debug Profile'),
             0, 0,
             self.viewProfileActGrp, 'debug_profile', True)
@@ -1993,7 +1993,7 @@
         
         self.whatsThisAct = E5Action(
             self.tr('What\'s This?'),
-            UI.PixmapCache.getIcon("whatsThis.png"),
+            UI.PixmapCache.getIcon("whatsThis"),
             self.tr('&What\'s This?'),
             QKeySequence(self.tr("Shift+F1")),
             0, self, 'whatsThis')
@@ -2011,7 +2011,7 @@
 
         self.helpviewerAct = E5Action(
             self.tr('Helpviewer'),
-            UI.PixmapCache.getIcon("help.png"),
+            UI.PixmapCache.getIcon("help"),
             self.tr('&Helpviewer...'),
             QKeySequence(self.tr("F1")),
             0, self, 'helpviewer')
@@ -2115,7 +2115,7 @@
         
         self.utDialogAct = E5Action(
             self.tr('Unittest'),
-            UI.PixmapCache.getIcon("unittest.png"),
+            UI.PixmapCache.getIcon("unittest"),
             self.tr('&Unittest...'),
             0, 0, self.utActGrp, 'unittest')
         self.utDialogAct.setStatusTip(self.tr('Start unittest dialog'))
@@ -2129,7 +2129,7 @@
 
         self.utRestartAct = E5Action(
             self.tr('Unittest Restart'),
-            UI.PixmapCache.getIcon("unittestRestart.png"),
+            UI.PixmapCache.getIcon("unittestRestart"),
             self.tr('&Restart Unittest...'),
             0, 0, self.utActGrp, 'unittest_restart')
         self.utRestartAct.setStatusTip(self.tr('Restart last unittest'))
@@ -2143,7 +2143,7 @@
         
         self.utRerunFailedAct = E5Action(
             self.tr('Unittest Rerun Failed'),
-            UI.PixmapCache.getIcon("unittestRerunFailed.png"),
+            UI.PixmapCache.getIcon("unittestRerunFailed"),
             self.tr('Rerun Failed Tests...'),
             0, 0, self.utActGrp, 'unittest_rerun_failed')
         self.utRerunFailedAct.setStatusTip(self.tr(
@@ -2159,7 +2159,7 @@
         
         self.utScriptAct = E5Action(
             self.tr('Unittest Script'),
-            UI.PixmapCache.getIcon("unittestScript.png"),
+            UI.PixmapCache.getIcon("unittestScript"),
             self.tr('Unittest &Script...'),
             0, 0, self.utActGrp, 'unittest_script')
         self.utScriptAct.setStatusTip(self.tr(
@@ -2174,7 +2174,7 @@
         
         self.utProjectAct = E5Action(
             self.tr('Unittest Project'),
-            UI.PixmapCache.getIcon("unittestProject.png"),
+            UI.PixmapCache.getIcon("unittestProject"),
             self.tr('Unittest &Project...'),
             0, 0, self.utActGrp, 'unittest_project')
         self.utProjectAct.setStatusTip(self.tr(
@@ -2201,7 +2201,7 @@
         if os.path.exists(designerExe):
             self.designer4Act = E5Action(
                 self.tr('Qt-Designer'),
-                UI.PixmapCache.getIcon("designer4.png"),
+                UI.PixmapCache.getIcon("designer4"),
                 self.tr('Qt-&Designer...'),
                 0, 0, self, 'qt_designer4')
             self.designer4Act.setStatusTip(self.tr('Start Qt-Designer'))
@@ -2227,7 +2227,7 @@
         if os.path.exists(linguistExe):
             self.linguist4Act = E5Action(
                 self.tr('Qt-Linguist'),
-                UI.PixmapCache.getIcon("linguist4.png"),
+                UI.PixmapCache.getIcon("linguist4"),
                 self.tr('Qt-&Linguist...'),
                 0, 0, self, 'qt_linguist4')
             self.linguist4Act.setStatusTip(self.tr('Start Qt-Linguist'))
@@ -2242,7 +2242,7 @@
     
         self.uipreviewerAct = E5Action(
             self.tr('UI Previewer'),
-            UI.PixmapCache.getIcon("uiPreviewer.png"),
+            UI.PixmapCache.getIcon("uiPreviewer"),
             self.tr('&UI Previewer...'),
             0, 0, self, 'ui_previewer')
         self.uipreviewerAct.setStatusTip(self.tr('Start the UI Previewer'))
@@ -2255,7 +2255,7 @@
         
         self.trpreviewerAct = E5Action(
             self.tr('Translations Previewer'),
-            UI.PixmapCache.getIcon("trPreviewer.png"),
+            UI.PixmapCache.getIcon("trPreviewer"),
             self.tr('&Translations Previewer...'),
             0, 0, self, 'tr_previewer')
         self.trpreviewerAct.setStatusTip(self.tr(
@@ -2269,7 +2269,7 @@
         
         self.diffAct = E5Action(
             self.tr('Compare Files'),
-            UI.PixmapCache.getIcon("diffFiles.png"),
+            UI.PixmapCache.getIcon("diffFiles"),
             self.tr('&Compare Files...'),
             0, 0, self, 'diff_files')
         self.diffAct.setStatusTip(self.tr('Compare two files'))
@@ -2282,7 +2282,7 @@
 
         self.compareAct = E5Action(
             self.tr('Compare Files side by side'),
-            UI.PixmapCache.getIcon("compareFiles.png"),
+            UI.PixmapCache.getIcon("compareFiles"),
             self.tr('Compare &Files side by side...'),
             0, 0, self, 'compare_files')
         self.compareAct.setStatusTip(self.tr('Compare two files'))
@@ -2296,7 +2296,7 @@
 
         self.sqlBrowserAct = E5Action(
             self.tr('SQL Browser'),
-            UI.PixmapCache.getIcon("sqlBrowser.png"),
+            UI.PixmapCache.getIcon("sqlBrowser"),
             self.tr('SQL &Browser...'),
             0, 0, self, 'sql_browser')
         self.sqlBrowserAct.setStatusTip(self.tr('Browse a SQL database'))
@@ -2309,7 +2309,7 @@
 
         self.miniEditorAct = E5Action(
             self.tr('Mini Editor'),
-            UI.PixmapCache.getIcon("editor.png"),
+            UI.PixmapCache.getIcon("editor"),
             self.tr('Mini &Editor...'),
             0, 0, self, 'mini_editor')
         self.miniEditorAct.setStatusTip(self.tr('Mini Editor'))
@@ -2322,7 +2322,7 @@
 
         self.hexEditorAct = E5Action(
             self.tr('Hex Editor'),
-            UI.PixmapCache.getIcon("hexEditor.png"),
+            UI.PixmapCache.getIcon("hexEditor"),
             self.tr('&Hex Editor...'),
             0, 0, self, 'hex_editor')
         self.hexEditorAct.setStatusTip(self.tr(
@@ -2337,7 +2337,7 @@
 
         self.webBrowserAct = E5Action(
             self.tr('eric6 Web Browser'),
-            UI.PixmapCache.getIcon("ericWeb.png"),
+            UI.PixmapCache.getIcon("ericWeb"),
             self.tr('eric6 &Web Browser...'),
             0, 0, self, 'web_browser')
         self.webBrowserAct.setStatusTip(self.tr(
@@ -2353,7 +2353,7 @@
 
         self.iconEditorAct = E5Action(
             self.tr('Icon Editor'),
-            UI.PixmapCache.getIcon("iconEditor.png"),
+            UI.PixmapCache.getIcon("iconEditor"),
             self.tr('&Icon Editor...'),
             0, 0, self, 'icon_editor')
         self.iconEditorAct.setStatusTip(self.tr(
@@ -2367,7 +2367,7 @@
 
         self.snapshotAct = E5Action(
             self.tr('Snapshot'),
-            UI.PixmapCache.getIcon("ericSnap.png"),
+            UI.PixmapCache.getIcon("ericSnap"),
             self.tr('&Snapshot...'),
             0, 0, self, 'snapshot')
         self.snapshotAct.setStatusTip(self.tr(
@@ -2382,7 +2382,7 @@
 
         self.prefAct = E5Action(
             self.tr('Preferences'),
-            UI.PixmapCache.getIcon("configure.png"),
+            UI.PixmapCache.getIcon("configure"),
             self.tr('&Preferences...'),
             0, 0, self, 'preferences')
         self.prefAct.setStatusTip(self.tr(
@@ -2398,7 +2398,7 @@
 
         self.prefExportAct = E5Action(
             self.tr('Export Preferences'),
-            UI.PixmapCache.getIcon("configureExport.png"),
+            UI.PixmapCache.getIcon("configureExport"),
             self.tr('E&xport Preferences...'),
             0, 0, self, 'export_preferences')
         self.prefExportAct.setStatusTip(self.tr(
@@ -2412,7 +2412,7 @@
 
         self.prefImportAct = E5Action(
             self.tr('Import Preferences'),
-            UI.PixmapCache.getIcon("configureImport.png"),
+            UI.PixmapCache.getIcon("configureImport"),
             self.tr('I&mport Preferences...'),
             0, 0, self, 'import_preferences')
         self.prefImportAct.setStatusTip(self.tr(
@@ -2439,7 +2439,7 @@
 
         self.showExternalToolsAct = E5Action(
             self.tr('Show external tools'),
-            UI.PixmapCache.getIcon("showPrograms.png"),
+            UI.PixmapCache.getIcon("showPrograms"),
             self.tr('Show external &tools'),
             0, 0, self, 'show_external_tools')
         self.showExternalToolsAct.setStatusTip(self.tr(
@@ -2455,7 +2455,7 @@
 
         self.configViewProfilesAct = E5Action(
             self.tr('View Profiles'),
-            UI.PixmapCache.getIcon("configureViewProfiles.png"),
+            UI.PixmapCache.getIcon("configureViewProfiles"),
             self.tr('&View Profiles...'),
             0, 0, self, 'view_profiles')
         self.configViewProfilesAct.setStatusTip(self.tr(
@@ -2472,7 +2472,7 @@
 
         self.configToolBarsAct = E5Action(
             self.tr('Toolbars'),
-            UI.PixmapCache.getIcon("toolbarsConfigure.png"),
+            UI.PixmapCache.getIcon("toolbarsConfigure"),
             self.tr('Tool&bars...'),
             0, 0, self, 'configure_toolbars')
         self.configToolBarsAct.setStatusTip(self.tr('Configure toolbars'))
@@ -2487,7 +2487,7 @@
 
         self.shortcutsAct = E5Action(
             self.tr('Keyboard Shortcuts'),
-            UI.PixmapCache.getIcon("configureShortcuts.png"),
+            UI.PixmapCache.getIcon("configureShortcuts"),
             self.tr('Keyboard &Shortcuts...'),
             0, 0, self, 'keyboard_shortcuts')
         self.shortcutsAct.setStatusTip(self.tr(
@@ -2502,7 +2502,7 @@
 
         self.exportShortcutsAct = E5Action(
             self.tr('Export Keyboard Shortcuts'),
-            UI.PixmapCache.getIcon("exportShortcuts.png"),
+            UI.PixmapCache.getIcon("exportShortcuts"),
             self.tr('&Export Keyboard Shortcuts...'),
             0, 0, self, 'export_keyboard_shortcuts')
         self.exportShortcutsAct.setStatusTip(self.tr(
@@ -2516,7 +2516,7 @@
 
         self.importShortcutsAct = E5Action(
             self.tr('Import Keyboard Shortcuts'),
-            UI.PixmapCache.getIcon("importShortcuts.png"),
+            UI.PixmapCache.getIcon("importShortcuts"),
             self.tr('&Import Keyboard Shortcuts...'),
             0, 0, self, 'import_keyboard_shortcuts')
         self.importShortcutsAct.setStatusTip(self.tr(
@@ -2531,7 +2531,7 @@
         if SSL_AVAILABLE:
             self.certificatesAct = E5Action(
                 self.tr('Manage SSL Certificates'),
-                UI.PixmapCache.getIcon("certificates.png"),
+                UI.PixmapCache.getIcon("certificates"),
                 self.tr('Manage SSL Certificates...'),
                 0, 0, self, 'manage_ssl_certificates')
             self.certificatesAct.setStatusTip(self.tr(
@@ -2547,7 +2547,7 @@
         
         self.editMessageFilterAct = E5Action(
             self.tr('Edit Message Filters'),
-            UI.PixmapCache.getIcon("warning.png"),
+            UI.PixmapCache.getIcon("warning"),
             self.tr('Edit Message Filters...'),
             0, 0, self, 'manage_message_filters')
         self.editMessageFilterAct.setStatusTip(self.tr(
@@ -2564,7 +2564,7 @@
 
         self.clearPrivateDataAct = E5Action(
             self.tr('Clear private data'),
-            UI.PixmapCache.getIcon("clearPrivateData.png"),
+            UI.PixmapCache.getIcon("clearPrivateData"),
             self.tr('Clear private data'),
             0, 0,
             self, 'clear_private_data')
@@ -2618,7 +2618,7 @@
         
         self.pluginInfoAct = E5Action(
             self.tr('Plugin Infos'),
-            UI.PixmapCache.getIcon("plugin.png"),
+            UI.PixmapCache.getIcon("plugin"),
             self.tr('&Plugin Infos...'), 0, 0, self, 'plugin_infos')
         self.pluginInfoAct.setStatusTip(self.tr('Show Plugin Infos'))
         self.pluginInfoAct.setWhatsThis(self.tr(
@@ -2631,7 +2631,7 @@
         
         self.pluginInstallAct = E5Action(
             self.tr('Install Plugins'),
-            UI.PixmapCache.getIcon("pluginInstall.png"),
+            UI.PixmapCache.getIcon("pluginInstall"),
             self.tr('&Install Plugins...'),
             0, 0, self, 'plugin_install')
         self.pluginInstallAct.setStatusTip(self.tr('Install Plugins'))
@@ -2644,7 +2644,7 @@
         
         self.pluginDeinstallAct = E5Action(
             self.tr('Uninstall Plugin'),
-            UI.PixmapCache.getIcon("pluginUninstall.png"),
+            UI.PixmapCache.getIcon("pluginUninstall"),
             self.tr('&Uninstall Plugin...'),
             0, 0, self, 'plugin_deinstall')
         self.pluginDeinstallAct.setStatusTip(self.tr('Uninstall Plugin'))
@@ -2657,7 +2657,7 @@
 
         self.pluginRepoAct = E5Action(
             self.tr('Plugin Repository'),
-            UI.PixmapCache.getIcon("pluginRepository.png"),
+            UI.PixmapCache.getIcon("pluginRepository"),
             self.tr('Plugin &Repository...'),
             0, 0, self, 'plugin_repository')
         self.pluginRepoAct.setStatusTip(self.tr(
@@ -2672,7 +2672,7 @@
         
         self.virtualenvManagerAct = E5Action(
             self.tr('Virtualenv Manager'),
-            UI.PixmapCache.getIcon("virtualenv.png"),
+            UI.PixmapCache.getIcon("virtualenv"),
             self.tr('&Virtualenv Manager...'),
             0, 0, self,
             'virtualenv_manager')
@@ -2689,7 +2689,7 @@
         
         self.virtualenvConfigAct = E5Action(
             self.tr('Virtualenv Configurator'),
-            UI.PixmapCache.getIcon("virtualenvConfig.png"),
+            UI.PixmapCache.getIcon("virtualenvConfig"),
             self.tr('Virtualenv &Configurator...'),
             0, 0, self,
             'virtualenv_configurator')
@@ -3022,7 +3022,7 @@
         ##############################################################
         
         pluginsMenu = QMenu(self.tr('P&lugins'), self)
-        pluginsMenu.setIcon(UI.PixmapCache.getIcon("plugin.png"))
+        pluginsMenu.setIcon(UI.PixmapCache.getIcon("plugin"))
         pluginsMenu.setTearOffEnabled(True)
         pluginsMenu.addAction(self.pluginInfoAct)
         pluginsMenu.addAction(self.pluginInstallAct)
@@ -3459,9 +3459,9 @@
         ))
         
         self.sbZoom = E5ZoomWidget(
-            UI.PixmapCache.getPixmap("zoomOut.png"),
-            UI.PixmapCache.getPixmap("zoomIn.png"),
-            UI.PixmapCache.getPixmap("zoomReset.png"),
+            UI.PixmapCache.getPixmap("zoomOut"),
+            UI.PixmapCache.getPixmap("zoomIn"),
+            UI.PixmapCache.getPixmap("zoomReset"),
             self.__statusBar)
         self.__statusBar.addPermanentWidget(self.sbZoom)
         self.sbZoom.setWhatsThis(self.tr(
@@ -6077,8 +6077,6 @@
         """
         Private slot handling the end of the external web browser process.
         """
-        self.__webBrowserProcess and self.__webBrowserProcess.deleteLater()
-        
         self.__webBrowserProcess = None
         self.__webBrowserClient = None
     
@@ -7322,7 +7320,7 @@
             parent=self
         )
         self.__versionsDialog.setIconPixmap(
-            UI.PixmapCache.getPixmap("eric.png").scaled(64, 64))
+            UI.PixmapCache.getPixmap("eric").scaled(64, 64))
         self.__versionsDialog.show()
         
     def __sslErrors(self, reply, errors):

eric ide

mercurial