Creo que esto va a ser presentable para maniana. Luca si podes dale esto a Gonzalo...

[z.facultad/75.42/plaqui.git] / Constructor / constructor.glade

diff --git a/Constructor/constructor.glade b/Constructor/constructor.glade
index cf3c90b0abaacd20ae08bbc5a34eb7c8e227b200..9703aa672e30707d5afde72491032577ea9f765c 100644 (file)
--- a/Constructor/constructor.glade
+++ b/Constructor/constructor.glade
@@ -29,7 +29,7 @@
          <property name="yscale">1</property>
 
          <child>
          <property name="yscale">1</property>
 
          <child>

-           <widget class="GtkMenuBar" id="menu">
+           <widget class="GtkMenuBar" id="main_menu">

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


@@ -507,10 +507,10 @@ Empalme</property>
   </child>
 </widget>
 
   </child>
 </widget>
 

-<widget class="GtkDialog" id="dialog1">
-  <property name="width_request">271</property>
-  <property name="height_request">194</property>
-  <property name="title" translatable="yes">Propiedades</property>
+<widget class="GtkDialog" id="cistern_pty_wnd">
+  <property name="width_request">289</property>
+  <property name="height_request">143</property>
+  <property name="title" translatable="yes">Propiedades del Tanque</property>

   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">False</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">False</property>


@@ -527,10 +527,10 @@ Empalme</property>
       <child internal-child="action_area">
        <widget class="GtkHButtonBox" id="dialog-action_area1">
          <property name="visible">True</property>
       <child internal-child="action_area">
        <widget class="GtkHButtonBox" id="dialog-action_area1">
          <property name="visible">True</property>

-         <property name="layout_style">GTK_BUTTONBOX_END</property>
+         <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>

 
          <child>
 
          <child>

-           <widget class="GtkButton" id="cancelbutton1">
+           <widget class="GtkButton" id="btn_cancel">

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


@@ -542,7 +542,7 @@ Empalme</property>
          </child>
 
          <child>
          </child>
 
          <child>

-           <widget class="GtkButton" id="okbutton1">
+           <widget class="GtkButton" id="btn_accept">

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


@@ -552,6 +552,18 @@ Empalme</property>
              <property name="response_id">-5</property>
            </widget>
          </child>
              <property name="response_id">-5</property>
            </widget>
          </child>

+
+         <child>
+           <widget class="GtkButton" id="btn_apply">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-apply</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="response_id">-10</property>
+           </widget>
+         </child>

        </widget>
        <packing>
          <property name="padding">0</property>
        </widget>
        <packing>
          <property name="padding">0</property>


@@ -562,139 +574,373 @@ Empalme</property>
       </child>
 
       <child>
       </child>
 
       <child>

-       <widget class="GtkFixed" id="fixed2">
+       <widget class="GtkTable" id="table2">

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

+         <property name="n_rows">3</property>
+         <property name="n_columns">2</property>
+         <property name="homogeneous">True</property>
+         <property name="row_spacing">0</property>
+         <property name="column_spacing">0</property>

 
          <child>
 
          <child>

-           <widget class="GtkSpinButton" id="spinbutton1">
-             <property name="width_request">46</property>
-             <property name="height_request">25</property>
+           <widget class="GtkSpinButton" id="spin_caudal">

              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="climb_rate">1</property>
              <property name="visible">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="digits">1</property>
+             <property name="numeric">True</property>

              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
              <property name="snap_to_ticks">False</property>
              <property name="wrap">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>
+             <property name="adjustment">0 0 100 0.1 10 10</property>

            </widget>
            <packing>
            </widget>
            <packing>

-             <property name="x">168</property>
-             <property name="y">16</property>
+             <property name="left_attach">1</property>
+             <property name="right_attach">2</property>
+             <property name="top_attach">0</property>
+             <property name="bottom_attach">1</property>
+             <property name="y_options"></property>

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

-           <widget class="GtkSpinButton" id="spinbutton2">
-             <property name="width_request">48</property>
-             <property name="height_request">24</property>
+           <widget class="GtkSpinButton" id="spin_fluido_max">

              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="climb_rate">1</property>
              <property name="visible">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="digits">1</property>
+             <property name="numeric">True</property>

              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
              <property name="snap_to_ticks">False</property>
              <property name="wrap">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>
+             <property name="adjustment">0 0 100 0.1 10 10</property>

            </widget>
            <packing>
            </widget>
            <packing>

-             <property name="x">168</property>
-             <property name="y">56</property>
+             <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>
 
          <child>
            </packing>
          </child>
 
          <child>

-           <widget class="GtkSpinButton" id="spinbutton3">
-             <property name="width_request">48</property>
-             <property name="height_request">24</property>
+           <widget class="GtkSpinButton" id="spinbutton9">

              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="climb_rate">1</property>
              <property name="visible">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="digits">1</property>
+             <property name="numeric">True</property>

              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
              <property name="snap_to_ticks">False</property>
              <property name="wrap">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>
+             <property name="adjustment">0 0 100 0.1 10 10</property>

            </widget>
            <packing>
            </widget>
            <packing>

-             <property name="x">168</property>
-             <property name="y">96</property>
+             <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="y_options"></property>

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

-           <widget class="GtkLabel" id="lb_max_fluid">
-             <property name="width_request">104</property>
-             <property name="height_request">24</property>
+           <widget class="GtkLabel" id="label14">

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

-             <property name="label" translatable="yes">Fluido Máximo</property>
+             <property name="label" translatable="yes">Capacidad Máxima</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="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="xalign">0</property>

              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
            </widget>
            <packing>
              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
            </widget>
            <packing>

-             <property name="x">32</property>
-             <property name="y">16</property>
+             <property name="left_attach">0</property>
+             <property name="right_attach">1</property>
+             <property name="top_attach">0</property>
+             <property name="bottom_attach">1</property>
+             <property name="x_options">fill</property>
+             <property name="y_options"></property>

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

-           <widget class="GtkLabel" id="lb_min_flui">
-             <property name="width_request">120</property>
-             <property name="height_request">24</property>
+           <widget class="GtkLabel" id="label15">

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

-             <property name="label" translatable="yes">Fluido Mínimo</property>
+             <property name="label" translatable="yes">Fluido Máximo</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="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="xalign">0</property>

              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
            </widget>
            <packing>
              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
            </widget>
            <packing>

-             <property name="x">24</property>
-             <property name="y">56</property>
+             <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>
 
          <child>
            </packing>
          </child>
 
          <child>

-           <widget class="GtkLabel" id="label3">
-             <property name="width_request">96</property>
-             <property name="height_request">24</property>
+           <widget class="GtkLabel" id="label16">

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

-             <property name="label" translatable="yes">otra cosa</property>
+             <property name="label" translatable="yes">Otro</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="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="xalign">0</property>

              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
            </widget>
            <packing>
              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
            </widget>
            <packing>

-             <property name="x">32</property>
-             <property name="y">96</property>
+             <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>
        </widget>
        <packing>
          <property name="padding">0</property>
          <property name="expand">True</property>
            </packing>
          </child>
        </widget>
        <packing>
          <property name="padding">0</property>
          <property name="expand">True</property>

+         <property name="fill">False</property>
+         <property name="pack_type">GTK_PACK_END</property>
+       </packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkDialog" id="conduct_pty_wnd">
+  <property name="title" translatable="yes">Propiedades del Tubo</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER</property>
+  <property name="modal">False</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox2">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+       <widget class="GtkHButtonBox" id="dialog-action_area2">
+         <property name="visible">True</property>
+         <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+         <child>
+           <widget class="GtkButton" id="btn_cancel">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-cancel</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="response_id">-6</property>
+           </widget>
+         </child>
+
+         <child>
+           <widget class="GtkButton" id="btn_apply">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-apply</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="response_id">-10</property>
+           </widget>
+         </child>
+
+         <child>
+           <widget class="GtkButton" id="btn_accept">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-ok</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="response_id">-5</property>
+           </widget>
+         </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">False</property>

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

+         <property name="pack_type">GTK_PACK_END</property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkTable" id="table1">
+         <property name="visible">True</property>
+         <property name="n_rows">3</property>
+         <property name="n_columns">2</property>
+         <property name="homogeneous">True</property>
+         <property name="row_spacing">0</property>
+         <property name="column_spacing">0</property>
+
+         <child>
+           <widget class="GtkSpinButton" id="spinbutton4">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="climb_rate">1</property>
+             <property name="digits">1</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">0 0 100 0.1 10 10</property>
+           </widget>
+           <packing>
+             <property name="left_attach">1</property>
+             <property name="right_attach">2</property>
+             <property name="top_attach">0</property>
+             <property name="bottom_attach">1</property>
+             <property name="y_options"></property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkLabel" id="label11">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">Flujo Máximo</property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_CENTER</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>
+           </widget>
+           <packing>
+             <property name="left_attach">0</property>
+             <property name="right_attach">1</property>
+             <property name="top_attach">0</property>
+             <property name="bottom_attach">1</property>
+             <property name="x_options">fill</property>
+             <property name="y_options"></property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkSpinButton" id="spinbutton5">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="climb_rate">1</property>
+             <property name="digits">1</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">0 0 100 0.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="y_options"></property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkSpinButton" id="spinbutton6">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="climb_rate">1</property>
+             <property name="digits">1</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">0 0 100 0.1 10 10</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="y_options"></property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkLabel" id="label12">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">Longitud</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>
+           </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>
+
+         <child>
+           <widget class="GtkLabel" id="label13">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">Otro</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>
+           </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>
+       </widget>
+       <packing>
+         <property name="padding">10</property>
+         <property name="expand">True</property>
+         <property name="fill">False</property>
+         <property name="pack_type">GTK_PACK_END</property>

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