summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMenTaLguY <mental@rydia.net>2008-07-02 01:45:20 +0000
committermental <mental@users.sourceforge.net>2008-07-02 01:45:20 +0000
commitdaa044a4dee55534c1b2bd1775af4741b6e9f8ff (patch)
tree72bd67fdbd3cb10922d5c7a1813dcf163c01a9d7
parentmissed a spot (diff)
downloadinkscape-daa044a4dee55534c1b2bd1775af4741b6e9f8ff.tar.gz
inkscape-daa044a4dee55534c1b2bd1775af4741b6e9f8ff.zip
add tab to layers dialog
(bzr r6114)
-rw-r--r--src/dialogs/layers-panel.cpp9
-rw-r--r--src/dialogs/layers-panel.h3
2 files changed, 9 insertions, 3 deletions
diff --git a/src/dialogs/layers-panel.cpp b/src/dialogs/layers-panel.cpp
index d54fb6fc7..7863e19f1 100644
--- a/src/dialogs/layers-panel.cpp
+++ b/src/dialogs/layers-panel.cpp
@@ -732,10 +732,13 @@ LayersPanel::LayersPanel() :
_watching.push_back( &_compositeSettings );
- _getContents()->pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
+ _layersPage.pack_start( _scroller, Gtk::PACK_EXPAND_WIDGET );
+ _layersPage.pack_end(_compositeSettings, Gtk::PACK_SHRINK);
+ _layersPage.pack_end(_buttonsRow, Gtk::PACK_SHRINK);
- _getContents()->pack_end(_compositeSettings, Gtk::PACK_SHRINK);
- _getContents()->pack_end(_buttonsRow, Gtk::PACK_SHRINK);
+ _notebook.append_page(_layersPage, _("Layers"));
+
+ _getContents()->pack_start(_notebook, Gtk::PACK_EXPAND_WIDGET);
SPDesktop* targetDesktop = getDesktop();
diff --git a/src/dialogs/layers-panel.h b/src/dialogs/layers-panel.h
index e554ad0bf..62596e407 100644
--- a/src/dialogs/layers-panel.h
+++ b/src/dialogs/layers-panel.h
@@ -19,6 +19,7 @@
#include <gtkmm/box.h>
#include <gtkmm/buttonbox.h>
#include <gtkmm/spinbutton.h>
+#include <gtkmm/notebook.h>
//#include "ui/previewholder.h"
#include "ui/widget/panel.h"
@@ -115,6 +116,8 @@ private:
Gtk::ScrolledWindow _scroller;
Gtk::Menu _popupMenu;
Gtk::SpinButton _spinBtn;
+ Gtk::Notebook _notebook;
+ Gtk::VBox _layersPage;
UI::Widget::StyleSubject::CurrentLayer _subject;
UI::Widget::ObjectCompositeSettings _compositeSettings;