--- a/PreferencesDialog.py	Wed Nov 17 21:22:31 2010 +0100
+++ b/PreferencesDialog.py	Thu Nov 18 12:14:41 2010 +0100
@@ -11,17 +11,24 @@
         self.ui = Ui_Preferences()
         self.ui.setupUi(self)
         self.fillUi()
-        
+
     def fillUi(self):
         maximized = self.preferences.startMaximized()
         self.ui.startMaximized.setChecked(maximized)
-        
+
         hideRead = self.preferences.hideReadFeedEntries()
         self.ui.hideReadFeedEntries.setChecked(hideRead)
-        
+
         showOnlyUnreadFeeds = self.preferences.showOnlyUnreadFeeds()
         self.ui.showOnlyUnreadFeeds.setChecked(showOnlyUnreadFeeds)
 
+        self.fillProxySettings()
+
+    def fillProxySettings(self):
+        if self.preferences.isProxyConfigured():
+            self.ui.proxyHost.setText(self.preferences.proxyHost())
+            self.ui.proxyPort.setText(str(self.preferences.proxyPort()))
+
     def startMaximizedChanged(self, change):
         if change:
             self.preferences.setStartMaximized(True)
@@ -40,12 +47,19 @@
         else:
             self.preferences.setShowOnlyUnreadFeeds(False)
 
+    def storeProxySettings(self):
+        proxyHost = str(self.ui.proxyHost.text())
+        self.preferences.setProxyHost(proxyHost)
+
+        proxyPort = int(self.ui.proxyPort.text())
+        self.preferences.setProxyPort(proxyPort)
+
     def accept(self):
+        self.storeProxySettings()
         self.session.commit()
         QtGui.QDialog.accept(self)
-        
+
     def reject(self):
         self.session.rollback()
         QtGui.QDialog.reject(self)
-        
-        
\ No newline at end of file
+