Skip to content

Commit 1058bfb

Browse files
NPavieNPavie
committed
feat(version): SaveAsDAISY 2.9.4
This release includes the following changes : - Embedded pipeline is updated to version 1.15.3 - An upgraded snapshot of the word to dtbook script is provided to fix additionnal issues regardings content blocks closure issues and the invalid documentDate error reported - Previous internal chains of scripts are replaced by the new word-based pipeline scripts - Embedded pipeline is now used through the DAISY pipeline webservice interface instead of JNI - Installer will check fro the presence of DAISY Pipeline app 1.10 on the user system and offer to download and install it if not found - Acronyms and abbreviations management dialogs usability has been improved with navigation buttons and a confirmation dialog before suppression of an acronym
1 parent 7543ba6 commit 1058bfb

File tree

204 files changed

+9240
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+9240
-216
lines changed

‎Common/DaisyAddinLib/Controls/EnumControl.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,6 @@
181181
<value>EnumControl</value>
182182
</data>
183183
<data name="&gt;&gt;$this.Type" xml:space="preserve">
184-
<value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.9.3.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
184+
<value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.9.4.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
185185
</data>
186186
</root>

‎Common/DaisyAddinLib/Controls/StrUserControl.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,6 @@
211211
<value>StrUserControl</value>
212212
</data>
213213
<data name="&gt;&gt;$this.Type" xml:space="preserve">
214-
<value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.9.3.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
214+
<value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.9.4.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
215215
</data>
216216
</root>

‎Common/DaisyAddinLib/ConversionParametersForm.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ your document with the Word Accessibility Checker.
909909
<value>DestinationControl</value>
910910
</data>
911911
<data name="&gt;&gt;DestinationControl.Type" xml:space="preserve">
912-
<value>Daisy.SaveAsDAISY.Forms.Controls.PathControl, DaisyAddinLib, Version=2.9.3.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
912+
<value>Daisy.SaveAsDAISY.Forms.Controls.PathControl, DaisyAddinLib, Version=2.9.4.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
913913
</data>
914914
<data name="&gt;&gt;DestinationControl.Parent" xml:space="preserve">
915915
<value>$this</value>

‎Common/DaisyAddinLib/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@
5959
//
6060
// Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de révision et de build par défaut
6161
// en utilisant '*', comme indiqué ci-dessous :
62-
[assembly: AssemblyVersion("2.9.3.0")]
63-
[assembly: AssemblyFileVersion("2.9.3.0")]
62+
[assembly: AssemblyVersion("2.9.4.0")]
63+
[assembly: AssemblyFileVersion("2.9.4.0")]

‎Common/DaisyAddinWPFLib/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@
4848
// Numéro de build
4949
// Révision
5050
//
51-
[assembly: AssemblyVersion("2.9.3.0")]
52-
[assembly: AssemblyFileVersion("2.9.3.0")]
51+
[assembly: AssemblyVersion("2.9.4.0")]
52+
[assembly: AssemblyFileVersion("2.9.4.0")]

‎Common/DaisyConverterLib/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@
5757
// Numéro de build
5858
// Révision
5959
//
60-
[assembly: AssemblyVersion("2.9.3.0")]
61-
[assembly: AssemblyFileVersion("2.9.3.0")]
60+
[assembly: AssemblyVersion("2.9.4.0")]
61+
[assembly: AssemblyFileVersion("2.9.4.0")]

‎Installer/CustomActionAddin/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
//
3232
// You can specify all the values or you can default the Revision and Build Numbers
3333
// by using the '*' as shown below:
34-
[assembly: AssemblyVersion("2.9.3.0")]
35-
[assembly: AssemblyFileVersion("2.9.3.0")]
34+
[assembly: AssemblyVersion("2.9.4.0")]
35+
[assembly: AssemblyFileVersion("2.9.4.0")]

‎Installer/DaisyAddinForWordSetup/Product.wxs‎

Lines changed: 448 additions & 109 deletions
Large diffs are not rendered by default.

‎Installer/SaveAsDAISYInstaller/Program.cs‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
using System.Diagnostics;
44
using System.Globalization;
55
using System.IO;
6+
using System.Linq;
7+
using System.Management;
68
using System.Net;
79
using System.Text.RegularExpressions;
10+
using System.Threading;
811
using System.Threading.Tasks;
912
using System.Windows.Forms;
1013
using static System.Net.WebRequestMethods;
@@ -41,15 +44,16 @@ static class Program
4144
public static float minimalVersionSupport = 11.0f;
4245
public static float maximalVersionSupport = 17.0f;
4346

44-
private static readonly string DAISY_APP_URL = "https://github.com/daisy/pipeline-ui/releases/download/1.9.0/daisy-pipeline-setup-1.9.0.exe";
47+
private static readonly string appVersion = "1.10.0";
48+
private static readonly string DAISY_APP_URL = $"https://github.com/daisy/pipeline-ui/releases/download/{appVersion}/daisy-pipeline-setup-{appVersion}.exe";
4549

4650
/// <summary>
4751
/// The main entry point for the application.
4852
/// </summary>
4953
[STAThread]
5054
static void Main()
5155
{
52-
56+
5357
#if X64INSTALLER // only
5458
bool installerIsForOffice32Bits = false;
5559
#else // x86 only installer or unified installer default version installed
@@ -164,17 +168,21 @@ static void Main()
164168
var process = Process.Start(daisySetupPath);
165169
process.WaitForExit();
166170
bool installApp = true;
167-
// Offer to install the daisy pipeline app if not installed
168-
RegistryKey softwareKeys = Registry.CurrentUser.OpenSubKey(@"Software");
169-
foreach (string subKey in softwareKeys.GetSubKeyNames()) {
170-
RegistryKey software = softwareKeys.OpenSubKey(subKey);
171-
if (software.GetValue("ShortcutName") != null && software.GetValue("ShortcutName").ToString() == "DAISY Pipeline") {
171+
// Check SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall
172+
RegistryKey lKeyApp = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall");
173+
foreach (string subKey in lKeyApp.GetSubKeyNames()) {
174+
RegistryKey appKey = lKeyApp.OpenSubKey(subKey);
175+
string displayName = appKey.GetValue("DisplayName")?.ToString() ?? "";
176+
string displayVersion = appKey.GetValue("DisplayVersion")?.ToString() ?? "";
177+
if (
178+
displayName.StartsWith("DAISY Pipeline") && displayVersion == appVersion
179+
) {
172180
installApp = false;
173181
break;
174182
}
175183
}
176184
if (installApp) {
177-
if (MessageBox.Show("SaveAsDAISY can now use the DAISY Pipeline app as backend for the conversions.\r\n" +
185+
if (MessageBox.Show($"SaveAsDAISY can use the DAISY Pipeline app {appVersion} as backend for the conversions.\r\n" +
178186
"Do you want to download and install the DAISY Pipeline app now?\r\n", "Download DAISY Pipeline app", MessageBoxButtons.YesNo,
179187
MessageBoxIcon.Question
180188
) == DialogResult.Yes
@@ -212,15 +220,20 @@ static void Main()
212220
using (var client = new System.Net.WebClient()) {
213221
ServicePointManager.SecurityProtocol |= System.Net.SecurityProtocolType.Tls12;
214222
client.DownloadFile(DAISY_APP_URL, installerPath);
215-
progressDialog.Close();
216-
progressDialog = null;
223+
217224
}
225+
label.Text = "Installing DAISY Pipeline app...";
218226
ProcessStartInfo exec = new ProcessStartInfo() {
219227
FileName = installerPath,
220228
UseShellExecute = true,
221229
Arguments = "/S" // silent install
222230
};
223231
process = System.Diagnostics.Process.Start(exec);
232+
process.WaitForExit();
233+
label.Text = "DAISY Pipeline app is installed";
234+
Thread.Sleep(3000);
235+
progressDialog.Close();
236+
progressDialog = null;
224237

225238
}
226239
catch (Exception ex) {

‎Installer/SaveAsDAISYInstaller/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.9.3.0")]
36-
[assembly: AssemblyFileVersion("2.9.3.0")]
35+
[assembly: AssemblyVersion("2.9.4.0")]
36+
[assembly: AssemblyFileVersion("2.9.4.0")]

0 commit comments

Comments
 (0)