X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/b7745587e67846353ff872a3bc3b3ea5a84706ac..4ac79a1d1914c71cd3d15853f4b15f5646885412:/Constructor/cistern.cpp?ds=sidebyside

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index 31bd367..c71b849 100644
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -4,10 +4,19 @@ Cistern::Cistern()
 {
 	imageE = Gdk::Pixbuf::create_from_file("tanque_e.png");
 	imageO = Gdk::Pixbuf::create_from_file("tanque_o.png");
-	null = Gdk::Pixbuf::create_from_file("null.png");
+	null = Gdk::Pixbuf::create_from_file("tanque_null.png");
 	imgActual = 0;
 	image = imageE;
 	set_size_request(image->get_width(), image->get_height());
+	
+	Glib::RefPtr<Gnome::Glade::Xml> ref;
+	try {
+		ref = Gnome::Glade::Xml::create("constructor.glade", "cistern_pty_wnd");
+	}
+	catch(const Gnome::Glade::XmlError &ex) {
+		std::cerr << ex.what() << std::endl;
+	}
+	ref->get_widget_derived("cistern_pty_wnd",property_wnd);
 }
 
 Cistern::~Cistern()
@@ -16,7 +25,6 @@ Cistern::~Cistern()
 
 bool Cistern::on_button_press_event(GdkEventButton *event)
 {
-	int w, h;
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==2)){
 		image = null; 
 		image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
@@ -29,14 +37,21 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
 				imgActual = 0;
 				image = imageE;			
 		}
-		get_size_request(w, h);
-		set_size_request(h, w);		
+		set_size_request(image->get_width(),image->get_height());
 		image->render_to_drawable(get_window(),get_style()->get_black_gc(),0,0,0,0,image->get_width(),image->get_height(),Gdk::RGB_DITHER_NONE,0,0);
 	}
+	
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
 		menu_popup.popup(event->button, event->time);
    		 return true; //It has been handled.
   	}
+	
+	if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){
+		if( property_wnd->is_open() == false ){
+			property_wnd->show();
+			property_wnd->set_open (true);
+		} 
+	}		
 	return true;
 }
 
@@ -47,3 +62,11 @@ void Cistern::on_menu_popup_rotar()
 		event.button = 2;
 	Cistern::on_button_press_event(&event);
 }
+
+void Cistern::on_menu_popup_propiedades()
+{
+	GdkEventButton event; 
+		event.type = GDK_2BUTTON_PRESS;
+		event.button = 1;
+	Cistern::on_button_press_event(&event);
+}