- saco estos archivos porque no los uso y me molestan

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index c71b849a0c4e3cf58fcd429eab4ae5db6da6d846..0cd46d8b13869edbb668e3e552fc6f490c3d5832 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -47,10 +47,7 @@ bool Cistern::on_button_press_event(GdkEventButton *event)
        }
        
        if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){
        }
        
        if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){

-               if( property_wnd->is_open() == false ){
-                       property_wnd->show();
-                       property_wnd->set_open (true);
-               } 
+               property_wnd->show();

        }               
        return true;
 }
        }               
        return true;
 }

diff --git a/Constructor/cistern.h b/Constructor/cistern.h
index f4affb501217a759ae21d773e4e4fe0f5700ec02..bad3ff1a2fd01d7c37569a73445456315f1f5650 100644 (file)
--- a/Constructor/cistern.h
+++ b/Constructor/cistern.h
@@ -3,7 +3,7 @@
 #define _CISTERN_H_
 
 #include "item.h"
 #define _CISTERN_H_
 
 #include "item.h"

-#include "cisternptywnd.h"
+

 class Cistern : public CItem {
        public:
                Cistern();
 class Cistern : public CItem {
        public:
                Cistern();

diff --git a/Constructor/cisternptywnd.cpp b/Constructor/cisternptywnd.cpp
deleted file mode 100644 (file)
index 98acbd6..0000000
--- a/Constructor/cisternptywnd.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-//cisternptywnd.cpp
-
-#include "cisternptywnd.h"
-
-CisternPtyWnd::CisternPtyWnd():PropertyWnd()
-{
-}
-
-CisternPtyWnd::~CisternPtyWnd()
-{
-}

diff --git a/Constructor/cisternptywnd.h b/Constructor/cisternptywnd.h
deleted file mode 100644 (file)
index 2429af4..0000000
--- a/Constructor/cisternptywnd.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//cisternptywnd.h
-
-#ifndef _CISTERNPTYWND_H_
-#define _CISTERNPTYWND_H_
-
-#include "propertywnd.h"
-
-class CisternPtyWnd : public PropertyWnd{
-       public:
-               CisternPtyWnd();
-               virtual ~CisternPtyWnd();
-       protected:
-               
-       
-};
-
-#endif

diff --git a/Constructor/conduct.cpp b/Constructor/conduct.cpp
index 4b7fa17032c46822b554a42c12db99f3862dfba0..d10c0c542d02bfe2b7d0e5f788ef15cd9df8736d 100644 (file)
--- a/Constructor/conduct.cpp
+++ b/Constructor/conduct.cpp
@@ -49,10 +49,7 @@ bool Conduct::on_button_press_event(GdkEventButton *event)
        }
        
        if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){
        }
        
        if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){

-               if( property_wnd->is_open() == false ){

                        property_wnd->show();
                        property_wnd->show();

-                       property_wnd->set_open (true);
-               } 

        }
        return true;
 }
        }
        return true;
 }

diff --git a/Constructor/conductptywnd.cpp b/Constructor/conductptywnd.cpp
deleted file mode 100644 (file)
index f1650d3..0000000
--- a/Constructor/conductptywnd.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-//conductptywnd.cpp
-
-#include "conductptywnd.h"
-
-ConductPtyWnd::ConductPtyWnd():PropertyWnd()
-{
-}
-
-ConductPtyWnd::~ConductPtyWnd()
-{
-}

diff --git a/Constructor/conductptywnd.h b/Constructor/conductptywnd.h
deleted file mode 100644 (file)
index 3afb970..0000000
--- a/Constructor/conductptywnd.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//conductptywnd.h
-
-#ifndef _CONDUCTPTYWND_H_
-#define _CONDUCTPTYWND_H_
-
-#include "propertywnd.h"
-
-class ConductPtyWnd : public PropertyWnd{
-       public:
-               ConductPtyWnd();
-               virtual ~ConductPtyWnd();
-       protected:
-               
-       
-};
-
-#endif

diff --git a/Constructor/constructor.glade b/Constructor/constructor.glade
index e1d757d44fd2573394c59f94105a1b85e2f4f0f2..9e96c17444addc094be9690dacc34ced0ba67e90 100644 (file)
--- a/Constructor/constructor.glade
+++ b/Constructor/constructor.glade
@@ -508,8 +508,8 @@ Empalme</property>
 </widget>
 
 <widget class="GtkDialog" id="cistern_pty_wnd">
 </widget>
 
 <widget class="GtkDialog" id="cistern_pty_wnd">

-  <property name="width_request">354</property>
-  <property name="height_request">194</property>
+  <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="title" translatable="yes">Propiedades del Tanque</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>


@@ -574,13 +574,16 @@ 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="spinbutton7">

              <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>


@@ -592,15 +595,16 @@ Empalme</property>
              <property name="adjustment">1 0 100 1 10 10</property>
            </widget>
            <packing>
              <property name="adjustment">1 0 100 1 10 10</property>
            </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="spinbutton8">

              <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>


@@ -612,15 +616,16 @@ Empalme</property>
              <property name="adjustment">1 0 100 1 10 10</property>
            </widget>
            <packing>
              <property name="adjustment">1 0 100 1 10 10</property>
            </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>


@@ -632,37 +637,40 @@ Empalme</property>
              <property name="adjustment">1 0 100 1 10 10</property>
            </widget>
            <packing>
              <property name="adjustment">1 0 100 1 10 10</property>
            </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">Capacidad</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="label" translatable="yes">Fluido Máximo</property>
              <property name="use_underline">False</property>
              <property name="visible">True</property>
              <property name="label" translatable="yes">Fluido Máximo</property>
              <property name="use_underline">False</property>


@@ -670,43 +678,50 @@ Empalme</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
              <property name="wrap">False</property>
              <property name="selectable">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 propiedad</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">True</property>
+         <property name="fill">False</property>
+         <property name="pack_type">GTK_PACK_END</property>

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


@@ -716,7 +731,7 @@ Empalme</property>
 <widget class="GtkDialog" id="conduct_pty_wnd">
   <property name="title" translatable="yes">Propiedades del Tubo</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
 <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_NONE</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="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>

diff --git a/Constructor/item.h b/Constructor/item.h
index 5b2822944638cfeb3fc82329d7d9943cd549cc28..900e335271b89298efa9d1db7c775f9745878759 100644 (file)
--- a/Constructor/item.h
+++ b/Constructor/item.h
@@ -1,5 +1,3 @@
-
-

 #ifndef GTKMM_EXAMPLE_DRAWINGAREALINES_H
 #define GTKMM_EXAMPLE_DRAWINGAREALINES_H
 
 #ifndef GTKMM_EXAMPLE_DRAWINGAREALINES_H
 #define GTKMM_EXAMPLE_DRAWINGAREALINES_H
 

diff --git a/Constructor/propertywnd.cpp b/Constructor/propertywnd.cpp
index c929c5b3b51b72aa88c66c645b224b30b11d9b2e..06b2cd6ee407056aefe328e6e822d63fb45f77cf 100644 (file)
--- a/Constructor/propertywnd.cpp
+++ b/Constructor/propertywnd.cpp
@@ -4,7 +4,6 @@
 
 PropertyWnd::PropertyWnd()
 {
 
 PropertyWnd::PropertyWnd()
 {

-       open = false;

 }
 
 PropertyWnd::PropertyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade): Gtk::Window(cobject)
 }
 
 PropertyWnd::PropertyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade): Gtk::Window(cobject)


@@ -14,7 +13,6 @@ PropertyWnd::PropertyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glad
        refGlade->get_widget("btn_accept", btn_accept);
                
        btn_cancel->signal_clicked().connect(SigC::slot(*this, &PropertyWnd::on_btn_cancel_clicked));
        refGlade->get_widget("btn_accept", btn_accept);
                
        btn_cancel->signal_clicked().connect(SigC::slot(*this, &PropertyWnd::on_btn_cancel_clicked));

-       open = false;

 }
 
 PropertyWnd::~PropertyWnd()
 }
 
 PropertyWnd::~PropertyWnd()


@@ -23,17 +21,6 @@ PropertyWnd::~PropertyWnd()
 
 void PropertyWnd::on_btn_cancel_clicked()
 {
 
 void PropertyWnd::on_btn_cancel_clicked()
 {

-       open = false;

        hide();
        //oculto la ventana, tengo que ver como hago para cerrarla del todo.
 }
        hide();
        //oculto la ventana, tengo que ver como hago para cerrarla del todo.
 }

-
-bool PropertyWnd::is_open()
-{
-       return open;
-}
-
-void PropertyWnd::set_open(bool o)
-{
-       open = o;
-}

diff --git a/Constructor/propertywnd.h b/Constructor/propertywnd.h
index bd5d40a1e085b586d196841fb8c568ae9b60db5d..c9783705f85906af3067c7c1f90ca7e5e77819c8 100644 (file)
--- a/Constructor/propertywnd.h
+++ b/Constructor/propertywnd.h
@@ -12,11 +12,7 @@ class PropertyWnd : public Gtk::Window{
                PropertyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
                virtual ~PropertyWnd();
                
                PropertyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
                virtual ~PropertyWnd();
                

-               bool is_open();
-               void set_open(bool);
-       

        protected:
        protected:

-               bool open;

                Gtk::Button *btn_cancel, *btn_accept, *btn_apply;
                virtual void on_btn_cancel_clicked();
        
                Gtk::Button *btn_cancel, *btn_accept, *btn_apply;
                virtual void on_btn_cancel_clicked();