remove the disabled old svg-keys-chart verb

diff --git a/share/keys/default.xml b/share/keys/default.xml
index 6f500e23f71a12de6e8cf2c9d43d5b6ea800a9bc..d77cdaa25509b310f3b6f590f369461564675fa3 100644 (file)
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -531,11 +531,11 @@ override) the bindings in the main default.xml.
 
 <!-- Help -->
 
-  <bind action="HelpKeys" />
   <bind action="HelpAboutExtensions" />
   <bind action="HelpAboutMemory" />
   <bind action="HelpAbout" />
   <!-- There are also verbs for tutorials, if you really need them -->
+  <!-- Other commands in Help are implemented as extensions, with ids of org.inkscape.help.* -->
 
 <!-- Effects -->
 

diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index 6f500e23f71a12de6e8cf2c9d43d5b6ea800a9bc..d77cdaa25509b310f3b6f590f369461564675fa3 100644 (file)
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -531,11 +531,11 @@ override) the bindings in the main default.xml.
 
 <!-- Help -->
 
-  <bind action="HelpKeys" />
   <bind action="HelpAboutExtensions" />
   <bind action="HelpAboutMemory" />
   <bind action="HelpAbout" />
   <!-- There are also verbs for tutorials, if you really need them -->
+  <!-- Other commands in Help are implemented as extensions, with ids of org.inkscape.help.* -->
 
 <!-- Effects -->
 

diff --git a/src/help.cpp b/src/help.cpp
index 919a200b04f8aadf485b2649dbe4296c87806ae3..8bae656c530fa45e15727efa79b53349e217c140 100644 (file)
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -38,15 +38,6 @@ sp_help_open_tutorial(GtkMenuItem *, gpointer data)
     g_free(c);
 }
 
-void
-sp_help_open_screen(gchar const *name)
-{
-    gchar *c = g_build_filename(INKSCAPE_SCREENSDIR, name, NULL);
-    sp_file_open(c, NULL, false, false);
-    g_free(c);
-}
-
-
 /*
   Local Variables:
   mode:c++

diff --git a/src/help.h b/src/help.h
index 34569e840c0453e39ad93f9c4004b74c2ce79ada..ab1008257f4e12affd6cfc458ab1b354e3f83f3a 100644 (file)
--- a/src/help.h
+++ b/src/help.h
@@ -18,7 +18,6 @@
 
 void sp_help_about(void);
 void sp_help_open_tutorial(GtkMenuItem *menuitem, gpointer data);
-void sp_help_open_screen(gchar const *name);
 
 
 #endif /* !SEEN_HELP_H */

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 7fd03631173d75ae7620148a3ebf35405b112467..711f24879ec64a0d27cedd54db3500cf81034b2c 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1775,12 +1775,6 @@ HelpVerb::perform(SPAction *action, void *data, void *pdata)
     g_assert(dt->_dlg_mgr != NULL);
 
     switch (reinterpret_cast<std::size_t>(data)) {
-        case SP_VERB_HELP_KEYS:
-            /* TRANSLATORS: If you have translated the keys.svg file to your language, then
-               translate this string as "keys.LANG.svg" (where LANG is your language code);
-               otherwise leave as "keys.svg". */
-            sp_help_open_screen(_("keys.svg"));
-            break;
         case SP_VERB_HELP_ABOUT:
             sp_help_about();
             break;
@@ -2552,8 +2546,6 @@ Verb *Verb::_base_verbs[] = {
                    N_("Manage SVG filter effects"), NULL),
 
     /* Help */
-    new HelpVerb(SP_VERB_HELP_KEYS, "HelpKeys", N_("_Keys and Mouse"),
-                 N_("Keys and mouse shortcuts reference"), "help_keys"),
     new HelpVerb(SP_VERB_HELP_ABOUT_EXTENSIONS, "HelpAboutExtensions", N_("About E_xtensions"),
                  N_("Information on Inkscape extensions"), NULL),
     new HelpVerb(SP_VERB_HELP_MEMORY, "HelpAboutMemory", N_("About _Memory"),

diff --git a/src/verbs.h b/src/verbs.h
index 838a7581ca069d887dc8269882259af50d1f7153..48bf8982553e64ecf4a93d6166b45184be266e00 100644 (file)
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -222,7 +222,6 @@ enum {
     SP_VERB_DIALOG_LIVE_PATH_EFFECT,
     SP_VERB_DIALOG_FILTER_EFFECTS,
     /* Help */
-    SP_VERB_HELP_KEYS,
     SP_VERB_HELP_ABOUT_EXTENSIONS,
     SP_VERB_HELP_MEMORY,
     SP_VERB_HELP_ABOUT,