X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/68e6923fe644c24ab285dc79134682cff1276b9f..3cff83911b19614c69bb391c21ed7c02d3a82914:/Constructor/src/constructor.cpp

diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp
index 80d07d2..87a943b 100644
--- a/Constructor/src/constructor.cpp
+++ b/Constructor/src/constructor.cpp
@@ -29,6 +29,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	refGlade->get_widget("btn_or", btn_or);
 	refGlade->get_widget("btn_not", btn_not);
 	refGlade->get_widget("main_menu_quit",main_menu_quit);
+	refGlade->get_widget("main_menu_new",main_menu_new);
 	refGlade->get_widget("main_menu_open",main_menu_open);
 	refGlade->get_widget("main_menu_save",main_menu_save);
 	refGlade->get_widget("edit_menu_del",edit_menu_del);
@@ -40,8 +41,10 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	refGlade->get_widget("dlg_connect", dlg_connect);
 	refGlade->get_widget("btn_dlg_close", btn_dlg_close);
 	refGlade->get_widget("dlg_label", dlg_label);
-	refGlade->get_widget("quick_btn_clear", quick_btn_clear);
+	refGlade->get_widget("quick_btn_new", quick_btn_new);
 	refGlade->get_widget("quick_btn_save", quick_btn_save);
+	refGlade->get_widget("quick_btn_open", quick_btn_open);
+	refGlade->get_widget("edit_menu_delete_all", edit_menu_delete_all);
 	
 	refGlade->get_widget_derived("workplace", workplace);  //fixed
 	
@@ -75,14 +78,17 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
 	btn_check->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_check_clicked));
 	btn_dlg_close->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_dlg_connect_clicked));
 	chk_btn_logica->signal_clicked().connect(SigC::slot(*this, &Constructor::on_chk_btn_clicked));
-	quick_btn_clear->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_clear_clicked));
+	quick_btn_new->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_new_clicked));
 	quick_btn_save->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_save_clicked));
+	quick_btn_open->signal_clicked().connect(SigC::slot(*this, &Constructor::on_main_menu_open));
 	
 	main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit));
+	main_menu_new->signal_activate().connect(SigC::slot(*this, &Constructor::on_quick_btn_new_clicked));
 	main_menu_open->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_open));
 	main_menu_save->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_save));
 	edit_menu_del->signal_activate().connect(SigC::slot(*this,&Constructor::on_edit_menu_del));
-			
+	edit_menu_delete_all->signal_activate().connect(SigC::slot(*this,&Constructor::on_quick_btn_delete_all_clicked));
+	
 	btn_file_cancel = file_selection->get_cancel_button();
 	btn_file_ok = file_selection->get_ok_button();
 	btn_file_ok->signal_clicked().connect(SigC::slot(*this,&Constructor::on_btn_file_ok_clicked));
@@ -203,6 +209,7 @@ void Constructor::on_edit_menu_delete_all()
 		(*i)->workplace->delete_item((*i)->get_id());
 		i=lista_logic_Items.begin();
 	}
+	id = 0;
 }
 
 void Constructor::on_chk_btn_clicked()
@@ -213,6 +220,7 @@ void Constructor::on_chk_btn_clicked()
 
 void Constructor::on_load_from_xml()
 {
+	on_edit_menu_delete_all();
 	file_name = file_open_selection->get_filename();
 
 	/* Parseo de ejemplo de un XML desde archivo */
@@ -313,8 +321,13 @@ void Constructor::on_quick_btn_save_clicked()
 	}
 }
 	
+void Constructor::on_quick_btn_new_clicked()
+{
+	on_quick_btn_delete_all_clicked();
+	saved = false;
+}
 
-void Constructor::on_quick_btn_clear_clicked()
+void Constructor::on_quick_btn_delete_all_clicked()
 {
 	std::list<CItem *>::iterator i = listaItems.begin();
 	while ( i != listaItems.end() ){
@@ -330,6 +343,7 @@ void Constructor::on_quick_btn_clear_clicked()
 		delete temp2;
 		i = lista_logic_Items.begin();
 	}
+	id = 0;
 }	
 
 void Constructor::on_btn_file_cancel_clicked()