Merge branch 'develop'

Update easymacro

CHANGELOG

@@ -1,13 +1,21 @@
+v 0.4.0 [27-sep-2019]
+    - Update library easymacro.py
+    - Add icon in command button
+
+
 v 0.3.0 [18-sep-2019]
     - Add support for generate barcode by code
 
+
 v 0.2.1 [16-sep-2019]
+
     - Fix #1
 
 v 0.2.0 [14-sep-2019]
 ---------------------
     - Add support for spanish
 
+
 v 0.1.0 [06-sep-2019]
 ---------------------
     - Initial version

README.md

@@ -41,7 +41,7 @@ BCH: `1RPLWHJW34p7pMQV1ft4x7eWhAYw69Dsb`
 BTC: `3Fe4JuADrAK8Qs7GDAxbSXR8E54avwZJLW`
 
 
-* [See the wiki](https://gitlab.com/mauriciobaeza/zaz-barcode/wikis/home)
+* [Look the wiki](https://gitlab.com/mauriciobaeza/zaz-barcode/wikis/home)
 * [Mira la wiki](https://gitlab.com/mauriciobaeza/zaz-barcode/wikis/home_es)
 
 

VERSION

@@ -1,2 +1,2 @@
-0.3.0
+0.4.0
 

conf.py

@@ -26,7 +26,7 @@ import logging
 TYPE_EXTENSION = 1
 
 # ~ https://semver.org/
-VERSION = '0.3.0'
+VERSION = '0.4.0'
 
 # ~ Your great extension name, not used spaces
 NAME = 'ZAZBarCode'
@@ -506,7 +506,7 @@ NODE_MENUS = ''
 if TYPE_EXTENSION == 1:
     if PARENT == 'AddonMenu':
         NODE_MENUS = '\n'.join(menus)
-    else:
+    elif PARENT == 'OfficeMenuBar':
         tmp = '          <value xml:lang="{}">{}</value>'
         titles = '\n'.join([tmp.format(k, v) for k, v in MENU_MAIN.items()])
         SUBMENUS = '<node oor:name="Submenu">\n  ' + '\n'.join(menus) + '\n        </node>'

files/zazbarcode.update.xml

@@ -5,10 +5,10 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
 
     <identifier value="net.elmau.zaz.BarCode" />
-    <version value="0.3.0" />
+    <version value="0.4.0" />
 
     <update-download>
-        <src xlink:href="https://gitlab.com/mauriciobaeza/zaz-barcode/raw/master/files/ZAZBarCode_v0.3.0.oxt"/>
+        <src xlink:href="https://gitlab.com/mauriciobaeza/zaz-barcode/raw/master/files/ZAZBarCode_v0.4.0.oxt"/>
     </update-download>
     <release-notes>
     </release-notes>

source/ZAZBarCode.py

@@ -48,11 +48,14 @@ class Controllers(object):
 
 
 class ZAZBarCode(unohelper.Base, XJob, XJobExecutor):
+    IMAGES = 'images'
 
     def __init__(self, ctx):
         self.ctx = ctx
         self._data = ''
         self._type = ''
+        self.path_ext = app.get_path_extension(ID_EXTENSION)
+        self.IMAGES = app.join(self.path_ext, self.IMAGES)
 
     def execute(self, args):
         data = app.property_to_dict(args)
@@ -228,8 +231,10 @@ class ZAZBarCode(unohelper.Base, XJob, XJobExecutor):
             'Type': 'Button',
             'Name': 'button',
             'Label': _('~Insert Barcode'),
-            'Width': 60,
+            'Width': 70,
             'Height': 15,
+            'ImageURL': app.join(self.IMAGES, 'qr.png'),
+            'ImagePosition': 1,
         }
         dlg.add_control(args)
 

source/description.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:d="http://openoffice.org/extensions/description/2006">
   <identifier value="net.elmau.zaz.BarCode" />
-  <version value="0.3.0" />
+  <version value="0.4.0" />
   <display-name>
     <name lang="en">ZAZ Bar Code</name>
     <name lang="es">ZAZ Códigos de Barras</name>