Move 'bounding box' option up one level (from Selector to Tools page in Preferences...

diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 7c6b0fc3b3e9ce5bb345e0640d115cf77c563215..e320f013fe8e8f36451084046564465587a50f37 100644 (file)
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -156,7 +156,7 @@ void Inkscape::ObjectSnapper::_collectNodes(Inkscape::Snapper::PointType const &
         g_assert(!(p_is_a_node && p_is_a_bbox || p_is_a_bbox && p_is_a_guide || p_is_a_node && p_is_a_guide));        
         
         if (_snap_to_bboxnode) {
-            gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box");
+            gchar const *prefs_bbox = prefs_get_string_attribute("tools", "bounding_box");
             bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX;
         }
 
@@ -258,7 +258,7 @@ void Inkscape::ObjectSnapper::_collectPaths(Inkscape::Snapper::PointType const &
         bool p_is_a_node = t & Inkscape::Snapper::SNAPPOINT_NODE;
         
         if (_snap_to_bboxpath) {
-            gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box");
+            gchar const *prefs_bbox = prefs_get_string_attribute("tools", "bounding_box");
             bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX;
         }
             

diff --git a/src/selcue.cpp b/src/selcue.cpp
index 1564ae1f173301d9a73df634135baf9066e665f4..3bac1713cce95bebf71b8fad2664d30349c69104 100644 (file)
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -75,7 +75,7 @@ void Inkscape::SelCue::_updateItemBboxes()
 
     g_return_if_fail(_selection != NULL);
 
-       gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box");
+       gchar const *prefs_bbox = prefs_get_string_attribute("tools", "bounding_box");
     SPItem::BBoxType bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX;
     
     for (GSList const *l = _selection->itemList(); l != NULL; l = l->next) {

diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index f7ffe69c0b7ca6c38c6d48cc7491fa2a60579cc6..a3f34384107f93300bf100471b2dcdb57dc09d0f 100644 (file)
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -94,7 +94,7 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) :
     _stamp_cache(NULL),
     _message_context(desktop->messageStack())
 {
-    gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box");
+    gchar const *prefs_bbox = prefs_get_string_attribute("tools", "bounding_box");
     _snap_bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX;
 
     g_return_if_fail(desktop != NULL);
@@ -791,7 +791,7 @@ void Inkscape::SelTrans::_selChanged(Inkscape::Selection */*selection*/)
 {
     if (!_grabbed) {
         // reread in case it changed on the fly:
-        gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box");
+        gchar const *prefs_bbox = prefs_get_string_attribute("tools", "bounding_box");
         _snap_bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::APPROXIMATE_BBOX;
         //SPItem::APPROXIMATE_BBOX will be replaced by SPItem::VISUAL_BBOX, as soon as the latter is implemented properly
 

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 078ff6c5948fffc1d573e1bd61b4850a233b916d..63d20d32075ccbbbf1ad36c8ecdae4d05965f012 100644 (file)
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -1600,7 +1600,7 @@ sp_item_convert_to_guides(SPItem *item) {
     SPDesktop *dt = inkscape_active_desktop();
     SPNamedView *nv = sp_desktop_namedview(dt);
 
-    gchar const *prefs_bbox = prefs_get_string_attribute("tools.select", "bounding_box");
+    gchar const *prefs_bbox = prefs_get_string_attribute("tools", "bounding_box");
     SPItem::BBoxType bbox_type = (prefs_bbox != NULL && strcmp(prefs_bbox, "geometric")==0)? SPItem::GEOMETRIC_BBOX : SPItem::RENDERING_BBOX;
 
     NR::Maybe<NR::Rect> bbox = sp_item_bbox_desktop(item, bbox_type);

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index d0fb56f976aead073fb7acac1a87dca756fe0899..ca25ad1270fec9d8c1cbab395936e6cc43aa8be2 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -326,6 +326,14 @@ void InkscapePreferences::initPageTools()
     Gtk::TreeModel::iterator iter_tools = this->AddPage(_page_tools, _("Tools"), PREFS_PAGE_TOOLS);    
     _path_tools = _page_list.get_model()->get_path(iter_tools);
 
+    _page_tools.add_group_header( _("Bounding box to use:"));
+    _t_bbox_visual.init ( _("Visual bounding box"), "tools", "bounding_box", "visual", false, 0);
+    _page_tools.add_line( true, "", _t_bbox_visual, "",
+                            _("This bounding box includes stroke width, markers, filter margins, etc."));
+    _t_bbox_geometric.init ( _("Geometric bounding box"), "tools", "bounding_box", "geometric", true, &_t_bbox_visual);
+    _page_tools.add_line( true, "", _t_bbox_geometric, "",
+                            _("This bounding box includes only the bare path"));
+
     _calligrapy_use_abs_size.init ( _("Width is in absolute units"), "tools.calligraphic", "abs_width", false);
     _calligrapy_keep_selected.init ( _("Select new path"), "tools.calligraphic", "keep_selected", true);
     _connector_ignore_text.init( _("Don't attach connectors to text objects"), "tools.connector", "ignoretext", true);
@@ -352,14 +360,6 @@ void InkscapePreferences::initPageTools()
     _page_selector.add_line( true, "", _t_sel_cue_box, "", 
                             _("Each selected object displays its bounding box"));
 
-    _page_selector.add_group_header( _("Bounding box to use:"));
-    _t_sel_bbox_visual.init ( _("Visual bounding box"), "tools.select", "bounding_box", "visual", false, 0);
-    _page_selector.add_line( true, "", _t_sel_bbox_visual, "",
-                            _("This bounding box includes stroke width, markers, filter margins, etc."));
-    _t_sel_bbox_geometric.init ( _("Geometric bounding box"), "tools.select", "bounding_box", "geometric", true, &_t_sel_bbox_visual);
-    _page_selector.add_line( true, "", _t_sel_bbox_geometric, "",
-                            _("This bounding box includes only the bare path"));
-
     //Node
     this->AddPage(_page_node, _("Node"), iter_tools, PREFS_PAGE_TOOLS_NODE);
     AddSelcueCheckbox(_page_node, "tools.nodes", true);

diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 607953802afd18466312cf02963de8a1fade55b0..02f2c2da4ceae6f631a7463c1dc86be8aaafed18 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -122,7 +122,7 @@ protected:
     PrefSpinButton  _steps_arrow, _steps_scale, _steps_inset, _steps_zoom;
 
     PrefRadioButton _t_sel_trans_obj, _t_sel_trans_outl, _t_sel_cue_none, _t_sel_cue_mark,
-                    _t_sel_cue_box, _t_sel_bbox_visual, _t_sel_bbox_geometric;
+                    _t_sel_cue_box, _t_bbox_visual, _t_bbox_geometric;
 
     PrefSpinButton  _t_pencil_tolerance;