Merge from trunk.

[inkscape.git] / src / layer-manager.h

diff --git a/src/layer-manager.h b/src/layer-manager.h
index 622cda1f247f5c7b7b2eedf853d561e2c792b9c7..fbb22d40511dd85d7f5608fe1907af905d0e5198 100644 (file)
--- a/src/layer-manager.h
+++ b/src/layer-manager.h
@@ -13,8 +13,10 @@
 #include "document-subset.h"
 #include "gc-finalized.h"
 #include "gc-soft-ptr.h"
+#include <vector>
+#include <map>
 
-class SPDocument;
+class SPDesktop;
 class SPDocument;
 
 namespace Inkscape {
@@ -24,10 +26,27 @@ class LayerManager : public DocumentSubset,
 {
 public:
     LayerManager(SPDesktop *desktop);
+    virtual ~LayerManager();
+
+    void setCurrentLayer( SPObject* obj );
+    void renameLayer( SPObject* obj, gchar const *label, bool uniquify );
+
+    sigc::connection connectCurrentLayerChanged(const sigc::slot<void, SPObject *> & slot) {
+        return _layer_changed_signal.connect(slot);
+    }
+
+    sigc::connection connectLayerDetailsChanged(const sigc::slot<void, SPObject *> & slot) {
+        return _details_changed_signal.connect(slot);
+    }
 
 private:
+    friend class LayerWatcher;
+    class LayerWatcher;
+
+    void _objectModified( SPObject* obj, guint flags );
     void _setDocument(SPDocument *document);
     void _rebuild();
+    void _selectedLayerChanged(SPObject *layer);
 
     sigc::connection _layer_connection;
     sigc::connection _document_connection;
@@ -35,6 +54,11 @@ private:
 
     GC::soft_ptr<SPDesktop> _desktop;
     SPDocument *_document;
+
+    std::vector<LayerWatcher*> _watchers;
+
+    sigc::signal<void, SPObject *>     _layer_changed_signal;
+    sigc::signal<void, SPObject *>     _details_changed_signal;
 };
 
 }
@@ -49,4 +73,4 @@ private:
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :