Skirda/SkirdaElectronLauncher
4
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Show installing progress bar during extractions.

Browse Source
This commit is contained in:
Daniel Scalzi 2018-07-02 02:24:13 -04:00
parent 41aae0c418
commit 6759b143c4
No known key found for this signature in database
GPG Key ID: 5CA2F145B63535F9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/js/scripts/landing.js
View File

@ -363,8 +363,8 @@ function asyncSystemScan(launchAfter = true){
// Downloading.. // Downloading..
setDownloadPercentage(m.value, m.total, m.percent) setDownloadPercentage(m.value, m.total, m.percent)
} else if(m.task === 1){ } else if(m.task === 1){
// Download will be at 100%, remove the loading from the OS progress bar. // Show installing progress bar.
remote.getCurrentWindow().setProgressBar(-1) remote.getCurrentWindow().setProgressBar(2)
// Wait for extration to complete. // Wait for extration to complete.
const eLStr = 'Extracting' const eLStr = 'Extracting'
@ -381,6 +381,9 @@ function asyncSystemScan(launchAfter = true){
} else if(m.task === 2){ } else if(m.task === 2){
// Download & extraction complete, remove the loading from the OS progress bar.
remote.getCurrentWindow().setProgressBar(-1)
// Extraction completed successfully. // Extraction completed successfully.
ConfigManager.setJavaExecutable(m.jPath) ConfigManager.setJavaExecutable(m.jPath)
ConfigManager.save() ConfigManager.save()
@ -523,6 +526,9 @@ function dlAsync(login = true){
} else if(m.task === 0.7){ } else if(m.task === 0.7){
// Show installing progress bar.
remote.getCurrentWindow().setProgressBar(2)
// Download done, extracting. // Download done, extracting.
const eLStr = 'Extracting libraries' const eLStr = 'Extracting libraries'
let dotStr = '' let dotStr = ''
@ -556,6 +562,7 @@ function dlAsync(login = true){
setOverlayHandler(null) setOverlayHandler(null)
} }
remote.getCurrentWindow().setProgressBar(-1)
toggleOverlay(true) toggleOverlay(true)
toggleLaunchArea(false) toggleLaunchArea(false)
@ -564,7 +571,7 @@ function dlAsync(login = true){
} else if(m.task === 1){ } else if(m.task === 1){
// Download will be at 100%, remove the loading from the OS progress bar. // Download and extraction complete, remove the loading from the OS progress bar.
remote.getCurrentWindow().setProgressBar(-1) remote.getCurrentWindow().setProgressBar(-1)
if(progressListener != null){ if(progressListener != null){
clearInterval(progressListener) clearInterval(progressListener)