X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ac870d5f2b6c3690d856c346aaf6946e1e64f05e..101179f2d7bcc4de75c326d3e9d01694c84d07ca:/Constructor/include/constructor.h?ds=inline diff --git a/Constructor/include/constructor.h b/Constructor/include/constructor.h index 1e847bc..a9c1cbf 100644 --- a/Constructor/include/constructor.h +++ b/Constructor/include/constructor.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "workplace.h" #include "item.h" #include "splitter.h" @@ -38,17 +38,18 @@ class Constructor : public Gtk::Window { int id; // / defino los elementos de la ventana. Gtk::Button *btn_canio, *btn_codo, *btn_y, *btn_tanque, *btn_bomba, *btn_exclusa, *btn_drain, *btn_file_ok, *btn_file_cancel, *btn_check, *btn_dlg_close, - *btn_and, *btn_or, *btn_not, *btn_open_ok, *btn_open_cancel, *quick_btn_clear, *quick_btn_save, *quick_btn_open, *quick_btn_new; + *btn_and, *btn_or, *btn_not, *btn_open_ok, *btn_open_cancel, *quick_btn_clear, *quick_btn_save, *quick_btn_open, *quick_btn_new, *btn_find; Gtk::ImageMenuItem *main_menu_quit,*main_menu_new, *edit_menu_del, *edit_menu_delete_all, *main_menu_save, *main_menu_open; Gtk::CheckButton *chk_btn_logica; Gtk::FileSelection *file_selection, *file_open_selection; - Gtk::Entry *combo_entry; + Gtk::Combo *combo_entry; Gtk::Dialog *dlg_connect; Gtk::Label *dlg_label; Glib::RefPtr ico_canio, ico_y, ico_codo, ico_tanque, ico_bomba, ico_exclusa, ico_drain, ico_and, ico_or, ico_not; Glib::RefPtr ico_last; std::list listTargets; std::list listaItems, lista_logic_Items; + std::list list_pointed; WorkPlace *workplace; bool logica; bool can_drop(CItem *, int , int); @@ -69,7 +70,7 @@ class Constructor : public Gtk::Window { virtual void on_main_menu_save(); virtual void on_edit_menu_del(); virtual void on_edit_menu_delete_all(); - virtual void on_chk_btn_clicked(); + virtual void on_chk_btn_logica_clicked(); virtual void on_btn_open_cancel_clicked(); virtual void on_btn_file_ok_clicked(); virtual void on_btn_file_cancel_clicked(); @@ -79,6 +80,7 @@ class Constructor : public Gtk::Window { virtual void on_quick_btn_delete_all_clicked(); virtual void on_quick_btn_save_clicked(); virtual void on_quick_btn_new_clicked(); + virtual void on_btn_find_clicked(); bool check_connection(Glib::ustring& name);