X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/43fc1b3f57852f2af098fa7411e83220015aaa6f..b7d95f97d1f101d9bcb891b1421a4074822c39ce:/Client/include/principal.h?ds=sidebyside

diff --git a/Client/include/principal.h b/Client/include/principal.h
index f18735c..8cfe7f2 100644
--- a/Client/include/principal.h
+++ b/Client/include/principal.h
@@ -24,13 +24,19 @@ protected:
 	std::map<const std::string, ViewItem *> mapItems;
 
 	// Funciones de carga del XML
+	bool is_xml_loaded;
+	void loadXML();
 	void loadBomba(xmlNodePtr nodo);
 	void loadCodo(xmlNodePtr nodo);
 	void loadConduct(xmlNodePtr nodo);
 	void loadExclusa(xmlNodePtr nodo);
 	void loadTank(xmlNodePtr nodo);
 	void loadUnion(xmlNodePtr nodo);
-	
+	void loadDrain(xmlNodePtr nodo);
+
+	Glib::Dispatcher load_xml_dispatch;
+	std::string xml_body;
+
 	// Archivo XML del Padre
 	Glib::RefPtr<Gnome::Glade::Xml> refXml;
 
@@ -39,20 +45,25 @@ protected:
 	Gtk::Entry *txt_target, *txt_command, *txt_args;
 	Gtk::TextView *txt_view;
 	Gtk::Fixed *work_place;
+	Gtk::Label *lbl_nombre, *lbl_color, *lbl_flujo;
+	Gtk::Image *ico_conected;
 
 	// Callbacks del menu y la barra
 	virtual void on_mnu_file_exit();
 	virtual void on_mnu_file_connect();
+	virtual void on_mnu_file_disconnect();
 	virtual void on_mnu_help_about();
 	virtual void on_dlg_connect_ok();
 	virtual void on_get_clicked();
-	virtual void on_mnu_prop();
 
 	virtual bool on_item_clicked(GdkEventButton *, ViewItem *);
 	
 	// Callbacks para las conexiones
-	void on_conexion_ok();
+	void on_conexion_connected();
+	void on_conexion_finished();
+	void on_conexion_ok(const std::string &body);
 	void on_conexion_error(unsigned code);
+	void on_conexion_frame(const std::string &frame);
 };
 
 #endif // _PRINCIPAL_H_