From 1cab611c173b2903512268994343f58ef83883ec Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 3 Dec 2015 21:51:29 +0100 Subject: Add global lock guides to the rulers (bzr r14500.1.5) --- src/desktop.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 7b20bcb9f..0ddd77594 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1467,6 +1467,13 @@ void SPDesktop::toggleColorProfAdjust() _widget->toggleColorProfAdjust(); } +void SPDesktop::toggleGuidesLock() +{ + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool guides_lock = prefs->getBool("/options/guides/guides_lock", false); + prefs->setBool("/options/guides/guides_lock", !guides_lock); +} + bool SPDesktop::colorProfAdjustEnabled() { return _widget->colorProfAdjustEnabled(); -- cgit v1.2.3 From 151733327589217e84c5ac7006b9076f428c53a0 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sat, 5 Dec 2015 12:33:26 +0100 Subject: cppification: GSList replaced by vectors (mostly related to guides and grids) (bzr r14504.1.1) --- 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 7b20bcb9f..5e9401ee0 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1474,7 +1474,7 @@ bool SPDesktop::colorProfAdjustEnabled() void SPDesktop::toggleGrids() { - if (namedview->grids) { + if (! namedview->grids.empty()) { if(gridgroup) { showGrids(!grids_visible); } -- cgit v1.2.3 From e649a1d9cd29f39b2d1cf343cec97ccebce9cf08 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 5 Dec 2015 23:55:57 +0100 Subject: Changed from Desktop to namedview to handle multiples documents (bzr r14500.1.8) --- src/desktop.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 0ddd77594..7b20bcb9f 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1467,13 +1467,6 @@ void SPDesktop::toggleColorProfAdjust() _widget->toggleColorProfAdjust(); } -void SPDesktop::toggleGuidesLock() -{ - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - bool guides_lock = prefs->getBool("/options/guides/guides_lock", false); - prefs->setBool("/options/guides/guides_lock", !guides_lock); -} - bool SPDesktop::colorProfAdjustEnabled() { return _widget->colorProfAdjustEnabled(); -- cgit v1.2.3 From 266cd1e5c43e6a46cd37f7db5138270b80d0944e Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 6 Dec 2015 22:39:31 +0100 Subject: Fixes UX pointed in suv review (bzr r14500.1.9) --- src/desktop.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 7b20bcb9f..ae92c058a 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1467,6 +1467,11 @@ void SPDesktop::toggleColorProfAdjust() _widget->toggleColorProfAdjust(); } +void SPDesktop::toggleGuidesLock() +{ + _widget->toggleGuidesLock(); +} + bool SPDesktop::colorProfAdjustEnabled() { return _widget->colorProfAdjustEnabled(); -- cgit v1.2.3 From b6a5a7b59a78a35128633bd7b7a070ebeb263505 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Tue, 8 Dec 2015 23:34:02 +0100 Subject: finally removed all GSList from main folder .h files (bzr r14504.1.15) --- src/desktop.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 491313234..0aac46e8d 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1704,12 +1704,6 @@ static void _reconstruction_start(SPDesktop * desktop) desktop->_reconstruction_old_layer_id = desktop->currentLayer()->getId() ? desktop->currentLayer()->getId() : ""; desktop->layers->reset(); - /* - GSList const * selection_objs = desktop->selection->list(); - for (; selection_objs != NULL; selection_objs = selection_objs->next) { - - } - */ desktop->selection->clear(); } -- cgit v1.2.3 From 6f817f71119774c09888fddf8ba28a96c4546165 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Mon, 21 Dec 2015 10:48:56 +0100 Subject: Add option for checkerboard background. Fixed bugs: - https://launchpad.net/bugs/397723 (bzr r14539) --- src/desktop.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 0aac46e8d..f099ba39f 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -210,9 +210,11 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid main = (SPCanvasGroup *) sp_canvas_item_new (root, SP_TYPE_CANVAS_GROUP, NULL); g_signal_connect (G_OBJECT (main), "event", G_CALLBACK (sp_desktop_root_handler), this); + /* This is the background the page sits on. */ table = sp_canvas_item_new (main, SP_TYPE_CTRLRECT, NULL); SP_CTRLRECT(table)->setRectangle(Geom::Rect(Geom::Point(-80000, -80000), Geom::Point(80000, 80000))); SP_CTRLRECT(table)->setColor(0x00000000, true, 0x00000000); + SP_CTRLRECT(table)->setCheckerboard( false ); sp_canvas_item_move_to_z (table, 0); page = sp_canvas_item_new (main, SP_TYPE_CTRLRECT, NULL); @@ -1731,14 +1733,16 @@ static void _namedview_modified (SPObject *obj, guint flags, SPDesktop *desktop) if (flags & SP_OBJECT_MODIFIED_FLAG) { - /* Show/hide page background */ - if (nv->pagecolor | (0xff != 0xffffffff)) { - sp_canvas_item_show (desktop->table); - ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor | 0xff); - sp_canvas_item_move_to_z (desktop->table, 0); + /* Set page background */ + sp_canvas_item_show (desktop->table); + if (nv->pagecheckerboard) { + ((CtrlRect *) desktop->table)->setCheckerboard( true ); + ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor ); // | 0xff); } else { - sp_canvas_item_hide (desktop->table); + ((CtrlRect *) desktop->table)->setCheckerboard( false ); + ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor | 0xff); } + sp_canvas_item_move_to_z (desktop->table, 0); /* Show/hide page border */ if (nv->showborder) { -- cgit v1.2.3