Removal of old grid code - fully enabled new grid code.

(bzr r2904)

3 files changed, 24 insertions, 80 deletions

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 39b3e36b4..324b63872 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -92,7 +92,7 @@ DocumentProperties::destroy()
 
 DocumentProperties::DocumentProperties()
     : Dialog ("dialogs.documentoptions", SP_VERB_DIALOG_NAMEDVIEW),
-      _page_page(1, 1), _page_grid(1, 1), _page_guides(1, 1),
+      _page_page(1, 1), _page_guides(1, 1),
       _page_snap(1, 1), _page_grids(1, 1),
       _grids_button_new(_("_New"), _("Create new grid.")),
       _grids_button_remove(_("_Remove"), _("Remove selected grid.")),
@@ -104,12 +104,12 @@ DocumentProperties::DocumentProperties()
     get_vbox()->pack_start (_notebook, true, true);
 
     _notebook.append_page(_page_page,      _("Page"));
-    _notebook.append_page(_page_grid,      _("Grid/Guides"));
+    _notebook.append_page(_page_guides,    _("Guides"));
     _notebook.append_page(_page_snap,      _("Snap"));
-    _notebook.append_page(_page_grids,     _("Grids setup"));
+    _notebook.append_page(_page_grids,     _("Grids"));
 
     build_page();
-    build_grid();
+    build_guides();
     build_snap();
     build_gridspage();
 
@@ -237,62 +237,28 @@ DocumentProperties::build_page()
 }
 
 void
-DocumentProperties::build_grid()
+DocumentProperties::build_guides()
 {
-    _page_grid.show();
+    _page_guides.show();
 
-    /// \todo FIXME: gray out snapping when grid is off.
-    /// Dissenting view: you want snapping without grid.
-
-    _rcbgrid.init (_("_Show grid"), _("Show or hide grid"), "showgrid", _wr);
-
-    _rumg.init (_("Grid _units:"), "grid_units", _wr);
-    _rsu_ox.init (_("_Origin X:"), _("X coordinate of grid origin"),
-                  "gridoriginx", _rumg, _wr);
-    _rsu_oy.init (_("O_rigin Y:"), _("Y coordinate of grid origin"),
-                  "gridoriginy", _rumg, _wr);
-    _rsu_sx.init (_("Spacing _X:"), _("Distance between vertical grid lines"),
-                  "gridspacingx", _rumg, _wr);
-    _rsu_sy.init (_("Spacing _Y:"), _("Distance between horizontal grid lines"),
-                  "gridspacingy", _rumg, _wr);
-    _rcp_gcol.init (_("Grid line _color:"), _("Grid line color"),
-                    _("Color of grid lines"), "gridcolor", "gridopacity", _wr);
-    _rcp_gmcol.init (_("Ma_jor grid line color:"), _("Major grid line color"),
-                     _("Color of the major (highlighted) grid lines"),
-                     "gridempcolor", "gridempopacity", _wr);
-    _rsi.init (_("_Major grid line every:"), _("lines"), "gridempspacing", _wr);
     _rcb_sgui.init (_("Show _guides"), _("Show or hide guides"), "showguides", _wr);
     _rcp_gui.init (_("Guide co_lor:"), _("Guideline color"),
                    _("Color of guidelines"), "guidecolor", "guideopacity", _wr);
     _rcp_hgui.init (_("_Highlight color:"), _("Highlighted guideline color"),
                     _("Color of a guideline when it is under mouse"),
                     "guidehicolor", "guidehiopacity", _wr);
-    Gtk::Label *label_grid = manage (new Gtk::Label);
-    label_grid->set_markup (_("<b>Grid</b>"));
     Gtk::Label *label_gui = manage (new Gtk::Label);
     label_gui->set_markup (_("<b>Guides</b>"));
 
     const Gtk::Widget* widget_array[] =
     {
-        label_grid,         0,
-        0,                  _rcbgrid._button,
-        _rumg._label,       _rumg._sel,
-        0,                  _rsu_ox.getSU(),
-        0,                  _rsu_oy.getSU(),
-        0,                  _rsu_sx.getSU(),
-        0,                  _rsu_sy.getSU(),
-        _rcp_gcol._label,   _rcp_gcol._cp,
-        0,                  0,
-        _rcp_gmcol._label,  _rcp_gmcol._cp,
-        _rsi._label,        &_rsi._hbox,
-        0, 0,
         label_gui,       0,
         0,               _rcb_sgui._button,
         _rcp_gui._label, _rcp_gui._cp,
         _rcp_hgui._label, _rcp_hgui._cp,
     };
 
-    attach_all (_page_grid.table(), widget_array, sizeof(widget_array));
+    attach_all (_page_guides.table(), widget_array, sizeof(widget_array));
 }
 
 void
@@ -399,6 +365,9 @@ DocumentProperties::build_gridspage()
 {
     _page_grids.show();
 
+    /// \todo FIXME: gray out snapping when grid is off.
+    /// Dissenting view: you want snapping without grid.
+
     SPDesktop *dt = SP_ACTIVE_DESKTOP;
     SPNamedView *nv = sp_desktop_namedview(dt);
 
@@ -461,28 +430,6 @@ DocumentProperties::update()
     double const doc_h_px = sp_document_height(sp_desktop_document(dt));
     _page_sizer.setDim (doc_w_px, doc_h_px);
 
-    //-----------------------------------------------------------grid page
-    _rcbgrid.setActive (nv->showgrid);
-    _rumg.setUnit (nv->gridunit);
-
-    gdouble val;
-    val = nv->gridorigin[NR::X];
-    val = sp_pixels_get_units (val, *(nv->gridunit));
-    _rsu_ox.setValue (val);
-    val = nv->gridorigin[NR::Y];
-    val = sp_pixels_get_units (val, *(nv->gridunit));
-    _rsu_oy.setValue (val);
-    val = nv->gridspacing[NR::X];
-    double gridx = sp_pixels_get_units (val, *(nv->gridunit));
-    _rsu_sx.setValue (gridx);
-    val = nv->gridspacing[NR::Y];
-    double gridy = sp_pixels_get_units (val, *(nv->gridunit));
-    _rsu_sy.setValue (gridy);
-
-    _rcp_gcol.setRgba32 (nv->gridcolor);
-    _rcp_gmcol.setRgba32 (nv->gridempcolor);
-    _rsi.setValue (nv->gridempspacing);
-
     //-----------------------------------------------------------guide
     _rcb_sgui.setActive (nv->showguides);
     _rcp_gui.setRgba32 (nv->guidecolor);
@@ -519,8 +466,6 @@ DocumentProperties::on_response (int id)
     {
         _rcp_bg.closeWindow();
         _rcp_bord.closeWindow();
-        _rcp_gcol.closeWindow();
-        _rcp_gmcol.closeWindow();
         _rcp_gui.closeWindow();
         _rcp_hgui.closeWindow();
     }
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index 439ad5701..294bbab43 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -56,7 +56,7 @@ protected:
     Gtk::Tooltips _tt;
     Gtk::Notebook  _notebook;
 
-    NotebookPage   _page_page, _page_grid, _page_guides;
+    NotebookPage   _page_page, _page_guides;
     NotebookPage   _page_snap;
     NotebookPage   _page_grids;
 
@@ -67,19 +67,15 @@ protected:
     PageSizer             _page_sizer;
     //---------------------------------------------------------------
     RegisteredCheckButton _rcbgrid; //_rcbsnbb, _rcbsnnod
-    RegisteredUnitMenu    _rumg, _rums;
-    RegisteredScalarUnit  _rsu_ox, _rsu_oy, _rsu_sx, _rsu_sy;
-    RegisteredColorPicker _rcp_gcol, _rcp_gmcol;
-    RegisteredSuffixedInteger _rsi;
+    RegisteredUnitMenu    _rums;
     //---------------------------------------------------------------
     RegisteredCheckButton _rcb_sgui; //_rcb_snpgui, _rcb_snbgui
     RegisteredUnitMenu    _rum_gusn;
-    ToleranceSlider      _rsu_sn, _rsu_gusn;
     RegisteredColorPicker _rcp_gui, _rcp_hgui;
     //---------------------------------------------------------------
     RegisteredCheckButton _rcbsnop, _rcbsnon; //_rcbsnbo, _rcbsnnob
     RegisteredUnitMenu    _rumso;
-    ToleranceSlider       _rsu_sno;
+    ToleranceSlider       _rsu_sno, _rsu_sn, _rsu_gusn;
     RegisteredRadioButtonPair _rrb_pix;
     //---------------------------------------------------------------
     Gtk::Notebook   _grids_notebook;
diff --git a/src/ui/view/edit-widget.cpp b/src/ui/view/edit-widget.cpp
index 79258283d..bac6854a1 100644
--- a/src/ui/view/edit-widget.cpp
+++ b/src/ui/view/edit-widget.cpp
@@ -1342,7 +1342,9 @@ EditWidget::deactivateDesktop()
 void
 EditWidget::viewSetPosition (NR::Point p)
 {
-    p -= _namedview->gridorigin;
+    // p -= _namedview->gridorigin;    
+    /// \todo Why was the origin corrected for the grid origin? (johan)
+    
     double lo, up, pos, max;
     _top_ruler.get_range (lo, up, pos, max);
     _top_ruler.set_range (lo, up, p[NR::X], max);
@@ -1353,18 +1355,19 @@ EditWidget::viewSetPosition (NR::Point p)
 void
 EditWidget::updateRulers()
 {
-    NR::Point origin = _namedview->gridorigin;
-
+    //NR::Point gridorigin = _namedview->gridorigin;
+    /// \todo Why was the origin corrected for the grid origin? (johan)
+    
     NR::Rect const viewbox = _svg_canvas.spobj()->getViewbox();
     double lo, up, pos, max;
     double const scale = _desktop->current_zoom();
-    double s = viewbox.min()[NR::X] / scale - origin[NR::X];
-    double e = viewbox.max()[NR::X] / scale - origin[NR::X];
+    double s = viewbox.min()[NR::X] / scale; //- gridorigin[NR::X];
+    double e = viewbox.max()[NR::X] / scale; //- gridorigin[NR::X];
     _top_ruler.get_range(lo, up, pos, max);
     _top_ruler.set_range(s, e, pos, e);
-    s = viewbox.min()[NR::Y] / -scale - origin[NR::Y];
-    e = viewbox.max()[NR::Y] / -scale - origin[NR::Y];
-    _left_ruler.set_range(s, e, origin[NR::Y], e);
+    s = viewbox.min()[NR::Y] / -scale; //- gridorigin[NR::Y];
+    e = viewbox.max()[NR::Y] / -scale; //- gridorigin[NR::Y];
+    _left_ruler.set_range(s, e, 0 /*gridorigin[NR::Y]*/, e);
     /// \todo is that correct?
 }