Mas detalles y se agrega el logo faltante en el constructor

diff --git a/Client/include/item.h b/Client/include/item.h
index 62f1b663a43d9bb0868a5d8b569801e8de4c7403..df6d3ba8c84a0f453fbe0cf19f753fb448067305 100644 (file)
--- a/Client/include/item.h
+++ b/Client/include/item.h
@@ -33,7 +33,7 @@ public:
        inline void set_color(const Gdk::Color &c) { color = c; }
        inline Gdk::Color get_color() { return color; }
        
-       std::string get_actual_flow();
+       virtual std::string get_actual_flow();
        virtual std::string get_cap_flow() { return "Flujo Actual :"; }
        virtual std::string get_cap_extra() { return ""; }
        virtual std::string get_extra() { return ""; }

diff --git a/Client/include/item_and.h b/Client/include/item_and.h
index ff67ec53963800d3da3db6b9aba0e73b9d91e519..dafba5001630520d7a873ef360ea73a567cc6f55 100644 (file)
--- a/Client/include/item_and.h
+++ b/Client/include/item_and.h
@@ -9,6 +9,9 @@ public:
        virtual ~ViewAnd();
        
        virtual bool on_image_expose_event(GdkEventExpose *e);
+       
+       virtual std::string get_actual_flow() { return ""; }
+       virtual std::string get_cap_flow() { return ""; }
 };
 
 #endif

diff --git a/Client/include/item_not.h b/Client/include/item_not.h
index 129ebd92a25f74c06dadf667e76c52aeb89723d0..f410a91946366cf41722bf3912490be1a8974a6c 100644 (file)
--- a/Client/include/item_not.h
+++ b/Client/include/item_not.h
@@ -9,6 +9,8 @@ public:
        virtual ~ViewNot();
        
        virtual bool on_image_expose_event(GdkEventExpose *e);
+       virtual std::string get_actual_flow() { return ""; }
+       virtual std::string get_cap_flow() { return ""; }
 };
 
 #endif

diff --git a/Client/include/item_or.h b/Client/include/item_or.h
index 2c830253d7993c1d7975fb900a64aa4e8211b233..d59cd044e2ff6605c7e56a471b91c58814cefd36 100644 (file)
--- a/Client/include/item_or.h
+++ b/Client/include/item_or.h
@@ -9,6 +9,8 @@ public:
        virtual ~ViewOr();
        
        virtual bool on_image_expose_event(GdkEventExpose *e);
+       virtual std::string get_actual_flow() { return ""; }
+       virtual std::string get_cap_flow() { return ""; }
 };
 
 #endif

diff --git a/Client/src/item.cpp b/Client/src/item.cpp
index 6bbaf1d2778debe503b64a1906b5d6c0e17fcdb8..be4e47db9eb525de4ba55b8579317be4b9e3059c 100644 (file)
--- a/Client/src/item.cpp
+++ b/Client/src/item.cpp
@@ -10,6 +10,9 @@ ViewItem::ViewItem(Glib::ustring _name):Gtk::EventBox(),image()
        actual_flow = -1;
        add(image);
 
+       open = false;
+       actual_flow = extra = 0;
+
        image.signal_expose_event().connect( SigC::slot(*this, &ViewItem::on_image_expose_event) );
 }
 

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