Author: andar
Revision: 5328
Log:
Fix #950 renaming a parent folder into multiple folders
Diff:
Modified: branches/1.1.0_RC/ChangeLog
===================================================================
--- branches/1.1.0_RC/ChangeLog 2009-05-30 01:32:25 UTC (rev 5327)
+++ branches/1.1.0_RC/ChangeLog 2009-06-01 19:29:15 UTC (rev 5328)
@@ -1,3 +1,6 @@
+=== Deluge 1.1.9 - (In Development) ===
+ * Fix #950 renaming a parent folder into multiple folders
+
=== Deluge 1.1.8 - (21 May 2009) ===
==== Core ====
* Fix pause all/resume all
Modified: branches/1.1.0_RC/deluge/ui/gtkui/files_tab.py
===================================================================
--- branches/1.1.0_RC/deluge/ui/gtkui/files_tab.py 2009-05-30 01:32:25 UTC
(rev 5327)
+++ branches/1.1.0_RC/deluge/ui/gtkui/files_tab.py 2009-06-01 19:29:15 UTC
(rev 5328)
@@ -738,9 +738,13 @@
# This means that a folder by this name already exists
self.reparent_iter(self.treestore.iter_children(old_folder_iter),
new_folder_iter)
else:
- new_folder_iter =
self.get_iter_at_path("/".join(new_split[:-1]) + "/")
- self.reparent_iter(old_folder_iter, new_folder_iter)
+ parent = old_folder_iter_parent
+ for ns in new_split[:-1]:
+ parent = self.treestore.append(parent, [ns + "/", 0, "",
0, 0, -1, gtk.STOCK_DIRECTORY])
+ self.treestore[old_folder_iter][0] = new_split[-1] + "/"
+ self.reparent_iter(old_folder_iter, parent)
+
# We need to check if the old_folder_iter_parent no longer has
children
# and if so, we delete it
self.remove_childless_folders(old_folder_iter_parent)
Modified: trunk/deluge/ui/gtkui/files_tab.py
===================================================================
--- trunk/deluge/ui/gtkui/files_tab.py 2009-05-30 01:32:25 UTC (rev 5327)
+++ trunk/deluge/ui/gtkui/files_tab.py 2009-06-01 19:29:15 UTC (rev 5328)
@@ -740,9 +740,13 @@
# This means that a folder by this name already exists
self.reparent_iter(self.treestore.iter_children(old_folder_iter),
new_folder_iter)
else:
- new_folder_iter =
self.get_iter_at_path("/".join(new_split[:-1]) + "/")
- self.reparent_iter(old_folder_iter, new_folder_iter)
+ parent = old_folder_iter_parent
+ for ns in new_split[:-1]:
+ parent = self.treestore.append(parent, [ns + "/", 0, "",
0, 0, -1, gtk.STOCK_DIRECTORY])
+ self.treestore[old_folder_iter][0] = new_split[-1] + "/"
+ self.reparent_iter(old_folder_iter, parent)
+
# We need to check if the old_folder_iter_parent no longer has
children
# and if so, we delete it
self.remove_childless_folders(old_folder_iter_parent)
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
