diff options
| author | Martin Owens <doctormo@gmail.com> | 2017-06-15 17:15:06 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2017-06-16 20:40:33 +0000 |
| commit | ee36458b5c235d13d30ae8e16a5be44415fe0dfb (patch) | |
| tree | 77a9e8a9e054f69ceaf27e770e18aa300ad88fa2 /src/widgets/toolbox.cpp | |
| parent | Use user interface files for the user interface (diff) | |
| download | inkscape-ee36458b5c235d13d30ae8e16a5be44415fe0dfb.tar.gz inkscape-ee36458b5c235d13d30ae8e16a5be44415fe0dfb.zip | |
Cleanup old xml
Diffstat (limited to '')
| -rw-r--r-- | src/widgets/toolbox.cpp | 59 |
1 files changed, 4 insertions, 55 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 3f595dd35..846321c71 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -1219,7 +1219,6 @@ static void setupToolboxCommon( GtkWidget *toolbox, } else { char const *filename = get_filename(UI, descr); gtk_ui_manager_add_ui_from_file( mgr, filename, &errVal ); - g_warning("RET CODE: %d", errVal); } GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, toolbarName ); @@ -1324,60 +1323,10 @@ void ToolboxFactory::setOrientation(GtkWidget* toolbox, GtkOrientation orientati void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop) { - gchar const * descr = "tool-toolbar.ui"; - /* - "<ui>" - " <toolbar name='ToolToolbar'>" - - " <!-- Basics -->" - " <toolitem action='ToolSelector' />" - " <toolitem action='FooBar' />" - " <toolitem action='ToolNode' />" - " <toolitem action='ToolTweak' />" - " <toolitem action='ToolZoom' />" - " <toolitem action='ToolMeasure' />" - - " <!-- Shapes -->" - " <toolitem action='ToolRect' />" - " <toolitem action='Tool3DBox' />" - " <toolitem action='ToolArc' />" - " <toolitem action='ToolStar' />" - " <toolitem action='ToolSpiral' />" - - " <!-- Paths -->" - " <toolitem action='ToolPencil' />" - " <toolitem action='ToolPen' />" - " <toolitem action='ToolCalligraphic' />" - - " <!-- Text -->" - " <toolitem action='ToolText' />" - - " <!-- Paint large areas -->" - " <toolitem action='ToolSpray' />" - " <toolitem action='ToolEraser' />" - -#if HAVE_POTRACE - " <!-- Fill -->" - " <toolitem action='ToolPaintBucket' />" -#endif - - " <toolitem action='ToolGradient' />" -#ifdef WITH_MESH - " <toolitem action='ToolMesh' />" -#endif - " <toolitem action='ToolDropper' />" - - " <toolitem action='ToolConnector' />" -#ifdef WITH_LPETOOL - " <toolitem action='ToolLPETool' />" -#endif - " </toolbar>" - "</ui>"; -*/ - - setupToolboxCommon( toolbox, desktop, descr, - "/ui/ToolToolbar", - "/toolbox/tools/small"); + setupToolboxCommon( toolbox, desktop, + "tool-toolbar.ui", + "/ui/ToolToolbar", + "/toolbox/tools/small"); } void update_tool_toolbox( SPDesktop *desktop, ToolBase *eventcontext, GtkWidget * /*toolbox*/ ) |