diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-04-19 04:52:30 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-04-19 04:52:30 +0000 |
| commit | 47abc2d2947692786bb402cedc107e40b9cd21e5 (patch) | |
| tree | 0fef0ac4ca957ae0405c01a1bc84e8564fb5e857 /src | |
| parent | Add image rendering option for outlines. Setup desktop preferences observer. (diff) | |
| download | inkscape-47abc2d2947692786bb402cedc107e40b9cd21e5.tar.gz inkscape-47abc2d2947692786bb402cedc107e40b9cd21e5.zip | |
Fix remaining issue with prefs updating
(bzr r13291.1.2)
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop.cpp | 2 | ||||
| -rw-r--r-- | src/desktop.h | 3 | ||||
| -rw-r--r-- | src/display/drawing-image.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index 35ee22448..3ed6d9ef3 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -139,7 +139,7 @@ SPDesktop::SPDesktop() : _d2w(), _doc2dt( Geom::Scale(1, -1) ), // This doesn't work I don't know why. - // _image_render_observer(*this, "/options/rendering/imageinoutlinemode"), + _image_render_observer(this, "/options/rendering/imageinoutlinemode"), grids_visible( false ) { _d2w.setIdentity(); diff --git a/src/desktop.h b/src/desktop.h index ccc45904d..fec6249e9 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -448,8 +448,7 @@ private: SPDesktop *_desktop; }; - // Disabled while stupid init call doesn't work - //DesktopPrefObserver _image_render_observer; + DesktopPrefObserver _image_render_observer; bool grids_visible; /* don't set this variable directly, use the method below */ void set_grids_visible(bool visible); diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp index bec59384c..00caef525 100644 --- a/src/display/drawing-image.cpp +++ b/src/display/drawing-image.cpp @@ -107,7 +107,7 @@ unsigned DrawingImage::_renderItem(DrawingContext &dc, Geom::IntRect const &/*ar bool outline = _drawing.outline(); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - bool imgoutline = prefs->getBool("/options/rendering/imageinoutlinemode", true); + bool imgoutline = prefs->getBool("/options/rendering/imageinoutlinemode", false); if (!outline || imgoutline) { if (!_pixbuf) return RENDER_OK; diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 940f105d0..559398a84 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1465,7 +1465,7 @@ void InkscapePreferences::initPageBitmaps() _page_bitmaps.add_group_header( _("Render")); // rendering outlines for pixmap image tags - _rendering_image_outline.init( _("Images in Outline Mode"), "/options/rendering/imageinoutlinemode", true); + _rendering_image_outline.init( _("Images in Outline Mode"), "/options/rendering/imageinoutlinemode", false); _page_bitmaps.add_line(false, _(""), _rendering_image_outline, "", _("When active will render images while in outline mode instead of a red box with an x. This is useful for manual tracing.")); this->AddPage(_page_bitmaps, _("Bitmaps"), PREFS_PAGE_BITMAPS); |