algunos cambios menores

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index 7fb292ddc0ad7cc3292d3791d48b139710303415..81d0fad80970b6d04c2c1f669af318f7776900fc 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -13,6 +13,7 @@ Cistern::Cistern()
        Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create("constructor.glade", "cistern_pty_wnd");
        ref->get_widget_derived("cistern_pty_wnd",cistern_pty_wnd);
        cistern_pty_wnd->cistern = this;
+       cistern_pty_wnd->set_title("Propiedades del Tanque");   
 }
 
 Cistern::~Cistern()

diff --git a/Constructor/conduct.cpp b/Constructor/conduct.cpp
index 61d39225f2fd774d04b52cf3231491c23e57aaeb..aa1c0922c2cfba26ae075ec2859bd937dda3ffaa 100644 (file)
--- a/Constructor/conduct.cpp
+++ b/Constructor/conduct.cpp
@@ -8,6 +8,7 @@ Conduct::Conduct()
        imgActual = 0;
        image = imageN;
        set_size_request(image->get_width(), image->get_height());
+       property_wnd->set_title("Propiedades del Tubo");
 }
 
 Conduct::~Conduct()

diff --git a/Constructor/splitter.cpp b/Constructor/splitter.cpp
index d017bc61564911edbe8bbcdcf086bbdda78f2dff..a9510de03795957dc02b40fdcfa329612cb74aad 100644 (file)
--- a/Constructor/splitter.cpp
+++ b/Constructor/splitter.cpp
@@ -10,6 +10,7 @@ Splitter::Splitter()
        imgActual = 0;
        image = imageO;
        set_size_request(image->get_width(), image->get_height());
+       property_wnd->set_title("Propiedades del Codo");        
 }
 
 Splitter::~Splitter()
@@ -43,12 +44,26 @@ bool Splitter::on_button_press_event(GdkEventButton *event)
                menu_popup.popup(event->button, event->time);
                 return true; //It has been handled.
        }
+       
+       if ((event->type == GDK_2BUTTON_PRESS) && ( event->button == 1)){
+               property_wnd->spin_caudal->set_value( caudal_max );
+               property_wnd->txt_item_name->set_text( name );
+               property_wnd->show();
+       }
        return true;
 }
 void Splitter::on_menu_popup_rotar()
 {
        GdkEventButton event; 
-               event.type = GDK_BUTTON_PRESS;
-               event.button = 2;
+       event.type = GDK_BUTTON_PRESS;
+       event.button = 2;
+       Splitter::on_button_press_event(&event);
+}
+
+void Splitter::on_menu_popup_propiedades()
+{
+       GdkEventButton event;
+       event.type = GDK_2BUTTON_PRESS;
+       event.button = 1;
        Splitter::on_button_press_event(&event);
 }

diff --git a/Constructor/splitter.h b/Constructor/splitter.h
index 3c443a060882fa66948bcdd488617c887580a83e..fac9059623c69c31064640a7e7709979d6a30ab3 100644 (file)
--- a/Constructor/splitter.h
+++ b/Constructor/splitter.h
@@ -9,6 +9,7 @@ class Splitter : public CItem {
                virtual ~Splitter();
                virtual bool on_button_press_event(GdkEventButton *event);
                virtual void on_menu_popup_rotar();
+               virtual void on_menu_popup_propiedades();
        private:
                int imgActual;  
        

diff --git a/Constructor/union.cpp b/Constructor/union.cpp
index d1395be5d20dc1f8c0d259f4614b0ce833f5a1f3..6c5301aadfeb6fdfe9b6597f2a597c6bd2008756 100644 (file)
--- a/Constructor/union.cpp
+++ b/Constructor/union.cpp
@@ -10,6 +10,7 @@ Union::Union()
        imgActual = 0;
        image = imageN;
        set_size_request(image->get_width(), image->get_height());
+       property_wnd->set_title("Propiedades del Empalme");
 }
 
 Union::~Union()
@@ -43,13 +44,27 @@ bool Union::on_button_press_event(GdkEventButton *event)
                menu_popup.popup(event->button, event->time);
                 return true; //It has been handled.
        }
+       
+       if ((event->type == GDK_2BUTTON_PRESS) && ( event->button == 1)){
+               property_wnd->spin_caudal->set_value( caudal_max );
+               property_wnd->txt_item_name->set_text( name );
+               property_wnd->show();
+       }
        return true;
 }
 
 void Union::on_menu_popup_rotar()
 {
        GdkEventButton event; 
-               event.type = GDK_BUTTON_PRESS;
-               event.button = 2;
+       event.type = GDK_BUTTON_PRESS;
+       event.button = 2;
+       Union::on_button_press_event(&event);
+}
+
+void Union::on_menu_popup_propiedades()
+{
+       GdkEventButton event; 
+       event.type = GDK_2BUTTON_PRESS;
+       event.button = 1;
        Union::on_button_press_event(&event);
 }

diff --git a/Constructor/union.h b/Constructor/union.h
index c5426e042f3ace636593b7524cf4e0790087cfb2..5f6279bb0f687832db142da12f507db81fe71722 100644 (file)
--- a/Constructor/union.h
+++ b/Constructor/union.h
@@ -10,6 +10,7 @@ class Union : public CItem {
                virtual ~Union();
                virtual bool on_button_press_event(GdkEventButton *event);
                virtual void on_menu_popup_rotar();
+               virtual void on_menu_popup_propiedades();
        private:
                int imgActual;