Changeset 3771

Timestamp:

08/28/08 20:42:19 (4 months ago)

Author:

andar

Message:

Fix add torrent dialog closing preventing another dialog from being
shown

Files:

• branches/1.0.0_RC/ChangeLog (modified) (1 diff)
• branches/1.0.0_RC/deluge/ui/gtkui/addtorrentdialog.py (modified) (2 diffs)
• trunk/deluge/ui/gtkui/addtorrentdialog.py (modified) (4 diffs)

branches/1.0.0_RC/ChangeLog

@@ +1 @@
+Deluge 0.9.09 - "1.0.0_RC9" (In Development)
+ GtkUI:
+  * Fix add torrent dialog closing preventing another dialog from being shown
+
 Deluge 0.9.08 - "1.0.0_RC8" (27 August 2008)
  Core:

branches/1.0.0_RC/deluge/ui/gtkui/addtorrentdialog.py

@@ -55 +55 @@
         
         self.dialog = self.glade.get_widget("dialog_add_torrent")
-        
+
+        self.dialog.connect("delete-event", self._on_delete_event)
+
         self.glade.signal_autoconnect({
             "on_button_file_clicked": self._on_button_file_clicked,
@@ -615 +617 @@
         del self.options[model.get_value(row, 0)]
         self.set_default_options()
+
+    def _on_delete_event(self, widget, event):
+        self.hide()
+        return True

trunk/deluge/ui/gtkui/addtorrentdialog.py

@@ -56 +56 @@
         self.dialog = self.glade.get_widget("dialog_add_torrent")
         
+        self.dialog.connect("delete-event", self._on_delete_event)
+        
         self.glade.signal_autoconnect({
             "on_button_file_clicked": self._on_button_file_clicked,
@@ -299 +301 @@
             options["compact_allocation"])
         self.glade.get_widget("spin_maxdown").set_value(
-            options["max_download_speed_per_torrent"])
+            options["max_download_speed"])
         self.glade.get_widget("spin_maxup").set_value(
-            options["max_upload_speed_per_torrent"])
+            options["max_upload_speed"])
         self.glade.get_widget("spin_maxconnections").set_value(
-            options["max_connections_per_torrent"])
+            options["max_connections"])
         self.glade.get_widget("spin_maxupslots").set_value(
-            options["max_upload_slots_per_torrent"])
+            options["max_upload_slots"])
         self.glade.get_widget("chk_paused").set_active(
             options["add_paused"])
@@ -330 +332 @@
         options["compact_allocation"] = \
             self.glade.get_widget("radio_compact").get_active()
-        options["max_download_speed_per_torrent"] = \
+        options["max_download_speed"] = \
             self.glade.get_widget("spin_maxdown").get_value()
-        options["max_upload_speed_per_torrent"] = \
+        options["max_upload_speed"] = \
             self.glade.get_widget("spin_maxup").get_value()
-        options["max_connections_per_torrent"] = \
+        options["max_connections"] = \
             self.glade.get_widget("spin_maxconnections").get_value_as_int()
-        options["max_upload_slots_per_torrent"] = \
+        options["max_upload_slots"] = \
             self.glade.get_widget("spin_maxupslots").get_value_as_int()
         options["add_paused"] = \
@@ -615 +617 @@
         del self.options[model.get_value(row, 0)]
         self.set_default_options()
+
+    def _on_delete_event(self, widget, event):
+        self.hide()
+        return True