Merge branch 'master' of /~https://github.com/isogeo/isogeo-2-office

isogeo · Sep 6, 2019 · a19860d · a19860d
2 parents f60db03 + cd0c829
commit a19860d
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 152 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,11 @@
 # Isogeo to Office
 
-[![Build status](https://ci.appveyor.com/api/projects/status/u003l71d0u42u0xn?svg=true)](https://ci.appveyor.com/project/GutsJM/isogeo-2-office)
 [![Build Status](https://dev.azure.com/isogeo/Isogeo%20to%20Office/_apis/build/status/isogeo.isogeo-2-office?branchName=master)](https://dev.azure.com/isogeo/Isogeo%20to%20Office/_build/latest?definitionId=9&branchName=master)
 [![Release Status](https://vsrm.dev.azure.com/isogeo/_apis/public/Release/badge/ab7b2770-7c3b-4370-be55-2d4491956a6b/1/1)](https://dev.azure.com/isogeo/Isogeo%20to%20Office/_release?definitionId=1)
-[![codecov](https://codecov.io/gh/isogeo/isogeo-2-office/branch/master/graph/badge.svg)](https://codecov.io/gh/isogeo/isogeo-2-office) 
-[![Python 3.6.x compatiblity](https://img.shields.io/badge/python-3.6-blue.svg)](https://docs.python.org/3.6/whatsnew/changelog.html)
+
+![Azure DevOps coverage](https://img.shields.io/azure-devops/coverage/isogeo/Isogeo%20to%20Office/9?style=flat-square)
+
+[![Python 3.7.x compatiblity](https://img.shields.io/badge/python-3.7-blue.svg)](https://docs.python.org/3.7/whatsnew/changelog.html)
 
 Desktop toolbox using Isogeo REST API to export metadatas into Microsoft Office files and standardized XML (ISO 19139).
 

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/bundle_isogeo2office.spec b/bundle_isogeo2office.spec
@@ -5,6 +5,7 @@ block_cipher = None
 # -- Include ------------------------------------------------------------------
 added_files = [('i18n', 'i18n'),
                ('resources', 'resources'),
+               ('.env.example', '.env'),
                ('_templates/template_Isogeo.docx', '_templates'),
                ('_thumbnails/thumbnails.xlsx', '_thumbnails'),
               ]

diff --git a/bundle_version.txt b/bundle_version.txt
@@ -7,7 +7,7 @@ VSVersionInfo(
     # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
     # Set not needed items to zero 0.
     filevers=(1, 0, 0, 0),
-    prodvers=(2, 0, 0, 0),
+    prodvers=(2, 5, 0, 0),
     # Contains a bitmask that specifies the valid bits 'flags'
     mask=0x0,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -31,7 +31,7 @@ VSVersionInfo(
         u'040904E4',
         [StringStruct(u'CompanyName', u'Isogeo'),
         StringStruct(u'ProductName', u'Isogeo to Office'),
-        StringStruct(u'ProductVersion', u'2,1,0,b1'),
+        StringStruct(u'ProductVersion', u'2,5,0,0'),
         StringStruct(u'InternalName', u'isogeo2office'),
         StringStruct(u'OriginalFilename', u'isogeo2office.exe'),
         StringStruct(u'FileVersion', u'1.0.0'),

diff --git a/i18n/IsogeoToOffice_en.ts b/i18n/IsogeoToOffice_en.ts
@@ -167,114 +167,114 @@ application will be closed.</source>
 <context>
     <name>ThreadAppProperties</name>
     <message>
-        <location filename="../modules/threads.py" line="81"/>
+        <location filename="../modules/threads/application_properties.py" line="71"/>
         <source>This application is authenticated as </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="93"/>
+        <location filename="../modules/threads/application_properties.py" line="83"/>
         <source> and powered by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="89"/>
+        <location filename="../modules/threads/application_properties.py" line="79"/>
         <source>share:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="93"/>
+        <location filename="../modules/threads/application_properties.py" line="83"/>
         <source>shares:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="123"/>
+        <location filename="../modules/threads/application_properties.py" line="113"/>
         <source>Updated:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="129"/>
+        <location filename="../modules/threads/application_properties.py" line="119"/>
         <source>Contact:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="117"/>
+        <location filename="../modules/threads/application_properties.py" line="107"/>
         <source>OpenCatalog status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="113"/>
+        <location filename="../modules/threads/application_properties.py" line="103"/>
         <source>enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="117"/>
+        <location filename="../modules/threads/application_properties.py" line="107"/>
         <source>disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="73"/>
+        <location filename="../modules/threads/application_properties.py" line="63"/>
         <source>No share is connected to the application. It cannot work.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThreadExportExcel</name>
     <message>
-        <location filename="../modules/threads.py" line="258"/>
+        <location filename="../modules/threads/export_excel.py" line="116"/>
         <source>Processing Excel: {}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="274"/>
+        <location filename="../modules/threads/export_excel.py" line="132"/>
         <source>Excel finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="249"/>
+        <location filename="../modules/threads/export_excel.py" line="107"/>
         <source>complementary analisis...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="258"/>
+        <location filename="../modules/threads/export_excel.py" line="116"/>
         <source>tunning sheets...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThreadExportWord</name>
     <message>
-        <location filename="../modules/threads.py" line="339"/>
+        <location filename="../modules/threads/export_word.py" line="103"/>
         <source>Processing Word: {}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="372"/>
+        <location filename="../modules/threads/export_word.py" line="129"/>
         <source>Word: error occurred during saving step. Check the log.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="381"/>
+        <location filename="../modules/threads/export_word.py" line="138"/>
         <source>Word finished</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThreadExportXml</name>
     <message>
-        <location filename="../modules/threads.py" line="425"/>
+        <location filename="../modules/threads/export_xml.py" line="83"/>
         <source>Processing XML: {}</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThreadThumbnails</name>
     <message>
-        <location filename="../modules/threads.py" line="526"/>
+        <location filename="../modules/threads/thumbnails.py" line="93"/>
         <source>Preparing thumbnail table for: {}</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../modules/threads.py" line="563"/>
+        <location filename="../modules/threads/thumbnails.py" line="130"/>
         <source>Thumbnail table finished</source>
         <translation type="unfinished"></translation>
     </message>