* logo feo para hacer que la ventana principal no sea taaaaan aburrida

diff --git a/demo/glade/main.glade b/demo/glade/main.glade
index 080383be618854e1f54f2a7b05fe72ed95aafd6d..1510b77955505759d9e1fdbb71de978c831a0f93 100644 (file)
--- a/demo/glade/main.glade
+++ b/demo/glade/main.glade
@@ -23,6 +23,8 @@
 
   <child>
     <widget class="GtkVBox" id="vbox1">
+      <property name="width_request">700</property>
+      <property name="height_request">500</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -266,22 +268,12 @@
       </child>
 
       <child>
-       <widget class="GtkLabel" id="label1">
+       <widget class="GtkImage" id="logo">
          <property name="visible">True</property>
-         <property name="label" translatable="yes"></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>
-         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-         <property name="width_chars">-1</property>
-         <property name="single_line_mode">False</property>
-         <property name="angle">0</property>
        </widget>
        <packing>
          <property name="padding">0</property>

diff --git a/demo/src/Main.cs b/demo/src/Main.cs
index 602483b0b1e6c1a706a66b4cf7e35d050dbd453b..8b5f7e76a6c2d7ce1b89cdb957650bd376848d6b 100644 (file)
--- a/demo/src/Main.cs
+++ b/demo/src/Main.cs
@@ -14,6 +14,7 @@ public class App
        Dialog wConsultarAfiliado;
        ArrayList lst;
        Glade.XML xmla;
+       [Widget] Image logo;
 
        #region Tests
 
@@ -53,6 +54,7 @@ public class App
                gxml.Autoconnect (this);
 
                #warning Descomentar para inicializar la base de datos con algunos valores de prueba !
+               logo.FromFile = "logo.png";
                /* InitDemo (); */
                Application.Run();
        }

diff --git a/demo/src/Makefile b/demo/src/Makefile
index 0af2dba9060e3b21f00c7ab410a7d8cd7a720cef..4627fc0c2877a119af68f1519473fa31da12b944 100644 (file)
--- a/demo/src/Makefile
+++ b/demo/src/Makefile
@@ -11,7 +11,7 @@ SOURCE_EXCEPCIONES=$(shell ls --color=none Excepciones/*.cs)
 SOURCE=$(SOURCE_DOMINIO) $(SOURCE_CONTROLADOR) $(SOURCE_EXTRA) $(SOURCE_VISTAS) $(SOURCE_TEST) $(SOURCE_REPORTES) $(SOURCE_EXCEPCIONES)
 
 LIBS=-pkg:glade-sharp-2.0 -pkg:gtk-sharp-2.0 -r:./bin/db4o.dll
-GLADE_FILES=$(shell ls --color=none ../glade/*.glade)
+GLADE_FILES=$(shell ls --color=none ../glade/*.glade ../glade/*.png)
 GLADE=$(foreach file,$(GLADE_FILES), $(addprefix -resource:,$(file)),$(notdir $(file)))
 
 

diff --git a/demo/src/Vistas/RevisarAutorizacionManual.cs b/demo/src/Vistas/RevisarAutorizacionManual.cs
index 7aab43343f915fc4b6b39112ce6de0e4d9b6de68..f6d0ff4881958508c760f4434ff5cd97a6c1618b 100644 (file)
--- a/demo/src/Vistas/RevisarAutorizacionManual.cs
+++ b/demo/src/Vistas/RevisarAutorizacionManual.cs
@@ -22,17 +22,15 @@ public class VRevisarAutorizacionManual
                xml = new Glade.XML (null, "actualizar_autorizacion_manual.glade", "autorizaciones_pendientes", null);
                xml.Autoconnect (this);
 
-               /* Creo los modelos para los TreeView y el ComboBox 
-                                                   Tipo Doc        NroDoc         Apellido       Nombre     */
-               lista.Model = new ListStore (typeof(string), typeof(int), typeof (string), typeof (string));
+               lista.Model = new ListStore (typeof(int), typeof(string), typeof (string), typeof (string), typeof(string));
 
                /* Columnas */
                lista.HeadersVisible = true;
                lista.AppendColumn ("Codigo", new CellRendererText (), "text", 0);
                lista.AppendColumn ("Fecha Solicitud", new CellRendererText (), "text", 1);
                lista.AppendColumn ("Prestacion", new CellRendererText (), "text", 2);
-               lista.AppendColumn ("Afiliado", new CellRendererText (), "text", 2);
-               lista.AppendColumn ("Prestador", new CellRendererText (), "text", 3);
+               lista.AppendColumn ("Afiliado", new CellRendererText (), "text", 3);
+               lista.AppendColumn ("Prestador", new CellRendererText (), "text", 4);
        
                CargarAutorizaciones ();
        }

diff --git a/demo/src/logo.png b/demo/src/logo.png
new file mode 100644 (file)
index 0000000..60618fa
Binary files /dev/null and b/demo/src/logo.png differ