]> git.llucax.com Git - z.facultad/75.42/plaqui.git/commitdiff
Con esto deberia compilar, avisen
authorNicolás Dimov <ndimov@gmail.com>
Fri, 24 Oct 2003 03:46:34 +0000 (03:46 +0000)
committerNicolás Dimov <ndimov@gmail.com>
Fri, 24 Oct 2003 03:46:34 +0000 (03:46 +0000)
Constructor/canio.cpp
Constructor/codo.cpp
Constructor/constructor.glade
Constructor/ico_tanque.png [new file with mode: 0644]
Constructor/item_tanque.png [new file with mode: 0644]
Constructor/tanque_e.png [new file with mode: 0644]
Constructor/y.cpp

index 47c1450d72f0fc332ba2709339be30b952b5b539..73dd6f1252a8ba114f7f0688ae652b3c6a5d1ed7 100644 (file)
@@ -18,7 +18,7 @@ bool Canio::on_button_press_event(GdkEventButton *event)
 {
        int w, h;
        if ((event->type == GDK_BUTTON_PRESS) && ( event->button ==3)){
 {
        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) {
                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) {
index a7f1502c07ad3c2c4b68c8a8749f73d9ce38cc12..6870e2d2c3ef6bf7c296debbf6fff5b935012329 100644 (file)
@@ -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;
        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());
 }
 
        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)){
 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) {
                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) {
index d6cdbf0c965d2a0e97b444d86290af7bcf89c59c..8cdf98db90bf637ecd24fa8a8019e797f0490fff 100644 (file)
@@ -387,6 +387,70 @@ Empalme</property>
                          </child>
                        </widget>
                      </child>
                          </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>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
diff --git a/Constructor/ico_tanque.png b/Constructor/ico_tanque.png
new file mode 100644 (file)
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 (file)
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 (file)
index 0000000..661bc36
Binary files /dev/null and b/Constructor/tanque_e.png differ
index 71e2367a91c19ad51b03c3a8dae24307a867b117..414bee6058e2c4ce1cae6f91a3760d7460789aad 100644 (file)
@@ -20,7 +20,7 @@ bool Y::on_button_press_event(GdkEventButton *event)
 {
        int w,h;
        if ((event->type == GDK_BUTTON_PRESS) && (event->button == 3 )){
 {
        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) {
                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) {