Changed Inkscape logo icon mapping from "inkscape" to "inkscape-logo" as "inkscape...

diff --git a/share/icons/icons.svg b/share/icons/icons.svg
index c36c2d5db9d91b878d9cbdd57e9680c56d622b1f..dd0fe6068aa804ed4db48b7d2a5562894ce770a9 100644 (file)
--- a/share/icons/icons.svg
+++ b/share/icons/icons.svg
@@ -5047,7 +5047,7 @@ http://www.inkscape.org/</dc:description>
      y="0"
      x="0" />
   <g
-     id="inkscape"
+     id="inkscape-logo"
      transform="matrix(0.1336824,0,0,0.1336824,329.5233,64.55912)"
      inkscape:label="#inkscape_options">
     <use

diff --git a/src/ui/icon-names.h b/src/ui/icon-names.h
index 3332dd8cf4351636e05d8828207d7eed97994688..f9a6f2a7d59e80ca4492e21b6b26fadaaa2bc6ba 100644 (file)
--- a/src/ui/icon-names.h
+++ b/src/ui/icon-names.h
@@ -235,7 +235,7 @@
 #define INKSCAPE_ICON_IMAGE_FILTER_TURBULENCE \
     "image-filter-turbulence"
 #define INKSCAPE_ICON_INKSCAPE \
-    "inkscape"
+    "inkscape-logo"
 #define INKSCAPE_ICON_LAYER_BOTTOM \
     "layer-bottom"
 #define INKSCAPE_ICON_LAYER_DELETE \

diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 5e47bd8e4620e2a26d34734dde38eef23650211d..56602962d373ac0889e8a4351b2a8325654fdf0a 100644 (file)
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -381,7 +381,7 @@ static void setupLegacyNaming() {
     legacyNames["text-unkern"] ="remove_manual_kerns";
     legacyNames["help-keyboard-shortcuts"] ="help_keys";
     legacyNames["help-contents"] ="help_tutorials";
-    legacyNames["inkscape"] ="inkscape_options";
+    legacyNames["inkscape-logo"] ="inkscape_options";
     legacyNames["dialog-memory"] ="about_memory";
     legacyNames["tool-pointer"] ="draw_select";
     legacyNames["tool-node-editor"] ="draw_node";

diff --git a/src/widgets/mappings.xml b/src/widgets/mappings.xml
index f142c450c4646ff2f6d246328a0423baa07589b6..2de3ff545aefe8c16219b9d087c9aa4c940e900a 100644 (file)
--- a/src/widgets/mappings.xml
+++ b/src/widgets/mappings.xml
@@ -113,7 +113,7 @@
   <!-- help menu -->
   <remap id='help_keys' newid='help-keyboard-shortcuts'/>
   <remap id='help_tutorials' newid='help-contents'/>
-  <remap id='inkscape_options' newid='inkscape'/>
+  <remap id='inkscape_options' newid='inkscape-logo'/>
   <remap id='about_memory' newid='dialog-memory'/>
   
   <!-- tools -->