Ticket #1903: deluge_[1903]_superseeding_ui_devel_20140907.patch

deluge/ui/console/commands/manage.py

@@ -53 +53 @@
     "max_upload_slots": int,
     "private": bool,
     "prioritize_first_last": bool,
+    "super_seeding": bool,
     "is_auto_managed": bool,
     "stop_at_ratio": bool,
     "stop_ratio": float,

deluge/ui/console/modes/torrent_actions.py

@@ -50 +50 @@
     ("max_connections", int),
     ("max_upload_slots", int),
     ("prioritize_first_last", bool),
+    ("super_seeding", bool),
     ("sequential_download", bool),
     ("is_auto_managed", bool),
     ("stop_at_ratio", bool),
@@ -65 +66 @@
     "max_connections": "Max connections",
     "max_upload_slots": "Max upload slots",
     "prioritize_first_last": "Prioritize first/last pieces",
+    "super_seeding": "Super Seeding",
     "sequential_download": "Sequential download",
     "is_auto_managed": "Is auto managed?",
     "stop_at_ratio": "Stop at ratio",

deluge/ui/gtkui/glade/main_window.tabs.ui

@@ -1516 +1516 @@
                                   </packing>
                                 </child>
                                 <child>
+                                  <object class="GtkCheckButton" id="chk_super_seeding">
+                                    <property name="label" translatable="yes">Super Seeding</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_chk_toggled" swapped="no"/>
+                                  </object>
+                                  <packing>
+                                     <property name="expand">False</property>
+                                     <property name="fill">True</property>
+                                     <property name="position">3</property>
+                                     </packing>
+                                </child>
+                                <child>
                                   <object class="GtkCheckButton" id="chk_move_completed">
                                     <property name="label" translatable="yes">Move completed:</property>
                                     <property name="use_action_appearance">False</property>
@@ -1528 +1544 @@
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
-                                    <property name="position">3</property>
+                                    <property name="position">4</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1542 +1558 @@
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
-                                    <property name="position">4</property>
+                                    <property name="position">5</property>
                                   </packing>
                                 </child>
                               </object>

deluge/ui/gtkui/glade/torrent_menu.options.ui

@@ -79 +79 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="menuitem_super_seeding">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_action_appearance">False</property>
+        <property name="label" translatable="yes">_Super Seeding</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="menuitem_change_owner">
         <property name="visible">True</property>
         <property name="can_focus">False</property>

deluge/ui/gtkui/menubar.py

@@ -85 +85 @@
         submenu.append(item)
         submenu.show_all()
         self.builder.get_object("menuitem_auto_managed").set_submenu(submenu)
+        
+        submenu = gtk.Menu()
+        item = gtk.MenuItem(_("On"))
+        item.connect("activate", self.on_menuitem_set_super_seeding_on)
+        submenu.append(item)
+        item = gtk.MenuItem(_("Off"))
+        item.set_name("menuitem_super_seeding")
+        item.connect("activate", self.on_menuitem_set_super_seeding_off)
+        submenu.append(item)
+        submenu.show_all()
+        self.builder.get_object("menuitem_super_seeding").set_submenu(submenu)
 
         submenu = gtk.Menu()
         item = gtk.MenuItem(_("Disable"))
@@ -471 +482 @@
         client.core.set_torrent_options(component.get("TorrentView").get_selected_torrents(),
                                         {"stop_at_ratio": False})
 
+    def on_menuitem_set_super_seeding_off(self, widget):
+        client.core.set_torrent_options(component.get("TorrentView").get_selected_torrents(),
+                                        {"super_seeding": False})
+
+    def on_menuitem_set_super_seeding_on(self, widget):
+        client.core.set_torrent_options(component.get("TorrentView").get_selected_torrents(),
+                                        {"super_seeding": True})
+
     def on_menuitem_sidebar_zero_toggled(self, widget):
         self.config["sidebar_show_zero"] = widget.get_active()
         component.get("FilterTreeView").update()

deluge/ui/gtkui/options_tab.py

@@ -34 +34 @@
         self.chk_stop_at_ratio = builder.get_object("chk_stop_at_ratio")
         self.chk_remove_at_ratio = builder.get_object("chk_remove_at_ratio")
         self.spin_stop_ratio = builder.get_object("spin_stop_ratio")
+        self.chk_super_seeding = builder.get_object("chk_super_seeding")
         self.chk_move_completed = builder.get_object("chk_move_completed")
         self.entry_move_completed = builder.get_object("entry_move_completed")
         self.chk_shared = builder.get_object("chk_shared")
@@ -53 +54 @@
             "on_button_apply_clicked": self._on_button_apply_clicked,
             "on_chk_move_completed_toggled": self._on_chk_move_completed_toggled,
             "on_chk_stop_at_ratio_toggled": self._on_chk_stop_at_ratio_toggled,
+            "on_chk_super_seeding_toggled" : self._on_chk_super_seeding_toggled,
             "on_chk_toggled": self._on_chk_toggled,
             "on_spin_value_changed": self._on_spin_value_changed,
             "on_move_completed_file_set": self._on_move_completed_file_set
@@ -96 +98 @@
             "stop_at_ratio",
             "stop_ratio",
             "remove_at_ratio",
+            "super_seeding",
             "storage_mode",
             "sequential_download",
             "move_on_completed",
@@ -135 +138 @@
                 self.spin_stop_ratio.set_value(status["stop_ratio"])
             if status["remove_at_ratio"] != self.prev_status["remove_at_ratio"]:
                 self.chk_remove_at_ratio.set_active(status["remove_at_ratio"])
+            if status["super_seeding"] != self.prev_status["super_seeding"]:
+                self.chk_super_seeding.set_active(status["super_seeding"])
             if status["move_on_completed"] != self.prev_status["move_on_completed"]:
                 self.chk_move_completed.set_active(status["move_on_completed"])
             if status["move_on_completed_path"] != self.prev_status["move_on_completed_path"]:
@@ -210 +215 @@
             client.core.set_torrent_remove_at_ratio(
                 self.prev_torrent_id, self.chk_remove_at_ratio.get_active()
             )
+        if self.chk_super_seeding.get_active () != self.prev_status["super_seeding"]:
+            client.core.set_super_seeding(
+                self.prev_torrent_id, self.chk_super_seeding.get_active()
+            )
         if self.chk_move_completed.get_active() != self.prev_status["move_on_completed"]:
             client.core.set_torrent_move_completed(
                 self.prev_torrent_id, self.chk_move_completed.get_active()
@@ -238 +247 @@
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)
 
+    def _on_chk_super_seeding_toggled(self, widget):
+        value = widget.get_active()
+        
+        self.chk_super_seeding.set_sensitive(value)
+        
+        if not self.button_apply.is_sensitive():
+            self.button_apply.set_sensitive(True)
+
     def _on_chk_toggled(self, widget):
         if not self.button_apply.is_sensitive():
             self.button_apply.set_sensitive(True)

deluge/ui/web/js/deluge-all/Keys.js

@@ -104 +104 @@
         'max_download_speed', 'max_upload_speed', 'max_connections',
         'max_upload_slots','is_auto_managed', 'stop_at_ratio', 'stop_ratio',
         'remove_at_ratio', 'private', 'prioritize_first_last',
-        'move_completed', 'move_completed_path'
+        'move_completed', 'move_completed_path', 'super_seeding'
     ]
 };
 

deluge/ui/web/js/deluge-all/details/OptionsTab.js

@@ -68 +68 @@
                 'move_completed': false,
                 'move_completed_path': '',
                 'private': false,
-                'prioritize_first_last': false
+                'prioritize_first_last': false,
+                'super_seeding': false
             }
         });
 
@@ -309 +310 @@
             id: 'prioritize_first_last'
         });
 
+        this.fields.super_seeding = this.fieldsets.general.add({
+            fieldLabel: '',
+            labelSeparator: '',
+            boxLabel: _('Super Seeding'),
+            id: 'super_seeding'
+        });
+
         // Bind the fields so the options manager can manage them.
         for (var id in this.fields) {
             this.optionsManager.bind(id, this.fields[id]);

deluge/ui/web/js/gettext.js

@@ -746 +746 @@
 // QueuePage.js:175
 GetText.add('Stop seeding when share ratio reaches:', '${escape(_("Stop seeding when share ratio reaches:"))}')
 
+// OptionsTab.js:316
+GetText.add('Super Seeding', '${escape(_("Super Seeding"))}')
+
 // OtherPage.js:72
 GetText.add('System Information', '${escape(_("System Information"))}')