agrego una barrita de estado para ver los datos con mas comodidad, se pueden hacer...

[z.facultad/75.42/plaqui.git] / Constructor / src / constructor.cpp

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index bfd2b2b827a49313d7fd37ccc54b407bb65624b5..a7e44aa6846217a34d88ae2a0fbdc02dd1bf339c 100644 (file)
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -46,6 +46,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        refGlade->get_widget("quick_btn_open", quick_btn_open);
        refGlade->get_widget("edit_menu_delete_all", edit_menu_delete_all);
        refGlade->get_widget("btn_find", btn_find);
+       refGlade->get_widget("status_bar", status_bar);
        
        refGlade->get_widget_derived("workplace", workplace);  //fixed
        
@@ -219,6 +220,10 @@ void Constructor::on_edit_menu_delete_all()
                i=lista_logic_Items.begin();
        }
        id = 0;
+       list_pointed.clear();
+       list_pointed.push_back(" ");
+       combo_entry->set_popdown_strings(list_pointed);
+       combo_entry->get_entry()->set_text("");
 }
 
 void Constructor::on_chk_btn_logica_clicked()
@@ -278,10 +283,14 @@ void Constructor::on_load_from_xml()
                                        current->workplace= workplace;
                                        //Apunto a la lista.
                                        current->combo_entry = combo_entry;
+                                       //Apunto a la lista de apuntados
+                                       current->list_pointed = &list_pointed;
                                        //Apunto a la listaItems.
                                        current->listaItems = &listaItems;
                                        //Apunto a la lista de items logicos
                                        current->lista_logic_Items = &lista_logic_Items;
+                                       //Apunto a la barra de estado
+                                       current->status_bar = status_bar;
                                        // Conecto las señales
                                        current->signal_drag_data_get().connect( SigC::slot(*this, &Constructor::on_item_drag_data_get));
                                        current->signal_drag_begin().connect(SigC::bind( SigC::slot(*this, &Constructor::on_item_drag_begin), current));
@@ -290,6 +299,7 @@ void Constructor::on_load_from_xml()
                        }
                        items = items->next;
                }
+               xmlFreeDoc(document);
        } else {
                // TODO : avisar que el XML no es valido!!
        }
@@ -340,21 +350,7 @@ void Constructor::on_quick_btn_new_clicked()
 
 void Constructor::on_quick_btn_delete_all_clicked()
 {
-       std::list<CItem *>::iterator i = listaItems.begin();
-       while ( i != listaItems.end() ){
-               CItem *temp = *i;
-               listaItems.erase(i);
-               delete temp;
-               i = listaItems.begin();
-       }
-       i = lista_logic_Items.begin();
-       while ( i != lista_logic_Items.end() ){
-               CItem *temp2 = *i;
-               lista_logic_Items.erase(i);
-               delete temp2;
-               i = lista_logic_Items.begin();
-       }
-       id = 0;
+       on_edit_menu_delete_all();
 }      
 
 void Constructor::on_btn_find_clicked()
@@ -362,13 +358,21 @@ void Constructor::on_btn_find_clicked()
        CItem * temp = NULL;
        std::list<CItem *>::iterator i = listaItems.begin();
        while ( i !=listaItems.end() ) {
-               if ( (*i)->get_name()  == combo_entry->get_text() ) {
+               if ( (*i)->get_name()  == combo_entry->get_entry()->get_text() ) {
                        temp = *i;
                        break;
                }
                i++;
        }
        
+       i = lista_logic_Items.begin();
+       while ( i !=lista_logic_Items.end() ) {
+               if ( (*i)->get_name()  == combo_entry->get_entry()->get_text() ) {
+                       temp = *i;
+                       break;
+               }
+               i++;
+       }
        if ( temp != NULL )
        workplace->get_window()->draw_rectangle(workplace->get_style()->get_black_gc(), false , temp->get_position_x()-5, temp->get_position_y()-5,
                                                                                                                                                temp->get_image()->get_width()+10, temp->get_image()->get_height()+10);
@@ -518,11 +522,15 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr<Gdk::DragContext
                        if ( can_drop(a, i*32, j*32) ) {
                                workplace->put(*a, i*32, j*32);
                                //Apunto al workplace
-                               a->workplace= workplace;
+                               a->workplace = workplace;
                                //Apunto a la lista.
                                a->combo_entry = combo_entry;
+                               //Apunto a la lista de apuntados
+                               a->list_pointed = &list_pointed;
                                //Apunto a la listaItems.
                                a->listaItems = &listaItems;
+                               //Apunto a la barra de estado
+                               a->status_bar = status_bar;
                                //Apunto a la lista de items logicos
                                a->lista_logic_Items = &lista_logic_Items;
                                //Seteo la posicion del item