From: Nicolás Dimov <ndimov@gmail.com>
Date: Thu, 6 Nov 2003 19:38:52 +0000 (+0000)
Subject: cambios menores, la aplicacion no modifico su funcionamiento
X-Git-Tag: svn_import~338
X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/commitdiff_plain/43aa212b9816129a8a2b08a8848bca407ef0129f?ds=inline

cambios menores, la aplicacion no modifico su funcionamiento
---

diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp
index e2fddbf..af1263b 100644
--- a/Constructor/constructor.cpp
+++ b/Constructor/constructor.cpp
@@ -7,10 +7,10 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	set_title("Constructor");
 	
 	
-	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");
+	ico_canio = Gdk::Pixbuf::create_from_file("canio_n.png");
+	ico_y     = Gdk::Pixbuf::create_from_file("y_n.png");
+	ico_codo  = Gdk::Pixbuf::create_from_file("codo_o.png");
+	ico_tanque  = Gdk::Pixbuf::create_from_file("tanque_e.png");
 	
 	refGlade->get_widget("btn_canio", btn_canio);
 	refGlade->get_widget("btn_codo", btn_codo);
@@ -92,6 +92,7 @@ void Constructor::on_btn_tanque_drag_get(const Glib::RefPtr<Gdk::DragContext>& c
 
 void Constructor::on_main_menu_quit()
 {
+	delete this;
 	Gtk::Main::quit();
 	//hide();
 }
diff --git a/Constructor/constructor.glade b/Constructor/constructor.glade
index 56a5149..d3ae137 100644
--- a/Constructor/constructor.glade
+++ b/Constructor/constructor.glade
@@ -434,7 +434,7 @@
 		      <property name="visible">True</property>
 		      <property name="can_default">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">button2</property>
+		      <property name="label" translatable="yes">AND</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		    </widget>
@@ -445,7 +445,7 @@
 		      <property name="visible">True</property>
 		      <property name="can_default">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">button3</property>
+		      <property name="label" translatable="yes">OR</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		    </widget>
@@ -456,7 +456,7 @@
 		      <property name="visible">True</property>
 		      <property name="can_default">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">button4</property>
+		      <property name="label" translatable="yes">NOT</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		    </widget>
diff --git a/Constructor/ico_canio.png b/Constructor/ico_canio.png
index 002171a..8bcc89d 100644
Binary files a/Constructor/ico_canio.png and b/Constructor/ico_canio.png differ
diff --git a/Constructor/ico_codo.png b/Constructor/ico_codo.png
index 1fe314e..7e40501 100644
Binary files a/Constructor/ico_codo.png and b/Constructor/ico_codo.png differ
diff --git a/Constructor/ico_y.png b/Constructor/ico_y.png
index e054729..bcc082c 100644
Binary files a/Constructor/ico_y.png and b/Constructor/ico_y.png differ
diff --git a/Constructor/item.h b/Constructor/item.h
index 1e188c1..4bc193f 100644
--- a/Constructor/item.h
+++ b/Constructor/item.h
@@ -24,11 +24,11 @@ public:
 	virtual void on_menu_popup_eliminar();
 	virtual void on_menu_popup_conectar();
 	Glib::RefPtr<Gdk::Pixbuf> get_image() { return image; }
-	void set_position(int, int);
+	void set_position(int _x, int _y);
 	int get_position_x();
 	int get_position_y();
-	bool is_occupied_area(int, int);
-	void set_id(int);
+	bool is_occupied_area(int _a, int _b);
+	void set_id(int _id);
 	int get_id();
 	// habria que ocultarla..........................................
 	WorkPlace *workplace;
diff --git a/Constructor/splitter.h b/Constructor/splitter.h
index c814988..3c443a0 100644
--- a/Constructor/splitter.h
+++ b/Constructor/splitter.h
@@ -1,4 +1,3 @@
-// Splitter.h
 #ifndef _SPLITTER_H_
 #define _SPLITTER_H_
 
diff --git a/Constructor/union.cpp b/Constructor/union.cpp
index f1bee2f..d1395be 100644
--- a/Constructor/union.cpp
+++ b/Constructor/union.cpp
@@ -18,7 +18,6 @@ Union::~Union()
 
 bool Union::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);
diff --git a/Constructor/workplace.cpp b/Constructor/workplace.cpp
index 11a98d1..7c82cfe 100644
--- a/Constructor/workplace.cpp
+++ b/Constructor/workplace.cpp
@@ -4,7 +4,11 @@ WorkPlace::WorkPlace( BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::
 {
 }
 
-bool WorkPlace::on_expose_event(GdkEventExpose *e)
+WorkPlace::~WorkPlace()
+{
+}
+
+bool WorkPlace::on_expose_event(GdkEventExpose *event)
 {
 	int x, y;
 	for(x=0; x<get_width(); x+=32) 
@@ -16,7 +20,7 @@ bool WorkPlace::on_expose_event(GdkEventExpose *e)
 			get_window()->draw_point (get_style()->get_black_gc(), x-1,y);
 		}
 	//TODO recorer la lista_lineas y dibujar todas		
-	get_window()->draw_line (get_style()->get_black_gc(), temp.x,temp.y,temp.w,temp.z);	
+	get_window()->draw_line (get_style()->get_black_gc(), temp.x,temp.y,temp.w,temp.z);
 	return true;
 }
 
diff --git a/Constructor/workplace.h b/Constructor/workplace.h
index 67ba45e..005eb8d 100644
--- a/Constructor/workplace.h
+++ b/Constructor/workplace.h
@@ -1,4 +1,3 @@
-
 #ifndef _H_WORKPLACE_
 #define _H_WORKPLACE_
 
@@ -17,14 +16,14 @@ class CItem;
 class WorkPlace:public Gtk::Fixed {
 	public:
 		WorkPlace(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade);
-		virtual ~WorkPlace() {}
-		virtual bool on_expose_event(GdkEventExpose *);
+		virtual ~WorkPlace();
+		virtual bool on_expose_event(GdkEventExpose *event);
 		virtual bool on_button_press_event(GdkEventButton *event);
 		virtual bool on_button_release_event(GdkEventButton *event);
-		void delete_item(int);	
-		std::list<CItem *> *listaItems;
+		void delete_item(int _id);	
 		std::list<t_line> lista_lineas;
 		t_line temp;
+		std::list<CItem *> *listaItems;
 };
 
 #endif