From 5d6fdc53754162543261db358916d1abeaf402a4 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Mon, 1 May 2023 13:35:45 +0200 Subject: [PATCH] Added checkbox for start core --- electron.js | 77 +++++++++++++++++++++++++++++++++++++--------- locales/bg.json | 8 ++++- locales/de.json | 8 ++++- locales/en.json | 8 ++++- locales/es.json | 10 ++++-- locales/fr.json | 8 ++++- locales/it.json | 8 ++++- locales/ko.json | 8 ++++- locales/nl.json | 8 ++++- locales/no.json | 8 ++++- locales/pt.json | 8 ++++- locales/pt_BR.json | 8 ++++- locales/ru_RU.json | 8 ++++- locales/tr.json | 8 ++++- locales/uk.json | 8 ++++- locales/zh_CN.json | 8 ++++- locales/zh_TW.json | 8 ++++- package.json | 3 +- 18 files changed, 177 insertions(+), 33 deletions(-) diff --git a/electron.js b/electron.js index aae3c452..c3c92fb7 100644 --- a/electron.js +++ b/electron.js @@ -6,6 +6,7 @@ const path = require('path') const i18n = require('./lib/i18n.js') const fs = require('fs') const electronDl = require('electron-dl') +const Store = require('electron-store') const extract = require('extract-zip') const fetch = require('node-fetch') const execFile = require('child_process').execFile @@ -20,15 +21,21 @@ process.env['APP_PATH'] = app.getAppPath() const homePath = app.getPath('home') const downloadPath = app.getPath('downloads') +const store = new Store() autoUpdater.autoDownload = false autoUpdater.autoInstallOnAppQuit = false autoUpdater.logger = log autoUpdater.logger.transports.file.level = 'info' +if(!store.has('askingCore')) { + store.set('askingCore', false) +} + log.info('App starting...') log.info('App Platform is', process.platform) log.info('Platform arch is', process.arch) +log.info("ASKING CORE", store.get('askingCore')) const winjar = String.raw`C:\Program Files\Qortal\qortal.jar` const winurl = "https://github.com/Qortal/qortal/releases/latest/download/qortal.exe" @@ -90,20 +97,26 @@ async function checkWin() { if (status == true) { log.info("Core is running, perfect !") } else { - const dialogOpts = { - type: 'info', - buttons: [i18n.__("electron_translate_13"), i18n.__("electron_translate_14")], - title: i18n.__("electron_translate_15"), - message: i18n.__("electron_translate_16"), - detail: i18n.__("electron_translate_17") - } - dialog.showMessageBox(dialogOpts).then((returnValue) => { - if (returnValue.response === 0) { - spawn(startWinCore, { detached: true }) - } else { - return + if (!store.get('askingCore')) { + const dialogOpts = { + type: 'info', + buttons: [i18n.__("electron_translate_13"), i18n.__("electron_translate_14")], + title: i18n.__("electron_translate_15"), + message: i18n.__("electron_translate_16"), + detail: i18n.__("electron_translate_17"), + checkboxLabel: i18n.__("electron_translate_28"), + checkboxChecked: false } - }) + dialog.showMessageBox(dialogOpts).then((returnValue) => { + if (returnValue.response === 0) { + spawn(startWinCore, { detached: true }) + store.set('askingCore', returnValue.checkboxChecked) + } else { + store.set('askingCore', returnValue.checkboxChecked) + return + } + }) + } } }) } else { @@ -460,12 +473,16 @@ function checkQortal() { buttons: [i18n.__("electron_translate_13"), i18n.__("electron_translate_14")], title: i18n.__("electron_translate_15"), message: i18n.__("electron_translate_16"), - detail: i18n.__("electron_translate_17") + detail: i18n.__("electron_translate_17"), + checkboxLabel: i18n.__("electron_translate_28"), + checkboxChecked: false } dialog.showMessageBox(dialogOpts).then((returnValue) => { if (returnValue.response === 0) { startQortal() + store.set('askingCore', returnValue.checkboxChecked) } else { + store.set('askingCore', returnValue.checkboxChecked) return } }) @@ -555,12 +572,16 @@ async function checkAndStart() { buttons: [i18n.__("electron_translate_13"), i18n.__("electron_translate_14")], title: i18n.__("electron_translate_15"), message: i18n.__("electron_translate_16"), - detail: i18n.__("electron_translate_17") + detail: i18n.__("electron_translate_17"), + checkboxLabel: i18n.__("electron_translate_28"), + checkboxChecked: false } dialog.showMessageBox(dialogOpts).then((returnValue) => { if (returnValue.response === 0) { startQortal() + store.set('askingCore', returnValue.checkboxChecked) } else { + store.set('askingCore', returnValue.checkboxChecked) return } }) @@ -756,6 +777,32 @@ const createTray = () => { { type: 'separator', }, + { + label: i18n.__("electron_translate_31"), + click: function () { + const dialogOpts = { + type: 'info', + noLink: true, + buttons: [i18n.__("electron_translate_29"), i18n.__("electron_translate_30")], + title: i18n.__("electron_translate_31"), + message: i18n.__("electron_translate_32"), + detail: i18n.__("electron_translate_33"), + checkboxLabel: i18n.__("electron_translate_28"), + checkboxChecked: store.get('askingCore') + } + dialog.showMessageBox(dialogOpts).then((returnValue) => { + if (returnValue.response === 0) { + store.set('askingCore', returnValue.checkboxChecked) + } else { + store.set('askingCore', returnValue.checkboxChecked) + return + } + }) + }, + }, + { + type: 'separator', + }, { label: i18n.__("electron_translate_1"), click: function () { diff --git a/locales/bg.json b/locales/bg.json index 1bb52192..e2439bed 100644 --- a/locales/bg.json +++ b/locales/bg.json @@ -27,5 +27,11 @@ "electron_translate_24": "НЕ БЛАГОДАРЯ", "electron_translate_25": "Java не е инсталирана.", "electron_translate_26": "Qortal UI откри, че Java не е инсталирана на вашата система.", - "electron_translate_27": "Щракнете върху ИЗТЕГЛЯНЕ на JAVA, за да изтеглите и инсталирате Java, или върху НЕ, БЛАГОДАРЯ, за да не я изтеглите и инсталирате." + "electron_translate_27": "Щракнете върху ИЗТЕГЛЯНЕ на JAVA, за да изтеглите и инсталирате Java, или върху НЕ, БЛАГОДАРЯ, за да не я изтеглите и инсталирате.", + "electron_translate_28": "Никога повече не ме питай", + "electron_translate_29": "ПРОМЯНА НА НАСТРОЙКАТА", + "electron_translate_30": "ОТКАЗ", + "electron_translate_31": "Стартиране на основните настройки", + "electron_translate_32": "Промяна на текущото състояние на запитване за стартиране на ядрото, ако то не работи", + "electron_translate_33": "(Поставете отметка или премахнете отметката от квадратчето никога повече да не ме питате)" } \ No newline at end of file diff --git a/locales/de.json b/locales/de.json index 135b0bd1..730b0744 100644 --- a/locales/de.json +++ b/locales/de.json @@ -27,5 +27,11 @@ "electron_translate_24": "NEIN DANKE", "electron_translate_25": "Java ist nicht installiert.", "electron_translate_26": "Qortal UI hat festgestellt, dass Java nicht auf Ihrem System installiert ist.", - "electron_translate_27": "Klicken Sie auf JAVA HERUNTERLADEN, um Java herunterzuladen und zu installieren, oder auf NEIN DANKE, um es nicht herunterzuladen und zu installieren." + "electron_translate_27": "Klicken Sie auf JAVA HERUNTERLADEN, um Java herunterzuladen und zu installieren, oder auf NEIN DANKE, um es nicht herunterzuladen und zu installieren.", + "electron_translate_28": "Frag mich nie wieder", + "electron_translate_29": "EINSTELLUNG ÄNDERN", + "electron_translate_30": "ABBRECHEN", + "electron_translate_31": "Core-Einstellungen starten", + "electron_translate_32": "Ändern Sie den aktuellen Status der Aufforderung, den Core zu starten, wenn er nicht läuft", + "electron_translate_33": "(Aktivieren oder deaktivieren Sie das Kontrollkästchen Frag mich nie wieder)" } \ No newline at end of file diff --git a/locales/en.json b/locales/en.json index 19db1fd3..935e6256 100644 --- a/locales/en.json +++ b/locales/en.json @@ -27,5 +27,11 @@ "electron_translate_24": "NO THANKS", "electron_translate_25": "Java is not installed.", "electron_translate_26": "Qortal UI has detected that java is not installed on your system.", - "electron_translate_27": "Click on DOWNLOAD JAVA to download and install java or on NO THANKS to not download and install it." + "electron_translate_27": "Click on DOWNLOAD JAVA to download and install java or on NO THANKS to not download and install it.", + "electron_translate_28": "Never ask me again", + "electron_translate_29": "CHANGE SETTING", + "electron_translate_30": "CANCEL", + "electron_translate_31": "Start Core Setiings", + "electron_translate_32": "Change the current status of asking to start the core if it is not running", + "electron_translate_33": "(Check or Uncheck the never ask me again checkbox)" } \ No newline at end of file diff --git a/locales/es.json b/locales/es.json index db652389..681156f5 100644 --- a/locales/es.json +++ b/locales/es.json @@ -26,6 +26,12 @@ "electron_translate_23": "DESCARGAR JAVA", "electron_translate_24": "NO GRACIAS", "electron_translate_25": "Java no está instalado.", - "electron_translate_26": "La interfaz de usuario de Qortal ha detectado que Java no está instalado en su sistema"., - "electron_translate_27": "Haz clic en DESCARGAR JAVA para descargar e instalar Java o en NO GRACIAS para no descargarlo e instalarlo". + "electron_translate_26": "La interfaz de usuario de Qortal ha detectado que Java no está instalado en su sistema.", + "electron_translate_27": "Haz clic en DESCARGAR JAVA para descargar e instalar Java o en NO GRACIAS para no descargarlo e instalarlo.", + "electron_translate_28": "Nunca me vuelvas a preguntar", + "electron_translate_29": "CAMBIAR CONFIGURACIÓN", + "electron_translate_30": "CANCELAR", + "electron_translate_31": "Iniciar configuración básica", + "electron_translate_32": "Cambiar el estado actual de solicitar iniciar el núcleo si no se está ejecutando", + "electron_translate_33": "(Marque o desmarque la casilla de verificación Nunca volver a preguntarme)" } \ No newline at end of file diff --git a/locales/fr.json b/locales/fr.json index 8ba1ade2..ea306fee 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -27,5 +27,11 @@ "electron_translate_24": "NON MERCI", "electron_translate_25": "Java n'est pas installé.", "electron_translate_26": "L'interface utilisateur Qortal a détecté que Java n'est pas installé sur votre système.", - "electron_translate_27": "Cliquez sur TÉLÉCHARGER JAVA pour télécharger et installer java ou sur NON MERCI pour ne pas le télécharger et l'installer." + "electron_translate_27": "Cliquez sur TÉLÉCHARGER JAVA pour télécharger et installer java ou sur NON MERCI pour ne pas le télécharger et l'installer.", + "electron_translate_28": "Ne me demande plus jamais", + "electron_translate_29": "MODIFIER LE PARAMÈTRE", + "electron_translate_30": "ANNULER", + "electron_translate_31": "Démarrer les paramètres de base", + "electron_translate_32": "Modifier l'état actuel de la demande de démarrage du noyau s'il n'est pas en cours d'exécution", + "electron_translate_33": "(Cochez ou décochez la case Ne plus jamais me demander)" } \ No newline at end of file diff --git a/locales/it.json b/locales/it.json index a3684fb3..62d138d4 100644 --- a/locales/it.json +++ b/locales/it.json @@ -27,5 +27,11 @@ "electron_translate_24": "NO GRAZIE", "electron_translate_25": "Java non è installato.", "electron_translate_26": "Qortal UI ha rilevato che java non è installato sul tuo sistema.", - "electron_translate_27": "Clicca su SCARICA JAVA per scaricare e installare java o su NO GRAZIE per non scaricarlo e installarlo." + "electron_translate_27": "Clicca su SCARICA JAVA per scaricare e installare java o su NO GRAZIE per non scaricarlo e installarlo.", + "electron_translate_28": "Non chiedermelo mai più", + "electron_translate_29": "MODIFICA IMPOSTAZIONE", + "electron_translate_30": "ANNULLA", + "electron_translate_31": "Avvia impostazioni di base", + "electron_translate_32": "Cambia lo stato attuale della richiesta di avvio del core se non è in esecuzione", + "electron_translate_33": "(Seleziona o deseleziona la casella di controllo Non chiedermelo più)" } \ No newline at end of file diff --git a/locales/ko.json b/locales/ko.json index dc1d8ec1..69750644 100644 --- a/locales/ko.json +++ b/locales/ko.json @@ -27,5 +27,11 @@ "electron_translate_24": "고마워요", "electron_translate_25": "자바가 설치되지 않았습니다.", "electron_translate_26": "Qortal UI에서 시스템에 Java가 설치되어 있지 않음을 감지했습니다.", - "electron_translate_27": "Java를 다운로드하여 설치하려면 JAVA 다운로드를 클릭하고, 다운로드 및 설치하지 않으려면 NO THANKS를 클릭하십시오." + "electron_translate_27": "Java를 다운로드하여 설치하려면 JAVA 다운로드를 클릭하고, 다운로드 및 설치하지 않으려면 NO THANKS를 클릭하십시오.", + "electron_translate_28": "다시 묻지 않음", + "electron_translate_29": "설정 변경", + "electron_translate_30": "취소", + "electron_translate_31": "핵심 설정 시작", + "electron_translate_32": "코어가 실행 중이 아닌 경우 코어 시작을 요청하는 현재 상태 변경", + "electron_translate_33": "(다시 묻지 않음 확인란 선택 또는 선택 취소)" } \ No newline at end of file diff --git a/locales/nl.json b/locales/nl.json index b9fe7571..26164260 100644 --- a/locales/nl.json +++ b/locales/nl.json @@ -27,5 +27,11 @@ "electron_translate_24": "NEE BEDANKT", "electron_translate_25": "Java is niet geïnstalleerd.", "electron_translate_26": "Qortal UI heeft gedetecteerd dat java niet op uw systeem is geïnstalleerd.", - "electron_translate_27": "Klik op DOWNLOAD JAVA om java te downloaden en te installeren of op NO BEDANKT om het niet te downloaden en te installeren." + "electron_translate_27": "Klik op DOWNLOAD JAVA om java te downloaden en te installeren of op NO BEDANKT om het niet te downloaden en te installeren.", + "electron_translate_28": "Vraag het me nooit meer", + "electron_translate_29": "INSTELLING WIJZIGEN", + "electron_translate_30": "ANNULEREN", + "electron_translate_31": "Kerninstellingen starten", + "electron_translate_32": "Wijzig de huidige status van vragen om de kern te starten als deze niet draait", + "electron_translate_33": "(vink het selectievakje Nooit meer vragen aan of uit)" } \ No newline at end of file diff --git a/locales/no.json b/locales/no.json index 06bfc8e7..c3e0d7d8 100644 --- a/locales/no.json +++ b/locales/no.json @@ -27,5 +27,11 @@ "electron_translate_24": "NEI TAKK", "electron_translate_25": "Java er ikke installert.", "electron_translate_26": "Qortal UI har oppdaget at Java ikke er installert på systemet ditt.", - "electron_translate_27": "Klikk på LAST NED JAVA for å laste ned og installere Java, eller på NEI TAKK for å ikke laste ned og installere det." + "electron_translate_27": "Klikk på LAST NED JAVA for å laste ned og installere Java, eller på NEI TAKK for å ikke laste ned og installere det.", + "electron_translate_28": "Aldri spør meg igjen", + "electron_translate_29": "ENDRE INNSTILLING", + "electron_translate_30": "AVBRYT", + "electron_translate_31": "Start kjerneinnstillinger", + "electron_translate_32": "Endre gjeldende status for å spørre om å starte kjernen hvis den ikke kjører", + "electron_translate_33": "(Merk av eller fjern merket for aldri spør meg igjen)" } \ No newline at end of file diff --git a/locales/pt.json b/locales/pt.json index c33077f9..be7d580d 100644 --- a/locales/pt.json +++ b/locales/pt.json @@ -27,5 +27,11 @@ "electron_translate_24": "NÃO, OBRIGADO", "electron_translate_25": "Java não está instalado.", "electron_translate_26": "Qortal UI detectou que o java não está instalado em seu sistema.", - "electron_translate_27": "Clique em DOWNLOAD JAVA para baixar e instalar o java ou em NÃO, OBRIGADO para não baixar e instalar." + "electron_translate_27": "Clique em DOWNLOAD JAVA para baixar e instalar o java ou em NÃO, OBRIGADO para não baixar e instalar.", + "electron_translate_28": "Nunca mais me pergunte", + "electron_translate_29": "ALTERAR CONFIGURAÇÃO", + "electron_translate_30": "CANCELAR", + "electron_translate_31": "Iniciar configurações do núcleo", + "electron_translate_32": "Alterar o status atual de pedir para iniciar o núcleo se não estiver em execução", + "electron_translate_33": "(Marque ou desmarque a caixa de seleção para nunca mais me perguntar)" } \ No newline at end of file diff --git a/locales/pt_BR.json b/locales/pt_BR.json index 6f5ac94b..eb57eed5 100644 --- a/locales/pt_BR.json +++ b/locales/pt_BR.json @@ -27,5 +27,11 @@ "electron_translate_24": "NÃO, OBRIGADO", "electron_translate_25": "Java não está instalado.", "electron_translate_26": "Qortal UI detectou que o java não está instalado em seu sistema.", - "electron_translate_27": "Clique em DOWNLOAD JAVA para baixar e instalar o java ou em NÃO, OBRIGADO para não baixar e instalar." + "electron_translate_27": "Clique em DOWNLOAD JAVA para baixar e instalar o java ou em NÃO, OBRIGADO para não baixar e instalar.", + "electron_translate_28": "Nunca mais me pergunte", + "electron_translate_29": "ALTERAR CONFIGURAÇÃO", + "electron_translate_30": "CANCELAR", + "electron_translate_31": "Iniciar configurações do núcleo", + "electron_translate_32": "Alterar o status atual de pedir para iniciar o núcleo se não estiver em execução", + "electron_translate_33": "(Marque ou desmarque a caixa de seleção para nunca mais me perguntar)" } \ No newline at end of file diff --git a/locales/ru_RU.json b/locales/ru_RU.json index a822eb26..b1dbdd5a 100644 --- a/locales/ru_RU.json +++ b/locales/ru_RU.json @@ -27,5 +27,11 @@ "electron_translate_24": "НЕТ, СПАСИБО", "electron_translate_25": "Java не установлена.", "electron_translate_26": "Пользовательский интерфейс Qortal обнаружил, что в вашей системе не установлена Java.", - "electron_translate_27": "Нажмите ЗАГРУЗИТЬ JAVA, чтобы загрузить и установить Java, или НЕТ, СПАСИБО, чтобы не загружать и устанавливать его." + "electron_translate_27": "Нажмите ЗАГРУЗИТЬ JAVA, чтобы загрузить и установить Java, или НЕТ, СПАСИБО, чтобы не загружать и устанавливать его.", + "electron_translate_28": "Никогда больше не спрашивайте меня", + "electron_translate_29": "ИЗМЕНИТЬ НАСТРОЙКИ", + "electron_translate_30": "ОТМЕНИТЬ", + "electron_translate_31": "Начать основные настройки", + "electron_translate_32": "Изменить текущий статус запроса на запуск ядра, если оно не запущено", + "electron_translate_33": "(Установите или снимите флажок Больше не спрашивать)" } \ No newline at end of file diff --git a/locales/tr.json b/locales/tr.json index 6b3f100d..4720b360 100644 --- a/locales/tr.json +++ b/locales/tr.json @@ -27,5 +27,11 @@ "electron_translate_24": "TEŞEKKÜR ETMİYORUM", "electron_translate_25": "Java yüklü değil.", "electron_translate_26": "Qortal UI sisteminizde java'nın kurulu olmadığını tespit etti.", - "electron_translate_27": "Java'yı indirip yüklemek için JAVA'YI İNDİR'e, indirip kurmamak için HAYIR'a TEŞEKKÜRLER'e tıklayın." + "electron_translate_27": "Java'yı indirip yüklemek için JAVA'YI İNDİR'e, indirip kurmamak için HAYIR'a TEŞEKKÜRLER'e tıklayın.", + "electron_translate_28": "Bir daha asla sorma", + "electron_translate_29": "AYARI DEĞİŞTİR", + "electron_translate_30": "İPTAL", + "electron_translate_31": "Temel Ayarları Başlat", + "electron_translate_32": "Çalışmıyorsa çekirdeği başlatma isteğinin mevcut durumunu değiştir", + "electron_translate_33": "(Bana bir daha asla sorma onay kutusunu işaretleyin veya işaretini kaldırın)" } \ No newline at end of file diff --git a/locales/uk.json b/locales/uk.json index f42c78fd..6113bc9a 100644 --- a/locales/uk.json +++ b/locales/uk.json @@ -27,5 +27,11 @@ "electron_translate_24": "NO THANKS", "electron_translate_25": "Java is not installed.", "electron_translate_26": "Qortal UI has detected that java is not installed on your system.", - "electron_translate_27": "Click on DOWNLOAD JAVA to download and install java or on NO THANKS to not download and install it." + "electron_translate_27": "Click on DOWNLOAD JAVA to download and install java or on NO THANKS to not download and install it.", + "electron_translate_28": "Never ask me again", + "electron_translate_29": "CHANGE SETTING", + "electron_translate_30": "CANCEL", + "electron_translate_31": "Start Core Setiings", + "electron_translate_32": "Change the current status of asking to start the core if it is not running", + "electron_translate_33": "(Check or Uncheck the never ask me again checkbox)" } \ No newline at end of file diff --git a/locales/zh_CN.json b/locales/zh_CN.json index b7c9f26f..5d83da70 100644 --- a/locales/zh_CN.json +++ b/locales/zh_CN.json @@ -27,5 +27,11 @@ "electron_translate_24": "不用谢", "electron_translate_25": "Java 未安装。", "electron_translate_26": "Qortal UI 检测到您的系统上没有安装 java。", - "electron_translate_27": "点击 DOWNLOAD JAVA 下载并安装 java 或点击 NO THANKS 不下载并安装它。" + "electron_translate_27": "点击 DOWNLOAD JAVA 下载并安装 java 或点击 NO THANKS 不下载并安装它。", + "electron_translate_28": "不要再问我", + "electron_translate_29": "更改设置", + "electron_translate_30": "取消", + "electron_translate_31": "开始核心设置", + "electron_translate_32": "更改核心未运行时要求启动的当前状态", + "electron_translate_33": "（选中或取消选中不再询问复选框）" } \ No newline at end of file diff --git a/locales/zh_TW.json b/locales/zh_TW.json index d64de524..73082e4f 100644 --- a/locales/zh_TW.json +++ b/locales/zh_TW.json @@ -27,5 +27,11 @@ "electron_translate_24": "不用謝", "electron_translate_25": "Java 未安裝。", "electron_translate_26": "Qortal UI 檢測到您的系統上沒有安裝 java。", - "electron_translate_27": "點擊 DOWNLOAD JAVA 下載並安裝 java 或點擊 NO THANKS 不下載並安裝它。" + "electron_translate_27": "點擊 DOWNLOAD JAVA 下載並安裝 java 或點擊 NO THANKS 不下載並安裝它。", + "electron_translate_28": "不要再問我", + "electron_translate_29": "更改設置", + "electron_translate_30": "取消", + "electron_translate_31": "開始核心設置", + "electron_translate_32": "更改核心未運行時要求啟動的當前狀態", + "electron_translate_33": "（勾選或取消勾選不再詢問複選框）" } \ No newline at end of file diff --git a/package.json b/package.json index f7611aa5..b4d57976 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "electron-log": "4.4.8", "electron-updater": "5.3.0", "electron-dl": "3.5.0", + "electron-store": "8.1.0", "extract-zip": "2.0.1", "node-fetch": "2.6.9", "os-locale": "3.0.0" @@ -48,4 +49,4 @@ "engines": { "node": ">=18.14.0" } -} +} \ No newline at end of file