le cambie el nombre a las clases y a los archivos y ahora el popup anda bien, rotar...

[z.facultad/75.42/plaqui.git] / Constructor / constructor.cpp

diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp
index 98f6ab9ad5d1b5ce03734e143796559c02db7c57..19a59729b57568536790cc718c04e9af3d365ffe 100644 (file)
--- a/Constructor/constructor.cpp
+++ b/Constructor/constructor.cpp
@@ -1,5 +1,4 @@
 //constructor.cpp
 //constructor.cpp

-

 #include "constructor.h"
 
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)
 #include "constructor.h"
 
 Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::Window(cobject)


@@ -10,10 +9,12 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        ico_canio = Gdk::Pixbuf::create_from_file("item_canio.png");
        ico_y     = Gdk::Pixbuf::create_from_file("item_y.png");
        ico_codo  = Gdk::Pixbuf::create_from_file("item_codo.png");
        ico_canio = Gdk::Pixbuf::create_from_file("item_canio.png");
        ico_y     = Gdk::Pixbuf::create_from_file("item_y.png");
        ico_codo  = Gdk::Pixbuf::create_from_file("item_codo.png");

+       ico_tanque  = Gdk::Pixbuf::create_from_file("item_tanque.png");

        
        refGlade->get_widget("btn_canio", btn_canio);
        refGlade->get_widget("btn_codo", btn_codo);
        refGlade->get_widget("btn_y", btn_y);
        
        refGlade->get_widget("btn_canio", btn_canio);
        refGlade->get_widget("btn_codo", btn_codo);
        refGlade->get_widget("btn_y", btn_y);

+       refGlade->get_widget("btn_tanque",btn_tanque);

        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        
        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        


@@ -28,14 +29,17 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        btn_canio->drag_source_set(listTargets);
        btn_y->drag_source_set(listTargets);
        btn_codo->drag_source_set(listTargets);
        btn_canio->drag_source_set(listTargets);
        btn_y->drag_source_set(listTargets);
        btn_codo->drag_source_set(listTargets);

+       btn_tanque->drag_source_set(listTargets);

        
        btn_canio->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_canio_drag_get));
        btn_y->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_y_drag_get));
        btn_codo->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_codo_drag_get));
        
        btn_canio->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_canio_drag_get));
        btn_y->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_y_drag_get));
        btn_codo->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_codo_drag_get));

+       btn_tanque->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_btn_tanque_drag_get));

        // Señales para cambiar el icono cuando empieza el drag.
        btn_canio->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_canio_drag_begin));
        btn_y->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_y_drag_begin));
        btn_codo->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_codo_drag_begin));
        // Señales para cambiar el icono cuando empieza el drag.
        btn_canio->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_canio_drag_begin));
        btn_y->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_y_drag_begin));
        btn_codo->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_codo_drag_begin));

+       btn_tanque->signal_drag_begin().connect( SigC::slot(*this, &Constructor::on_tanque_drag_begin));

        
        
        workplace->drag_dest_set(listTargets);
        
        
        workplace->drag_dest_set(listTargets);


@@ -52,12 +56,17 @@ void Constructor::on_btn_canio_drag_get(const Glib::RefPtr<Gdk::DragContext>& co
 
 void Constructor::on_btn_y_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
 
 void Constructor::on_btn_y_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {

-       gtk_selection_data_set(selection_data, selection_data->target,8,(const guchar*)"item_y.png",10);
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"item_y.png",10);

 }
 
 void Constructor::on_btn_codo_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {
 }
 
 void Constructor::on_btn_codo_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {

-       gtk_selection_data_set(selection_data, selection_data->target,8,(const guchar*)"item_codo.png",13);
+       gtk_selection_data_set(selection_data, selection_data->target, 8 ,(const guchar*)"item_codo.png",13);
+}
+
+void Constructor::on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
+{
+       gtk_selection_data_set(selection_data, selection_data->target, 8,(const guchar*)"item_tanque.png",15);

 }
 
 void Constructor::on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
 }
 
 void Constructor::on_canio_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)


@@ -74,7 +83,12 @@ void Constructor::on_codo_drag_begin(const Glib::RefPtr<Gdk::DragContext>& conte
 {
        context->set_icon(ico_codo, 5, 5); 
 }
 {
        context->set_icon(ico_codo, 5, 5); 
 }

-       
+
+void Constructor::on_tanque_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context)
+{
+       context->set_icon(ico_tanque, 5, 5); 
+}
+

 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {
        context->set_icon(item->get_image(), 5, 5);
 void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& context, CItem *item)
 {
        context->set_icon(item->get_image(), 5, 5);


@@ -82,7 +96,7 @@ void Constructor::on_item_drag_begin(const Glib::RefPtr<Gdk::DragContext>& conte
 
 void Constructor::on_item_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {      
 
 void Constructor::on_item_drag_data_get(const Glib::RefPtr<Gdk::DragContext>& context, GtkSelectionData* selection_data, guint info, guint time)
 {      

-       gtk_selection_data_set (selection_data, selection_data->target, 10, (const guchar*)"item_codo.png", 13);
+               gtk_selection_data_set (selection_data, selection_data->target, 10, (const guchar*)"item_codo.png", 13);

 }
 
 void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, GtkSelectionData* selection_data, guint info, guint time)
 }
 
 void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, GtkSelectionData* selection_data, guint info, guint time)


@@ -103,14 +117,16 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
   {
        CItem *a;
        if (strcmp((const char *)selection_data->data, "item_codo.png")==0) 
   {
        CItem *a;
        if (strcmp((const char *)selection_data->data, "item_codo.png")==0) 

-               a = Gtk::manage( new Codo() );
+               a = Gtk::manage( new Splitter() );

        else    if (strcmp((const char *)selection_data->data, "item_canio.png")==0) 
        else    if (strcmp((const char *)selection_data->data, "item_canio.png")==0) 

-                               a = Gtk::manage( new Canio() );
-                       else if (strcmp((const char *)selection_data->data, "item_y.png")==0) {
-                                               a = Gtk::manage( new Y() );
-                                       } else {
-                                                       a = Gtk::manage( new CItem((const char *)selection_data->data) );
-                                               }
+                               a = Gtk::manage( new Conduct() );
+                       else if (strcmp((const char *)selection_data->data, "item_y.png")==0) 
+                                               a = Gtk::manage( new Union() );
+                                       else if (strcmp((const char *)selection_data->data, "item_tanque.png")==0) 
+                                                               a = Gtk::manage( new Cistern() );
+                                                       else
+                                                               a = Gtk::manage( new CItem((const char *)selection_data->data) );
+                                               

                workplace->put(*a, i*32, j*32);
                // Seteo la lista de tipos de drags 
                a->drag_source_set(listTargets);
                workplace->put(*a, i*32, j*32);
                // Seteo la lista de tipos de drags 
                a->drag_source_set(listTargets);


@@ -123,7 +139,7 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                // y pedirle su ícono para mostrar cono icono durante la operacion,
                // Esto va a permitir, que si un widget tiene una imagen rotara o algo
                // raro se vea el widget tal cual.
                // y pedirle su ícono para mostrar cono icono durante la operacion,
                // Esto va a permitir, que si un widget tiene una imagen rotara o algo
                // raro se vea el widget tal cual.

-               //a->signal_drag_begin().connect(SigC::bind( SigC::slot(*this, &Constructor::on_item_drag_begin), a));
+               a->signal_drag_begin().connect(SigC::bind( SigC::slot(*this, &Constructor::on_item_drag_begin), a));

                a->show();      
                listaItems.push_back(a);
   }
                a->show();      
                listaItems.push_back(a);
   }