From: Nicolás Dimov Date: Tue, 11 Nov 2003 06:12:08 +0000 (+0000) Subject: (no commit message) X-Git-Tag: svn_import~316 X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/commitdiff_plain/c9f8c0bc99fea35db2944e60ef14441c2c056746 --- diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp index 98fbb78..aa27c53 100644 --- a/Constructor/constructor.cpp +++ b/Constructor/constructor.cpp @@ -24,6 +24,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrget_widget("btn_check",btn_check); 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_derived("workplace", workplace); //fixed @@ -270,12 +271,19 @@ void Constructor::on_item_drop_drag_received(const Glib::RefPtr::iterator i = listaItems.begin(); - while ( i != listaItems.end() ) { - CItem *temp = *i; - if ( !temp->check_connection() ) { - dlg_connect->show(); - break; + if ( !listaItems.empty() ) { + while ( i != listaItems.end() ) { + CItem *temp = *i; + if ( !temp->check_connection() ) { + dlg_connect->set_title("Error"); + dlg_label->set_text("Los elementos no estan conectados\n\t\tcorrectamente"); + dlg_connect->show(); + return; + } + i++; } - i++; + dlg_connect->set_title("Conexion"); + dlg_label->set_text("Los elementos estan conectados\n\t\tcorrectamente"); + dlg_connect->show(); } } diff --git a/Constructor/constructor.glade b/Constructor/constructor.glade index 01b0743..ffbab64 100644 --- a/Constructor/constructor.glade +++ b/Constructor/constructor.glade @@ -940,10 +940,10 @@ - + True Los elementos no estan conectados - correctamente + correctamente False False GTK_JUSTIFY_FILL diff --git a/Constructor/constructor.h b/Constructor/constructor.h index d2c9d6f..55d3149 100644 --- a/Constructor/constructor.h +++ b/Constructor/constructor.h @@ -35,6 +35,7 @@ class Constructor : public Gtk::Window { Gtk::FileSelection *file_selection; Gtk::Entry *combo_entry; Gtk::Dialog *dlg_connect; + Gtk::Label *dlg_label; Glib::RefPtr ico_canio, ico_y, ico_codo, ico_tanque; Glib::RefPtr ico_last; std::list listTargets; diff --git a/Constructor/item_canio.png b/Constructor/item_canio.png deleted file mode 100644 index 3fccb7d..0000000 Binary files a/Constructor/item_canio.png and /dev/null differ diff --git a/Constructor/item_codo.png b/Constructor/item_codo.png deleted file mode 100644 index 4bd8ccf..0000000 Binary files a/Constructor/item_codo.png and /dev/null differ diff --git a/Constructor/item_tanque.png b/Constructor/item_tanque.png deleted file mode 100644 index d91f0ab..0000000 Binary files a/Constructor/item_tanque.png and /dev/null differ diff --git a/Constructor/item_y.png b/Constructor/item_y.png deleted file mode 100644 index 1190144..0000000 Binary files a/Constructor/item_y.png and /dev/null differ