From cfe9b10c8259d207d11000743e01ae699031ea5c Mon Sep 17 00:00:00 2001 From: Plata Date: Sun, 27 Aug 2017 13:38:33 +0200 Subject: [PATCH 1/3] unified setup wizards --- Applications/Internet/Internet Explorer 6.0/Online/script.js | 2 +- Applications/Internet/Internet Explorer 7.0/Online/script.js | 2 +- Engines/Wine/Engine/Object/script.js | 2 +- Engines/Wine/QuickScript/InstallerScript/script.js | 2 +- Engines/Wine/QuickScript/SteamScript/script.js | 2 +- Engines/Wine/QuickScript/UplayScript/script.js | 2 +- Engines/Wine/QuickScript/ZipScript/script.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Applications/Internet/Internet Explorer 6.0/Online/script.js b/Applications/Internet/Internet Explorer 6.0/Online/script.js index 6015480a11..4a7a435ef9 100644 --- a/Applications/Internet/Internet Explorer 6.0/Online/script.js +++ b/Applications/Internet/Internet Explorer 6.0/Online/script.js @@ -7,7 +7,7 @@ include(["Engines", "Wine", "Verbs", "msls31"]); var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication(["Applications", "Internet", "Internet Explorer 6.0"]); -var setupWizard = SetupWizardWithMiniature("Internet Explorer 6.0", application.getMainMiniature()); +var setupWizard = SetupWizardApps("Internet Explorer 6.0", application.getMainMiniature()); setupWizard.presentation("Internet Explorer 6.0", "Microsoft", "http://www.microsoft.com", "Quentin PÂRIS"); diff --git a/Applications/Internet/Internet Explorer 7.0/Online/script.js b/Applications/Internet/Internet Explorer 7.0/Online/script.js index 0890322915..71e24f8621 100644 --- a/Applications/Internet/Internet Explorer 7.0/Online/script.js +++ b/Applications/Internet/Internet Explorer 7.0/Online/script.js @@ -7,7 +7,7 @@ include(["Engines", "Wine", "Verbs", "sandbox"]); var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication(["Applications", "Internet", "Internet Explorer 7.0"]); -var setupWizard = SetupWizardWithMiniature("Internet Explorer 7.0", application.getMainMiniature()); +var setupWizard = SetupWizardApps("Internet Explorer 7.0", application.getMainMiniature()); setupWizard.presentation("Internet Explorer 7.0", "Microsoft", "http://www.microsoft.com", "Quentin PÂRIS"); diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js index 4d1525edab..cd14beb2e6 100644 --- a/Engines/Wine/Engine/Object/script.js +++ b/Engines/Wine/Engine/Object/script.js @@ -334,7 +334,7 @@ Wine.prototype.install = function (category, subCategory, version, userData) { this.architecture(architecture); this.version(version); if (!this.installed()) { - var wizard = EngineProgressUi("Wine " + version + " " + distribution + " (" + architecture + ")"); + var wizard = SetupWizardEngines("Wine " + version + " " + distribution + " (" + architecture + ")", java.util.Optional.empty()); this.wizard(wizard); this._installVersion(); wizard.close(); diff --git a/Engines/Wine/QuickScript/InstallerScript/script.js b/Engines/Wine/QuickScript/InstallerScript/script.js index 27cbfda6a1..1435f1b145 100644 --- a/Engines/Wine/QuickScript/InstallerScript/script.js +++ b/Engines/Wine/QuickScript/InstallerScript/script.js @@ -19,7 +19,7 @@ InstallerScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizardWithMiniature(this._name, application.getMainMiniature()); + var setupWizard = SetupWizardApps(this._name, application.getMainMiniature()); // if no name given, ask user if (this._name == "Custom Installer") { diff --git a/Engines/Wine/QuickScript/SteamScript/script.js b/Engines/Wine/QuickScript/SteamScript/script.js index 0e355d1336..ad4b0b54db 100644 --- a/Engines/Wine/QuickScript/SteamScript/script.js +++ b/Engines/Wine/QuickScript/SteamScript/script.js @@ -83,7 +83,7 @@ SteamScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizardWithMiniature(this._name, application.getMainMiniature()); + var setupWizard = SetupWizardApps(this._name, application.getMainMiniature()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); diff --git a/Engines/Wine/QuickScript/UplayScript/script.js b/Engines/Wine/QuickScript/UplayScript/script.js index b20d0df21c..67b7576e15 100644 --- a/Engines/Wine/QuickScript/UplayScript/script.js +++ b/Engines/Wine/QuickScript/UplayScript/script.js @@ -40,7 +40,7 @@ UplayScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizardWithMiniature(this._name, application.getMainMiniature()); + var setupWizard = SetupWizardApps(this._name, application.getMainMiniature()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); diff --git a/Engines/Wine/QuickScript/ZipScript/script.js b/Engines/Wine/QuickScript/ZipScript/script.js index 9e593c8a0d..fea34d609c 100644 --- a/Engines/Wine/QuickScript/ZipScript/script.js +++ b/Engines/Wine/QuickScript/ZipScript/script.js @@ -27,7 +27,7 @@ ZipScript.prototype.checksum = function(checksum) { ZipScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizardWithMiniature(this._name, application.getMainMiniature()); + var setupWizard = SetupWizardApps(this._name, application.getMainMiniature()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); From 167703c28e6d2d25653a0fcb7f1f5de2a06d6ec8 Mon Sep 17 00:00:00 2001 From: Plata Date: Sun, 27 Aug 2017 17:49:05 +0200 Subject: [PATCH 2/3] set installation type from JS --- Applications/Internet/Internet Explorer 6.0/Online/script.js | 2 +- Applications/Internet/Internet Explorer 7.0/Online/script.js | 2 +- Engines/Wine/Engine/Object/script.js | 2 +- Engines/Wine/QuickScript/InstallerScript/script.js | 2 +- Engines/Wine/QuickScript/SteamScript/script.js | 2 +- Engines/Wine/QuickScript/UplayScript/script.js | 2 +- Engines/Wine/QuickScript/ZipScript/script.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Applications/Internet/Internet Explorer 6.0/Online/script.js b/Applications/Internet/Internet Explorer 6.0/Online/script.js index 4a7a435ef9..5ced5e69c3 100644 --- a/Applications/Internet/Internet Explorer 6.0/Online/script.js +++ b/Applications/Internet/Internet Explorer 6.0/Online/script.js @@ -7,7 +7,7 @@ include(["Engines", "Wine", "Verbs", "msls31"]); var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication(["Applications", "Internet", "Internet Explorer 6.0"]); -var setupWizard = SetupWizardApps("Internet Explorer 6.0", application.getMainMiniature()); +var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, "Internet Explorer 6.0", application.getMainMiniature()); setupWizard.presentation("Internet Explorer 6.0", "Microsoft", "http://www.microsoft.com", "Quentin PÂRIS"); diff --git a/Applications/Internet/Internet Explorer 7.0/Online/script.js b/Applications/Internet/Internet Explorer 7.0/Online/script.js index 71e24f8621..e640de9a0f 100644 --- a/Applications/Internet/Internet Explorer 7.0/Online/script.js +++ b/Applications/Internet/Internet Explorer 7.0/Online/script.js @@ -7,7 +7,7 @@ include(["Engines", "Wine", "Verbs", "sandbox"]); var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication(["Applications", "Internet", "Internet Explorer 7.0"]); -var setupWizard = SetupWizardApps("Internet Explorer 7.0", application.getMainMiniature()); +var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, "Internet Explorer 7.0", application.getMainMiniature()); setupWizard.presentation("Internet Explorer 7.0", "Microsoft", "http://www.microsoft.com", "Quentin PÂRIS"); diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js index cd14beb2e6..9604301ea8 100644 --- a/Engines/Wine/Engine/Object/script.js +++ b/Engines/Wine/Engine/Object/script.js @@ -334,7 +334,7 @@ Wine.prototype.install = function (category, subCategory, version, userData) { this.architecture(architecture); this.version(version); if (!this.installed()) { - var wizard = SetupWizardEngines("Wine " + version + " " + distribution + " (" + architecture + ")", java.util.Optional.empty()); + var wizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.ENGINES, "Wine " + version + " " + distribution + " (" + architecture + ")", java.util.Optional.empty()); this.wizard(wizard); this._installVersion(); wizard.close(); diff --git a/Engines/Wine/QuickScript/InstallerScript/script.js b/Engines/Wine/QuickScript/InstallerScript/script.js index 1435f1b145..cfdead2cff 100644 --- a/Engines/Wine/QuickScript/InstallerScript/script.js +++ b/Engines/Wine/QuickScript/InstallerScript/script.js @@ -19,7 +19,7 @@ InstallerScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizardApps(this._name, application.getMainMiniature()); + var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, this._name, application.getMainMiniature()); // if no name given, ask user if (this._name == "Custom Installer") { diff --git a/Engines/Wine/QuickScript/SteamScript/script.js b/Engines/Wine/QuickScript/SteamScript/script.js index ad4b0b54db..8036dc9470 100644 --- a/Engines/Wine/QuickScript/SteamScript/script.js +++ b/Engines/Wine/QuickScript/SteamScript/script.js @@ -83,7 +83,7 @@ SteamScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizardApps(this._name, application.getMainMiniature()); + var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, this._name, application.getMainMiniature()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); diff --git a/Engines/Wine/QuickScript/UplayScript/script.js b/Engines/Wine/QuickScript/UplayScript/script.js index 67b7576e15..88c8e2ea43 100644 --- a/Engines/Wine/QuickScript/UplayScript/script.js +++ b/Engines/Wine/QuickScript/UplayScript/script.js @@ -40,7 +40,7 @@ UplayScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizardApps(this._name, application.getMainMiniature()); + var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, this._name, application.getMainMiniature()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); diff --git a/Engines/Wine/QuickScript/ZipScript/script.js b/Engines/Wine/QuickScript/ZipScript/script.js index fea34d609c..746a7125df 100644 --- a/Engines/Wine/QuickScript/ZipScript/script.js +++ b/Engines/Wine/QuickScript/ZipScript/script.js @@ -27,7 +27,7 @@ ZipScript.prototype.checksum = function(checksum) { ZipScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizardApps(this._name, application.getMainMiniature()); + var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, this._name, application.getMainMiniature()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); From 520bdb3243bbf39c5b48c06b54b91f5128cfeb4d Mon Sep 17 00:00:00 2001 From: Plata Date: Sun, 27 Aug 2017 18:59:53 +0200 Subject: [PATCH 3/3] avoid complete package path --- Applications/Internet/Internet Explorer 6.0/Online/script.js | 2 +- Applications/Internet/Internet Explorer 7.0/Online/script.js | 2 +- Engines/Wine/Engine/Object/script.js | 2 +- Engines/Wine/QuickScript/InstallerScript/script.js | 2 +- Engines/Wine/QuickScript/SteamScript/script.js | 2 +- Engines/Wine/QuickScript/UplayScript/script.js | 2 +- Engines/Wine/QuickScript/ZipScript/script.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Applications/Internet/Internet Explorer 6.0/Online/script.js b/Applications/Internet/Internet Explorer 6.0/Online/script.js index 5ced5e69c3..0a9eca1bdf 100644 --- a/Applications/Internet/Internet Explorer 6.0/Online/script.js +++ b/Applications/Internet/Internet Explorer 6.0/Online/script.js @@ -7,7 +7,7 @@ include(["Engines", "Wine", "Verbs", "msls31"]); var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication(["Applications", "Internet", "Internet Explorer 6.0"]); -var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, "Internet Explorer 6.0", application.getMainMiniature()); +var setupWizard = SetupWizard(InstallationType.APPS, "Internet Explorer 6.0", application.getMainMiniature()); setupWizard.presentation("Internet Explorer 6.0", "Microsoft", "http://www.microsoft.com", "Quentin PÂRIS"); diff --git a/Applications/Internet/Internet Explorer 7.0/Online/script.js b/Applications/Internet/Internet Explorer 7.0/Online/script.js index e640de9a0f..3b15fd4e06 100644 --- a/Applications/Internet/Internet Explorer 7.0/Online/script.js +++ b/Applications/Internet/Internet Explorer 7.0/Online/script.js @@ -7,7 +7,7 @@ include(["Engines", "Wine", "Verbs", "sandbox"]); var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication(["Applications", "Internet", "Internet Explorer 7.0"]); -var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, "Internet Explorer 7.0", application.getMainMiniature()); +var setupWizard = SetupWizard(InstallationType.APPS, "Internet Explorer 7.0", application.getMainMiniature()); setupWizard.presentation("Internet Explorer 7.0", "Microsoft", "http://www.microsoft.com", "Quentin PÂRIS"); diff --git a/Engines/Wine/Engine/Object/script.js b/Engines/Wine/Engine/Object/script.js index 9604301ea8..5e50cb373c 100644 --- a/Engines/Wine/Engine/Object/script.js +++ b/Engines/Wine/Engine/Object/script.js @@ -334,7 +334,7 @@ Wine.prototype.install = function (category, subCategory, version, userData) { this.architecture(architecture); this.version(version); if (!this.installed()) { - var wizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.ENGINES, "Wine " + version + " " + distribution + " (" + architecture + ")", java.util.Optional.empty()); + var wizard = SetupWizard(InstallationType.ENGINES, "Wine " + version + " " + distribution + " (" + architecture + ")", java.util.Optional.empty()); this.wizard(wizard); this._installVersion(); wizard.close(); diff --git a/Engines/Wine/QuickScript/InstallerScript/script.js b/Engines/Wine/QuickScript/InstallerScript/script.js index cfdead2cff..8728835e37 100644 --- a/Engines/Wine/QuickScript/InstallerScript/script.js +++ b/Engines/Wine/QuickScript/InstallerScript/script.js @@ -19,7 +19,7 @@ InstallerScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, this._name, application.getMainMiniature()); + var setupWizard = SetupWizard(InstallationType.APPS, this._name, application.getMainMiniature()); // if no name given, ask user if (this._name == "Custom Installer") { diff --git a/Engines/Wine/QuickScript/SteamScript/script.js b/Engines/Wine/QuickScript/SteamScript/script.js index 8036dc9470..d6406cc13e 100644 --- a/Engines/Wine/QuickScript/SteamScript/script.js +++ b/Engines/Wine/QuickScript/SteamScript/script.js @@ -83,7 +83,7 @@ SteamScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, this._name, application.getMainMiniature()); + var setupWizard = SetupWizard(InstallationType.APPS, this._name, application.getMainMiniature()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); diff --git a/Engines/Wine/QuickScript/UplayScript/script.js b/Engines/Wine/QuickScript/UplayScript/script.js index 88c8e2ea43..4876dff643 100644 --- a/Engines/Wine/QuickScript/UplayScript/script.js +++ b/Engines/Wine/QuickScript/UplayScript/script.js @@ -40,7 +40,7 @@ UplayScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, this._name, application.getMainMiniature()); + var setupWizard = SetupWizard(InstallationType.APPS, this._name, application.getMainMiniature()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); diff --git a/Engines/Wine/QuickScript/ZipScript/script.js b/Engines/Wine/QuickScript/ZipScript/script.js index 746a7125df..c4d419b828 100644 --- a/Engines/Wine/QuickScript/ZipScript/script.js +++ b/Engines/Wine/QuickScript/ZipScript/script.js @@ -27,7 +27,7 @@ ZipScript.prototype.checksum = function(checksum) { ZipScript.prototype.go = function() { var appsManager = Bean("repositoryManager"); var application = appsManager.getApplication([this._type, this._category, this._name]); - var setupWizard = SetupWizard(org.phoenicis.scripts.ui.InstallationType.APPS, this._name, application.getMainMiniature()); + var setupWizard = SetupWizard(InstallationType.APPS, this._name, application.getMainMiniature()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author);