Improve default colors and remove symlink icons

13 files changed, 166 insertions, 34 deletions

diff --git a/share/icons/CMakeLists.txt b/share/icons/CMakeLists.txt
index 741f0401d..3080b2482 100644
--- a/share/icons/CMakeLists.txt
+++ b/share/icons/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(application)
 add_subdirectory(hicolor)
-add_subdirectory(nextgeneration)
+add_subdirectory(nextgen)
 add_subdirectory(Tango)
 
diff --git a/share/icons/nextgeneration/CMakeLists.txt b/share/icons/nextgen/CMakeLists.txt
index b7a8fb355..720a3a83e 100644
--- a/share/icons/nextgeneration/CMakeLists.txt
+++ b/share/icons/nextgen/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(THEME nextgeneration)
+set(THEME nextgen)
 install(FILES "index.theme" DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME})
 
 set(PIXMAP_SIZES "scalable" "symbolic")
diff --git a/share/icons/nextgeneration/index.theme b/share/icons/nextgen/index.theme
index 2dd3a322f..5a7ed7623 100644
--- a/share/icons/nextgeneration/index.theme
+++ b/share/icons/nextgen/index.theme
@@ -1,5 +1,5 @@
 [Icon Theme]
-Name=nextgeneration
+Name=nextgen
 Comment=next generation theme for inkscape
 Hidden=true
 Directories=scalable/actions,scalable/apps,symbolic/actions,symbolic/apps,16x16/apps,22x22/apps,24x24/apps,32x32/apps,48x48/apps,256x256/apps
diff --git a/share/icons/nextgen/scalable/actions/tool-measure.svg b/share/icons/nextgen/scalable/actions/tool-measure.svg
new file mode 100644
index 000000000..d52757ddb
--- /dev/null
+++ b/share/icons/nextgen/scalable/actions/tool-measure.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   sodipodi:docname="tool-measure-symbolic.svg"
+   inkscape:version="1.0alpha2 (92053aa9ea, 2019-06-13)">
+   <style id="style226">
+      .success { fill:#4AD589; }
+      .warning { fill:#F57900; }
+      .error { fill:#cc0000; }
+   </style>
+  <metadata
+     id="metadata852">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs850" />
+  <sodipodi:namedview
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     id="namedview"
+     showgrid="true"
+     inkscape:zoom="31.678384"
+     inkscape:cx="7.969267"
+     inkscape:cy="7.571171"
+     inkscape:window-width="1360"
+     inkscape:window-height="704"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid" />
+    <style
+       id="style862">.success { fill:#25FF4E; }
+.error { fill:#CC0000; }
+.warning { fill:#FF25CE; }
+</style>
+  </sodipodi:namedview>
+  <rect
+     style="opacity:0.60953183"
+     ry="0"
+     rx="0"
+     y="2"
+     x="8.0427818"
+     height="12.666823"
+     width="3.0714278"
+     id="rect878"
+     class="error" />
+  <rect
+     style="opacity:0.78496546"
+     class="error"
+     id="rect856"
+     width="3.0714278"
+     height="12.666823"
+     x="5"
+     y="2"
+     rx="0"
+     ry="0" />
+  <g
+     transform="matrix(0.666667,0,0,0.666667,-189.69806,-598.89953)"
+     id="tool-measure"
+     inkscape:label="00336">
+    <path
+       inkscape:connector-curvature="0"
+       id="rect13362"
+       d="m 284.54709,898.3493 h 24 v 24 h -24 z"
+       style="opacity:0;fill:none" />
+    <path
+       style="opacity:1"
+       d="m 290.6066,900.4247 v 20.9959 h 11.9246 v -17.1209 c 0,-1.8792 -1.1179,-3.875 -3.6875,-3.875 z m 2,2 h 6.1216 c 1.3125,0 1.8125,0.8107 1.8125,1.9375 v 15.0312 h -7.9341 z"
+       id="path13364"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect13370"
+       d="m 292.65979,903.36218 h 3.25001 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -3.25001 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+       style="opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect13372"
+       d="m 292.65979,911.36218 h 3.25001 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -3.25001 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+       style="opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect13376"
+       d="m 292.72229,917.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+       style="opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect13378"
+       d="m 292.72229,915.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+       style="opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect13380"
+       d="m 292.72229,913.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+       style="opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect13382"
+       d="m 292.72229,909.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+       style="opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect13384"
+       d="m 292.72229,907.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+       style="opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect13386"
+       d="m 292.72229,905.36218 h 1.18751 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1.18751 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+       style="opacity:1" />
+  </g>
+</svg>
diff --git a/share/icons/nextgeneration/symbolic/actions/tool-measure-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg
index 73f3762e6..d52757ddb 100644
--- a/share/icons/nextgeneration/symbolic/actions/tool-measure-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg
@@ -14,11 +14,11 @@
    viewBox="0 0 16 16"
    sodipodi:docname="tool-measure-symbolic.svg"
    inkscape:version="1.0alpha2 (92053aa9ea, 2019-06-13)">
-  <style
-     id="style226">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
-</style>
+   <style id="style226">
+      .success { fill:#4AD589; }
+      .warning { fill:#F57900; }
+      .error { fill:#cc0000; }
+   </style>
   <metadata
      id="metadata852">
     <rdf:RDF>
diff --git a/share/icons/nextgeneration/symbolic/actions/tool-spray-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg
index d51af2d14..9b9cef1cb 100644
--- a/share/icons/nextgeneration/symbolic/actions/tool-spray-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg
@@ -47,11 +47,11 @@
        type="xygrid"
        id="grid" />
   </sodipodi:namedview>
-  <style
-     id="style226">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
-</style>
+   <style id="style226">
+      .success { fill:#4AD589; }
+      .warning { fill:#F57900; }
+      .error { fill:#cc0000; }
+   </style>
   <g
      transform="matrix(0.666667,0,0,0.666667,-190,-681.57467)"
      id="tool-spray"
diff --git a/share/icons/nextgeneration/symbolic/actions/tool-tweak-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg
index 6735d7001..efe1b6b98 100644
--- a/share/icons/nextgeneration/symbolic/actions/tool-tweak-symbolic.svg
+++ b/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg
@@ -63,11 +63,11 @@
        id="grid"
        type="xygrid" />
   </sodipodi:namedview>
-  <style
-     id="style226">.success { fill:#25FF4E; }
-.error { fill:#CC0000; }
-.warning { fill:#FF25CE; }
-</style>
+   <style id="style226">
+      .success { fill:#4AD589; }
+      .warning { fill:#F57900; }
+      .error { fill:#cc0000; }
+   </style>
   <g
      inkscape:label="00155"
      id="tool-tweak"
diff --git a/share/icons/nextgeneration/scalable/actions/tool-measure.svg b/share/icons/nextgeneration/scalable/actions/tool-measure.svg
deleted file mode 120000
index 6414e7a88..000000000
--- a/share/icons/nextgeneration/scalable/actions/tool-measure.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../symbolic/actions/tool-measure-symbolic.svg
\ No newline at end of file
diff --git a/share/icons/nextgeneration/scalable/actions/tool-spray.svg b/share/icons/nextgeneration/scalable/actions/tool-spray.svg
deleted file mode 120000
index ea74935be..000000000
--- a/share/icons/nextgeneration/scalable/actions/tool-spray.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../symbolic/actions/tool-spray-symbolic.svg
\ No newline at end of file
diff --git a/share/icons/nextgeneration/scalable/actions/tool-tweak.svg b/share/icons/nextgeneration/scalable/actions/tool-tweak.svg
deleted file mode 120000
index 8cfb8c6c2..000000000
--- a/share/icons/nextgeneration/scalable/actions/tool-tweak.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../symbolic/actions/tool-tweak-symbolic.svg
\ No newline at end of file
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 266580d39..cec0d9407 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -378,13 +378,13 @@ Application::add_gtk_css()
     gchar colornamedwarning[64];
     gchar colornamederror[64];
     gchar colornamed_inverse[64];
-    int colorset = prefs->getInt("/theme/symbolicColor", 0x000000ff);
+    int colorset = prefs->getInt("/theme/symbolicColor", 0x2E3436ff);
     sp_svg_write_color(colornamed, sizeof(colornamed), colorset);
-    int colorsetsuccess = prefs->getInt("/theme/symbolicSuccessColor", 0x000000ff);
+    int colorsetsuccess = prefs->getInt("/theme/symbolicSuccessColor", 0x4AD589ff);
     sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess);
-    int colorsetwarning = prefs->getInt("/theme/symbolicWarningColor", 0x000000ff);
+    int colorsetwarning = prefs->getInt("/theme/symbolicWarningColor", 0xF57900ff);
     sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning);
-    int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0x000000ff);
+    int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0xcc0000ff);
     sp_svg_write_color(colornamederror, sizeof(colornamederror), colorseterror);
     // Use in case the special widgets have inverse theme background and symbolic
     int colorset_inverse = colorset ^ 0xffffff00;
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index 72093ea70..fa975f8b9 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -80,7 +80,7 @@ R"=====(
   </group>
 
   <group id="theme"
-       gtkTheme="" iconTheme=""  symbolicIcons="0" darkTheme="0" symbolicColor="0x000000ff" >
+       gtkTheme="" iconTheme=""  symbolicIcons="0" darkTheme="0" symbolicColor="0x2E3436ff" >
   </group>
 
   <group id="tools" bounding_box="0">
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index d4108608e..5f1f98c01 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -666,13 +666,13 @@ void InkscapePreferences::symbolicAddClass()
     gchar colornamedwarning[64];
     gchar colornamederror[64];
     gchar colornamed_inverse[64];
-    int colorset = prefs->getInt("/theme/symbolicColor", 0x000000ff);
+    int colorset = prefs->getInt("/theme/symbolicColor", 0x2E3436ff);
     sp_svg_write_color(colornamed, sizeof(colornamed), colorset);
-    int colorsetsuccess = prefs->getInt("/theme/symbolicSuccessColor", 0x000000ff);
+    int colorsetsuccess = prefs->getInt("/theme/symbolicSuccessColor", 0x4AD589ff);
     sp_svg_write_color(colornamedsuccess, sizeof(colornamedsuccess), colorsetsuccess);
-    int colorsetwarning = prefs->getInt("/theme/symbolicWarningColor", 0x000000ff);
+    int colorsetwarning = prefs->getInt("/theme/symbolicWarningColor", 0xF57900ff);
     sp_svg_write_color(colornamedwarning, sizeof(colornamedwarning), colorsetwarning);
-    int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0x000000ff);
+    int colorseterror = prefs->getInt("/theme/symbolicErrorColor", 0xcc0000ff);
     sp_svg_write_color(colornamederror, sizeof(colornamederror), colorseterror);
     // Use in case the special widgets have inverse theme background and symbolic
     int colorset_inverse = colorset ^ 0xffffff00;
@@ -992,10 +992,10 @@ void InkscapePreferences::initPageUI()
     _symbolic_icons.init(_("Use symbolic icons"), "/theme/symbolicIcons", true);
     _symbolic_icons.signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::symbolicAddClass));
     _page_theme.add_line(true, "", _symbolic_icons, "", "", true);
-    _symbolic_color.init(_("Color for symbolic icons:"), "/theme/symbolicColor", 0x000000ff);
-    _symbolic_success_color.init(_("Color for symbolic success icons:"), "/theme/symbolicSuccessColor", 0x000000ff);
-    _symbolic_warning_color.init(_("Color for symbolic warning icons:"), "/theme/symbolicWarningColor", 0x000000ff);
-    _symbolic_error_color.init(_("Color for symbolic error icons:"), "/theme/symbolicErrorColor", 0x000000ff);
+    _symbolic_color.init(_("Color for symbolic icons:"), "/theme/symbolicColor", 0x2E3436ff);
+    _symbolic_success_color.init(_("Color for symbolic success icons:"), "/theme/symbolicSuccessColor", 0x4AD589ff);
+    _symbolic_warning_color.init(_("Color for symbolic warning icons:"), "/theme/symbolicWarningColor", 0xF57900ff);
+    _symbolic_error_color.init(_("Color for symbolic error icons:"), "/theme/symbolicErrorColor", 0xcc0000ff);
     Gtk::Label *_symbolic_color_label = Gtk::manage(new Gtk::Label(_("Change colors:")));
     Gtk::Button *apply_color = Gtk::manage(new Gtk::Button(_("Apply color")));
     apply_color->set_tooltip_text(_("Apply color to symbolic icons)"));