From fbb85064cfaaf03cc09bacedb16a8561f61f2b3d Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 13 Apr 2013 00:37:18 +0200 Subject: Added prefPaths to contexts; modified SPFactory (bzr r11608.1.94) --- src/desktop.cpp | 63 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 0bf442b7a..626576c7f 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -227,7 +227,8 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid * call "set" instead of "push". Can we assume that there is only one * context ever? */ - push_event_context (SP_TYPE_SELECT_CONTEXT, "/tools/select", SP_EVENT_CONTEXT_STATIC); + //push_event_context (SP_TYPE_SELECT_CONTEXT, "/tools/select", SP_EVENT_CONTEXT_STATIC); + set_event_context(SP_TYPE_SELECT_CONTEXT, "/tools/select"); // display rect and zoom are now handled in sp_desktop_widget_realize() @@ -351,12 +352,14 @@ void SPDesktop::destroy() g_signal_handlers_disconnect_by_func(G_OBJECT (main), (gpointer) G_CALLBACK(sp_desktop_root_handler), this); g_signal_handlers_disconnect_by_func(G_OBJECT (drawing), (gpointer) G_CALLBACK(_arena_handler), this); - while (event_context) { - SPEventContext *ec = event_context; - event_context = ec->next; - sp_event_context_finish (ec); - g_object_unref (G_OBJECT (ec)); - } +// while (event_context) { +// SPEventContext *ec = event_context; +// event_context = ec->next; +// sp_event_context_finish (ec); +// g_object_unref (G_OBJECT (ec)); +// } + sp_event_context_finish(event_context); + g_object_unref(G_OBJECT(event_context)); if (_layer_hierarchy) { delete _layer_hierarchy; @@ -688,16 +691,16 @@ void SPDesktop::set_event_context (GType type, const gchar *config) { SPEventContext *ec; - while (event_context) { + //while (event_context) { ec = event_context; sp_event_context_deactivate (ec); // we have to keep event_context valid during destruction - otherwise writing // destructors is next to impossible - SPEventContext *next = ec->next; + // SPEventContext *next = ec->next; sp_event_context_finish (ec); g_object_unref (G_OBJECT (ec)); - event_context = next; - } + // event_context = next; + //} // The event_context will be null. This means that it will be impossible // to process any event invoked by the lines below. See for example bug @@ -705,7 +708,7 @@ SPDesktop::set_event_context (GType type, const gchar *config) // context to the node tool. In this bug the line bellow invokes GDK_LEAVE_NOTIFY // events which cannot be handled and must be discarded. ec = sp_event_context_new (type, this, config, SP_EVENT_CONTEXT_STATIC); - ec->next = event_context; + // ec->next = event_context; event_context = ec; // Now the event_context has been set again and we can process all events again sp_event_context_activate (ec); @@ -718,24 +721,24 @@ SPDesktop::set_event_context (GType type, const gchar *config) void SPDesktop::push_event_context (GType type, const gchar *config, unsigned int key) { - SPEventContext *ref, *ec; - - if (event_context && event_context->key == key) return; - ref = event_context; - while (ref && ref->next && ref->next->key != key) ref = ref->next; - if (ref && ref->next) { - ec = ref->next; - ref->next = ec->next; - sp_event_context_finish (ec); - g_object_unref (G_OBJECT (ec)); - } - - if (event_context) sp_event_context_deactivate (event_context); - ec = sp_event_context_new (type, this, config, key); - ec->next = event_context; - event_context = ec; - sp_event_context_activate (ec); - _event_context_changed_signal.emit (this, ec); +// SPEventContext *ref, *ec; +// +// if (event_context && event_context->key == key) return; +// ref = event_context; +// while (ref && ref->next && ref->next->key != key) ref = ref->next; +// if (ref && ref->next) { +// ec = ref->next; +// ref->next = ec->next; +// sp_event_context_finish (ec); +// g_object_unref (G_OBJECT (ec)); +// } +// +// if (event_context) sp_event_context_deactivate (event_context); +// ec = sp_event_context_new (type, this, config, key); +// ec->next = event_context; +// event_context = ec; +// sp_event_context_activate (ec); +// _event_context_changed_signal.emit (this, ec); } /** -- cgit v1.2.3 From fbdc8b84ff670c684dafc7d7d403ed01e7077e70 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 13 Apr 2013 18:13:17 +0200 Subject: Replaced casting macros for EventContext tree; added contructors. (bzr r11608.1.96) --- src/desktop.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 626576c7f..17787e912 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -690,15 +690,15 @@ SPDesktop::change_document (SPDocument *theDocument) void SPDesktop::set_event_context (GType type, const gchar *config) { - SPEventContext *ec; + //SPEventContext *ec; //while (event_context) { - ec = event_context; - sp_event_context_deactivate (ec); + //ec = event_context; + sp_event_context_deactivate (event_context); // we have to keep event_context valid during destruction - otherwise writing // destructors is next to impossible // SPEventContext *next = ec->next; - sp_event_context_finish (ec); - g_object_unref (G_OBJECT (ec)); + sp_event_context_finish (event_context); + g_object_unref (G_OBJECT (event_context)); // event_context = next; //} @@ -707,20 +707,20 @@ SPDesktop::set_event_context (GType type, const gchar *config) // LP #622350. Cutting and undoing again in the node tool resets the event // context to the node tool. In this bug the line bellow invokes GDK_LEAVE_NOTIFY // events which cannot be handled and must be discarded. - ec = sp_event_context_new (type, this, config, SP_EVENT_CONTEXT_STATIC); + event_context = sp_event_context_new (type, this, config, SP_EVENT_CONTEXT_STATIC); // ec->next = event_context; - event_context = ec; + //event_context = ec; // Now the event_context has been set again and we can process all events again - sp_event_context_activate (ec); - _event_context_changed_signal.emit (this, ec); + sp_event_context_activate (event_context); + _event_context_changed_signal.emit (this, event_context); } /** * Push event context onto desktop's context stack. */ -void -SPDesktop::push_event_context (GType type, const gchar *config, unsigned int key) -{ +//void +//SPDesktop::push_event_context (GType type, const gchar *config, unsigned int key) +//{ // SPEventContext *ref, *ec; // // if (event_context && event_context->key == key) return; @@ -739,7 +739,7 @@ SPDesktop::push_event_context (GType type, const gchar *config, unsigned int key // event_context = ec; // sp_event_context_activate (ec); // _event_context_changed_signal.emit (this, ec); -} +//} /** * Sets the coordinate status to a given point -- cgit v1.2.3 From 1227ca0189590b281116fcc808bdd8c674b2196c Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 21:16:13 +0200 Subject: Further changes to EventContexts; they work without GObject (bzr r11608.1.97) --- src/desktop.cpp | 94 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 66 insertions(+), 28 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 17787e912..3ef668f5f 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -228,7 +228,8 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid * context ever? */ //push_event_context (SP_TYPE_SELECT_CONTEXT, "/tools/select", SP_EVENT_CONTEXT_STATIC); - set_event_context(SP_TYPE_SELECT_CONTEXT, "/tools/select"); + //set_event_context(SP_TYPE_SELECT_CONTEXT, "/tools/select"); + set_event_context2("/tools/select"); // display rect and zoom are now handled in sp_desktop_widget_realize() @@ -684,37 +685,74 @@ SPDesktop::change_document (SPDocument *theDocument) _document_replaced_signal.emit (this, theDocument); } -/** - * Make desktop switch event contexts. - */ -void -SPDesktop::set_event_context (GType type, const gchar *config) -{ - //SPEventContext *ec; - //while (event_context) { - //ec = event_context; - sp_event_context_deactivate (event_context); - // we have to keep event_context valid during destruction - otherwise writing - // destructors is next to impossible - // SPEventContext *next = ec->next; - sp_event_context_finish (event_context); - g_object_unref (G_OBJECT (event_context)); - // event_context = next; + +#include "sp-factory.h" + +void SPDesktop::set_event_context2(const std::string& toolName) { + if (event_context) { + sp_event_context_deactivate(event_context); + sp_event_context_finish(event_context); + //g_object_unref(G_OBJECT(event_context)); + delete event_context; + } + + event_context = ToolFactory::instance().createObject(toolName); + SPEventContext* ec = event_context; + SPDesktop* desktop = this; + + ec->desktop = desktop; + ec->_message_context + = new Inkscape::MessageContext(desktop->messageStack()); + //ec->key = key; + ec->key = 0; + ec->pref_observer = NULL; + + const std::string& pref_path = toolName; + //if (pref_path) { + ec->pref_observer = new ToolPrefObserver(pref_path, ec); + + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + prefs->addObserver(*(ec->pref_observer)); //} - // The event_context will be null. This means that it will be impossible - // to process any event invoked by the lines below. See for example bug - // LP #622350. Cutting and undoing again in the node tool resets the event - // context to the node tool. In this bug the line bellow invokes GDK_LEAVE_NOTIFY - // events which cannot be handled and must be discarded. - event_context = sp_event_context_new (type, this, config, SP_EVENT_CONTEXT_STATIC); - // ec->next = event_context; - //event_context = ec; - // Now the event_context has been set again and we can process all events again - sp_event_context_activate (event_context); - _event_context_changed_signal.emit (this, event_context); + ec->ceventcontext->setup(); + + + sp_event_context_activate(event_context); + _event_context_changed_signal.emit(this, event_context); } +/** + * Make desktop switch event contexts. + */ +//void +//SPDesktop::set_event_context (GType type, const gchar *config) +//{ +// //SPEventContext *ec; +// //while (event_context) { +// //ec = event_context; +// sp_event_context_deactivate (event_context); +// // we have to keep event_context valid during destruction - otherwise writing +// // destructors is next to impossible +// // SPEventContext *next = ec->next; +// sp_event_context_finish (event_context); +// g_object_unref (G_OBJECT (event_context)); +// // event_context = next; +// //} +// +// // The event_context will be null. This means that it will be impossible +// // to process any event invoked by the lines below. See for example bug +// // LP #622350. Cutting and undoing again in the node tool resets the event +// // context to the node tool. In this bug the line bellow invokes GDK_LEAVE_NOTIFY +// // events which cannot be handled and must be discarded. +// event_context = sp_event_context_new (type, this, config, SP_EVENT_CONTEXT_STATIC); +// // ec->next = event_context; +// //event_context = ec; +// // Now the event_context has been set again and we can process all events again +// sp_event_context_activate (event_context); +// _event_context_changed_signal.emit (this, event_context); +//} + /** * Push event context onto desktop's context stack. */ -- cgit v1.2.3 From 65ba6ad9a82f8f47974eb10665478fd783692bb5 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 23:19:46 +0200 Subject: Merging of EventContext classes complete. (bzr r11608.1.98) --- 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 3ef668f5f..9df01b990 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -715,7 +715,7 @@ void SPDesktop::set_event_context2(const std::string& toolName) { prefs->addObserver(*(ec->pref_observer)); //} - ec->ceventcontext->setup(); + ec->setup(); sp_event_context_activate(event_context); -- cgit v1.2.3 From 5512f857e2f33f1aa40124dc82b353e5f2e5a0b0 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 23:58:53 +0200 Subject: Moved factories to different files. (bzr r11608.1.100) --- 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 9df01b990..493261ea3 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -686,7 +686,7 @@ SPDesktop::change_document (SPDocument *theDocument) } -#include "sp-factory.h" +#include "tool-factory.h" void SPDesktop::set_event_context2(const std::string& toolName) { if (event_context) { -- cgit v1.2.3 From dda3882d58e8cc05ce1d153ad09ee17819d2c0f1 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 01:28:31 +0200 Subject: Some refactoring in RectContext and StarContext. (bzr r11608.1.101) --- src/desktop.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 493261ea3..d952fde35 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -360,7 +360,11 @@ void SPDesktop::destroy() // g_object_unref (G_OBJECT (ec)); // } sp_event_context_finish(event_context); - g_object_unref(G_OBJECT(event_context)); + //g_object_unref(G_OBJECT(event_context)); + if (event_context) { + delete event_context; + event_context = 0; + } if (_layer_hierarchy) { delete _layer_hierarchy; -- cgit v1.2.3 From 389b871cdea29ace85567863c439eb0537a36f54 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 20:45:27 +0200 Subject: Cleaned up a bit. (bzr r11608.1.102) --- src/desktop.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index d952fde35..2b768ede3 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -359,7 +359,8 @@ void SPDesktop::destroy() // sp_event_context_finish (ec); // g_object_unref (G_OBJECT (ec)); // } - sp_event_context_finish(event_context); + //sp_event_context_finish(event_context); + event_context->finish(); //g_object_unref(G_OBJECT(event_context)); if (event_context) { delete event_context; @@ -694,8 +695,10 @@ SPDesktop::change_document (SPDocument *theDocument) void SPDesktop::set_event_context2(const std::string& toolName) { if (event_context) { - sp_event_context_deactivate(event_context); - sp_event_context_finish(event_context); + //sp_event_context_deactivate(event_context); + event_context->deactivate(); + //sp_event_context_finish(event_context); + event_context->finish(); //g_object_unref(G_OBJECT(event_context)); delete event_context; } -- cgit v1.2.3 From d483730f7dbad0c29366354b32b4b2a1020eba0d Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 21:32:53 +0200 Subject: More cleaning. (bzr r11608.1.103) --- src/desktop.cpp | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 2b768ede3..a9e608057 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -695,35 +695,17 @@ SPDesktop::change_document (SPDocument *theDocument) void SPDesktop::set_event_context2(const std::string& toolName) { if (event_context) { - //sp_event_context_deactivate(event_context); event_context->deactivate(); - //sp_event_context_finish(event_context); event_context->finish(); - //g_object_unref(G_OBJECT(event_context)); delete event_context; } event_context = ToolFactory::instance().createObject(toolName); - SPEventContext* ec = event_context; - SPDesktop* desktop = this; - ec->desktop = desktop; - ec->_message_context - = new Inkscape::MessageContext(desktop->messageStack()); - //ec->key = key; - ec->key = 0; - ec->pref_observer = NULL; - - const std::string& pref_path = toolName; - //if (pref_path) { - ec->pref_observer = new ToolPrefObserver(pref_path, ec); - - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - prefs->addObserver(*(ec->pref_observer)); - //} - - ec->setup(); + event_context->desktop = this; + event_context->_message_context = new Inkscape::MessageContext(this->messageStack()); + event_context->setup(); sp_event_context_activate(event_context); _event_context_changed_signal.emit(this, event_context); -- cgit v1.2.3 From bdde74bbab299f2ee448f1c55469c56a66fb01f7 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 23:58:15 +0200 Subject: Removed some unused files; more refactoring in EventContext tree. (bzr r11608.1.104) --- src/desktop.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index a9e608057..d999c780e 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -897,7 +897,10 @@ SPDesktop::set_display_area (double x0, double y0, double x1, double y1, double canvas->scrollTo(x0 * newscale - border, y1 * -newscale - border, clear); /* update perspective lines if we are in the 3D box tool (so that infinite ones are shown correctly) */ - sp_box3d_context_update_lines(event_context); + //sp_box3d_context_update_lines(event_context); + if (SP_IS_BOX3D_CONTEXT(event_context)) { + SP_BOX3D_CONTEXT(event_context)->_vpdrag->updateLines(); + } _widget->updateRulers(); _widget->updateScrollbars(_d2w.descrim()); @@ -1218,7 +1221,10 @@ SPDesktop::scroll_world (double dx, double dy, bool is_scrolling) canvas->scrollTo(viewbox.min()[Geom::X] - dx, viewbox.min()[Geom::Y] - dy, FALSE, is_scrolling); /* update perspective lines if we are in the 3D box tool (so that infinite ones are shown correctly) */ - sp_box3d_context_update_lines(event_context); + //sp_box3d_context_update_lines(event_context); + if (SP_IS_BOX3D_CONTEXT(event_context)) { + SP_BOX3D_CONTEXT(event_context)->_vpdrag->updateLines(); + } _widget->updateRulers(); _widget->updateScrollbars(_d2w.descrim()); -- cgit v1.2.3 From b2dd3583e7372d23d18bbc6e861f4f645ec3dc37 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 30 Jul 2013 23:17:21 +0200 Subject: Further refactoring of EventContexts. (bzr r11608.1.109) --- src/desktop.cpp | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 4 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 029e58c59..332ae5996 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -401,6 +401,65 @@ SPDesktop::~SPDesktop() { } + +SPEventContext* SPDesktop::getEventContext() const { + return event_context; +} + +Inkscape::Selection* SPDesktop::getSelection() const { + return selection; +} + +SPDocument* SPDesktop::getDocument() const { + return doc(); +} + +SPCanvas* SPDesktop::getCanvas() const { + return SP_CANVAS_ITEM(main)->canvas; +} + +SPCanvasItem* SPDesktop::getAcetate() const { + return acetate; +} + +SPCanvasGroup* SPDesktop::getMain() const { + return main; +} + +SPCanvasGroup* SPDesktop::getGridGroup() const { + return gridgroup; +} + +SPCanvasGroup* SPDesktop::getGuides() const { + return guides; +} + +SPCanvasItem* SPDesktop::getDrawing() const { + return drawing; +} + +SPCanvasGroup* SPDesktop::getSketch() const { + return sketch; +} + +SPCanvasGroup* SPDesktop::getControls() const { + return controls; +} + +SPCanvasGroup* SPDesktop::getTempGroup() const { + return tempgroup; +} + +Inkscape::MessageStack* SPDesktop::getMessageStack() const { + return messageStack(); +} + +SPNamedView* SPDesktop::getNamedView() const { + return namedview; +} + + + //-------------------------------------------------------------------- /* Public methods */ @@ -1444,10 +1503,10 @@ void SPDesktop::setWaitingCursor() waiting_cursor = true; } -void SPDesktop::clearWaitingCursor() -{ - if (waiting_cursor) - sp_event_context_update_cursor(sp_desktop_event_context(this)); +void SPDesktop::clearWaitingCursor() { + if (waiting_cursor) { + this->event_context->sp_event_context_update_cursor(); + } } void SPDesktop::toggleColorProfAdjust() -- cgit v1.2.3 From 989abbac025a8b3349748d19a613a08586c5fdcd Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Wed, 31 Jul 2013 21:11:20 +0200 Subject: Fixed SPObject ctor and dtor; removed singleton.h; some smaller changes. (bzr r11608.1.110) --- 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 332ae5996..a8de8ee50 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -682,7 +682,7 @@ void SPDesktop::set_event_context2(const std::string& toolName) { event_context = ToolFactory::instance().createObject(toolName); event_context->desktop = this; - event_context->_message_context = new Inkscape::MessageContext(this->messageStack()); + event_context->message_context = new Inkscape::MessageContext(this->messageStack()); event_context->setup(); -- cgit v1.2.3 From 5488905e7f4659c0fed7c1841b768cbaf26e3cb1 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Fri, 2 Aug 2013 22:25:14 +0200 Subject: reordered SPDesktop::set_event_context2; fixed last mismatched-tags (bzr r11608.1.116) --- src/desktop.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index a8de8ee50..f602f30d1 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -673,20 +673,26 @@ SPDesktop::change_document (SPDocument *theDocument) #include "tool-factory.h" void SPDesktop::set_event_context2(const std::string& toolName) { - if (event_context) { - event_context->deactivate(); - event_context->finish(); - delete event_context; + SPEventContext* ec_old = event_context; + + if (ec_old) { + ec_old->deactivate(); } - event_context = ToolFactory::instance().createObject(toolName); + SPEventContext* ec_new = ToolFactory::instance().createObject(toolName); + ec_new->desktop = this; + ec_new->message_context = new Inkscape::MessageContext(this->messageStack()); + ec_new->setup(); - event_context->desktop = this; - event_context->message_context = new Inkscape::MessageContext(this->messageStack()); + event_context = ec_new; - event_context->setup(); + if (ec_old) { + ec_old->finish(); + delete ec_old; + } sp_event_context_activate(event_context); + _event_context_changed_signal.emit(this, event_context); } -- cgit v1.2.3 From dd18c27c36c9138bc68161ad365bfc61b8d135f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20dos=20Santos=20Oliveira?= Date: Thu, 12 Sep 2013 07:23:11 -0300 Subject: Integrating with libdepixelize (bzr r12506.1.1) --- src/desktop.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/desktop.cpp') diff --git a/src/desktop.cpp b/src/desktop.cpp index 13e339abe..d75733b61 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1822,6 +1822,7 @@ SPDesktop::show_dialogs() mapVerbPreference.insert(std::make_pair ((int)SP_VERB_DIALOG_DISPLAY, "/dialogs/preferences") ); mapVerbPreference.insert(std::make_pair ((int)SP_VERB_SELECTION_GRIDTILE, "/dialogs/gridtiler") ); mapVerbPreference.insert(std::make_pair ((int)SP_VERB_SELECTION_TRACE, "/dialogs/trace") ); + mapVerbPreference.insert(std::make_pair ((int)SP_VERB_SELECTION_PIXEL_ART, "/dialogs/pixelart") ); mapVerbPreference.insert(std::make_pair ((int)SP_VERB_DIALOG_TEXT, "/dialogs/textandfont") ); mapVerbPreference.insert(std::make_pair ((int)SP_VERB_DIALOG_EXPORT, "/dialogs/export") ); mapVerbPreference.insert(std::make_pair ((int)SP_VERB_DIALOG_XML_EDITOR, "/dialogs/xml") ); -- cgit v1.2.3