- Agrego documentacion sobre las herramientas utilizadas

	- Modifico el encabezado a utilizar en los archivos
	- Client: agrego el handler para entrar al dialogo "Acerca de"
	- Client; Inicio los archivos de informacion (ChangeLog, AUTHORS)

diff --git a/Client/AUTHORS b/Client/AUTHORS
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4b11b05814864c3baac0f871912ef9fa818f141e 100644 (file)
--- a/Client/AUTHORS
+++ b/Client/AUTHORS
@@ -0,0 +1,19 @@
+Maintainer
+----------
+       Ricardo Markiewicz <rmarkie@fi.uba.ar>
+
+Developers
+----------
+       PlaQui Developers Team
+               Nicolás Dimov <nicodimov@datafull.com>
+               Leandro Lucarella <luca@llucax.hn.org>
+               Ricardo Markiewicz <rmarkie@fi.uba.ar>
+
+Special Thanks to
+-----------------
+       Eric Raymond
+       Linus Torvals
+       Richard Stallman
+       Gtk+ Deleveloper Team
+       The Free Software community
+

diff --git a/Client/ChangeLog b/Client/ChangeLog
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0e67fba8064f7a48cff5982399a1c2c2ebc1e38f 100644 (file)
--- a/Client/ChangeLog
+++ b/Client/ChangeLog
@@ -0,0 +1,4 @@
+16-10-2003
+       * Agrego handlers para salir del programa
+       * Agrego dialogo de "Acerca de..."
+

diff --git a/Client/include/mnu_help_about.h b/Client/include/mnu_help_about.h
new file mode 100644 (file)
index 0000000..9a3f442
--- /dev/null
+++ b/Client/include/mnu_help_about.h
@@ -0,0 +1,31 @@
+
+/* Maneja el Ayuda->Acerca de */
+
+#include <gtkmm.h>
+#include <iostream>
+
+class MnuHelpAbout:public Gtk::MenuItem {
+public:
+       MnuHelpAbout(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):Gtk::MenuItem(cobject) {
+       }
+       virtual ~MnuHelpAbout() {}
+
+protected:
+       Glib::RefPtr<Gnome::Glade::Xml> refXml;
+       virtual void on_activate() {
+               try {
+                       refXml = 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;
+               refXml->get_widget("dlgAbout", dlg);
+               refXml->get_widget("btn_close", btn_cerrar);
+               btn_cerrar->signal_clicked().connect(SigC::slot(*dlg, &Gtk::Dialog::hide));
+               dlg->show();
+       }
+};
+

diff --git a/Client/src/client.glade b/Client/src/client.glade
index 41e22a09c8c49d99389f61f8df9ba2bc78ff8dec..90277f75e2cbe82533848b08df13519e153e1e6b 100644 (file)
--- a/Client/src/client.glade
+++ b/Client/src/client.glade
@@ -9,6 +9,8 @@
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>

+  <property name="default_width">640</property>
+  <property name="default_height">480</property>

   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
 
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
 


@@ -32,11 +34,23 @@
                <widget class="GtkMenu" id="menuitem1_menu">
 
                  <child>
                <widget class="GtkMenu" id="menuitem1_menu">
 
                  <child>

-                   <widget class="GtkMenuItem" id="mnu_conectar">
+                   <widget class="GtkImageMenuItem" id="mnu_conectar">

                      <property name="visible">True</property>
                      <property name="label" translatable="yes">_Conectar</property>
                      <property name="use_underline">True</property>
                      <signal name="activate" handler="on_mnu_conectar_activate" last_modification_time="Thu, 16 Oct 2003 00:50:14 GMT"/>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">_Conectar</property>
                      <property name="use_underline">True</property>
                      <signal name="activate" handler="on_mnu_conectar_activate" last_modification_time="Thu, 16 Oct 2003 00:50:14 GMT"/>

+
+                     <child internal-child="image">
+                       <widget class="GtkImage" id="image4">
+                         <property name="visible">True</property>
+                         <property name="stock">gtk-execute</property>
+                         <property name="icon_size">1</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>

                    </widget>
                  </child>
 
                    </widget>
                  </child>
 


@@ -76,7 +90,7 @@
                      <signal name="activate" handler="on_propiedades1_activate" last_modification_time="Thu, 16 Oct 2003 01:17:27 GMT"/>
 
                      <child internal-child="image">
                      <signal name="activate" handler="on_propiedades1_activate" last_modification_time="Thu, 16 Oct 2003 01:17:27 GMT"/>
 
                      <child internal-child="image">

-                       <widget class="GtkImage" id="image3">
+                       <widget class="GtkImage" id="image5">

                          <property name="visible">True</property>
                          <property name="stock">gtk-properties</property>
                          <property name="icon_size">1</property>
                          <property name="visible">True</property>
                          <property name="stock">gtk-properties</property>
                          <property name="icon_size">1</property>


@@ -112,11 +126,23 @@
                <widget class="GtkMenu" id="menuitem4_menu">
 
                  <child>
                <widget class="GtkMenu" id="menuitem4_menu">
 
                  <child>

-                   <widget class="GtkMenuItem" id="acerca_de1">
+                   <widget class="GtkImageMenuItem" id="mnu_help_about">

                      <property name="visible">True</property>
                      <property name="label" translatable="yes">_Acerca de</property>
                      <property name="use_underline">True</property>
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">_Acerca de</property>
                      <property name="use_underline">True</property>

-                     <signal name="activate" handler="on_acerca_de1_activate" last_modification_time="Thu, 16 Oct 2003 00:50:14 GMT"/>
+                     <signal name="activate" handler="on_mnu_help_about_activate" last_modification_time="Thu, 16 Oct 2003 18:02:46 GMT"/>
+
+                     <child internal-child="image">
+                       <widget class="GtkImage" id="image6">
+                         <property name="visible">True</property>
+                         <property name="stock">gtk-dialog-info</property>
+                         <property name="icon_size">1</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>

                    </widget>
                  </child>
                </widget>
                    </widget>
                  </child>
                </widget>


@@ -187,13 +213,13 @@
        <widget class="GtkHPaned" id="hpaned1">
          <property name="visible">True</property>
          <property name="can_focus">True</property>
        <widget class="GtkHPaned" id="hpaned1">
          <property name="visible">True</property>
          <property name="can_focus">True</property>

-         <property name="position">0</property>
+         <property name="position">500</property>

 
          <child>
            <widget class="GtkVPaned" id="vpaned1">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
 
          <child>
            <widget class="GtkVPaned" id="vpaned1">
              <property name="visible">True</property>
              <property name="can_focus">True</property>

-             <property name="position">0</property>
+             <property name="position">290</property>

 
              <child>
                <widget class="GtkScrolledWindow" id="scrolledwindow1">
 
              <child>
                <widget class="GtkScrolledWindow" id="scrolledwindow1">


@@ -212,6 +238,22 @@
                      <child>
                        <widget class="GtkFixed" id="work_place">
                          <property name="visible">True</property>
                      <child>
                        <widget class="GtkFixed" id="work_place">
                          <property name="visible">True</property>

+
+                         <child>
+                           <widget class="GtkButton" id="button9">
+                             <property name="width_request">368</property>
+                             <property name="height_request">96</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">Este boton es para ver si se mueve el scroll!!</property>
+                             <property name="use_underline">True</property>
+                             <property name="relief">GTK_RELIEF_NORMAL</property>
+                           </widget>
+                           <packing>
+                             <property name="x">224</property>
+                             <property name="y">120</property>
+                           </packing>
+                         </child>

                        </widget>
                      </child>
                    </widget>
                        </widget>
                      </child>
                    </widget>


@@ -219,7 +261,7 @@
                </widget>
                <packing>
                  <property name="shrink">True</property>
                </widget>
                <packing>
                  <property name="shrink">True</property>

-                 <property name="resize">False</property>
+                 <property name="resize">True</property>

                </packing>
              </child>
 
                </packing>
              </child>
 


@@ -231,11 +273,18 @@
                  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
                  <child>
                  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
                  <child>

-                   <widget class="Custom" id="custom1">
+                   <widget class="GtkLabel" id="label8">

                      <property name="visible">True</property>
                      <property name="visible">True</property>

-                     <property name="int1">0</property>
-                     <property name="int2">0</property>
-                     <property name="last_modification_time">Thu, 16 Oct 2003 01:23:10 GMT</property>
+                     <property name="label" translatable="yes">label8</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>

                    </widget>
                  </child>
 
                    </widget>
                  </child>
 


@@ -266,7 +315,7 @@
            </widget>
            <packing>
              <property name="shrink">True</property>
            </widget>
            <packing>
              <property name="shrink">True</property>

-             <property name="resize">False</property>
+             <property name="resize">True</property>

            </packing>
          </child>
 
            </packing>
          </child>
 


@@ -278,11 +327,18 @@
              <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
              <child>
              <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
 
              <child>

-               <widget class="Custom" id="custom2">
+               <widget class="GtkLabel" id="label9">

                  <property name="visible">True</property>
                  <property name="visible">True</property>

-                 <property name="int1">0</property>
-                 <property name="int2">0</property>
-                 <property name="last_modification_time">Thu, 16 Oct 2003 01:23:12 GMT</property>
+                 <property name="label" translatable="yes">label9</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0.5</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>

                </widget>
              </child>
 
                </widget>
              </child>
 


@@ -481,12 +537,12 @@
   </child>
 </widget>
 
   </child>
 </widget>
 

-<widget class="GtkWindow" id="dlgABout">
+<widget class="GtkWindow" id="dlgAbout">

   <property name="visible">True</property>
   <property name="title" translatable="yes">Acerca de ...</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Acerca de ...</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>

-  <property name="modal">False</property>
+  <property name="modal">True</property>

   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
 
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
 

diff --git a/Client/src/main.cpp b/Client/src/main.cpp
index f7ca2a1750053f666dbbd07c082556a21f70d9cc..b9fe6301d3d05534149c7db9b4ef796a92918ec3 100644 (file)
--- a/Client/src/main.cpp
+++ b/Client/src/main.cpp
@@ -3,6 +3,7 @@
 #include <libglademm.h>
 #include <iostream>
 #include "mnu_file_exit.h"
 #include <libglademm.h>
 #include <iostream>
 #include "mnu_file_exit.h"

+#include "mnu_help_about.h"

 
 int main (int argc, char **argv)
 {
 
 int main (int argc, char **argv)
 {


@@ -14,16 +15,23 @@ int main (int argc, char **argv)
                refXml = Gnome::Glade::Xml::create("client.glade", "Principal");
        }
        catch(const Gnome::Glade::XmlError& ex) {
                refXml = Gnome::Glade::Xml::create("client.glade", "Principal");
        }
        catch(const Gnome::Glade::XmlError& ex) {

+               std::cerr << "(main.cpp:18) : ";

                std::cerr << ex.what() << std::endl;
                return 1;
        }
 
        Gtk::Window* pWindow = 0;
        MnuFileExit *mnu_file_exit = 0;
                std::cerr << ex.what() << std::endl;
                return 1;
        }
 
        Gtk::Window* pWindow = 0;
        MnuFileExit *mnu_file_exit = 0;

+       MnuHelpAbout *mnu_help_about = 0;

        Gtk::Button *bar_exit;
        Gtk::Button *bar_exit;

+       Gtk::Fixed *work_place;
+

        refXml->get_widget("Principal", pWindow);
        refXml->get_widget_derived("mnu_file_exit", mnu_file_exit);
        refXml->get_widget("Principal", pWindow);
        refXml->get_widget_derived("mnu_file_exit", mnu_file_exit);

+       refXml->get_widget_derived("mnu_help_about", mnu_help_about);

        refXml->get_widget("bar_exit", bar_exit);
        refXml->get_widget("bar_exit", bar_exit);

+       refXml->get_widget("work_place", work_place);
+       work_place->set_size_request(10000, 10000);

        bar_exit->signal_clicked().connect( SigC::slot(Gtk::Main::quit) );
        client.run(*pWindow);
 
        bar_exit->signal_clicked().connect( SigC::slot(Gtk::Main::quit) );
        client.run(*pWindow);
 

diff --git a/docs/ejemplo_doxygen.h b/docs/ejemplo_doxygen.h
index e389208e3db27e541903d5457664502cc91d835a..6625e06d5198923efb112eee44e36975d878bd53 100644 (file)
--- a/docs/ejemplo_doxygen.h
+++ b/docs/ejemplo_doxygen.h
@@ -1,16 +1,25 @@
-/* vim: set ts=4 sw=4 fdm=marker fmr={,} fdn=1 fo+=t tw=80:
+/***************************************************************************
+ * PlaQui - Simulador de Plantas Químicas

  *
  *

- * Taller de Programación (75.42).
- *
- * Trabajo Práctico Final:
- * Simulador de plantas químicas (A.K.A. plaqui)
- *
- * TODO poner cabecera más bonita. :)
+ * Desarrollado para : Taller de Programacion I (FIUBA)

  *
  *

+ * Un desarrollo de :
+ *             The PlaQui Development Team
+ *                     - Dimov, Nicolás <nicodimov@datafull.com>
+ *                     - Lucarella, Leandro <luca@llucax.hn.org>
+ *                     - Markiewicz, Ricardo <rmarkie@fi.uba.ar>
+ ***************************************************************************

  * Creado: lun oct 13 20:59:19 ART 2003
  *
  * $Id$
  * Creado: lun oct 13 20:59:19 ART 2003
  *
  * $Id$

- */
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/

 
 #ifndef FIGURA_H
 #define FIGURA_H
 
 #ifndef FIGURA_H
 #define FIGURA_H

diff --git a/docs/herramientas.txt b/docs/herramientas.txt
new file mode 100644 (file)
index 0000000..dba0fa9
--- /dev/null
+++ b/docs/herramientas.txt
@@ -0,0 +1,44 @@
+Aqui tenemos un listado de las herramientas y bibliotecas que estamos
+utilizando a fin de poder luego documentar de manera correcta los
+requerimientos para instalar y ejecutar el programa, las versiones y los
+programas utilizados durante el desarrollo.
+
+Herramientas
+------------
+       - Glade2 : Editor RAD para crear interfaces de usuario
+       - gcc (3.2.x) : Compilador C+++
+       - vim : Editor de texto utilizado para programar
+       - GNU Make
+       - Automake
+       - Autoconf
+
+Bibliotecas
+-----------
+       - Gtkmm ( >= 2.0.0) : warper a C++ de la biblioteca Gtk+
+       - Glademm ( >= 2.0.0) : Para cargar archivos XML con la UI
+       - Glibmm ( >= 2.0.0) : ???????
+
+Requerimientos
+--------------
+Requerimientos de HW y SF para correr las aplicaciones.
+       Cliente
+       -------
+               - Procesador  : PII 400 Mhz
+               - Memoria RAM : 64 Mb
+               - Espacio en disco : aun no confirmado
+               - SO : Gnu/Linux
+
+       Server  
+       -------
+               - Procesador  :
+               - Memoria RAM :
+               - Espacio en disco :
+               - SO : Gnu/Linux
+               
+       Constructor
+       -----------
+               - Procesador  :
+               - Memoria RAM :
+               - Espacio en disco :
+               - SO : Gnu/Linux
+