summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
Diffstat (limited to 'src/display')
-rw-r--r--src/display/canvas-axonomgrid.cpp129
-rw-r--r--src/display/canvas-axonomgrid.h17
-rw-r--r--src/display/canvas-grid.cpp198
-rw-r--r--src/display/canvas-grid.h25
4 files changed, 189 insertions, 180 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index c64887d1c..65caa41cb 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -193,7 +193,7 @@ attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int
}
CanvasAxonomGrid::CanvasAxonomGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc)
- : CanvasGrid(nv, in_repr, in_doc, GRID_AXONOMETRIC), table(1, 1)
+ : CanvasGrid(nv, in_repr, in_doc, GRID_AXONOMETRIC)
{
gridunit = sp_unit_get_by_abbreviation( prefs_get_string_attribute("options.grids.axonom", "units") );
if (!gridunit)
@@ -214,62 +214,6 @@ CanvasAxonomGrid::CanvasAxonomGrid (SPNamedView * nv, Inkscape::XML::Node * in_r
tan_angle[Z] = tan(angle_rad[Z]);
snapper = new CanvasAxonomGridSnapper(this, namedview, 0);
-
- // initialize widgets:
- vbox.set_border_width(2);
- table.set_spacings(2);
- vbox.pack_start(table, false, false, 0);
-
-_wr.setUpdating (true);
- Inkscape::UI::Widget::ScalarUnit * sutemp;
- _rumg.init (_("Grid _units:"), "units", _wr, repr, doc);
- _rsu_ox.init (_("_Origin X:"), _("X coordinate of grid origin"),
- "originx", _rumg, _wr, repr, doc);
- sutemp = _rsu_ox.getSU();
- sutemp->setDigits(4);
- sutemp->setIncrements(0.1, 1.0);
- _rsu_oy.init (_("O_rigin Y:"), _("Y coordinate of grid origin"),
- "originy", _rumg, _wr, repr, doc);
- sutemp = _rsu_oy.getSU();
- sutemp->setDigits(4);
- sutemp->setIncrements(0.1, 1.0);
- _rsu_sy.init (_("Spacing _Y:"), _("Base length of z-axis"),
- "spacingy", _rumg, _wr, repr, doc);
- sutemp = _rsu_sy.getSU();
- sutemp->setDigits(4);
- sutemp->setIncrements(0.1, 1.0);
- _rsu_ax.init (_("Angle X:"), _("Angle of x-axis"),
- "gridanglex", _wr, repr, doc);
- _rsu_az.init (_("Angle Z:"), _("Angle of z-axis"),
- "gridanglez", _wr, repr, doc);
- _rcp_gcol.init (_("Grid line _color:"), _("Grid line color"),
- _("Color of grid lines"), "color", "opacity", _wr, repr, doc);
- _rcp_gmcol.init (_("Ma_jor grid line color:"), _("Major grid line color"),
- _("Color of the major (highlighted) grid lines"),
- "empcolor", "empopacity", _wr, repr, doc);
- _rsi.init (_("_Major grid line every:"), _("lines"), "empspacing", _wr, repr, doc);
-_wr.setUpdating (false);
-
- Gtk::Widget const *const widget_array[] = {
- 0, _rcbgrid._button,
- _rumg._label, _rumg._sel,
- 0, _rsu_ox.getSU(),
- 0, _rsu_oy.getSU(),
- 0, _rsu_sy.getSU(),
- 0, _rsu_ax.getS(),
- 0, _rsu_az.getS(),
- _rcp_gcol._label, _rcp_gcol._cp,
- 0, 0,
- _rcp_gmcol._label, _rcp_gmcol._cp,
- _rsi._label, &_rsi._hbox,
- };
-
- attach_all (table, widget_array, sizeof(widget_array));
-
- vbox.show();
-
- if (repr) readRepr();
- updateWidgets();
}
CanvasAxonomGrid::~CanvasAxonomGrid ()
@@ -434,10 +378,72 @@ CanvasAxonomGrid::onReprAttrChanged(Inkscape::XML::Node */*repr*/, gchar const *
-Gtk::Widget &
-CanvasAxonomGrid::getWidget()
+Gtk::Widget *
+CanvasAxonomGrid::newSpecificWidget()
{
- return vbox;
+ Gtk::Table * table = Gtk::manage( new Gtk::Table(1,1) );
+
+ Inkscape::UI::Widget::RegisteredUnitMenu *_rumg = new Inkscape::UI::Widget::RegisteredUnitMenu();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_ox = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_oy = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_sy = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredScalar *_rsu_ax = new Inkscape::UI::Widget::RegisteredScalar();
+ Inkscape::UI::Widget::RegisteredScalar *_rsu_az = new Inkscape::UI::Widget::RegisteredScalar();
+ Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gcol = new Inkscape::UI::Widget::RegisteredColorPicker();
+ Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gmcol = new Inkscape::UI::Widget::RegisteredColorPicker();
+ Inkscape::UI::Widget::RegisteredSuffixedInteger *_rsi = new Inkscape::UI::Widget::RegisteredSuffixedInteger();
+
+ // initialize widgets:
+ table->set_spacings(2);
+
+_wr.setUpdating (true);
+ Inkscape::UI::Widget::ScalarUnit * sutemp = NULL;
+ _rumg->init (_("Grid _units:"), "units", _wr, repr, doc);
+ _rsu_ox->init (_("_Origin X:"), _("X coordinate of grid origin"),
+ "originx", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_ox->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rsu_oy->init (_("O_rigin Y:"), _("Y coordinate of grid origin"),
+ "originy", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_oy->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rsu_sy->init (_("Spacing _Y:"), _("Base length of z-axis"),
+ "spacingy", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_sy->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rsu_ax->init (_("Angle X:"), _("Angle of x-axis"),
+ "gridanglex", _wr, repr, doc);
+ _rsu_az->init (_("Angle Z:"), _("Angle of z-axis"),
+ "gridanglez", _wr, repr, doc);
+ _rcp_gcol->init (_("Grid line _color:"), _("Grid line color"),
+ _("Color of grid lines"), "color", "opacity", _wr, repr, doc);
+ _rcp_gmcol->init (_("Ma_jor grid line color:"), _("Major grid line color"),
+ _("Color of the major (highlighted) grid lines"),
+ "empcolor", "empopacity", _wr, repr, doc);
+ _rsi->init (_("_Major grid line every:"), _("lines"), "empspacing", _wr, repr, doc);
+_wr.setUpdating (false);
+
+ Gtk::Widget const *const widget_array[] = {
+ _rumg->_label, _rumg->_sel,
+ 0, _rsu_ox->getSU(),
+ 0, _rsu_oy->getSU(),
+ 0, _rsu_sy->getSU(),
+ 0, _rsu_ax->getS(),
+ 0, _rsu_az->getS(),
+ _rcp_gcol->_label, _rcp_gcol->_cp,
+ 0, 0,
+ _rcp_gmcol->_label, _rcp_gmcol->_cp,
+ _rsi->_label, &_rsi->_hbox,
+ };
+
+ attach_all (*table, widget_array, sizeof(widget_array));
+
+ if (repr) readRepr();
+ updateWidgets();
+ return table;
}
@@ -447,7 +453,7 @@ CanvasAxonomGrid::getWidget()
void
CanvasAxonomGrid::updateWidgets()
{
- if (_wr.isUpdating()) return;
+/* if (_wr.isUpdating()) return;
_wr.setUpdating (true);
@@ -479,6 +485,7 @@ CanvasAxonomGrid::updateWidgets()
_wr.setUpdating (false);
return;
+ */
}
diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h
index a5bc33fa9..ad9466eb8 100644
--- a/src/display/canvas-axonomgrid.h
+++ b/src/display/canvas-axonomgrid.h
@@ -41,8 +41,6 @@ public:
void readRepr();
void onReprAttrChanged (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive);
-
- Gtk::Widget & getWidget();
SPUnit const* gridunit;
@@ -63,22 +61,15 @@ public:
double spacing_ylines;
NR::Point sw; /**< the scaling factors of the affine transform */
-
-
+
+protected:
+ virtual Gtk::Widget * newSpecificWidget();
+
private:
CanvasAxonomGrid(const CanvasAxonomGrid&);
CanvasAxonomGrid& operator=(const CanvasAxonomGrid&);
void updateWidgets();
-
- Gtk::Table table;
-
- Inkscape::UI::Widget::RegisteredCheckButton _rcbgrid, _rcbsnbb, _rcbsnnod;
- Inkscape::UI::Widget::RegisteredUnitMenu _rumg, _rums;
- Inkscape::UI::Widget::RegisteredScalarUnit _rsu_ox, _rsu_oy, _rsu_sy;
- Inkscape::UI::Widget::RegisteredScalar _rsu_ax, _rsu_az;
- Inkscape::UI::Widget::RegisteredColorPicker _rcp_gcol, _rcp_gmcol;
- Inkscape::UI::Widget::RegisteredSuffixedInteger _rsi;
};
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index b6897ae48..a15fdf243 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -157,7 +157,7 @@ grid_canvasitem_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned i
};
CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc, GridType type)
- : namelabel("", Gtk::ALIGN_CENTER), visible(true), gridtype(type)
+ : visible(true), gridtype(type)
{
repr = in_repr;
doc = in_doc;
@@ -167,22 +167,6 @@ CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocume
namedview = nv;
canvasitems = NULL;
-
- Glib::ustring str("<b>");
- str += getName();
- str += "</b>";
- namelabel.set_markup(str);
- vbox.pack_start(namelabel, true, true);
-
- _rcb_enabled.init ( _("_Enabled"),
- _("Determines whether to snap to this grid or not. Can be 'on' for invisible grids."),
- "enabled", _wr, false, repr, doc);
- vbox.pack_start(*dynamic_cast<Gtk::Widget*>(_rcb_enabled._button), true, true);
-
- _rcb_visible.init ( _("_Visible"),
- _("Determines whether the grid is displayed or not. Objects are still snapped to invisible grids."),
- "visible", _wr, true, repr, doc);
- vbox.pack_start(*dynamic_cast<Gtk::Widget*>(_rcb_visible._button), true, true);
}
CanvasGrid::~CanvasGrid()
@@ -325,6 +309,34 @@ CanvasGrid::createCanvasItem(SPDesktop * desktop)
return item;
}
+Gtk::Widget *
+CanvasGrid::newWidget()
+{
+ Gtk::VBox * vbox = Gtk::manage( new Gtk::VBox() );
+ Gtk::Label * namelabel = Gtk::manage(new Gtk::Label("", Gtk::ALIGN_CENTER) );
+
+ Glib::ustring str("<b>");
+ str += getName();
+ str += "</b>";
+ namelabel->set_markup(str);
+ vbox->pack_start(*namelabel, true, true);
+
+ Inkscape::UI::Widget::RegisteredCheckButton * _rcb_visible = Gtk::manage(
+ new Inkscape::UI::Widget::RegisteredCheckButton( _("_Enabled"),
+ _("Determines whether to snap to this grid or not. Can be 'on' for invisible grids."),
+ "enabled", _wr, false, repr, doc) );
+ Inkscape::UI::Widget::RegisteredCheckButton * _rcb_enabled = Gtk::manage(
+ new Inkscape::UI::Widget::RegisteredCheckButton( _("_Visible"),
+ _("Determines whether the grid is displayed or not. Objects are still snapped to invisible grids."),
+ "visible", _wr, true, repr, doc) );
+
+ vbox->pack_start(*_rcb_enabled, true, true);
+ vbox->pack_start(*_rcb_visible, true, true);
+ vbox->pack_start(*newSpecificWidget(), true, true);
+
+ return dynamic_cast<Gtk::Widget *> (vbox);
+}
+
void
CanvasGrid::on_repr_attr_changed(Inkscape::XML::Node *repr, gchar const *key, gchar const *oldval, gchar const *newval, bool is_interactive, void *data)
{
@@ -389,7 +401,7 @@ attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int
}
CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc)
- : CanvasGrid(nv, in_repr, in_doc, GRID_RECTANGULAR), table(1, 1)
+ : CanvasGrid(nv, in_repr, in_doc, GRID_RECTANGULAR)
{
gridunit = sp_unit_get_by_abbreviation( prefs_get_string_attribute("options.grids.xy", "units") );
if (!gridunit)
@@ -404,65 +416,6 @@ CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPD
render_dotted = prefs_get_int_attribute ("options.grids.xy", "dotted", 0) == 1;
snapper = new CanvasXYGridSnapper(this, namedview, 0);
-
- // initialize widgets:
- vbox.set_border_width(2);
- table.set_spacings(2);
- vbox.pack_start(table, false, false, 0);
-
-_wr.setUpdating (true);
- Inkscape::UI::Widget::ScalarUnit * sutemp;
- _rumg.init (_("Grid _units:"), "units", _wr, repr, doc);
- _rsu_ox.init (_("_Origin X:"), _("X coordinate of grid origin"),
- "originx", _rumg, _wr, repr, doc);
- sutemp = _rsu_ox.getSU();
- sutemp->setDigits(4);
- sutemp->setIncrements(0.1, 1.0);
- _rsu_oy.init (_("O_rigin Y:"), _("Y coordinate of grid origin"),
- "originy", _rumg, _wr, repr, doc);
- sutemp = _rsu_oy.getSU();
- sutemp->setDigits(4);
- sutemp->setIncrements(0.1, 1.0);
- _rsu_sx.init (_("Spacing _X:"), _("Distance between vertical grid lines"),
- "spacingx", _rumg, _wr, repr, doc);
- sutemp = _rsu_sx.getSU();
- sutemp->setDigits(4);
- sutemp->setIncrements(0.1, 1.0);
- _rsu_sy.init (_("Spacing _Y:"), _("Distance between horizontal grid lines"),
- "spacingy", _rumg, _wr, repr, doc);
- sutemp = _rsu_sy.getSU();
- sutemp->setDigits(4);
- sutemp->setIncrements(0.1, 1.0);
- _rcp_gcol.init (_("Grid line _color:"), _("Grid line color"),
- _("Color of grid lines"), "color", "opacity", _wr, repr, doc);
- _rcp_gmcol.init (_("Ma_jor grid line color:"), _("Major grid line color"),
- _("Color of the major (highlighted) grid lines"),
- "empcolor", "empopacity", _wr, repr, doc);
- _rsi.init (_("_Major grid line every:"), _("lines"), "empspacing", _wr, repr, doc);
- _rcb_dotted.init ( _("_Show dots instead of lines"),
- _("If set, displays dots at gridpoints instead of gridlines"),
- "dotted", _wr, false, repr, doc);
-_wr.setUpdating (false);
-
- Gtk::Widget const *const widget_array[] = {
- _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, _rcb_dotted._button,
- };
-
- attach_all (table, widget_array, sizeof(widget_array));
-
- vbox.show();
-
- if (repr) readRepr();
- updateWidgets();
}
CanvasXYGrid::~CanvasXYGrid ()
@@ -550,8 +503,7 @@ static gboolean sp_nv_read_opacity(gchar const *str, guint32 *color)
@param widget Widget associated with the scalar.
*/
static void validateScalar(double oldVal,
- double* pTarget,
- Inkscape::UI::Widget::RegisteredScalarUnit& widget)
+ double* pTarget)
{
// Avoid nullness.
if ( pTarget == NULL )
@@ -565,7 +517,6 @@ static void validateScalar(double oldVal,
// Reset the scalar and associated widget to the old value.
*pTarget = oldVal;
- widget.setValue( *pTarget);
} //if
} //validateScalar
@@ -579,8 +530,7 @@ static void validateScalar(double oldVal,
@param widget Widget associated with the int.
*/
static void validateInt(gint oldVal,
- gint* pTarget,
- Inkscape::UI::Widget::RegisteredSuffixedInteger& widget)
+ gint* pTarget)
{
// Avoid nullness.
if ( pTarget == NULL )
@@ -594,7 +544,6 @@ static void validateInt(gint oldVal,
// Reset the int and associated widget to the old value.
*pTarget = oldVal;
- widget.setValue( *pTarget);
} //if
} //validateInt
@@ -616,14 +565,14 @@ CanvasXYGrid::readRepr()
if ( (value = repr->attribute("spacingx")) ) {
double oldVal = spacing[NR::X];
sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &spacing[NR::X], &gridunit);
- validateScalar( oldVal, &spacing[NR::X], _rsu_sx );
+ validateScalar( oldVal, &spacing[NR::X]);
spacing[NR::X] = sp_units_get_pixels(spacing[NR::X], *(gridunit));
}
if ( (value = repr->attribute("spacingy")) ) {
double oldVal = spacing[NR::Y];
sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &spacing[NR::Y], &gridunit);
- validateScalar( oldVal, &spacing[NR::Y], _rsu_sy );
+ validateScalar( oldVal, &spacing[NR::Y]);
spacing[NR::Y] = sp_units_get_pixels(spacing[NR::Y], *(gridunit));
}
@@ -646,7 +595,7 @@ CanvasXYGrid::readRepr()
if ( (value = repr->attribute("empspacing")) ) {
gint oldVal = empspacing;
empspacing = atoi(value);
- validateInt( oldVal, &empspacing, _rsi );
+ validateInt( oldVal, &empspacing);
}
if ( (value = repr->attribute("dotted")) ) {
@@ -684,10 +633,79 @@ CanvasXYGrid::onReprAttrChanged(Inkscape::XML::Node */*repr*/, gchar const */*ke
-Gtk::Widget &
-CanvasXYGrid::getWidget()
+Gtk::Widget *
+CanvasXYGrid::newSpecificWidget()
{
- return vbox;
+ Gtk::Table * table = Gtk::manage( new Gtk::Table(1,1) );
+
+ Inkscape::UI::Widget::RegisteredUnitMenu *_rumg = new Inkscape::UI::Widget::RegisteredUnitMenu();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_ox = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_oy = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_sx = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_sy = new Inkscape::UI::Widget::RegisteredScalarUnit();
+ Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gcol = new Inkscape::UI::Widget::RegisteredColorPicker();
+ Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gmcol = new Inkscape::UI::Widget::RegisteredColorPicker();
+ Inkscape::UI::Widget::RegisteredSuffixedInteger *_rsi = new Inkscape::UI::Widget::RegisteredSuffixedInteger();
+
+ // initialize widgets:
+ table->set_spacings(2);
+
+_wr.setUpdating (true);
+ Inkscape::UI::Widget::ScalarUnit * sutemp;
+ _rumg->init (_("Grid _units:"), "units", _wr, repr, doc);
+ _rsu_ox->init (_("_Origin X:"), _("X coordinate of grid origin"),
+ "originx", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_ox->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rsu_oy->init (_("O_rigin Y:"), _("Y coordinate of grid origin"),
+ "originy", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_oy->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rsu_sx->init (_("Spacing _X:"), _("Distance between vertical grid lines"),
+ "spacingx", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_sx->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rsu_sy->init (_("Spacing _Y:"), _("Distance between horizontal grid lines"),
+ "spacingy", *_rumg, _wr, repr, doc);
+ sutemp = _rsu_sy->getSU();
+ sutemp->setDigits(4);
+ sutemp->setIncrements(0.1, 1.0);
+ _rcp_gcol->init (_("Grid line _color:"), _("Grid line color"),
+ _("Color of grid lines"), "color", "opacity", _wr, repr, doc);
+ _rcp_gmcol->init (_("Ma_jor grid line color:"), _("Major grid line color"),
+ _("Color of the major (highlighted) grid lines"),
+ "empcolor", "empopacity", _wr, repr, doc);
+ _rsi->init (_("_Major grid line every:"), _("lines"), "empspacing", _wr, repr, doc);
+
+ Inkscape::UI::Widget::RegisteredCheckButton * _rcb_dotted = Gtk::manage(
+ new Inkscape::UI::Widget::RegisteredCheckButton( _("_Show dots instead of lines"),
+ _("If set, displays dots at gridpoints instead of gridlines"),
+ "dotted", _wr, false, repr, doc)
+ );
+_wr.setUpdating (false);
+
+ Gtk::Widget const *const widget_array[] = {
+ _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, _rcb_dotted,
+ };
+
+ attach_all (*table, widget_array, sizeof(widget_array));
+
+ if (repr) readRepr();
+ updateWidgets();
+
+ return table;
}
@@ -697,6 +715,7 @@ CanvasXYGrid::getWidget()
void
CanvasXYGrid::updateWidgets()
{
+/*
if (_wr.isUpdating()) return;
_wr.setUpdating (true);
@@ -731,6 +750,7 @@ CanvasXYGrid::updateWidgets()
_wr.setUpdating (false);
return;
+*/
}
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index b8ed8174c..c201fa7df 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -89,7 +89,7 @@ public:
virtual void readRepr() = 0;
virtual void onReprAttrChanged (Inkscape::XML::Node * /*repr*/, const gchar */*key*/, const gchar */*oldval*/, const gchar */*newval*/, bool /*is_interactive*/) = 0;
- virtual Gtk::Widget & getWidget() = 0;
+ Gtk::Widget * newWidget();
Inkscape::XML::Node * repr;
SPDocument *doc;
@@ -104,18 +104,15 @@ public:
protected:
CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc, GridType type);
+ virtual Gtk::Widget * newSpecificWidget() = 0;
+
GSList * canvasitems; // list of created canvasitems
SPNamedView * namedview;
- Gtk::VBox vbox;
- Gtk::Label namelabel;
-
Inkscape::UI::Widget::Registry _wr;
- Inkscape::UI::Widget::RegisteredCheckButton _rcb_visible;
bool visible;
- Inkscape::UI::Widget::RegisteredCheckButton _rcb_enabled;
-
+
GridType gridtype;
private:
@@ -135,8 +132,6 @@ public:
void readRepr();
void onReprAttrChanged (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive);
- Gtk::Widget & getWidget();
-
NR::Point origin;
guint32 color;
guint32 empcolor;
@@ -149,20 +144,16 @@ public:
variables */
NR::Point ow; /**< Transformed origin by the affine for the zoom */
NR::Point sw; /**< Transformed spacing by the affine for the zoom */
+
+protected:
+ virtual Gtk::Widget * newSpecificWidget();
+
private:
CanvasXYGrid(const CanvasXYGrid&);
CanvasXYGrid& operator=(const CanvasXYGrid&);
void updateWidgets();
- Gtk::Table table;
-
- Inkscape::UI::Widget::RegisteredUnitMenu _rumg, _rums;
- Inkscape::UI::Widget::RegisteredScalarUnit _rsu_ox, _rsu_oy, _rsu_sx, _rsu_sy;
- Inkscape::UI::Widget::RegisteredColorPicker _rcp_gcol, _rcp_gmcol;
- Inkscape::UI::Widget::RegisteredSuffixedInteger _rsi;
- Inkscape::UI::Widget::RegisteredCheckButton _rcb_dotted;
-
bool render_dotted;
};
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-20 17:38:45 +0000