[Scummvm-git-logs] scummvm master -> d09090db629b6243d1a53a9e081c25ccd8c22a82

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d09090db62 DEVTOOLS: BLADERUNNER: Use forward slash for link paths in quoteSpreadsheetCreator


Commit: d09090db629b6243d1a53a9e081c25ccd8c22a82
    https://github.com/scummvm/scummvm/commit/d09090db629b6243d1a53a9e081c25ccd8c22a82
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-01-19T22:29:07+02:00

Commit Message:
DEVTOOLS: BLADERUNNER: Use forward slash for link paths in quoteSpreadsheetCreator

This affects the automatic Excel creation that links quote lines to wav files.

It solves a bug with LibreOffice (at least 6.2.8.2) that has trouble if the path has backslashes (even if escaped)
It is still compatible with MS Excel.

Changed paths:
    devtools/create_bladerunner/subtitles/common/subtlsVersTextResource.py
    devtools/create_bladerunner/subtitles/quotesSpreadsheetCreator/sortBladeRunnerWavs02.py


diff --git a/devtools/create_bladerunner/subtitles/common/subtlsVersTextResource.py b/devtools/create_bladerunner/subtitles/common/subtlsVersTextResource.py
index a51cb22..1df1c41 100644
--- a/devtools/create_bladerunner/subtitles/common/subtlsVersTextResource.py
+++ b/devtools/create_bladerunner/subtitles/common/subtlsVersTextResource.py
@@ -2,13 +2,13 @@
 # -*- coding: UTF-8 -*-
 #
 
-my_module_version = "1.00"
+my_module_version = "1.60"
 my_module_name = "subtlsVersTextResource"
 
 # Template for SBTLVERS.TRE sheet's values ((row 2 and below)
 SBTLVERS_TEXT_RESOURCE_TUPLE_LIST = [
 	(0, "ScummVM Team", "Credits"),
-	(1, "3", "Version (an incremental number)"),
+	(1, "6", "Version (an incremental number)"),
 	(2, "##:##:## ##/##/####", "Placeholder – Date of compilation (HH:mm:ss dd/mm/yyyy)"),
 	(3, "EFIGS", "Placeholder – Language mode")
  ]
diff --git a/devtools/create_bladerunner/subtitles/quotesSpreadsheetCreator/sortBladeRunnerWavs02.py b/devtools/create_bladerunner/subtitles/quotesSpreadsheetCreator/sortBladeRunnerWavs02.py
index c358e13..fac75a7 100644
--- a/devtools/create_bladerunner/subtitles/quotesSpreadsheetCreator/sortBladeRunnerWavs02.py
+++ b/devtools/create_bladerunner/subtitles/quotesSpreadsheetCreator/sortBladeRunnerWavs02.py
@@ -556,7 +556,9 @@ def auxPopulateExtraSpeechAudioRow(sh = None, n = 0, pFilenameStr = '', pTextStr
 						# checks if not empty
 						if gStringReplacementForRootFolderWithExportedFiles and gNumReplaceStartingCharacters > 0:
 							realPathOfFileNameToLink = realPathOfFileNameToLink.replace(realPathOfFileNameToLink[:gNumReplaceStartingCharacters], gStringReplacementForRootFolderWithExportedFiles)
-
+						# Libreoffice seems to only work with forward slashes (v6.2.8.2)
+						# Also works with MS Excel (tested with Office 2007)
+						realPathOfFileNameToLink = realPathOfFileNameToLink.replace('\\','/');
 						hyperlinkAudioFormula = 'HYPERLINK("file:///%s","%s")' % (realPathOfFileNameToLink, shortHandFileName)
 						sh.write(n, 6, Formula(hyperlinkAudioFormula))
 						break
@@ -948,6 +950,10 @@ def outputXLS(filename, sheet, listTlkWavs, listDevsWavs, parseTREResourcesAlso
 				# also works in Windows + LibreOffice (run from msys) -- tried something like:
 				#	python sortBladeRunnerWavs.py -op /g/WORKSPACE/BladeRunnerWorkspace/br-mixer-master/data/WAV -m "G:/WORKSPACE/BladeRunnerWorkspace/br-mixer-master/data/WAV"
 				# put real full path for each file as FILE URL, and real (or approximate shorthand file name as alias)
+				#
+				# Libreoffice seems to only work with forward slashes (v6.2.8.2)
+				# Also works with MS Excel (tested with Office 2007)
+				realPathOfFileNameToLink = realPathOfFileNameToLink.replace('\\','/');
 				hyperlinkAudioFormula = 'HYPERLINK("file:///%s","%s")' % (realPathOfFileNameToLink, shortHandFileName)
 				sh.write(m, 6, Formula(hyperlinkAudioFormula))
 			else: