From: Nicolás Dimov Date: Thu, 20 Nov 2003 07:53:50 +0000 (+0000) Subject: hay que ponerlo lindo... si no lo pueden ver sera sorpresa para maniana X-Git-Tag: svn_import~225 X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/commitdiff_plain/3f2e45f01d3d3e8790d52c38d774721e63707b46?hp=f61a5ebd00d4620af70c3780ba821f5af68def1c hay que ponerlo lindo... si no lo pueden ver sera sorpresa para maniana --- diff --git a/Constructor/dialogs/constructor.glade b/Constructor/dialogs/constructor.glade index 70055b4..a98a7d1 100644 --- a/Constructor/dialogs/constructor.glade +++ b/Constructor/dialogs/constructor.glade @@ -158,6 +158,36 @@ + + + True + GTK_ORIENTATION_HORIZONTAL + GTK_TOOLBAR_ICONS + True + + + + True + gtk-clear + True + + + + + + True + gtk-save + True + + + + + 0 + False + False + + + True diff --git a/Constructor/include/constructor.h b/Constructor/include/constructor.h index ad2a14e..8674c75 100644 --- a/Constructor/include/constructor.h +++ b/Constructor/include/constructor.h @@ -32,11 +32,13 @@ class Constructor : public Gtk::Window { virtual ~Constructor(); private: FILE *archivo; + bool saved; + std::string file_name; protected: 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; + *btn_and, *btn_or, *btn_not, *btn_open_ok, *btn_open_cancel, *quick_btn_clear, *quick_btn_save; Gtk::ImageMenuItem *main_menu_quit, *edit_menu_del, *main_menu_save, *main_menu_open; Gtk::CheckButton *chk_btn_logica; Gtk::FileSelection *file_selection, *file_open_selection; @@ -74,7 +76,9 @@ class Constructor : public Gtk::Window { virtual void on_btn_check_clicked(); virtual void on_btn_dlg_connect_clicked(); virtual void on_load_from_xml(); - + virtual void on_quick_btn_clear_clicked(); + virtual void on_quick_btn_save_clicked(); + // señales para cambiar el icono. virtual void on_canio_drag_begin(const Glib::RefPtr& context); virtual void on_y_drag_begin(const Glib::RefPtr& context); diff --git a/Constructor/src/constructor.cpp b/Constructor/src/constructor.cpp index 4ab3b19..2966528 100644 --- a/Constructor/src/constructor.cpp +++ b/Constructor/src/constructor.cpp @@ -3,6 +3,7 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtr& refGlade):Gtk::Window(cobject) { id = 0; + saved = false; set_title("Constructor"); @@ -39,6 +40,8 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrget_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_save", quick_btn_save); refGlade->get_widget_derived("workplace", workplace); //fixed @@ -72,6 +75,8 @@ Constructor::Constructor(BaseObjectType* cobject, const Glib::RefPtrsignal_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_save->signal_clicked().connect(SigC::slot(*this, &Constructor::on_quick_btn_save_clicked)); main_menu_quit->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_quit)); main_menu_open->signal_activate().connect(SigC::slot(*this, &Constructor::on_main_menu_open)); @@ -208,7 +213,7 @@ void Constructor::on_chk_btn_clicked() void Constructor::on_load_from_xml() { - std::string file_name = file_open_selection->get_filename(); + file_name = file_open_selection->get_filename(); /* Parseo de ejemplo de un XML desde archivo */ xmlDocPtr document; @@ -278,7 +283,7 @@ void Constructor::on_load_from_xml() void Constructor::on_btn_file_ok_clicked() { std::list::iterator i = listaItems.begin(); - std::string file_name = file_selection->get_filename(); + file_name = file_selection->get_filename(); if ( (archivo = fopen( file_name.c_str(), "w+")) != NULL ){ fprintf(archivo, "\n"); fprintf (archivo,"\n"); @@ -292,12 +297,41 @@ void Constructor::on_btn_file_ok_clicked() i++; } fprintf(archivo,"\n"); + saved = true; } else std::cout<<"NO SE ABRIO EL ARCHIVO"<hide(); } +void Constructor::on_quick_btn_save_clicked() +{ + if ( ! saved ) { + on_main_menu_save(); + } else { + on_btn_file_ok_clicked(); + } +} + + +void Constructor::on_quick_btn_clear_clicked() +{ + std::list::iterator i = listaItems.begin(); + while ( i != listaItems.end() ){ + CItem *temp = *i; + listaItems.erase(i); + delete temp; + i = listaItems.begin(); + } + i = lista_logic_Items.begin(); + while ( i != lista_logic_Items.end() ){ + CItem *temp2 = *i; + lista_logic_Items.erase(i); + delete temp2; + i = lista_logic_Items.begin(); + } +} + void Constructor::on_btn_file_cancel_clicked() { file_selection->hide();