From 204b9726e63765daac179c9c7972e08c5b62a1c1 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 14 Apr 2014 22:55:29 +0200 Subject: remove debug messages in desktop.cpp (bzr r13287) --- src/desktop.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 22c00d4f1..b61f6867f 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1699,7 +1699,6 @@ _layer_hierarchy_changed(SPObject */*top*/, SPObject *bottom, /// Called when document is starting to be rebuilt. static void _reconstruction_start(SPDesktop * desktop) { - g_debug("Desktop, starting reconstruction\n"); desktop->_reconstruction_old_layer_id = desktop->currentLayer()->getId() ? desktop->currentLayer()->getId() : ""; desktop->layers->reset(); @@ -1710,8 +1709,6 @@ static void _reconstruction_start(SPDesktop * desktop) } */ desktop->selection->clear(); - - g_debug("Desktop, starting reconstruction end\n"); } /// Called when document rebuild is finished. -- cgit v1.2.3 From 7744bd7a4bdfedd8d0d04b647fd6c0e80a603cb7 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Fri, 18 Apr 2014 19:08:21 -0400 Subject: Add image rendering option for outlines. Setup desktop preferences observer. (bzr r13291.1.1) --- src/desktop.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index b61f6867f..35ee22448 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -138,6 +138,8 @@ SPDesktop::SPDesktop() : _w2d(), _d2w(), _doc2dt( Geom::Scale(1, -1) ), + // This doesn't work I don't know why. + // _image_render_observer(*this, "/options/rendering/imageinoutlinemode"), grids_visible( false ) { _d2w.setIdentity(); @@ -499,11 +501,15 @@ SPDesktop::remove_temporary_canvasitem (Inkscape::Display::TemporaryItem * tempi } } +void SPDesktop::redrawDesktop() { + sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (main), _d2w); // redraw +} + void SPDesktop::_setDisplayMode(Inkscape::RenderMode mode) { SP_CANVAS_ARENA (drawing)->drawing.setRenderMode(mode); canvas->rendermode = mode; _display_mode = mode; - sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (main), _d2w); // redraw + redrawDesktop(); _widget->setTitle( sp_desktop_document(this)->getName() ); } void SPDesktop::_setDisplayColorMode(Inkscape::ColorMode mode) { @@ -524,7 +530,7 @@ void SPDesktop::_setDisplayColorMode(Inkscape::ColorMode mode) { SP_CANVAS_ARENA (drawing)->drawing.setColorMode(mode); canvas->colorrendermode = mode; _display_color_mode = mode; - sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (main), _d2w); // redraw + redrawDesktop(); _widget->setTitle( sp_desktop_document(this)->getName() ); } @@ -819,7 +825,7 @@ SPDesktop::set_display_area (double x0, double y0, double x1, double y1, double // zoom changed - set new zoom factors _d2w = Geom::Scale(newscale, -newscale); _w2d = Geom::Scale(1/newscale, 1/-newscale); - sp_canvas_item_affine_absolute(SP_CANVAS_ITEM(main), _d2w); + redrawDesktop(); clear = TRUE; zoomChanged = true; } -- cgit v1.2.3 From 47abc2d2947692786bb402cedc107e40b9cd21e5 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 19 Apr 2014 00:52:30 -0400 Subject: Fix remaining issue with prefs updating (bzr r13291.1.2) --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/desktop.cpp') 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(); -- cgit v1.2.3 From 77b3c4eb00a8f297449deb5af29f566a12c03b2e Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 19 Apr 2014 20:36:33 -0400 Subject: Stop observer from crashing when it doesn't exist in preferences.xml (bzr r13293) --- src/desktop.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 3ed6d9ef3..f14a314b9 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -138,7 +138,6 @@ SPDesktop::SPDesktop() : _w2d(), _d2w(), _doc2dt( Geom::Scale(1, -1) ), - // This doesn't work I don't know why. _image_render_observer(this, "/options/rendering/imageinoutlinemode"), grids_visible( false ) { -- cgit v1.2.3 From efd39893a4f5e629a9df2d0674222aea1be14199 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Sun, 5 Oct 2014 12:38:15 -0400 Subject: Move obvious ui component to ui/ (bzr r13341.1.247) --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index f14a314b9..b72e9c776 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -55,7 +55,7 @@ #include "document-undo.h" #include "event-log.h" #include "helper/action-context.h" -#include "interface.h" +#include "ui/interface.h" #include "inkscape-private.h" #include "layer-fns.h" #include "layer-manager.h" -- cgit v1.2.3 From 156cf3323a936c7dfccd9e09458cd8b5d174b7fe Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Sun, 5 Oct 2014 19:24:27 -0400 Subject: Move more UI code into ui/ (bzr r13341.1.253) --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index b72e9c776..74dea3ca1 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -72,7 +72,7 @@ #include "sp-namedview.h" #include "sp-root.h" #include "sp-defs.h" -#include "tool-factory.h" +#include "ui/tool-factory.h" #include "widgets/desktop-widget.h" #include "xml/repr.h" #include "helper/action.h" //sp_action_perform -- cgit v1.2.3