Changeset 3761

Timestamp:

08/26/08 23:00:12 (4 months ago)

Author:

andar

Message:

Fix setting file priorities on folders

Files:

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

branches/1.0.0_RC/ChangeLog

@@ -9 +9 @@
  GtkUI:
   * Sort filenames alphabetically in add torrent dialog
+  * Fix setting file priorities on folders
   
 Deluge 0.9.07 - "1.0.0_RC7" (18 August 2008)

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

@@ -344 +344 @@
     def get_selected_files(self):
         """Returns a list of file indexes that are selected"""
+        def get_iter_children(itr, selected):
+            i = self.treestore.iter_children(itr)
+            while i:
+                selected.append(self.treestore[i][5])
+                if self.treestore.iter_has_child(i):
+                    get_selected_files(i, selected)
+                i = self.treestore.iter_next(i)
+                    
         selected = []
         paths = self.listview.get_selection().get_selected_rows()[1]
         for path in paths:
-            selected.append(self.treestore.get_value(self.treestore.get_iter(path), 5))
-
+            i = self.treestore.get_iter(path)
+            selected.append(self.treestore[i][5])
+            if self.treestore.iter_has_child(i):
+                get_iter_children(i, selected)
+                
         return selected
-            
+
     def _on_get_torrent_files(self, status):
         self.files_list[self.torrent_id] = status["files"]
@@ -406 +417 @@
         def set_file_priority(model, path, iter, data):
             index = model.get_value(iter, 5)
-            if index in selected:
+            if index in selected and index != -1:
                 file_priorities.append((index, priority))
             elif index != -1:

trunk/deluge/ui/gtkui/files_tab.py

@@ -344 +344 @@
     def get_selected_files(self):
         """Returns a list of file indexes that are selected"""
+        def get_iter_children(itr, selected):
+            i = self.treestore.iter_children(itr)
+            while i:
+                selected.append(self.treestore[i][5])
+                if self.treestore.iter_has_child(i):
+                    get_selected_files(i, selected)
+                i = self.treestore.iter_next(i)
+                    
         selected = []
         paths = self.listview.get_selection().get_selected_rows()[1]
         for path in paths:
-            selected.append(self.treestore.get_value(self.treestore.get_iter(path), 5))
-
+            i = self.treestore.get_iter(path)
+            selected.append(self.treestore[i][5])
+            if self.treestore.iter_has_child(i):
+                get_iter_children(i, selected)
+                
         return selected
             
@@ -406 +417 @@
         def set_file_priority(model, path, iter, data):
             index = model.get_value(iter, 5)
-            if index in selected:
+            if index in selected and index != -1:
                 file_priorities.append((index, priority))
             elif index != -1: