Fixing drag-and-drop bug

3 files changed, 27 insertions, 11 deletions

diff --git a/cover.py b/cover.py
index 8289806..ed2bffd 100644
--- a/cover.py
+++ b/cover.py
@@ -23,11 +23,16 @@
 
 import os
 from gettext import gettext as _
+import gobject
 import gtk
 from widgets import ImageEditor
 
 
 class CoverSlide(gtk.VPaned):
+    __gsignals__ = {'get-image-from-galery': (gobject.SIGNAL_RUN_LAST,
+                                              gobject.TYPE_PYOBJECT,
+                                              (gobject.TYPE_STRING,))}
+
     def set_copyright(self, title):
         self._copyright.set_text(title)
 
@@ -155,7 +160,7 @@ class CoverSlide(gtk.VPaned):
             self.cover_image_editor.set_image(cover_image)
 
     def __init__(self):
-        super(CoverSlide, self).__init__()
+        gtk.VPaned.__init__(self)
         self.main_vbox = gtk.VBox()
         self.pack1(self.main_vbox)
         hbox = gtk.HBox()
@@ -251,15 +256,26 @@ class CoverSlide(gtk.VPaned):
         self.images_notebook.append_page(label1)
 
         self.top_image_editor = ImageEditor()
-
+        self.top_image_editor.connect('get-image-from-galery',
+                                      lambda w,
+                                        arg: self.emit('get-image-from-galery',
+                                                      arg))
         self.images_notebook.append_page(self.top_image_editor)
         self.images_check_model.append([False,
                                   "Display an image on the top of the slides"])
         self.background_image_editor = ImageEditor()
+        self.background_image_editor.connect('get-image-from-galery',
+                                      lambda w,
+                                        arg: self.emit('get-image-from-galery',
+                                                      arg))
         self.images_check_model.append([False,
                         "Display a background image in the slides you choose"])
         self.images_notebook.append_page(self.background_image_editor)
         self.cover_image_editor = ImageEditor()
+        self.cover_image_editor.connect('get-image-from-galery',
+                                         lambda w,
+                                        arg: self.emit('get-image-from-galery',
+                                                       arg))
         self.images_check_model.append([False,
                                    "Display an image at the cover slide"])
         self.images_notebook.append_page(self.cover_image_editor)
diff --git a/present.py b/present.py
index 52c0f8e..c2879e6 100755
--- a/present.py
+++ b/present.py
@@ -46,10 +46,10 @@ class PresentActivity(activity.Activity):
         self.images_galery.show()
         self.set_tray(self.images_galery, gtk.POS_RIGHT)
         self.slides = SlidesNotebook()
-        self.slides.cover.top_image_editor.connect("get-image-from-galery",
-                                              self.images_galery.image_request)
-        self.slides.cover.top_image_editor.connect("load-toolbar",
-                                            toolbarbox.load_image_toolbar)
+        self.slides.cover.connect("get-image-from-galery",
+                                  self.images_galery.image_request)
+        #self.slides.cover.top_image_editor.connect("load-toolbar",
+        #                                    toolbarbox.load_image_toolbar)
         self.set_canvas(self.slides)
         self.slides.show_all()
         self.show()
diff --git a/widgets.py b/widgets.py
index 0a45a74..9012245 100644
--- a/widgets.py
+++ b/widgets.py
@@ -96,11 +96,11 @@ class ImageEditor(gtk.Notebook):
         self.image_widget.set_from_pixbuf(self.pixbuf)
         self.set_current_page(1)
         self.toolbar.set_sensitive(True)
-        self.width_entry.set_value(self.image.width)
-        self.height_entry.set_value(self.image.height)
-        self.link_values_button.set_active(True)
-        self.width = self.image.width
-        self.height = self.image.height
+        #self.width_entry.set_value(self.image.width)
+        #self.height_entry.set_value(self.image.height)
+        #self.link_values_button.set_active(True)
+        #self.width = self.image.width
+        #self.height = self.image.height
 
     def link_unlink(self, widget):
         active = widget.get_active()