Merge branch 'release/bundle_release_1.1.0' into main

Nouuu · Dec 6, 2020 · 2f2a477 · 2f2a477
2 parents 62fc846 + 1b77a9a
commit 2f2a477
Show file tree

Hide file tree

Showing 13 changed files with 307 additions and 0 deletions.
diff --git a/working_builds/Part_3/linux/CXML_CLI_1.9 b/working_builds/Part_3/linux/CXML_CLI_1.9
diff --git a/working_builds/Part_3/windows/CXML_CLI_1.9.exe b/working_builds/Part_3/windows/CXML_CLI_1.9.exe
diff --git a/working_builds/part_4/linux/CXML_GTK_1.8 b/working_builds/part_4/linux/CXML_GTK_1.8
diff --git a/working_builds/part_4/windows/v1.8/CXML_GTK_1.8.exe b/working_builds/part_4/windows/v1.8/CXML_GTK_1.8.exe
diff --git a/...ds/part_4/windows/v1.7/CXML_setup_1.7.exe → ...ds/part_4/windows/v1.8/CXML_setup_1.8.exe b/...ds/part_4/windows/v1.7/CXML_setup_1.7.exe → ...ds/part_4/windows/v1.8/CXML_setup_1.8.exe
diff --git a/working_builds/part_4/windows/v1.8/gtk_files/CXML.ico b/working_builds/part_4/windows/v1.8/gtk_files/CXML.ico
diff --git a/working_builds/part_4/windows/v1.8/gtk_files/CXML.png b/working_builds/part_4/windows/v1.8/gtk_files/CXML.png
diff --git a/working_builds/part_4/windows/v1.8/gtk_files/CXML_big.png b/working_builds/part_4/windows/v1.8/gtk_files/CXML_big.png
diff --git a/working_builds/part_4/windows/v1.8/gtk_files/banner.png b/working_builds/part_4/windows/v1.8/gtk_files/banner.png
diff --git a/working_builds/part_4/windows/v1.8/gtk_files/delete.png b/working_builds/part_4/windows/v1.8/gtk_files/delete.png
diff --git a/working_builds/part_4/windows/v1.8/gtk_files/spy.png b/working_builds/part_4/windows/v1.8/gtk_files/spy.png
diff --git a/working_builds/part_4/windows/v1.8/gtk_files/window.glade b/working_builds/part_4/windows/v1.8/gtk_files/window.glade
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.1 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkTextBuffer" id="consoleTextbuffer"/>
+  <object class="GtkImage" id="delete">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="pixbuf">delete.png</property>
+  </object>
+  <object class="GtkAdjustment" id="scrollbarAdjustement">
+    <property name="upper">100</property>
+    <property name="value">100</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
+  </object>
+  <object class="GtkImage" id="spy">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="pixbuf">spy.png</property>
+  </object>
+  <object class="GtkWindow" id="window">
+    <property name="width-request">800</property>
+    <property name="height-request">700</property>
+    <property name="can-focus">False</property>
+    <property name="title" translatable="yes">CXML - Ultimate XML DTD validator</property>
+    <property name="resizable">False</property>
+    <property name="icon">CXML.png</property>
+    <child>
+      <object class="GtkFixed">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <child>
+          <object class="GtkImage">
+            <property name="width-request">760</property>
+            <property name="height-request">100</property>
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="pixbuf">banner.png</property>
+          </object>
+          <packing>
+            <property name="x">20</property>
+            <property name="y">20</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="spacing">20</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">Choose XML file :</property>
+                <attributes>
+                  <attribute name="font-desc" value="Sans Bold 12"/>
+                  <attribute name="style" value="normal"/>
+                  <attribute name="underline" value="True"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFileChooserButton" id="xmlFileChooserButton">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="create-folders">False</property>
+                <property name="title" translatable="yes">Choose file</property>
+                <property name="width-chars">15</property>
+                <signal name="file-set" handler="on_xmlFileChooserButton_file_set" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="x">20</property>
+            <property name="y">200</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="spacing">20</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">Choose DTD file :</property>
+                <attributes>
+                  <attribute name="font-desc" value="Sans Bold 12"/>
+                  <attribute name="style" value="normal"/>
+                  <attribute name="underline" value="True"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFileChooserButton" id="dtdFileChooserButton">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="create-folders">False</property>
+                <property name="show-hidden">True</property>
+                <property name="title" translatable="yes">Choose key</property>
+                <property name="width-chars">15</property>
+                <signal name="file-set" handler="on_dtdFileChooserButton_file_set" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="x">420</property>
+            <property name="y">200</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="height-request">50</property>
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="spacing">20</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">Status :</property>
+                <attributes>
+                  <attribute name="font-desc" value="Sans Bold 12"/>
+                  <attribute name="style" value="normal"/>
+                  <attribute name="underline" value="True"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="statusLabel">
+                <property name="name">label</property>
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="single-line-mode">True</property>
+                <property name="max-width-chars">83</property>
+                <attributes>
+                  <attribute name="font-desc" value="Sans 10"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="x">20</property>
+            <property name="y">630</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrollableWindow">
+            <property name="width-request">760</property>
+            <property name="height-request">300</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="vadjustment">scrollbarAdjustement</property>
+            <property name="vscrollbar-policy">always</property>
+            <property name="window-placement-set">False</property>
+            <property name="shadow-type">in</property>
+            <property name="overlay-scrolling">False</property>
+            <child>
+              <object class="GtkTextView" id="consoleTextView">
+                <property name="width-request">760</property>
+                <property name="height-request">160</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="hscroll-policy">natural</property>
+                <property name="vscroll-policy">natural</property>
+                <property name="editable">False</property>
+                <property name="wrap-mode">word</property>
+                <property name="left-margin">5</property>
+                <property name="right-margin">5</property>
+                <property name="top-margin">5</property>
+                <property name="bottom-margin">5</property>
+                <property name="buffer">consoleTextbuffer</property>
+                <property name="input-purpose">terminal</property>
+                <property name="monospace">True</property>
+                <style>
+                  <class name="textview text {&#10;color : #8E3388;&#10;}"/>
+                </style>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="x">20</property>
+            <property name="y">300</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="validateButton">
+            <property name="label" translatable="yes">Validate document</property>
+            <property name="width-request">180</property>
+            <property name="height-request">50</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="image">spy</property>
+            <property name="always-show-image">True</property>
+            <signal name="clicked" handler="on_validateButton_clicked" swapped="no"/>
+          </object>
+          <packing>
+            <property name="x">600</property>
+            <property name="y">630</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="flushButton">
+            <property name="width-request">30</property>
+            <property name="height-request">30</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="image">delete</property>
+            <property name="always-show-image">True</property>
+            <signal name="clicked" handler="on_flushButton_clicked" swapped="no"/>
+          </object>
+          <packing>
+            <property name="x">730</property>
+            <property name="y">260</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/working_builds/part_4/windows/v1.8/script.iss b/working_builds/part_4/windows/v1.8/script.iss
@@ -0,0 +1,53 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "CXML"
+#define MyAppVersion "1.8"
+#define MyAppExeName "CXML_GTK_1.8.exe"
+#define MyAppPublisher "Nouuu"
+#define MyAppURL "https://github.com/Nouuu/CXML"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{2B4823CE-0A54-4C0C-98DC-D9096E1AAE24}}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+DisableProgramGroupPage=yes
+LicenseFile=D:\Projets\CXML\LICENSE
+; Uncomment the following line to run in non administrative install mode (install for current user only.)
+;PrivilegesRequired=lowest
+OutputDir=D:\Projets\CXML\working_builds\part_4\windows\v{#MyAppVersion}
+OutputBaseFilename=CXML_setup_{#MyAppVersion}
+SetupIconFile=D:\Projets\CXML\working_builds\part_4\windows\v{#MyAppVersion}\gtk_files\CXML.ico
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+Name: "french"; MessagesFile: "compiler:Languages\French.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "D:\Projets\CXML\working_builds\part_4\windows\v{#MyAppVersion}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\Projets\CXML\working_builds\part_4\windows\v{#MyAppVersion}\gtk_files\*"; DestDir: "{app}\gtk_files"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "D:\Projets\CXML\working_builds\part_4\windows\gtk3-runtime-3.24.23-2020-11-22-ts-win64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{tmp}\gtk3-runtime-3.24.23-2020-11-22-ts-win64.exe"; StatusMsg: Installing GTK+3.24.23 Runtime Libraries... 
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent unchecked;
+