Separate CSS dialog from Style Dialog visually

(bzr r14949.1.56)

3 files changed, 6 insertions, 4 deletions

diff --git a/src/ui/dialog/cssdialog.cpp b/src/ui/dialog/cssdialog.cpp
index e12716d6e..9007faafc 100644
--- a/src/ui/dialog/cssdialog.cpp
+++ b/src/ui/dialog/cssdialog.cpp
@@ -30,7 +30,7 @@ CssDialog::CssDialog():
     UI::Widget::Panel("", "/dialogs/css", SP_VERB_DIALOG_CSS),
     _desktop(0)
 {
-    set_size_request(50, 50);
+    set_size_request(20, 15);
     _mainBox.pack_start(_scrolledWindow, Gtk::PACK_EXPAND_WIDGET);
     _treeView.set_headers_visible(false);
     _scrolledWindow.add(_treeView);
diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp
index 99d5cd7e1..f3e682062 100644
--- a/src/ui/dialog/styledialog.cpp
+++ b/src/ui/dialog/styledialog.cpp
@@ -55,6 +55,7 @@ StyleDialog::StyleDialog() :
 {
     set_size_request(200, 200);
 
+    _paned.pack1(_mainBox, Gtk::SHRINK);
     _mainBox.pack_start(_scrolledWindow, Gtk::PACK_EXPAND_WIDGET);
     _treeView.set_headers_visible(false);
     _scrolledWindow.add(_treeView);
@@ -76,7 +77,6 @@ StyleDialog::StyleDialog() :
 
     _treeView.append_column("Selector Name", _mColumns._selectorLabel);
     _treeView.set_expander_column(*(_treeView.get_column(1)));
-    _treeView.set_level_indentation(-12);
 
     create = manage( new Gtk::Button() );
     _styleButton(*create, "list-add", "Add a new CSS Selector");
@@ -94,7 +94,7 @@ StyleDialog::StyleDialog() :
     _buttonBox.pack_start(*create, Gtk::PACK_SHRINK);
     _buttonBox.pack_start(*del, Gtk::PACK_SHRINK);
 
-    _getContents()->pack_start(_mainBox, Gtk::PACK_EXPAND_WIDGET);
+    _getContents()->pack_start(_paned, Gtk::PACK_EXPAND_WIDGET);
 
     _targetDesktop = getDesktop();
     setDesktop(_targetDesktop);
@@ -699,7 +699,7 @@ void StyleDialog::_buttonEventsSelectObjs(GdkEventButton* event )
 
         //Open CSS dialog here.
         if (!_cssPane->get_visible()) {
-            _mainBox.pack_end(*_cssPane, Gtk::PACK_SHRINK);
+            _paned.pack2(*_cssPane, Gtk::SHRINK);
             _cssPane->show_all();
         }
 
diff --git a/src/ui/dialog/styledialog.h b/src/ui/dialog/styledialog.h
index 31a28dc1f..b3a8580f1 100644
--- a/src/ui/dialog/styledialog.h
+++ b/src/ui/dialog/styledialog.h
@@ -18,6 +18,7 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/treeselection.h>
+#include <gtkmm/paned.h>
 
 #include "desktop.h"
 #include "document.h"
@@ -71,6 +72,7 @@ private:
     SPDesktop* _desktop;
     SPDesktop* _targetDesktop;
     ModelColumns _mColumns;
+    Gtk::VPaned _paned;
     Gtk::VBox _mainBox;
     Gtk::HBox _buttonBox;
     Gtk::TreeView _treeView;