Add paint server dialog. Currently handles patterns and hatches. GSOC 2019.

9 files changed, 312 insertions, 18 deletions

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 8520fea10..bfe6f7b49 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -4,12 +4,11 @@ add_subdirectory(branding)
 add_subdirectory(examples)
 add_subdirectory(filters)
 add_subdirectory(fonts)
-add_subdirectory(gradients)
 add_subdirectory(icons)
 add_subdirectory(keys)
 add_subdirectory(markers)
+add_subdirectory(paint)
 add_subdirectory(palettes)
-add_subdirectory(patterns)
 add_subdirectory(screens)
 add_subdirectory(symbols)
 add_subdirectory(templates)
@@ -17,9 +16,8 @@ add_subdirectory(pixmaps)
 add_subdirectory(tutorials)
 add_subdirectory(ui)
 
-install(DIRECTORY extensions DESTINATION ${INKSCAPE_SHARE_INSTALL} 
-	PATTERN ".git*" EXCLUDE 
+install(DIRECTORY extensions DESTINATION ${INKSCAPE_SHARE_INSTALL}
+	PATTERN ".git*" EXCLUDE
 	PATTERN "tests" EXCLUDE
 	PATTERN "*.pyc" EXCLUDE
 	)
-
diff --git a/share/gradients/CMakeLists.txt b/share/gradients/CMakeLists.txt
deleted file mode 100644
index cd235477f..000000000
--- a/share/gradients/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-install(FILES "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/gradients)
diff --git a/share/gradients/README b/share/gradients/README
deleted file mode 100644
index 0dd74cf49..000000000
--- a/share/gradients/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This new folder is part of the Inkscape 0.38 directory reorganization. Please place the appropriate files into this folder.
-
-Thank You!
-
-Inkscape Developers
diff --git a/share/patterns/CMakeLists.txt b/share/paint/CMakeLists.txt
index 7bd4e0c71..73654dcde 100644
--- a/share/patterns/CMakeLists.txt
+++ b/share/paint/CMakeLists.txt
@@ -8,4 +8,4 @@ add_custom_command(
 set_source_files_properties(${CMAKE_SOURCE_DIR}/patterns.svg.h PROPERTIES GENERATED TRUE)
 add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h)
 
-install(FILES "patterns.svg" "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/patterns)
+install(FILES "hatches.svg" "patterns.svg" "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/paint)
diff --git a/share/patterns/README b/share/paint/README
index 7035a58a9..7035a58a9 100644
--- a/share/patterns/README
+++ b/share/paint/README
diff --git a/share/paint/hatches.svg b/share/paint/hatches.svg
new file mode 100644
index 000000000..ff965e675
--- /dev/null
+++ b/share/paint/hatches.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    width="475"
+    height="475"
+    id="InkscapeHatches"
+    inkscape:version="1.0alpha2">
+  <title>Hatches</title>
+  <defs>
+    <hatch inkscape:collect="always"
+		id="hatch1" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="5" stroke-width="2" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch2" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="15" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch3" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="5" d="M 0,0 5,10" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch4" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="5" d="L 0,0 5,10" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch5" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="5" d="M 0,0 5,10 10,5" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch6" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="5" d="M 0,0 5,10 M 5,20" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch7" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="5" d="L 0,0 5,10 0,20" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch8" hatchUnits="userSpaceOnUse" pitch="15" rotate="30">
+     <hatchpath stroke="#000000" offset="10" d="L 0,0 5,10 0,20" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch9" hatchUnits="userSpaceOnUse" pitch="15" rotate="45">
+     <hatchpath stroke="#000000" offset="10" d="L 0,0 5,10 0,20" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch10" hatchUnits="userSpaceOnUse" pitch="15" x="-5" y="-10" rotate="30">
+     <hatchpath stroke="#000000" offset="10" d="L 0,0 5,10 0,20" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch11" hatchUnits="userSpaceOnUse" pitch="15" rotate="30" x="-5" y="-10"
+      hatchTransform="matrix(0.96592583,-0.25881905,0.25881905,0.96592583,-8.4757068,43.273395)">
+     <hatchpath stroke="#000000" offset="10" d="L 0,0 5,10 0,20" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch12" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="5" />
+     <hatchpath stroke="#a080ff" offset="10" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch13" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="5" />
+     <hatchpath stroke="#000000" offset="10" d="L 0,0 5,10" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch14" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="5" d="L 0,0 5,17" />
+     <hatchpath stroke="#000000" offset="10" d="L 0,0 5,10" />
+    </hatch>
+    <hatch inkscape:collect="always"
+		id="hatch15" hatchUnits="userSpaceOnUse" pitch="15">
+     <hatchpath stroke="#000000" offset="5" stroke-width="5" stroke-dasharray="10 4 2 4" />
+    </hatch>
+  </defs>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="15" />
+    <rect class="preview" fill="url(#hatch1)" width="100" height="100" x="15" y="15" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="130" y="15" />
+    <rect class="preview" fill="url(#hatch2)" width="100" height="100" x="130" y="15" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="245" y="15" />
+    <rect class="preview" fill="url(#hatch3)" width="100" height="100" x="245" y="15" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="360" y="15" />
+    <rect class="preview" fill="url(#hatch4)" width="100" height="100" x="360" y="15" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="130" />
+    <rect class="preview" fill="url(#hatch5)" width="100" height="100" x="15" y="130" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="130" y="130" />
+    <rect class="preview" fill="url(#hatch6)" width="100" height="100" x="130" y="130" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="130" y="130" />
+    <rect class="preview" fill="url(#hatch7)" width="100" height="100" x="130" y="130" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="360" y="130" />
+    <rect class="preview" fill="url(#hatch8)" width="100" height="100" x="360" y="130" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="245" />
+    <rect class="preview" fill="url(#hatch9)" width="100" height="100" x="15" y="245" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="130" y="245" />
+    <rect class="preview" fill="url(#hatch10)" width="100" height="100" x="130" y="245" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="245" y="245" />
+    <rect class="preview" fill="url(#hatch11)" width="100" height="100" x="245" y="245" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="360" y="245" />
+    <rect class="preview" fill="url(#hatch12)" width="100" height="100" x="360" y="245" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="360" />
+    <rect class="preview" fill="url(#hatch13)" width="100" height="100" x="15" y="360" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="130" y="360" />
+    <rect class="preview" fill="url(#hatch14)" width="100" height="100" x="130" y="360" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="245" y="360" />
+    <rect class="preview" fill="url(#hatch15)" width="100" height="100" x="245" y="360" />
+  </g>
+
+  <script type="text/javascript" xlink:href="hatch.js"></script>
+</svg>
diff --git a/share/patterns/i18n.py b/share/paint/i18n.py
index b0f515d2c..b0f515d2c 100755
--- a/share/patterns/i18n.py
+++ b/share/paint/i18n.py
diff --git a/share/patterns/patterns.svg b/share/paint/patterns.svg
index 0950b7858..f93e13996 100644
--- a/share/patterns/patterns.svg
+++ b/share/paint/patterns.svg
@@ -6,11 +6,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   width="744.094"
-   height="1052.362"
+   width="475"
+   height="1280"
    id="InkscapePatterns"
    sodipodi:version="0.32"
-   inkscape:version="0.46dev+devel">
+   inkscape:version="1.0alpha2 (2d4d49aaa0, 2019-06-18, custom)">
+  <title>Patterns</title>
   <defs
      id="defs2387">
     <pattern
@@ -942,7 +943,7 @@
          height="260"
          id="image9"
          x="0"
-         y="0" 
+         y="0"
          xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQIAIwAjAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB
 AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEB
 AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAEEAQQDASIA
@@ -3051,7 +3052,7 @@ SUVORK5CYII=
          height="260"
          id="image10"
          x="0"
-         y="0" 
+         y="0"
          xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQIAIwAjAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcU
 FhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/wAALCAEEAQQBAREA/8QAGwAAAwEBAQEB
 AAAAAAAAAAAAAwQFBgIBAAf/xABFEAACAQMDAwIEBAMECQMEAgMBAgMEERIABSETIjEyQQYUQlEj
@@ -3544,4 +3545,166 @@ Jum5BFiA+acWC8cWA9+OANf/2Q==
 "/>
     </pattern>
   </defs>
+
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="15" />
+    <rect class="preview" fill="url(#Strips1_1)" width="100" height="100" x="15" y="15" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="130" y="15" />
+    <rect class="preview" fill="url(#Strips1_1white)" width="100" height="100" x="130" y="15" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="245" y="15" />
+    <rect class="preview" fill="url(#Strips1_1.5)" width="100" height="100" x="245" y="15" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="360" y="15" />
+    <rect class="preview" fill="url(#Strips1_1.5white)" width="100" height="100" x="360" y="15" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="130" />
+    <rect class="preview" fill="url(#Strips1_2)" width="100" height="100" x="15" y="130" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="130" y="130" />
+    <rect class="preview" fill="url(#Strips1_2white)" width="100" height="100" x="130" y="130" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="245" y="130" />
+    <rect class="preview" fill="url(#Strips1_3)" width="100" height="100" x="245" y="130" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="360" y="130" />
+    <rect class="preview" fill="url(#Strips1_3white)" width="100" height="100" x="360" y="130" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="245" />
+    <rect class="preview" fill="url(#Strips1_4)" width="100" height="100" x="15" y="245" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="130" y="245" />
+    <rect class="preview" fill="url(#Strips1_4white)" width="100" height="100" x="130" y="245" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="245" y="245" />
+    <rect class="preview" fill="url(#Strips1_5)" width="100" height="100" x="245" y="245" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="360" y="245" />
+    <rect class="preview" fill="url(#Strips1_5white)" width="100" height="100" x="360" y="245" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="360" />
+    <rect class="preview" fill="url(#Strips1_8)" width="100" height="100" x="15" y="360" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="130" y="360" />
+    <rect class="preview" fill="url(#Strips1_8white)" width="100" height="100" x="130" y="360" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="245" y="360" />
+    <rect class="preview" fill="url(#Strips1_10)" width="100" height="100" x="245" y="360" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="360" y="360" />
+    <rect class="preview" fill="url(#Strips1_10white)" width="100" height="100" x="360" y="360" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="475" />
+    <rect class="preview" fill="url(#Strips1_16)" width="100" height="100" x="15" y="475" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="130" y="475" />
+    <rect class="preview" fill="url(#Strips1_16white)" width="100" height="100" x="130" y="475" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="245" y="475" />
+    <rect class="preview" fill="url(#Strips1_32)" width="100" height="100" x="245" y="475" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="360" y="475" />
+    <rect class="preview" fill="url(#Strips1_32white)" width="100" height="100" x="360" y="475" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="590" />
+    <rect class="preview" fill="url(#Strips1_64)" width="100" height="100" x="15" y="590" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="130" y="590" />
+    <rect class="preview" fill="url(#Strips2_1)" width="100" height="100" x="130" y="590" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="245" y="590" />
+    <rect class="preview" fill="url(#Strips2_1white)" width="100" height="100" x="245" y="590" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="360" y="590" />
+    <rect class="preview" fill="url(#Strips4_1)" width="100" height="100" x="360" y="590" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="15" y="705" />
+    <rect class="preview" fill="url(#Strips4_1white)" width="100" height="100" x="15" y="705" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="130" y="705" />
+    <rect class="preview" fill="url(#Checkerboard)" width="100" height="100" x="130" y="705" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="245" y="705" />
+    <rect class="preview" fill="url(#Checkerboardwhite)" width="100" height="100" x="245" y="705" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF"  width="100" height="100" x="360" y="705" />
+    <rect class="preview" fill="url(#Packedcircles)" width="100" height="100" x="360" y="705" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="820" />
+    <rect class="preview" fill="url(#Polkadots-small)" width="100" height="100" x="15" y="820" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="130" y="820" />
+    <rect class="preview" fill="url(#Polkadots-smallwhite)" width="100" height="100" x="130" y="820" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="245" y="820" />
+    <rect class="preview" fill="url(#Polkadots-med)" width="100" height="100" x="245" y="820" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="360" y="820" />
+    <rect class="preview" fill="url(#Polkadots-medwhite)" width="100" height="100" x="360" y="820" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="935" />
+    <rect class="preview" fill="url(#Polkadots-large)" width="100" height="100" x="15" y="935" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="130" y="935" />
+    <rect class="preview" fill="url(#Polkadots-largewhite)" width="100" height="100" x="130" y="935" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="245" y="935" />
+    <rect class="preview" fill="url(#Wavy)" width="100" height="100" x="245" y="935" />
+  </g>
+  <g>
+    <rect fill="#000000" width="100" height="100" x="360" y="935" />
+    <rect class="preview" fill="url(#Wavywhite)" width="100" height="100" x="360" y="935" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="15" y="1050" />
+    <rect class="preview" fill="url(#Camouflage)" width="100" height="100" x="15" y="1050" />
+  </g>
+  <g>
+    <rect fill="#FFFFFF" width="100" height="100" x="130" y="1050" />
+    <rect class="preview" fill="url(#Ermine)" width="100" height="100" x="130" y="1050" />
+  </g>
+  <g>
+    <rect class="preview" fill="url(#sand_bitmap)" width="100" height="100" x="245" y="1050" />
+  </g>
+  <g>
+    <rect class="preview" fill="url(#cloth_bitmap)" width="100" height="100" x="360" y="1050" />
+  </g>
+  <g>
+    <rect class="preview" fill="url(#oldpaint_bitmap)" width="100" height="100" x="15" y="1165" />
+  </g>
 </svg>
diff --git a/share/ui/menus.xml b/share/ui/menus.xml
index 58f19d4b9..c17969798 100644
--- a/share/ui/menus.xml
+++ b/share/ui/menus.xml
@@ -195,6 +195,7 @@
        <verb verb-id="DialogFillStroke" />
        <verb verb-id="DialogObjectProperties" />
        <verb verb-id="DialogSymbols" />
+       <verb verb-id="DialogPaintServers" />
        <separator/>
        <verb verb-id="SelectionGroup" />
        <verb verb-id="SelectionUnGroup" />