(no commit message)

diff --git a/Constructor/constructor.cpp b/Constructor/constructor.cpp
index 98fbb786ffc7f754ad4df8b81172109cc9f8732c..aa27c5361b28980dbb5af3de4b721c9b4cdd74aa 100644 (file)
--- a/Constructor/constructor.cpp
+++ b/Constructor/constructor.cpp
@@ -24,6 +24,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        refGlade->get_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<Gdk::DragContext
 void Constructor::on_btn_check_clicked()
 {
        std::list<CItem *>::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 01b07435913f4f5f4038fda5590839b85804471f..ffbab647f9adcecbc413f8d81b15023a10b8401e 100644 (file)
--- a/Constructor/constructor.glade
+++ b/Constructor/constructor.glade
@@ -940,10 +940,10 @@
       </child>
 
       <child>
-       <widget class="GtkLabel" id="label21">
+       <widget class="GtkLabel" id="dlg_label">
          <property name="visible">True</property>
          <property name="label" translatable="yes">Los elementos no estan conectados
-                correctamente</property>
+               correctamente</property>
          <property name="use_underline">False</property>
          <property name="use_markup">False</property>
          <property name="justify">GTK_JUSTIFY_FILL</property>

diff --git a/Constructor/constructor.h b/Constructor/constructor.h
index d2c9d6faef4b398d27ab7c5afb418a8da34bd93c..55d3149b4be0c492d65c580020bf777d3daafbbd 100644 (file)
--- 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<Gdk::Pixbuf> ico_canio, ico_y, ico_codo, ico_tanque;
        Glib::RefPtr<Gdk::Pixbuf> ico_last;
        std::list<Gtk::TargetEntry> listTargets;

diff --git a/Constructor/item_canio.png b/Constructor/item_canio.png
deleted file mode 100644 (file)
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 (file)
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 (file)
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 (file)
index 1190144..0000000
Binary files a/Constructor/item_y.png and /dev/null differ