Author: andar

Revision: 4055

Log:
        Re-add "Max Connections per Second" setting

Diff:
Modified: branches/1.0.0_RC/ChangeLog
===================================================================
--- branches/1.0.0_RC/ChangeLog 2008-10-18 23:50:29 UTC (rev 4054)
+++ branches/1.0.0_RC/ChangeLog 2008-10-18 23:55:27 UTC (rev 4055)
@@ -7,9 +7,11 @@
     would cause the torrent to be rechecked on every startup.
   * Fix ip filtering
 
+ GtkUI:
+  * Re-add the "Max Connections Per Second" option with a default setting of 20
+
  WebUI:
   * Fix White template for Opera
-  * Remove max connections per second from config dialog.
  
  Misc:
   * Deluge will now use a system libtorrent library if available.

Modified: branches/1.0.0_RC/deluge/core/core.py
===================================================================
--- branches/1.0.0_RC/deluge/core/core.py       2008-10-18 23:50:29 UTC (rev 
4054)
+++ branches/1.0.0_RC/deluge/core/core.py       2008-10-18 23:55:27 UTC (rev 
4055)
@@ -838,10 +838,7 @@
         self.session.set_max_half_open_connections(value)
         
     def _on_set_max_connections_per_second(self, key, value):
-        #self.settings.connection_speed = value
-        # We are hard-coding this value to 20 due to issues with having it
-        # unlimited by default.
-        self.settings.connection_speed = 20
+        self.settings.connection_speed = value
         self.session.set_settings(self.settings)
     
     def _on_ignore_limits_on_local_network(self, key, value):

Modified: branches/1.0.0_RC/deluge/ui/gtkui/glade/preferences_dialog.glade
===================================================================
--- branches/1.0.0_RC/deluge/ui/gtkui/glade/preferences_dialog.glade    
2008-10-18 23:50:29 UTC (rev 4054)
+++ branches/1.0.0_RC/deluge/ui/gtkui/glade/preferences_dialog.glade    
2008-10-18 23:55:27 UTC (rev 4055)
@@ -1306,6 +1306,7 @@
                                             </child>
                                             <child>
                                               <widget class="GtkLabel" 
id="label58">
+                                                <property 
name="visible">True</property>
                                                 <property 
name="xalign">0</property>
                                                 <property name="label" 
translatable="yes">Maximum Connection Attempts per Second:</property>
                                               </widget>
@@ -1333,6 +1334,7 @@
                                             </child>
                                             <child>
                                               <widget class="GtkSpinButton" 
id="spin_max_connections_per_second">
+                                                <property 
name="visible">True</property>
                                                 <property 
name="can_focus">True</property>
                                                 <property 
name="xalign">1</property>
                                                 <property name="adjustment">-1 
-1 9999 1 10 10</property>

Modified: branches/1.0.0_RC/deluge/ui/webui/config_tabs_deluge.py
===================================================================
--- branches/1.0.0_RC/deluge/ui/webui/config_tabs_deluge.py     2008-10-18 
23:50:29 UTC (rev 4054)
+++ branches/1.0.0_RC/deluge/ui/webui/config_tabs_deluge.py     2008-10-18 
23:55:27 UTC (rev 4055)
@@ -105,7 +105,7 @@
     max_upload_slots_global = forms.DelugeInt(_("Maximum Upload Slots"))
 
     max_half_open_connections = forms.DelugeInt(_("Maximum Half-Open 
Connections"))
-    #max_connections_per_second = forms.DelugeInt(_("Maximum Connection 
Attempts per Second"))
+    max_connections_per_second = forms.DelugeInt(_("Maximum Connection 
Attempts per Second"))
     ignore_limits_on_local_network = forms.CheckBox("Ignore limits on local 
network")
 
 



--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to