From cd4b2f703d125b7b16d42ade5e7a91e416df22b5 Mon Sep 17 00:00:00 2001 From: Plata Date: Sat, 26 Aug 2017 13:24:31 +0200 Subject: [PATCH 1/2] show miniature when installing an application --- .../Internet/Internet Explorer 6.0/Online/script.js | 8 +++++--- .../Internet/Internet Explorer 7.0/Online/script.js | 6 ++++-- Engines/Wine/QuickScript/InstallerScript/script.js | 5 ++++- Engines/Wine/QuickScript/SteamScript/script.js | 4 +++- Engines/Wine/QuickScript/UplayScript/script.js | 4 +++- Engines/Wine/QuickScript/ZipScript/script.js | 4 +++- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Applications/Internet/Internet Explorer 6.0/Online/script.js b/Applications/Internet/Internet Explorer 6.0/Online/script.js index b45694b4b1..e1dc3792e2 100644 --- a/Applications/Internet/Internet Explorer 6.0/Online/script.js +++ b/Applications/Internet/Internet Explorer 6.0/Online/script.js @@ -5,7 +5,9 @@ include(["Engines", "Wine", "Shortcuts", "Wine"]); include(["Utils", "Functions", "Apps", "Resources"]); include(["Engines", "Wine", "Verbs", "msls31"]); -var setupWizard = SetupWizard("Internet Explorer 6.0"); +var appsManager = Bean("repositoryManager"); +var application = appsManager.getApplication(["Applications", "Internet", "Internet Explorer 6.0"]); +var setupWizard = SetupWizardWithMiniature("Internet Explorer 6.0", application.getMainMiniature().get()); setupWizard.presentation("Internet Explorer 6.0", "Microsoft", "http://www.microsoft.com", "Quentin PÂRIS"); @@ -81,10 +83,10 @@ new WineShortcut() .name("Internet Explorer 6.0") .prefix("InternetExplorer6") .search("iexplore.exe") - .miniature(["Internet", "Internet Explorer 6.0"]) + .miniature(["Applications", "Internet", "Internet Explorer 6.0"]) .create(); -var registrySettings = new AppResource().application(["Internet", "Internet Explorer 6.0"]).get("ie6.reg"); +var registrySettings = new AppResource().application(["Applications", "Internet", "Internet Explorer 6.0"]).get("ie6.reg"); wine.regedit().patch(registrySettings); setupWizard.close(); diff --git a/Applications/Internet/Internet Explorer 7.0/Online/script.js b/Applications/Internet/Internet Explorer 7.0/Online/script.js index a5431258cb..227f7a71a6 100644 --- a/Applications/Internet/Internet Explorer 7.0/Online/script.js +++ b/Applications/Internet/Internet Explorer 7.0/Online/script.js @@ -5,7 +5,9 @@ include(["Engines", "Wine", "Shortcuts", "Wine"]); include(["Utils", "Functions", "Apps", "Resources"]); include(["Engines", "Wine", "Verbs", "sandbox"]); -var setupWizard = SetupWizard("Internet Explorer 7.0"); +var appsManager = Bean("repositoryManager"); +var application = appsManager.getApplication(["Applications", "Internet", "Internet Explorer 7.0"]); +var setupWizard = SetupWizardWithMiniature("Internet Explorer 7.0", application.getMainMiniature().get()); setupWizard.presentation("Internet Explorer 7.0", "Microsoft", "http://www.microsoft.com", "Quentin PÂRIS"); @@ -221,7 +223,7 @@ new WineShortcut() .name("Internet Explorer 7.0") .prefix("InternetExplorer7") .search("iexplore.exe") - .miniature(["Internet", "Internet Explorer 7.0"]) + .miniature(["Applications", "Internet", "Internet Explorer 7.0"]) .create(); setupWizard.close(); diff --git a/Engines/Wine/QuickScript/InstallerScript/script.js b/Engines/Wine/QuickScript/InstallerScript/script.js index fc7b631e94..efd084b853 100644 --- a/Engines/Wine/QuickScript/InstallerScript/script.js +++ b/Engines/Wine/QuickScript/InstallerScript/script.js @@ -16,7 +16,10 @@ InstallerScript.prototype.constructor = InstallerScript; InstallerScript.prototype.go = function() { this._name = this._name || "Custom Installer"; - var setupWizard = SetupWizard(this._name); + + var appsManager = Bean("repositoryManager"); + var application = appsManager.getApplication([this._type, this._category, this._name]); + var setupWizard = SetupWizardWithMiniature(this._name, application.getMainMiniature().get()); // 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 1802da0329..fd1b600f00 100644 --- a/Engines/Wine/QuickScript/SteamScript/script.js +++ b/Engines/Wine/QuickScript/SteamScript/script.js @@ -81,7 +81,9 @@ SteamScript.prototype.go = function() { this._executableArgs = ["-silent", "-applaunch", this._appId]; } - var setupWizard = SetupWizard(this._name); + var appsManager = Bean("repositoryManager"); + var application = appsManager.getApplication([this._type, this._category, this._name]); + var setupWizard = SetupWizardWithMiniature(this._name, application.getMainMiniature().get()); 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 de2bdae506..6022be619d 100644 --- a/Engines/Wine/QuickScript/UplayScript/script.js +++ b/Engines/Wine/QuickScript/UplayScript/script.js @@ -38,7 +38,9 @@ UplayScript.prototype.go = function() { this._executableArgs = ["uplay://launch/" + this._appId + "/0"]; } - var setupWizard = SetupWizard(this._name); + var appsManager = Bean("repositoryManager"); + var application = appsManager.getApplication([this._type, this._category, this._name]); + var setupWizard = SetupWizardWithMiniature(this._name, application.getMainMiniature().get()); 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 c477a61c70..7c9a2deef3 100644 --- a/Engines/Wine/QuickScript/ZipScript/script.js +++ b/Engines/Wine/QuickScript/ZipScript/script.js @@ -25,7 +25,9 @@ ZipScript.prototype.checksum = function(checksum) { }; ZipScript.prototype.go = function() { - var setupWizard = SetupWizard(this._name); + var appsManager = Bean("repositoryManager"); + var application = appsManager.getApplication([this._type, this._category, this._name]); + var setupWizard = SetupWizardWithMiniature(this._name, application.getMainMiniature().get()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author); From 81b8733cff7678eb99d556e8e50beb7bfa556bc6 Mon Sep 17 00:00:00 2001 From: Plata Date: Sat, 26 Aug 2017 18:17:58 +0200 Subject: [PATCH 2/2] made miniature for setup wizard optional --- Applications/Internet/Internet Explorer 6.0/Online/script.js | 2 +- Applications/Internet/Internet Explorer 7.0/Online/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 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Applications/Internet/Internet Explorer 6.0/Online/script.js b/Applications/Internet/Internet Explorer 6.0/Online/script.js index e1dc3792e2..6015480a11 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().get()); +var setupWizard = SetupWizardWithMiniature("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 227f7a71a6..0890322915 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().get()); +var setupWizard = SetupWizardWithMiniature("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/QuickScript/InstallerScript/script.js b/Engines/Wine/QuickScript/InstallerScript/script.js index efd084b853..27cbfda6a1 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().get()); + var setupWizard = SetupWizardWithMiniature(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 fd1b600f00..0e355d1336 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().get()); + var setupWizard = SetupWizardWithMiniature(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 6022be619d..b20d0df21c 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().get()); + var setupWizard = SetupWizardWithMiniature(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 7c9a2deef3..9e593c8a0d 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().get()); + var setupWizard = SetupWizardWithMiniature(this._name, application.getMainMiniature()); setupWizard.presentation(this._name, this._editor, this._applicationHomepage, this._author);