From 9358db2a9b1234d36096bfc6f2c6d59610f248b6 Mon Sep 17 00:00:00 2001
From: Olibia Tsati <olibia@hardpixel.eu>
Date: Sat, 13 Jun 2020 11:30:42 +0300
Subject: [PATCH] update to support inkscape 1.0

---
 generate_palette.inx | 46 +++++++++++++++++++++++----------------
 generate_palette.py  | 52 +++++++++++++++++++++++++++++---------------
 info.svg             |  1 +
 3 files changed, 63 insertions(+), 36 deletions(-)
 create mode 100644 info.svg

diff --git a/generate_palette.inx b/generate_palette.inx
index 0e6f406..5527bdb 100644
--- a/generate_palette.inx
+++ b/generate_palette.inx
@@ -1,25 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<inkscape-extension>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
   <name>Generate</name>
   <id>hardpixel.eu.generate_palette</id>
-  <dependency type="executable" location="extensions">generate_palette.py</dependency>
-  <dependency type="executable" location="extensions">simplestyle.py</dependency>
-
-  <param name="description" type="description" indent="-1">Select a set of objects and create a custom color palette.</param>
-  <param name="properties-title" type="description" appearance="header">Palette Properties</param>
-  <param name="name-label" type="description" indent="-1">Palette Name</param>
-  <param name="name" type="string" gui-text=""></param>
-  <param name="property-label" type="description" indent="-1">Color Property</param>
-  <param name="property" type="enum" gui-text="">
-    <item value="fill">Fill Color</item>
-    <item value="stroke">Stroke Color</item>
-    <item value="both">Both</item>
-  </param>
-  <param name="options-title" type="description" appearance="header">Options</param>
-  <param name="default" type="boolean" gui-text="Include default grays">false</param>
-  <param name="replace" type="boolean" gui-text="Replace existing palette">false</param>
-  <param name="help-text" type="description" indent="-1">ℹ️ Don't forget to restart Inkscape </param>
 
+  <label>Select a set of objects and create a custom color palette.</label>
+  <label appearance="header">Palette Properties</label>
+
+  <label>Palette Name</label>
+  <param name="name" type="string" gui-text=" "></param>
+
+  <vbox>
+    <label>Color Property</label>
+    <param name="property" type="optiongroup" appearance="combo" gui-text=" ">
+      <option value="fill">Fill Color</option>
+      <option value="stroke">Stroke Color</option>
+      <option value="both">Both</option>
+    </param>
+  </vbox>
+
+  <label appearance="header">Options</label>
+  <param name="default" type="bool" gui-text="Include default grays">false</param>
+  <param name="replace" type="bool" gui-text="Replace existing palette">false</param>
+
+  <spacer />
+
+  <hbox>
+    <image>info.svg</image>
+    <label>Don't forget to restart Inkscape</label>
+  </hbox>
 
   <effect needs-live-preview="false">
     <object-type>all</object-type>
@@ -29,6 +37,6 @@
   </effect>
 
   <script>
-    <command reldir="extensions" interpreter="python">generate_palette.py</command>
+    <command location="inx" interpreter="python">generate_palette.py</command>
   </script>
 </inkscape-extension>
diff --git a/generate_palette.py b/generate_palette.py
index daf60f7..efc7d4b 100644
--- a/generate_palette.py
+++ b/generate_palette.py
@@ -8,29 +8,46 @@
 import os
 import sys
 import inkex
-import simplestyle
-
-__version__ = '2.0'
-
-inkex.localize()
 
 def log(text):
-  inkex.debug(text)
+  inkex.utils.debug(text)
 
 def abort(text):
   inkex.errormsg(_(text))
   exit()
 
-
 class GeneratePalette(inkex.Effect):
 
   def __init__(self):
     inkex.Effect.__init__(self)
 
-    self.OptionParser.add_option('-n', '--name', action='store', type='string', dest='name', help='Palette name')
-    self.OptionParser.add_option('-p', '--property', action='store', type='string', dest='property', help='Color property')
-    self.OptionParser.add_option('-d', '--default', action='store', type='inkbool', dest='default', help='Default grays')
-    self.OptionParser.add_option('-r', '--replace', action='store', type='inkbool', dest='replace', help='Replace existing')
+    self.arg_parser.add_argument(
+      '-n', '--name',
+      type=str,
+      dest='name',
+      help='Palette name'
+    )
+
+    self.arg_parser.add_argument(
+      '-p', '--property',
+      type=str,
+      dest='property',
+      help='Color property'
+    )
+
+    self.arg_parser.add_argument(
+      '-d', '--default',
+      type=inkex.Boolean,
+      dest='default',
+      help='Default grays'
+    )
+
+    self.arg_parser.add_argument(
+      '-r', '--replace',
+      type=inkex.Boolean,
+      dest='replace',
+      help='Replace existing'
+    )
 
   def get_palettes_path(self):
     if sys.platform.startswith('win'):
@@ -66,22 +83,24 @@ def get_default_colors(self):
     return colors if self.options.default else []
 
   def get_node_prop(self, node, property):
-    style = simplestyle.parseStyle(node.attrib['style'])
-    return style[property]
+    attr = node.attrib.get('style')
+    style = dict(inkex.Style.parse_str(attr))
+
+    return style.get(property, 'none')
 
   def get_node_index(self, args):
     id, node = args
     return self.options.ids.index(id)
 
   def get_formatted_color(self, color):
-    rgb = simplestyle.parseColor(color)
+    rgb = inkex.Color(color).to_rgb()
     rgb = "{:3d} {:3d} {:3d}".format(*rgb)
 
     return "%s  %s" % (rgb, color)
 
   def get_selected_colors(self):
     colors   = []
-    selected = list(self.selected.items())
+    selected = list(self.svg.selected.items())
 
     selected.sort(key=self.get_node_index)
 
@@ -133,7 +152,6 @@ def effect(self):
 
     self.write_palette()
 
-
 if __name__ == '__main__':
   palette = GeneratePalette()
-  palette.affect()
+  palette.run()
diff --git a/info.svg b/info.svg
new file mode 100644
index 0000000..2fafe0a
--- /dev/null
+++ b/info.svg
@@ -0,0 +1 @@
+<svg height="12" viewBox="0 0 12 12" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m6 1c2.757 0 5 2.243 5 5s-2.243 5-5 5-5-2.243-5-5 2.243-5 5-5zm0-1c-3.3135 0-6 2.6865-6 6s2.6865 6 6 6 6-2.6865 6-6-2.6865-6-6-6zm-.0005 2.875c.345 0 .6255.28.6255.625s-.2805.625-.6255.625-.6245-.28-.6245-.625.2795-.625.6245-.625zm1.0005 6.125h-2v-.5c.242-.0895.5-.1005.5-.3675v-2.2335c0-.267-.258-.309-.5-.3985v-.5h1.5v3.1325c0 .2675.2585.279.5.3675z"/></svg>
\ No newline at end of file