X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ea7708f0d91b00a54cc5f136a67e9f9bd272329d..663eccb7e27110aba6c79648c38254a7a5737bca:/Constructor/src/constructor.cpp diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp index 21bdbca..a7e44aa 100644 --- a/Constructor/src/constructor.cpp +++ b/Constructor/src/constructor.cpp @@ -46,6 +46,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrget_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() @@ -284,6 +289,8 @@ void Constructor::on_load_from_xml() 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)); @@ -343,21 +350,7 @@ void Constructor::on_quick_btn_new_clicked() void Constructor::on_quick_btn_delete_all_clicked() { - std::list::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() @@ -536,6 +529,8 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtrlist_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