From: Ricardo Markiewicz Date: Mon, 1 Dec 2003 06:58:21 +0000 (+0000) Subject: * Se completa el diaglo "Acerca de" del cliente X-Git-Tag: svn_import~126 X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/commitdiff_plain/b703e826843af6055f4685d70f029b1262db9f1e?ds=inline * Se completa el diaglo "Acerca de" del cliente --- diff --git a/Client/dialogs/client.glade b/Client/dialogs/client.glade index 15a7538..4f1e081 100644 --- a/Client/dialogs/client.glade +++ b/Client/dialogs/client.glade @@ -692,151 +692,6 @@ - - Acerca de ... - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - True - True - False - - - - True - False - 0 - - - - True - True - True - True - GTK_POS_TOP - False - False - - - - True - logo.png - 0.5 - 0.5 - 0 - 0 - - - False - True - - - - - - True - PlaQui - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - True - True - False - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - False - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - False - True - - - - - - True - ChangeLog - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 0 - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - - - - - - 0 - False - True - - - - - - Conectar GTK_WINDOW_TOPLEVEL @@ -1138,4 +993,99 @@ + + Acerca de ... + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + True + True + False + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + -7 + + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + True + True + True + GTK_POS_TOP + False + False + + + + + False + True + + + + + + True + PlaQui + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + 0 + True + True + + + + + + diff --git a/Client/include/principal.h b/Client/include/principal.h index f93cb78..4653404 100644 --- a/Client/include/principal.h +++ b/Client/include/principal.h @@ -58,7 +58,7 @@ protected: // Para la actualizacion automatica ViewItem *last_selected; - // Dialogo de Conectar + Gtk::Dialog *dlg_about; DlgConectar *dlg_conectar; DlgProperty *dlg_property; Gtk::TextView *txt_view; diff --git a/Client/pixmaps/Makefile.am b/Client/pixmaps/Makefile.am index f7489ce..5f08943 100644 --- a/Client/pixmaps/Makefile.am +++ b/Client/pixmaps/Makefile.am @@ -1,6 +1,7 @@ plaquidir = $(datadir)/plaqui-client/pixmaps plaqui_DATA = \ +logo.png \ and_e.png \ and_n.png \ and_o.png \ diff --git a/Client/pixmaps/logo.png b/Client/pixmaps/logo.png index 4d157cd..ce2ddc4 100644 Binary files a/Client/pixmaps/logo.png and b/Client/pixmaps/logo.png differ diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp index 8b47e56..3a9bfe4 100644 --- a/Client/src/principal.cpp +++ b/Client/src/principal.cpp @@ -21,7 +21,8 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr &rg):Gtk::Window(co),refXml(rg) { Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=0; - Gtk::Button *bar_connect=0; + Gtk::Button *bar_connect=0, *close_about=0; + Gtk::Image *plaqui_logo; txt_view = 0; work_place = 0; lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0; @@ -37,10 +38,15 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & anim_frames[7] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_7.png"); current_frame = 0; - anim = 0; + plaqui_logo = anim = 0; + rg->get_widget("plaqui_logo", plaqui_logo); + plaqui_logo->set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/logo.png"); + rg->get_widget("anim_frames", anim); anim->set(anim_frames[current_frame]); + rg->get_widget("close_about", close_about); + rg->get_widget("dlgAbout", dlg_about); rg->get_widget("btn_pausa", btn_pause); rg->get_widget("btn_simular", btn_simulate); rg->get_widget("btn_activar", btn_activar); @@ -76,6 +82,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & btn_activar->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_activar_clicked) ); btn_simulate->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_simulate_clicked) ); btn_pause->signal_clicked().connect( SigC::slot(*this, &Principal::on_btn_pause_clicked) ); + close_about->signal_clicked().connect( SigC::slot(*dlg_about, &Gtk::Widget::hide) ); conexion = NULL; is_xml_loaded = false; @@ -257,34 +264,7 @@ void Principal::on_mnu_file_connect() void Principal::on_mnu_help_about() { - // preparo para leer el archivo ChangeLog -/* Glib::RefPtr xml; - Glib::ustring line; - Glib::RefPtr log_buffer; - Glib::RefPtr log_io; - - log_buffer = Gtk::TextBuffer::create(); - log_io = Glib::IOChannel::create_from_file("../ChangeLog", "r"); - while (log_io->read_line(line) != Glib::IO_STATUS_EOF) { - log_buffer->insert_at_cursor(line); - } - - try { - xml = Gnome::Glade::Xml::create("client.glade", "dlgAbout"); - } - catch(const Gnome::Glade::XmlError &ex) { - std::cerr << ex.what() << std::endl; - return; - } - Gtk::Window *dlg = 0; - Gtk::Button *btn_cerrar = 0; - Gtk::TextView *txt_changelog = 0; - xml->get_widget("dlgAbout", dlg); - xml->get_widget("btn_close", btn_cerrar); - xml->get_widget("txt_changelog", txt_changelog); - btn_cerrar->signal_clicked().connect(SigC::slot(*dlg, &Gtk::Dialog::hide)); - txt_changelog->set_buffer(log_buffer); - dlg->show();*/ + dlg_about->run(); } bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)