* Se completa el diaglo "Acerca de" del cliente

[z.facultad/75.42/plaqui.git] / Client / src / principal.cpp

diff --git a/Client/src/principal.cpp b/Client/src/principal.cpp
index 3775a8f7c3bf99df336ea0e2b0dd5799edf2721b..3a9bfe40fe287cb2ebb229401386d4d42ff8a4f2 100644 (file)
--- a/Client/src/principal.cpp
+++ b/Client/src/principal.cpp
@@ -20,8 +20,9 @@
 
 Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &rg):Gtk::Window(co),refXml(rg)
 {
 
 Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &rg):Gtk::Window(co),refXml(rg)
 {

-       Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0;
-       Gtk::Button *bar_connect=0;
+       Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=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;
        txt_view = 0;
        work_place = 0;
        lbl_cap_flujo = lbl_cap_extra = lbl_extra = lbl_nombre = lbl_color = lbl_flujo = 0;


@@ -32,12 +33,20 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        anim_frames[2] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_2.png");
        anim_frames[3] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_3.png");
        anim_frames[4] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_4.png");
        anim_frames[2] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_2.png");
        anim_frames[3] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_3.png");
        anim_frames[4] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_4.png");

+       anim_frames[5] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_5.png");
+       anim_frames[6] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_6.png");
+       anim_frames[7] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_7.png");

        current_frame = 0;
 
        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("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);
        rg->get_widget("btn_pausa", btn_pause);
        rg->get_widget("btn_simular", btn_simulate);
        rg->get_widget("btn_activar", btn_activar);


@@ -51,6 +60,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        rg->get_widget("mnu_file_disconnect", mnu_disconnect);
        rg->get_widget("mnu_file_exit", exit);
        rg->get_widget("mnu_help_about", about);
        rg->get_widget("mnu_file_disconnect", mnu_disconnect);
        rg->get_widget("mnu_file_exit", exit);
        rg->get_widget("mnu_help_about", about);

+       rg->get_widget("mnu_server_stop", server_stop);

        rg->get_widget("mnu_prop", mnu_prop);
        rg->get_widget_derived("dlg_property", dlg_property);
        rg->get_widget_derived("dlgConectar", dlg_conectar);
        rg->get_widget("mnu_prop", mnu_prop);
        rg->get_widget_derived("dlg_property", dlg_property);
        rg->get_widget_derived("dlgConectar", dlg_conectar);


@@ -64,6 +74,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        dlg_conectar->get_ok_button()->signal_clicked().connect( SigC::slot(*this, &Principal::on_dlg_connect_ok) );
        mnu_prop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_property));
        mnu_disconnect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_disconnect));
        dlg_conectar->get_ok_button()->signal_clicked().connect( SigC::slot(*this, &Principal::on_dlg_connect_ok) );
        mnu_prop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_property));
        mnu_disconnect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_disconnect));

+       server_stop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_server_stop_activate));

        conect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_connect));
        bar_connect->signal_clicked().connect( SigC::slot(*this, &Principal::on_mnu_file_connect));
        exit->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_exit));
        conect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_connect));
        bar_connect->signal_clicked().connect( SigC::slot(*this, &Principal::on_mnu_file_connect));
        exit->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_exit));


@@ -71,6 +82,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
        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) );
        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;
        
        conexion = NULL;
        is_xml_loaded = false;


@@ -87,13 +99,6 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr<Gnome::Glade::Xml> &
 
 Principal::~Principal()
 {
 
 Principal::~Principal()
 {

-       if (conexion) {
-               conexion->finish();
-       }
-       // Espera a que termine realmente.
-       while (conexion) {
-               Glib::usleep(100000); // 0,1 segundo
-       }

 }
 
 void Principal::on_realize()
 }
 
 void Principal::on_realize()


@@ -197,6 +202,13 @@ void Principal::on_dlg_connect_ok()
 void Principal::on_mnu_file_exit()
 {
        on_mnu_file_disconnect();
 void Principal::on_mnu_file_exit()
 {
        on_mnu_file_disconnect();

+       if (conexion) {
+               conexion->finish();
+       }
+       // Espera a que termine realmente.
+       while (conexion) {
+               Glib::usleep(100000); // 0,1 segundo
+       }

        Gtk::Main::quit();
 }
 
        Gtk::Main::quit();
 }
 


@@ -206,6 +218,14 @@ bool Principal::on_delete_event(GdkEventAny *e)
        return false;
 }
 
        return false;
 }
 

+void Principal::on_mnu_server_stop_activate()
+{
+       if (conexion == NULL) return;
+
+       PlaQui::Server::Command c("server", "stop");
+       conexion->send(c);
+}
+

 void Principal::on_btn_activar_clicked()
 {
        if ((conexion == NULL) || (last_selected == NULL)) return;
 void Principal::on_btn_activar_clicked()
 {
        if ((conexion == NULL) || (last_selected == NULL)) return;


@@ -235,7 +255,6 @@ void Principal::on_mnu_file_disconnect()
        c2.add_arg(conexion->get_host());
        c2.add_arg(conexion->get_port());
        conexion->send(c2);
        c2.add_arg(conexion->get_host());
        c2.add_arg(conexion->get_port());
        conexion->send(c2);

-

 }
 
 void Principal::on_mnu_file_connect()
 }
 
 void Principal::on_mnu_file_connect()


@@ -245,34 +264,7 @@ void Principal::on_mnu_file_connect()
 
 void Principal::on_mnu_help_about()
 {
 
 void Principal::on_mnu_help_about()
 {

-       // preparo para leer el archivo ChangeLog
-/*     Glib::RefPtr<Gnome::Glade::Xml> xml;
-       Glib::ustring line;
-       Glib::RefPtr<Gtk::TextBuffer> log_buffer;
-       Glib::RefPtr<Glib::IOChannel> 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)
 }
 
 bool Principal::on_item_clicked(GdkEventButton *e, ViewItem *i)


@@ -302,7 +294,7 @@ void Principal::update_items_prop()
 
        if (!paused) {
                current_frame++;
 
        if (!paused) {
                current_frame++;

-               if (current_frame > 4) {
+               if (current_frame > 7) {

                        current_frame = 0;
                }
                anim->set(anim_frames[current_frame]);
                        current_frame = 0;
                }
                anim->set(anim_frames[current_frame]);


@@ -334,6 +326,7 @@ void Principal::on_conexion_finished()
                delete i->second;
        }
        mapItems.clear();
                delete i->second;
        }
        mapItems.clear();

+       is_xml_loaded = false;

 }
 
 void Principal::on_conexion_ok(const std::string &body)
 }
 
 void Principal::on_conexion_ok(const std::string &body)