Merge lp:~simar/clicompanion/fix-738260 into lp:clicompanion

[Gursimran singh]

There was a built in functionality of drap and drop in pygtk treeview widget. So I removed all the drag and drop code and used that functionality. It fits nicely.

        self.treeview.set_reorderable(True)

[Duane Hinnen (duanedesign)]

I do not know how you figured this out, but great job. This is a much much better solution for adding drag and drop. Good work!

review: Approve

=== modified file 'clicompanionlib/controller.py'
--- clicompanionlib/controller.py	2011-03-29 17:31:11 +0000
+++ clicompanionlib/controller.py	2011-03-31 11:15:53 +0000
@@ -641,45 +641,3 @@
         ## not work.
         dialog.destroy()
         
-        
-    ## drag and drop
-    def drag_data_get_data(self, treeview, context, selection, target_id,
-                           etime):
-        treeselection = treeview.get_selection()
-        model, iter = treeselection.get_selected()
-        data = model.get(iter, 0,1,2)
-        
-
-        selection.set(selection.target, 8, str(data))
-    ## drag and drop
-    def drag_data_received_data(self, treeview, context, x, y, selection,
-                                info, etime):
-        model = treeview.get_model()
-        data_selection = selection.data
-        data = str(data_selection).split(',')
-        print data[0][2:-1]
-        print data[1][2:-1]
-        print data[2][2:-2]
-        drop_info = treeview.get_dest_row_at_pos(x, y)
-        if drop_info:
-            path, position = drop_info
-            iter = model.get_iter(path)
-            if (position == gtk.TREE_VIEW_DROP_BEFORE
-                or position == gtk.TREE_VIEW_DROP_INTO_OR_BEFORE):
-                model.set(iter, 0, data[0][2:-1],1, data[1][2:-1],2, data[2][2:-2])
-            else:
-                model.set(iter, 0, data[0][2:-1],1, data[1][2:-1],2, data[2][2:-2])
-        else:
-            model.append([data])
-        if context.action == gtk.gdk.ACTION_MOVE:
-            context.finish(True, True, etime)
-        return
-        
-        
-
-
-
-
-
-            
-            

=== modified file 'clicompanionlib/view.py'
--- clicompanionlib/view.py	2011-03-29 17:31:11 +0000
+++ clicompanionlib/view.py	2011-03-31 11:15:53 +0000
@@ -255,9 +255,16 @@
         
         ''' set treeview model and put treeview in the scrolled window
         and the scrolled window in the expander. '''
+<<<<<<< TREE
         self.treeview.set_model(self.liststore)
         self.scrolledwindow.add(self.treeview)
         self.expander.add(self.scrolledwindow)
+=======
+        treeview.set_model(self.liststore)
+        treeview.set_reorderable(True)
+        scrolledwindow.add(treeview)
+        expander.add(scrolledwindow)
+>>>>>>> MERGE-SOURCE
         #self.window.show_all()
 
         ## instantiate tabs
@@ -299,6 +306,7 @@
         ## double-click
         self.treeview.connect("button-press-event", treeview_clicked)
         #press enter to run command
+<<<<<<< TREE
         self.treeview.connect("key-press-event", treeview_button)
         
         ##drag and drop
@@ -307,6 +315,10 @@
         self.treeview.connect("drag_data_get", actions.drag_data_get_data)
         self.treeview.connect("drag_data_received", actions.drag_data_received_data)
         
+=======
+        treeview.connect("key-press-event", treeview_button)
+                
+>>>>>>> MERGE-SOURCE
         global menu_search_hbox
         
         ## The search section