Bueh, termine de resolver conflictos.

[z.facultad/75.10/miklolife.git] / demo / glade / actualizar_autorizacion_manual.glade

diff --git a/demo/glade/actualizar_autorizacion_manual.glade b/demo/glade/actualizar_autorizacion_manual.glade
index 3f6c0a2fdfa6fb3669d2bb8faaf0eafd8a7ad332..9cc1799eb89f81497b8d9e1b4e1b56856870f5cc 100644 (file)
--- a/demo/glade/actualizar_autorizacion_manual.glade
+++ b/demo/glade/actualizar_autorizacion_manual.glade
@@ -480,34 +480,6 @@
                            </packing>
                          </child>
 
                            </packing>
                          </child>
 

-                         <child>
-                           <widget class="GtkLabel" id="label5">
-                             <property name="visible">True</property>
-                             <property name="label" translatable="yes">label5</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</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="left_attach">0</property>
-                             <property name="right_attach">1</property>
-                             <property name="top_attach">2</property>
-                             <property name="bottom_attach">3</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"></property>
-                           </packing>
-                         </child>
-

                          <child>
                            <widget class="GtkEntry" id="entry1">
                              <property name="visible">True</property>
                          <child>
                            <widget class="GtkEntry" id="entry1">
                              <property name="visible">True</property>


@@ -551,22 +523,57 @@
                          </child>
 
                          <child>
                          </child>
 
                          <child>

-                           <widget class="GtkEntry" id="entry3">
+                           <widget class="GtkLabel" id="label28">

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

-                             <property name="can_focus">True</property>
-                             <property name="editable">False</property>
-                             <property name="visibility">True</property>
-                             <property name="max_length">0</property>
-                             <property name="text" translatable="yes"></property>
-                             <property name="has_frame">True</property>
-                             <property name="invisible_char">*</property>
-                             <property name="activates_default">False</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</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="left_attach">0</property>
+                             <property name="right_attach">1</property>
+                             <property name="top_attach">2</property>
+                             <property name="bottom_attach">3</property>
+                             <property name="x_options">fill</property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkLabel" id="label29">
+                             <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</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="left_attach">1</property>
                              <property name="right_attach">2</property>
                              <property name="top_attach">2</property>
                              <property name="bottom_attach">3</property>
                            </widget>
                            <packing>
                              <property name="left_attach">1</property>
                              <property name="right_attach">2</property>
                              <property name="top_attach">2</property>
                              <property name="bottom_attach">3</property>

+                             <property name="x_options">fill</property>

                              <property name="y_options"></property>
                            </packing>
                          </child>
                              <property name="y_options"></property>
                            </packing>
                          </child>


@@ -1347,7 +1354,7 @@ CI</property>
                      <child>
                        <widget class="GtkLabel" id="label24">
                          <property name="visible">True</property>
                      <child>
                        <widget class="GtkLabel" id="label24">
                          <property name="visible">True</property>

-                         <property name="label" translatable="yes">El afiliado [no] presenta deuda [de N meses]</property>
+                         <property name="label" translatable="yes">El afiliado [no]  presenta deuda </property>

                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
                          <property name="use_underline">False</property>
                          <property name="use_markup">False</property>
                          <property name="justify">GTK_JUSTIFY_LEFT</property>


@@ -1424,7 +1431,7 @@ CI</property>
                          <child>
                            <widget class="GtkLabel" id="label22">
                              <property name="visible">True</property>
                          <child>
                            <widget class="GtkLabel" id="label22">
                              <property name="visible">True</property>

-                             <property name="label" translatable="yes">El plan Cubre/NoCubre la Prestacion</property>
+                             <property name="label" translatable="yes">El plan [Cubre/NoCubre] la Prestacion</property>

                              <property name="use_underline">False</property>
                              <property name="use_markup">False</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>
                              <property name="use_underline">False</property>
                              <property name="use_markup">False</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>


@@ -1518,7 +1525,7 @@ CI</property>
                      <child>
                        <widget class="GtkTable" id="table3">
                          <property name="visible">True</property>
                      <child>
                        <widget class="GtkTable" id="table3">
                          <property name="visible">True</property>

-                         <property name="n_rows">2</property>
+                         <property name="n_rows">3</property>

                          <property name="n_columns">2</property>
                          <property name="homogeneous">False</property>
                          <property name="row_spacing">8</property>
                          <property name="n_columns">2</property>
                          <property name="homogeneous">False</property>
                          <property name="row_spacing">8</property>


@@ -1585,12 +1592,61 @@ CI</property>
                            <packing>
                              <property name="left_attach">0</property>
                              <property name="right_attach">2</property>
                            <packing>
                              <property name="left_attach">0</property>
                              <property name="right_attach">2</property>

+                             <property name="top_attach">2</property>
+                             <property name="bottom_attach">3</property>
+                             <property name="x_options">fill</property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkLabel" id="label27">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">Límite Anual : </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</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="left_attach">0</property>
+                             <property name="right_attach">1</property>

                              <property name="top_attach">1</property>
                              <property name="bottom_attach">2</property>
                              <property name="x_options">fill</property>
                              <property name="y_options"></property>
                            </packing>
                          </child>
                              <property name="top_attach">1</property>
                              <property name="bottom_attach">2</property>
                              <property name="x_options">fill</property>
                              <property name="y_options"></property>
                            </packing>
                          </child>

+
+                         <child>
+                           <widget class="GtkEntry" id="entry10">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="editable">True</property>
+                             <property name="visibility">True</property>
+                             <property name="max_length">0</property>
+                             <property name="text" translatable="yes"></property>
+                             <property name="has_frame">True</property>
+                             <property name="invisible_char">*</property>
+                             <property name="activates_default">False</property>
+                           </widget>
+                           <packing>
+                             <property name="left_attach">1</property>
+                             <property name="right_attach">2</property>
+                             <property name="top_attach">1</property>
+                             <property name="bottom_attach">2</property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>

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