Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/NetworkPage.py	Sun Mar 30 22:00:14 2014 +0200
+++ b/Preferences/ConfigurationPages/NetworkPage.py	Thu Apr 03 23:05:31 2014 +0200
@@ -22,6 +22,7 @@
 
 import Preferences
 import Utilities
+import UI.PixmapCache
 
 
 class NetworkPage(ConfigurationPageBase, Ui_NetworkPage):
@@ -36,28 +37,30 @@
         self.setupUi(self)
         self.setObjectName("NetworkPage")
         
+        self.downloadDirButton.setIcon(UI.PixmapCache.getIcon("open.png"))
+        
         self.downloadDirCompleter = E5DirCompleter(self.downloadDirEdit)
         
         self.ftpProxyTypeCombo.addItem(
-            self.trUtf8("No FTP Proxy"), E5FtpProxyType.NoProxy)
+            self.tr("No FTP Proxy"), E5FtpProxyType.NoProxy)
         self.ftpProxyTypeCombo.addItem(
-            self.trUtf8("No Proxy Authentication required"),
+            self.tr("No Proxy Authentication required"),
             E5FtpProxyType.NonAuthorizing)
         self.ftpProxyTypeCombo.addItem(
-            self.trUtf8("User@Server"), E5FtpProxyType.UserAtServer)
+            self.tr("User@Server"), E5FtpProxyType.UserAtServer)
         self.ftpProxyTypeCombo.addItem(
-            self.trUtf8("SITE"), E5FtpProxyType.Site)
+            self.tr("SITE"), E5FtpProxyType.Site)
         self.ftpProxyTypeCombo.addItem(
-            self.trUtf8("OPEN"), E5FtpProxyType.Open)
+            self.tr("OPEN"), E5FtpProxyType.Open)
         self.ftpProxyTypeCombo.addItem(
-            self.trUtf8("User@Proxyuser@Server"),
+            self.tr("User@Proxyuser@Server"),
             E5FtpProxyType.UserAtProxyuserAtServer)
         self.ftpProxyTypeCombo.addItem(
-            self.trUtf8("Proxyuser@Server"), E5FtpProxyType.ProxyuserAtServer)
+            self.tr("Proxyuser@Server"), E5FtpProxyType.ProxyuserAtServer)
         self.ftpProxyTypeCombo.addItem(
-            self.trUtf8("AUTH and RESP"), E5FtpProxyType.AuthResp)
+            self.tr("AUTH and RESP"), E5FtpProxyType.AuthResp)
         self.ftpProxyTypeCombo.addItem(
-            self.trUtf8("Bluecoat Proxy"), E5FtpProxyType.Bluecoat)
+            self.tr("Bluecoat Proxy"), E5FtpProxyType.Bluecoat)
         
         # set initial values
         self.downloadDirEdit.setText(Preferences.getUI("DownloadPath"))
@@ -181,7 +184,7 @@
         """
         directory = E5FileDialog.getExistingDirectory(
             self,
-            self.trUtf8("Select download directory"),
+            self.tr("Select download directory"),
             self.downloadDirEdit.text(),
             E5FileDialog.Options(E5FileDialog.ShowDirsOnly))