Se termina de modificar el modelo de instalacion y compilacion del cliente

diff --git a/Client/Makefile.am b/Client/Makefile.am
index 0286ef1fca31ce4df481ce84cac58b904e66e341..59d1405ef2e61c0b8f6e38ec00fddbabb4112169 100644 (file)
--- a/Client/Makefile.am
+++ b/Client/Makefile.am
@@ -1,3 +1,3 @@
 
-SUBDIRS = src pixmaps
+SUBDIRS = src pixmaps dialogs
 

diff --git a/Client/configure.in b/Client/configure.in
index 13914e220614eaa4942b0717f8e2eeb832565273..374d9516da647c26092de013f0dc9d3209ea9e90 100644 (file)
--- a/Client/configure.in
+++ b/Client/configure.in
@@ -21,11 +21,12 @@ AC_SUBST(PACKAGE_LIBS)
 AC_OUTPUT([
 Makefile
 pixmaps/Makefile
+dialogs/Makefile
 src/Makefile
 ])
 
 echo
 echo "Todo listo. Ahora para compilar solo ejecute make"
 echo
-echo "The PlaQui Developer Team"
+echo "The PlaQui Development Team"
 

diff --git a/Client/dialogs/Makefile.am b/Client/dialogs/Makefile.am
new file mode 100644 (file)
index 0000000..322efec
--- /dev/null
+++ b/Client/dialogs/Makefile.am
@@ -0,0 +1,6 @@
+plaquidir = $(datadir)/plaqui-client/dialogs
+
+plaqui_DATA = client.glade
+
+EXTRA_DIST = $(plaqui_DATA)
+

diff --git a/Client/src/client.glade b/Client/dialogs/client.glade
similarity index 100%
rename from Client/src/client.glade
rename to Client/dialogs/client.glade

diff --git a/Client/pixmaps/Makefile.am b/Client/pixmaps/Makefile.am
new file mode 100644 (file)
index 0000000..f9cf9c9
--- /dev/null
+++ b/Client/pixmaps/Makefile.am
@@ -0,0 +1,41 @@
+plaquidir = $(datadir)/plaqui-client/pixmaps
+
+plaqui_DATA = \
+and_e.png \
+and_n.png \
+and_o.png \
+and_s.png \
+bomba_e.png \
+bomba_null.png \
+bomba_o.png \
+canio_n.png \
+canio_s.png \
+codo_e.png \
+codo_n.png \
+codo_o.png \
+codo_s.png \
+drain_e.png \
+drain_n.png \
+drain_o.png \
+drain_s.png \
+exclusa_h.png \
+exclusa_s.png \
+not_e.png \
+not_n.png \
+not_o.png \
+not_s.png \
+null.png \
+or_e.png \
+or_n.png \
+or_o.png \
+or_s.png \
+tanque_e.png \
+tanque_null.png \
+tanque_o.png \
+y_e.png \
+y_n.png \
+y_o.png \
+y_s.png
+
+EXTRA_DIST = $(plaqui_DATA) 
+

diff --git a/Client/pixmaps/and_e.png b/Client/pixmaps/and_e.png
new file mode 100644 (file)
index 0000000..0ae0826
Binary files /dev/null and b/Client/pixmaps/and_e.png differ

diff --git a/Client/pixmaps/and_n.png b/Client/pixmaps/and_n.png
new file mode 100644 (file)
index 0000000..8abc931
Binary files /dev/null and b/Client/pixmaps/and_n.png differ

diff --git a/Client/pixmaps/and_o.png b/Client/pixmaps/and_o.png
new file mode 100644 (file)
index 0000000..dcd5136
Binary files /dev/null and b/Client/pixmaps/and_o.png differ

diff --git a/Client/pixmaps/and_s.png b/Client/pixmaps/and_s.png
new file mode 100644 (file)
index 0000000..bbb3bf9
Binary files /dev/null and b/Client/pixmaps/and_s.png differ

diff --git a/Client/pixmaps/bomba_null.png b/Client/pixmaps/bomba_null.png
new file mode 100644 (file)
index 0000000..39e5761
Binary files /dev/null and b/Client/pixmaps/bomba_null.png differ

diff --git a/Client/pixmaps/ico_bomba.png b/Client/pixmaps/ico_bomba.png
new file mode 100644 (file)
index 0000000..83224ba
Binary files /dev/null and b/Client/pixmaps/ico_bomba.png differ

diff --git a/Client/pixmaps/ico_canio.png b/Client/pixmaps/ico_canio.png
new file mode 100644 (file)
index 0000000..ad590a0
Binary files /dev/null and b/Client/pixmaps/ico_canio.png differ

diff --git a/Client/pixmaps/ico_codo.png b/Client/pixmaps/ico_codo.png
new file mode 100644 (file)
index 0000000..cc9962f
Binary files /dev/null and b/Client/pixmaps/ico_codo.png differ

diff --git a/Client/pixmaps/ico_exclusa.png b/Client/pixmaps/ico_exclusa.png
new file mode 100644 (file)
index 0000000..9ea656a
Binary files /dev/null and b/Client/pixmaps/ico_exclusa.png differ

diff --git a/Client/pixmaps/ico_tanque.png b/Client/pixmaps/ico_tanque.png
new file mode 100644 (file)
index 0000000..405ed8b
Binary files /dev/null and b/Client/pixmaps/ico_tanque.png differ

diff --git a/Client/pixmaps/ico_y.png b/Client/pixmaps/ico_y.png
new file mode 100644 (file)
index 0000000..1b685d5
Binary files /dev/null and b/Client/pixmaps/ico_y.png differ

diff --git a/Client/pixmaps/not_e.png b/Client/pixmaps/not_e.png
new file mode 100644 (file)
index 0000000..ce39789
Binary files /dev/null and b/Client/pixmaps/not_e.png differ

diff --git a/Client/pixmaps/not_n.png b/Client/pixmaps/not_n.png
new file mode 100644 (file)
index 0000000..3b51716
Binary files /dev/null and b/Client/pixmaps/not_n.png differ

diff --git a/Client/pixmaps/not_o.png b/Client/pixmaps/not_o.png
new file mode 100644 (file)
index 0000000..7ee2125
Binary files /dev/null and b/Client/pixmaps/not_o.png differ

diff --git a/Client/pixmaps/not_s.png b/Client/pixmaps/not_s.png
new file mode 100644 (file)
index 0000000..cc8e708
Binary files /dev/null and b/Client/pixmaps/not_s.png differ

diff --git a/Client/pixmaps/null.png b/Client/pixmaps/null.png
new file mode 100644 (file)
index 0000000..b764134
Binary files /dev/null and b/Client/pixmaps/null.png differ

diff --git a/Client/pixmaps/or_e.png b/Client/pixmaps/or_e.png
new file mode 100644 (file)
index 0000000..d177791
Binary files /dev/null and b/Client/pixmaps/or_e.png differ

diff --git a/Client/pixmaps/or_n.png b/Client/pixmaps/or_n.png
new file mode 100644 (file)
index 0000000..cdf6610
Binary files /dev/null and b/Client/pixmaps/or_n.png differ

diff --git a/Client/pixmaps/or_o.png b/Client/pixmaps/or_o.png
new file mode 100644 (file)
index 0000000..d86a398
Binary files /dev/null and b/Client/pixmaps/or_o.png differ

diff --git a/Client/pixmaps/or_s.png b/Client/pixmaps/or_s.png
new file mode 100644 (file)
index 0000000..82eff98
Binary files /dev/null and b/Client/pixmaps/or_s.png differ

diff --git a/Client/pixmaps/tanque_null.png b/Client/pixmaps/tanque_null.png
new file mode 100644 (file)
index 0000000..9ae5e50
Binary files /dev/null and b/Client/pixmaps/tanque_null.png differ

diff --git a/Client/src/item_codo.cpp b/Client/src/item_codo.cpp
index 8b088f8ea566f58db6e032f0e33467897a87747d..639e63566cc37df869f9d728a95e9d32470287b2 100644 (file)
--- a/Client/src/item_codo.cpp
+++ b/Client/src/item_codo.cpp
@@ -5,16 +5,16 @@ ViewCodo::ViewCodo(Glib::ustring _name, int orientacion):ViewItem(_name)
 {
        switch (orientacion) {
                case 0:
-                       image.set("codo_o.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/codo_o.png");
                break;
                case 1:
-                       image.set("codo_n.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/codo_n.png");
                break;
                case 2:
-                       image.set("codo_e.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/codo_e.png");
                break;
                case 3:
-                       image.set("codo_s.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/codo_s.png");
        }
        image.show();
        set_size_request();

diff --git a/Client/src/item_conduct.cpp b/Client/src/item_conduct.cpp
index 033937087ac344359ee3a1817cf263cc16bde4f8..9f46810341677ca3d80663b245a75dd2581807eb 100644 (file)
--- a/Client/src/item_conduct.cpp
+++ b/Client/src/item_conduct.cpp
@@ -5,10 +5,10 @@ ViewConduct::ViewConduct(Glib::ustring _name, int orientacion):ViewItem(_name)
 {
        switch (orientacion) {
                case 0:
-                       image.set("canio_n.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/canio_n.png");
                break;
                case 1:
-                       image.set("canio_s.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/canio_s.png");
        }
        std::cout << "Conducto creado" << std::endl;
        image.show();

diff --git a/Client/src/item_drain.cpp b/Client/src/item_drain.cpp
index aa3b3255f58794560addb4cb468bc12e71d3ec7d..0a03dd5efc73f28d47f4555a75cd46e6e8554598 100644 (file)
--- a/Client/src/item_drain.cpp
+++ b/Client/src/item_drain.cpp
@@ -6,16 +6,16 @@ ViewDrain::ViewDrain(Glib::ustring _name, int orientacion):ViewItem(_name)
 {
        switch (orientacion) {
                case 0:
-                       image.set("drain_n.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/drain_n.png");
                break;
                case 1:
-                       image.set("drain_e.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/drain_e.png");
                break;
                case 2:
-                       image.set("drain_s.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/drain_s.png");
                break;
                case 3:
-                       image.set("drain_o.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/drain_o.png");
        }
        image.show();
        set_size_request();

diff --git a/Client/src/item_exclusa.cpp b/Client/src/item_exclusa.cpp
index aac6a1dba77270c9328522668a153cd5aa3b3357..d9c1a9b763323583e80afe4f865b8bcad92562e7 100644 (file)
--- a/Client/src/item_exclusa.cpp
+++ b/Client/src/item_exclusa.cpp
@@ -5,10 +5,10 @@ ViewExclusa::ViewExclusa(Glib::ustring _name, int orientacion):ViewItem(_name)
 {
        switch (orientacion) {
                case 0:
-                       image.set("exclusa_h.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/exclusa_h.png");
                break;
                case 1:
-                       image.set("exclusa_s.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/exclusa_s.png");
        }
        image.show();
        set_size_request();

diff --git a/Client/src/item_pump.cpp b/Client/src/item_pump.cpp
index 201ce2d7bf3a0003f65b02fb7ca602fa814e178e..1c25011e9ed609d8abf48738368433368e7daa3d 100644 (file)
--- a/Client/src/item_pump.cpp
+++ b/Client/src/item_pump.cpp
@@ -5,10 +5,10 @@ ViewPump::ViewPump(Glib::ustring _name, int orientacion):ViewItem(_name)
 {
        switch (orientacion) {
                case 0:
-                       image.set("bomba_e.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/bomba_e.png");
                break;
                case 1:
-                       image.set("bomba_o.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/bomba_o.png");
        }
        image.show();
        set_size_request();

diff --git a/Client/src/item_tank.cpp b/Client/src/item_tank.cpp
index c3fcdaaa305e4fa80cc52f26b9b959fdfddf5182..b22b337bb21d993eb7d4b21fa61bf9c7b69df132 100644 (file)
--- a/Client/src/item_tank.cpp
+++ b/Client/src/item_tank.cpp
@@ -6,10 +6,10 @@ ViewTank::ViewTank(Glib::ustring _name, int orientacion):ViewItem(_name)
 {
        switch (orientacion) {
                case 0:
-                       image.set("tanque_e.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/tanque_e.png");
                break;
                case 1:
-                       image.set("tanque_o.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/tanque_o.png");
        }
        image.show();
        set_size_request();

diff --git a/Client/src/item_union.cpp b/Client/src/item_union.cpp
index 814bb2b7593deb06bf7f75de68a217448279f8e6..b96c137845c7f3c2b6d0cd8ab1d5211937040858 100644 (file)
--- a/Client/src/item_union.cpp
+++ b/Client/src/item_union.cpp
@@ -6,16 +6,16 @@ ViewUnion::ViewUnion(Glib::ustring _name, int orientacion):ViewItem(_name)
 {
        switch (orientacion) {
                case 0:
-                       image.set("y_n.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/y_n.png");
                break;
                case 1:
-                       image.set("y_e.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/y_e.png");
                break;
                case 2:
-                       image.set("y_s.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/y_s.png");
                break;
                case 3:
-                       image.set("y_o.png");
+                       image.set(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/y_o.png");
        }
        image.show();
        set_size_request();

diff --git a/Client/src/main.cpp b/Client/src/main.cpp
index 085c2b1ec8c5677f6ba1625252eae1de15231ba9..9dc0b749968ee3943604f6cd8d19e9dd24479fdc 100644 (file)
--- a/Client/src/main.cpp
+++ b/Client/src/main.cpp
@@ -12,7 +12,7 @@ int main (int argc, char **argv)
        //Load the Glade file and instiate its widgets:
        Glib::RefPtr<Gnome::Glade::Xml> refXml;
        try {
-               refXml = Gnome::Glade::Xml::create("client.glade");
+               refXml = Gnome::Glade::Xml::create(PACKAGE_DATA_DIR"/plaqui-client/dialgos/client.glade");
        }
        catch(const Gnome::Glade::XmlError& ex) {
                std::cerr << "(main.cpp:17) : ";