Add panned to XMLDialog and ArrtDialog

1 files changed, 27 insertions, 9 deletions

diff --git a/src/ui/dialog/selectorsdialog.cpp b/src/ui/dialog/selectorsdialog.cpp
index 0d46886b6..edf5d926f 100644
--- a/src/ui/dialog/selectorsdialog.cpp
+++ b/src/ui/dialog/selectorsdialog.cpp
@@ -354,7 +354,7 @@ void SelectorsDialog::_showWidgets()
 {
     // Pack widgets
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    bool dir = prefs->getBool("/dialogs/selectors/updown", true);
+    bool dir = prefs->getBool("/dialogs/selectors/vertical", true);
     _paned.set_orientation(dir ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL);
     _selectors_box.set_orientation(Gtk::ORIENTATION_VERTICAL);
     _selectors_box.set_name("SelectorsDialog");
@@ -362,34 +362,52 @@ void SelectorsDialog::_showWidgets()
     _scrolled_window_selectors.add(_treeView);
     _scrolled_window_selectors.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
     Gtk::Label *dirtogglerlabel = Gtk::manage(new Gtk::Label(_("Paned vertical")));
+    _direction.property_active() = dir;
     _direction.property_active().signal_changed().connect(sigc::mem_fun(*this, &SelectorsDialog::_toggleDirection));
-    _direction.get_style_context()->add_class("directiontoggler");
+    _direction.get_style_context()->add_class("inkswitch");
     _styleButton(_create, "list-add", "Add a new CSS Selector");
     _create.signal_clicked().connect(sigc::mem_fun(*this, &SelectorsDialog::_addSelector));
     _styleButton(_del, "list-remove", "Remove a CSS Selector");
     _button_box.pack_start(_create, Gtk::PACK_SHRINK);
     _button_box.pack_start(_del, Gtk::PACK_SHRINK);
-    _button_box.pack_start(_direction, Gtk::PACK_SHRINK);
-    _button_box.pack_start(*dirtogglerlabel, Gtk::PACK_SHRINK);
-    _selectors_box.pack_end(_button_box, Gtk::PACK_SHRINK);
+    _button_box.pack_start(_direction, false, false, 0);
+    _button_box.pack_start(*dirtogglerlabel, false, false, 0);
+    _selectors_box.pack_end(_button_box, false, false, 0);
     _del.signal_clicked().connect(sigc::mem_fun(*this, &SelectorsDialog::_delSelector));
     _del.hide();
     _style_dialog = new StyleDialog;
     _selectors_box.set_name("StyleDialog");
     _paned.pack1(*_style_dialog, Gtk::SHRINK);
     _paned.pack2(_selectors_box, true, true);
-    _paned.set_position(-1);
     _getContents()->pack_start(_paned, Gtk::PACK_EXPAND_WIDGET);
+    show_all();
+    int widthpos = _paned.property_max_position() - _paned.property_min_position();
+    int panedpos = prefs->getInt("/dialogs/selectors/panedpos", 130);
+    
+    _paned.set_position(panedpos);
+    _paned.property_wide_handle() = true;
+    _paned.signal_button_release_event().connect(sigc::mem_fun(*this, &SelectorsDialog::_resized), false);
+    set_size_request(320, 260);
     set_name("SelectorsAndStyleDialog");
 }
 
+bool SelectorsDialog::_resized(GdkEventButton *event)
+{
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    prefs->setInt("/dialogs/selectors/pannedpos", _paned.get_position());
+    return false;
+}
+
+
 void SelectorsDialog::_toggleDirection()
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    bool dir = !prefs->getBool("/dialogs/selectors/updown", true);
-    prefs->setBool("/dialogs/selectors/updown", dir);
-    _paned.set_position(-1);
+    bool dir = !prefs->getBool("/dialogs/selectors/vertical", true);
+    prefs->setBool("/dialogs/selectors/vertical", dir);
     _paned.set_orientation(dir ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL);
+    int widthpos = _paned.property_max_position() - _paned.property_min_position();
+    _paned.set_position(widthpos/2);
+
 }
 
 /**