diff options
| author | gustav_b <gustav_b@users.sourceforge.net> | 2008-01-17 00:56:37 +0000 |
|---|---|---|
| committer | gustav_b <gustav_b@users.sourceforge.net> | 2008-01-17 00:56:37 +0000 |
| commit | 5b4ddfaee3979a1b8290ed8381f3a4cda6ce7a8e (patch) | |
| tree | c45bd9a4c80cf63a65c72c028def5bd60a7a70f7 /src/display/canvas-grid.cpp | |
| parent | now act on settings in dialogue (diff) | |
| download | inkscape-5b4ddfaee3979a1b8290ed8381f3a4cda6ce7a8e.tar.gz inkscape-5b4ddfaee3979a1b8290ed8381f3a4cda6ce7a8e.zip | |
RegisteredColorPicker is now subclassed from RegisteredWidget<ColorPicker> instead of old RegisteredWdg
(bzr r4530)
Diffstat (limited to 'src/display/canvas-grid.cpp')
| -rw-r--r-- | src/display/canvas-grid.cpp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index f36d8dc5a..104c28747 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -649,8 +649,18 @@ CanvasXYGrid::newSpecificWidget() 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::RegisteredColorPicker *_rcp_gcol = Gtk::manage( + new Inkscape::UI::Widget::RegisteredColorPicker( + _("Grid line _color:"), _("Grid line color"), _("Color of grid lines"), + "color", "opacity", _wr, repr, doc)); + + Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gmcol = Gtk::manage( + new Inkscape::UI::Widget::RegisteredColorPicker( + _("Ma_jor grid line color:"), _("Major grid line color"), + _("Color of the major (highlighted) grid lines"), "empcolor", "empopacity", + _wr, repr, doc)); + Inkscape::UI::Widget::RegisteredSuffixedInteger *_rsi = new Inkscape::UI::Widget::RegisteredSuffixedInteger(); // initialize widgets: @@ -679,11 +689,7 @@ _wr.setUpdating (true); 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( @@ -699,9 +705,9 @@ _wr.setUpdating (false); 0, _rsu_oy->getSU(), 0, _rsu_sx->getSU(), 0, _rsu_sy->getSU(), - _rcp_gcol->_label, _rcp_gcol->_cp, + _rcp_gcol->_label, _rcp_gcol, 0, 0, - _rcp_gmcol->_label, _rcp_gmcol->_cp, + _rcp_gmcol->_label, _rcp_gmcol, _rsi->_label, &_rsi->_hbox, 0, _rcb_dotted, }; |