installer: Use of licensing dialog in Installer

diff --git a/installer/src/createLink.ec b/extras/createLink.ec
similarity index 100%
rename from installer/src/createLink.ec
rename to extras/createLink.ec

diff --git a/ide/src/about.ec b/ide/src/about.ec
index 11897c4..a6458f1 100644 (file)
--- a/ide/src/about.ec
+++ b/ide/src/about.ec
@@ -22,13 +22,23 @@ class AboutIDE : Window
    Label { this, text = $"With contributions from...", font = { $"Tahoma", 8.25f, bold = true }, position = { 16, 208 } };
    Button licensingBtn
    {
-      this, anchor = { left = 40, bottom = 10 }; hotKey = l; text = "Software Licenses";
+      this, anchor = { left = 40, bottom = 10 }; hotKey = altL; text = "Software Licenses";
       bool NotifyClicked(Button button, int x, int y, Modifiers mods)
       {
          LicensesForm { master = this }.Modal();
          return true;
       }
    };
+   Button button 
+   {
+      this, text = $"OK", isDefault = true, size = { 80, 20 }, anchor = { right = 13, bottom = 10 };
+
+      bool NotifyClicked(Button button, int x, int y, Modifiers mods)
+      {
+         Destroy(0);
+         return true;
+      }
+   };
    EditBox credits
    {
       this, borderStyle = none, noCaret = true, readOnly = true, anchor = { left = 16, top = 236, bottom = 48, right = 16 },
@@ -39,6 +49,7 @@ class AboutIDE : Window
          "Réjean Loyer\n"
          "   Most of the additional programming on the IDE\n"
          "   Initial EDA design\n"
+         "   Cross-platform and cross-compiler Makefile build system\n"
          "\n"
          "Juan Sánchez\n"
          "   Oracle EDA driver\n"
@@ -130,7 +141,7 @@ class AboutIDE : Window
          "\n"
          "   Richard M. Stallman (Bison, GCC)\n"
          "\n"
-         "   Linus Torvalds (Git, Linux)\n"
+         "   Linus Torvalds (Git, Linux)"
    };
    /*Label { this, text = "Réjean Loyer, Joey Adams, Max Maton", position = { 124, 176 } };
    */
@@ -147,14 +158,4 @@ class AboutIDE : Window
          return true;
       }
    };
-   Button button 
-   {
-      this, text = $"OK", isDefault = true, size = { 80, 20 }, anchor = { right = 13, bottom = 10 };
-
-      bool NotifyClicked(Button button, int x, int y, Modifiers mods)
-      {
-         Destroy(0);
-         return true;
-      }
-   };
 }

diff --git a/ide/src/licensing.ec b/ide/src/licensing.ec
index 666e475..629828d 100644 (file)
--- a/ide/src/licensing.ec
+++ b/ide/src/licensing.ec
@@ -124,7 +124,7 @@ class LicensesForm : Window
       sourceFile = ":licenses/gpl.LICENSE";
       tabControl = tabControl;
    };
-   Button ok
+/*   Button ok
    {
       this;
       text = "OK";
@@ -133,4 +133,28 @@ class LicensesForm : Window
       isDefault = true;
       NotifyClicked = ButtonCloseDialog;
    };
+*/
+   Button dontAgreeButton
+   {
+      this;
+      text = $"I don't agree";
+      size = { 100, 22 };
+      anchor = { bottom = 10, right = 14 };
+
+      bool NotifyClicked(Button button, int x, int y, Modifiers mods)
+      {
+         ((GuiApplication)__thisModule).desktop.Destroy(0);
+         return true;
+      }
+   };
+   Button agreeButton
+   {
+      this;
+      text = $"I agree";
+      font = { "Verdana", 10, bold = true };
+      isDefault = true;
+      size = { 80, 23 };
+      anchor = { bottom = 10 };
+      NotifyClicked = ButtonCloseDialog;
+   };
 }

diff --git a/installer/Installer.epj b/installer/Installer.epj
index 420c335..db64842 100644 (file)
--- a/installer/Installer.epj
+++ b/installer/Installer.epj
@@ -67,14 +67,14 @@
       {
          "Folder" : "src",
          "Files" : [
-            "createLink.ec",
-            "installer.ec",
-            "licenseBox.ec"
+            "installer.ec"
          ]
       },
       "../ide/src/IDESettings.ec",
       "../ide/src/OldIDESettings.ec",
-      "../extras/gui/controls/StringsBox.ec"
+      "../extras/gui/controls/StringsBox.ec",
+      "../ide/src/licensing.ec",
+      "../extras/createLink.ec"
    ],
    "ResourcesPath" : "",
    "Resources" : [
@@ -10059,6 +10059,22 @@
             }
          ]
       },
+      {
+         "Folder" : "licenses",
+         "Files" : [
+            "../extras/res/licenses/freetype.LICENSE",
+            "../extras/res/licenses/gpl.LICENSE",
+            "../extras/res/licenses/harfbuzz.LICENSE",
+            "../extras/res/licenses/jpg.LICENSE",
+            "../extras/res/licenses/png.LICENSE",
+            "../extras/res/licenses/sqlite.LICENSE",
+            "../extras/res/licenses/tango.COPYING",
+            "../extras/res/licenses/ungif.LICENSE",
+            "../extras/res/licenses/upx.LICENSE",
+            "../extras/res/licenses/zlib.README",
+            "../LICENSE"
+         ]
+      },
       "../ide/res/icon.png",
       "ecere.png",
       "ryoanji.png",

diff --git a/installer/ecere.bmp b/installer/ecere.bmp
deleted file mode 100644 (file)
index 314f1a6..0000000
Binary files a/installer/ecere.bmp and /dev/null differ

diff --git a/installer/src/installer.ec b/installer/src/installer.ec
index 8aac572..32553ba 100644 (file)
--- a/installer/src/installer.ec
+++ b/installer/src/installer.ec
@@ -16,7 +16,8 @@ import "ecere"
 #endif
 import "IDESettings"
 import "createLink"
-import "licenseBox"
+// import "licenseBox"
+import "licensing"
 
 class CheckListBox : ListBox
 {
@@ -672,7 +673,8 @@ class Installer : Window
 
       bool NotifyClicked(Button button, int x, int y, Modifiers mods)
       {
-         LicenseBox { master = this, sourceFile = ":ecere-sdk/doc/LICENSE" }.Modal();
+         // LicenseBox { master = this, sourceFile = ":ecere-sdk/doc/LICENSE" }.Modal();
+         LicensesForm { master = this }.Modal();
          return true;
       }
    };

diff --git a/installer/src/licenseBox.ec b/installer/src/licenseBox.ec
deleted file mode 100644 (file)
index 3e7af7e..0000000
--- a/installer/src/licenseBox.ec
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifdef ECERE_STATIC
-import static "ecere"
-#else
-import "ecere"
-#endif
-
-class LicenseBox : Window
-{
-   text = $"Ecere SDK License Agreement";
-   clientSize = { 700, 480 };
-   hasClose = true;
-   borderStyle = sizable;
-   background = activeBorder;
-   tabCycle = true;
-   font = { "Verdana", 10 };
-   EditBox editBox
-   {
-      this,
-      multiLine = true;
-      hasHorzScroll = true;
-      hasVertScroll = true;
-      borderStyle = deep;
-      anchor = { 10, 10, 10, 40 };
-      readOnly = true;
-      noCaret = true;
-      font = { "Courier New", 10 };
-   };
-   property char * sourceFile
-   {
-      set
-      {
-         File f = FileOpen(value, read);
-         if(f)
-         {
-            editBox.Load(f);
-            delete f;
-         }
-      }
-   }
-   Button dontAgreeButton
-   {
-      this;
-      text = $"I don't agree";
-      size = { 100, 22 };
-      anchor = { bottom = 10, right = 14 };
-
-      bool NotifyClicked(Button button, int x, int y, Modifiers mods)
-      {
-         ((GuiApplication)__thisModule).desktop.Destroy(0);
-         return true;
-      }
-   };
-   Button agreeButton
-   {
-      this;
-      text = $"I agree";
-      font = { "Verdana", 10, bold = true };
-      isDefault = true;
-      size = { 80, 23 };
-      anchor = { bottom = 10 };
-      NotifyClicked = ButtonCloseDialog;
-   };
-}