From 43aa212b9816129a8a2b08a8848bca407ef0129f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Nicol=C3=A1s=20Dimov?= <ndimov@gmail.com>
Date: Thu, 6 Nov 2003 19:38:52 +0000
Subject: [PATCH] cambios menores, la aplicacion no modifico su funcionamiento

---
 Constructor/constructor.cpp   |   9 +++++----
 Constructor/constructor.glade |   6 +++---
 Constructor/ico_canio.png     | Bin 718 -> 1724 bytes
 Constructor/ico_codo.png      | Bin 1743 -> 2784 bytes
 Constructor/ico_y.png         | Bin 2126 -> 2758 bytes
 Constructor/item.h            |   6 +++---
 Constructor/splitter.h        |   1 -
 Constructor/union.cpp         |   1 -
 Constructor/workplace.cpp     |   8 ++++++--
 Constructor/workplace.h       |   9 ++++-----
 10 files changed, 21 insertions(+), 19 deletions(-)

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 002171afc626d4d9982acc4be0f6a589a08ae2ad..8bcc89d3369277c52d50599476e97ec152accf66 100644
GIT binary patch
delta 1657
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
DvsVjd

delta 643
zcmV-}0(||v4bBBIiBL{Q4GJ0x0000DNk~Le0000G0000m2nGNE02p8TR{#J21ZP1_
zK>z@;j|==^1(6{!2?`hl3JnA_pBs@|D}MqaNkl<Zc-p;|OK#La5Qe|%mq$4T*+&zx
z10giC2zNkHhQ~>87R)^&ByPZl4bDUYBpxCICjf~%kWI0O+v%BUkIguuCEG2l{JZM^
ztGY@6Wx#R(<M9E9cgKje7~^oxUq6k-8jCdsXD!ZJtTR|^SzKIDRaFgec);xGF@Gim
zoF5Uw9)%xK*g$ZB!h4F~85IFvID81q=X0v6!ff~?H$iD~mt-f2`6hr0BAc;l4T7#x
zW^$&gDYdfVfvlmM9J3N{LPjKQi+HzX8z12ga2ofsXUE*T|A5KE2}h5PSS%I*6>tVj
zlRW@s;z<eU+jnpD)ACY({rs(0e}AqbD`gT#*~&p%yt!p+cP7c-*Xe{+;-k$3m_~qU
z{qn_@jAG4Z8Ue~gG|8k+PUU!&TR4zjGMa7zWmf>{r9`I(vU3P3z4E*rK(tqpba0@<
zRFEE08V0Vd0IEYdknUVEy-HaJW#XV(&|xIXdWHY93PWWaSdG$)#;qjYQhx~l0iaAo
z*K8t5HbFF=%2j=l^v1fJvqD6h3aBE$d9E{Q-h*g!9svebgRK!Kb$gd)FR=Xfov)w2
z@Zsb8*xmv5lUBGtc))M~C$q;qd4AH2c}3VG_z}Sd3g;<&XvVxyk9jZWbIP*Z%!4=<
zwbr4ox@_8xGQI9C&GFteIy~u^6E(|<v^M<B5LDOts;+#jITDwbKX`Tax*4{u^;p|I
dY~RY9_!mS<lU+rVj7b0h002ovPDHLkV1it&97+HH

diff --git a/Constructor/ico_codo.png b/Constructor/ico_codo.png
index 1fe314e2ad67385aee4cdabb1cce4fa576d56f5a..7e40501131e02d743322277f088fc7e2461ac381 100644
GIT binary patch
delta 2770
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
Y9|;6n-fd8-;Q#;t07*qoM6N<$f-pF9rT_o{

delta 1721
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
P00000NkvXXu0mjf^Q}X=

diff --git a/Constructor/ico_y.png b/Constructor/ico_y.png
index e05472949000fbe313062b42d24c1b7812ae6289..bcc082cfe64abf8cb71003abe562ea2a0b32ffa9 100644
GIT binary patch
delta 2717
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
XHBT3b)=&s100000NkvXXu0mjf`=&CF

delta 2107
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

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
-- 
2.43.0