Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/E5Network/E5SslCertificatesDialog.py	Sat Jan 19 16:59:23 2013 +0100
+++ b/E5Network/E5SslCertificatesDialog.py	Sat Jan 19 17:24:35 2013 +0100
@@ -26,6 +26,7 @@
 
 import Preferences
 import Utilities
+import UI.PixmapCache
 
 
 class E5SslCertificatesDialog(QDialog, Ui_E5SslCertificatesDialog):
@@ -43,6 +44,16 @@
         super().__init__(parent)
         self.setupUi(self)
         
+        self.serversViewButton.setIcon(UI.PixmapCache.getIcon("certificates.png"))
+        self.serversDeleteButton.setIcon(UI.PixmapCache.getIcon("certificateDelete.png"))
+        self.serversExportButton.setIcon(UI.PixmapCache.getIcon("certificateExport.png"))
+        self.serversImportButton.setIcon(UI.PixmapCache.getIcon("certificateImport.png"))
+        
+        self.caViewButton.setIcon(UI.PixmapCache.getIcon("certificates.png"))
+        self.caDeleteButton.setIcon(UI.PixmapCache.getIcon("certificateDelete.png"))
+        self.caExportButton.setIcon(UI.PixmapCache.getIcon("certificateExport.png"))
+        self.caImportButton.setIcon(UI.PixmapCache.getIcon("certificateImport.png"))
+        
         self.__populateServerCertificatesTree()
         self.__populateCaCertificatesTree()
     

--- a/Helpviewer/HelpWindow.py	Sat Jan 19 16:59:23 2013 +0100
+++ b/Helpviewer/HelpWindow.py	Sat Jan 19 17:24:35 2013 +0100
@@ -1183,6 +1183,7 @@
         self.__actions.append(self.searchEnginesAct)
         
         self.passwordsAct = E5Action(self.trUtf8('Manage Saved Passwords'),
+                      UI.PixmapCache.getIcon("passwords.png"),
                       self.trUtf8('Manage Saved Passwords...'),
                       0, 0,
                       self, 'help_manage_passwords')
@@ -1228,6 +1229,7 @@
         
         if SSL_AVAILABLE:
             self.certificatesAct = E5Action(self.trUtf8('Manage SSL Certificates'),
+                          UI.PixmapCache.getIcon("certificates.png"),
                           self.trUtf8('Manage SSL Certificates...'),
                           0, 0,
                           self, 'help_manage_certificates')

--- a/UI/UserInterface.py	Sat Jan 19 16:59:23 2013 +0100
+++ b/UI/UserInterface.py	Sat Jan 19 17:24:35 2013 +0100
@@ -1914,14 +1914,15 @@
 
         if SSL_AVAILABLE:
             self.certificatesAct = E5Action(self.trUtf8('Manage SSL Certificates'),
-                          self.trUtf8('Manage SSL Certificates...'),
-                          0, 0,
-                          self, 'manage_ssl_certificates')
+                    UI.PixmapCache.getIcon("certificates.png"),
+                    self.trUtf8('Manage SSL Certificates...'),
+                    0, 0,
+                    self, 'manage_ssl_certificates')
             self.certificatesAct.setStatusTip(self.trUtf8(
-                    'Manage the saved SSL certificates'))
+                'Manage the saved SSL certificates'))
             self.certificatesAct.setWhatsThis(self.trUtf8(
-                    """<b>Manage SSL Certificates...</b>"""
-                    """<p>Opens a dialog to manage the saved SSL certificates.</p>"""
+                """<b>Manage SSL Certificates...</b>"""
+                """<p>Opens a dialog to manage the saved SSL certificates.</p>"""
             ))
             self.certificatesAct.triggered[()].connect(self.__showCertificatesDialog)
             self.actions.append(self.certificatesAct)

Binary file icons/default/certificateDelete.png has changed

Binary file icons/default/certificateExport.png has changed

Binary file icons/default/certificateImport.png has changed

Binary file icons/default/certificates.png has changed

Binary file icons/default/passwords.png has changed