more 2geomification

[inkscape.git] / src / dialogs / layers-panel.h

diff --git a/src/dialogs/layers-panel.h b/src/dialogs/layers-panel.h
index 76278fa4f6ff5ad14cc4c2cb2565bba38fb330f6..1f593b9c6c962e3c8b727170a3102d1e65e50ead 100644 (file)
--- a/src/dialogs/layers-panel.h
+++ b/src/dialogs/layers-panel.h
@@ -1,6 +1,3 @@
-
-#ifndef SEEN_LAYERS_PANEL_H
-#define SEEN_LAYERS_PANEL_H
 /*
  * A simple dialog for layer UI.
  *
@@ -12,6 +9,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifndef SEEN_LAYERS_PANEL_H
+#define SEEN_LAYERS_PANEL_H
+
 #include <gtkmm/treeview.h>
 #include <gtkmm/treestore.h>
 #include <gtkmm/tooltips.h>
@@ -19,9 +19,12 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/box.h>
 #include <gtkmm/buttonbox.h>
+#include <gtkmm/spinbutton.h>
+#include <gtkmm/notebook.h>
 
-#include "ui/widget/panel.h"
 //#include "ui/previewholder.h"
+#include "ui/widget/panel.h"
+#include "ui/widget/object-composite-settings.h"
 
 class SPObject;
 
@@ -36,14 +39,15 @@ namespace Dialogs {
 /**
  * A panel that displays layers.
  */
-class LayersPanel : public Inkscape::UI::Widget::Panel
+class LayersPanel : public UI::Widget::Panel
 {
 public:
     LayersPanel();
     virtual ~LayersPanel();
 
-    static LayersPanel& getInstance();
     //virtual void setOrientation( Gtk::AnchorType how );
+    
+    static LayersPanel& getInstance();
 
     void setDesktop( SPDesktop* desktop );
 
@@ -57,8 +61,6 @@ private:
     LayersPanel(LayersPanel const &); // no copy
     LayersPanel &operator=(LayersPanel const &); // no assign
 
-    static LayersPanel* instance;
-
     void _styleButton( Gtk::Button& btn, SPDesktop *desktop, unsigned int code, char const* iconName, char const* fallback );
     void _fireAction( unsigned int code );
     Gtk::MenuItem& _addPopupItem( SPDesktop *desktop, unsigned int code, char const* iconName, char const* fallback, int id );
@@ -86,8 +88,6 @@ private:
     void _layersChanged();
     void _addLayer( SPDocument* doc, SPObject* layer, Gtk::TreeModel::Row* parentRow, SPObject* target, int level );
 
-    void _opacityChanged();
-
     SPObject* _selectedLayer();
 
     // Hooked to the layer manager:
@@ -96,7 +96,9 @@ private:
     sigc::connection _changedConnection;
     sigc::connection _addedConnection;
     sigc::connection _removedConnection;
-    sigc::connection _opacityConnection;
+
+    // Internal
+    sigc::connection _selectedConnection;
 
     int _maxNestDepth;
     Inkscape::LayerManager* _mgr;
@@ -113,9 +115,13 @@ private:
     Gtk::TreeView _tree;
     Gtk::HButtonBox _buttonsRow;
     Gtk::ScrolledWindow _scroller;
-    Gtk::HBox _opacityBox;
-    Gtk::HScale _opacity;
     Gtk::Menu _popupMenu;
+    Gtk::SpinButton _spinBtn;
+    Gtk::Notebook _notebook;
+    Gtk::VBox _layersPage;
+
+    UI::Widget::StyleSubject::CurrentLayer _subject;
+    UI::Widget::ObjectCompositeSettings _compositeSettings;
 };