From e963d0f06ef9f5002bd3083cea62e7590323623f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Nicol=C3=A1s=20Dimov?= <ndimov@gmail.com>
Date: Tue, 28 Oct 2003 21:45:01 +0000
Subject: [PATCH 1/1] - saco estos archivos porque no los uso y me molestan

---
 Constructor/cistern.cpp       |  5 +-
 Constructor/cistern.h         |  2 +-
 Constructor/cisternptywnd.cpp | 11 ----
 Constructor/cisternptywnd.h   | 17 -------
 Constructor/conduct.cpp       |  3 --
 Constructor/conductptywnd.cpp | 11 ----
 Constructor/conductptywnd.h   | 17 -------
 Constructor/constructor.glade | 95 ++++++++++++++++++++---------------
 Constructor/item.h            |  2 -
 Constructor/propertywnd.cpp   | 13 -----
 Constructor/propertywnd.h     |  4 --
 11 files changed, 57 insertions(+), 123 deletions(-)
 delete mode 100644 Constructor/cisternptywnd.cpp
 delete mode 100644 Constructor/cisternptywnd.h
 delete mode 100644 Constructor/conductptywnd.cpp
 delete mode 100644 Constructor/conductptywnd.h

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index c71b849..0cd46d8 100644
--- 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( property_wnd->is_open() == false ){
-			property_wnd->show();
-			property_wnd->set_open (true);
-		} 
+		property_wnd->show();
 	}		
 	return true;
 }
diff --git a/Constructor/cistern.h b/Constructor/cistern.h
index f4affb5..bad3ff1 100644
--- a/Constructor/cistern.h
+++ b/Constructor/cistern.h
@@ -3,7 +3,7 @@
 #define _CISTERN_H_
 
 #include "item.h"
-#include "cisternptywnd.h"
+
 class Cistern : public CItem {
 	public:
 		Cistern();
diff --git a/Constructor/cisternptywnd.cpp b/Constructor/cisternptywnd.cpp
deleted file mode 100644
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
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 4b7fa17..d10c0c5 100644
--- 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( property_wnd->is_open() == false ){
 			property_wnd->show();
-			property_wnd->set_open (true);
-		} 
 	}
 	return true;
 }
diff --git a/Constructor/conductptywnd.cpp b/Constructor/conductptywnd.cpp
deleted file mode 100644
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
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 e1d757d..9e96c17 100644
--- a/Constructor/constructor.glade
+++ b/Constructor/constructor.glade
@@ -508,8 +508,8 @@ Empalme</property>
 </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>
@@ -574,13 +574,16 @@ Empalme</property>
       </child>
 
       <child>
-	<widget class="GtkFixed" id="fixed2">
+	<widget class="GtkTable" id="table2">
 	  <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="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>
@@ -592,15 +595,16 @@ Empalme</property>
 	      <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>
-	    <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>
@@ -612,15 +616,16 @@ Empalme</property>
 	      <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>
-	    <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>
@@ -632,37 +637,40 @@ Empalme</property>
 	      <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>
-	    <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="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="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="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>
-	    <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>
@@ -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="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="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>
-	    <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="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="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="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>
-	  <property name="fill">True</property>
+	  <property name="fill">False</property>
+	  <property name="pack_type">GTK_PACK_END</property>
 	</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>
-  <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>
diff --git a/Constructor/item.h b/Constructor/item.h
index 5b28229..900e335 100644
--- a/Constructor/item.h
+++ b/Constructor/item.h
@@ -1,5 +1,3 @@
-
-
 #ifndef GTKMM_EXAMPLE_DRAWINGAREALINES_H
 #define GTKMM_EXAMPLE_DRAWINGAREALINES_H
 
diff --git a/Constructor/propertywnd.cpp b/Constructor/propertywnd.cpp
index c929c5b..06b2cd6 100644
--- a/Constructor/propertywnd.cpp
+++ b/Constructor/propertywnd.cpp
@@ -4,7 +4,6 @@
 
 PropertyWnd::PropertyWnd()
 {
-	open = false;
 }
 
 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));
-	open = false;
 }
 
 PropertyWnd::~PropertyWnd()
@@ -23,17 +21,6 @@ PropertyWnd::~PropertyWnd()
 
 void PropertyWnd::on_btn_cancel_clicked()
 {
-	open = false;
 	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 bd5d40a..c978370 100644
--- 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();
 		
-		bool is_open();
-		void set_open(bool);
-	
 	protected:
-		bool open;
 		Gtk::Button *btn_cancel, *btn_accept, *btn_apply;
 		virtual void on_btn_cancel_clicked();
 	
-- 
2.43.0