Bueh, termine de resolver conflictos.

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

diff --git a/demo/glade/mantener_planes.glade b/demo/glade/mantener_planes.glade
index 757cf4718d6e8547c7529567adb13533b33dce66..f9b681c6c35d17c24cce1987a0284f972de4a921 100644 (file)
--- a/demo/glade/mantener_planes.glade
+++ b/demo/glade/mantener_planes.glade
@@ -40,7 +40,6 @@
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
              <property name="response_id">-7</property>
-             <signal name="clicked" handler="OnConsultarAfiliadoClose" last_modification_time="Thu, 09 Jun 2005 04:57:08 GMT"/>
            </widget>
          </child>
        </widget>
@@ -88,7 +87,7 @@
                      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
                      <child>
-                       <widget class="GtkTreeView" id="treeview1">
+                       <widget class="GtkTreeView" id="lista">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
                          <property name="headers_visible">True</property>
@@ -151,6 +150,7 @@
                  <property name="use_stock">True</property>
                  <property name="relief">GTK_RELIEF_NORMAL</property>
                  <property name="focus_on_click">True</property>
+                 <signal name="clicked" handler="OnAdd" last_modification_time="Tue, 28 Jun 2005 15:55:41 GMT"/>
                </widget>
              </child>
 
@@ -163,6 +163,7 @@
                  <property name="use_stock">True</property>
                  <property name="relief">GTK_RELIEF_NORMAL</property>
                  <property name="focus_on_click">True</property>
+                 <signal name="clicked" handler="OnProperties" last_modification_time="Tue, 28 Jun 2005 15:55:51 GMT"/>
                </widget>
              </child>
 
@@ -175,6 +176,7 @@
                  <property name="use_stock">True</property>
                  <property name="relief">GTK_RELIEF_NORMAL</property>
                  <property name="focus_on_click">True</property>
+                 <signal name="clicked" handler="OnDelete" last_modification_time="Tue, 28 Jun 2005 15:55:58 GMT"/>
                </widget>
              </child>
            </widget>
@@ -196,6 +198,7 @@
 </widget>
 
 <widget class="GtkDialog" id="alta_plan">
+  <property name="height_request">450</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Alta de Plan</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -210,6 +213,7 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="has_separator">True</property>
+  <signal name="response" handler="OnAltaPlan" last_modification_time="Tue, 28 Jun 2005 16:04:15 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox2">
@@ -231,7 +235,7 @@
              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <property name="response_id">-6</property>
+             <property name="response_id">0</property>
            </widget>
          </child>
 
@@ -244,7 +248,7 @@
              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <property name="response_id">-5</property>
+             <property name="response_id">1</property>
            </widget>
          </child>
        </widget>
@@ -264,6 +268,7 @@
 
          <child>
            <widget class="GtkFrame" id="frame5">
+             <property name="border_width">12</property>
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
              <property name="label_yalign">0.5</property>
@@ -375,7 +380,7 @@
                      </child>
 
                      <child>
-                       <widget class="GtkEntry" id="entry1">
+                       <widget class="GtkEntry" id="descripcion">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
                          <property name="editable">True</property>
@@ -396,27 +401,32 @@
                      </child>
 
                      <child>
-                       <widget class="GtkComboBox" id="combobox1">
+                       <widget class="GtkSpinButton" id="permanencia_minima">
                          <property name="visible">True</property>
-                         <property name="add_tearoffs">False</property>
-                         <property name="focus_on_click">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="climb_rate">1</property>
+                         <property name="digits">0</property>
+                         <property name="numeric">False</property>
+                         <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                         <property name="snap_to_ticks">False</property>
+                         <property name="wrap">False</property>
+                         <property name="adjustment">1 0 100 1 10 10</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="x_options">fill</property>
-                         <property name="y_options">fill</property>
+                         <property name="top_attach">2</property>
+                         <property name="bottom_attach">3</property>
+                         <property name="y_options"></property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkSpinButton" id="spinbutton1">
+                       <widget class="GtkSpinButton" id="categoria">
                          <property name="visible">True</property>
                          <property name="can_focus">True</property>
                          <property name="climb_rate">1</property>
-                         <property name="digits">0</property>
+                         <property name="digits">2</property>
                          <property name="numeric">False</property>
                          <property name="update_policy">GTK_UPDATE_ALWAYS</property>
                          <property name="snap_to_ticks">False</property>
@@ -426,8 +436,8 @@
                        <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="top_attach">1</property>
+                         <property name="bottom_attach">2</property>
                          <property name="y_options"></property>
                        </packing>
                      </child>
@@ -468,6 +478,7 @@
 
          <child>
            <widget class="GtkFrame" id="frame6">
+             <property name="border_width">12</property>
              <property name="visible">True</property>
              <property name="label_xalign">0</property>
              <property name="label_yalign">0.5</property>
@@ -501,7 +512,7 @@
                          <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
                          <child>
-                           <widget class="GtkTreeView" id="treeview2">
+                           <widget class="GtkTreeView" id="coberturas">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
                              <property name="headers_visible">True</property>
@@ -537,6 +548,7 @@
                              <property name="use_stock">True</property>
                              <property name="relief">GTK_RELIEF_NORMAL</property>
                              <property name="focus_on_click">True</property>
+                             <signal name="clicked" handler="OnAddCobertura" last_modification_time="Tue, 28 Jun 2005 16:29:30 GMT"/>
                            </widget>
                          </child>
 
@@ -720,7 +732,7 @@
              <property name="spacing">0</property>
 
              <child>
-               <widget class="GtkEntry" id="entry2">
+               <widget class="GtkEntry" id="codigo_prestacion">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="editable">True</property>
@@ -882,7 +894,7 @@
              <property name="spacing">0</property>
 
              <child>
-               <widget class="GtkRadioButton" id="radiobutton1">
+               <widget class="GtkRadioButton" id="tipo_auth">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="label" translatable="yes">Manual</property>
@@ -911,7 +923,7 @@
                  <property name="active">False</property>
                  <property name="inconsistent">False</property>
                  <property name="draw_indicator">True</property>
-                 <property name="group">radiobutton1</property>
+                 <property name="group">tipo_auth</property>
                </widget>
                <packing>
                  <property name="padding">0</property>
@@ -931,7 +943,7 @@
          </child>
 
          <child>
-           <widget class="GtkEntry" id="entry3">
+           <widget class="GtkEntry" id="carencia">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="editable">True</property>
@@ -952,7 +964,7 @@
          </child>
 
          <child>
-           <widget class="GtkSpinButton" id="spinbutton2">
+           <widget class="GtkSpinButton" id="cobertura">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="climb_rate">1</property>
@@ -973,7 +985,7 @@
          </child>
 
          <child>
-           <widget class="GtkSpinButton" id="spinbutton3">
+           <widget class="GtkSpinButton" id="limite_anual">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="climb_rate">1</property>