Commit 880a88d9 authored by Nathan Lee's avatar Nathan Lee Committed by Marc Jeanmougin

Cleanup UI when built without Potrace

Remove Trace Dialog from context menu, keep
tutorial visible.

(backported from a16ccd50 and 60156dc9)
parent 06cb5e15
......@@ -2005,6 +2005,7 @@ void ContextMenu::MakeImageMenu (void)
mi->set_sensitive( FALSE );
}
#if HAVE_POTRACE
/* Trace Bitmap */
mi = Gtk::manage(new Gtk::MenuItem(_("_Trace Bitmap..."), 1));
mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ImageTraceBitmap));
......@@ -2013,6 +2014,7 @@ void ContextMenu::MakeImageMenu (void)
if (_desktop->selection->isEmpty()) {
mi->set_sensitive(FALSE);
}
#endif
/* Trace Pixel Art */
mi = Gtk::manage(new Gtk::MenuItem(_("Trace Pixel Art"), 1));
......@@ -2133,11 +2135,13 @@ void ContextMenu::ImageEdit(void)
}
}
#if HAVE_POTRACE
void ContextMenu::ImageTraceBitmap(void)
{
INKSCAPE.dialogs_unhide();
_desktop->_dlg_mgr->showDialog("Trace");
}
#endif
void ContextMenu::ImageTracePixelArt(void)
{
......
......@@ -234,7 +234,9 @@ class ContextMenu : public Gtk::Menu
/**
* callback, is executed on clicking the "Trace Bitmap" menu entry
*/
#if HAVE_POTRACE
void ImageTraceBitmap(void);
#endif
/**
* callback, is executed on clicking the "Trace Pixel Art" menu entry
......
......@@ -2990,13 +2990,9 @@ Verb *Verb::_base_verbs[] = {
N_("Using shape tools to create and edit shapes"), NULL),
new TutorialVerb(SP_VERB_TUTORIAL_ADVANCED, "TutorialsAdvanced", N_("Inkscape: _Advanced"),
N_("Advanced Inkscape topics"), NULL/*"tutorial_advanced"*/),
#if HAVE_POTRACE
// TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize)
new TutorialVerb(SP_VERB_TUTORIAL_TRACING, "TutorialsTracing", N_("Inkscape: T_racing"),
N_("Using bitmap tracing"), NULL/*"tutorial_tracing"*/),
#endif
new TutorialVerb(SP_VERB_TUTORIAL_TRACING_PIXELART, "TutorialsTracingPixelArt", N_("Inkscape: Tracing Pixel Art"),
N_("Using Trace Pixel Art dialog"), NULL),
new TutorialVerb(SP_VERB_TUTORIAL_CALLIGRAPHY, "TutorialsCalligraphy", N_("Inkscape: _Calligraphy"),
......
......@@ -324,11 +324,7 @@ enum {
SP_VERB_TUTORIAL_BASIC,
SP_VERB_TUTORIAL_SHAPES,
SP_VERB_TUTORIAL_ADVANCED,
#if HAVE_POTRACE
SP_VERB_TUTORIAL_TRACING,
#endif
SP_VERB_TUTORIAL_TRACING_PIXELART,
SP_VERB_TUTORIAL_CALLIGRAPHY,
SP_VERB_TUTORIAL_INTERPOLATE,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment