From: Nicolás Dimov <ndimov@gmail.com>
Date: Fri, 24 Oct 2003 03:46:34 +0000 (+0000)
Subject: Con esto deberia compilar, avisen
X-Git-Tag: svn_import~367
X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/commitdiff_plain/f059ec88ed59eca9966b753cd7222f3f3299c301?hp=a5ce0f929d3f4b2e8a06cc4cbaabb20a889cd039

Con esto deberia compilar, avisen
---

diff --git a/Constructor/canio.cpp b/Constructor/canio.cpp
index 47c1450..73dd6f1 100644
--- a/Constructor/canio.cpp
+++ b/Constructor/canio.cpp
@@ -18,7 +18,7 @@ bool Canio::on_button_press_event(GdkEventButton *event)
 {
 	int w, h;
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==3)){
-		image = null;  //como hago para actualizar?????
+		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);
 		imgActual++;
 		switch (imgActual) {
diff --git a/Constructor/codo.cpp b/Constructor/codo.cpp
index a7f1502..6870e2d 100644
--- a/Constructor/codo.cpp
+++ b/Constructor/codo.cpp
@@ -8,7 +8,7 @@ Codo::Codo()
 	imageO = Gdk::Pixbuf::create_from_file("codo_o.png");
 	null = Gdk::Pixbuf::create_from_file("null.png");
 	imgActual = 0;
-	image = imageN;
+	image = imageO;
 	set_size_request(image->get_width(), image->get_height());
 }
 
@@ -19,7 +19,7 @@ Codo::~Codo()
 bool Codo::on_button_press_event(GdkEventButton *event)
 {
 	if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
-		image = null;  //como hago para actualizar?????
+		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);
 		imgActual++;
 		switch (imgActual) {
diff --git a/Constructor/constructor.glade b/Constructor/constructor.glade
index d6cdbf0..8cdf98d 100644
--- a/Constructor/constructor.glade
+++ b/Constructor/constructor.glade
@@ -387,6 +387,70 @@ Empalme</property>
 			  </child>
 			</widget>
 		      </child>
+
+		      <child>
+			<widget class="GtkButton" id="btn_tanque">
+			  <property name="visible">True</property>
+			  <property name="can_default">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+
+			  <child>
+			    <widget class="GtkAlignment" id="alignment9">
+			      <property name="visible">True</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xscale">0</property>
+			      <property name="yscale">0</property>
+
+			      <child>
+				<widget class="GtkHBox" id="hbox8">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">2</property>
+
+				  <child>
+				    <widget class="GtkImage" id="image7">
+				      <property name="visible">True</property>
+				      <property name="pixbuf">ico_tanque.png</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkLabel" id="label10">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Tanque</property>
+				      <property name="use_underline">True</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+				</widget>
+			      </child>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
diff --git a/Constructor/ico_tanque.png b/Constructor/ico_tanque.png
new file mode 100644
index 0000000..2b883e9
Binary files /dev/null and b/Constructor/ico_tanque.png differ
diff --git a/Constructor/item_tanque.png b/Constructor/item_tanque.png
new file mode 100644
index 0000000..29744a6
Binary files /dev/null and b/Constructor/item_tanque.png differ
diff --git a/Constructor/tanque_e.png b/Constructor/tanque_e.png
new file mode 100644
index 0000000..661bc36
Binary files /dev/null and b/Constructor/tanque_e.png differ
diff --git a/Constructor/y.cpp b/Constructor/y.cpp
index 71e2367..414bee6 100644
--- a/Constructor/y.cpp
+++ b/Constructor/y.cpp
@@ -20,7 +20,7 @@ bool Y::on_button_press_event(GdkEventButton *event)
 {
 	int w,h;
 	if ((event->type == GDK_BUTTON_PRESS) && (event->button == 3 )){
-		image = null;  //como hago para actualizar?????
+		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);
 		imgActual++;
 		switch (imgActual) {