diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3c3fc4..488bcea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,11 +23,15 @@ jobs: chmod -R 777 build/jre - name: Run Gradle Release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | ./gradlew --stacktrace --info packageApp + - name: Genrate Windows Installer with InnoSetup + run: | + chmod 777 build/distributions + chmod -R 777 build/jre + ./gradlew --stacktrace --info generateWindowsInstallerInDocker + - name: Get Env run: | echo "REPO_NAME=${{ github.repository }}" >> $GITHUB_ENV @@ -70,4 +74,5 @@ jobs: ./build/distributions/InterAACtionBox_Interface-noJRE.tar.gz ./build/distributions/InterAACtionBox_Interface-noJRE.zip ./build/distributions/InterAACtionBox_Interface-windows.zip + ./build/distributions/InterAACtionBoxAFSR-windows-x64-installer.exe github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/GoogleChromePortable/App/AppInfo/EULA.txt b/GoogleChromePortable/App/AppInfo/EULA.txt new file mode 100644 index 0000000..6ef66f5 --- /dev/null +++ b/GoogleChromePortable/App/AppInfo/EULA.txt @@ -0,0 +1,13 @@ +Please note that you MUST sign into Google Chrome with your associated Google account in order to have a fully functional browser when used portably. Unlike other browsers, some components of Google Chrome are locked to a given PC and will be lost if you move from PC to PC including extensions, extension settings and data, homepage and search settings, etc. This is by design of the Google Chrome team. + +Passwords are not portable by default but can be made portable using a configuration option within the launcher's INI file. They may be portable while signed into Google. + +Certificates and Chrome apps installed outside the browser are not portable and are installed on the local machine. + +By installing, you are agreeing to the current Google Terms of Service: https://policies.google.com/terms + +and Chrome and Chrome OS Additional Terms of Service: https://www.google.com/chrome/terms/ + +Portableapps.com is not affiliated with Google. Google and Chrome are trademarks or registered trademarks of Google Inc. + +Portions of Google Chrome Portable utilize SQLite3. The license is available here: https://www.sqlite.org/copyright.html diff --git a/GoogleChromePortable/App/AppInfo/appicon.ico b/GoogleChromePortable/App/AppInfo/appicon.ico new file mode 100644 index 0000000..c8dcd8f Binary files /dev/null and b/GoogleChromePortable/App/AppInfo/appicon.ico differ diff --git a/GoogleChromePortable/App/AppInfo/appicon_128.png b/GoogleChromePortable/App/AppInfo/appicon_128.png new file mode 100644 index 0000000..78fa1ae Binary files /dev/null and b/GoogleChromePortable/App/AppInfo/appicon_128.png differ diff --git a/GoogleChromePortable/App/AppInfo/appicon_16.png b/GoogleChromePortable/App/AppInfo/appicon_16.png new file mode 100644 index 0000000..35a3f45 Binary files /dev/null and b/GoogleChromePortable/App/AppInfo/appicon_16.png differ diff --git a/GoogleChromePortable/App/AppInfo/appicon_256.png b/GoogleChromePortable/App/AppInfo/appicon_256.png new file mode 100644 index 0000000..f039cea Binary files /dev/null and b/GoogleChromePortable/App/AppInfo/appicon_256.png differ diff --git a/GoogleChromePortable/App/AppInfo/appicon_32.png b/GoogleChromePortable/App/AppInfo/appicon_32.png new file mode 100644 index 0000000..28c777b Binary files /dev/null and b/GoogleChromePortable/App/AppInfo/appicon_32.png differ diff --git a/GoogleChromePortable/App/AppInfo/appicon_75.png b/GoogleChromePortable/App/AppInfo/appicon_75.png new file mode 100644 index 0000000..3ac78df Binary files /dev/null and b/GoogleChromePortable/App/AppInfo/appicon_75.png differ diff --git a/GoogleChromePortable/App/AppInfo/appinfo.ini b/GoogleChromePortable/App/AppInfo/appinfo.ini new file mode 100644 index 0000000..c1f94d7 --- /dev/null +++ b/GoogleChromePortable/App/AppInfo/appinfo.ini @@ -0,0 +1,39 @@ +[Format] +Type=PortableApps.comFormat +Version=3.5 + +[Details] +Name=Google Chrome Portable +AppId=GoogleChromePortable +Publisher=Google & PortableApps.com +Homepage=https://portableapps.com/apps/internet/google_chrome_portable +Category=Internet +Description=Web browser +Language=Multilingual +Trademarks= +InstallType= + +[License] +Shareable=true +OpenSource=false +Freeware=true +CommercialUse=true +EULAVersion=2 + +[Version] +PackageVersion=104.0.5112.81 +DisplayVersion=104.0.5112.81 + +[SpecialPaths] +Plugins=Chrome-bin\Plugins + +[Control] +BaseAppID=Chrome.ZQNWJZRJIK3UCX77OAOZ4G6E.profile.Default +Icons=1 +Start=GoogleChromePortable.exe + +[Associations] +FileTypes=htm,html,shtml,xht,xhtml +FileTypeCommandLine=-- "%1" +Protocols=ftp,http,https +ProtocolCommandLine=-- "%1" diff --git a/GoogleChromePortable/App/AppInfo/installer.ini b/GoogleChromePortable/App/AppInfo/installer.ini new file mode 100644 index 0000000..8997c9f --- /dev/null +++ b/GoogleChromePortable/App/AppInfo/installer.ini @@ -0,0 +1,14 @@ +[DownloadFiles] +DownloadURL=https://dl.google.com/release2/chrome/acryzwk4bzyqlfwvkoxjvflmon2q_104.0.5112.81/104.0.5112.81_chrome_installer.exe +DownloadName=Google Chrome (Stable) +DownloadFilename=104.0.5112.81_chrome_installer.exe +DownloadMD5=0ab0879b151899b1574f466120ea3e47 +AdditionalInstallSize=239000 +DoubleExtractFilename=chrome.7z +DoubleExtract1To=App +DoubleExtract1Filter=Chrome-bin\** +DownloadSHA256=4EE180631B32A8B9CA2F0B48ABF9C0AA3A92B5A13739E88F5E04DF25719A5EC4 + +[DirectoriesToPreserve] +PreserveDirectory1=App\Chrome-bin\Plugins +PreserveDirectory2=App\Chrome-bin\Dictionaries diff --git a/GoogleChromePortable/App/AppInfo/pac_installer_log.ini b/GoogleChromePortable/App/AppInfo/pac_installer_log.ini new file mode 100644 index 0000000..65664c4 --- /dev/null +++ b/GoogleChromePortable/App/AppInfo/pac_installer_log.ini @@ -0,0 +1,11 @@ +[PortableApps.comInstaller] +Info1=Do not delete or modify this file. It may be necessary for this app to function correctly. +Info2=This file was generated by the PortableApps.com Installer wizard and modified by the official PortableApps.com Installer TM Rare Ideas, LLC as the app was installed. +Info3=This file should be excluded from git repositories by using the appropriate gitignore. +Run=true +WizardVersion=3.7.2.0 +PackagingDate=2022-08-02 +PackagingTime=15:21:28 +InstallerVersion=3.7.2.0 +InstallDate=2022-08-09 +InstallTime=10:45:50 diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/104.0.5112.79.manifest b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/104.0.5112.79.manifest new file mode 100644 index 0000000..35c25b1 --- /dev/null +++ b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/104.0.5112.79.manifest @@ -0,0 +1,8 @@ + + + + diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/104.0.5112.80.manifest b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/104.0.5112.80.manifest new file mode 100644 index 0000000..399ce54 --- /dev/null +++ b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/104.0.5112.80.manifest @@ -0,0 +1,8 @@ + + + + diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/104.0.5112.81.manifest b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/104.0.5112.81.manifest new file mode 100644 index 0000000..4d7fc15 --- /dev/null +++ b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/104.0.5112.81.manifest @@ -0,0 +1,8 @@ + + + + diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Extensions/external_extensions.json b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Extensions/external_extensions.json new file mode 100644 index 0000000..1ef50f3 --- /dev/null +++ b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Extensions/external_extensions.json @@ -0,0 +1,5 @@ +// This json file will contain a list of extensions that will be included +// in the installer. + +{ +} \ No newline at end of file diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/af.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/af.pak new file mode 100644 index 0000000..8df11c9 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/af.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/am.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/am.pak new file mode 100644 index 0000000..adacb88 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/am.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ar.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ar.pak new file mode 100644 index 0000000..0b2a841 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ar.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/bg.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/bg.pak new file mode 100644 index 0000000..4c5883c Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/bg.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/bn.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/bn.pak new file mode 100644 index 0000000..6d46dbd Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/bn.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ca.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ca.pak new file mode 100644 index 0000000..cb44f6f Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ca.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/cs.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/cs.pak new file mode 100644 index 0000000..553bac0 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/cs.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/da.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/da.pak new file mode 100644 index 0000000..5b0b9fe Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/da.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/de.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/de.pak new file mode 100644 index 0000000..4b3ab2e Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/de.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/el.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/el.pak new file mode 100644 index 0000000..f12113f Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/el.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/en-GB.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/en-GB.pak new file mode 100644 index 0000000..a6303d6 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/en-GB.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/en-US.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/en-US.pak new file mode 100644 index 0000000..dae9dc5 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/en-US.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/es-419.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/es-419.pak new file mode 100644 index 0000000..49e76ed Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/es-419.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/es.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/es.pak new file mode 100644 index 0000000..5316804 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/es.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/et.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/et.pak new file mode 100644 index 0000000..0514774 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/et.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fa.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fa.pak new file mode 100644 index 0000000..25f3003 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fa.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fi.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fi.pak new file mode 100644 index 0000000..d834834 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fi.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fil.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fil.pak new file mode 100644 index 0000000..7b08917 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fil.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fr.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fr.pak new file mode 100644 index 0000000..2252d15 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/fr.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/gu.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/gu.pak new file mode 100644 index 0000000..3ecf6d8 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/gu.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/he.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/he.pak new file mode 100644 index 0000000..c7778fb Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/he.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/hi.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/hi.pak new file mode 100644 index 0000000..8040d52 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/hi.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/hr.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/hr.pak new file mode 100644 index 0000000..795ec74 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/hr.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/hu.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/hu.pak new file mode 100644 index 0000000..8d7e63b Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/hu.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/id.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/id.pak new file mode 100644 index 0000000..3c9f501 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/id.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/it.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/it.pak new file mode 100644 index 0000000..c7fa936 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/it.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ja.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ja.pak new file mode 100644 index 0000000..365172b Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ja.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/kn.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/kn.pak new file mode 100644 index 0000000..a9209d5 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/kn.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ko.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ko.pak new file mode 100644 index 0000000..4689ba6 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ko.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/lt.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/lt.pak new file mode 100644 index 0000000..40ce889 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/lt.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/lv.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/lv.pak new file mode 100644 index 0000000..152195b Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/lv.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ml.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ml.pak new file mode 100644 index 0000000..df69ee5 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ml.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/mr.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/mr.pak new file mode 100644 index 0000000..37cf765 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/mr.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ms.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ms.pak new file mode 100644 index 0000000..765a1b1 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ms.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/nb.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/nb.pak new file mode 100644 index 0000000..0f19da7 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/nb.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/nl.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/nl.pak new file mode 100644 index 0000000..c762849 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/nl.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/pl.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/pl.pak new file mode 100644 index 0000000..7c51fa2 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/pl.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/pt-BR.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/pt-BR.pak new file mode 100644 index 0000000..9e81e15 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/pt-BR.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/pt-PT.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/pt-PT.pak new file mode 100644 index 0000000..5f1f1c5 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/pt-PT.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ro.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ro.pak new file mode 100644 index 0000000..7ce1c48 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ro.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ru.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ru.pak new file mode 100644 index 0000000..f57598c Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ru.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sk.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sk.pak new file mode 100644 index 0000000..f836ce9 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sk.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sl.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sl.pak new file mode 100644 index 0000000..58142aa Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sl.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sr.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sr.pak new file mode 100644 index 0000000..e4aa934 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sr.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sv.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sv.pak new file mode 100644 index 0000000..18a4d52 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sv.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sw.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sw.pak new file mode 100644 index 0000000..596e60f Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/sw.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ta.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ta.pak new file mode 100644 index 0000000..851be4c Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ta.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/te.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/te.pak new file mode 100644 index 0000000..2d43b60 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/te.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/th.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/th.pak new file mode 100644 index 0000000..f284dc4 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/th.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/tr.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/tr.pak new file mode 100644 index 0000000..bc0f968 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/tr.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/uk.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/uk.pak new file mode 100644 index 0000000..75d7399 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/uk.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ur.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ur.pak new file mode 100644 index 0000000..5281ed3 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/ur.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/vi.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/vi.pak new file mode 100644 index 0000000..039c89b Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/vi.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/zh-CN.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/zh-CN.pak new file mode 100644 index 0000000..8a5e52e Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/zh-CN.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/zh-TW.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/zh-TW.pak new file mode 100644 index 0000000..f5ce0ca Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/Locales/zh-TW.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/MEIPreload/manifest.json b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/MEIPreload/manifest.json new file mode 100644 index 0000000..1b4fa8a --- /dev/null +++ b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/MEIPreload/manifest.json @@ -0,0 +1,8 @@ +{ + "name": "MEI Preload", + "icons": {}, + "version": "1.0.7.1652906823", + "manifest_version": 2, + "update_url": "https://clients2.google.com/service/update2/crx", + "description": "Contains preloaded data for Media Engagement" +} diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/MEIPreload/preloaded_data.pb b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/MEIPreload/preloaded_data.pb new file mode 100644 index 0000000..78f104c Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/MEIPreload/preloaded_data.pb differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/Logo.png b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/Logo.png new file mode 100644 index 0000000..83c18a3 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/Logo.png differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/LogoBeta.png b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/LogoBeta.png new file mode 100644 index 0000000..7c5803a Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/LogoBeta.png differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/LogoCanary.png b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/LogoCanary.png new file mode 100644 index 0000000..a508714 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/LogoCanary.png differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/LogoDev.png b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/LogoDev.png new file mode 100644 index 0000000..8527fcc Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/LogoDev.png differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogo.png b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogo.png new file mode 100644 index 0000000..ce89457 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogo.png differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogoBeta.png b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogoBeta.png new file mode 100644 index 0000000..b630f56 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogoBeta.png differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogoCanary.png b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogoCanary.png new file mode 100644 index 0000000..1c1de9e Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogoCanary.png differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogoDev.png b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogoDev.png new file mode 100644 index 0000000..75f0724 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/VisualElements/SmallLogoDev.png differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/LICENSE b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/LICENSE new file mode 100644 index 0000000..e711887 --- /dev/null +++ b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/LICENSE @@ -0,0 +1,8 @@ +Google LLC and its affiliates ("Google") own all legal right, title and +interest in and to the content decryption module software ("Software") and +related documentation, including any intellectual property rights in the +Software. You may not use, modify, sell, or otherwise distribute the Software +without a separate license agreement with Google. The Software is not open +source software. + +If you are interested in licensing the Software, please contact www.widevine.com diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/_platform_specific/win_x86/widevinecdm.dll b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/_platform_specific/win_x86/widevinecdm.dll new file mode 100644 index 0000000..2a5f173 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/_platform_specific/win_x86/widevinecdm.dll differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/_platform_specific/win_x86/widevinecdm.dll.sig b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/_platform_specific/win_x86/widevinecdm.dll.sig new file mode 100644 index 0000000..be7edcb Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/_platform_specific/win_x86/widevinecdm.dll.sig differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/manifest.json b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/manifest.json new file mode 100644 index 0000000..5c69483 --- /dev/null +++ b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/WidevineCdm/manifest.json @@ -0,0 +1,38 @@ +{ + "manifest_version": 2, + "update_url": "https://clients2.google.com/service/update2/crx", + "name": "WidevineCdm", + "description": "Widevine Content Decryption Module", + "version": "4.10.2449.0", + "minimum_chrome_version": "68.0.3430.0", + "x-cdm-module-versions": "4", + "x-cdm-interface-versions": "10", + "x-cdm-host-versions": "10", + "x-cdm-codecs": "vp8,vp09,avc1,av01", + "x-cdm-persistent-license-support": true, + "x-cdm-supported-encryption-schemes": [ + "cenc", + "cbcs" + ], + "icons": { + "16": "imgs/icon-128x128.png", + "128": "imgs/icon-128x128.png" + }, + "platforms": [ + { + "os": "win", + "arch": "x64", + "sub_package_path": "_platform_specific/win_x64/" + }, + { + "os": "win", + "arch": "x86", + "sub_package_path": "_platform_specific/win_x86/" + }, + { + "os": "win", + "arch": "arm64", + "sub_package_path": "_platform_specific/win_arm64/" + } + ] +} \ No newline at end of file diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome.dll.sig b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome.dll.sig new file mode 100644 index 0000000..b726425 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome.dll.sig differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome.exe.sig b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome.exe.sig new file mode 100644 index 0000000..71fb60c Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome.exe.sig differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chromeDll.zip b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chromeDll.zip new file mode 100644 index 0000000..1a1eb0f Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chromeDll.zip differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_100_percent.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_100_percent.pak new file mode 100644 index 0000000..0a9a792 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_100_percent.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_200_percent.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_200_percent.pak new file mode 100644 index 0000000..623eb2f Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_200_percent.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_elf.dll b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_elf.dll new file mode 100644 index 0000000..695d200 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_elf.dll differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_pwa_launcher.exe b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_pwa_launcher.exe new file mode 100644 index 0000000..542a3fd Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/chrome_pwa_launcher.exe differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/d3dcompiler_47.dll b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/d3dcompiler_47.dll new file mode 100644 index 0000000..52c3d90 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/d3dcompiler_47.dll differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/default_apps/external_extensions.json b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/default_apps/external_extensions.json new file mode 100644 index 0000000..6c3660f --- /dev/null +++ b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/default_apps/external_extensions.json @@ -0,0 +1,9 @@ +// Dictionary of default apps to install into new profiles. They will be +// dynamically downloaded and installed from CWS on profile creation. +{ + // Drive extension + "ghbmnnjooekpmoecnnnilnnbdlolhkhi" : { + "external_update_url": "https://clients2.google.com/service/update2/crx" + } +} + diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/elevation_service.exe b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/elevation_service.exe new file mode 100644 index 0000000..8fac5c3 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/elevation_service.exe differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/eventlog_provider.dll b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/eventlog_provider.dll new file mode 100644 index 0000000..2fda5b2 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/eventlog_provider.dll differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/icudtl.dat b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/icudtl.dat new file mode 100644 index 0000000..dfa97af Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/icudtl.dat differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/libEGL.dll b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/libEGL.dll new file mode 100644 index 0000000..39022a5 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/libEGL.dll differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/libGLESv2.dll b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/libGLESv2.dll new file mode 100644 index 0000000..86a42aa Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/libGLESv2.dll differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/mojo_core.dll b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/mojo_core.dll new file mode 100644 index 0000000..2713c45 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/mojo_core.dll differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/nacl64.exe b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/nacl64.exe new file mode 100644 index 0000000..e226998 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/nacl64.exe differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/nacl_irt_x86_32.nexe b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/nacl_irt_x86_32.nexe new file mode 100644 index 0000000..c11498d Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/nacl_irt_x86_32.nexe differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/nacl_irt_x86_64.nexe b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/nacl_irt_x86_64.nexe new file mode 100644 index 0000000..3ba245f Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/nacl_irt_x86_64.nexe differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/notification_helper.exe b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/notification_helper.exe new file mode 100644 index 0000000..68df2cc Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/notification_helper.exe differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/optimization_guide_internal.dll b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/optimization_guide_internal.dll new file mode 100644 index 0000000..c7d1fe6 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/optimization_guide_internal.dll differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/resources.pak b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/resources.pak new file mode 100644 index 0000000..384b379 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/resources.pak differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/v8_context_snapshot.bin b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/v8_context_snapshot.bin new file mode 100644 index 0000000..29bf2a5 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/v8_context_snapshot.bin differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/vk_swiftshader.dll b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/vk_swiftshader.dll new file mode 100644 index 0000000..a96dd92 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/vk_swiftshader.dll differ diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/vk_swiftshader_icd.json b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/vk_swiftshader_icd.json new file mode 100644 index 0000000..525fbc5 --- /dev/null +++ b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/vk_swiftshader_icd.json @@ -0,0 +1 @@ +{"file_format_version": "1.0.0", "ICD": {"library_path": ".\\vk_swiftshader.dll", "api_version": "1.0.5"}} \ No newline at end of file diff --git a/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/vulkan-1.dll b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/vulkan-1.dll new file mode 100644 index 0000000..e69e22c Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/104.0.5112.81/vulkan-1.dll differ diff --git a/GoogleChromePortable/App/Chrome-bin/First Run b/GoogleChromePortable/App/Chrome-bin/First Run new file mode 100644 index 0000000..e69de29 diff --git a/GoogleChromePortable/App/Chrome-bin/chrome.exe b/GoogleChromePortable/App/Chrome-bin/chrome.exe new file mode 100644 index 0000000..7f113e7 Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/chrome.exe differ diff --git a/GoogleChromePortable/App/Chrome-bin/chrome_proxy.exe b/GoogleChromePortable/App/Chrome-bin/chrome_proxy.exe new file mode 100644 index 0000000..11b225b Binary files /dev/null and b/GoogleChromePortable/App/Chrome-bin/chrome_proxy.exe differ diff --git a/GoogleChromePortable/App/DefaultData/profile/Default/Bookmarks b/GoogleChromePortable/App/DefaultData/profile/Default/Bookmarks new file mode 100644 index 0000000..c056283 --- /dev/null +++ b/GoogleChromePortable/App/DefaultData/profile/Default/Bookmarks @@ -0,0 +1,36 @@ +{ + "checksum": "2cf42d4f179a8b7766a445c1270dd4c0", + "roots": { + "bookmark_bar": { + "children": [ { + "date_added": "13028788410338143", + "id": "5", + "name": "PortableApps.com", + "type": "url", + "url": "http://portableapps.com/" + } ], + "date_added": "0", + "date_modified": "13028788410338143", + "id": "1", + "name": "Bookmarks bar", + "type": "folder" + }, + "other": { + "children": [ ], + "date_added": "0", + "date_modified": "0", + "id": "2", + "name": "Other bookmarks", + "type": "folder" + }, + "synced": { + "children": [ ], + "date_added": "13028788397005139", + "date_modified": "0", + "id": "4", + "name": "Mobile bookmarks", + "type": "folder" + } + }, + "version": 1 +} diff --git a/GoogleChromePortable/App/DefaultData/profile/Default/Favicons b/GoogleChromePortable/App/DefaultData/profile/Default/Favicons new file mode 100644 index 0000000..92aedd6 Binary files /dev/null and b/GoogleChromePortable/App/DefaultData/profile/Default/Favicons differ diff --git a/GoogleChromePortable/App/DefaultData/profile/Default/History b/GoogleChromePortable/App/DefaultData/profile/Default/History new file mode 100644 index 0000000..bda971e Binary files /dev/null and b/GoogleChromePortable/App/DefaultData/profile/Default/History differ diff --git a/GoogleChromePortable/App/DefaultData/profile/Default/Preferences b/GoogleChromePortable/App/DefaultData/profile/Default/Preferences new file mode 100644 index 0000000..24b2156 --- /dev/null +++ b/GoogleChromePortable/App/DefaultData/profile/Default/Preferences @@ -0,0 +1,163 @@ +{ + "browser": { + "check_default_browser": false, + "clear_lso_data_enabled": true, + "default_browser_infobar_last_declined":"16274190850000000", + "last_known_google_url": "https://www.google.com/", + "last_prompted_google_url": "https://www.google.com/", + "ntp": { + "theme_promo_remaining": -2 + }, + "pepper_flash_settings_enabled": true, + "should_reset_check_default_browser":false, + "window_placement": { + "bottom": 738, + "left": 10, + "maximized": false, + "right": 955, + "top": 0, + "work_area_bottom": 738, + "work_area_left": 0, + "work_area_right": 1024, + "work_area_top": 0 + } + }, + "countryid_at_install": 21843, + "default_apps_install_state": 2, + "default_search_provider": { + "id": "2", + "prepopulate_id": "1", + "suggest_url": "{google:baseSuggestURL}search?client=chrome&hl={language}&q={searchTerms}" + }, + "dns_prefetching": { + "host_referral_list": [ 2 ], + "startup_list": [ 1, "https://clients2.google.com/", "https://clients2.googleusercontent.com/", "https://www.google.com/" ] + }, + "download": { + "directory_upgrade": true, + "extensions_to_open": "" + }, + "enhanced_bookmarks_enabled": 0, + "extensions": { + "alerts": { + "initialized": true + }, + "autoupdate": { + "next_check": "16274190850000000" + }, + "chrome_url_overrides": { + "bookmarks": [ "chrome-extension://eemcgdkfndhakfknompkggombfjjjeno/main.html" ] + }, + "last_chrome_version": "37.0.2062.120" + }, + "http_throttling": { + "enabled": false + }, + "intl": { + "accept_languages": "en-US,en" + }, + "invalidator": { + "client_id": "WPR/kEKBYQJvDFQytu38qg==" + }, + "media": { + "device_id_salt": "hV42eI2dh8XX3Ch/EBuMCg==" + }, + "net": { + "http_server_properties": { + "servers": { + "clients2.google.com:443": { + "alternate_protocol": { + "port": 443, + "protocol_str": "quic" + }, + "settings": { + "4": 100 + }, + "supports_spdy": true + }, + "clients2.googleusercontent.com:443": { + "alternate_protocol": { + "port": 443, + "protocol_str": "quic" + }, + "settings": { + "4": 100 + }, + "supports_spdy": true + }, + "www.google.com:443": { + "alternate_protocol": { + "port": 443, + "protocol_str": "quic" + }, + "settings": { + "4": 100 + }, + "supports_spdy": true + } + }, + "version": 3 + } + }, + "ntp": { + "alt_logo_end": 0.0, + "alt_logo_resource_server": "https://www.google.com/support/chrome/bin/topic/30248/inproduct", + "alt_logo_start": 0.0, + "pinned_urls": { + "af4775052a19379b5cfb577f90adaf0d": { + "direction": "ltr", + "index": 0, + "title": "PortableApps.com - Portable software for USB drives", + "url": "http://portableapps.com/" + } + }, + "pref_version": 3, + "promo_build": 2, + "promo_closed": false, + "promo_end": 1316246340.0, + "promo_group": 11, + "promo_group_max": 1, + "promo_group_timeslice": 0, + "promo_line": "Like Chrome? You might like the Chromebook, too. \u003Ca href=\"http://www.google.com/chromebook/buynow.html#utm_campaign=en&utm_source=en-ntp-na-us-bkws&utm_medium=ntp\">Learn more.\u003C/a>", + "promo_start": 1315641480.0, + "shown_sections": 1, + "web_resource_cache_update": "1289679884.902772", + "webstore_last_promo_id": "1335115" + }, + "plugins": { + "enabled_internal_pdf3": true, + "enabled_nacl": true, + "migrated_to_pepper_flash": true, + "plugins_list": [ ], + "removed_old_component_pepper_flash_settings": true + }, + "profile": { + "avatar_index": 0, + "content_settings": { + "clear_on_exit_migrated": true, + "pattern_pairs": { + + }, + "pref_version": 1 + }, + "exit_type": "Normal", + "exited_cleanly": true, + "managed_user_id": "", + "name": "First user", + "per_host_zoom_levels": { + + } + }, + "session": { + "restore_on_startup_migrated": true, + "startup_urls_migration_time": "16274190850000000" + }, + "tabs": { + "use_compact_navigation_bar": false, + "use_vertical_tabs": false + }, + "translate_blocked_languages": [ "en" ], + "translate_whitelists": { + + } +} diff --git a/GoogleChromePortable/App/DefaultData/profile/Default/Top Sites b/GoogleChromePortable/App/DefaultData/profile/Default/Top Sites new file mode 100644 index 0000000..7e3fa6b Binary files /dev/null and b/GoogleChromePortable/App/DefaultData/profile/Default/Top Sites differ diff --git a/GoogleChromePortable/App/DefaultData/profile/Default/Web Data b/GoogleChromePortable/App/DefaultData/profile/Default/Web Data new file mode 100644 index 0000000..17496c0 Binary files /dev/null and b/GoogleChromePortable/App/DefaultData/profile/Default/Web Data differ diff --git a/GoogleChromePortable/App/readme.txt b/GoogleChromePortable/App/readme.txt new file mode 100644 index 0000000..27d6448 --- /dev/null +++ b/GoogleChromePortable/App/readme.txt @@ -0,0 +1,6 @@ +This directory contains files used by the portable app. +They should generally not be accessed directly by users. + +User data or settings should not be stored within the App +directory or its sub-directories. Any data stored here +will likely be deleted on upgrades. \ No newline at end of file diff --git a/GoogleChromePortable/Data.zip b/GoogleChromePortable/Data.zip new file mode 100644 index 0000000..ad10417 Binary files /dev/null and b/GoogleChromePortable/Data.zip differ diff --git a/GoogleChromePortable/GoogleChromePortable.exe b/GoogleChromePortable/GoogleChromePortable.exe new file mode 100644 index 0000000..fde606d Binary files /dev/null and b/GoogleChromePortable/GoogleChromePortable.exe differ diff --git a/GoogleChromePortable/Other/Help/images/donation_button.png b/GoogleChromePortable/Other/Help/images/donation_button.png new file mode 100644 index 0000000..13606de Binary files /dev/null and b/GoogleChromePortable/Other/Help/images/donation_button.png differ diff --git a/GoogleChromePortable/Other/Help/images/favicon.ico b/GoogleChromePortable/Other/Help/images/favicon.ico new file mode 100644 index 0000000..ed849b2 Binary files /dev/null and b/GoogleChromePortable/Other/Help/images/favicon.ico differ diff --git a/GoogleChromePortable/Other/Help/images/help_background_footer.png b/GoogleChromePortable/Other/Help/images/help_background_footer.png new file mode 100644 index 0000000..a97084a Binary files /dev/null and b/GoogleChromePortable/Other/Help/images/help_background_footer.png differ diff --git a/GoogleChromePortable/Other/Help/images/help_background_header.png b/GoogleChromePortable/Other/Help/images/help_background_header.png new file mode 100644 index 0000000..5c4d34f Binary files /dev/null and b/GoogleChromePortable/Other/Help/images/help_background_header.png differ diff --git a/GoogleChromePortable/Other/Help/images/help_logo_top.png b/GoogleChromePortable/Other/Help/images/help_logo_top.png new file mode 100644 index 0000000..6263b61 Binary files /dev/null and b/GoogleChromePortable/Other/Help/images/help_logo_top.png differ diff --git a/GoogleChromePortable/Other/Source/GoogleChromePortable.ini b/GoogleChromePortable/Other/Source/GoogleChromePortable.ini new file mode 100644 index 0000000..f555a55 --- /dev/null +++ b/GoogleChromePortable/Other/Source/GoogleChromePortable.ini @@ -0,0 +1,83 @@ +; This file contains the Google Chrome Portable default settings. +; You can copy this file to GoogleChromePortable\ and change settings in it. +; Any settings missing from that file will have their defaults (listed here) +; used. + +[GoogleChromePortable] +Google ChromeDirectory=App\Chrome-bin +; The main app directory +ProfileDirectory=Data\profile +; The profile directory +SettingsDirectory=Data\settings +; The directory containing settings. Currently only used for the master +; password hash, if enabled. +AdditionalParameters= +; More parameters to pass to chrome.exe, use to enable experimental features. +Google ChromeExecutable=chrome.exe +; The EXE name +WaitForProgram=true +; Waits for the program to run. Don't set to false as it is required for +; cleanup to avoid leaving files on the local system, and to avoid breaking +; local Google Update and Chrome. +DisableSplashScreen=false +; Disables the splash screen, if it has been compiled into the launcher. +RunLocally=false +; Forces the profile to be copied to the local computer, as if the portable app +; is run from a CD. The profile will be copied back to the portable device +; afterwards (minus cache files). +CacheInTemp=true +; If this is true, the disk Cache will be set to use the local computer, and +; will be deleted on exit, even if RunLocally is false. + +; Note that using either of the previous two options can represent a risk of +; other users of the same computer discovering your internet surfing +; activities on that computer. Although Google Chrome Portable deletes the +; locally saved data when it is finished, it is possible this may not happen +; (Google Chrome Portable or the computer crashes) and even if it does, some +; of the data may be recoverable using disk recovery tools. For this reason +; it is recommended you use Incognito mode for any browsing you don't want +; others to know about. HTTPS browsing is never written to cache and thus not +; an issue. + +ImportJava=false +; If true, it will import the Java plugin from a copy of Java Portable if you +; have it installed, and if you do not already have a Java plugin installed in +; Google Chrome Portable. Note that Java Portable is not yet supported; the +; plugin will attempt to use a locally installed Java. +UsePAMLanguage=true +; Forces Google Chrome to use the language selected by PortableApps.com Menu +; when it is launched from PAM. The language is only used if Google Chrome +; supports it, otherwise it falls back to the user-selected language (or +; the local system language). If "true", you won't be able to change the +; language within Google Chrome when launched from PAM since PAM will override +; it. + +PortablePasswords=false +; Stores your saved passwords using a master password you select on startup, +; working around Chrome's normal mechanism of tying saved passwords to a local +; user account. This setting causes a prompt for the master password on +; every startup so it's opt-in. +EncryptPortablePasswords=true +; Uses a master password to re-encrypt passwords. If this is false, Portable +; Passwords will be insecurely stored as plaintext, but you will not need to +; use a master password. You may find setting this to false useful if you +; already use an encryption solution such as TrueCrypt to store +; GooglechromePortable. +; +; If you want to change any of the following: +; - The Portable Passwords algorithms, salts, or implementation in such a way +; that would break your existing Portable Passwords (through an upgrade of +; Google Chrome Portable that changes these). +; - Your master password, or lack of a master password. +; +; You can keep your Portable Passwords by first ensuring that your passwords +; have been successfully imported into your Google Chrome profile with the +; local user account. To do this, simply start GCP before upgrading it or +; changing your password or Portable Passwords settings. Then, delete the +; master password hash in Data\settings and the Portable Passwords files in +; your profile (by default, there is only one in Data\profile\Default. A +; power user with more than one profile will have one for each profile). +; Next, perform the upgrade, or change the settings, if you wanted to. Now +; run GCP and enter a new master password (or the same one, but it CAN be new +; if you want). Once you close Google Chrome the new Portable Passwords +; database will be constructed using your saved passwords from Google Chrome. \ No newline at end of file diff --git a/GoogleChromePortable/Other/Source/License.txt b/GoogleChromePortable/Other/Source/License.txt new file mode 100644 index 0000000..f119115 --- /dev/null +++ b/GoogleChromePortable/Other/Source/License.txt @@ -0,0 +1,344 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT +PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED +IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, +EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY +AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL +NECESSARY SERVICING, REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR +AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY +OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM +AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING +ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM +(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY +OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. \ No newline at end of file diff --git a/GoogleChromePortable/Other/Source/ReadmeAndSource.txt b/GoogleChromePortable/Other/Source/ReadmeAndSource.txt new file mode 100644 index 0000000..d40fecf --- /dev/null +++ b/GoogleChromePortable/Other/Source/ReadmeAndSource.txt @@ -0,0 +1,72 @@ +Google Chrome Portable Launcher +=============================== +Copyright 2004-2021 John T. Haller of PortableApps.com +Copyright 2008-2010 Dan Bugglin + +Website: https://portableapps.com/go/GoogleChromePortable + +This software is OSI Certified Open Source Software. +OSI Certified is a certification mark of the Open Source Initiative. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +ABOUT GOOGLE CHROME PORTABLE +============================ +The Google Chrome Portable Launcher allows you to run Chrome from a removable drive +whose letter changes as you move it to another computer. The browser and the +profile can be entirely self-contained on the drive and then used on any Windows +computer. Specific configuration changes are made to the chrome.rdf so that +your extensions will still work as the drive letter changes. + + +LICENSE +======= +This code is released under the GPL. You can find the full code here: + +https://sourceforge.net/projects/portableapps/files/Source/Google%20Chrome/Launcher/ + +If you use the launcher or code in your own product, please give +proper and prominent attribution. + + +INSTALLATION / DIRECTORY STRUCTURE +================================== +By default, the program expects the following directory structure: + +-\ <--- Directory with GoogleChromePortable.exe + +\App\ + +\Chrome-bin\ + +\Data\ + +\profile\ + +\settings\ + + +GOOGLECHROMEPORTABLE.INI CONFIGURATION +====================================== +The GoogleChromePortable.exe launcher will look for GoogleChromePortable.ini +within its directory. If you are happy with the default options, it is not necessary, +though. There is an example INI included with this package to get you started within +the Other\Source directory. Note that it will not work from this location as it must +be placed in the same directory as GoogleChromePortable.exe. The INI file format +and options are described within the INI file. + + +CURRENT LIMITATIONS +=================== +Passwords Not Saved Between PCs By Default: Google Chrome stores passwords in such a way that they are encrypted in a way tied to current PC. While the passwords are not kept or left behind on the PC itself, they won't be retrievable when you move to a new PC. We've added password portability as an advanced option, though, which you can enable by reading the help.html file. + +Certificates Not Portable: Google Chrome has no certificate manager. It uses Windows' certificates manager. So, any certificates you install through the Google Chrome interface are stored on the current local machine and will not travel with you. Thus, you should not use any private certificates with Google Chrome except on your own PC. + +Some Settings/Extensions Locked Per PC: Google Chrome locks specific settings to a given PC. Details are included in this post. This behavior is by design by the Chrome team. If you would like this changed, please file a bug with the Chrome team. A suggested workaround is to sign in to Google to restore all settings and extensions and to use an extension such as Session Buddy to maintain your session state as you move PCs. Note that PortableApps.com has not evaluated this extension. \ No newline at end of file diff --git a/GoogleChromePortable/help.html b/GoogleChromePortable/help.html new file mode 100644 index 0000000..4ba8f94 --- /dev/null +++ b/GoogleChromePortable/help.html @@ -0,0 +1,377 @@ + + + + Google Chrome Portable Help + + + + + + + +
+

Google Chrome Portable Help

+

a new way to get online

+

Google Chrome Portable automatically downloads and installs Google's innovative Chrome browser and converts it into a portable form. Google Chrome is built for speed, security, and simplicity, so it will run well even on your aunt's ancient PC. Learn more about Google Chrome Portable...

+ +

Make a Donation - Support PortableApps.com's Hosting and Development

+ +

Go to the Google Chrome Portable Homepage >>

+ +

Get more portable apps at PortableApps.com

+ + + +

Google Chrome Portable-Specific Issues

+ + + +

Installer and launcher licensed under GPLv2. More License Info.

+ +

Known Issues

+ +
    +
  • The built-in update feature in Google Chrome will not function.
  • +
  • Google Chrome Portable and local Chrome may not work simultaneously unless they are both the same exact version. This cannot be fixed with the current way Google Chrome's update system works.
  • +
  • Google Chrome does not appear to run properly under some unofficial minimalistic Windows distributions. Only official RTM builds of Windows from Microsoft are supported.
  • +
  • Currently, Java plugins will not integrate with Java Portable, but will only be able to use a locally installed Java. A future release of Java Portable or the PortableApps.com Platform may add the ability for Java Portable to work in Google Chrome Portable.
  • +
  • When opting in to Portable Passwords (see GooglechromePortable.ini), a malicious individual will be able to determine the length of your passwords.
  • +
+ +

Using an arbitrary version of Chrome, Chromium, or Iron

+ +

There are a few ways you can set up Google Chrome Portable to use a different version of Chrome or variants. First you must install Google Chrome Portable. Then you can remove the existing version of Chrome from App\Chrome-bin and replace it.

+ +

If your final program executable name is not App\Chrome-bin\chrome.exe you can use a GoogleChromePortable.ini file to have the launcher launch a different file. See the file in Other\Source for more info, you can use it as a template in the same directory as the launcher.

+ +

The following methods have been known to work for installing an arbitrary Chrome:

+ +
    +
  1. Copy a local Chrome installation +

    Press Win+R to open the Run dialog. On XP and below type:

    + +
    %USERPROFILE%\Local Settings\Application Data\Google\Chrome\Application
    + +

    On Vista and above you type:

    + +
    %USERPROFILE%\AppData\Local\Google\Chrome\Application
    + +

    And click OK. This is the Google Chrome application directory. There are two ways to copy the files:

    + +
      +
    1. Open the directory corresponding with the version number you want to copy, and then the Installer directory inside that. If you extract the Chrome.7z file you find therein into your App folder it will create a Chrome-bin directory and populate it with the proper files. +

      OR

      +
    2. + +
    3. Copy the entire directory you are in. You will want to exclude the following files: +
        +
      • old_chrome.exe
      • +
      • Any version number directory other than the newest (chrome.exe will only work with the newest).
      • +
      • The Installer directory inside the version number directory.
      • +
      + +

      All the files and directories go into App\Chrome-bin.

      +
    4. +
    +
  2. + +
  3. Download an arbitrary version installer + +

    This url will download any Chrome version you want, provided it's still on the server (old versions seem to be removed periodically):

    + +
    http://dl.google.com/chrome/install/<X>.<Y>/chrome_installer.exe
    + +

    Replace <X> and <Y> with the third and fourth numbers from the version. Example: 3.0.197.11 has a download url of http://dl.google.com/chrome/install/197.11/chrome_installer.exe

    + +

    Do not run this installer as it will silently update your local Chrome! Instead unpack it with an archiver program (7-zip works) and you will end up with a single .7z file. Extract this file into App and it will create the Chrome-bin file and populate it with the proper files.

    +
  4. +
+ +

Installing plugins

+ +

If you wish to have portable plugins, be aware that many plugins are linked to locally installed programs and will not function correctly in a portable environment. When testing plugins be sure to test them on a system that does not have the plugin installed locally.

+ +

Note that if a system has plugins installed locally for Firefox or Chrome, your portable Google Chrome should find and use them automatically.

+ +

Since verison 5.0 Chrome includes a built-in Flash player so no Flash plugin is needed.

+ +

Starting with 6.0 (currently only in the Dev channel) Chrome will have a PDF plugin capable of rendering PDF files. No PDF plugin will be needed externally.

+ +

To install a plugin, first you need to find the location of a locally installed plugin. Run a local Firefox or Chrome and navigate to about:plugins. In Chrome, click "Details" on the right.

+ +

You should now see each plugin's details including the file path.

+ +

If you open the folder up and copy any relevant looking files to Google Chrome Portable\App\Chrome-bin\plugins (you'll have to create the plugins folder) it should work if the plugin supports being used this way.

+ +

You can open about:plugins in Google Chrome Portable to verify which plugins are being loaded and used. Again be sure to test the plugin on a computer without that plugin installed locally!

+ +

Removing unneeded components

+ +

NOTE: This section is out of date. Be sure to keep backups in case your removals break something you want. Test thoroughly.

+ +

Chrome ships with a few features that can be safely removed:

+ +

To remove languages, open the App\Chrome-bin\<version number>\Locales directory, and remove any language file you do not need. en-US.dll is US English and may be the only one you want.

+ +

To remove DOM Inspector, remove the App\Chrome-bin\<version number>\Resources\Inspector directory. DOM Inspector will still be available within Chrome as an option but will not function (the popup window will have an error message).

+ +

To remove packaged Web Apps (GMail, Calendar, Docs) remove the appropriate directories from App\Chrome-bin\<version number>\Resources. Probably not worth it since they're mostly just a few icons.

+ +

In addition if you installed a custom Chrome version by hand keep in mind that the App\Chrome-bin\<version number>\Installer directory is not needed and should be removed. Normal Chrome only seems to keep it around for uninstallation purposes.

+ +

You can also experiment with removing App\Chrome-bin\<version number>\gears.dll to remove Google Gears support but I don't know if that will work or not. :) Same with gcswf32.dll and pdf.dll for the internal flash and PDF plugins.

+ +

wow_helper.exe is used for 64-bit support for the sandbox and if you don't intend to run on 64-bit you don't need it. It is not installed on 32-bit machines by the Chrome installer. There are also nacl64.* files which are probably 64-bit Native Client plugin stuff.

+ +

Enabling Chrome's First Run dialog

+ +

You can trigger the first run dialog in Google Chrome to import bookmarks from the local machine by deleting App\Chrome-bin\First Run and then running Google Chrome Portable. Note that it works even if you have a profile, but I don't know if it'll preserve or wipe out your bookmarks when it imports, so be careful!

+ +

Compressing with UPX

+ +

Though PAF has allowed the installer for Google Chrome Portable to be simplified, a downside is that UPX cannot be used to automatically compress the downloaded Chrome files. You can compress some of them by hand if you wish.

+ +

Do not compress the following files:

+ +
    +
  • avcodec*.dll - Random crashes with <video>/<audio>. UPX detects errors when you try to decompress.
  • +
  • chrome.exe - Tabs no longer show content.
  • +
  • chrome.dll - Not supported by UPX.
  • +
  • wow_helper.exe, nacl64.dll, nacl64.exe - 64-bit binaries not supported by UPX.
  • +
  • Locale DLLs - Chrome starts up with no text, pops up a blank dialog, and crashes.
  • +
+ +

The following files CAN be compressed without breaking Chrome:

+ +
    +
  • avformat*.dll
  • +
  • avutil*.dll
  • +
  • chrome_launcher.exe
  • +
  • d3dcompiler*.dll
  • +
  • d3dx9*.dll
  • +
  • gcswf32.dll
  • +
  • gears.dll
  • +
  • icudt*.dll
  • +
  • libegl.dll
  • +
  • libglesv2.dll
  • +
  • npchrome_frame.dll (Compacts in Chrome 6, not in Chrome 7)
  • +
  • pdf.dll
  • +
+ +

New versions of Chrome may add more binaries, be sure to test Chrome thoroughly if you compress any of them.

+ +

Copying a local profile

+ +

Press Win+R to open the Run dialog. On XP and below type:

+ +
%USERPROFILE%\Local Settings\Application Data\Google\Chrome\User Data
+ +

On Vista and above you type:

+ +
%LOCALAPPDATA%\Google\Chrome\User Data
+ +

This is your profile dir and should be copied to Data\profile. If you did it right you will end up with a Default directory and a Local State file in Data\profile. You may also have a few more files and folders depending on your profile settings.

+ +

You should exempt Default\Cache and Default\Media Cache from the copy. You may also want to trim your profile down a bit regularly, in particular the History Index files can get large. You should use the in-Chrome options for purging old data, or if you know how, vaccuum the SQLLite databases in your profile. Note that removing the Thumbnails file may seem like a good idea but then your icons on your bookmarks will be gone.

+ +

You can further reduce the profile size by disabling malware and phishing protection in Chrome and then removing the Safe Browsing files from the profile.

+ +

In the end it may be prudent to simply export your bookmarks from Chrome and then re-import them in a fresh profile to keep file sizes down.

+ +

Cleaning up in case of a launcher crash

+ +

If the GoogleChromePortable process does not exit normally, it will leave some bits and pieces that need to be cleaned up, as most portable launchers will:

+ +
    +
  1. HKEY_CURRENT_USER\Software\Google\Update\Clients\{8A69D345-D564-463c-AFF1-A69D9E530F96}\pv will be set to the Portable Chrome version. If the local Chrome is a different version this value will need to be adjusted to match. If there is no local Chrome the entire key should be deleted.
  2. +
  3. HKEY_CURRENT_USER\Software\Google\Update\Clients\{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}\pv will be set to the Portable Chrome version. If the local Chrome CANARY is a different version this value will need to be adjusted to match. If there is no local Chrome CANARY the entire key should be deleted.
  4. +
  5. HKEY_CURRENT_USER\Software\Google\Update\ClientState\{8A69D345-D564-463c-AFF1-A69D9E530F96} should be deleted if Chrome is not installed locally.
  6. +
  7. HKEY_CURRENT_USER\Software\Google\Update\ClientState\{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20} should be deleted if Chrome CANARY is not installed locally.
  8. +
  9. HKEY_CURRENT_USER\Software\Google\Rlz should be deleted.
  10. +
  11. If there is no local Chrome HKEY_CLASSES_ROOT\Applications\chrome.exe, HKEY_CLASSES_ROOT\.htm\OpenWithList\chrome.exe, and HKEY_CLASSES_ROOT\.html\OpenWithList\chrome.exe should all be deleted. Otherwise HKEY_CLASSES_ROOT\Applications\chrome.exe\shell\open\command should be set to the location of the local chrome using the following templates. +

    For XP:

    + +
    "C:\Documents and Settings\<Username>\Local Settings\Application Data\Google\Chrome\Application\chrome.exe" -- "%1"
    + +

    Vista and 7:

    + +
    "C:\Users\<Username>\AppData\Local\Google\Chrome\Application\chrome.exe" -- "%1"
    + +

    Chrome overwrites this value with it's own location when run portably so the launcher will restore it on close.

    +
  12. + +
  13. Make sure there is no Data\settings\GoogleChromePortableShuttingDown and delete it if it exists.
  14. +
  15. %TEMP%\GoogleChromePortable\profile should be copied back to Data\profile to avoid losing any profile data changed last session, if copying the profile locally was on. %TEMP%\GoogleChromePortable\profile\Default\Cache should be excluded if it exists.
  16. +
  17. %TEMP%\GoogleChromePortable\rlz.reg should be merged into the registry if it exists.
  18. +
  19. %TEMP%\GoogleChromePortable should be deleted.
  20. + +
+ +

Command line options

+ +

Google Chrome has some experimental features which require command line parameters to activate. Some others are for diagnostic purposes. You can enable these by copying GoogleChromePortable\Other\Source\GoogleChromePortable.ini to GoogleChromePortable\ and adding the parameters to the AdditionalParameters field. For example:

+ +
[GoogleChromePortable]
+AdditionalParameters=--disable-extensions --enable-webgl
+ +

This disables extension support in Chrome and enables experimental WebGL support.

+ +
+ + + \ No newline at end of file diff --git a/README.md b/README.md index 4166cff..1b6d610 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,24 @@ -# interaactionBoxOS-AFSR +# Google Chrome Portable -Lien vers la dernière release: -https://github.com/AFSR/interaactionBoxOS-AFSR/releases/tag/0.0.1 +Un google chrome portable personnalisé et adapté a nos logiciels. +Version actuellement utilisé -> 104.0.5112.81 + +Si on change de version, pour pouvoir envoie le tout en ligne sur git il faut : +* Aller dans GoogleChromePortable/App/Chrome-bin/104.0.5112.81 (Peut changer selon la version de votre Google Chrome Portable) +* Compresser le fichier chrome.dll sous le nom "chromeDll.zip" +* Et supprimer le fichier chrome.dll +* Ensuite compresser le dossier "Data" sous le nom "Data.zip", celui-ci se trouve dans le dossier "GoogleChromePortable" +* Pour finir supprimer le dossier "Data" + +On fait cela car git n'accepte pas l'envoie de fichier supérieur à 100mo !
+Et aussi, la génération d'un exe via innosetup plnate du à un trop grand nombre de fichier. + +# Python + +Utilisé pour l'ouverture des ports des applications angular en local. +Version actuellement utilisé -> 3.10 + +# Wget + +GNU Wget pour windows, utilitaire de ligne de commande pour récupérer des fichiers à l'aide des protocoles HTTP, HTTPS et FTP. +Version actuellement utilisé -> 1.21.3 \ No newline at end of file diff --git a/bin/interaactionBoxOS-windows.bat b/bin/interaactionBoxOS-windows.bat new file mode 100644 index 0000000..2d08319 --- /dev/null +++ b/bin/interaactionBoxOS-windows.bat @@ -0,0 +1,8 @@ +@echo on + +SET JAVA_HOME=..\lib\jre +SET PATH=%JAVA_HOME%\bin;%PATH%;%LocalAppData%\TobiiStreamEngineForJava\lib\tobii\x64 + +java -cp "..\lib\*" -Xms256m -Xmx1g -Dlogging.appender.console.level=OFF main.Main %* + +pause diff --git a/build.gradle b/build.gradle index f0cd329..36137be 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,8 @@ plugins { id 'org.openjfx.javafxplugin' version '0.0.8' id 'io.freefair.lombok' version '4.1.4' id 'com.github.spotbugs' version '2.0.0' + id 'net.researchgate.release' version '2.6.0' + id 'com.github.hierynomus.license-report' version '0.15.0' } ext.javafxVersion = "11.0.2" @@ -41,6 +43,7 @@ apply plugin: 'distribution' apply from: "${rootDir}/gradle/package.gradle" apply from: "${rootDir}/gradle/jre.gradle" apply from: "${rootDir}/gradle/drivers.gradle" +apply from: "${rootDir}/gradle/installer.gradle" sourceSets { main { @@ -58,6 +61,8 @@ spotbugs { //reportLevel = "high" } +mainClassName = 'main.Main' + jar { manifest { attributes 'Main-Class': 'main.Main' @@ -113,12 +118,33 @@ distributions { contents { with distributions.main.contents from("build/reports") - from("build/bin/interaactionBoxOS-windows.bat") { + from("bin/interaactionBoxOS-windows.bat") { into 'bin' } + from("scriptsWindows") { + into 'lib/scriptsWindows' + } from("build/jre/windows-x64") { into 'lib/jre' } + from("python") { + into 'lib/python' + } + from("wget") { + into 'lib/wget' + } + from("GoogleChromePortable/App") { + into 'lib/google/App' + } + from("GoogleChromePortable/Other") { + into 'lib/google/Other' + } + from("GoogleChromePortable/GoogleChromePortable.exe") { + into 'lib/google/' + } + from("GoogleChromePortable/Data.zip") { + into 'lib/google/' + } } } @@ -126,7 +152,7 @@ distributions { contents { with distributions.main.contents from("build/reports") - from("bin") { + from("bin/interaactionBoxOS-linux.sh") { into 'bin' } from("build/jre/linux-x64") { @@ -145,6 +171,16 @@ distributions { } } +tasks.jar.dependsOn('createLicence') + +task createLicence(dependsOn: ['processResources'], type: Copy, group: 'license') { + from("${rootDir}/gradle/templates/licence.txt") + expand([ + "date" : new Date().format('yyyy-MM-dd') + ]) + into("${processResources.destinationDir}/data/common") +} + task('downloadAndExtractLinuxDependecies').dependsOn('downloadAndExtractLinuxJREwithLibavPlugin', 'downloadAndExtractTobiiDriversForLinux') windowsDistZip.dependsOn(downloadAndExtractWindowsJRE) @@ -164,9 +200,7 @@ tasks.withType(Tar){ archiveExtension.set('tar.gz') } -distZip { - duplicatesStrategy = 'exclude' -} - defaultTasks 'clean', 'build' startScripts.enabled = false + +afterReleaseBuild.dependsOn generateWindowsInstallerInDocker \ No newline at end of file diff --git a/gradle/innosetup/interface.bmp b/gradle/innosetup/interface.bmp new file mode 100644 index 0000000..34f66c7 Binary files /dev/null and b/gradle/innosetup/interface.bmp differ diff --git a/gradle/innosetup/interface.ico b/gradle/innosetup/interface.ico new file mode 100644 index 0000000..6f38d2d Binary files /dev/null and b/gradle/innosetup/interface.ico differ diff --git a/gradle/innosetup/setup.iss.skel b/gradle/innosetup/setup.iss.skel new file mode 100644 index 0000000..3b58ab9 --- /dev/null +++ b/gradle/innosetup/setup.iss.skel @@ -0,0 +1,99 @@ +; InteraactionBoxInterface Inno Setup Skeleton Script +; +; PLEASE NOTE: +; +; 1. This script is a SKELETON and is meant to be parsed by the Gradle +; task "innosetup" before handing it to the Inno Setup compiler (ISCC) +; +; 2. All VARIABLES with a dollar sign and curly brackets are replaced +; by Gradle, e.g. "applicationVersion" below +; +; 3. The script is COPIED to build/innosetup before its run, +; so all relative paths refer to this path! +; +; 4. All BACKSLASHES must be escaped +; + +[Setup] +AppId=InterAACtionBoxAFSR +AppName=InterAACtionBoxAFSR +AppVersion=${applicationVersion} +AppVerName=InterAACtionBoxAFSR ${applicationVersion} +AppPublisher=Univ. Grenoble Alpes - LIG - GETALP +AppPublisherURL=https://github.com/InteraactionGroup/InterAACtionBox_Interface +AppSupportURL=https://github.com/InteraactionGroup/InterAACtionBox_Interface/issues +AppUpdatesURL=https://github.com/InteraactionGroup/InterAACtionBox_Interface/releases + +SetupIconFile=interface.ico +WizardStyle=modern +WizardImageFile=interface.bmp +WizardSmallImageFile=interface.bmp + +DefaultDirName={commonpf}\\InterAACtionBoxAFSR +DefaultGroupName=InterAACtionBoxAFSR +LicenseFile=licence.txt + +OutputDir=..\\distributions +OutputBaseFilename=InterAACtionBoxAFSR-windows-x64-installer +;Compression=lzma +SolidCompression=yes + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}" + +[Files] +Source: "interface.ico"; DestDir: "{app}\\bin"; Flags: ignoreversion +Source: "..\\${unpackedDirectory}\\bin\\*"; DestDir: "{app}\\bin"; Flags: ignoreversion +Source: "..\\${unpackedDirectory}\\lib\\*"; DestDir: "{app}\\lib"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "licence.txt"; DestDir: "{app}\\license"; Flags: ignoreversion recursesubdirs createallsubdirs +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\\InterAACtionBoxAFSR"; Filename: "{app}\\bin\\interaactionBoxOS-windows.bat"; IconFilename: "{app}\\bin\\interface.ico"; Flags: runminimized +Name: "{group}\\Uninstall InterAACtionBoxAFSR"; Filename: "{uninstallexe}"; IconFilename: "{app}\\bin\\gazeicon.ico" +Name: "{commondesktop}\\InterAACtionBoxAFSR"; Filename: "{app}\\bin\\interaactionBoxOS-windows.bat"; Tasks: desktopicon; IconFilename: "{app}\\bin\\interface.ico" + +[Run] +Filename: "{app}\\bin\\interaactionBoxOS-windows.bat"; Description: "{cm:LaunchProgram,InterAACtionBoxAFSR}"; Flags: shellexec postinstall skipifsilent + +[Code] +function GetUninstallString: string; +var + sUnInstPath: string; + sUnInstallString: String; +begin + Result := ''; + sUnInstPath := ExpandConstant('Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\InterAACtionBoxAFSR_is1'); { Your App GUID/ID } + sUnInstallString := ''; + if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then + RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString); + Result := sUnInstallString; +end; + +function IsUpgrade: Boolean; +begin + Result := (GetUninstallString() <> ''); +end; + +function InitializeSetup: Boolean; +var + V: Integer; + iResultCode: Integer; + sUnInstallString: string; +begin + Result := True; { in case when no previous version is found } + if RegValueExists(HKEY_LOCAL_MACHINE,'Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\InterAACtionBoxAFSR_is1', 'UninstallString') then { Your App GUID/ID } + begin + V := MsgBox(ExpandConstant('An older version of InterAACtionBoxAFSR was detected. Do you want to uninstall it?'), mbInformation, MB_YESNO); { Custom Message if App installed } + if V = IDYES then + begin + sUnInstallString := GetUninstallString(); + sUnInstallString := RemoveQuotes(sUnInstallString); + Exec(ExpandConstant(sUnInstallString), '', '', SW_SHOW, ewWaitUntilTerminated, iResultCode); + Result := True; { if you want to proceed after uninstall } + { Exit; //if you want to quit after uninstall } + end + else + Result := False; { when older version present and not uninstalled } + end; +end; \ No newline at end of file diff --git a/gradle/installer.gradle b/gradle/installer.gradle new file mode 100644 index 0000000..a076603 --- /dev/null +++ b/gradle/installer.gradle @@ -0,0 +1,66 @@ +task generateWindowsInstaller(dependsOn: ['unzipDistribution', 'prepareInnoSetupFiles'], group: 'distribution') { + doLast { + + def innoSetupDir = new File("${buildDir}/innosetup") + + // I'm leaving this line in so we can quickly sign installers if/when we decide to do so. + // def signtool = "/SStandard=\"C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.18362.0\\x64\\signtool.exe sign /a /n \$qGazePlay\$q /tr http://timestamp.comodoca.com/ /d \$qGazePlay\$q \$f\"" + + exec { + commandLine "C:\\Program Files (x86)\\Inno Setup 6\\ISCC.exe", "${innoSetupDir}\\setup.iss" + } + + } +} + +task generateWindowsInstallerInDocker(dependsOn: ['unzipDistribution', 'prepareInnoSetupFiles'], group: 'distribution') { + doLast { + exec { + workingDir rootDir + commandLine "docker", "run", "--rm", "-i", "-v", "${buildDir}:/work", "amake/innosetup", "innosetup/setup.iss" + } + } +} + +task prepareInnoSetupFiles(group: 'distribution') { + doLast { + def innoSetupDir = new File("${buildDir}/innosetup") + + innoSetupDir.mkdir() + + copy { + from("${rootDir}/gradle/innosetup/setup.iss.skel") + rename("setup.iss.skel", "setup.iss") + expand([ + applicationVersion: "latest", + unpackedDirectory : "${project.name}-windows" + ]) + into(innoSetupDir) + } + + copy { + from("${rootDir}/gradle/templates/licence.txt") + expand([ + "date" : new Date().format('yyyy-MM-dd') + ]) + into(innoSetupDir) + } + + copy { + from("${rootDir}/gradle/innosetup/interface.ico") + into(innoSetupDir) + } + + copy { + from("${rootDir}/gradle/innosetup/interface.bmp") + into(innoSetupDir) + } + } +} + +task unzipDistribution(dependsOn: ['packageApp'], type: Copy, group: 'distribution') { + from zipTree("${buildDir}/distributions/${project.name}-windows.zip") + into buildDir + fileMode 0777 + dirMode 0777 +} \ No newline at end of file diff --git a/gradle/templates/licence.txt b/gradle/templates/licence.txt new file mode 100644 index 0000000..240b65c --- /dev/null +++ b/gradle/templates/licence.txt @@ -0,0 +1,634 @@ +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . + +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming LANGUAGE, one that +is widely used among developers working in that LANGUAGE. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/python/LICENSE.txt b/python/LICENSE.txt new file mode 100644 index 0000000..b63fce2 --- /dev/null +++ b/python/LICENSE.txt @@ -0,0 +1,650 @@ +A. HISTORY OF THE SOFTWARE +========================== + +Python was created in the early 1990s by Guido van Rossum at Stichting +Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands +as a successor of a language called ABC. Guido remains Python's +principal author, although it includes many contributions from others. + +In 1995, Guido continued his work on Python at the Corporation for +National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) +in Reston, Virginia where he released several versions of the +software. + +In May 2000, Guido and the Python core development team moved to +BeOpen.com to form the BeOpen PythonLabs team. In October of the same +year, the PythonLabs team moved to Digital Creations, which became +Zope Corporation. In 2001, the Python Software Foundation (PSF, see +https://www.python.org/psf/) was formed, a non-profit organization +created specifically to own Python-related Intellectual Property. +Zope Corporation was a sponsoring member of the PSF. + +All Python releases are Open Source (see http://www.opensource.org for +the Open Source Definition). Historically, most, but not all, Python +releases have also been GPL-compatible; the table below summarizes +the various releases. + + Release Derived Year Owner GPL- + from compatible? (1) + + 0.9.0 thru 1.2 1991-1995 CWI yes + 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes + 1.6 1.5.2 2000 CNRI no + 2.0 1.6 2000 BeOpen.com no + 1.6.1 1.6 2001 CNRI yes (2) + 2.1 2.0+1.6.1 2001 PSF no + 2.0.1 2.0+1.6.1 2001 PSF yes + 2.1.1 2.1+2.0.1 2001 PSF yes + 2.1.2 2.1.1 2002 PSF yes + 2.1.3 2.1.2 2002 PSF yes + 2.2 and above 2.1.1 2001-now PSF yes + +Footnotes: + +(1) GPL-compatible doesn't mean that we're distributing Python under + the GPL. All Python licenses, unlike the GPL, let you distribute + a modified version without making your changes open source. The + GPL-compatible licenses make it possible to combine Python with + other software that is released under the GPL; the others don't. + +(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, + because its license has a choice of law clause. According to + CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 + is "not incompatible" with the GPL. + +Thanks to the many outside volunteers who have worked under Guido's +direction to make these releases possible. + + +B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON +=============================================================== + +Python software and documentation are licensed under the +Python Software Foundation License Version 2. + +Starting with Python 3.8.6, examples, recipes, and other code in +the documentation are dual licensed under the PSF License Version 2 +and the Zero-Clause BSD license. + +Some software incorporated into Python is under different licenses. +The licenses are listed with code falling under that license. + + +PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 +-------------------------------------------- + +1. This LICENSE AGREEMENT is between the Python Software Foundation +("PSF"), and the Individual or Organization ("Licensee") accessing and +otherwise using this software ("Python") in source or binary form and +its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF hereby +grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, +analyze, test, perform and/or display publicly, prepare derivative works, +distribute, and otherwise use Python alone or in any derivative version, +provided, however, that PSF's License Agreement and PSF's notice of copyright, +i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Python Software Foundation; +All Rights Reserved" are retained in Python alone or in any derivative version +prepared by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python. + +4. PSF is making Python available to Licensee on an "AS IS" +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 +------------------------------------------- + +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 + +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an +office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the +Individual or Organization ("Licensee") accessing and otherwise using +this software in source or binary form and its associated +documentation ("the Software"). + +2. Subject to the terms and conditions of this BeOpen Python License +Agreement, BeOpen hereby grants Licensee a non-exclusive, +royalty-free, world-wide license to reproduce, analyze, test, perform +and/or display publicly, prepare derivative works, distribute, and +otherwise use the Software alone or in any derivative version, +provided, however, that the BeOpen Python License is retained in the +Software, alone or in any derivative version prepared by Licensee. + +3. BeOpen is making the Software available to Licensee on an "AS IS" +basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY +DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +5. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +6. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of California, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed to +create any relationship of agency, partnership, or joint venture +between BeOpen and Licensee. This License Agreement does not grant +permission to use BeOpen trademarks or trade names in a trademark +sense to endorse or promote products or services of Licensee, or any +third party. As an exception, the "BeOpen Python" logos available at +http://www.pythonlabs.com/logos.html may be used according to the +permissions granted on that web page. + +7. By copying, installing or otherwise using the software, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 +--------------------------------------- + +1. This LICENSE AGREEMENT is between the Corporation for National +Research Initiatives, having an office at 1895 Preston White Drive, +Reston, VA 20191 ("CNRI"), and the Individual or Organization +("Licensee") accessing and otherwise using Python 1.6.1 software in +source or binary form and its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, CNRI +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 1.6.1 +alone or in any derivative version, provided, however, that CNRI's +License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) +1995-2001 Corporation for National Research Initiatives; All Rights +Reserved" are retained in Python 1.6.1 alone or in any derivative +version prepared by Licensee. Alternately, in lieu of CNRI's License +Agreement, Licensee may substitute the following text (omitting the +quotes): "Python 1.6.1 is made available subject to the terms and +conditions in CNRI's License Agreement. This Agreement together with +Python 1.6.1 may be located on the internet using the following +unique, persistent identifier (known as a handle): 1895.22/1013. This +Agreement may also be obtained from a proxy server on the internet +using the following URL: http://hdl.handle.net/1895.22/1013". + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 1.6.1 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python 1.6.1. + +4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" +basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. This License Agreement shall be governed by the federal +intellectual property law of the United States, including without +limitation the federal copyright law, and, to the extent such +U.S. federal law does not apply, by the law of the Commonwealth of +Virginia, excluding Virginia's conflict of law provisions. +Notwithstanding the foregoing, with regard to derivative works based +on Python 1.6.1 that incorporate non-separable material that was +previously distributed under the GNU General Public License (GPL), the +law of the Commonwealth of Virginia shall govern this License +Agreement only as to issues arising under or with respect to +Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this +License Agreement shall be deemed to create any relationship of +agency, partnership, or joint venture between CNRI and Licensee. This +License Agreement does not grant permission to use CNRI trademarks or +trade name in a trademark sense to endorse or promote products or +services of Licensee, or any third party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, +installing or otherwise using Python 1.6.1, Licensee agrees to be +bound by the terms and conditions of this License Agreement. + + ACCEPT + + +CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 +-------------------------------------------------- + +Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, +The Netherlands. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Stichting Mathematisch +Centrum or CWI not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION +---------------------------------------------------------------------- + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + + +Additional Conditions for this Windows binary build +--------------------------------------------------- + +This program is linked with and uses Microsoft Distributable Code, +copyrighted by Microsoft Corporation. The Microsoft Distributable Code +is embedded in each .exe, .dll and .pyd file as a result of running +the code through a linker. + +If you further distribute programs that include the Microsoft +Distributable Code, you must comply with the restrictions on +distribution specified by Microsoft. In particular, you must require +distributors and external end users to agree to terms that protect the +Microsoft Distributable Code at least as much as Microsoft's own +requirements for the Distributable Code. See Microsoft's documentation +(included in its developer tools and on its website at microsoft.com) +for specific details. + +Redistribution of the Windows binary build of the Python interpreter +complies with this agreement, provided that you do not: + +- alter any copyright, trademark or patent notice in Microsoft's +Distributable Code; + +- use Microsoft's trademarks in your programs' names or in a way that +suggests your programs come from or are endorsed by Microsoft; + +- distribute Microsoft's Distributable Code to run on a platform other +than Microsoft operating systems, run-time technologies or application +platforms; or + +- include Microsoft Distributable Code in malicious, deceptive or +unlawful programs. + +These restrictions apply only to the Microsoft Distributable Code as +defined above, not to Python itself or any programs running on the +Python interpreter. The redistribution of the Python interpreter and +libraries is governed by the Python Software License included with this +file, or by other licenses as marked. + + + +-------------------------------------------------------------------------- + +This program, "bzip2", the associated library "libbzip2", and all +documentation, are copyright (C) 1996-2019 Julian R Seward. All +rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + +3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + +4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Julian Seward, jseward@acm.org +bzip2/libbzip2 version 1.0.8 of 13 July 2019 + +-------------------------------------------------------------------------- + + + LICENSE ISSUES + ============== + + The OpenSSL toolkit stays under a double license, i.e. both the conditions of + the OpenSSL License and the original SSLeay license apply to the toolkit. + See below for the actual license texts. + + OpenSSL License + --------------- + +/* ==================================================================== + * Copyright (c) 1998-2019 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * openssl-core@openssl.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.openssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + + Original SSLeay License + ----------------------- + +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) + * All rights reserved. + * + * This package is an SSL implementation written + * by Eric Young (eay@cryptsoft.com). + * The implementation was written so as to conform with Netscapes SSL. + * + * This library is free for commercial and non-commercial use as long as + * the following conditions are aheared to. The following conditions + * apply to all code found in this distribution, be it the RC4, RSA, + * lhash, DES, etc., code; not just the SSL code. The SSL documentation + * included with this distribution is covered by the same copyright terms + * except that the holder is Tim Hudson (tjh@cryptsoft.com). + * + * Copyright remains Eric Young's, and as such any Copyright notices in + * the code are not to be removed. + * If this package is used in a product, Eric Young should be given attribution + * as the author of the parts of the library used. + * This can be in the form of a textual message at program startup or + * in documentation (online or textual) provided with the package. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay@cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + + +libffi - Copyright (c) 1996-2014 Anthony Green, Red Hat, Inc and others. +See source files for details. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +``Software''), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +This software is copyrighted by the Regents of the University of +California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState +Corporation and other parties. The following terms apply to all files +associated with the software unless explicitly disclaimed in +individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + +GOVERNMENT USE: If you are acquiring this software on behalf of the +U.S. government, the Government shall have only "Restricted Rights" +in the software and related documentation as defined in the Federal +Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you +are acquiring the software on behalf of the Department of Defense, the +software shall be classified as "Commercial Computer Software" and the +Government shall have only "Restricted Rights" as defined in Clause +252.227-7014 (b) (3) of DFARs. Notwithstanding the foregoing, the +authors grant the U.S. Government and others acting in its behalf +permission to use and distribute the software in accordance with the +terms specified in this license. + +This software is copyrighted by the Regents of the University of +California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState +Corporation, Apple Inc. and other parties. The following terms apply to +all files associated with the software unless explicitly disclaimed in +individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + +GOVERNMENT USE: If you are acquiring this software on behalf of the +U.S. government, the Government shall have only "Restricted Rights" +in the software and related documentation as defined in the Federal +Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you +are acquiring the software on behalf of the Department of Defense, the +software shall be classified as "Commercial Computer Software" and the +Government shall have only "Restricted Rights" as defined in Clause +252.227-7013 (b) (3) of DFARs. Notwithstanding the foregoing, the +authors grant the U.S. Government and others acting in its behalf +permission to use and distribute the software in accordance with the +terms specified in this license. + +Copyright (c) 1993-1999 Ioi Kim Lam. +Copyright (c) 2000-2001 Tix Project Group. +Copyright (c) 2004 ActiveState + +This software is copyrighted by the above entities +and other parties. The following terms apply to all files associated +with the software unless explicitly disclaimed in individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + +GOVERNMENT USE: If you are acquiring this software on behalf of the +U.S. government, the Government shall have only "Restricted Rights" +in the software and related documentation as defined in the Federal +Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you +are acquiring the software on behalf of the Department of Defense, the +software shall be classified as "Commercial Computer Software" and the +Government shall have only "Restricted Rights" as defined in Clause +252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the +authors grant the U.S. Government and others acting in its behalf +permission to use and distribute the software in accordance with the +terms specified in this license. + +---------------------------------------------------------------------- + +Parts of this software are based on the Tcl/Tk software copyrighted by +the Regents of the University of California, Sun Microsystems, Inc., +and other parties. The original license terms of the Tcl/Tk software +distribution is included in the file docs/license.tcltk. + +Parts of this software are based on the HTML Library software +copyrighted by Sun Microsystems, Inc. The original license terms of +the HTML Library software distribution is included in the file +docs/license.html_lib. + diff --git a/python/_asyncio.pyd b/python/_asyncio.pyd new file mode 100644 index 0000000..575ecb9 Binary files /dev/null and b/python/_asyncio.pyd differ diff --git a/python/_bz2.pyd b/python/_bz2.pyd new file mode 100644 index 0000000..4b69a20 Binary files /dev/null and b/python/_bz2.pyd differ diff --git a/python/_ctypes.pyd b/python/_ctypes.pyd new file mode 100644 index 0000000..eed69bb Binary files /dev/null and b/python/_ctypes.pyd differ diff --git a/python/_decimal.pyd b/python/_decimal.pyd new file mode 100644 index 0000000..cc31be7 Binary files /dev/null and b/python/_decimal.pyd differ diff --git a/python/_elementtree.pyd b/python/_elementtree.pyd new file mode 100644 index 0000000..5bdf291 Binary files /dev/null and b/python/_elementtree.pyd differ diff --git a/python/_hashlib.pyd b/python/_hashlib.pyd new file mode 100644 index 0000000..255c95e Binary files /dev/null and b/python/_hashlib.pyd differ diff --git a/python/_lzma.pyd b/python/_lzma.pyd new file mode 100644 index 0000000..f18c7d8 Binary files /dev/null and b/python/_lzma.pyd differ diff --git a/python/_msi.pyd b/python/_msi.pyd new file mode 100644 index 0000000..8ae64ca Binary files /dev/null and b/python/_msi.pyd differ diff --git a/python/_multiprocessing.pyd b/python/_multiprocessing.pyd new file mode 100644 index 0000000..0d8a303 Binary files /dev/null and b/python/_multiprocessing.pyd differ diff --git a/python/_overlapped.pyd b/python/_overlapped.pyd new file mode 100644 index 0000000..8f216d3 Binary files /dev/null and b/python/_overlapped.pyd differ diff --git a/python/_queue.pyd b/python/_queue.pyd new file mode 100644 index 0000000..f810aa1 Binary files /dev/null and b/python/_queue.pyd differ diff --git a/python/_socket.pyd b/python/_socket.pyd new file mode 100644 index 0000000..c0edced Binary files /dev/null and b/python/_socket.pyd differ diff --git a/python/_sqlite3.pyd b/python/_sqlite3.pyd new file mode 100644 index 0000000..14a6023 Binary files /dev/null and b/python/_sqlite3.pyd differ diff --git a/python/_ssl.pyd b/python/_ssl.pyd new file mode 100644 index 0000000..ba3a34e Binary files /dev/null and b/python/_ssl.pyd differ diff --git a/python/_uuid.pyd b/python/_uuid.pyd new file mode 100644 index 0000000..dc47fc0 Binary files /dev/null and b/python/_uuid.pyd differ diff --git a/python/_zoneinfo.pyd b/python/_zoneinfo.pyd new file mode 100644 index 0000000..720b592 Binary files /dev/null and b/python/_zoneinfo.pyd differ diff --git a/python/libcrypto-1_1.dll b/python/libcrypto-1_1.dll new file mode 100644 index 0000000..41e1a67 Binary files /dev/null and b/python/libcrypto-1_1.dll differ diff --git a/python/libffi-7.dll b/python/libffi-7.dll new file mode 100644 index 0000000..8fd2e5e Binary files /dev/null and b/python/libffi-7.dll differ diff --git a/python/libssl-1_1.dll b/python/libssl-1_1.dll new file mode 100644 index 0000000..15fe3cd Binary files /dev/null and b/python/libssl-1_1.dll differ diff --git a/python/pyexpat.pyd b/python/pyexpat.pyd new file mode 100644 index 0000000..23ceae9 Binary files /dev/null and b/python/pyexpat.pyd differ diff --git a/python/python.cat b/python/python.cat new file mode 100644 index 0000000..6e207e4 Binary files /dev/null and b/python/python.cat differ diff --git a/python/python.exe b/python/python.exe new file mode 100644 index 0000000..aaa84c9 Binary files /dev/null and b/python/python.exe differ diff --git a/python/python3.dll b/python/python3.dll new file mode 100644 index 0000000..f7157b9 Binary files /dev/null and b/python/python3.dll differ diff --git a/python/python310._pth b/python/python310._pth new file mode 100644 index 0000000..5908e77 --- /dev/null +++ b/python/python310._pth @@ -0,0 +1,5 @@ +python310.zip +. + +# Uncomment to run site.main() automatically +#import site diff --git a/python/python310.dll b/python/python310.dll new file mode 100644 index 0000000..aae3f08 Binary files /dev/null and b/python/python310.dll differ diff --git a/python/python310.zip b/python/python310.zip new file mode 100644 index 0000000..6d760d0 Binary files /dev/null and b/python/python310.zip differ diff --git a/python/pythonw.exe b/python/pythonw.exe new file mode 100644 index 0000000..0a9f9b6 Binary files /dev/null and b/python/pythonw.exe differ diff --git a/python/select.pyd b/python/select.pyd new file mode 100644 index 0000000..5357e6f Binary files /dev/null and b/python/select.pyd differ diff --git a/python/sqlite3.dll b/python/sqlite3.dll new file mode 100644 index 0000000..b317d36 Binary files /dev/null and b/python/sqlite3.dll differ diff --git a/python/unicodedata.pyd b/python/unicodedata.pyd new file mode 100644 index 0000000..9ef759e Binary files /dev/null and b/python/unicodedata.pyd differ diff --git a/python/vcruntime140.dll b/python/vcruntime140.dll new file mode 100644 index 0000000..9cda5ce Binary files /dev/null and b/python/vcruntime140.dll differ diff --git a/python/vcruntime140_1.dll b/python/vcruntime140_1.dll new file mode 100644 index 0000000..49f97fe Binary files /dev/null and b/python/vcruntime140_1.dll differ diff --git a/python/winsound.pyd b/python/winsound.pyd new file mode 100644 index 0000000..db34c70 Binary files /dev/null and b/python/winsound.pyd differ diff --git a/scriptsWindows/augcomDownload.bat b/scriptsWindows/augcomDownload.bat new file mode 100644 index 0000000..3560dbf --- /dev/null +++ b/scriptsWindows/augcomDownload.bat @@ -0,0 +1,6 @@ +cd C:\\Users\\%USERNAME%\\Documents\\InterAACtionBoxAFSR +rmdir /s /q AugCom +C:\"Program Files (x86)"\InterAACtionBoxAFSR\lib\wget\wget.exe -q -c --show-progress https://github.com/AFSR/AugCom-AFSR/releases/latest/download/AugCom.zip +powershell Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('AugCom.zip', '../InterAACtionBoxAFSR') +del AugCom.zip +exit \ No newline at end of file diff --git a/scriptsWindows/augcomServer.bat b/scriptsWindows/augcomServer.bat new file mode 100644 index 0000000..425259a --- /dev/null +++ b/scriptsWindows/augcomServer.bat @@ -0,0 +1,3 @@ +cd C:\Users\%USERNAME%\Documents\InterAACtionBoxAFSR\AugCom +C:\"Program Files (x86)"\InterAACtionBoxAFSR\lib\python\python.exe -m http.server 4200 +exit diff --git a/scriptsWindows/close_chrome.bat b/scriptsWindows/close_chrome.bat new file mode 100644 index 0000000..cc6aade --- /dev/null +++ b/scriptsWindows/close_chrome.bat @@ -0,0 +1,9 @@ +cd C:\\Users\\%USERNAME%\\Downloads +IF EXIST close161918.txt ( + del close161918.txt + taskkill /IM chrome.exe /F + taskkill /IM python.exe /F + cd "C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows" + reset_ports.bat +) +exit \ No newline at end of file diff --git a/scriptsWindows/close_ports.bat b/scriptsWindows/close_ports.bat new file mode 100644 index 0000000..6a83ae5 --- /dev/null +++ b/scriptsWindows/close_ports.bat @@ -0,0 +1,2 @@ +taskkill /IM python.exe /F +exit \ No newline at end of file diff --git a/scriptsWindows/extractGoogleChromePortable.bat b/scriptsWindows/extractGoogleChromePortable.bat new file mode 100644 index 0000000..35c73b8 --- /dev/null +++ b/scriptsWindows/extractGoogleChromePortable.bat @@ -0,0 +1,9 @@ +cd C:\\Users\\%USERNAME%\\Documents\\InterAACtionBoxAFSR\\GoogleChromePortable\\App\\Chrome-bin\\104.0.5112.81 +powershell Add-Type -A 'System.IO.Compression.FileSystem';[IO.Compression.ZipFile]::ExtractToDirectory('chromeDll.zip', '../104.0.5112.81') +del chromeDll.zip + +cd ../../../ +powershell Add-Type -A 'System.IO.Compression.FileSystem';[IO.Compression.ZipFile]::ExtractToDirectory('Data.zip', '../GoogleChromePortable') +del Data.zip + +exit \ No newline at end of file diff --git a/scriptsWindows/gazeDownload.bat b/scriptsWindows/gazeDownload.bat new file mode 100644 index 0000000..66d303b --- /dev/null +++ b/scriptsWindows/gazeDownload.bat @@ -0,0 +1,7 @@ +cd C:\\Users\\%USERNAME%\\Documents\\InterAACtionBoxAFSR +rmdir /s /q interaactionGaze-windows +C:\"Program Files (x86)"\InterAACtionBoxAFSR\lib\wget\wget.exe -q -c --show-progress https://github.com/InteraactionGroup/interaactionGaze/releases/latest/download/interAACtionGaze-windows.zip +powershell Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('interAACtionGaze-windows.zip', '../InterAACtionBoxAFSR') +powershell ren interAACtionGaze-windows interAACtionGaze +del interAACtionGaze-windows.zip +exit \ No newline at end of file diff --git a/scriptsWindows/gazeplayDownload.bat b/scriptsWindows/gazeplayDownload.bat new file mode 100644 index 0000000..c60f7e3 --- /dev/null +++ b/scriptsWindows/gazeplayDownload.bat @@ -0,0 +1,8 @@ +cd C:\\Users\\%USERNAME%\\Documents\\InterAACtionBoxAFSR +rmdir /s /q GazePlay +C:\"Program Files (x86)"\InterAACtionBoxAFSR\lib\wget\wget.exe -q -c --show-progress https://github.com/AFSR/GazePlay-AFSR/releases/latest/download/gazeplay-afsr-windows-x64.zip +powershell Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('gazeplay-afsr-windows-x64.zip', '../InterAACtionBoxAFSR') +del gazeplay-afsr-windows-x64.zip +for /f "delims=" %%a in ('dir /b gazeplay-afsr-*') do set "name=%%a" +ren %name% GazePlay +exit \ No newline at end of file diff --git a/scriptsWindows/launchGazePlay.bat b/scriptsWindows/launchGazePlay.bat new file mode 100644 index 0000000..c61b59b --- /dev/null +++ b/scriptsWindows/launchGazePlay.bat @@ -0,0 +1,3 @@ +cd C:\Users\%USERNAME%\Documents\InterAACtionBoxAFSR\GazePlay\bin +gazeplay-afsr-windows.bat +exit \ No newline at end of file diff --git a/scriptsWindows/playerDownload.bat b/scriptsWindows/playerDownload.bat new file mode 100644 index 0000000..f050266 --- /dev/null +++ b/scriptsWindows/playerDownload.bat @@ -0,0 +1,6 @@ +cd C:\\Users\\%USERNAME%\\Documents\\InterAACtionBoxAFSR +rmdir /s /q InterAACtionPlayer +C:\"Program Files (x86)"\InterAACtionBoxAFSR\lib\wget\wget.exe -q -c --show-progress https://github.com/AFSR/InterAACtionPlayer-AFSR/releases/latest/download/InterAACtionPlayer.zip +powershell Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('InterAACtionPlayer.zip', '../InterAACtionBoxAFSR') +del InterAACtionPlayer.zip +exit \ No newline at end of file diff --git a/scriptsWindows/playerServer.bat b/scriptsWindows/playerServer.bat new file mode 100644 index 0000000..92b93e2 --- /dev/null +++ b/scriptsWindows/playerServer.bat @@ -0,0 +1,3 @@ +cd C:\Users\%USERNAME%\Documents\InterAACtionBoxAFSR\InterAACtionPlayer +C:\"Program Files (x86)"\InterAACtionBoxAFSR\lib\python\python.exe -m http.server 4202 +exit \ No newline at end of file diff --git a/scriptsWindows/reset_ports.bat b/scriptsWindows/reset_ports.bat new file mode 100644 index 0000000..017bcc6 --- /dev/null +++ b/scriptsWindows/reset_ports.bat @@ -0,0 +1,5 @@ +cd C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\ +start /B augcomServer.bat +start /B sceneServer.bat +start /B playerServer.bat +exit \ No newline at end of file diff --git a/scriptsWindows/sceneDownload.bat b/scriptsWindows/sceneDownload.bat new file mode 100644 index 0000000..a25d658 --- /dev/null +++ b/scriptsWindows/sceneDownload.bat @@ -0,0 +1,6 @@ +cd C:\\Users\\%USERNAME%\\Documents\\InterAACtionBoxAFSR +rmdir /s /q InterAACtionScene +C:\"Program Files (x86)"\InterAACtionBoxAFSR\lib\wget\wget.exe -q -c --show-progress https://github.com/AFSR/InterAACtionScene-AFSR/releases/latest/download/InterAACtionScene.zip +powershell Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('InterAACtionScene.zip', '../InterAACtionBoxAFSR') +del InterAACtionScene.zip +exit \ No newline at end of file diff --git a/scriptsWindows/sceneServer.bat b/scriptsWindows/sceneServer.bat new file mode 100644 index 0000000..87604e8 --- /dev/null +++ b/scriptsWindows/sceneServer.bat @@ -0,0 +1,3 @@ +cd C:\Users\%USERNAME%\Documents\InterAACtionBoxAFSR\InterAACtionScene +C:\"Program Files (x86)"\InterAACtionBoxAFSR\lib\python\python.exe -m http.server 4201 +exit \ No newline at end of file diff --git a/src/main/java/main/Configuration.java b/src/main/java/main/Configuration.java index b2904e6..5f7d66f 100644 --- a/src/main/java/main/Configuration.java +++ b/src/main/java/main/Configuration.java @@ -1,19 +1,24 @@ package main; -import javafx.beans.property.BooleanProperty; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import javafx.beans.property.IntegerProperty; import javafx.beans.property.SimpleIntegerProperty; import javafx.geometry.Point2D; import javafx.scene.Scene; import lombok.Getter; import lombok.Setter; +import main.utils.UtilsOS; import java.awt.*; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.LinkedList; +import java.util.Scanner; public class Configuration { - public final static String VERSION = "InterAACtionBox-Interface 1.0.0 Dev v.2021.18.11"; + public static String VERSION = ""; public final static int MOUSE_INTERACTION = 0; public final static int GAZE_INTERACTION = 1; @@ -30,6 +35,21 @@ public class Configuration { public String language = "fra"; public Configuration() { + this.getInterfaceVersion(); + } + + @SuppressFBWarnings + public void getInterfaceVersion(){ + String version = ""; + try{ + File file = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version\\InterAACtionBox_InterfaceVersion.txt"); + Scanner scanner = new Scanner(file, StandardCharsets.UTF_8); + version = scanner.nextLine(); + scanner.close(); + } catch (IOException e) { + System.out.println("No version found !"); + } + VERSION = version; } public boolean isGazeInteraction() { diff --git a/src/main/java/main/Main.java b/src/main/java/main/Main.java index 93ed849..3e3bca5 100644 --- a/src/main/java/main/Main.java +++ b/src/main/java/main/Main.java @@ -1,11 +1,8 @@ package main; import javafx.application.Application; -import javafx.application.Platform; -import javafx.event.EventHandler; import javafx.scene.Scene; -import javafx.scene.input.KeyCode; -import javafx.scene.input.KeyEvent; +import javafx.scene.control.Alert; import javafx.scene.layout.Pane; import javafx.scene.paint.Color; import javafx.scene.shape.Rectangle; @@ -16,8 +13,12 @@ import main.UI.DefaultTranslator; import main.UI.Translator; import main.UI.menu.GraphicalMenus; +import main.utils.Setup; import main.utils.StageUtils; +import main.utils.UtilsOS; import main.utils.multilinguism.Multilinguism; +import java.io.File; +import java.io.IOException; public class Main extends Application { @@ -27,12 +28,17 @@ public class Main extends Application { @Getter private Translator translator; + @Getter + private final Setup setup = new Setup(); + public static void main(String[] args) {instance = getInstance(); launch(args);} @Override public void start(Stage primaryStage) { + this.initWindows(); + primaryStage.initStyle(StageStyle.TRANSPARENT); primaryStage.setTitle("InteraactionBox-AFSR"); primaryStage.setWidth(Screen.getPrimary().getBounds().getWidth()); @@ -50,6 +56,16 @@ public void start(Stage primaryStage) { graphicalMenus.getConfiguration().setScene(scene); primaryStage.setScene(scene); + primaryStage.setOnCloseRequest(e -> { + if (UtilsOS.isWindows()){ + try { + Runtime.getRuntime().exec("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\close_ports.bat"); + System.exit(0); + } catch (IOException ex) { + ex.printStackTrace(); + } + } + }); graphicalMenus.getHomeScreen().showCloseProcessButtonIfProcessNotNull(); StageUtils.displayUnclosable(primaryStage); @@ -59,18 +75,20 @@ public void start(Stage primaryStage) { graphicalMenus.getConfiguration().analyse(e.getScreenX(), e.getScreenY()); } }); + } - scene.addEventHandler(KeyEvent.KEY_PRESSED, new EventHandler - () { - @Override - public void handle(KeyEvent t) { - if (t.getCode() == KeyCode.E) { - Platform.exit(); - } + public void initWindows(){ + if (UtilsOS.isWindows()){ + File appFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR"); + if (!appFolder.exists()){ + Alert alert = new Alert(Alert.AlertType.INFORMATION); + alert.setTitle("Setup Application"); + alert.setHeaderText(null); + alert.setContentText("Completing the installation of InterAACtionBoxAFSR ! \n It may take several minutes."); + alert.showAndWait(); } - }); - Platform.setImplicitExit(false); - + this.setup.setup(); + this.setup.openPorts(); + } } - } diff --git a/src/main/java/main/UI/I18NProgressButton.java b/src/main/java/main/UI/I18NProgressButton.java index b6dedc9..fbaa2a4 100644 --- a/src/main/java/main/UI/I18NProgressButton.java +++ b/src/main/java/main/UI/I18NProgressButton.java @@ -164,10 +164,14 @@ public void assignIndicator(final EventHandler eventHandler) { } public void deactivate(){ - timelineProgressBar.stop(); - indicator.setOpacity(0); - indicator.setProgress(0); - this.button.removeEventFilter(MouseEvent.MOUSE_ENTERED, enterButtonHandler); - this.button.removeEventFilter(MouseEvent.MOUSE_EXITED, exitButtonHandler); + try{ + timelineProgressBar.stop(); + indicator.setOpacity(0); + indicator.setProgress(0); + this.button.removeEventFilter(MouseEvent.MOUSE_ENTERED, enterButtonHandler); + this.button.removeEventFilter(MouseEvent.MOUSE_EXITED, exitButtonHandler); + } catch (Exception e) { + log.info(""); + } } } diff --git a/src/main/java/main/UI/ProgressDoubleClickedButtonI18N.java b/src/main/java/main/UI/ProgressDoubleClickedButtonI18N.java index 5472ec7..abfe5d0 100644 --- a/src/main/java/main/UI/ProgressDoubleClickedButtonI18N.java +++ b/src/main/java/main/UI/ProgressDoubleClickedButtonI18N.java @@ -62,8 +62,11 @@ private void activate() { } public void deactivate(){ - this.button.removeEventFilter(MouseEvent.MOUSE_ENTERED, enterButtonHandler); - this.button.removeEventFilter(MouseEvent.MOUSE_EXITED, exitButtonHandler); + try { + this.button.removeEventFilter(MouseEvent.MOUSE_ENTERED, enterButtonHandler); + this.button.removeEventFilter(MouseEvent.MOUSE_EXITED, exitButtonHandler); + } catch (Exception ignored) { + } } private void enable() { diff --git a/src/main/java/main/UI/menu/ExitMenu.java b/src/main/java/main/UI/menu/ExitMenu.java index 1dbf600..03a3d21 100644 --- a/src/main/java/main/UI/menu/ExitMenu.java +++ b/src/main/java/main/UI/menu/ExitMenu.java @@ -75,10 +75,15 @@ public ExitMenu(GraphicalMenus graphicalMenus, Main main, Configuration configur graphicalMenus.process.destroy(); graphicalMenus.process.set(null); } + try { + Runtime.getRuntime().exec("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\close_ports.bat"); + } catch (IOException ex) { + ex.printStackTrace(); + } Platform.exit(); System.exit(0); }, - "Non, aller vers Ubuntu", + this.getLabelOS(), "images/exit.png", configuration ); @@ -156,4 +161,12 @@ private StackPane createAppI18NButtonLauncher(Translator translator, EventHandle progressButton.start(); return progressButton; } + + private String getLabelOS(){ + if (UtilsOS.isUnix()){ + return "Non, aller vers Ubuntu"; + }else { + return "Non, aller vers Windows"; + } + } } diff --git a/src/main/java/main/UI/menu/HomeScreen.java b/src/main/java/main/UI/menu/HomeScreen.java index ed4a96b..3e7c908 100644 --- a/src/main/java/main/UI/menu/HomeScreen.java +++ b/src/main/java/main/UI/menu/HomeScreen.java @@ -29,15 +29,9 @@ import main.process.*; import main.process.xdotoolProcess.ActivateMainWindowProcess; import main.utils.*; -import tobii.Tobii; import java.awt.*; import java.awt.image.BufferedImage; -import java.io.File; -import java.util.Arrays; -import java.util.Objects; -import java.util.Scanner; -import java.util.concurrent.TimeUnit; @Slf4j public class HomeScreen extends BorderPane { @@ -60,8 +54,6 @@ public HomeScreen(GraphicalMenus graphicalMenus, UpdateManager updateManager, Ma this.getChildren().add(UtilsUI.createBackground(graphicalMenus)); - //String tobiiNotConnected = Arrays.toString(Tobii.gazePosition()); - centerMenu = new VBox(); centerMenu.setAlignment(Pos.TOP_CENTER); @@ -72,7 +64,6 @@ public HomeScreen(GraphicalMenus graphicalMenus, UpdateManager updateManager, Ma goToUpdateMenu = (e) -> { interAACtionGazeNamedProcessCreator.close(); - updateManager.checkUpdates(); graphicalMenus.getConfiguration().scene.setRoot(graphicalMenus.getUpdateMenu()); }; @@ -180,9 +171,13 @@ private StackPane createOptionBar(Button optionButton, Button updateButton, Butt title.setAlignment(Pos.CENTER); titlePane.getChildren().addAll(backgroundForTitle, titleBox); - - titleBox.setLeft(new HBox(optionButton, updateButton)); - titleBox.setRight(new HBox(gazeButton, calibrationButton, exitButton)); + if (UtilsOS.isUnix()){ + titleBox.setLeft(new HBox(optionButton, updateButton)); + titleBox.setRight(new HBox(gazeButton, calibrationButton, exitButton)); + }else { + titleBox.setLeft(new HBox(optionButton, updateButton)); + titleBox.setRight(new HBox(gazeButton, exitButton)); + } BorderPane.setAlignment(titlePane, Pos.CENTER_LEFT); diff --git a/src/main/java/main/UI/menu/OptionsMenu.java b/src/main/java/main/UI/menu/OptionsMenu.java index 1ae770e..56ca6d7 100644 --- a/src/main/java/main/UI/menu/OptionsMenu.java +++ b/src/main/java/main/UI/menu/OptionsMenu.java @@ -15,16 +15,16 @@ import main.process.GnomeControlCenterNamedProcessCreator; import main.process.TeamviewerNamedProcessCreator; import main.utils.StageUtils; +import main.utils.UtilsOS; import main.utils.UtilsUI; -import tobii.Tobii; import java.io.IOException; -import java.util.Objects; @Slf4j public class OptionsMenu extends BorderPane { public String langage = "Francais"; + public int row = 0; public OptionsMenu(GraphicalMenus graphicalMenus, Main main, Configuration configuration) { super(); @@ -42,122 +42,100 @@ public OptionsMenu(GraphicalMenus graphicalMenus, Main main, Configuration confi settings.setHgap(20); settings.setVgap(graphicalMenus.primaryStage.getHeight() / 30); - { - I18NLabel useEyeTracker = new I18NLabel(translator,"Eye Tracker:"); - useEyeTracker.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 3em ; -fx-text-fill: #cd2653"); - - Label errorEyeTracker = new Label(""); - errorEyeTracker.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 1em ; -fx-text-fill: #cd2653"); - - I18NCheckbox useEyeTrackerCheckBox = new I18NCheckbox(translator,"Activ\u00e9"); - - String style = "-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 2.5em; "; - useEyeTrackerCheckBox.setStyle(style); - useEyeTrackerCheckBox.hoverProperty().addListener((obs, oldval, newval) -> { - if (newval) { - useEyeTrackerCheckBox.setStyle(style + "-fx-cursor: hand; -fx-underline: true"); - } else { - useEyeTrackerCheckBox.setStyle(style); - } - }); - useEyeTrackerCheckBox.selectedProperty().addListener((obj, oldval, newval) -> { - if (newval) { - graphicalMenus.getConfiguration().setMode(Configuration.GAZE_INTERACTION); - log.info("Configuration.GAZE_INTERACTION : {}", configuration.isGazeInteraction()); - graphicalMenus.getConfiguration().setMode(Configuration.MOUSE_INTERACTION); - useEyeTrackerCheckBox.setSelected(false); - } else { - graphicalMenus.getConfiguration().setMode(Configuration.MOUSE_INTERACTION); - log.info("Configuration.GAZE_INTERACTION : {}", configuration.isGazeInteraction()); - } - }); - - useEyeTrackerCheckBox.setSelected(false); - useEyeTrackerCheckBox.setTextFill(Color.web("#faeaed")); - useEyeTrackerCheckBox.resize(100, 100); - - settings.add(useEyeTracker, 0, 1); - settings.add(useEyeTrackerCheckBox, 1, 1); - settings.add(errorEyeTracker, 2, 1); + if (UtilsOS.isUnix()){ + createGnomeControlCenterButtonLang(translator, settings, configuration, getRow()); + createGnomeControlCenterButtonEyeTracker(translator, settings, configuration, graphicalMenus, getRow()); + createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Gestionnaire Wifi:", "images/wi-fi_white.png", "wifi", getRow()); + createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Gestionnaire Bluetooth:", "images/bluetooth.png", "bluetooth", getRow()); + createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Param\u00e8tres D'Affichage:", "images/notebook.png", "display", getRow()); + createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Param\u00e8tres de Batterie:", "images/battery.png", "power", getRow()); + createGnomeControlCenterButtonTeamViewer(translator, settings, graphicalMenus, getRow()); + createGnomeControlCenterButtonPassword(translator, settings, getRow()); + createGnomeControlCenterButtonMail(translator, settings, graphicalMenus, getRow()); + }else { + createGnomeControlCenterButtonLang(translator, settings, configuration, getRow()); + createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Gestionnaire Wifi:", "images/wi-fi_white.png", "wifi", getRow()); + createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Param\u00e8tres D'Affichage:", "images/notebook.png", "display", getRow()); + createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Param\u00e8tres de Batterie:", "images/battery.png", "power", getRow()); + createGnomeControlCenterButtonMail(translator, settings, graphicalMenus, getRow()); } - createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Gestionnaire Wifi:", "images/wi-fi_white.png", "wifi", 2); - createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Gestionnaire Bluetooth:", "images/bluetooth.png", "bluetooth", 3); - createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Param\u00e8tres D'Affichage:", "images/notebook.png", "display", 4); - createGnomeControlCenterButtonI18N(translator, graphicalMenus, settings, "Param\u00e8tres de Batterie:", "images/battery.png", "power", 5); - createGnomeControlCenterButtonLang(translator, settings, configuration); - - { - - Label userInformationLabel = new I18NLabel(translator,"Une id\u00e9e ? Besoin d'aide ? "); - userInformationLabel.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 3em ; -fx-text-fill: #cd2653"); + settings.setAlignment(Pos.CENTER); + BorderPane.setAlignment(settings, Pos.CENTER); + this.setCenter(settings); - Button userInformationButton = UtilsUI.createI18NButton(translator, - "Contactez-nous>", - "images/contact.png", - (e) -> { - StageUtils.killRunningProcess(graphicalMenus); - graphicalMenus.getConfiguration().scene.setRoot(graphicalMenus.getContactUs()); - } - ); + this.setBottom(new Label(Configuration.VERSION)); + } - userInformationButton.setTextFill(Color.web("#faeaed")); + void createGnomeControlCenterButtonLang(Translator translator, GridPane settings, Configuration configuration, int row) { + Label displayedLabel = new I18NLabel(translator,"Choisir une langue:"); + displayedLabel.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 3em ; -fx-text-fill: #cd2653"); + displayedLabel.setTextFill(Color.web("#cd2653")); - settings.add(userInformationLabel, 0, 8); - settings.add(userInformationButton, 1, 8); - } + MenuItem menuItemFR = new MenuItem("Francais"); + MenuItem menuItemEN = new MenuItem("English"); - { - Label changePasswordLabel = new I18NLabel(translator,"Mot de Passe"); - changePasswordLabel.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-text-fill: #cd2653; -fx-font-size: 3em"); - - - Button changePasswordButton = UtilsUI.createI18NButton(translator, - "Changer>", - "images/user_white.png", - (e) -> { - try { - ProcessBuilder pb = new ProcessBuilder("bash", "./scripts/changePassword.sh"); - pb.inheritIO().start(); - } catch (IOException ex) { - ex.printStackTrace(); - } - } - ); + MenuButton menuButton = new MenuButton(langage); - changePasswordButton.setTextFill(Color.web("#faeaed")); + menuItemFR.setOnAction(eventMenuLanguages -> { + configuration.setLanguage("fra"); + ConfigurationBuilder.createFromPropertiesResource().withLanguage(configuration.getLanguage()).saveConfigIgnoringExceptions(); + langage = menuItemFR.getText(); + menuButton.setText(langage); + translator.changeLanguage(configuration.getLanguage()); + translator.notifyLanguageChanged(); + }); + menuItemEN.setOnAction(eventMenuLanguages -> { + configuration.setLanguage("eng"); + ConfigurationBuilder.createFromPropertiesResource().withLanguage(configuration.getLanguage()).saveConfigIgnoringExceptions(); + langage = menuItemEN.getText(); + menuButton.setText(langage); + translator.changeLanguage(configuration.getLanguage()); + translator.notifyLanguageChanged(); + }); + menuButton.getItems().addAll(menuItemEN,menuItemFR); - settings.add(changePasswordLabel, 0, 7); - settings.add(changePasswordButton, 1, 7); - } + settings.add(displayedLabel, 0, row); + settings.add(menuButton,1, row); + } - { + void createGnomeControlCenterButtonEyeTracker(Translator translator, GridPane settings, Configuration configuration, GraphicalMenus graphicalMenus, int row){ + I18NLabel useEyeTracker = new I18NLabel(translator,"Eye Tracker:"); + useEyeTracker.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 3em ; -fx-text-fill: #cd2653"); - Label teamviewerLabel = new I18NLabel(translator,"Lancer TeamViewer:"); - teamviewerLabel.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 3em ; -fx-text-fill: #cd2653"); + Label errorEyeTracker = new Label(""); + errorEyeTracker.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 1em ; -fx-text-fill: #cd2653"); - Button teamViewerButton = UtilsUI.createI18NButton(translator, - "Ouvrir>", - "images/teamviewer.png", - (e) -> { - StageUtils.killRunningProcess(graphicalMenus); - TeamviewerNamedProcessCreator teamviewerNamedProcessCreator = new TeamviewerNamedProcessCreator(); - teamviewerNamedProcessCreator.setUpProcessBuilder(); - graphicalMenus.process = teamviewerNamedProcessCreator.start(graphicalMenus); - } - ); + I18NCheckbox useEyeTrackerCheckBox = new I18NCheckbox(translator,"Activ\u00e9"); - teamViewerButton.setTextFill(Color.web("#faeaed")); + String style = "-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 2.5em; "; + useEyeTrackerCheckBox.setStyle(style); + useEyeTrackerCheckBox.hoverProperty().addListener((obs, oldval, newval) -> { + if (newval) { + useEyeTrackerCheckBox.setStyle(style + "-fx-cursor: hand; -fx-underline: true"); + } else { + useEyeTrackerCheckBox.setStyle(style); + } + }); + useEyeTrackerCheckBox.selectedProperty().addListener((obj, oldval, newval) -> { + if (newval) { + graphicalMenus.getConfiguration().setMode(Configuration.GAZE_INTERACTION); + log.info("Configuration.GAZE_INTERACTION : {}", configuration.isGazeInteraction()); + graphicalMenus.getConfiguration().setMode(Configuration.MOUSE_INTERACTION); + useEyeTrackerCheckBox.setSelected(false); + } else { + graphicalMenus.getConfiguration().setMode(Configuration.MOUSE_INTERACTION); + log.info("Configuration.GAZE_INTERACTION : {}", configuration.isGazeInteraction()); + } + }); - settings.add(teamviewerLabel, 0, 6); - settings.add(teamViewerButton, 1, 6); - } + useEyeTrackerCheckBox.setSelected(false); + useEyeTrackerCheckBox.setTextFill(Color.web("#faeaed")); + useEyeTrackerCheckBox.resize(100, 100); - settings.setAlignment(Pos.CENTER); - BorderPane.setAlignment(settings, Pos.CENTER); - this.setCenter(settings); - - this.setBottom(new Label(Configuration.VERSION)); + settings.add(useEyeTracker, 0, row); + settings.add(useEyeTrackerCheckBox, 1, row); + settings.add(errorEyeTracker, 2, row); } void createGnomeControlCenterButtonI18N(Translator translator,GraphicalMenus graphicalMenus, GridPane settings, String label, String imageName, String panelToOpen, int row) { @@ -181,36 +159,72 @@ void createGnomeControlCenterButtonI18N(Translator translator,GraphicalMenus gra settings.add(button, 1, row); } - void createGnomeControlCenterButtonLang(Translator translator, GridPane settings, Configuration configuration) { - Label displayedLabel = new I18NLabel(translator,"Choisir une langue:"); - displayedLabel.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 3em ; -fx-text-fill: #cd2653"); - displayedLabel.setTextFill(Color.web("#cd2653")); + void createGnomeControlCenterButtonMail(Translator translator, GridPane settings, GraphicalMenus graphicalMenus, int row){ + Label userInformationLabel = new I18NLabel(translator,"Une id\u00e9e ? Besoin d'aide ? "); + userInformationLabel.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 3em ; -fx-text-fill: #cd2653"); - MenuItem menuItemFR = new MenuItem("Francais"); - MenuItem menuItemEN = new MenuItem("English"); + Button userInformationButton = UtilsUI.createI18NButton(translator, + "Contactez-nous>", + "images/contact.png", + (e) -> { + StageUtils.killRunningProcess(graphicalMenus); + graphicalMenus.getConfiguration().scene.setRoot(graphicalMenus.getContactUs()); + } + ); - MenuButton menuButton = new MenuButton(langage); + userInformationButton.setTextFill(Color.web("#faeaed")); - menuItemFR.setOnAction(eventMenuLanguages -> { - configuration.setLanguage("fra"); - ConfigurationBuilder.createFromPropertiesResource().withLanguage(configuration.getLanguage()).saveConfigIgnoringExceptions(); - langage = menuItemFR.getText(); - menuButton.setText(langage); - translator.changeLanguage(configuration.getLanguage()); - translator.notifyLanguageChanged(); - }); - menuItemEN.setOnAction(eventMenuLanguages -> { - configuration.setLanguage("eng"); - ConfigurationBuilder.createFromPropertiesResource().withLanguage(configuration.getLanguage()).saveConfigIgnoringExceptions(); - langage = menuItemEN.getText(); - menuButton.setText(langage); - translator.changeLanguage(configuration.getLanguage()); - translator.notifyLanguageChanged(); - }); - menuButton.getItems().addAll(menuItemEN,menuItemFR); + settings.add(userInformationLabel, 0, row); + settings.add(userInformationButton, 1, row); + } + + void createGnomeControlCenterButtonPassword(Translator translator, GridPane settings, int row){ + Label changePasswordLabel = new I18NLabel(translator,"Mot de Passe"); + changePasswordLabel.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-text-fill: #cd2653; -fx-font-size: 3em"); + + Button changePasswordButton = UtilsUI.createI18NButton(translator, + "Changer>", + "images/user_white.png", + (e) -> { + try { + ProcessBuilder pb = new ProcessBuilder("bash", "./scripts/changePassword.sh"); + pb.inheritIO().start(); + } catch (IOException ex) { + ex.printStackTrace(); + } + } + ); - settings.add(displayedLabel, 0, 0); - settings.add(menuButton,1, 0); + changePasswordButton.setTextFill(Color.web("#faeaed")); + + settings.add(changePasswordLabel, 0, row); + settings.add(changePasswordButton, 1, row); + } + + void createGnomeControlCenterButtonTeamViewer(Translator translator, GridPane settings, GraphicalMenus graphicalMenus, int row){ + Label teamviewerLabel = new I18NLabel(translator,"Lancer TeamViewer:"); + teamviewerLabel.setStyle("-fx-font-weight: bold; -fx-font-family: Helvetica; -fx-font-size: 3em ; -fx-text-fill: #cd2653"); + + Button teamViewerButton = UtilsUI.createI18NButton(translator, + "Ouvrir>", + "images/teamviewer.png", + (e) -> { + StageUtils.killRunningProcess(graphicalMenus); + TeamviewerNamedProcessCreator teamviewerNamedProcessCreator = new TeamviewerNamedProcessCreator(); + teamviewerNamedProcessCreator.setUpProcessBuilder(); + graphicalMenus.process = teamviewerNamedProcessCreator.start(graphicalMenus); + } + ); + + teamViewerButton.setTextFill(Color.web("#faeaed")); + + settings.add(teamviewerLabel, 0, row); + settings.add(teamViewerButton, 1, row); } + int getRow(){ + int tempRow = this.row; + this.row += 1; + return tempRow; + } } diff --git a/src/main/java/main/UI/menu/UpdateMenu.java b/src/main/java/main/UI/menu/UpdateMenu.java index d3fd4ab..48bd72d 100644 --- a/src/main/java/main/UI/menu/UpdateMenu.java +++ b/src/main/java/main/UI/menu/UpdateMenu.java @@ -23,11 +23,10 @@ import main.UI.Translator; import main.utils.UpdateManager; import main.utils.UpdateService; +import main.utils.UtilsOS; import main.utils.UtilsUI; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; +import java.io.*; import java.nio.charset.StandardCharsets; @Slf4j @@ -37,12 +36,15 @@ public class UpdateMenu extends BorderPane { ProgressBar[] progressBars = new ProgressBar[8]; Button installAllButton; GraphicalMenus graphicalMenus; + Main main; + Boolean download = false; public UpdateMenu(GraphicalMenus graphicalMenus, UpdateManager updateManager, Main main, Configuration configuration) { super(); Translator translator = main.getTranslator(); + this.main = main; this.updateManager = updateManager; this.graphicalMenus = graphicalMenus; for (int i = 0; i <= 7; i++) { @@ -95,7 +97,7 @@ public UpdateMenu(GraphicalMenus graphicalMenus, UpdateManager updateManager, Ma GridPane settings = new GridPane(); settings.setHgap(20); - settings.setVgap(graphicalMenus.primaryStage.getHeight() / 30); + settings.setVgap(graphicalMenus.primaryStage.getHeight() / 50); createGnomeControlCenterButton(translator, settings, UpdateService.SYSTEME); createGnomeControlCenterButton(translator, settings, UpdateService.AUGCOM); @@ -103,7 +105,9 @@ public UpdateMenu(GraphicalMenus graphicalMenus, UpdateManager updateManager, Ma createGnomeControlCenterButton(translator, settings, UpdateService.GAZEPLAY); createGnomeControlCenterButton(translator, settings, UpdateService.INTERAACTION_PLAYER); createGnomeControlCenterButton(translator, settings, UpdateService.INTERAACTION_GAZE); - createGnomeControlCenterButton(translator, settings, UpdateService.INTERAACTION_INTERFACE); + if (UtilsOS.isUnix()){ + createGnomeControlCenterButton(translator, settings, UpdateService.INTERAACTION_INTERFACE); + } settings.setAlignment(Pos.CENTER); BorderPane.setAlignment(settings, Pos.CENTER); @@ -158,7 +162,6 @@ public void run() { t.setDaemon(true); t.start(); - Thread t2 = new Thread() { public void run() { startUpdateSystem(); @@ -180,7 +183,9 @@ void closeProcessStream(Process p) { } void startUpdateSystem() { - if (updateManager.updateServices[UpdateService.SYSTEME].getUpdateProperty().get()) { + this.main.getSetup().closePorts(); + if (updateManager.updateServices[UpdateService.SYSTEME].getUpdateProperty().get() && !this.download) { + this.download = true; try { ProcessBuilder pb = new ProcessBuilder(""); pb.redirectErrorStream(true); @@ -225,61 +230,121 @@ void startUpdateOnlySystem() { void startUpdateAugCom() { if (updateManager.updateServices[UpdateService.AUGCOM].getUpdateProperty().get()) { try { - ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/augcomUpdate.sh"); - pb.redirectErrorStream(true); - Process p = pb.start(); - p.onExit().thenRun(() -> { - closeProcessStream(p); - Platform.runLater(() -> { - progressBars[UpdateService.AUGCOM + 1].setVisible(false); - updateManager.updateServices[UpdateService.AUGCOM].getOutput().setValue(""); + if (UtilsOS.isUnix()){ + ProcessBuilder pb = new ProcessBuilder( + "sh", + "../../Update/augcomUpdate.sh"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.AUGCOM + 1].setVisible(false); + updateManager.updateServices[UpdateService.AUGCOM].getOutput().setValue(""); + }); + startUpdateInterAACtionScene(); }); - startUpdateInterAACtonScene(); - }); - progressPercent(p, 2); + progressPercent(p, 2); + }else { + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\augcomDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.AUGCOM + 1].setVisible(false); + updateManager.updateServices[UpdateService.AUGCOM].getOutput().setValue(""); + this.writeVersion(updateManager.updateServices[UpdateService.AUGCOM].getName(), updateManager.updateServices[UpdateService.AUGCOM].getVersion()); + updateManager.checkSpecificUpdate(updateManager.updateServices[UpdateService.AUGCOM]); + }); + startUpdateInterAACtionScene(); + }); + progressPercent(p, 2); + } } catch (IOException ex) { ex.printStackTrace(System.err); } } else { - startUpdateInterAACtonScene(); + startUpdateInterAACtionScene(); } } void startUpdateOnlyAugCom() { - if (updateManager.updateServices[UpdateService.AUGCOM].getUpdateProperty().get()) { + if (updateManager.updateServices[UpdateService.AUGCOM].getUpdateProperty().get() && !this.download) { try { - ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/augcomUpdate.sh"); - pb.redirectErrorStream(true); - Process p = pb.start(); - p.onExit().thenRun(() -> { - closeProcessStream(p); - Platform.runLater(() -> { - progressBars[UpdateService.AUGCOM + 1].setVisible(false); - updateManager.updateServices[UpdateService.AUGCOM].getOutput().setValue(""); + if (UtilsOS.isUnix()){ + ProcessBuilder pb = new ProcessBuilder( + "sh", + "../../Update/augcomUpdate.sh"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.AUGCOM + 1].setVisible(false); + updateManager.updateServices[UpdateService.AUGCOM].getOutput().setValue(""); + }); }); - }); - progressPercent(p, 2); + progressPercent(p, 2); + }else { + this.main.getSetup().closePorts(); + this.download = true; + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\augcomDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + this.main.getSetup().openPorts(); + this.download = false; + Platform.runLater(() -> { + progressBars[UpdateService.AUGCOM + 1].setVisible(false); + updateManager.updateServices[UpdateService.AUGCOM].getOutput().setValue(""); + this.writeVersion(updateManager.updateServices[UpdateService.AUGCOM].getName(), updateManager.updateServices[UpdateService.AUGCOM].getVersion()); + updateManager.checkSpecificUpdate(updateManager.updateServices[UpdateService.AUGCOM]); + }); + }); + progressPercent(p, 2); + } } catch (IOException ex) { ex.printStackTrace(System.err); } } } - void startUpdateInterAACtonScene() { + void startUpdateInterAACtionScene() { if (updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getUpdateProperty().get()) { try { - ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/interAACtionSceneUpdate.sh"); - pb.redirectErrorStream(true); - Process p = pb.start(); - p.onExit().thenRun(() -> { - closeProcessStream(p); - Platform.runLater(() -> { - progressBars[UpdateService.INTERAACTION_SCENE + 1].setVisible(false); - updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getOutput().setValue(""); + if (UtilsOS.isUnix()){ + ProcessBuilder pb = new ProcessBuilder( + "sh", + "../../Update/interAACtionSceneUpdate.sh"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_SCENE + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getOutput().setValue(""); + }); + startUpdateInterAACtionPlayer(); }); - startUpdateInterAACtionPlayer(); - }); - progressPercent(p, 3); + progressPercent(p, 3); + }else { + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\sceneDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_SCENE + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getOutput().setValue(""); + this.writeVersion(updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getName(), updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getVersion()); + updateManager.checkSpecificUpdate(updateManager.updateServices[UpdateService.INTERAACTION_SCENE]); + }); + startUpdateInterAACtionPlayer(); + }); + progressPercent(p, 3); + } } catch (IOException ex) { ex.printStackTrace(System.err); } @@ -288,20 +353,42 @@ void startUpdateInterAACtonScene() { } } - void startUpdateOnlyInterAACtonScene() { - if (updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getUpdateProperty().get()) { + void startUpdateOnlyInterAACtionScene() { + if (updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getUpdateProperty().get() && !this.download) { try { - ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/interAACtionSceneUpdate.sh"); - pb.redirectErrorStream(true); - Process p = pb.start(); - p.onExit().thenRun(() -> { - closeProcessStream(p); - Platform.runLater(() -> { - progressBars[UpdateService.INTERAACTION_SCENE + 1].setVisible(false); - updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getOutput().setValue(""); + if (UtilsOS.isUnix()){ + ProcessBuilder pb = new ProcessBuilder( + "sh", + "../../Update/interAACtionSceneUpdate.sh"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_SCENE + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getOutput().setValue(""); + }); }); - }); - progressPercent(p, 3); + progressPercent(p, 3); + }else { + this.main.getSetup().closePorts(); + this.download = true; + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\sceneDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + this.main.getSetup().openPorts(); + this.download = false; + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_SCENE + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getOutput().setValue(""); + this.writeVersion(updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getName(), updateManager.updateServices[UpdateService.INTERAACTION_SCENE].getVersion()); + updateManager.checkSpecificUpdate(updateManager.updateServices[UpdateService.INTERAACTION_SCENE]); + }); + }); + progressPercent(p, 3); + } } catch (IOException ex) { ex.printStackTrace(System.err); } @@ -311,18 +398,37 @@ void startUpdateOnlyInterAACtonScene() { void startUpdateGazePlay() { if (updateManager.updateServices[UpdateService.GAZEPLAY].getUpdateProperty().get()) { try { - ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/gazeplayUpdate.sh"); - pb.redirectErrorStream(true); - Process p = pb.start(); - p.onExit().thenRun(() -> { - closeProcessStream(p); - Platform.runLater(() -> { - progressBars[UpdateService.GAZEPLAY + 1].setVisible(false); - updateManager.updateServices[UpdateService.GAZEPLAY].getOutput().setValue(""); + if (UtilsOS.isUnix()){ + ProcessBuilder pb = new ProcessBuilder( + "sh", + "../../Update/gazeplayUpdate.sh"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.GAZEPLAY + 1].setVisible(false); + updateManager.updateServices[UpdateService.GAZEPLAY].getOutput().setValue(""); + }); + startUpdateInterAACtionGaze(); }); - startUpdateInterAACtionGaze(); - }); - progressPercent(p, 4); + progressPercent(p, 4); + }else { + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\gazeplayDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.GAZEPLAY + 1].setVisible(false); + updateManager.updateServices[UpdateService.GAZEPLAY].getOutput().setValue(""); + this.writeVersion(updateManager.updateServices[UpdateService.GAZEPLAY].getName(), updateManager.updateServices[UpdateService.GAZEPLAY].getVersion()); + updateManager.checkSpecificUpdate(updateManager.updateServices[UpdateService.GAZEPLAY]); + }); + startUpdateInterAACtionGaze(); + }); + progressPercent(p, 4); + } } catch (IOException ex) { ex.printStackTrace(System.err); } @@ -332,19 +438,39 @@ void startUpdateGazePlay() { } void startUpdateOnlyGazePlay() { - if (updateManager.updateServices[UpdateService.GAZEPLAY].getUpdateProperty().get()) { + if (updateManager.updateServices[UpdateService.GAZEPLAY].getUpdateProperty().get() && !this.download) { try { - ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/gazeplayUpdate.sh"); - pb.redirectErrorStream(true); - Process p = pb.start(); - p.onExit().thenRun(() -> { - closeProcessStream(p); - Platform.runLater(() -> { - progressBars[UpdateService.GAZEPLAY + 1].setVisible(false); - updateManager.updateServices[UpdateService.GAZEPLAY].getOutput().setValue(""); + if (UtilsOS.isUnix()){ + ProcessBuilder pb = new ProcessBuilder( + "sh", + "../../Update/gazeplayUpdate.sh"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.GAZEPLAY + 1].setVisible(false); + updateManager.updateServices[UpdateService.GAZEPLAY].getOutput().setValue(""); + }); }); - }); - progressPercent(p, 4); + progressPercent(p, 4); + }else { + this.download = true; + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\gazeplayDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + this.download = false; + Platform.runLater(() -> { + progressBars[UpdateService.GAZEPLAY + 1].setVisible(false); + updateManager.updateServices[UpdateService.GAZEPLAY].getOutput().setValue(""); + this.writeVersion(updateManager.updateServices[UpdateService.GAZEPLAY].getName(), updateManager.updateServices[UpdateService.GAZEPLAY].getVersion()); + updateManager.checkSpecificUpdate(updateManager.updateServices[UpdateService.GAZEPLAY]); + }); + }); + progressPercent(p, 4); + } } catch (IOException ex) { ex.printStackTrace(System.err); } @@ -355,18 +481,37 @@ void startUpdateInterAACtionPlayer() { if (updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getUpdateProperty().get()) { try { - ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/interAACtionPlayerUpdate.sh"); - pb.redirectErrorStream(true); - Process p = pb.start(); - p.onExit().thenRun(() -> { - closeProcessStream(p); - Platform.runLater(() -> { - progressBars[UpdateService.INTERAACTION_PLAYER + 1].setVisible(false); - updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getOutput().setValue(""); + if (UtilsOS.isUnix()){ + ProcessBuilder pb = new ProcessBuilder( + "sh", + "../../Update/interAACtionPlayerUpdate.sh"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_PLAYER + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getOutput().setValue(""); + }); + startUpdateGazePlay(); }); - startUpdateGazePlay(); - }); - progressPercent(p, 5); + progressPercent(p, 5); + }else { + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\playerDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_PLAYER + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getOutput().setValue(""); + this.writeVersion(updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getName(), updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getVersion()); + updateManager.checkSpecificUpdate(updateManager.updateServices[UpdateService.INTERAACTION_PLAYER]); + }); + startUpdateGazePlay(); + }); + progressPercent(p, 5); + } } catch (IOException ex) { ex.printStackTrace(System.err); } @@ -377,19 +522,41 @@ void startUpdateInterAACtionPlayer() { void startUpdateOnlyInterAACtionPlayer() { - if (updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getUpdateProperty().get()) { + if (updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getUpdateProperty().get() && !this.download) { try { - ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/interAACtionPlayerUpdate.sh"); - pb.redirectErrorStream(true); - Process p = pb.start(); - p.onExit().thenRun(() -> { - closeProcessStream(p); - Platform.runLater(() -> { - progressBars[UpdateService.INTERAACTION_PLAYER + 1].setVisible(false); - updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getOutput().setValue(""); + if (UtilsOS.isUnix()){ + ProcessBuilder pb = new ProcessBuilder( + "sh", + "../../Update/interAACtionPlayerUpdate.sh"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_PLAYER + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getOutput().setValue(""); + }); }); - }); - progressPercent(p, 5); + progressPercent(p, 5); + }else { + this.main.getSetup().closePorts(); + this.download = true; + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\playerDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + this.main.getSetup().openPorts(); + this.download = false; + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_PLAYER + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getOutput().setValue(""); + this.writeVersion(updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getName(), updateManager.updateServices[UpdateService.INTERAACTION_PLAYER].getVersion()); + updateManager.checkSpecificUpdate(updateManager.updateServices[UpdateService.INTERAACTION_PLAYER]); + }); + }); + progressPercent(p, 5); + } } catch (IOException ex) { ex.printStackTrace(System.err); } @@ -399,18 +566,37 @@ void startUpdateOnlyInterAACtionPlayer() { void startUpdateInterAACtionGaze(){ if (updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getUpdateProperty().get()) { try { - ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/interAACtionGazeUpdate.sh"); - pb.redirectErrorStream(true); - Process p = pb.start(); - p.onExit().thenRun(() -> { - closeProcessStream(p); - Platform.runLater(() -> { - progressBars[UpdateService.INTERAACTION_GAZE + 1].setVisible(false); - updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getOutput().setValue(""); + if (UtilsOS.isUnix()){ + ProcessBuilder pb = new ProcessBuilder( + "sh", + "../../Update/interAACtionGazeUpdate.sh"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_GAZE + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getOutput().setValue(""); + }); + startUpdateInterAACtionInterface(); }); - startUpdateInterAACtionInterface(); - }); - progressPercent(p, 6); + progressPercent(p, 6); + }else { + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\gazeDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_GAZE + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getOutput().setValue(""); + this.writeVersion(updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getName(), updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getVersion()); + updateManager.checkSpecificUpdate(updateManager.updateServices[UpdateService.INTERAACTION_GAZE]); + }); + startUpdateInterAACtionInterface(); + }); + progressPercent(p, 6); + } } catch (IOException ex) { ex.printStackTrace(System.err); } @@ -420,19 +606,39 @@ void startUpdateInterAACtionGaze(){ } void startUpdateOnlyInterAACtionGaze(){ - if (updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getUpdateProperty().get()) { + if (updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getUpdateProperty().get() && !this.download) { try { - ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/interAACtionGazeUpdate.sh"); - pb.redirectErrorStream(true); - Process p = pb.start(); - p.onExit().thenRun(() -> { - closeProcessStream(p); - Platform.runLater(() -> { - progressBars[UpdateService.INTERAACTION_GAZE + 1].setVisible(false); - updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getOutput().setValue(""); + if (UtilsOS.isUnix()){ + ProcessBuilder pb = new ProcessBuilder( + "sh", + "../../Update/interAACtionGazeUpdate.sh"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_GAZE + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getOutput().setValue(""); + }); }); - }); - progressPercent(p, 6); + progressPercent(p, 6); + }else { + this.download = true; + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\gazeDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + closeProcessStream(p); + this.download = false; + Platform.runLater(() -> { + progressBars[UpdateService.INTERAACTION_GAZE + 1].setVisible(false); + updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getOutput().setValue(""); + this.writeVersion(updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getName(), updateManager.updateServices[UpdateService.INTERAACTION_GAZE].getVersion()); + updateManager.checkSpecificUpdate(updateManager.updateServices[UpdateService.INTERAACTION_GAZE]); + }); + }); + progressPercent(p, 6); + } } catch (IOException ex) { ex.printStackTrace(System.err); } @@ -440,7 +646,7 @@ void startUpdateOnlyInterAACtionGaze(){ } void startUpdateInterAACtionInterface(){ - if (updateManager.updateServices[UpdateService.INTERAACTION_INTERFACE].getUpdateProperty().get()) { + if ((updateManager.updateServices[UpdateService.INTERAACTION_INTERFACE].getUpdateProperty().get()) && (UtilsOS.isUnix())) { try { ProcessBuilder pb = new ProcessBuilder("sh", "../../Update/interAACtionBoxInterfaceUpdate.sh"); pb.redirectErrorStream(true); @@ -460,6 +666,8 @@ void startUpdateInterAACtionInterface(){ }else { updateManager.checkUpdates(); } + this.main.getSetup().openPorts(); + this.download = false; } void startUpdateOnlyInterAACtionInterface(){ @@ -499,11 +707,6 @@ void progressPercent(Process p, int index) { } catch (NumberFormatException e) { //DO NOTHING } - } else { - String finalS = s; - Platform.runLater(() -> { - updateManager.updateServices[index - 1].getOutput().setValue(finalS); - }); } } } catch (IOException e) { @@ -539,7 +742,7 @@ void createGnomeControlCenterButton(Translator translator,GridPane settings, int startUpdateOnlyAugCom(); break; case UpdateService.INTERAACTION_SCENE: - startUpdateOnlyInterAACtonScene(); + startUpdateOnlyInterAACtionScene(); break; case UpdateService.GAZEPLAY: startUpdateOnlyGazePlay(); @@ -618,5 +821,23 @@ Button createTopBarI18NButton(Translator translator,String text, EventHandler ev return UtilsUI.getDoubleClickedI18NButton(translator,text, imagePath, eventhandler, graphicalMenus.primaryStage); } - + public void writeVersion(String name, String version){ + FileWriter fileWriter = null; + try { + String pathFile = "C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version\\" + name + "Version.txt"; + fileWriter = new FileWriter(pathFile, StandardCharsets.UTF_8); + fileWriter.write(version); + fileWriter.close(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + try { + if (fileWriter != null){ + fileWriter.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } } diff --git a/src/main/java/main/process/AppNamedProcessCreator.java b/src/main/java/main/process/AppNamedProcessCreator.java index e6f23ee..9f09d3b 100644 --- a/src/main/java/main/process/AppNamedProcessCreator.java +++ b/src/main/java/main/process/AppNamedProcessCreator.java @@ -20,7 +20,7 @@ public interface AppNamedProcessCreator { static String getBrowser() { if (UtilsOS.isWindows()) { - return "C:/Program Files (x86)/Google/Chrome/Application/chrome.exe"; + return "C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\GoogleChromePortable\\GoogleChromePortable.exe"; } else if (UtilsOS.isUnix()) { return "google-chrome"; } @@ -35,8 +35,6 @@ static NamedProcess createProcress(XdotoolProcessCreator xdotoolProcessCreator, namedProcess = new NamedProcess(xdotoolProcessCreator.start(graphicalMenus)); } else { namedProcess = new NamedProcess(); - graphicalMenus.primaryStage.hide(); - graphicalMenus.getHomeScreen().removeMenu(); } return getNamedProcess(processBuilder, graphicalMenus, name, namedProcess); } catch (IOException e) { @@ -54,8 +52,6 @@ static NamedProcess createProcressAndWaitForClose(XdotoolProcessCreator xdotoolP namedProcess = new NamedProcess(xdotoolProcessCreator.start(graphicalMenus), closeGoogleChromeProcessCreator.waitForCloseRequest()); } else { namedProcess = new NamedProcess(); - graphicalMenus.primaryStage.hide(); - graphicalMenus.getHomeScreen().removeMenu(); } return getNamedProcess(processBuilder, graphicalMenus, name, namedProcess); } catch (IOException e) { diff --git a/src/main/java/main/process/AugComNamedProcessCreator.java b/src/main/java/main/process/AugComNamedProcessCreator.java index f76ada1..8e2d437 100644 --- a/src/main/java/main/process/AugComNamedProcessCreator.java +++ b/src/main/java/main/process/AugComNamedProcessCreator.java @@ -5,6 +5,8 @@ import main.utils.NamedProcess; import main.utils.UtilsOS; +import java.io.IOException; + public class AugComNamedProcessCreator implements AppNamedProcessCreator { ProcessBuilder processBuilder; diff --git a/src/main/java/main/process/CloseGoogleChromeProcessCreator.java b/src/main/java/main/process/CloseGoogleChromeProcessCreator.java index d01136a..9af604a 100644 --- a/src/main/java/main/process/CloseGoogleChromeProcessCreator.java +++ b/src/main/java/main/process/CloseGoogleChromeProcessCreator.java @@ -1,6 +1,7 @@ package main.process; import lombok.extern.slf4j.Slf4j; +import main.utils.UtilsOS; import java.io.File; import java.io.IOException; @@ -11,26 +12,30 @@ public class CloseGoogleChromeProcessCreator { ProcessBuilder processBuilder; public void setUpProcessBuilder() { + if (UtilsOS.isUnix()){ processBuilder = new ProcessBuilder( "sh", "./scripts/close_chrome.sh"); + } } Process waitForCloseRequest() { - try { - File fileFR = new File("~/Téléchargements/close161918.txt"); - File fileEN = new File("~/Downloads/close161918.txt"); - if(fileFR.exists()) { - boolean deleteFrFile = fileFR.delete(); - log.info("File delete = " + deleteFrFile); - } - if(fileEN.exists()) { - boolean deleteEnFile = fileEN.delete(); - log.info("File delete = " + deleteEnFile); + if (UtilsOS.isUnix()){ + try { + File fileFR = new File("~/Téléchargements/close161918.txt"); + File fileEN = new File("~/Downloads/close161918.txt"); + if(fileFR.exists()) { + boolean deleteFrFile = fileFR.delete(); + log.info("File delete = " + deleteFrFile); + } + if(fileEN.exists()) { + boolean deleteEnFile = fileEN.delete(); + log.info("File delete = " + deleteEnFile); + } + return this.processBuilder.inheritIO().start(); + } catch (IOException e) { + e.printStackTrace(); } - return this.processBuilder.inheritIO().start(); - } catch (IOException e) { - e.printStackTrace(); } return null; } diff --git a/src/main/java/main/process/GazePlayNamedProcessCreator.java b/src/main/java/main/process/GazePlayNamedProcessCreator.java index 903abb0..74fab99 100644 --- a/src/main/java/main/process/GazePlayNamedProcessCreator.java +++ b/src/main/java/main/process/GazePlayNamedProcessCreator.java @@ -27,10 +27,19 @@ public void setUpProcessBuilder() { private ProcessBuilder createGazePlayBuilder() { - return new ProcessBuilder( + ProcessBuilder processBuilder; + if (UtilsOS.isUnix()){ + processBuilder = new ProcessBuilder( "sh", "../../Launcher/gazeplayAfsrLauncher.sh" ); + } else { + processBuilder = new ProcessBuilder( + "C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\launchGazePlay.bat" + ); + } + + return processBuilder; } @Override diff --git a/src/main/java/main/process/GnomeControlCenterNamedProcessCreator.java b/src/main/java/main/process/GnomeControlCenterNamedProcessCreator.java index 169299d..13f7ba5 100644 --- a/src/main/java/main/process/GnomeControlCenterNamedProcessCreator.java +++ b/src/main/java/main/process/GnomeControlCenterNamedProcessCreator.java @@ -6,6 +6,8 @@ import main.utils.NamedProcess; import main.utils.UtilsOS; +import java.io.IOException; + @Slf4j public class GnomeControlCenterNamedProcessCreator implements AppNamedProcessCreator { @@ -26,8 +28,34 @@ public NamedProcess start(GraphicalMenus graphicalMenus) { if (UtilsOS.isUnix()) { return AppNamedProcessCreator.createProcress(new GnomeControlCenterXdotoolProcessCreator(), processBuilder, graphicalMenus, "Gnome Control Center"); } else { - return new NamedProcess(); + + String cmd = ""; + switch (this.panelToOpen){ + + case "wifi" : + cmd = "control /name Microsoft.NetworkAndSharingCenter"; + break; + + case "display" : + cmd = "control desk.cpl"; + break; + + case "power" : + cmd = "control powercfg.cpl"; + break; + + default: + cmd = ""; + break; + } + + ProcessBuilder builder = new ProcessBuilder("cmd.exe", "/c", cmd); + try{ + builder.start(); + } catch (IOException e) { + e.printStackTrace(); + } } + return null; } - } diff --git a/src/main/java/main/process/InterAACtionGazeNamedProcessCreator.java b/src/main/java/main/process/InterAACtionGazeNamedProcessCreator.java index 6fd47a7..485f7be 100644 --- a/src/main/java/main/process/InterAACtionGazeNamedProcessCreator.java +++ b/src/main/java/main/process/InterAACtionGazeNamedProcessCreator.java @@ -34,7 +34,7 @@ private ProcessBuilder createInterAACtionGazeBuilder() { } String classpath = gazeInstallationRepo + "/lib/*"; - LinkedList commands = new LinkedList<>(Arrays.asList(javaBin, "-cp", classpath, "-Djdk.gtk.version=2", "-jar", gazeInstallationRepo+"/lib/untitled.jar")); + LinkedList commands = new LinkedList<>(Arrays.asList(javaBin, "-cp", classpath, "-Djdk.gtk.version=2", "-jar", gazeInstallationRepo+"/lib/interAACtionGaze.jar")); for(String command:commands){ log.info(command); @@ -68,7 +68,7 @@ public void reOpen(){ private String getInterAACtionGazeRepo() { if (UtilsOS.isWindows()) { - return "C:/Program Files (x86)/InteraactionGaze"; + return "C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\interAACtionGaze"; } else { String text = "../../InterAACtionGaze"; log.info("InterAACtionGaze directory is: " + text); diff --git a/src/main/java/main/process/InterAACtionPlayerNamedProcessCreator.java b/src/main/java/main/process/InterAACtionPlayerNamedProcessCreator.java index 02da80a..aec92b7 100644 --- a/src/main/java/main/process/InterAACtionPlayerNamedProcessCreator.java +++ b/src/main/java/main/process/InterAACtionPlayerNamedProcessCreator.java @@ -5,6 +5,8 @@ import main.utils.NamedProcess; import main.utils.UtilsOS; +import java.io.IOException; + public class InterAACtionPlayerNamedProcessCreator implements AppNamedProcessCreator { ProcessBuilder processBuilder; diff --git a/src/main/java/main/process/InterAACtionSceneNamedProcessCreator.java b/src/main/java/main/process/InterAACtionSceneNamedProcessCreator.java index 5bfe0ec..3f39357 100644 --- a/src/main/java/main/process/InterAACtionSceneNamedProcessCreator.java +++ b/src/main/java/main/process/InterAACtionSceneNamedProcessCreator.java @@ -5,6 +5,8 @@ import main.utils.NamedProcess; import main.utils.UtilsOS; +import java.io.IOException; + public class InterAACtionSceneNamedProcessCreator implements AppNamedProcessCreator { ProcessBuilder processBuilder; @@ -20,13 +22,11 @@ public void setUpProcessBuilder() { "--disable-features=Translate", "--autoplay-policy=no-user-gesture-required", "http://localhost:4201/#/fr/connect/" + UtilsOS.getUserNameFromOSForPWA()); - } @Override public NamedProcess start(GraphicalMenus graphicalMenus) { return AppNamedProcessCreator.createProcressAndWaitForClose(new GoogleChromeXdotoolProcessCreator(), new CloseGoogleChromeProcessCreator(), processBuilder, graphicalMenus, "InteraactionScene"); - } } diff --git a/src/main/java/main/process/xdotoolProcess/ActivateMainWindowProcess.java b/src/main/java/main/process/xdotoolProcess/ActivateMainWindowProcess.java index 60ae3ff..61ec18c 100644 --- a/src/main/java/main/process/xdotoolProcess/ActivateMainWindowProcess.java +++ b/src/main/java/main/process/xdotoolProcess/ActivateMainWindowProcess.java @@ -7,9 +7,7 @@ public class ActivateMainWindowProcess { public static void start() { - if (UtilsOS.isWindows()) { - //Do Nothing - } else { + if (UtilsOS.isUnix()) { try { ProcessBuilder processBuilderRaise = new ProcessBuilder("xdotool", "search", "--onlyvisible", "--classname", "--sync", "--main.Main", "windowraise"); processBuilderRaise.start(); diff --git a/src/main/java/main/process/xdotoolProcess/GazePlayXdotoolProcessCreator.java b/src/main/java/main/process/xdotoolProcess/GazePlayXdotoolProcessCreator.java index 21184a5..e2935a1 100644 --- a/src/main/java/main/process/xdotoolProcess/GazePlayXdotoolProcessCreator.java +++ b/src/main/java/main/process/xdotoolProcess/GazePlayXdotoolProcessCreator.java @@ -2,6 +2,7 @@ import lombok.extern.slf4j.Slf4j; import main.UI.menu.GraphicalMenus; +import main.utils.UtilsOS; @Slf4j public class GazePlayXdotoolProcessCreator implements XdotoolProcessCreator { @@ -10,10 +11,14 @@ public class GazePlayXdotoolProcessCreator implements XdotoolProcessCreator { @Override public void setUpProcessBuilder() { - processBuilder = new ProcessBuilder( - "sh", - "./scripts/gazeplay_windowId.sh" - ); + if (UtilsOS.isUnix()){ + processBuilder = new ProcessBuilder( + "sh", + "./scripts/gazeplay_windowId.sh" + ); + }else { + processBuilder = new ProcessBuilder(""); + } } @Override diff --git a/src/main/java/main/process/xdotoolProcess/InteraactionGazeCloseXdotoolProcessCreator.java b/src/main/java/main/process/xdotoolProcess/InteraactionGazeCloseXdotoolProcessCreator.java index 53b0edf..af84fe3 100644 --- a/src/main/java/main/process/xdotoolProcess/InteraactionGazeCloseXdotoolProcessCreator.java +++ b/src/main/java/main/process/xdotoolProcess/InteraactionGazeCloseXdotoolProcessCreator.java @@ -1,6 +1,7 @@ package main.process.xdotoolProcess; import lombok.extern.slf4j.Slf4j; +import main.utils.UtilsOS; import java.io.IOException; @@ -13,10 +14,18 @@ public InteraactionGazeCloseXdotoolProcessCreator(){ setUpProcessBuilder(); } public void setUpProcessBuilder() { - processBuilder = new ProcessBuilder( - "sh", - "./scripts/closeGaze.sh" - ); + if (UtilsOS.isUnix()){ + processBuilder = new ProcessBuilder( + "sh", + "./scripts/closeGaze.sh" + ); + }else { + processBuilder = new ProcessBuilder( + "cmd.exe", + "/c", + "(for /f \"tokens=2 delims=,\" %F in ('tasklist /v /fo csv /nh /fi \"imagename eq java.exe\" /fi \"windowtitle eq InteraactionGaze\"') do taskkill /pid %~F)" + ); + } } public Process start() { diff --git a/src/main/java/main/process/xdotoolProcess/InteraactionGazeReOpenXdotoolProcessCreator.java b/src/main/java/main/process/xdotoolProcess/InteraactionGazeReOpenXdotoolProcessCreator.java index 89899a3..9b36418 100644 --- a/src/main/java/main/process/xdotoolProcess/InteraactionGazeReOpenXdotoolProcessCreator.java +++ b/src/main/java/main/process/xdotoolProcess/InteraactionGazeReOpenXdotoolProcessCreator.java @@ -1,6 +1,7 @@ package main.process.xdotoolProcess; import lombok.extern.slf4j.Slf4j; +import main.utils.UtilsOS; import java.io.IOException; @@ -13,10 +14,16 @@ public InteraactionGazeReOpenXdotoolProcessCreator(){ setUpProcessBuilder(); } public void setUpProcessBuilder() { - processBuilder = new ProcessBuilder( - "sh", - "./scripts/reOpenGaze.sh" - ); + if (UtilsOS.isUnix()){ + processBuilder = new ProcessBuilder( + "sh", + "./scripts/interAACtionGaze_windowId.sh" + ); + }else { + processBuilder = new ProcessBuilder( + "C:\\Program Files (x86)\\InteraactionGaze\\bin\\interAACtionGaze-windows.bat" + ); + } } public Process start() { diff --git a/src/main/java/main/process/xdotoolProcess/InteraactionGazeXdotoolProcessCreator.java b/src/main/java/main/process/xdotoolProcess/InteraactionGazeXdotoolProcessCreator.java index 3141f66..aabddc3 100644 --- a/src/main/java/main/process/xdotoolProcess/InteraactionGazeXdotoolProcessCreator.java +++ b/src/main/java/main/process/xdotoolProcess/InteraactionGazeXdotoolProcessCreator.java @@ -1,6 +1,7 @@ package main.process.xdotoolProcess; import lombok.extern.slf4j.Slf4j; +import main.utils.UtilsOS; import java.io.IOException; @@ -14,10 +15,16 @@ public InteraactionGazeXdotoolProcessCreator(){ } public void setUpProcessBuilder() { - processBuilder = new ProcessBuilder( - "sh", - "./scripts/interAACtionGaze_windowId.sh" - ); + if (UtilsOS.isUnix()){ + processBuilder = new ProcessBuilder( + "sh", + "./scripts/interAACtionGaze_windowId.sh" + ); + }else { + processBuilder = new ProcessBuilder( + "C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\interAACtionGaze-windows\\bin\\interAACtionGaze-windows.bat" + ); + } } public Process start() { diff --git a/src/main/java/main/utils/Setup.java b/src/main/java/main/utils/Setup.java new file mode 100644 index 0000000..fc5dd2b --- /dev/null +++ b/src/main/java/main/utils/Setup.java @@ -0,0 +1,254 @@ +package main.utils; + +import lombok.extern.slf4j.Slf4j; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +@Slf4j +public class Setup { + + Process [] listPortServer = new Process[3]; + + boolean portSceneOpen = false; + boolean portAugComOpen = false; + boolean portPlayerOpen = false; + + public void setup(){ + if (UtilsOS.isWindows()){ + this.exitAngularApp(); + this.createFolderWindows(); + this.createFolderVersion(); + this.installGoogle(); + this.installGaze(); + } + } + + public void createFolderWindows(){ + File boxFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR"); + boolean createFolder = boxFolder.mkdirs(); + System.out.println("Folder Box created ! -> " + createFolder); + } + + public void createFolderVersion(){ + File versionFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version"); + boolean createFolder = versionFolder.mkdirs(); + if (createFolder){ + this.createFileVersion(); + } + } + + public void createFileVersion(){ + File sceneVersion = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version\\InterAACtionSceneVersion.txt"); + File playerVersion = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version\\InterAACtionPlayerVersion.txt"); + File augcomVersion = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version\\AugComVersion.txt"); + File gazeVersion = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version\\InterAACtionGazeVersion.txt"); + File gazeplayVersion = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version\\GazePlayVersion.txt"); + File interfaceVersion = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version\\InterAACtionBox_InterfaceVersion.txt"); + try { + boolean createSceneFile = sceneVersion.createNewFile(); + boolean createPlayerFile = playerVersion.createNewFile(); + boolean createAugComFile = augcomVersion.createNewFile(); + boolean createGazeFile = gazeVersion.createNewFile(); + boolean createGazePlayFile = gazeplayVersion.createNewFile(); + boolean createInterfaceFile = interfaceVersion.createNewFile(); + System.out.println("Files version created ! " + + "Scene -> " + createSceneFile + + ", Player -> " + createPlayerFile + + ", AugCom -> " + createAugComFile + + ", Gaze -> " + createGazeFile + + ", GazePlay -> " + createGazePlayFile + + ", Interface -> " + createInterfaceFile); + this.writeVersion(sceneVersion); + this.writeVersion(playerVersion); + this.writeVersion(augcomVersion); + this.writeVersion(gazeVersion); + this.writeVersion(gazeplayVersion); + this.writeInterfaceVersion(interfaceVersion); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void installGoogle(){ + File googleFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\GoogleChromePortable"); + boolean createGoogleFolder = googleFolder.mkdirs(); + if (createGoogleFolder){ + Path source = Paths.get("./../lib/google"); + try{ + Files.walk(source).forEach(elem -> this.copyElemToDest(source, elem)); + } catch (IOException e) { + e.printStackTrace(); + } finally { + this.extractGoogle(); + } + } + } + + public void installGaze(){ + File gazeFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\interAACtionGaze"); + if (!gazeFolder.exists()){ + try { + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\gazeDownload.bat"); + pb.redirectErrorStream(true); + Process p = pb.start(); + p.onExit().thenRun(() -> { + try { + p.getInputStream().close(); + p.getOutputStream().close(); + p.getErrorStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + p.destroy(); + }); + this.showOutPutCmd(p); + } catch (IOException e) { + e.printStackTrace(); + } finally { + FileWriter fileWriter = null; + try { + JSONObject softwareJson = JsonReader.readJsonFromUrl("https://api.github.com/repos/InteraactionGroup/interaactionGaze/releases/latest"); + String pathFile = "C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version\\InterAACtionGazeVersion.txt"; + fileWriter = new FileWriter(pathFile, StandardCharsets.UTF_8); + fileWriter.write("" + softwareJson.get("name")); + fileWriter.close(); + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + } + } + + public void extractGoogle(){ + try { + Process runtime = Runtime.getRuntime().exec("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\extractGoogleChromePortable.bat"); + this.showOutPutCmd(runtime); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void copyElemToDest(Path source, Path elem){ + Path destination = Paths.get("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\GoogleChromePortable", elem.toString().substring(source.toString().length())); + try{ + Files.copy(elem, destination); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void showOutPutCmd(Process process) throws IOException { + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8)); + String output = ""; + while ((output = bufferedReader.readLine()) != null){ + System.out.println(output); + } + bufferedReader.close(); + } + + public void writeVersion(File file){ + FileWriter fileWriter = null; + try { + fileWriter = new FileWriter(file, StandardCharsets.UTF_8); + fileWriter.write("null"); + fileWriter.close(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + try { + if (fileWriter != null){ + fileWriter.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + public void writeInterfaceVersion(File file){ + FileWriter fileWriter = null; + try { + JSONObject softwareJson = JsonReader.readJsonFromUrl("https://api.github.com/repos/InteraactionGroup/InterAACtionBox_Interface/releases/latest"); + String date = "" + softwareJson.get("created_at"); + fileWriter = new FileWriter(file, StandardCharsets.UTF_8); + fileWriter.write("" + softwareJson.get("name") + " Dev v." + date.substring(0, 10).replace("-", ".")); + fileWriter.close(); + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } + + public void openPorts(){ + File sceneFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\InterAACtionScene"); + File augcomFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\AugCom"); + File playerFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\InterAACtionPlayer"); + + if (sceneFolder.exists()){ + try{ + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\sceneServer.bat"); + Process scene = pb.start(); + listPortServer[0] = scene; + this.portSceneOpen = true; + } catch (IOException e) { + e.printStackTrace(); + } + } + if (augcomFolder.exists()){ + try{ + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\augcomServer.bat"); + Process augcom = pb.start(); + listPortServer[1] = augcom; + this.portAugComOpen = true; + } catch (IOException e) { + e.printStackTrace(); + } + } + if (playerFolder.exists()){ + try{ + ProcessBuilder pb = new ProcessBuilder("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\playerServer.bat"); + Process player = pb.start(); + listPortServer[2] = player; + this.portPlayerOpen = true; + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + public void closePorts() { + try { + Runtime.getRuntime().exec("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\close_ports.bat"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void exitAngularApp(){ + ExitAngularAppThread exitThread = new ExitAngularAppThread(); + exitThread.start(); + } + + public static class ExitAngularAppThread extends Thread { + + public ExitAngularAppThread(){ + super(); + } + + public void run(){ + try { + while (true){ + Thread.sleep(5000); + Runtime.getRuntime().exec("C:\\Program Files (x86)\\InterAACtionBoxAFSR\\lib\\scriptsWindows\\close_chrome.bat"); + } + } catch (InterruptedException | IOException e) { + e.printStackTrace(); + } + } + } +} diff --git a/src/main/java/main/utils/UpdateManager.java b/src/main/java/main/utils/UpdateManager.java index 2c926c0..d339382 100644 --- a/src/main/java/main/utils/UpdateManager.java +++ b/src/main/java/main/utils/UpdateManager.java @@ -19,7 +19,7 @@ public class UpdateManager { new UpdateService("GazePlay", "https://api.github.com/repos/AFSR/GazePlay-AFSR/releases/latest"), new UpdateService("InterAACtionPlayer", "https://api.github.com/repos/AFSR/InteraactionPlayer-AFSR/releases/latest"), new UpdateService("InterAACtionGaze","https://api.github.com/repos/InteraactionGroup/interaactionGaze/releases/latest"), - new UpdateService("InterAACtionBox_Interface-linux","https://api.github.com/repos/InteraactionGroup/InterAACtionBox_Interface/releases/latest") + new UpdateService("InterAACtionBox_Interface","https://api.github.com/repos/InteraactionGroup/InterAACtionBox_Interface/releases/latest") }; public UpdateManager(Configuration configuration) { @@ -34,13 +34,11 @@ public UpdateManager(Configuration configuration) { ) )); Thread updateChecker = new Thread(()->{ - while (true) { - try { - checkUpdates(); - Thread.sleep(Duration.ofHours(1).toMillis()); - } catch (InterruptedException e) { - e.printStackTrace(); - } + try { + Thread.sleep(3000); + this.checkUpdates(); + } catch (InterruptedException e) { + e.printStackTrace(); } }); updateChecker.setDaemon(true); @@ -54,4 +52,8 @@ public void checkUpdates() { } } + public void checkSpecificUpdate(UpdateService updateService){ + updateService.checkUpdate(true); + updateService.checkExist(); + } } diff --git a/src/main/java/main/utils/UpdateService.java b/src/main/java/main/utils/UpdateService.java index ad7c178..7cfc7a7 100644 --- a/src/main/java/main/utils/UpdateService.java +++ b/src/main/java/main/utils/UpdateService.java @@ -12,6 +12,8 @@ import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Scanner; @Slf4j public class UpdateService { @@ -28,7 +30,7 @@ public class UpdateService { @Getter final BooleanProperty existProperty; @Getter - private final String name; + public final String name; @Getter private final String updateURL; @Getter @@ -44,7 +46,33 @@ public UpdateService(String name, String updateURL) { this.existProperty = new SimpleBooleanProperty(false); } - public void checkUpdate(boolean testBool) { + public void checkUpdate(boolean testBool){ + if (UtilsOS.isUnix()){ + this.checkUpdateUnix(testBool); + }else { + this.checkUpdateWindows(testBool); + } + } + + public void checkUpdateWindows(boolean testBool){ + if (!updateURL.equals("") && testBool) { + try { + JSONObject softwareJson = JsonReader.readJsonFromUrl(updateURL); + if (softwareJson != null) { + this.version = "" + softwareJson.get("name"); + updateProperty.set(!(softwareJson.get("name").equals(this.readVersion(name)))); + System.out.println("Name json -> " + softwareJson.get("name")); + System.out.println("Name version -> " + this.readVersion(name)); + } + } catch (JSONException | IOException e) { + e.printStackTrace(); + } + } else { + updateProperty.set(false); + } + } + + public void checkUpdateUnix(boolean testBool) { if (!updateURL.equals("") && testBool) { try { if (name.equals("GazePlay")) { @@ -69,7 +97,7 @@ public void checkUpdate(boolean testBool) { updateProperty.set(!((directory.exists() && directory.isDirectory()) || (directoryspace.exists() && directoryspace.isDirectory()))); }); } - }else if (name.equals("InterAACtionBox_Interface-linux")){ + }else if (name.equals("InterAACtionBox_Interface")){ JSONObject softwareJson = JsonReader.readJsonFromUrl(updateURL); if (softwareJson != null) { File directory = new File(System.getProperty("user.home") + "/InterAACtionBox_Interface-linux"); @@ -101,15 +129,59 @@ public void checkUpdate(boolean testBool) { } public void checkExist() { - if (name.equals("GazePlay")) { - File[] directories = new File(System.getProperty("user.home")).listFiles(file -> file.isDirectory() && file.getName().toLowerCase().contains(name.toLowerCase() + "-afsr")); - existProperty.set(directories == null || directories.length == 0); - } else if (name.equals("InterAACtionGaze") || name.equals("InterAACtionBox_Interface-linux")){ - File[] directories = new File(System.getProperty("user.home")).listFiles(file -> file.isDirectory() && file.getName().toLowerCase().contains(name.toLowerCase())); - existProperty.set(directories == null || directories.length == 0); - } else { - File[] directories = new File(System.getProperty("user.home") + "/dist").listFiles(file -> file.isDirectory() && file.getName().toLowerCase().contains(name.toLowerCase())); - existProperty.set(directories == null || directories.length == 0); + if (UtilsOS.isUnix()){ + if (name.equals("GazePlay")) { + File[] directories = new File(System.getProperty("user.home")).listFiles(file -> file.isDirectory() && file.getName().toLowerCase().contains(name.toLowerCase() + "-afsr")); + existProperty.set(directories == null || directories.length == 0); + } else if (name.equals("InterAACtionGaze")) { + File[] directories = new File(System.getProperty("user.home")).listFiles(file -> file.isDirectory() && file.getName().toLowerCase().contains(name.toLowerCase())); + existProperty.set(directories == null || directories.length == 0); + }else if (name.equals("InterAACtionBox_Interface")){ + String nameFolder = name + "-linux"; + File[] directories = new File(System.getProperty("user.home")).listFiles(file -> file.isDirectory() && file.getName().toLowerCase().contains(nameFolder.toLowerCase())); + existProperty.set(directories == null || directories.length == 0); + } else { + File[] directories = new File(System.getProperty("user.home") + "/dist").listFiles(file -> file.isDirectory() && file.getName().toLowerCase().contains(name.toLowerCase())); + existProperty.set(directories == null || directories.length == 0); + } + }else { + switch (name){ + case "InterAACtionScene": + File sceneFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\InterAACtionScene"); + existProperty.set(!sceneFolder.exists()); + break; + case "InterAACtionPlayer": + File playerFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\InterAACtionPlayer"); + existProperty.set(!playerFolder.exists()); + break; + case "AugCom": + File augcomFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\AugCom"); + existProperty.set(!augcomFolder.exists()); + break; + case "GazePlay": + File gazeplayFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\GazePlay"); + existProperty.set(!gazeplayFolder.exists()); + break; + case "InterAACtionGaze": + File gazeFolder = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\interAACtionGaze"); + existProperty.set(!gazeFolder.exists()); + break; + default: + break; + } + } + } + + public String readVersion(String name){ + String version = ""; + try{ + File file = new File("C:\\Users\\" + UtilsOS.getUserNameFromOS() + "\\Documents\\InterAACtionBoxAFSR\\Version\\"+ name + "Version.txt"); + Scanner scanner = new Scanner(file, StandardCharsets.UTF_8); + version = scanner.nextLine(); + scanner.close(); + } catch (IOException e) { + System.out.println("No version found !"); } + return version; } } diff --git a/src/main/java/main/utils/UtilsOS.java b/src/main/java/main/utils/UtilsOS.java index 762e4fa..9b5a447 100644 --- a/src/main/java/main/utils/UtilsOS.java +++ b/src/main/java/main/utils/UtilsOS.java @@ -6,7 +6,7 @@ public class UtilsOS { - private static final String OS = System.getProperty("os.name").toLowerCase(); + public static final String OS = System.getProperty("os.name").toLowerCase(); public static boolean isWindows() { @@ -42,7 +42,7 @@ public static String getUserNameFromOSForPWA(){ return username.replace(" ","_"); } - public static String getUserNameFromOSForGazePlay(){ + public static String getUserNameFromOS(){ return System.getProperty("user.name"); } diff --git a/src/main/java/main/utils/UtilsUI.java b/src/main/java/main/utils/UtilsUI.java index cb92480..a393ae8 100644 --- a/src/main/java/main/utils/UtilsUI.java +++ b/src/main/java/main/utils/UtilsUI.java @@ -94,8 +94,8 @@ public static StackPane createTopBar(Translator translator, Parent parent, Graph backgroundForTitle.setFill(Color.web("#cd2653")); EventHandler goToHomeMenu = (e) -> { - InterAACtionGazeNamedProcessCreator interAACtionGazeNamedProcessCreator = new InterAACtionGazeNamedProcessCreator(); - interAACtionGazeNamedProcessCreator.reOpen(); + /*InterAACtionGazeNamedProcessCreator interAACtionGazeNamedProcessCreator = new InterAACtionGazeNamedProcessCreator(); + interAACtionGazeNamedProcessCreator.reOpen();*/ graphicalMenus.getConfiguration().scene.setRoot(parent); }; diff --git a/src/resources/multilinguism/multilinguism.csv b/src/resources/multilinguism/multilinguism.csv index f5060be..1e7b340 100644 --- a/src/resources/multilinguism/multilinguism.csv +++ b/src/resources/multilinguism/multilinguism.csv @@ -44,6 +44,7 @@ Un problème, Une idée, vous voulez travailler avec nous ? Dites-nous tout ! ;U Objet du message;Objet du message;Subject of the message;; Non, annuler;Non, annuler;No cancel;; Non, aller vers Ubuntu;Non, aller vers Ubuntu;No, go to Ubuntu;; +Non, aller vers Windows;Non, aller vers Windows;No, go to Windows;; Oui, éteindre;Oui, éteindre;Yes, turn off;; Voulez vous vraiment éteindre la box ?;Voulez vous vraiment éteindre la box ?;Do you really want to turn off the box?;; Mises à jour;Mises à jour;Updates;; diff --git a/wget/wget.exe b/wget/wget.exe new file mode 100644 index 0000000..82a0e63 Binary files /dev/null and b/wget/wget.exe differ