Compare commits
12 Commits
8778398d31
...
fix/balanc
| Author | SHA1 | Date | |
|---|---|---|---|
| 0942691eb3 | |||
| a2f84be2d4 | |||
| 7e8b99a82b | |||
| 29274c2f48 | |||
| 870793433b | |||
| 08cfeb0e08 | |||
| 5daf2d83b6 | |||
| 6d26ccd0ed | |||
| a7514becbc | |||
| 558cfcbe56 | |||
| d0bd55b9c1 | |||
| b37d3d97b6 |
Binary file not shown.
@@ -74,6 +74,9 @@
|
||||
"av_title": "Windows Defender hat den Miner blockiert",
|
||||
"available": "Verfügbar",
|
||||
"backup_backing_up": "Sicherung läuft...",
|
||||
"backup_col_backup": "SICHERUNG",
|
||||
"backup_col_export": "EXPORTIEREN",
|
||||
"backup_col_import": "IMPORTIEREN & WIEDERHERSTELLEN",
|
||||
"backup_create": "Sicherung erstellen",
|
||||
"backup_created": "Wallet-Sicherung erstellt",
|
||||
"backup_data": "SICHERUNG & DATEN",
|
||||
@@ -423,6 +426,7 @@
|
||||
"daemon_bundled": "Gebündelt",
|
||||
"daemon_install_bundled": "Gebündelten installieren",
|
||||
"daemon_installed": "Installiert",
|
||||
"daemon_maintenance_label": "WARTUNG",
|
||||
"daemon_none_bundled": "keiner in diesem Build",
|
||||
"daemon_not_installed": "nicht installiert",
|
||||
"daemon_status_differ": "Installierte Binärdatei unterscheidet sich von der gebündelten Version.",
|
||||
@@ -458,6 +462,7 @@
|
||||
"daemon_update_verify_note": "Der Download wird vor der Installation anhand der veröffentlichten SHA-256-Prüfsumme des Releases und einer fest hinterlegten ed25519-Signatur verifiziert.",
|
||||
"daemon_update_verifying": "Wird verifiziert…",
|
||||
"daemon_update_version": "Version:",
|
||||
"daemon_updates_label": "AKTUALISIERUNGEN",
|
||||
"daemon_version": "Daemon",
|
||||
"dark": "Dunkel",
|
||||
"data_stale_prefix": "Aktualisiert",
|
||||
@@ -1228,6 +1233,7 @@
|
||||
"sb_waiting_daemon_err": "Warten auf dragonxd — %s",
|
||||
"sb_warming_up": "Aufwärmen...",
|
||||
"sb_witness_cache": "Zeugen werden neu aufgebaut",
|
||||
"scale_effects": "SKALIERUNG & EFFEKTE",
|
||||
"screenshot_open_dir": "Speicherort öffnen",
|
||||
"screenshot_sweep": "Screenshot-Durchlauf ausführen",
|
||||
"screenshot_sweep_desc": "Durchläuft jedes Design über jeden Tab und speichert von jedem einen Screenshot in tab-spezifischen Unterordnern im Screenshots-Ordner des Konfigurationsverzeichnisses (überschreibt den vorherigen Durchlauf). Läuft einige Sekunden.",
|
||||
@@ -1316,12 +1322,12 @@
|
||||
"settings": "Einstellungen",
|
||||
"settings_about_text": "Eine geschirmte Kryptowährungs-Wallet für DragonX (DRGX), erstellt mit Dear ImGui für ein leichtes, portables Erlebnis.",
|
||||
"settings_acrylic_level": "Acrylstufe:",
|
||||
"settings_address_book": "Adressbuch...",
|
||||
"settings_address_book": "Adressbuch…",
|
||||
"settings_auto_detected": "Automatisch erkannt aus DRAGONX.conf",
|
||||
"settings_auto_lock": "AUTO-SPERRE",
|
||||
"settings_auto_shield_desc": "Transparente Guthaben automatisch an geschirmte Adressen verschieben",
|
||||
"settings_auto_shield_funds": "Transparente Guthaben automatisch abschirmen",
|
||||
"settings_backup": "Sicherung...",
|
||||
"settings_backup": "Sicherung…",
|
||||
"settings_block_explorer_urls": "Block-Explorer-URLs",
|
||||
"settings_builtin": "Integriert",
|
||||
"settings_change_passphrase": "Passphrase ändern",
|
||||
@@ -1335,7 +1341,7 @@
|
||||
"settings_copy_diagnostics": "Diagnose kopieren",
|
||||
"settings_copyright": "Copyright 2024-2026 DragonX-Entwickler | GPLv3-Lizenz",
|
||||
"settings_custom": "Benutzerdefiniert",
|
||||
"settings_data_dir": "Datenverzeichnis:",
|
||||
"settings_data_dir": "Datenverzeichnis",
|
||||
"settings_debug_changed": "Debug-Kategorien geändert — Daemon neu starten zum Anwenden",
|
||||
"settings_debug_restart_note": "Änderungen werden nach einem Neustart des Daemons wirksam.",
|
||||
"settings_debug_select": "Kategorien auswählen, um Daemon-Fehlerprotokollierung zu aktivieren (-debug= Flags).",
|
||||
@@ -1343,18 +1349,18 @@
|
||||
"settings_encrypt_first_pin": "Verschlüsseln Sie zuerst die Wallet, um PIN zu aktivieren",
|
||||
"settings_encrypt_wallet": "Wallet verschlüsseln",
|
||||
"settings_explorer_hint": "URLs sollten einen abschließenden Schrägstrich enthalten. Die txid/Adresse wird angehängt.",
|
||||
"settings_export_all": "Alle exportieren...",
|
||||
"settings_export_csv": "CSV exportieren...",
|
||||
"settings_export_key": "Schlüssel exportieren...",
|
||||
"settings_export_all": "Alle exportieren…",
|
||||
"settings_export_csv": "CSV exportieren…",
|
||||
"settings_export_key": "Schlüssel exportieren…",
|
||||
"settings_gradient_bg": "Hintergrund-Verlauf",
|
||||
"settings_gradient_desc": "Strukturierte Hintergründe durch sanfte Verläufe ersetzen",
|
||||
"settings_idle_after": "nach",
|
||||
"settings_import_key": "Privaten Schlüssel importieren...",
|
||||
"settings_import_viewkey": "Anzeigeschlüssel importieren...",
|
||||
"settings_import_key": "Privaten Schlüssel importieren…",
|
||||
"settings_import_viewkey": "Anzeigeschlüssel importieren…",
|
||||
"settings_language_note": "Hinweis: Manche Texte erfordern einen Neustart zur Aktualisierung",
|
||||
"settings_lock_now": "Jetzt sperren",
|
||||
"settings_locked": "Gesperrt",
|
||||
"settings_merge_to_address": "An Adresse zusammenführen...",
|
||||
"settings_merge_to_address": "An Adresse zusammenführen…",
|
||||
"settings_noise_opacity": "Rauschdichte:",
|
||||
"settings_not_connected": "Nicht mit dem Daemon verbunden",
|
||||
"settings_not_encrypted": "Nicht verschlüsselt",
|
||||
@@ -1370,7 +1376,7 @@
|
||||
"settings_reloaded": "Einstellungen von der Festplatte neu geladen",
|
||||
"settings_remove_encryption": "Verschlüsselung entfernen",
|
||||
"settings_remove_pin": "PIN entfernen",
|
||||
"settings_request_payment": "Zahlung anfordern...",
|
||||
"settings_request_payment": "Zahlung anfordern…",
|
||||
"settings_rescan_desc": "Blockchain nach fehlenden Transaktionen neu scannen",
|
||||
"settings_restart_daemon": "Daemon neu starten",
|
||||
"settings_rpc_connection": "RPC-Verbindung",
|
||||
@@ -1381,20 +1387,20 @@
|
||||
"settings_save_shielded_local": "Geschirmten Transaktionsverlauf lokal speichern",
|
||||
"settings_saved": "Einstellungen gespeichert",
|
||||
"settings_set_pin": "PIN festlegen",
|
||||
"settings_shield_mining": "Mining abschirmen...",
|
||||
"settings_shield_mining": "Mining abschirmen…",
|
||||
"settings_solid_colors_desc": "Feste Farben anstelle von Unschärfe-Effekten verwenden (Barrierefreiheit)",
|
||||
"settings_theme_refreshed": "Themenliste aktualisiert",
|
||||
"settings_tor_desc": "Alle Verbindungen für erhöhte Privatsphäre über Tor leiten",
|
||||
"settings_unlocked": "Entsperrt",
|
||||
"settings_use_tor_network": "Tor für Netzwerkverbindungen verwenden",
|
||||
"settings_validate_address": "Adresse überprüfen...",
|
||||
"settings_validate_address": "Adresse überprüfen…",
|
||||
"settings_visual_effects": "Visuelle Effekte",
|
||||
"settings_wallet_file_size": "Wallet-Dateigröße: %s",
|
||||
"settings_wallet_info": "Wallet-Informationen",
|
||||
"settings_wallet_location": "Wallet-Speicherort: %s",
|
||||
"settings_wallet_maintenance": "Wallet-Wartung",
|
||||
"settings_wallet_not_found": "Wallet-Datei nicht gefunden",
|
||||
"settings_wallet_size_label": "Wallet-Größe:",
|
||||
"settings_wallet_size_label": "Wallet-Größe",
|
||||
"settings_ztx_cleared": "Z-Transaktionsverlauf gelöscht",
|
||||
"settings_ztx_not_found": "Keine Verlaufsdatei gefunden",
|
||||
"setup_wizard": "Einrichtungsassistent",
|
||||
@@ -1494,6 +1500,7 @@
|
||||
"to_upper": "AN",
|
||||
"tools": "WERKZEUGE",
|
||||
"tools_actions": "Werkzeuge & Aktionen...",
|
||||
"tools_actions_hdr": "WERKZEUGE & AKTIONEN",
|
||||
"total": "Gesamt",
|
||||
"total_balance_label": "Gesamtguthaben",
|
||||
"transaction_id": "TRANSAKTIONS-ID",
|
||||
@@ -1517,7 +1524,7 @@
|
||||
"tt_auto_shield": "Transparentes Guthaben automatisch an geschirmte Adressen für Datenschutz verschieben",
|
||||
"tt_backup": "Eine Sicherungskopie Ihrer wallet.dat erstellen",
|
||||
"tt_block_explorer": "Den DragonX Block-Explorer im Browser öffnen",
|
||||
"tt_blur": "Unschärfe-Stärke (0%% = aus, 100%% = maximum)",
|
||||
"tt_blur": "Unschärfe-Stärke (0% = aus, 100% = maximum)",
|
||||
"tt_change_pass": "Die Wallet-Verschlüsselungspassphrase ändern",
|
||||
"tt_change_pin": "Ihre Entsperr-PIN ändern",
|
||||
"tt_chat_bubble_accent": "Akzentfarbe für deine ausgehenden Nachrichtenblasen (oder dem aktuellen Theme folgen)",
|
||||
@@ -1580,7 +1587,7 @@
|
||||
"tt_low_spec": "Alle aufwendigen visuellen Effekte deaktivieren\\nHotkey: Ctrl+Shift+Down",
|
||||
"tt_merge": "Mehrere UTXOs einer Adresse zusammenführen",
|
||||
"tt_mine_idle": "Mining automatisch starten, wenn das\\nSystem inaktiv ist (keine Tastatur-/Mauseingabe)",
|
||||
"tt_noise": "Körnungstextur-Intensität (0%% = aus, 100%% = maximum)",
|
||||
"tt_noise": "Körnungstextur-Intensität (0% = aus, 100% = maximum)",
|
||||
"tt_open_app_dir": "Den ObsidianDragon-Ordner (Einstellungen, Themes, Logs) im Dateimanager öffnen",
|
||||
"tt_open_data_dir": "Den Ordner mit Ihren Wallet- und Blockchain-Daten im Dateimanager öffnen",
|
||||
"tt_open_dir": "Klicken, um im Dateimanager zu öffnen",
|
||||
@@ -1619,7 +1626,7 @@
|
||||
"tt_theme_hotkey": "Hotkey: Ctrl+Links/Rechts zum Wechseln der Themes",
|
||||
"tt_tor": "Daemon-Verbindungen für Anonymität über das Tor-Netzwerk leiten",
|
||||
"tt_tx_url": "Basis-URL zum Anzeigen von Transaktionen in einem Block-Explorer",
|
||||
"tt_ui_opacity": "Karten- und Seitenleisten-Deckkraft (100%% = vollständig undurchsichtig, niedriger = durchsichtiger)",
|
||||
"tt_ui_opacity": "Karten- und Seitenleisten-Deckkraft (100% = vollständig undurchsichtig, niedriger = durchsichtiger)",
|
||||
"tt_validate": "Prüfen, ob eine DragonX-Adresse gültig ist",
|
||||
"tt_verbose": "Detaillierte Verbindungsdiagnosen,\\nDaemon-Status und Port-Besitzer-Info\\nin der Konsolen-Registerkarte protokollieren",
|
||||
"tt_wallets_button": "Ihre Wallet-Dateien auflisten und zwischen ihnen wechseln",
|
||||
@@ -1831,4 +1838,4 @@
|
||||
"your_addresses": "Ihre Adressen",
|
||||
"z_address": "Z-Adresse",
|
||||
"z_addresses": "Z-Adressen"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,6 +74,9 @@
|
||||
"av_title": "Windows Defender bloqueó el minero",
|
||||
"available": "Disponible",
|
||||
"backup_backing_up": "Respaldando...",
|
||||
"backup_col_backup": "COPIA DE SEGURIDAD",
|
||||
"backup_col_export": "EXPORTAR",
|
||||
"backup_col_import": "IMPORTAR Y RESTAURAR",
|
||||
"backup_create": "Crear Respaldo",
|
||||
"backup_created": "Respaldo de cartera creado",
|
||||
"backup_data": "RESPALDO Y DATOS",
|
||||
@@ -423,6 +426,7 @@
|
||||
"daemon_bundled": "Incluido",
|
||||
"daemon_install_bundled": "Instalar integrado",
|
||||
"daemon_installed": "Instalado",
|
||||
"daemon_maintenance_label": "MANTENIMIENTO",
|
||||
"daemon_none_bundled": "ninguno en esta compilación",
|
||||
"daemon_not_installed": "no instalado",
|
||||
"daemon_status_differ": "El binario instalado difiere de la versión incluida.",
|
||||
@@ -458,6 +462,7 @@
|
||||
"daemon_update_verify_note": "La descarga se verifica frente al SHA-256 publicado de la versión y una firma ed25519 fijada antes de instalarla.",
|
||||
"daemon_update_verifying": "Verificando…",
|
||||
"daemon_update_version": "Versión:",
|
||||
"daemon_updates_label": "ACTUALIZACIONES",
|
||||
"daemon_version": "Daemon",
|
||||
"dark": "Oscuro",
|
||||
"data_stale_prefix": "Actualizado",
|
||||
@@ -1228,6 +1233,7 @@
|
||||
"sb_waiting_daemon_err": "Esperando a dragonxd — %s",
|
||||
"sb_warming_up": "Calentando...",
|
||||
"sb_witness_cache": "Reconstruyendo testigos",
|
||||
"scale_effects": "ESCALA Y EFECTOS",
|
||||
"screenshot_open_dir": "Abrir ubicación",
|
||||
"screenshot_sweep": "Ejecutar barrido de capturas",
|
||||
"screenshot_sweep_desc": "Recorre cada tema en cada pestaña y guarda una captura de pantalla de cada una en subcarpetas por pestaña dentro de la carpeta de capturas del directorio de configuración (sobrescribiendo el barrido anterior). Se ejecuta durante unos segundos.",
|
||||
@@ -1316,12 +1322,12 @@
|
||||
"settings": "Ajustes",
|
||||
"settings_about_text": "Una billetera de criptomonedas blindada para DragonX (DRGX), creada con Dear ImGui para una experiencia ligera y portátil.",
|
||||
"settings_acrylic_level": "Nivel de acrílico:",
|
||||
"settings_address_book": "Libreta de direcciones...",
|
||||
"settings_address_book": "Libreta de direcciones…",
|
||||
"settings_auto_detected": "Autodetectado de DRAGONX.conf",
|
||||
"settings_auto_lock": "BLOQUEO AUTOMÁTICO",
|
||||
"settings_auto_shield_desc": "Mover automáticamente fondos transparentes a direcciones blindadas",
|
||||
"settings_auto_shield_funds": "Blindar fondos transparentes automáticamente",
|
||||
"settings_backup": "Respaldo...",
|
||||
"settings_backup": "Respaldo…",
|
||||
"settings_block_explorer_urls": "URLs del explorador de bloques",
|
||||
"settings_builtin": "Integrado",
|
||||
"settings_change_passphrase": "Cambiar contraseña",
|
||||
@@ -1335,7 +1341,7 @@
|
||||
"settings_copy_diagnostics": "Copiar diagnósticos",
|
||||
"settings_copyright": "Copyright 2024-2026 Desarrolladores de DragonX | Licencia GPLv3",
|
||||
"settings_custom": "Personalizado",
|
||||
"settings_data_dir": "Dir. de datos:",
|
||||
"settings_data_dir": "Dir. de datos",
|
||||
"settings_debug_changed": "Categorías de depuración cambiadas — reinicie el daemon para aplicar",
|
||||
"settings_debug_restart_note": "Los cambios surten efecto después de reiniciar el daemon.",
|
||||
"settings_debug_select": "Seleccione categorías para habilitar el registro de depuración del daemon (flags -debug=).",
|
||||
@@ -1343,18 +1349,18 @@
|
||||
"settings_encrypt_first_pin": "Primero cifre la billetera para habilitar el PIN",
|
||||
"settings_encrypt_wallet": "Cifrar billetera",
|
||||
"settings_explorer_hint": "Las URLs deben incluir una barra final. Se añadirá el txid/dirección.",
|
||||
"settings_export_all": "Exportar todo...",
|
||||
"settings_export_csv": "Exportar CSV...",
|
||||
"settings_export_key": "Exportar clave...",
|
||||
"settings_export_all": "Exportar todo…",
|
||||
"settings_export_csv": "Exportar CSV…",
|
||||
"settings_export_key": "Exportar clave…",
|
||||
"settings_gradient_bg": "Fondo degradado",
|
||||
"settings_gradient_desc": "Reemplazar fondos con texturas por degradados suaves",
|
||||
"settings_idle_after": "después de",
|
||||
"settings_import_key": "Importar Clave Privada...",
|
||||
"settings_import_viewkey": "Importar clave de visualización...",
|
||||
"settings_import_key": "Importar Clave Privada…",
|
||||
"settings_import_viewkey": "Importar clave de visualización…",
|
||||
"settings_language_note": "Nota: Parte del texto requiere reinicio para actualizarse",
|
||||
"settings_lock_now": "Bloquear ahora",
|
||||
"settings_locked": "Bloqueado",
|
||||
"settings_merge_to_address": "Fusionar a dirección...",
|
||||
"settings_merge_to_address": "Fusionar a dirección…",
|
||||
"settings_noise_opacity": "Opacidad de ruido:",
|
||||
"settings_not_connected": "No conectado al daemon",
|
||||
"settings_not_encrypted": "Sin cifrar",
|
||||
@@ -1370,7 +1376,7 @@
|
||||
"settings_reloaded": "Configuración recargada desde el disco",
|
||||
"settings_remove_encryption": "Quitar cifrado",
|
||||
"settings_remove_pin": "Quitar PIN",
|
||||
"settings_request_payment": "Solicitar pago...",
|
||||
"settings_request_payment": "Solicitar pago…",
|
||||
"settings_rescan_desc": "Reescanear la cadena de bloques en busca de transacciones faltantes",
|
||||
"settings_restart_daemon": "Reiniciar daemon",
|
||||
"settings_rpc_connection": "Conexión RPC",
|
||||
@@ -1381,20 +1387,20 @@
|
||||
"settings_save_shielded_local": "Guardar historial de transacciones blindadas localmente",
|
||||
"settings_saved": "Configuración guardada",
|
||||
"settings_set_pin": "Establecer PIN",
|
||||
"settings_shield_mining": "Blindar minería...",
|
||||
"settings_shield_mining": "Blindar minería…",
|
||||
"settings_solid_colors_desc": "Usar colores sólidos en lugar de efectos de desenfoque (accesibilidad)",
|
||||
"settings_theme_refreshed": "Lista de temas actualizada",
|
||||
"settings_tor_desc": "Enrutar todas las conexiones a través de Tor para mayor privacidad",
|
||||
"settings_unlocked": "Desbloqueado",
|
||||
"settings_use_tor_network": "Usar Tor para conexiones de red",
|
||||
"settings_validate_address": "Validar dirección...",
|
||||
"settings_validate_address": "Validar dirección…",
|
||||
"settings_visual_effects": "Efectos visuales",
|
||||
"settings_wallet_file_size": "Tamaño del archivo de billetera: %s",
|
||||
"settings_wallet_info": "Información de billetera",
|
||||
"settings_wallet_location": "Ubicación de billetera: %s",
|
||||
"settings_wallet_maintenance": "Mantenimiento de billetera",
|
||||
"settings_wallet_not_found": "Archivo de billetera no encontrado",
|
||||
"settings_wallet_size_label": "Tamaño de billetera:",
|
||||
"settings_wallet_size_label": "Tamaño de billetera",
|
||||
"settings_ztx_cleared": "Historial de transacciones Z borrado",
|
||||
"settings_ztx_not_found": "No se encontró archivo de historial",
|
||||
"setup_wizard": "Asistente de Configuración",
|
||||
@@ -1494,6 +1500,7 @@
|
||||
"to_upper": "PARA",
|
||||
"tools": "HERRAMIENTAS",
|
||||
"tools_actions": "Herramientas y Acciones...",
|
||||
"tools_actions_hdr": "HERRAMIENTAS Y ACCIONES",
|
||||
"total": "Total",
|
||||
"total_balance_label": "Saldo Total",
|
||||
"transaction_id": "ID DE TRANSACCIÓN",
|
||||
@@ -1517,7 +1524,7 @@
|
||||
"tt_auto_shield": "Mover automáticamente el saldo transparente a direcciones blindadas para privacidad",
|
||||
"tt_backup": "Crear una copia de seguridad de su wallet.dat",
|
||||
"tt_block_explorer": "Abrir el explorador de bloques DragonX en su navegador",
|
||||
"tt_blur": "Cantidad de desenfoque (0%% = apagado, 100%% = máximo)",
|
||||
"tt_blur": "Cantidad de desenfoque (0% = apagado, 100% = máximo)",
|
||||
"tt_change_pass": "Cambiar la contraseña de cifrado de la billetera",
|
||||
"tt_change_pin": "Cambiar su PIN de desbloqueo",
|
||||
"tt_chat_bubble_accent": "Color de acento para tus burbujas de mensaje salientes (o sigue el tema actual)",
|
||||
@@ -1580,7 +1587,7 @@
|
||||
"tt_low_spec": "Desactivar todos los efectos visuales pesados\\nAtajo: Ctrl+Shift+Down",
|
||||
"tt_merge": "Consolidar múltiples UTXOs en una dirección",
|
||||
"tt_mine_idle": "Iniciar minería automáticamente cuando el\\nsistema esté inactivo (sin entrada de teclado/ratón)",
|
||||
"tt_noise": "Intensidad de textura granulada (0%% = apagado, 100%% = máximo)",
|
||||
"tt_noise": "Intensidad de textura granulada (0% = apagado, 100% = máximo)",
|
||||
"tt_open_app_dir": "Abrir la carpeta de ObsidianDragon (configuración, temas, registros) en el explorador de archivos",
|
||||
"tt_open_data_dir": "Abre en el gestor de archivos la carpeta con los datos de tu cartera y de la blockchain",
|
||||
"tt_open_dir": "Clic para abrir en explorador de archivos",
|
||||
@@ -1619,7 +1626,7 @@
|
||||
"tt_theme_hotkey": "Atajo: Ctrl+Izquierda/Derecha para cambiar temas",
|
||||
"tt_tor": "Enrutar conexiones del daemon a través de la red Tor para anonimato",
|
||||
"tt_tx_url": "URL base para ver transacciones en un explorador de bloques",
|
||||
"tt_ui_opacity": "Opacidad de tarjetas y barra lateral (100%% = totalmente opaco, menor = más transparente)",
|
||||
"tt_ui_opacity": "Opacidad de tarjetas y barra lateral (100% = totalmente opaco, menor = más transparente)",
|
||||
"tt_validate": "Comprobar si una dirección DragonX es válida",
|
||||
"tt_verbose": "Registrar diagnósticos detallados de conexión,\\nestado del daemon e info de propietario de puerto\\nen la pestaña de Consola",
|
||||
"tt_wallets_button": "Enumera tus archivos de cartera y cambia entre ellos",
|
||||
@@ -1831,4 +1838,4 @@
|
||||
"your_addresses": "Sus Direcciones",
|
||||
"z_address": "Dirección Z",
|
||||
"z_addresses": "Direcciones Z"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,6 +74,9 @@
|
||||
"av_title": "Windows Defender a bloqué le mineur",
|
||||
"available": "Disponible",
|
||||
"backup_backing_up": "Sauvegarde en cours...",
|
||||
"backup_col_backup": "SAUVEGARDE",
|
||||
"backup_col_export": "EXPORTER",
|
||||
"backup_col_import": "IMPORTER ET RESTAURER",
|
||||
"backup_create": "Créer une sauvegarde",
|
||||
"backup_created": "Sauvegarde du portefeuille créée",
|
||||
"backup_data": "SAUVEGARDE & DONNÉES",
|
||||
@@ -423,6 +426,7 @@
|
||||
"daemon_bundled": "Intégré",
|
||||
"daemon_install_bundled": "Installer la version intégrée",
|
||||
"daemon_installed": "Installé",
|
||||
"daemon_maintenance_label": "MAINTENANCE",
|
||||
"daemon_none_bundled": "aucun dans cette version",
|
||||
"daemon_not_installed": "non installé",
|
||||
"daemon_status_differ": "Le binaire installé diffère de la version intégrée.",
|
||||
@@ -458,6 +462,7 @@
|
||||
"daemon_update_verify_note": "Le téléchargement est vérifié par rapport au SHA-256 publié de la version et à une signature ed25519 épinglée avant l'installation.",
|
||||
"daemon_update_verifying": "Vérification…",
|
||||
"daemon_update_version": "Version :",
|
||||
"daemon_updates_label": "MISES À JOUR",
|
||||
"daemon_version": "Daemon",
|
||||
"dark": "Sombre",
|
||||
"data_stale_prefix": "Mis à jour",
|
||||
@@ -1228,6 +1233,7 @@
|
||||
"sb_waiting_daemon_err": "En attente de dragonxd — %s",
|
||||
"sb_warming_up": "Démarrage...",
|
||||
"sb_witness_cache": "Reconstruction des témoins",
|
||||
"scale_effects": "ÉCHELLE ET EFFETS",
|
||||
"screenshot_open_dir": "Ouvrir l'emplacement",
|
||||
"screenshot_sweep": "Lancer la capture d'écran",
|
||||
"screenshot_sweep_desc": "Parcourt chaque thème sur chaque onglet et enregistre une capture d'écran de chacun dans des sous-dossiers par onglet, sous le dossier screenshots du répertoire de configuration (en écrasant le balayage précédent). Dure quelques secondes.",
|
||||
@@ -1316,12 +1322,12 @@
|
||||
"settings": "Paramètres",
|
||||
"settings_about_text": "Un portefeuille de cryptomonnaie blindé pour DragonX (DRGX), construit avec Dear ImGui pour une expérience légère et portable.",
|
||||
"settings_acrylic_level": "Niveau acrylique :",
|
||||
"settings_address_book": "Carnet d'adresses...",
|
||||
"settings_address_book": "Carnet d'adresses…",
|
||||
"settings_auto_detected": "Détecté automatiquement depuis DRAGONX.conf",
|
||||
"settings_auto_lock": "VERROUILLAGE AUTO",
|
||||
"settings_auto_shield_desc": "Déplacer automatiquement les fonds transparents vers des adresses blindées",
|
||||
"settings_auto_shield_funds": "Blindage automatique des fonds transparents",
|
||||
"settings_backup": "Sauvegarde...",
|
||||
"settings_backup": "Sauvegarde…",
|
||||
"settings_block_explorer_urls": "URLs de l'explorateur de blocs",
|
||||
"settings_builtin": "Intégré",
|
||||
"settings_change_passphrase": "Changer la phrase secrète",
|
||||
@@ -1335,7 +1341,7 @@
|
||||
"settings_copy_diagnostics": "Copier les diagnostics",
|
||||
"settings_copyright": "Copyright 2024-2026 Développeurs DragonX | Licence GPLv3",
|
||||
"settings_custom": "Personnalisé",
|
||||
"settings_data_dir": "Rép. de données :",
|
||||
"settings_data_dir": "Rép. de données ",
|
||||
"settings_debug_changed": "Catégories de débogage modifiées — redémarrez le daemon pour appliquer",
|
||||
"settings_debug_restart_note": "Les modifications prennent effet après le redémarrage du daemon.",
|
||||
"settings_debug_select": "Sélectionnez les catégories pour activer la journalisation de débogage du daemon (flags -debug=).",
|
||||
@@ -1343,18 +1349,18 @@
|
||||
"settings_encrypt_first_pin": "Chiffrez d'abord le portefeuille pour activer le PIN",
|
||||
"settings_encrypt_wallet": "Chiffrer le portefeuille",
|
||||
"settings_explorer_hint": "Les URLs doivent inclure une barre oblique finale. Le txid/adresse sera ajouté.",
|
||||
"settings_export_all": "Tout exporter...",
|
||||
"settings_export_csv": "Exporter CSV...",
|
||||
"settings_export_key": "Exporter la clé...",
|
||||
"settings_export_all": "Tout exporter…",
|
||||
"settings_export_csv": "Exporter CSV…",
|
||||
"settings_export_key": "Exporter la clé…",
|
||||
"settings_gradient_bg": "Fond dégradé",
|
||||
"settings_gradient_desc": "Remplacer les arrière-plans texturés par des dégradés lisses",
|
||||
"settings_idle_after": "après",
|
||||
"settings_import_key": "Importer une clé privée...",
|
||||
"settings_import_viewkey": "Importer la clé de visualisation...",
|
||||
"settings_import_key": "Importer une clé privée…",
|
||||
"settings_import_viewkey": "Importer la clé de visualisation…",
|
||||
"settings_language_note": "Remarque : Certains textes nécessitent un redémarrage pour se mettre à jour",
|
||||
"settings_lock_now": "Verrouiller maintenant",
|
||||
"settings_locked": "Verrouillé",
|
||||
"settings_merge_to_address": "Fusionner vers l'adresse...",
|
||||
"settings_merge_to_address": "Fusionner vers l'adresse…",
|
||||
"settings_noise_opacity": "Opacité du bruit :",
|
||||
"settings_not_connected": "Non connecté au démon",
|
||||
"settings_not_encrypted": "Non chiffré",
|
||||
@@ -1370,7 +1376,7 @@
|
||||
"settings_reloaded": "Paramètres rechargés depuis le disque",
|
||||
"settings_remove_encryption": "Supprimer le chiffrement",
|
||||
"settings_remove_pin": "Supprimer le PIN",
|
||||
"settings_request_payment": "Demander un paiement...",
|
||||
"settings_request_payment": "Demander un paiement…",
|
||||
"settings_rescan_desc": "Rescanner la blockchain pour les transactions manquantes",
|
||||
"settings_restart_daemon": "Redémarrer le daemon",
|
||||
"settings_rpc_connection": "Connexion RPC",
|
||||
@@ -1381,20 +1387,20 @@
|
||||
"settings_save_shielded_local": "Enregistrer l'historique des transactions blindées localement",
|
||||
"settings_saved": "Paramètres enregistrés",
|
||||
"settings_set_pin": "Définir le PIN",
|
||||
"settings_shield_mining": "Blindage minage...",
|
||||
"settings_shield_mining": "Blindage minage…",
|
||||
"settings_solid_colors_desc": "Utiliser des couleurs unies au lieu des effets de flou (accessibilité)",
|
||||
"settings_theme_refreshed": "Liste des thèmes actualisée",
|
||||
"settings_tor_desc": "Acheminer toutes les connexions via Tor pour une confidentialité renforcée",
|
||||
"settings_unlocked": "Déverrouillé",
|
||||
"settings_use_tor_network": "Utiliser Tor pour les connexions réseau",
|
||||
"settings_validate_address": "Valider l'adresse...",
|
||||
"settings_validate_address": "Valider l'adresse…",
|
||||
"settings_visual_effects": "Effets visuels",
|
||||
"settings_wallet_file_size": "Taille du fichier portefeuille : %s",
|
||||
"settings_wallet_info": "Informations du portefeuille",
|
||||
"settings_wallet_location": "Emplacement du portefeuille : %s",
|
||||
"settings_wallet_maintenance": "Maintenance du portefeuille",
|
||||
"settings_wallet_not_found": "Fichier portefeuille introuvable",
|
||||
"settings_wallet_size_label": "Taille du portefeuille :",
|
||||
"settings_wallet_size_label": "Taille du portefeuille ",
|
||||
"settings_ztx_cleared": "Historique des transactions Z effacé",
|
||||
"settings_ztx_not_found": "Aucun fichier d'historique trouvé",
|
||||
"setup_wizard": "Assistant de configuration",
|
||||
@@ -1494,6 +1500,7 @@
|
||||
"to_upper": "À",
|
||||
"tools": "OUTILS",
|
||||
"tools_actions": "Outils & Actions...",
|
||||
"tools_actions_hdr": "OUTILS ET ACTIONS",
|
||||
"total": "Total",
|
||||
"total_balance_label": "Solde total",
|
||||
"transaction_id": "ID DE TRANSACTION",
|
||||
@@ -1517,7 +1524,7 @@
|
||||
"tt_auto_shield": "Déplacer automatiquement le solde transparent vers des adresses blindées pour la confidentialité",
|
||||
"tt_backup": "Créer une sauvegarde de votre wallet.dat",
|
||||
"tt_block_explorer": "Ouvrir l'explorateur de blocs DragonX dans votre navigateur",
|
||||
"tt_blur": "Quantité de flou (0%% = désactivé, 100%% = maximum)",
|
||||
"tt_blur": "Quantité de flou (0% = désactivé, 100% = maximum)",
|
||||
"tt_change_pass": "Changer la phrase secrète de chiffrement du portefeuille",
|
||||
"tt_change_pin": "Changer votre PIN de déverrouillage",
|
||||
"tt_chat_bubble_accent": "Couleur d'accent de vos bulles de message sortantes (ou suivre le thème actuel)",
|
||||
@@ -1580,7 +1587,7 @@
|
||||
"tt_low_spec": "Désactiver tous les effets visuels lourds\\nRaccourci : Ctrl+Shift+Down",
|
||||
"tt_merge": "Consolider plusieurs UTXOs vers une adresse",
|
||||
"tt_mine_idle": "Démarrer le minage automatiquement quand le\\nsystème est inactif (aucune entrée clavier/souris)",
|
||||
"tt_noise": "Intensité de texture grainée (0%% = désactivé, 100%% = maximum)",
|
||||
"tt_noise": "Intensité de texture grainée (0% = désactivé, 100% = maximum)",
|
||||
"tt_open_app_dir": "Ouvrir le dossier ObsidianDragon (paramètres, thèmes, journaux) dans le gestionnaire de fichiers",
|
||||
"tt_open_data_dir": "Ouvrir le dossier contenant les données de votre portefeuille et de la blockchain dans le gestionnaire de fichiers",
|
||||
"tt_open_dir": "Cliquer pour ouvrir dans l'explorateur de fichiers",
|
||||
@@ -1619,7 +1626,7 @@
|
||||
"tt_theme_hotkey": "Raccourci : Ctrl+Gauche/Droite pour changer de thème",
|
||||
"tt_tor": "Acheminer les connexions du daemon via le réseau Tor pour l'anonymat",
|
||||
"tt_tx_url": "URL de base pour consulter les transactions dans un explorateur de blocs",
|
||||
"tt_ui_opacity": "Opacité des cartes et de la barre latérale (100%% = entièrement opaque, plus bas = plus transparent)",
|
||||
"tt_ui_opacity": "Opacité des cartes et de la barre latérale (100% = entièrement opaque, plus bas = plus transparent)",
|
||||
"tt_validate": "Vérifier si une adresse DragonX est valide",
|
||||
"tt_verbose": "Journaliser les diagnostics de connexion détaillés,\\nl'état du daemon et les informations de propriétaire de port\\ndans l'onglet Console",
|
||||
"tt_wallets_button": "Répertoriez vos fichiers de portefeuille et passez de l'un à l'autre",
|
||||
@@ -1831,4 +1838,4 @@
|
||||
"your_addresses": "Vos adresses",
|
||||
"z_address": "Adresse Z",
|
||||
"z_addresses": "Adresses Z"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,6 +74,9 @@
|
||||
"av_title": "Windows Defender がマイナーをブロックしました",
|
||||
"available": "利用可能",
|
||||
"backup_backing_up": "バックアップ中...",
|
||||
"backup_col_backup": "バックアップ",
|
||||
"backup_col_export": "エクスポート",
|
||||
"backup_col_import": "インポートと復元",
|
||||
"backup_create": "バックアップを作成",
|
||||
"backup_created": "ウォレットのバックアップを作成しました",
|
||||
"backup_data": "バックアップとデータ",
|
||||
@@ -423,6 +426,7 @@
|
||||
"daemon_bundled": "バンドル版",
|
||||
"daemon_install_bundled": "バンドル版をインストール",
|
||||
"daemon_installed": "インストール済み",
|
||||
"daemon_maintenance_label": "メンテナンス",
|
||||
"daemon_none_bundled": "このビルドにはなし",
|
||||
"daemon_not_installed": "未インストール",
|
||||
"daemon_status_differ": "インストール済みのバイナリはバンドル版と異なります。",
|
||||
@@ -458,6 +462,7 @@
|
||||
"daemon_update_verify_note": "ダウンロードは、インストール前にリリースで公開された SHA-256 と固定された ed25519 署名で検証されます。",
|
||||
"daemon_update_verifying": "検証中…",
|
||||
"daemon_update_version": "バージョン:",
|
||||
"daemon_updates_label": "アップデート",
|
||||
"daemon_version": "デーモン",
|
||||
"dark": "ダーク",
|
||||
"data_stale_prefix": "更新",
|
||||
@@ -1225,6 +1230,7 @@
|
||||
"sb_waiting_daemon_err": "dragonxd を待機中 — %s",
|
||||
"sb_warming_up": "ウォームアップ中...",
|
||||
"sb_witness_cache": "ウィットネスを再構築中",
|
||||
"scale_effects": "スケールとエフェクト",
|
||||
"screenshot_open_dir": "場所を開く",
|
||||
"screenshot_sweep": "スクリーンショットスイープを実行",
|
||||
"screenshot_sweep_desc": "すべてのテーマをすべてのタブで巡回し、それぞれのスクリーンショットを設定ディレクトリの screenshots フォルダ内のタブごとのサブフォルダに保存します(前回のスイープを上書きします)。数秒間実行されます。",
|
||||
@@ -1313,12 +1319,12 @@
|
||||
"settings": "設定",
|
||||
"settings_about_text": "DragonX (DRGX) 用のシールド暗号通貨ウォレット。Dear ImGui で構築された軽量でポータブルな体験。",
|
||||
"settings_acrylic_level": "アクリルレベル:",
|
||||
"settings_address_book": "アドレス帳...",
|
||||
"settings_address_book": "アドレス帳…",
|
||||
"settings_auto_detected": "DRAGONX.conf から自動検出",
|
||||
"settings_auto_lock": "オートロック",
|
||||
"settings_auto_shield_desc": "透明資金を自動的にシールドアドレスに移動",
|
||||
"settings_auto_shield_funds": "透明資金を自動シールド",
|
||||
"settings_backup": "バックアップ...",
|
||||
"settings_backup": "バックアップ…",
|
||||
"settings_block_explorer_urls": "ブロックエクスプローラーURL",
|
||||
"settings_builtin": "内蔵",
|
||||
"settings_change_passphrase": "パスフレーズを変更",
|
||||
@@ -1340,18 +1346,18 @@
|
||||
"settings_encrypt_first_pin": "PIN を有効にするには、まずウォレットを暗号化してください",
|
||||
"settings_encrypt_wallet": "ウォレットを暗号化",
|
||||
"settings_explorer_hint": "URLには末尾のスラッシュを含めてください。txid/アドレスが追加されます。",
|
||||
"settings_export_all": "すべてエクスポート...",
|
||||
"settings_export_csv": "CSV エクスポート...",
|
||||
"settings_export_key": "鍵をエクスポート...",
|
||||
"settings_export_all": "すべてエクスポート…",
|
||||
"settings_export_csv": "CSV エクスポート…",
|
||||
"settings_export_key": "鍵をエクスポート…",
|
||||
"settings_gradient_bg": "グラデーション背景",
|
||||
"settings_gradient_desc": "テクスチャ背景を滑らかなグラデーションに置換",
|
||||
"settings_idle_after": "経過後",
|
||||
"settings_import_key": "秘密鍵をインポート...",
|
||||
"settings_import_viewkey": "閲覧鍵をインポート...",
|
||||
"settings_import_key": "秘密鍵をインポート…",
|
||||
"settings_import_viewkey": "閲覧鍵をインポート…",
|
||||
"settings_language_note": "注意:一部のテキストは更新に再起動が必要です",
|
||||
"settings_lock_now": "今すぐロック",
|
||||
"settings_locked": "ロック済み",
|
||||
"settings_merge_to_address": "アドレスにマージ...",
|
||||
"settings_merge_to_address": "アドレスにマージ…",
|
||||
"settings_noise_opacity": "ノイズ不透明度:",
|
||||
"settings_not_connected": "デーモンに接続されていません",
|
||||
"settings_not_encrypted": "暗号化されていません",
|
||||
@@ -1367,7 +1373,7 @@
|
||||
"settings_reloaded": "ディスクから設定を再読み込みしました",
|
||||
"settings_remove_encryption": "暗号化を解除",
|
||||
"settings_remove_pin": "PIN を削除",
|
||||
"settings_request_payment": "支払い請求...",
|
||||
"settings_request_payment": "支払い請求…",
|
||||
"settings_rescan_desc": "欠落したトランザクションのためにブロックチェーンを再スキャン",
|
||||
"settings_restart_daemon": "デーモンを再起動",
|
||||
"settings_rpc_connection": "RPC 接続",
|
||||
@@ -1378,13 +1384,13 @@
|
||||
"settings_save_shielded_local": "シールドトランザクション履歴をローカルに保存",
|
||||
"settings_saved": "設定を保存しました",
|
||||
"settings_set_pin": "PIN を設定",
|
||||
"settings_shield_mining": "マイニングシールド...",
|
||||
"settings_shield_mining": "マイニングシールド…",
|
||||
"settings_solid_colors_desc": "ぼかし効果の代わりに単色を使用(アクセシビリティ)",
|
||||
"settings_theme_refreshed": "テーマ一覧を更新しました",
|
||||
"settings_tor_desc": "プライバシー向上のため全接続を Tor 経由にする",
|
||||
"settings_unlocked": "ロック解除",
|
||||
"settings_use_tor_network": "ネットワーク接続に Tor を使用",
|
||||
"settings_validate_address": "アドレス検証...",
|
||||
"settings_validate_address": "アドレス検証…",
|
||||
"settings_visual_effects": "視覚効果",
|
||||
"settings_wallet_file_size": "ウォレットファイルサイズ:%s",
|
||||
"settings_wallet_info": "ウォレット情報",
|
||||
@@ -1491,6 +1497,7 @@
|
||||
"to_upper": "宛先",
|
||||
"tools": "ツール",
|
||||
"tools_actions": "ツールとアクション...",
|
||||
"tools_actions_hdr": "ツールと操作",
|
||||
"total": "合計",
|
||||
"total_balance_label": "総残高",
|
||||
"transaction_id": "取引ID",
|
||||
@@ -1514,7 +1521,7 @@
|
||||
"tt_auto_shield": "プライバシーのため透明残高を自動的にシールドアドレスに移動",
|
||||
"tt_backup": "wallet.dat のバックアップを作成",
|
||||
"tt_block_explorer": "ブラウザで DragonX ブロックエクスプローラーを開く",
|
||||
"tt_blur": "ぼかし量(0%% = オフ、100%% = 最大)",
|
||||
"tt_blur": "ぼかし量(0% = オフ、100% = 最大)",
|
||||
"tt_change_pass": "ウォレットの暗号化パスフレーズを変更",
|
||||
"tt_change_pin": "アンロック PIN を変更",
|
||||
"tt_chat_bubble_accent": "送信メッセージの吹き出しのアクセントカラー(または現在のテーマに従う)",
|
||||
@@ -1577,7 +1584,7 @@
|
||||
"tt_low_spec": "すべての重い視覚効果を無効化\\nホットキー:Ctrl+Shift+Down",
|
||||
"tt_merge": "複数の UTXO を一つのアドレスに統合",
|
||||
"tt_mine_idle": "システムがアイドル状態(キーボード/マウス入力なし)\\nのとき自動的にマイニングを開始",
|
||||
"tt_noise": "グレインテクスチャ強度(0%% = オフ、100%% = 最大)",
|
||||
"tt_noise": "グレインテクスチャ強度(0% = オフ、100% = 最大)",
|
||||
"tt_open_app_dir": "ObsidianDragon フォルダ(設定、テーマ、ログ)をファイルマネージャーで開く",
|
||||
"tt_open_data_dir": "ファイルマネージャーでウォレットとブロックチェーンデータのフォルダを開きます",
|
||||
"tt_open_dir": "クリックしてファイルエクスプローラーで開く",
|
||||
@@ -1616,7 +1623,7 @@
|
||||
"tt_theme_hotkey": "ホットキー:Ctrl+左/右でテーマを切り替え",
|
||||
"tt_tor": "匿名性のためにデーモン接続を Tor ネットワーク経由でルーティング",
|
||||
"tt_tx_url": "ブロックエクスプローラーでトランザクションを表示するためのベース URL",
|
||||
"tt_ui_opacity": "カードとサイドバーの不透明度(100%% = 完全不透明、低い = より透過)",
|
||||
"tt_ui_opacity": "カードとサイドバーの不透明度(100% = 完全不透明、低い = より透過)",
|
||||
"tt_validate": "DragonX アドレスが有効かどうかを確認",
|
||||
"tt_verbose": "詳細な接続診断、デーモン状態、\\nポート所有者情報をコンソールタブに記録",
|
||||
"tt_wallets_button": "ウォレットファイルを一覧表示して切り替えます",
|
||||
@@ -1828,4 +1835,4 @@
|
||||
"your_addresses": "あなたのアドレス",
|
||||
"z_address": "Zアドレス",
|
||||
"z_addresses": "Zアドレス"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,6 +74,9 @@
|
||||
"av_title": "Windows Defender가 채굴기를 차단했습니다",
|
||||
"available": "사용 가능",
|
||||
"backup_backing_up": "백업 중...",
|
||||
"backup_col_backup": "백업",
|
||||
"backup_col_export": "내보내기",
|
||||
"backup_col_import": "가져오기 및 복원",
|
||||
"backup_create": "백업 생성",
|
||||
"backup_created": "지갑 백업이 생성되었습니다",
|
||||
"backup_data": "백업 및 데이터",
|
||||
@@ -423,6 +426,7 @@
|
||||
"daemon_bundled": "번들",
|
||||
"daemon_install_bundled": "번들 버전 설치",
|
||||
"daemon_installed": "설치됨",
|
||||
"daemon_maintenance_label": "유지 관리",
|
||||
"daemon_none_bundled": "이 빌드에 없음",
|
||||
"daemon_not_installed": "설치되지 않음",
|
||||
"daemon_status_differ": "설치된 바이너리가 번들 버전과 다릅니다.",
|
||||
@@ -458,6 +462,7 @@
|
||||
"daemon_update_verify_note": "다운로드는 설치 전에 릴리스에 게시된 SHA-256과 고정된 ed25519 서명으로 검증됩니다.",
|
||||
"daemon_update_verifying": "확인 중…",
|
||||
"daemon_update_version": "버전:",
|
||||
"daemon_updates_label": "업데이트",
|
||||
"daemon_version": "데몬",
|
||||
"dark": "다크",
|
||||
"data_stale_prefix": "업데이트",
|
||||
@@ -1227,6 +1232,7 @@
|
||||
"sb_waiting_daemon_err": "dragonxd 대기 중 — %s",
|
||||
"sb_warming_up": "워밍업 중...",
|
||||
"sb_witness_cache": "증인 재구축 중",
|
||||
"scale_effects": "배율 및 효과",
|
||||
"screenshot_open_dir": "위치 열기",
|
||||
"screenshot_sweep": "스크린샷 스윕 실행",
|
||||
"screenshot_sweep_desc": "모든 탭에 대해 모든 테마를 순회하며 각각의 스크린샷을 설정 디렉터리의 screenshots 폴더 아래 탭별 하위 폴더에 저장합니다(이전 스윕을 덮어씀). 몇 초 동안 실행됩니다.",
|
||||
@@ -1315,12 +1321,12 @@
|
||||
"settings": "설정",
|
||||
"settings_about_text": "DragonX (DRGX)용 차폐 암호화폐 지갑으로, Dear ImGui로 제작되어 가볍고 휴대 가능합니다.",
|
||||
"settings_acrylic_level": "아크릴 레벨:",
|
||||
"settings_address_book": "주소록...",
|
||||
"settings_address_book": "주소록…",
|
||||
"settings_auto_detected": "DRAGONX.conf에서 자동 감지",
|
||||
"settings_auto_lock": "자동 잠금",
|
||||
"settings_auto_shield_desc": "투명 자금을 자동으로 차폐 주소로 이동",
|
||||
"settings_auto_shield_funds": "투명 자금 자동 차폐",
|
||||
"settings_backup": "백업...",
|
||||
"settings_backup": "백업…",
|
||||
"settings_block_explorer_urls": "블록 탐색기 URL",
|
||||
"settings_builtin": "내장",
|
||||
"settings_change_passphrase": "비밀번호 변경",
|
||||
@@ -1334,7 +1340,7 @@
|
||||
"settings_copy_diagnostics": "진단 정보 복사",
|
||||
"settings_copyright": "Copyright 2024-2026 DragonX 개발자 | GPLv3 라이선스",
|
||||
"settings_custom": "사용자 지정",
|
||||
"settings_data_dir": "데이터 디렉터리:",
|
||||
"settings_data_dir": "데이터 디렉터리",
|
||||
"settings_debug_changed": "디버그 카테고리가 변경되었습니다 — 데몬을 재시작하여 적용",
|
||||
"settings_debug_restart_note": "변경 사항은 데몬을 다시 시작한 후에 적용됩니다.",
|
||||
"settings_debug_select": "데몬 디버그 로깅을 활성화할 카테고리를 선택하세요 (-debug= 플래그).",
|
||||
@@ -1342,18 +1348,18 @@
|
||||
"settings_encrypt_first_pin": "PIN을 활성화하려면 먼저 지갑을 암호화하세요",
|
||||
"settings_encrypt_wallet": "지갑 암호화",
|
||||
"settings_explorer_hint": "URL에 후행 슬래시를 포함해야 합니다. txid/주소가 추가됩니다.",
|
||||
"settings_export_all": "모두 내보내기...",
|
||||
"settings_export_csv": "CSV 내보내기...",
|
||||
"settings_export_key": "키 내보내기...",
|
||||
"settings_export_all": "모두 내보내기…",
|
||||
"settings_export_csv": "CSV 내보내기…",
|
||||
"settings_export_key": "키 내보내기…",
|
||||
"settings_gradient_bg": "그라데이션 배경",
|
||||
"settings_gradient_desc": "텍스처 배경을 부드러운 그라데이션으로 교체",
|
||||
"settings_idle_after": "후",
|
||||
"settings_import_key": "개인 키 가져오기...",
|
||||
"settings_import_viewkey": "조회 키 가져오기...",
|
||||
"settings_import_key": "개인 키 가져오기…",
|
||||
"settings_import_viewkey": "조회 키 가져오기…",
|
||||
"settings_language_note": "참고: 일부 텍스트는 업데이트하려면 다시 시작해야 합니다",
|
||||
"settings_lock_now": "지금 잠금",
|
||||
"settings_locked": "잠김",
|
||||
"settings_merge_to_address": "주소로 병합...",
|
||||
"settings_merge_to_address": "주소로 병합…",
|
||||
"settings_noise_opacity": "노이즈 불투명도:",
|
||||
"settings_not_connected": "데몬에 연결되지 않음",
|
||||
"settings_not_encrypted": "암호화되지 않음",
|
||||
@@ -1369,7 +1375,7 @@
|
||||
"settings_reloaded": "디스크에서 설정을 다시 불러왔습니다",
|
||||
"settings_remove_encryption": "암호화 제거",
|
||||
"settings_remove_pin": "PIN 제거",
|
||||
"settings_request_payment": "결제 요청...",
|
||||
"settings_request_payment": "결제 요청…",
|
||||
"settings_rescan_desc": "누락된 거래를 찾기 위해 블록체인 재스캔",
|
||||
"settings_restart_daemon": "데몬 재시작",
|
||||
"settings_rpc_connection": "RPC 연결",
|
||||
@@ -1380,20 +1386,20 @@
|
||||
"settings_save_shielded_local": "차폐 거래 기록을 로컬에 저장",
|
||||
"settings_saved": "설정이 저장되었습니다",
|
||||
"settings_set_pin": "PIN 설정",
|
||||
"settings_shield_mining": "채굴 차폐...",
|
||||
"settings_shield_mining": "채굴 차폐…",
|
||||
"settings_solid_colors_desc": "블러 효과 대신 단색 사용 (접근성)",
|
||||
"settings_theme_refreshed": "테마 목록을 새로고침했습니다",
|
||||
"settings_tor_desc": "향상된 개인 정보 보호를 위해 모든 연결을 Tor를 통해 라우팅",
|
||||
"settings_unlocked": "잠금 해제",
|
||||
"settings_use_tor_network": "네트워크 연결에 Tor 사용",
|
||||
"settings_validate_address": "주소 확인...",
|
||||
"settings_validate_address": "주소 확인…",
|
||||
"settings_visual_effects": "시각 효과",
|
||||
"settings_wallet_file_size": "지갑 파일 크기: %s",
|
||||
"settings_wallet_info": "지갑 정보",
|
||||
"settings_wallet_location": "지갑 위치: %s",
|
||||
"settings_wallet_maintenance": "지갑 유지보수",
|
||||
"settings_wallet_not_found": "지갑 파일을 찾을 수 없음",
|
||||
"settings_wallet_size_label": "지갑 크기:",
|
||||
"settings_wallet_size_label": "지갑 크기",
|
||||
"settings_ztx_cleared": "Z-거래 내역이 삭제되었습니다",
|
||||
"settings_ztx_not_found": "내역 파일을 찾을 수 없습니다",
|
||||
"setup_wizard": "설정 마법사",
|
||||
@@ -1493,6 +1499,7 @@
|
||||
"to_upper": "받는 곳",
|
||||
"tools": "도구",
|
||||
"tools_actions": "도구 및 작업...",
|
||||
"tools_actions_hdr": "도구 및 작업",
|
||||
"total": "합계",
|
||||
"total_balance_label": "총 잔액",
|
||||
"transaction_id": "거래 ID",
|
||||
@@ -1516,7 +1523,7 @@
|
||||
"tt_auto_shield": "개인 정보 보호를 위해 투명 잔액을 자동으로 차폐 주소로 이동",
|
||||
"tt_backup": "wallet.dat 백업 만들기",
|
||||
"tt_block_explorer": "브라우저에서 DragonX 블록 탐색기 열기",
|
||||
"tt_blur": "블러 양 (0%% = 끔, 100%% = 최대)",
|
||||
"tt_blur": "블러 양 (0% = 끔, 100% = 최대)",
|
||||
"tt_change_pass": "지갑 암호화 비밀번호 변경",
|
||||
"tt_change_pin": "잠금 해제 PIN 변경",
|
||||
"tt_chat_bubble_accent": "보내는 메시지 말풍선의 강조 색상(또는 현재 테마를 따름)",
|
||||
@@ -1579,7 +1586,7 @@
|
||||
"tt_low_spec": "모든 고부하 시각 효과 비활성화\\n단축키: Ctrl+Shift+Down",
|
||||
"tt_merge": "여러 UTXO를 하나의 주소로 통합",
|
||||
"tt_mine_idle": "시스템이 유휴 상태(키보드/마우스 입력 없음)일 때\\n자동으로 채굴 시작",
|
||||
"tt_noise": "그레인 텍스처 강도 (0%% = 끔, 100%% = 최대)",
|
||||
"tt_noise": "그레인 텍스처 강도 (0% = 끔, 100% = 최대)",
|
||||
"tt_open_app_dir": "파일 관리자에서 ObsidianDragon 폴더(설정, 테마, 로그)를 엽니다",
|
||||
"tt_open_data_dir": "지갑 및 블록체인 데이터가 있는 폴더를 파일 탐색기에서 엽니다",
|
||||
"tt_open_dir": "파일 탐색기에서 열려면 클릭",
|
||||
@@ -1618,7 +1625,7 @@
|
||||
"tt_theme_hotkey": "단축키: Ctrl+왼쪽/오른쪽으로 테마 전환",
|
||||
"tt_tor": "익명성을 위해 데몬 연결을 Tor 네트워크를 통해 라우팅",
|
||||
"tt_tx_url": "블록 탐색기에서 거래를 보기 위한 기본 URL",
|
||||
"tt_ui_opacity": "카드 및 사이드바 불투명도 (100%% = 완전 불투명, 낮을수록 더 투명)",
|
||||
"tt_ui_opacity": "카드 및 사이드바 불투명도 (100% = 완전 불투명, 낮을수록 더 투명)",
|
||||
"tt_validate": "DragonX 주소가 유효한지 확인",
|
||||
"tt_verbose": "콘솔 탭에 상세 연결 진단,\\n데몬 상태 및 포트 소유자 정보 기록",
|
||||
"tt_wallets_button": "지갑 파일 목록을 보고 전환합니다",
|
||||
@@ -1830,4 +1837,4 @@
|
||||
"your_addresses": "내 주소",
|
||||
"z_address": "Z 주소",
|
||||
"z_addresses": "Z 주소"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,6 +74,9 @@
|
||||
"av_title": "Windows Defender bloqueou o minerador",
|
||||
"available": "Disponível",
|
||||
"backup_backing_up": "Fazendo backup...",
|
||||
"backup_col_backup": "BACKUP",
|
||||
"backup_col_export": "EXPORTAR",
|
||||
"backup_col_import": "IMPORTAR E RESTAURAR",
|
||||
"backup_create": "Criar Backup",
|
||||
"backup_created": "Backup da carteira criado",
|
||||
"backup_data": "BACKUP & DADOS",
|
||||
@@ -423,6 +426,7 @@
|
||||
"daemon_bundled": "Empacotado",
|
||||
"daemon_install_bundled": "Instalar incluído",
|
||||
"daemon_installed": "Instalado",
|
||||
"daemon_maintenance_label": "MANUTENÇÃO",
|
||||
"daemon_none_bundled": "nenhum nesta build",
|
||||
"daemon_not_installed": "não instalado",
|
||||
"daemon_status_differ": "O binário instalado difere da versão empacotada.",
|
||||
@@ -458,6 +462,7 @@
|
||||
"daemon_update_verify_note": "O download é verificado contra o SHA-256 publicado do lançamento e uma assinatura ed25519 fixada antes da instalação.",
|
||||
"daemon_update_verifying": "Verificando…",
|
||||
"daemon_update_version": "Versão:",
|
||||
"daemon_updates_label": "ATUALIZAÇÕES",
|
||||
"daemon_version": "Daemon",
|
||||
"dark": "Escuro",
|
||||
"data_stale_prefix": "Atualizado",
|
||||
@@ -1228,6 +1233,7 @@
|
||||
"sb_waiting_daemon_err": "Aguardando dragonxd — %s",
|
||||
"sb_warming_up": "Aquecendo...",
|
||||
"sb_witness_cache": "Reconstruindo testemunhas",
|
||||
"scale_effects": "ESCALA E EFEITOS",
|
||||
"screenshot_open_dir": "Abrir local",
|
||||
"screenshot_sweep": "Executar varredura de capturas de tela",
|
||||
"screenshot_sweep_desc": "Percorre cada tema em cada aba e salva uma captura de tela de cada um em subpastas por aba dentro da pasta de capturas de tela do diretório de configuração (sobrescrevendo a varredura anterior). É executado por alguns segundos.",
|
||||
@@ -1316,12 +1322,12 @@
|
||||
"settings": "Ajustes",
|
||||
"settings_about_text": "Uma carteira de criptomoeda blindada para DragonX (DRGX), criada com Dear ImGui para uma experiência leve e portátil.",
|
||||
"settings_acrylic_level": "Nível acrílico:",
|
||||
"settings_address_book": "Livro de endereços...",
|
||||
"settings_address_book": "Livro de endereços…",
|
||||
"settings_auto_detected": "Detectado automaticamente de DRAGONX.conf",
|
||||
"settings_auto_lock": "BLOQUEIO AUTOMÁTICO",
|
||||
"settings_auto_shield_desc": "Mover automaticamente fundos transparentes para endereços blindados",
|
||||
"settings_auto_shield_funds": "Blindar fundos transparentes automaticamente",
|
||||
"settings_backup": "Backup...",
|
||||
"settings_backup": "Backup…",
|
||||
"settings_block_explorer_urls": "URLs do explorador de blocos",
|
||||
"settings_builtin": "Integrado",
|
||||
"settings_change_passphrase": "Alterar frase secreta",
|
||||
@@ -1335,7 +1341,7 @@
|
||||
"settings_copy_diagnostics": "Copiar diagnósticos",
|
||||
"settings_copyright": "Copyright 2024-2026 Desenvolvedores DragonX | Licença GPLv3",
|
||||
"settings_custom": "Personalizado",
|
||||
"settings_data_dir": "Dir. de dados:",
|
||||
"settings_data_dir": "Dir. de dados",
|
||||
"settings_debug_changed": "Categorias de depuração alteradas — reinicie o daemon para aplicar",
|
||||
"settings_debug_restart_note": "As alterações entram em vigor após reiniciar o daemon.",
|
||||
"settings_debug_select": "Selecione categorias para ativar o registro de depuração do daemon (flags -debug=).",
|
||||
@@ -1343,18 +1349,18 @@
|
||||
"settings_encrypt_first_pin": "Encripte a carteira primeiro para ativar o PIN",
|
||||
"settings_encrypt_wallet": "Encriptar carteira",
|
||||
"settings_explorer_hint": "As URLs devem incluir uma barra final. O txid/endereço será adicionado.",
|
||||
"settings_export_all": "Exportar tudo...",
|
||||
"settings_export_csv": "Exportar CSV...",
|
||||
"settings_export_key": "Exportar chave...",
|
||||
"settings_export_all": "Exportar tudo…",
|
||||
"settings_export_csv": "Exportar CSV…",
|
||||
"settings_export_key": "Exportar chave…",
|
||||
"settings_gradient_bg": "Fundo gradiente",
|
||||
"settings_gradient_desc": "Substituir fundos texturizados por gradientes suaves",
|
||||
"settings_idle_after": "após",
|
||||
"settings_import_key": "Importar Chave Privada...",
|
||||
"settings_import_viewkey": "Importar chave de visualização...",
|
||||
"settings_import_key": "Importar Chave Privada…",
|
||||
"settings_import_viewkey": "Importar chave de visualização…",
|
||||
"settings_language_note": "Nota: Alguns textos requerem reinício para atualizar",
|
||||
"settings_lock_now": "Bloquear agora",
|
||||
"settings_locked": "Bloqueado",
|
||||
"settings_merge_to_address": "Fundir para endereço...",
|
||||
"settings_merge_to_address": "Fundir para endereço…",
|
||||
"settings_noise_opacity": "Opacidade do ruído:",
|
||||
"settings_not_connected": "Não conectado ao daemon",
|
||||
"settings_not_encrypted": "Não encriptado",
|
||||
@@ -1370,7 +1376,7 @@
|
||||
"settings_reloaded": "Configurações recarregadas do disco",
|
||||
"settings_remove_encryption": "Remover encriptação",
|
||||
"settings_remove_pin": "Remover PIN",
|
||||
"settings_request_payment": "Solicitar pagamento...",
|
||||
"settings_request_payment": "Solicitar pagamento…",
|
||||
"settings_rescan_desc": "Reescanear a blockchain em busca de transações ausentes",
|
||||
"settings_restart_daemon": "Reiniciar daemon",
|
||||
"settings_rpc_connection": "Conexão RPC",
|
||||
@@ -1381,20 +1387,20 @@
|
||||
"settings_save_shielded_local": "Salvar histórico de transações blindadas localmente",
|
||||
"settings_saved": "Configurações salvas",
|
||||
"settings_set_pin": "Definir PIN",
|
||||
"settings_shield_mining": "Blindar mineração...",
|
||||
"settings_shield_mining": "Blindar mineração…",
|
||||
"settings_solid_colors_desc": "Usar cores sólidas em vez de efeitos de desfoque (acessibilidade)",
|
||||
"settings_theme_refreshed": "Lista de temas atualizada",
|
||||
"settings_tor_desc": "Rotear todas as conexões através do Tor para maior privacidade",
|
||||
"settings_unlocked": "Desbloqueado",
|
||||
"settings_use_tor_network": "Usar Tor para conexões de rede",
|
||||
"settings_validate_address": "Validar endereço...",
|
||||
"settings_validate_address": "Validar endereço…",
|
||||
"settings_visual_effects": "Efeitos visuais",
|
||||
"settings_wallet_file_size": "Tamanho do arquivo da carteira: %s",
|
||||
"settings_wallet_info": "Informações da carteira",
|
||||
"settings_wallet_location": "Localização da carteira: %s",
|
||||
"settings_wallet_maintenance": "Manutenção da carteira",
|
||||
"settings_wallet_not_found": "Arquivo da carteira não encontrado",
|
||||
"settings_wallet_size_label": "Tamanho da carteira:",
|
||||
"settings_wallet_size_label": "Tamanho da carteira",
|
||||
"settings_ztx_cleared": "Histórico de transações Z limpo",
|
||||
"settings_ztx_not_found": "Nenhum arquivo de histórico encontrado",
|
||||
"setup_wizard": "Assistente de Configuração",
|
||||
@@ -1494,6 +1500,7 @@
|
||||
"to_upper": "PARA",
|
||||
"tools": "FERRAMENTAS",
|
||||
"tools_actions": "Ferramentas e Ações...",
|
||||
"tools_actions_hdr": "FERRAMENTAS E AÇÕES",
|
||||
"total": "Total",
|
||||
"total_balance_label": "Saldo Total",
|
||||
"transaction_id": "ID DA TRANSAÇÃO",
|
||||
@@ -1517,7 +1524,7 @@
|
||||
"tt_auto_shield": "Mover automaticamente o saldo transparente para endereços blindados para privacidade",
|
||||
"tt_backup": "Criar um backup do seu wallet.dat",
|
||||
"tt_block_explorer": "Abrir o explorador de blocos DragonX no seu navegador",
|
||||
"tt_blur": "Quantidade de desfoque (0%% = desligado, 100%% = máximo)",
|
||||
"tt_blur": "Quantidade de desfoque (0% = desligado, 100% = máximo)",
|
||||
"tt_change_pass": "Alterar a frase secreta de encriptação da carteira",
|
||||
"tt_change_pin": "Alterar seu PIN de desbloqueio",
|
||||
"tt_chat_bubble_accent": "Cor de destaque para seus balões de mensagem enviados (ou seguir o tema atual)",
|
||||
@@ -1580,7 +1587,7 @@
|
||||
"tt_low_spec": "Desativar todos os efeitos visuais pesados\\nAtalho: Ctrl+Shift+Down",
|
||||
"tt_merge": "Consolidar múltiplos UTXOs em um endereço",
|
||||
"tt_mine_idle": "Iniciar mineração automaticamente quando o\\nsistema estiver ocioso (sem entrada de teclado/mouse)",
|
||||
"tt_noise": "Intensidade de textura granulada (0%% = desligado, 100%% = máximo)",
|
||||
"tt_noise": "Intensidade de textura granulada (0% = desligado, 100% = máximo)",
|
||||
"tt_open_app_dir": "Abrir a pasta ObsidianDragon (configurações, temas, logs) no gerenciador de arquivos",
|
||||
"tt_open_data_dir": "Abrir a pasta com os dados da sua carteira e da blockchain no gerenciador de arquivos",
|
||||
"tt_open_dir": "Clique para abrir no explorador de arquivos",
|
||||
@@ -1619,7 +1626,7 @@
|
||||
"tt_theme_hotkey": "Atalho: Ctrl+Esquerda/Direita para alternar temas",
|
||||
"tt_tor": "Rotear conexões do daemon através da rede Tor para anonimato",
|
||||
"tt_tx_url": "URL base para visualizar transações em um explorador de blocos",
|
||||
"tt_ui_opacity": "Opacidade de cartões e barra lateral (100%% = totalmente opaco, menor = mais transparente)",
|
||||
"tt_ui_opacity": "Opacidade de cartões e barra lateral (100% = totalmente opaco, menor = mais transparente)",
|
||||
"tt_validate": "Verificar se um endereço DragonX é válido",
|
||||
"tt_verbose": "Registrar diagnósticos detalhados de conexão,\\nestado do daemon e info de proprietário de porta\\nna aba Console",
|
||||
"tt_wallets_button": "Liste os arquivos de carteira e alterne entre eles",
|
||||
@@ -1831,4 +1838,4 @@
|
||||
"your_addresses": "Seus Endereços",
|
||||
"z_address": "Endereço Z",
|
||||
"z_addresses": "Endereços Z"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,6 +74,9 @@
|
||||
"av_title": "Windows Defender заблокировал майнер",
|
||||
"available": "Доступно",
|
||||
"backup_backing_up": "Создание резервной копии...",
|
||||
"backup_col_backup": "РЕЗЕРВНАЯ КОПИЯ",
|
||||
"backup_col_export": "ЭКСПОРТ",
|
||||
"backup_col_import": "ИМПОРТ И ВОССТАНОВЛЕНИЕ",
|
||||
"backup_create": "Создать резервную копию",
|
||||
"backup_created": "Резервная копия кошелька создана",
|
||||
"backup_data": "РЕЗЕРВНОЕ КОПИРОВАНИЕ И ДАННЫЕ",
|
||||
@@ -423,6 +426,7 @@
|
||||
"daemon_bundled": "Встроенный",
|
||||
"daemon_install_bundled": "Установить встроенную",
|
||||
"daemon_installed": "Установлено",
|
||||
"daemon_maintenance_label": "ОБСЛУЖИВАНИЕ",
|
||||
"daemon_none_bundled": "нет в этой сборке",
|
||||
"daemon_not_installed": "не установлен",
|
||||
"daemon_status_differ": "Установленный бинарный файл отличается от встроенной версии.",
|
||||
@@ -458,6 +462,7 @@
|
||||
"daemon_update_verify_note": "Перед установкой загрузка проверяется по опубликованному для релиза SHA-256 и закреплённой подписи ed25519.",
|
||||
"daemon_update_verifying": "Проверка…",
|
||||
"daemon_update_version": "Версия:",
|
||||
"daemon_updates_label": "ОБНОВЛЕНИЯ",
|
||||
"daemon_version": "Демон",
|
||||
"dark": "Тёмная",
|
||||
"data_stale_prefix": "Обновлено",
|
||||
@@ -1228,6 +1233,7 @@
|
||||
"sb_waiting_daemon_err": "Ожидание dragonxd — %s",
|
||||
"sb_warming_up": "Прогрев...",
|
||||
"sb_witness_cache": "Перестроение свидетелей",
|
||||
"scale_effects": "МАСШТАБ И ЭФФЕКТЫ",
|
||||
"screenshot_open_dir": "Открыть расположение",
|
||||
"screenshot_sweep": "Запустить прогон скриншотов",
|
||||
"screenshot_sweep_desc": "Перебирает каждую тему по всем вкладкам и сохраняет скриншот каждой в подпапки по вкладкам внутри папки screenshots в каталоге конфигурации (перезаписывая предыдущий проход). Выполняется несколько секунд.",
|
||||
@@ -1316,12 +1322,12 @@
|
||||
"settings": "Настройки",
|
||||
"settings_about_text": "Защищённый криптовалютный кошелёк для DragonX (DRGX), созданный на Dear ImGui для лёгкого и портативного использования.",
|
||||
"settings_acrylic_level": "Уровень акрила:",
|
||||
"settings_address_book": "Адресная книга...",
|
||||
"settings_address_book": "Адресная книга…",
|
||||
"settings_auto_detected": "Автоопределено из DRAGONX.conf",
|
||||
"settings_auto_lock": "АВТОБЛОКИРОВКА",
|
||||
"settings_auto_shield_desc": "Автоматически перемещать прозрачные средства на экранированные адреса",
|
||||
"settings_auto_shield_funds": "Автоматически экранировать прозрачные средства",
|
||||
"settings_backup": "Резервная копия...",
|
||||
"settings_backup": "Резервная копия…",
|
||||
"settings_block_explorer_urls": "URL-адреса обозревателя блоков",
|
||||
"settings_builtin": "Встроенные",
|
||||
"settings_change_passphrase": "Сменить пароль",
|
||||
@@ -1335,7 +1341,7 @@
|
||||
"settings_copy_diagnostics": "Копировать диагностику",
|
||||
"settings_copyright": "Copyright 2024-2026 Разработчики DragonX | Лицензия GPLv3",
|
||||
"settings_custom": "Пользовательские",
|
||||
"settings_data_dir": "Каталог данных:",
|
||||
"settings_data_dir": "Каталог данных",
|
||||
"settings_debug_changed": "Категории отладки изменены — перезапустите демон для применения",
|
||||
"settings_debug_restart_note": "Изменения вступают в силу после перезапуска демона.",
|
||||
"settings_debug_select": "Выберите категории для включения журнала отладки демона (флаги -debug=).",
|
||||
@@ -1343,18 +1349,18 @@
|
||||
"settings_encrypt_first_pin": "Сначала зашифруйте кошелёк, чтобы включить PIN",
|
||||
"settings_encrypt_wallet": "Зашифровать кошелёк",
|
||||
"settings_explorer_hint": "URL-адреса должны заканчиваться косой чертой. Txid/адрес будет добавлен.",
|
||||
"settings_export_all": "Экспортировать все...",
|
||||
"settings_export_csv": "Экспорт CSV...",
|
||||
"settings_export_key": "Экспортировать ключ...",
|
||||
"settings_export_all": "Экспортировать все…",
|
||||
"settings_export_csv": "Экспорт CSV…",
|
||||
"settings_export_key": "Экспортировать ключ…",
|
||||
"settings_gradient_bg": "Градиент фона",
|
||||
"settings_gradient_desc": "Заменить текстурные фоны плавными градиентами",
|
||||
"settings_idle_after": "через",
|
||||
"settings_import_key": "Импорт приватного ключа...",
|
||||
"settings_import_viewkey": "Импортировать ключ просмотра...",
|
||||
"settings_import_key": "Импорт приватного ключа…",
|
||||
"settings_import_viewkey": "Импортировать ключ просмотра…",
|
||||
"settings_language_note": "Примечание: Некоторый текст требует перезапуска для обновления",
|
||||
"settings_lock_now": "Заблокировать сейчас",
|
||||
"settings_locked": "Заблокирован",
|
||||
"settings_merge_to_address": "Объединить на адрес...",
|
||||
"settings_merge_to_address": "Объединить на адрес…",
|
||||
"settings_noise_opacity": "Непрозрачность шума:",
|
||||
"settings_not_connected": "Нет соединения с демоном",
|
||||
"settings_not_encrypted": "Не зашифрован",
|
||||
@@ -1370,7 +1376,7 @@
|
||||
"settings_reloaded": "Настройки перезагружены с диска",
|
||||
"settings_remove_encryption": "Удалить шифрование",
|
||||
"settings_remove_pin": "Удалить PIN",
|
||||
"settings_request_payment": "Запросить платёж...",
|
||||
"settings_request_payment": "Запросить платёж…",
|
||||
"settings_rescan_desc": "Пересканировать блокчейн для поиска пропущенных транзакций",
|
||||
"settings_restart_daemon": "Перезапустить демон",
|
||||
"settings_rpc_connection": "RPC-соединение",
|
||||
@@ -1381,20 +1387,20 @@
|
||||
"settings_save_shielded_local": "Сохранять историю защищённых транзакций локально",
|
||||
"settings_saved": "Настройки сохранены",
|
||||
"settings_set_pin": "Установить PIN",
|
||||
"settings_shield_mining": "Экранировать майнинг...",
|
||||
"settings_shield_mining": "Экранировать майнинг…",
|
||||
"settings_solid_colors_desc": "Использовать сплошные цвета вместо эффектов размытия (доступность)",
|
||||
"settings_theme_refreshed": "Список тем обновлён",
|
||||
"settings_tor_desc": "Маршрутизировать все соединения через Tor для повышения конфиденциальности",
|
||||
"settings_unlocked": "Разблокирован",
|
||||
"settings_use_tor_network": "Использовать Tor для сетевых подключений",
|
||||
"settings_validate_address": "Проверить адрес...",
|
||||
"settings_validate_address": "Проверить адрес…",
|
||||
"settings_visual_effects": "Визуальные эффекты",
|
||||
"settings_wallet_file_size": "Размер файла кошелька: %s",
|
||||
"settings_wallet_info": "Информация о кошельке",
|
||||
"settings_wallet_location": "Расположение кошелька: %s",
|
||||
"settings_wallet_maintenance": "Обслуживание кошелька",
|
||||
"settings_wallet_not_found": "Файл кошелька не найден",
|
||||
"settings_wallet_size_label": "Размер кошелька:",
|
||||
"settings_wallet_size_label": "Размер кошелька",
|
||||
"settings_ztx_cleared": "История Z-транзакций очищена",
|
||||
"settings_ztx_not_found": "Файл истории не найден",
|
||||
"setup_wizard": "Мастер настройки",
|
||||
@@ -1494,6 +1500,7 @@
|
||||
"to_upper": "КОМУ",
|
||||
"tools": "УТИЛИТЫ",
|
||||
"tools_actions": "Инструменты и действия...",
|
||||
"tools_actions_hdr": "ИНСТРУМЕНТЫ И ДЕЙСТВИЯ",
|
||||
"total": "Итого",
|
||||
"total_balance_label": "Общий баланс",
|
||||
"transaction_id": "ID ТРАНЗАКЦИИ",
|
||||
@@ -1517,7 +1524,7 @@
|
||||
"tt_auto_shield": "Автоматически перемещать прозрачный баланс на экранированные адреса для конфиденциальности",
|
||||
"tt_backup": "Создать резервную копию вашего wallet.dat",
|
||||
"tt_block_explorer": "Открыть обозреватель блоков DragonX в браузере",
|
||||
"tt_blur": "Степень размытия (0%% = выкл., 100%% = максимум)",
|
||||
"tt_blur": "Степень размытия (0% = выкл., 100% = максимум)",
|
||||
"tt_change_pass": "Сменить пароль шифрования кошелька",
|
||||
"tt_change_pin": "Изменить PIN-код разблокировки",
|
||||
"tt_chat_bubble_accent": "Акцентный цвет для ваших исходящих пузырьков сообщений (или следовать текущей теме)",
|
||||
@@ -1580,7 +1587,7 @@
|
||||
"tt_low_spec": "Отключить все тяжёлые визуальные эффекты\\nГорячая клавиша: Ctrl+Shift+Down",
|
||||
"tt_merge": "Объединить несколько UTXO в один адрес",
|
||||
"tt_mine_idle": "Автоматически начать майнинг при\\nпростое системы (нет ввода с клавиатуры/мыши)",
|
||||
"tt_noise": "Интенсивность зернистой текстуры (0%% = выкл., 100%% = максимум)",
|
||||
"tt_noise": "Интенсивность зернистой текстуры (0% = выкл., 100% = максимум)",
|
||||
"tt_open_app_dir": "Открыть папку ObsidianDragon (настройки, темы, логи) в файловом менеджере",
|
||||
"tt_open_data_dir": "Открыть в файловом менеджере папку с данными кошелька и блокчейна",
|
||||
"tt_open_dir": "Нажмите, чтобы открыть в проводнике",
|
||||
@@ -1619,7 +1626,7 @@
|
||||
"tt_theme_hotkey": "Горячая клавиша: Ctrl+Влево/Вправо для переключения тем",
|
||||
"tt_tor": "Маршрутизировать подключения демона через сеть Tor для анонимности",
|
||||
"tt_tx_url": "Базовый URL для просмотра транзакций в обозревателе блоков",
|
||||
"tt_ui_opacity": "Непрозрачность карточек и боковой панели (100%% = полностью непрозрачно, ниже = прозрачнее)",
|
||||
"tt_ui_opacity": "Непрозрачность карточек и боковой панели (100% = полностью непрозрачно, ниже = прозрачнее)",
|
||||
"tt_validate": "Проверить, действителен ли адрес DragonX",
|
||||
"tt_verbose": "Записывать подробную диагностику подключений,\\nсостояние демона и информацию о владельце порта\\nна вкладке Консоль",
|
||||
"tt_wallets_button": "Показать файлы кошельков и переключаться между ними",
|
||||
@@ -1831,4 +1838,4 @@
|
||||
"your_addresses": "Ваши адреса",
|
||||
"z_address": "Z-адрес",
|
||||
"z_addresses": "Z-адреса"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,6 +74,9 @@
|
||||
"av_title": "Windows Defender 已阻止矿工程序",
|
||||
"available": "可用",
|
||||
"backup_backing_up": "正在备份...",
|
||||
"backup_col_backup": "备份",
|
||||
"backup_col_export": "导出",
|
||||
"backup_col_import": "导入与恢复",
|
||||
"backup_create": "创建备份",
|
||||
"backup_created": "钱包备份已创建",
|
||||
"backup_data": "备份与数据",
|
||||
@@ -423,6 +426,7 @@
|
||||
"daemon_bundled": "内置",
|
||||
"daemon_install_bundled": "安装内置版本",
|
||||
"daemon_installed": "已安装",
|
||||
"daemon_maintenance_label": "维护",
|
||||
"daemon_none_bundled": "此版本未内置",
|
||||
"daemon_not_installed": "未安装",
|
||||
"daemon_status_differ": "已安装的程序文件与内置版本不同。",
|
||||
@@ -458,6 +462,7 @@
|
||||
"daemon_update_verify_note": "在安装前,会根据该版本发布的 SHA-256 和固定的 ed25519 签名对下载内容进行校验。",
|
||||
"daemon_update_verifying": "正在验证…",
|
||||
"daemon_update_version": "版本:",
|
||||
"daemon_updates_label": "更新",
|
||||
"daemon_version": "守护进程",
|
||||
"dark": "深色",
|
||||
"data_stale_prefix": "更新于",
|
||||
@@ -1226,6 +1231,7 @@
|
||||
"sb_waiting_daemon_err": "等待 dragonxd — %s",
|
||||
"sb_warming_up": "正在预热...",
|
||||
"sb_witness_cache": "正在重建见证",
|
||||
"scale_effects": "缩放与效果",
|
||||
"screenshot_open_dir": "打开位置",
|
||||
"screenshot_sweep": "运行截图批处理",
|
||||
"screenshot_sweep_desc": "遍历每个标签页的每一种主题,并将每一个的截图保存到配置目录 screenshots 文件夹下的各标签页子文件夹中(覆盖上一次的遍历)。运行几秒钟。",
|
||||
@@ -1314,12 +1320,12 @@
|
||||
"settings": "设置",
|
||||
"settings_about_text": "DragonX (DRGX) 屏蔽加密货币钱包,使用 Dear ImGui 构建,提供轻量、便携的体验。",
|
||||
"settings_acrylic_level": "亚克力级别:",
|
||||
"settings_address_book": "地址簿...",
|
||||
"settings_address_book": "地址簿…",
|
||||
"settings_auto_detected": "从 DRAGONX.conf 自动检测",
|
||||
"settings_auto_lock": "自动锁定",
|
||||
"settings_auto_shield_desc": "自动将透明资金转移到屏蔽地址",
|
||||
"settings_auto_shield_funds": "自动屏蔽透明资金",
|
||||
"settings_backup": "备份...",
|
||||
"settings_backup": "备份…",
|
||||
"settings_block_explorer_urls": "区块浏览器网址",
|
||||
"settings_builtin": "内置",
|
||||
"settings_change_passphrase": "更改密码",
|
||||
@@ -1341,18 +1347,18 @@
|
||||
"settings_encrypt_first_pin": "请先加密钱包以启用 PIN",
|
||||
"settings_encrypt_wallet": "加密钱包",
|
||||
"settings_explorer_hint": "URL 应包含尾部斜杠。将自动附加 txid/地址。",
|
||||
"settings_export_all": "全部导出...",
|
||||
"settings_export_csv": "导出 CSV...",
|
||||
"settings_export_key": "导出密钥...",
|
||||
"settings_export_all": "全部导出…",
|
||||
"settings_export_csv": "导出 CSV…",
|
||||
"settings_export_key": "导出密钥…",
|
||||
"settings_gradient_bg": "渐变背景",
|
||||
"settings_gradient_desc": "用平滑渐变替换纹理背景",
|
||||
"settings_idle_after": "之后",
|
||||
"settings_import_key": "导入私钥...",
|
||||
"settings_import_viewkey": "导入查看密钥...",
|
||||
"settings_import_key": "导入私钥…",
|
||||
"settings_import_viewkey": "导入查看密钥…",
|
||||
"settings_language_note": "注意:部分文本需要重启才能更新",
|
||||
"settings_lock_now": "立即锁定",
|
||||
"settings_locked": "已锁定",
|
||||
"settings_merge_to_address": "合并到地址...",
|
||||
"settings_merge_to_address": "合并到地址…",
|
||||
"settings_noise_opacity": "噪点不透明度:",
|
||||
"settings_not_connected": "未连接到守护进程",
|
||||
"settings_not_encrypted": "未加密",
|
||||
@@ -1368,7 +1374,7 @@
|
||||
"settings_reloaded": "已从磁盘重新加载设置",
|
||||
"settings_remove_encryption": "移除加密",
|
||||
"settings_remove_pin": "移除 PIN",
|
||||
"settings_request_payment": "请求付款...",
|
||||
"settings_request_payment": "请求付款…",
|
||||
"settings_rescan_desc": "重新扫描区块链以查找丢失的交易",
|
||||
"settings_restart_daemon": "重启守护进程",
|
||||
"settings_rpc_connection": "RPC 连接",
|
||||
@@ -1379,13 +1385,13 @@
|
||||
"settings_save_shielded_local": "将屏蔽交易历史保存到本地",
|
||||
"settings_saved": "设置已保存",
|
||||
"settings_set_pin": "设置 PIN",
|
||||
"settings_shield_mining": "屏蔽挖矿...",
|
||||
"settings_shield_mining": "屏蔽挖矿…",
|
||||
"settings_solid_colors_desc": "使用纯色代替模糊效果(无障碍功能)",
|
||||
"settings_theme_refreshed": "主题列表已刷新",
|
||||
"settings_tor_desc": "通过 Tor 路由所有连接以增强隐私",
|
||||
"settings_unlocked": "已解锁",
|
||||
"settings_use_tor_network": "使用 Tor 进行网络连接",
|
||||
"settings_validate_address": "验证地址...",
|
||||
"settings_validate_address": "验证地址…",
|
||||
"settings_visual_effects": "视觉效果",
|
||||
"settings_wallet_file_size": "钱包文件大小:%s",
|
||||
"settings_wallet_info": "钱包信息",
|
||||
@@ -1492,6 +1498,7 @@
|
||||
"to_upper": "至",
|
||||
"tools": "工具",
|
||||
"tools_actions": "工具与操作...",
|
||||
"tools_actions_hdr": "工具与操作",
|
||||
"total": "合计",
|
||||
"total_balance_label": "总余额",
|
||||
"transaction_id": "交易 ID",
|
||||
@@ -1515,7 +1522,7 @@
|
||||
"tt_auto_shield": "自动将透明余额转移到屏蔽地址以增强隐私",
|
||||
"tt_backup": "创建 wallet.dat 的备份",
|
||||
"tt_block_explorer": "在浏览器中打开 DragonX 区块浏览器",
|
||||
"tt_blur": "模糊程度(0%% = 关闭,100%% = 最大)",
|
||||
"tt_blur": "模糊程度(0% = 关闭,100% = 最大)",
|
||||
"tt_change_pass": "更改钱包加密密码",
|
||||
"tt_change_pin": "更改您的解锁 PIN",
|
||||
"tt_chat_bubble_accent": "你发出的消息气泡的强调色(或跟随当前主题)",
|
||||
@@ -1578,7 +1585,7 @@
|
||||
"tt_low_spec": "禁用所有重度视觉效果\\n快捷键:Ctrl+Shift+Down",
|
||||
"tt_merge": "将多个 UTXO 合并到一个地址",
|
||||
"tt_mine_idle": "系统空闲时自动开始挖矿\\n(无键盘/鼠标输入)",
|
||||
"tt_noise": "颗粒纹理强度(0%% = 关闭,100%% = 最大)",
|
||||
"tt_noise": "颗粒纹理强度(0% = 关闭,100% = 最大)",
|
||||
"tt_open_app_dir": "在文件管理器中打开 ObsidianDragon 文件夹(设置、主题、日志)",
|
||||
"tt_open_data_dir": "在文件管理器中打开包含您钱包和区块链数据的文件夹",
|
||||
"tt_open_dir": "点击在文件管理器中打开",
|
||||
@@ -1617,7 +1624,7 @@
|
||||
"tt_theme_hotkey": "快捷键:Ctrl+左/右箭头切换主题",
|
||||
"tt_tor": "通过 Tor 网络路由守护进程连接以实现匿名",
|
||||
"tt_tx_url": "在区块浏览器中查看交易的基础 URL",
|
||||
"tt_ui_opacity": "卡片和侧边栏不透明度(100%% = 完全不透明,越低越透明)",
|
||||
"tt_ui_opacity": "卡片和侧边栏不透明度(100% = 完全不透明,越低越透明)",
|
||||
"tt_validate": "检查 DragonX 地址是否有效",
|
||||
"tt_verbose": "将详细连接诊断、守护进程状态\\n和端口所有者信息记录到控制台选项卡",
|
||||
"tt_wallets_button": "列出您的钱包文件并在它们之间切换",
|
||||
@@ -1829,4 +1836,4 @@
|
||||
"your_addresses": "您的地址",
|
||||
"z_address": "Z 地址",
|
||||
"z_addresses": "Z 地址"
|
||||
}
|
||||
}
|
||||
|
||||
231
src/app.cpp
231
src/app.cpp
@@ -878,6 +878,9 @@ void App::update()
|
||||
// (a prior/unwitnessed salvage likely moved the coins into a wallet.<ts>.bak).
|
||||
maybeWarnEmptyWalletWithFundedSiblings();
|
||||
|
||||
// One-time nudge if wallet.dat has bloated past the threshold (toast + clickable alert → consolidate).
|
||||
maybeWarnLargeWallet();
|
||||
|
||||
// Classify the wallet's mnemonic status (once per connect) so the Migrate-to-seed button can
|
||||
// glow for a legacy, pre-seed-phrase wallet.
|
||||
probeWalletSeedStatus();
|
||||
@@ -916,7 +919,9 @@ void App::update()
|
||||
|
||||
// Re-apply the refresh cadence when sync starts/finishes: while syncing we throttle polling to
|
||||
// a low-impact profile so RPC contention doesn't slow block download (see applyRefreshPolicy).
|
||||
if (state_.sync.syncing != refresh_policy_syncing_) {
|
||||
// effectivelySyncing() includes the post-sync settle window, so this also reverts to the normal
|
||||
// per-tab cadence once that window elapses.
|
||||
if (effectivelySyncing() != refresh_policy_syncing_) {
|
||||
applyRefreshPolicy(current_page_);
|
||||
}
|
||||
|
||||
@@ -1502,16 +1507,11 @@ void App::ensureLogoTexture()
|
||||
}
|
||||
}
|
||||
|
||||
// 0) DragonX mark — rasterize the embedded SVG recolored to the theme (body = accent, detail = white)
|
||||
// at ~2x the 128px viewBox for crisp downscaling. This is the branding on every skin; the per-skin
|
||||
// PNG path below is only a fallback if rasterization ever fails.
|
||||
if (util::LoadTextureFromSvg(embedded::kLogoDragonXSvg, 256, logoAccent,
|
||||
detailCol, &logo_tex_, &logo_w_, &logo_h_)) {
|
||||
DEBUG_LOGF("Rendered DragonX SVG logo (%dx%d, accent %08X)\n", logo_w_, logo_h_, logoAccent);
|
||||
return;
|
||||
}
|
||||
// The header / top-left / About branding is the ObsidianDragon PRODUCT logo — NOT the DragonX coin
|
||||
// mark (that is coin_logo_tex_ / drgx_emoji_tex_ above). Resolve it below: active-skin override, else
|
||||
// the ui.toml header-icon, else the bundled ObsidianDragon dark/light PNG (disk, then embedded).
|
||||
|
||||
// 1) Fallback — theme-override logo from the active skin
|
||||
// 1) theme-override logo from the active skin
|
||||
const auto* activeSkin = ui::schema::SkinManager::instance().findById(
|
||||
ui::schema::SkinManager::instance().activeSkinId());
|
||||
std::string logoPath;
|
||||
@@ -1795,32 +1795,21 @@ void App::render()
|
||||
sbStatus.unconfirmedTxCount = static_cast<int>(unconfirmedTxids.size());
|
||||
}
|
||||
|
||||
// Sidebar margins from ui.toml schema (DPI-scaled like all sidebar values)
|
||||
const float sbMarginTop = sbde("margin-top", 0.0f);
|
||||
const float sbMarginBottom = sbde("margin-bottom", 0.0f);
|
||||
const float sbMinHeight = sbde("min-height", 360.0f);
|
||||
// Sidebar minimum height from ui.toml schema (DPI-scaled).
|
||||
const float sbMinHeight = sbde("min-height", 360.0f);
|
||||
|
||||
// Ensure sidebar is tall enough to fit all buttons — shrink margins if needed
|
||||
float sidebarH = contentH - sbMarginTop - sbMarginBottom;
|
||||
float effectiveMarginTop = sbMarginTop;
|
||||
if (sidebarH < sbMinHeight) {
|
||||
float available = contentH - sbMinHeight;
|
||||
if (available > 0.0f) {
|
||||
float ratio = available / (sbMarginTop + sbMarginBottom);
|
||||
effectiveMarginTop = sbMarginTop * ratio;
|
||||
} else {
|
||||
effectiveMarginTop = 0.0f;
|
||||
}
|
||||
sidebarH = std::max(contentH - effectiveMarginTop, sbMinHeight);
|
||||
}
|
||||
|
||||
// Sidebar navigation
|
||||
// Save cursor Y before applying sidebar margin so the content area
|
||||
// (placed via SameLine) starts at the original row position, not the
|
||||
// margin-shifted one.
|
||||
// Save cursor Y before the sidebar so the content area (restored below) starts at the original row.
|
||||
float preSidebarCursorY = ImGui::GetCursorPosY();
|
||||
if (effectiveMarginTop > 0.0f)
|
||||
ImGui::SetCursorPosY(preSidebarCursorY + effectiveMarginTop);
|
||||
|
||||
// Size the sidebar to span from its own top down to the status-bar top, so the nav panel centers
|
||||
// within the TRUE visible area (equal top/bottom gaps). Do NOT derive it from contentH (inset by the
|
||||
// content-area's edge-fade margins) and do NOT apply the legacy sidebar margin-top/-bottom (they are
|
||||
// asymmetric, -12 / +40, and pushed the panel upward). Window-local reference (matches how the status
|
||||
// bar is positioned — GetWindowPos/GetWindowSize, not GetMainViewport) so it is correct on every platform.
|
||||
float sbWindowBottom = ImGui::GetWindowPos().y + ImGui::GetWindowSize().y;
|
||||
float sbStatusTopY = sbWindowBottom - statusBarH - mainPadBot;
|
||||
float sbChildTopY = ImGui::GetCursorScreenPos().y;
|
||||
float sidebarH = std::max(sbMinHeight, sbStatusTopY - sbChildTopY);
|
||||
bool prevCollapsed = sidebar_collapsed_;
|
||||
{
|
||||
PERF_SCOPE("Render.Sidebar");
|
||||
@@ -2235,6 +2224,7 @@ void App::render()
|
||||
renderDecryptWalletDialog();
|
||||
renderPinDialogs();
|
||||
renderSwitchStopDaemonDialog();
|
||||
renderDaemonStopConfirm();
|
||||
renderBlockDbReindexDialog();
|
||||
renderWalletRecoveredDialog();
|
||||
renderEmptyWalletWarningDialog();
|
||||
@@ -2437,10 +2427,19 @@ void App::renderAlertHistoryPanel()
|
||||
return;
|
||||
}
|
||||
|
||||
// Scrollable list, newest first. Height adapts to the entry count but caps so a busy session
|
||||
// scrolls inside the panel instead of blowing past the popup's max height.
|
||||
const float perEntry = txtF->LegacySize * 2.0f + 14.0f * dp; // message line + time line + spacing
|
||||
const float listH = std::min(300.0f * dp, static_cast<float>(hist.size()) * perEntry);
|
||||
// Scrollable list, newest first. Measure the TRUE content height so wrapped (multi-line) messages
|
||||
// and optional action links aren't clipped by an under-estimate; cap so a busy session scrolls
|
||||
// inside the panel instead of blowing past the popup's max height.
|
||||
const float msgWrapW = std::max(40.0f * dp, innerW - 2.0f * padX - icoF->LegacySize - 6.0f * dp);
|
||||
float contentH = 0.0f;
|
||||
for (const auto& a : hist) {
|
||||
const float msgH = txtF->CalcTextSizeA(txtF->LegacySize, FLT_MAX, msgWrapW, a.message.c_str()).y;
|
||||
contentH += std::max(msgH, static_cast<float>(icoF->LegacySize)); // icon + wrapped message
|
||||
contentH += txtF->LegacySize; // relative-age line
|
||||
if (a.onClick && !a.actionHint.empty()) contentH += txtF->LegacySize; // action-link line
|
||||
contentH += 8.0f * dp; // inter-entry spacing
|
||||
}
|
||||
const float listH = std::min(300.0f * dp, contentH);
|
||||
ImGui::BeginChild("##AlertRows", ImVec2(0, listH), false);
|
||||
int idx = 0;
|
||||
for (auto it = hist.rbegin(); it != hist.rend(); ++it, ++idx) {
|
||||
@@ -2468,6 +2467,19 @@ void App::renderAlertHistoryPanel()
|
||||
ImGui::TextWrapped("%s", a.message.c_str());
|
||||
ImGui::PopTextWrapPos();
|
||||
ImGui::PopStyleColor();
|
||||
// Optional clickable action (accent link), directly under the message so it stays prominent.
|
||||
if (a.onClick && !a.actionHint.empty()) {
|
||||
ImGui::SetCursorPosX(padX + icoF->LegacySize + 6.0f * dp);
|
||||
ImGui::PushStyleColor(ImGuiCol_Text, m::Primary());
|
||||
ImGui::TextUnformatted(a.actionHint.c_str());
|
||||
ImGui::PopStyleColor();
|
||||
if (ImGui::IsItemHovered()) {
|
||||
const ImVec2 lmn = ImGui::GetItemRectMin(), lmx = ImGui::GetItemRectMax();
|
||||
ImGui::GetWindowDrawList()->AddLine(ImVec2(lmn.x, lmx.y), ImVec2(lmx.x, lmx.y), m::Primary());
|
||||
ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
|
||||
}
|
||||
if (ImGui::IsItemClicked()) { a.onClick(); ImGui::CloseCurrentPopup(); }
|
||||
}
|
||||
// Relative age, dim, indented under the message.
|
||||
ImGui::SetCursorPosX(padX + icoF->LegacySize + 6.0f * dp);
|
||||
ImGui::PushStyleColor(ImGuiCol_Text, m::OnSurfaceDisabled());
|
||||
@@ -5641,6 +5653,16 @@ void App::beginShutdown()
|
||||
{
|
||||
// Only start shutdown once
|
||||
if (shutting_down_) return;
|
||||
|
||||
// Guard: don't silently discard an in-progress witness-cache rebuild. If we're about to stop the
|
||||
// daemon while it's rebuilding (stopping now forces a multi-minute rebuild on the next launch),
|
||||
// defer shutdown and let render() show the confirm modal. The user's choice re-enters beginShutdown()
|
||||
// with shutdown_confirmed_ set (and, for "keep node running", shutdown_keep_daemon_override_).
|
||||
if (!shutdown_confirmed_ && shouldConfirmDaemonStop()) {
|
||||
pending_shutdown_confirm_ = true;
|
||||
return; // NOT shutting down yet — the normal UI + modal keep rendering
|
||||
}
|
||||
|
||||
shutting_down_ = true;
|
||||
quit_requested_ = true;
|
||||
shutdown_timer_ = 0.0f;
|
||||
@@ -5701,7 +5723,7 @@ void App::beginShutdown()
|
||||
}
|
||||
|
||||
auto shutdownDecision = daemon_controller_->shutdownDecision(
|
||||
settings_ && settings_->getKeepDaemonRunning(),
|
||||
(settings_ && settings_->getKeepDaemonRunning()) || shutdown_keep_daemon_override_,
|
||||
settings_ && settings_->getStopExternalDaemon());
|
||||
if (shutdownDecision.action == daemon::DaemonController::ShutdownAction::DisconnectOnly) {
|
||||
DEBUG_LOGF("beginShutdown: %s, skipping daemon stop\n", shutdownDecision.logReason);
|
||||
@@ -5731,6 +5753,133 @@ void App::beginShutdown()
|
||||
});
|
||||
}
|
||||
|
||||
std::vector<std::string> App::tailDaemonDebugLog(int maxLines) const
|
||||
{
|
||||
std::vector<std::string> out;
|
||||
if (maxLines <= 0) return out;
|
||||
const std::string path = util::Platform::getDataDir() + "debug.log";
|
||||
std::error_code ec;
|
||||
const auto sz = std::filesystem::file_size(path, ec);
|
||||
if (ec || sz == 0) return out;
|
||||
std::ifstream f(path, std::ios::binary);
|
||||
if (!f) return out;
|
||||
|
||||
// Read only the last ~16 KB — plenty for a handful of lines, cheap even for a multi-GB log.
|
||||
const std::uintmax_t kTailBytes = 16 * 1024;
|
||||
const std::uintmax_t start = sz > kTailBytes ? sz - kTailBytes : 0;
|
||||
f.seekg(static_cast<std::streamoff>(start), std::ios::beg);
|
||||
std::string chunk(static_cast<std::size_t>(sz - start), '\0');
|
||||
f.read(&chunk[0], static_cast<std::streamsize>(chunk.size()));
|
||||
chunk.resize(static_cast<std::size_t>(f.gcount()));
|
||||
|
||||
std::vector<std::string> lines;
|
||||
std::string cur;
|
||||
for (char c : chunk) {
|
||||
if (c == '\n') { if (!cur.empty()) lines.push_back(cur); cur.clear(); }
|
||||
else if (c != '\r') cur.push_back(c);
|
||||
}
|
||||
if (!cur.empty()) lines.push_back(cur);
|
||||
// When we seeked into the middle of the file the first line is a fragment — drop it.
|
||||
if (start > 0 && !lines.empty()) lines.erase(lines.begin());
|
||||
if (static_cast<int>(lines.size()) > maxLines)
|
||||
lines.erase(lines.begin(), lines.end() - static_cast<std::ptrdiff_t>(maxLines));
|
||||
return lines;
|
||||
}
|
||||
|
||||
bool App::daemonWitnessRebuildActive() const
|
||||
{
|
||||
// Scan the debug.log tail for the daemon's witness-rebuild markers (wallet.cpp): "Cleared witness
|
||||
// data from" (start), "Setting Initial Sapling Witness" / "Reading blocks for witness rebuild"
|
||||
// (progress), vs. "rebuilt N note witness cache(s)" / "aborting…" (finished). Active iff the most
|
||||
// recent relevant line is a start/progress line, not a completion.
|
||||
const auto lines = tailDaemonDebugLog(80);
|
||||
int state = 0; // 0 none, 1 active, 2 finished/aborted
|
||||
for (const auto& l : lines) {
|
||||
if (l.find("note witness cache(s) to height") != std::string::npos ||
|
||||
l.find("aborting witness rebuild") != std::string::npos ||
|
||||
l.find("aborted during witness rebuild") != std::string::npos) {
|
||||
state = 2;
|
||||
} else if (l.find("Reading blocks for witness rebuild") != std::string::npos ||
|
||||
l.find("Setting Initial Sapling Witness") != std::string::npos ||
|
||||
l.find("Cleared witness data from") != std::string::npos) {
|
||||
state = 1;
|
||||
}
|
||||
}
|
||||
return state == 1;
|
||||
}
|
||||
|
||||
bool App::shouldConfirmDaemonStop() const
|
||||
{
|
||||
if (!daemon_controller_) return false;
|
||||
// Only relevant when this shutdown would actually STOP the daemon (embedded, or external with
|
||||
// stop-on-exit) — a DisconnectOnly shutdown leaves it running and loses nothing.
|
||||
const auto decision = daemon_controller_->shutdownDecision(
|
||||
settings_ && settings_->getKeepDaemonRunning(),
|
||||
settings_ && settings_->getStopExternalDaemon());
|
||||
if (decision.action != daemon::DaemonController::ShutdownAction::StopDaemon) return false;
|
||||
return daemonWitnessRebuildActive();
|
||||
}
|
||||
|
||||
void App::renderDaemonStopConfirm()
|
||||
{
|
||||
using namespace ui::material;
|
||||
if (pending_shutdown_confirm_) {
|
||||
ImGui::OpenPopup("##DaemonStopConfirm");
|
||||
pending_shutdown_confirm_ = false;
|
||||
daemon_stop_confirm_open_ = true;
|
||||
}
|
||||
if (!daemon_stop_confirm_open_) return;
|
||||
|
||||
ImVec2 center = ImGui::GetMainViewport()->GetCenter();
|
||||
ImGui::SetNextWindowPos(center, ImGuiCond_Appearing, ImVec2(0.5f, 0.5f));
|
||||
bool proceed = false;
|
||||
if (ImGui::BeginPopupModal("##DaemonStopConfirm", nullptr,
|
||||
ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar)) {
|
||||
if (Type().subtitle1()) ImGui::PushFont(Type().subtitle1());
|
||||
ImGui::TextUnformatted("Node is rebuilding its witness cache");
|
||||
if (Type().subtitle1()) ImGui::PopFont();
|
||||
ImGui::Spacing();
|
||||
ImGui::PushTextWrapPos(ImGui::GetFontSize() * 26.0f);
|
||||
ImGui::TextUnformatted(
|
||||
"Stopping the node now discards the in-progress rebuild and restarts it (several minutes) "
|
||||
"the next time you open the wallet. You can keep the node running instead.");
|
||||
ImGui::PopTextWrapPos();
|
||||
ImGui::Spacing();
|
||||
ImGui::Spacing();
|
||||
|
||||
if (TactileButton("Keep node running & quit", ImVec2(0, 0))) {
|
||||
shutdown_keep_daemon_override_ = true;
|
||||
shutdown_confirmed_ = true;
|
||||
daemon_stop_confirm_open_ = false;
|
||||
proceed = true;
|
||||
ImGui::CloseCurrentPopup();
|
||||
}
|
||||
ImGui::SameLine();
|
||||
ImGui::PushStyleColor(ImGuiCol_Button, ImGui::ColorConvertU32ToFloat4(WithAlpha(Error(), 210)));
|
||||
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::ColorConvertU32ToFloat4(Error()));
|
||||
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGui::ColorConvertU32ToFloat4(WithAlpha(Error(), 160)));
|
||||
const bool stopAnyway = TactileButton("Stop anyway & quit", ImVec2(0, 0));
|
||||
ImGui::PopStyleColor(3);
|
||||
if (stopAnyway) {
|
||||
shutdown_confirmed_ = true;
|
||||
daemon_stop_confirm_open_ = false;
|
||||
proceed = true;
|
||||
ImGui::CloseCurrentPopup();
|
||||
}
|
||||
ImGui::SameLine();
|
||||
if (TactileButton("Cancel", ImVec2(0, 0))) {
|
||||
daemon_stop_confirm_open_ = false; // abort the quit; stay open
|
||||
ImGui::CloseCurrentPopup();
|
||||
}
|
||||
ImGui::EndPopup();
|
||||
} else {
|
||||
daemon_stop_confirm_open_ = false; // dismissed via Esc / click-away = Cancel
|
||||
}
|
||||
|
||||
// Re-enter shutdown outside the popup scope now that the user has chosen (shutdown_confirmed_ set).
|
||||
if (proceed) beginShutdown();
|
||||
}
|
||||
|
||||
void App::renderShutdownScreen()
|
||||
{
|
||||
using namespace ui::material;
|
||||
@@ -5963,6 +6112,10 @@ void App::renderShutdownScreen()
|
||||
// -------------------------------------------------------------------
|
||||
if (daemon_controller_) {
|
||||
auto lines = daemon_controller_->recentLines(8);
|
||||
// External daemon (attached, not spawned) has no captured stdout — tail its debug.log directly
|
||||
// so the user can still watch the node flush the block index and exit.
|
||||
if (lines.empty())
|
||||
lines = tailDaemonDebugLog(8);
|
||||
if (!lines.empty()) {
|
||||
float panelW = vp_size.x * shutElem("panel-width-fraction", 0.70f);
|
||||
float panelX = cx - panelW * 0.5f;
|
||||
|
||||
36
src/app.h
36
src/app.h
@@ -175,6 +175,21 @@ public:
|
||||
*/
|
||||
void renderShutdownScreen();
|
||||
|
||||
/**
|
||||
* @brief Tail the last N lines of the daemon's debug.log (best-effort, reads only the file tail).
|
||||
* Fallback for the shutdown screen when we have no captured stdout — e.g. an external daemon we
|
||||
* attached to rather than spawned — so the user can still see the node flushing/exiting.
|
||||
*/
|
||||
std::vector<std::string> tailDaemonDebugLog(int maxLines) const;
|
||||
|
||||
// True when the daemon's debug.log shows an in-progress Sapling witness-cache rebuild (best-effort
|
||||
// heuristic). Stopping the daemon during one discards it and forces a multi-minute redo next launch.
|
||||
bool daemonWitnessRebuildActive() const;
|
||||
// Whether beginShutdown() should pause and confirm before stopping the daemon (rebuild in progress).
|
||||
bool shouldConfirmDaemonStop() const;
|
||||
// The "node is rebuilding — stop anyway / keep running / cancel" modal, rendered from render().
|
||||
void renderDaemonStopConfirm();
|
||||
|
||||
/**
|
||||
* @brief Render loading overlay in content area while daemon is starting/syncing
|
||||
* @param contentH Height of the content area child window
|
||||
@@ -408,6 +423,9 @@ public:
|
||||
// each under every skin. Output: <config>/screenshots-full/<surface>/<skin>.png + an index.
|
||||
void startFullUiSweep();
|
||||
std::string screenshotFullDir() const;
|
||||
// Debug option: restrict either sweep to just the currently-active theme instead of cycling all.
|
||||
bool sweepCurrentThemeOnly() const { return sweep_current_theme_only_; }
|
||||
void setSweepCurrentThemeOnly(bool v) { sweep_current_theme_only_ = v; }
|
||||
bool isScreenshotSweeping() const { return screenshot_sweep_active_; }
|
||||
bool wantsScreenshotThisFrame() const { return sweep_capture_this_frame_; }
|
||||
const std::string& screenshotSweepPath() const { return sweep_current_path_; }
|
||||
@@ -814,6 +832,7 @@ private:
|
||||
// install) to back up their seed phrase. Cheap early-outs keep it idle until it can act.
|
||||
void maybeRemindSeedBackup();
|
||||
void maybeWarnEmptyWalletWithFundedSiblings(); // full-node: empty active wallet + a funded sibling → warn once
|
||||
void maybeWarnLargeWallet(); // full-node: wallet.dat past bloat threshold → one-time toast + clickable alert
|
||||
void scanFundedSiblingsAsync(); // off-UI-thread probe of sibling wallet files
|
||||
static void scrubAndRemoveExport(const std::string& path); // zero + delete a plaintext key export (H-02)
|
||||
void sweepStaleDecryptExports(); // startup net: purge stale obsidiandecryptexport* files (H-02)
|
||||
@@ -900,6 +919,11 @@ private:
|
||||
bool address_list_dirty_ = false; // P8: dedup rebuildAddressList
|
||||
GuardedStatus shutdown_status_; // thread-safe: written by the shutdown thread, read by the UI (M-05)
|
||||
std::thread shutdown_thread_;
|
||||
// Confirm-before-stopping-daemon-mid-witness-rebuild guard (see beginShutdown / renderDaemonStopConfirm)
|
||||
bool pending_shutdown_confirm_ = false; // a quit is deferred, waiting to open the confirm modal
|
||||
bool daemon_stop_confirm_open_ = false; // the confirm modal is currently showing
|
||||
bool shutdown_confirmed_ = false; // user chose to proceed — bypass the guard on re-entry
|
||||
bool shutdown_keep_daemon_override_ = false; // user chose "keep node running" for this shutdown only
|
||||
float shutdown_timer_ = 0.0f;
|
||||
bool force_quit_confirm_ = false;
|
||||
std::chrono::steady_clock::time_point shutdown_start_time_;
|
||||
@@ -1004,6 +1028,7 @@ private:
|
||||
bool seed_backup_loading_ = false;
|
||||
bool seed_backup_no_mnemonic_ = false;
|
||||
bool seed_backup_reminder_in_flight_ = false; // guards the one-time backup nudge probe
|
||||
bool large_wallet_checked_ = false; // gate: stat wallet.dat for the bloat nudge once per launch
|
||||
|
||||
// Cached mnemonic status of the current wallet, driving the Migrate-to-seed button glow. Probed
|
||||
// once per connect (probeWalletSeedStatus, via exportSeedPhrase); NoMnemonic = a legacy wallet a
|
||||
@@ -1097,6 +1122,14 @@ private:
|
||||
bool daemon_start_error_shown_ = false;
|
||||
int daemon_last_seen_crashes_ = 0; // surface each new embedded-daemon crash reason once
|
||||
bool refresh_policy_syncing_ = false; // whether the sync-throttle refresh profile is active
|
||||
// Sync-settle hysteresis + adaptive balance-poll throttle. Balance polling (z_gettotalbalance) is
|
||||
// O(mapWallet) and holds the daemon's cs_main, which starves block connection on a large shielded
|
||||
// wallet — so we keep the low-impact profile briefly after catching up, and back the balance poll
|
||||
// off in proportion to its own measured cost. See effectivelySyncing() / balanceRefreshDue().
|
||||
bool was_core_syncing_ = false; // previous Core-refresh sync state, to detect the caught-up edge
|
||||
std::time_t sync_settle_until_ = 0; // hold the sync-throttle until this wall-clock time (0 = not settling)
|
||||
double last_balance_scan_ms_ = 0.0; // measured cost of the last z_gettotalbalance scan
|
||||
bool force_balance_refresh_ = false; // a wallet mutation forces the next balance poll through the throttle
|
||||
// Auto-clear for secrets copied to the clipboard. Only a hash of the copied secret is kept.
|
||||
std::uint64_t clipboard_secret_hash_ = 0;
|
||||
double clipboard_clear_deadline_ = 0.0;
|
||||
@@ -1114,6 +1147,7 @@ private:
|
||||
|
||||
// Debug screenshot sweep state.
|
||||
bool screenshot_sweep_active_ = false;
|
||||
bool sweep_current_theme_only_ = false; // Debug Options: sweep only the active theme
|
||||
bool sweep_capture_this_frame_ = false;
|
||||
int sweep_skin_idx_ = 0;
|
||||
int sweep_settle_frames_ = 0; // frames to let a new skin/surface settle before capture
|
||||
@@ -1433,6 +1467,8 @@ private:
|
||||
void refreshPrice();
|
||||
void refreshWalletEncryptionState();
|
||||
void applyRefreshPolicy(ui::NavPage page);
|
||||
bool effectivelySyncing() const; // syncing, or within the post-sync settle window (hysteresis)
|
||||
bool balanceRefreshDue() const; // adaptive: enough time elapsed given the last balance-scan cost?
|
||||
bool currentPageNeedsWalletDataRefresh() const;
|
||||
bool shouldRunWalletTransactionRefresh() const;
|
||||
bool shouldRefreshTransactions() const;
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "rpc/connection.h"
|
||||
#include "chat/chat_identity.h" // deriveChatIdentityFromSecret for HushChat identity provisioning
|
||||
#include "ui/windows/chat_tab.h" // ui::ResetChatTab — wipe chat UI plaintext on a wallet switch
|
||||
#include "ui/windows/shield_dialog.h" // ui::ShieldDialog — Merge to Address shortcut from the bloat nudge
|
||||
#include "ui/windows/mining_pool_panel.h" // ui::resolveMiningUserAddress
|
||||
#include <sodium.h> // sodium_memzero for wiping the fetched mnemonic
|
||||
#include <cctype>
|
||||
@@ -836,13 +837,39 @@ void App::applyRefreshPolicy(ui::NavPage page)
|
||||
// While the daemon is syncing, override the per-tab cadence with the low-impact sync profile so
|
||||
// the wallet stops contending for the daemon's cs_main lock (frequent getpeerinfo / per-block
|
||||
// transaction scans / balance polls slow block connection). This makes every tab sync as fast
|
||||
// as the Console tab does today. Reverts to the per-tab profile once sync finishes.
|
||||
refresh_policy_syncing_ = state_.sync.syncing;
|
||||
// as the Console tab does today. effectivelySyncing() keeps this profile on briefly after catching
|
||||
// up (hysteresis) so a large-wallet scan can't immediately re-starve connection and bounce the
|
||||
// node back into "syncing". Reverts to the per-tab profile once the settle window passes.
|
||||
refresh_policy_syncing_ = effectivelySyncing();
|
||||
network_refresh_.setIntervals(refresh_policy_syncing_
|
||||
? services::RefreshScheduler::kSyncProfile
|
||||
: getIntervalsForPage(page));
|
||||
}
|
||||
|
||||
// True while the node is behind, and for a short settle window after it first catches up. The settle
|
||||
// window is armed only on the syncing→caught-up edge (see the Core refresh callback), so a wallet that
|
||||
// was synced from the start is never throttled at connect — only a node that just finished catching up.
|
||||
bool App::effectivelySyncing() const
|
||||
{
|
||||
if (state_.sync.syncing) return true;
|
||||
if (sync_settle_until_ == 0) return false; // no pending settle → genuinely caught up
|
||||
return std::time(nullptr) < sync_settle_until_;
|
||||
}
|
||||
|
||||
// Adaptive throttle: the next balance poll must wait at least (lastScanCost / kBalanceDutyCycle) since
|
||||
// the last one, so balance scanning can never occupy more than ~kBalanceDutyCycle of wall-clock. A
|
||||
// cheap wallet (sub-cadence cost) is unaffected — the tab's Core timer stays the real cadence; a ~20s
|
||||
// scan on a large wallet backs off to roughly every ~200s instead of every 2s, freeing cs_main for
|
||||
// block connection. A wallet mutation bypasses this via force_balance_refresh_.
|
||||
bool App::balanceRefreshDue() const
|
||||
{
|
||||
constexpr double kBalanceDutyCycle = 0.10;
|
||||
if (state_.last_balance_update == 0) return true; // never fetched
|
||||
if (last_balance_scan_ms_ <= 0.0) return true; // no cost measured yet
|
||||
const double minInterval = (last_balance_scan_ms_ / 1000.0) / kBalanceDutyCycle;
|
||||
return std::difftime(std::time(nullptr), state_.last_balance_update) >= minInterval;
|
||||
}
|
||||
|
||||
bool App::currentPageNeedsWalletDataRefresh() const
|
||||
{
|
||||
using NP = ui::NavPage;
|
||||
@@ -1665,9 +1692,15 @@ void App::refreshCoreData()
|
||||
? fast_rpc_.get() : rpc_.get();
|
||||
if (!w || !rpc) return;
|
||||
ui::NavPage tracePage = current_page_;
|
||||
// Skip the balance call while syncing (it's incomplete anyway and takes the wallet lock +
|
||||
// cs_main). Captured on the main thread to avoid reading state_ off the worker thread.
|
||||
const bool includeBalance = !state_.sync.syncing;
|
||||
// Decide whether to include the balance call (z_gettotalbalance — O(mapWallet), holds cs_main).
|
||||
// Suppress it (a) while syncing or within the post-sync settle window, so it can't starve block
|
||||
// connection, and (b) unless enough time has elapsed given the LAST scan's measured cost, so a
|
||||
// large shielded wallet backs off automatically instead of re-scanning every couple of seconds.
|
||||
// A wallet mutation (send/shield) forces the next poll through so the user's own action updates the
|
||||
// balance immediately. Captured on the main thread to avoid reading state_ off the worker thread.
|
||||
const bool includeBalance = !effectivelySyncing() &&
|
||||
(force_balance_refresh_ || balanceRefreshDue());
|
||||
if (includeBalance) force_balance_refresh_ = false;
|
||||
|
||||
auto enqueued = network_refresh_.enqueue(services::NetworkRefreshService::Job::Core, *w, [this, rpc, tracePage, includeBalance]() -> rpc::RPCWorker::MainCb {
|
||||
AppRefreshRpcGateway refreshRpc(*rpc, traceSource(tracePage, "Core refresh"));
|
||||
@@ -1677,6 +1710,19 @@ void App::refreshCoreData()
|
||||
NetworkRefreshService::applyCoreRefreshResult(state_, result, std::time(nullptr));
|
||||
applyPendingSendBalanceDeltas(true);
|
||||
|
||||
// Feed the adaptive balance throttle + sync-settle hysteresis. Record the last scan's
|
||||
// cost (0 when balance was skipped), and arm the settle window only on the
|
||||
// syncing→caught-up edge so a wallet synced from the start is never throttled at connect.
|
||||
if (result.balanceScanMs > 0.0) last_balance_scan_ms_ = result.balanceScanMs;
|
||||
const bool nowSyncing = state_.sync.syncing;
|
||||
if (nowSyncing) {
|
||||
sync_settle_until_ = 0;
|
||||
} else if (was_core_syncing_) {
|
||||
constexpr double kSyncSettleSeconds = 8.0;
|
||||
sync_settle_until_ = std::time(nullptr) + static_cast<std::time_t>(kSyncSettleSeconds);
|
||||
}
|
||||
was_core_syncing_ = nowSyncing;
|
||||
|
||||
// Mid-session connection-loss detection. During normal operation, both core
|
||||
// RPCs failing together means the daemon connection is dead (a busy daemon
|
||||
// fails them individually, not both at once). Warmup is excluded — both fail
|
||||
@@ -4232,6 +4278,36 @@ void App::maybeRemindSeedBackup()
|
||||
});
|
||||
}
|
||||
|
||||
// One-time nudge (full-node) when the BDB wallet.dat has bloated past the threshold. Berkeley DB never
|
||||
// shrinks in place and shielded-note witness data accumulates, so a mining/shielded wallet can grow
|
||||
// unbounded. Fires ONCE (persisted flag) a warning toast + a clickable "Consolidate notes…" entry in the
|
||||
// bell/alert panel that opens Merge to Address; re-arms if the file later drops back under the threshold.
|
||||
void App::maybeWarnLargeWallet()
|
||||
{
|
||||
if (capture_mode_ || lite_wallet_) return; // no live nags during a UI sweep; lite has no wallet.dat
|
||||
if (!supportsFullNodeLifecycleActions() || !settings_) return;
|
||||
if (!state_.connected || !state_.encryption_state_known) return;
|
||||
if (state_.warming_up || state_.daemon_initializing || !state_.sync.isSynced()) return;
|
||||
if (large_wallet_checked_) return; // stat wallet.dat at most once per launch
|
||||
large_wallet_checked_ = true;
|
||||
|
||||
static constexpr uint64_t kWalletBloatWarnBytes = 500ull * 1024 * 1024; // 500 MB (matches the Settings banner)
|
||||
const std::string walletPath = util::Platform::getDragonXDataDir() + "/wallet.dat";
|
||||
const uint64_t sz = util::Platform::getFileSize(walletPath);
|
||||
if (sz <= kWalletBloatWarnBytes) {
|
||||
// Re-arm the one-time warning if the file shrank back under the threshold (e.g. after a fresh seed wallet).
|
||||
if (settings_->getLargeWalletWarned()) { settings_->setLargeWalletWarned(false); settings_->save(); }
|
||||
return;
|
||||
}
|
||||
if (settings_->getLargeWalletWarned()) return; // already warned once for this bloat episode
|
||||
settings_->setLargeWalletWarned(true);
|
||||
settings_->save();
|
||||
ui::Notifications::instance().action(
|
||||
TR("wallet_size_warn"), ui::NotificationType::Warning,
|
||||
[]() { ui::ShieldDialog::showConsolidate(); },
|
||||
TR("wallet_size_consolidate"), 12.0f);
|
||||
}
|
||||
|
||||
// Complementary on-disk safety net (full-node) for a wallet salvage we did NOT witness this launch — it
|
||||
// happened on a prior run, or under an external daemon whose startup output we never captured, so
|
||||
// detectWalletAutoRecovery() never fired. If the active wallet loads EMPTY while a sibling wallet file in
|
||||
@@ -4967,21 +5043,12 @@ void App::rebuildWalletDatabase()
|
||||
const std::string tmpOut = datadir + "/wallet.rebuilt-" + std::string(ts) + ".tmp";
|
||||
{ std::error_code ec; fs::remove(tmpOut, ec); } // helper uses DB_EXCL — path must be fresh
|
||||
|
||||
// 3. Run the helper (src -> tmpOut). Quote both paths; capture its JSON line.
|
||||
std::string cmd = "\"" + helper + "\" \"" + src + "\" \"" + tmpOut + "\"";
|
||||
#ifdef _WIN32
|
||||
cmd = "\"" + cmd + "\""; // cmd.exe strips the outermost quotes
|
||||
FILE* fp = _popen(cmd.c_str(), "r");
|
||||
#else
|
||||
FILE* fp = popen(cmd.c_str(), "r");
|
||||
#endif
|
||||
std::string jout;
|
||||
if (fp) { char b[512]; while (std::fgets(b, sizeof b, fp)) jout += b; }
|
||||
#ifdef _WIN32
|
||||
const int rc = fp ? _pclose(fp) : -1;
|
||||
#else
|
||||
const int rc = fp ? pclose(fp) : -1;
|
||||
#endif
|
||||
// 3. Run the helper (src -> tmpOut). Quote both paths; capture its JSON line. Windowless
|
||||
// (runHiddenCapture) so a wallet rebuild never flashes a cmd.exe console; it runs the
|
||||
// helper via CreateProcess directly on Windows, so no cmd.exe outer-quote wrap is needed.
|
||||
const std::string cmd = "\"" + helper + "\" \"" + src + "\" \"" + tmpOut + "\"";
|
||||
int rc = -1;
|
||||
const std::string jout = util::Platform::runHiddenCapture(cmd, /*mergeStderr=*/false, &rc);
|
||||
DEBUG_LOGF("[App] wallet-rebuild helper rc=%d out=%s\n", rc, jout.c_str());
|
||||
|
||||
// 4. Verify-before-swap: the output must be a readable BDB with the fund-critical keys.
|
||||
@@ -5269,6 +5336,7 @@ void App::submitZSendMany(const std::string& from, const std::string& to, double
|
||||
// Force transaction list refresh so the sent tx appears immediately
|
||||
transactions_dirty_ = true;
|
||||
last_tx_block_height_ = -1;
|
||||
force_balance_refresh_ = true; // the user's own send must update the balance now, past the throttle
|
||||
network_refresh_.markWalletMutationRefresh();
|
||||
// z_sendmany only returned an opid: the transaction is built/signed/
|
||||
// broadcast asynchronously by the daemon. Defer the user-facing
|
||||
|
||||
@@ -704,6 +704,10 @@ void App::startSweepImpl(bool full)
|
||||
if (sk.valid) sweep_skins_.push_back(sk.id);
|
||||
if (sweep_skins_.empty()) return;
|
||||
|
||||
// Debug Options "Current theme only": sweep just the active skin instead of cycling every theme.
|
||||
if (sweep_current_theme_only_)
|
||||
sweep_skins_.assign(1, ui::schema::SkinManager::instance().activeSkinId());
|
||||
|
||||
sweep_full_ = full;
|
||||
if (full) { capture_mode_ = true; installDemoWalletData(); }
|
||||
buildSweepCatalog();
|
||||
|
||||
@@ -232,6 +232,7 @@ bool Settings::load(const std::string& path)
|
||||
}
|
||||
loadScalar(j, "wizard_completed", wizard_completed_);
|
||||
loadScalar(j, "seed_backup_reminded", seed_backup_reminded_);
|
||||
loadScalar(j, "large_wallet_warned", large_wallet_warned_);
|
||||
if (j.contains("empty_wallet_warning_acked") && j["empty_wallet_warning_acked"].is_array()) {
|
||||
empty_wallet_warning_acked_.clear();
|
||||
for (const auto& w : j["empty_wallet_warning_acked"])
|
||||
@@ -506,6 +507,7 @@ bool Settings::save(const std::string& path)
|
||||
}
|
||||
j["wizard_completed"] = wizard_completed_;
|
||||
j["seed_backup_reminded"] = seed_backup_reminded_;
|
||||
j["large_wallet_warned"] = large_wallet_warned_;
|
||||
j["empty_wallet_warning_acked"] = json::array();
|
||||
for (const auto& w : empty_wallet_warning_acked_)
|
||||
j["empty_wallet_warning_acked"].push_back(w);
|
||||
|
||||
@@ -330,6 +330,10 @@ public:
|
||||
bool getSeedBackupReminded() const { return seed_backup_reminded_; }
|
||||
void setSeedBackupReminded(bool v) { seed_backup_reminded_ = v; }
|
||||
|
||||
// One-time nudge when wallet.dat grows past the bloat threshold (re-armed if it shrinks back).
|
||||
bool getLargeWalletWarned() const { return large_wallet_warned_; }
|
||||
void setLargeWalletWarned(bool v) { large_wallet_warned_ = v; }
|
||||
|
||||
// Wallet filenames for which the one-time "this wallet is empty but a sibling holds funds"
|
||||
// warning has been dismissed. Keyed per active wallet file so switching to a different empty
|
||||
// wallet can warn again (see App::maybeWarnEmptyWalletWithFundedSiblings).
|
||||
@@ -597,6 +601,7 @@ private:
|
||||
std::map<std::string, AddressMeta> address_meta_;
|
||||
bool wizard_completed_ = false;
|
||||
bool seed_backup_reminded_ = false;
|
||||
bool large_wallet_warned_ = false;
|
||||
std::set<std::string> empty_wallet_warning_acked_; // wallet files whose empty-wallet warning was dismissed
|
||||
bool encryption_pending_ = false;
|
||||
long long daemon_update_prompted_size_ = 0; // bundled daemon size last offered via the update prompt
|
||||
|
||||
@@ -689,7 +689,10 @@ bool EmbeddedDaemon::startProcess(const std::string& binary_path, const std::vec
|
||||
debug_log_path_.c_str(), debug_log_offset_);
|
||||
}
|
||||
|
||||
// Launch daemon with CREATE_NEW_CONSOLE (hidden via SW_HIDE).
|
||||
// Launch daemon windowless. Use CREATE_NO_WINDOW (NOT CREATE_NEW_CONSOLE): CREATE_NEW_CONSOLE
|
||||
// allocates a console window that briefly flashes on screen before SW_HIDE can hide it, which is
|
||||
// visible as a console-window flash on wallet launch. CREATE_NO_WINDOW gives the console child no
|
||||
// window at all (same approach as the xmrig launcher). The daemon logs to debug.log, not a console.
|
||||
// The daemon binary must NOT be in the data directory (%APPDATA%\Hush\DRAGONX)
|
||||
// — it must be in <exe_dir>/dragonx/ to avoid conflicts with lock files and data.
|
||||
STARTUPINFOA si;
|
||||
@@ -699,7 +702,7 @@ bool EmbeddedDaemon::startProcess(const std::string& binary_path, const std::vec
|
||||
si.dwFlags = STARTF_USESHOWWINDOW;
|
||||
si.wShowWindow = SW_HIDE;
|
||||
ZeroMemory(&pi, sizeof(pi));
|
||||
|
||||
|
||||
char* cmd_line = _strdup(cmd.c_str());
|
||||
BOOL success = CreateProcessA(
|
||||
NULL,
|
||||
@@ -707,7 +710,7 @@ bool EmbeddedDaemon::startProcess(const std::string& binary_path, const std::vec
|
||||
NULL,
|
||||
NULL,
|
||||
FALSE,
|
||||
CREATE_NEW_CONSOLE,
|
||||
CREATE_NO_WINDOW,
|
||||
NULL,
|
||||
work_dir.c_str(),
|
||||
&si,
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <curl/curl.h>
|
||||
|
||||
#include "../util/logger.h"
|
||||
#include "../util/platform.h"
|
||||
#include "../util/pool_registry.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
@@ -145,32 +146,18 @@ std::string XmrigManager::findXmrigBinary() {
|
||||
return path;
|
||||
}
|
||||
|
||||
// Fallback: system PATH
|
||||
// Fallback: system PATH — windowless so it never flashes a console.
|
||||
#ifdef _WIN32
|
||||
FILE* f = _popen("where xmrig.exe 2>nul", "r");
|
||||
std::string out = util::Platform::runHiddenCapture("where xmrig.exe");
|
||||
#else
|
||||
FILE* f = popen("which xmrig 2>/dev/null", "r");
|
||||
#endif
|
||||
if (f) {
|
||||
char line[512];
|
||||
if (fgets(line, sizeof(line), f)) {
|
||||
std::string s(line);
|
||||
while (!s.empty() && (s.back() == '\n' || s.back() == '\r'))
|
||||
s.pop_back();
|
||||
if (!s.empty() && fs::exists(s)) {
|
||||
#ifdef _WIN32
|
||||
_pclose(f);
|
||||
#else
|
||||
pclose(f);
|
||||
#endif
|
||||
return s;
|
||||
}
|
||||
}
|
||||
#ifdef _WIN32
|
||||
_pclose(f);
|
||||
#else
|
||||
pclose(f);
|
||||
std::string out = util::Platform::runHiddenCapture("which xmrig");
|
||||
#endif
|
||||
{
|
||||
std::string s = out;
|
||||
const auto nl = s.find_first_of("\r\n"); // first line only
|
||||
if (nl != std::string::npos) s.erase(nl);
|
||||
while (!s.empty() && (s.back() == ' ' || s.back() == '\t')) s.pop_back();
|
||||
if (!s.empty() && fs::exists(s)) return s;
|
||||
}
|
||||
|
||||
return {};
|
||||
@@ -927,24 +914,10 @@ void XmrigManager::startVersionDetection()
|
||||
const bool binShellSafe =
|
||||
!bin.empty() && bin.find_first_of("\"'`$;&|<>^%\n\r") == std::string::npos;
|
||||
if (binShellSafe) {
|
||||
const std::string cmd = "\"" + bin + "\" --version 2>&1";
|
||||
#ifdef _WIN32
|
||||
FILE* fp = _popen(cmd.c_str(), "r");
|
||||
#else
|
||||
FILE* fp = popen(cmd.c_str(), "r");
|
||||
#endif
|
||||
if (fp) {
|
||||
std::string out;
|
||||
char buf[256];
|
||||
size_t n;
|
||||
while ((n = fread(buf, 1, sizeof(buf), fp)) > 0) out.append(buf, n);
|
||||
#ifdef _WIN32
|
||||
_pclose(fp);
|
||||
#else
|
||||
pclose(fp);
|
||||
#endif
|
||||
ver = parseMinerVersion(out);
|
||||
}
|
||||
// Windowless capture (mergeStderr: xmrig may print --version to stderr) — never flashes.
|
||||
const std::string cmd = "\"" + bin + "\" --version";
|
||||
const std::string out = util::Platform::runHiddenCapture(cmd, /*mergeStderr=*/true);
|
||||
if (!out.empty()) ver = parseMinerVersion(out);
|
||||
}
|
||||
std::lock_guard<std::mutex> lk(g_installed_ver_mutex);
|
||||
g_installed_ver = ver;
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <cctype>
|
||||
#include <chrono>
|
||||
#include <cmath>
|
||||
#include <cstdlib>
|
||||
#include <map>
|
||||
@@ -294,8 +295,13 @@ NetworkRefreshService::CoreRefreshResult NetworkRefreshService::collectCoreRefre
|
||||
json blockInfo;
|
||||
bool balanceOk = false;
|
||||
bool blockOk = false;
|
||||
double balanceScanMs = 0.0;
|
||||
|
||||
if (includeBalance) {
|
||||
// z_gettotalbalance is O(mapWallet) and holds the daemon's cs_main for its whole duration —
|
||||
// seconds on a large shielded wallet. Time it so the caller can throttle how often it polls
|
||||
// (balanceRefreshDue()), keeping balance scans from starving block connection.
|
||||
const auto balanceStart = std::chrono::steady_clock::now();
|
||||
try { // DISPLAY total: minconf=0 — includes the user's own pending change so it doesn't crater
|
||||
totalBalance = rpc.call("z_gettotalbalance", json::array({0}));
|
||||
balanceOk = true;
|
||||
@@ -305,6 +311,8 @@ NetworkRefreshService::CoreRefreshResult NetworkRefreshService::collectCoreRefre
|
||||
try { // SPENDABLE total: minconf=1 (confirmed). If absent, spendable degrades to display in apply.
|
||||
spendableBalance = rpc.call("z_gettotalbalance", json::array({1}));
|
||||
} catch (...) {}
|
||||
balanceScanMs = std::chrono::duration<double, std::milli>(
|
||||
std::chrono::steady_clock::now() - balanceStart).count();
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -314,7 +322,9 @@ NetworkRefreshService::CoreRefreshResult NetworkRefreshService::collectCoreRefre
|
||||
DEBUG_LOGF("BlockchainInfo error: %s\n", e.what());
|
||||
}
|
||||
|
||||
return parseCoreRefreshResult(totalBalance, spendableBalance, balanceOk, blockInfo, blockOk);
|
||||
auto result = parseCoreRefreshResult(totalBalance, spendableBalance, balanceOk, blockInfo, blockOk);
|
||||
result.balanceScanMs = balanceScanMs;
|
||||
return result;
|
||||
}
|
||||
|
||||
NetworkRefreshService::MiningRefreshResult NetworkRefreshService::parseMiningRefreshResult(
|
||||
|
||||
@@ -111,6 +111,7 @@ public:
|
||||
std::optional<double> verificationProgress;
|
||||
std::optional<int> longestChain;
|
||||
std::optional<int> notarized;
|
||||
double balanceScanMs = 0.0; // wall-clock spent in z_gettotalbalance this refresh (0 if balance skipped)
|
||||
};
|
||||
|
||||
struct MiningRefreshResult {
|
||||
|
||||
@@ -173,11 +173,23 @@ inline float kSidePanelMinWidth() { return schema::UI().drawElement("panels",
|
||||
inline float kSidePanelMaxWidth() { return schema::UI().drawElement("panels", "side-panel").getFloat("max-width", 450.0f) * dpiScale(); }
|
||||
inline float kSidePanelWidthRatio() { return schema::UI().drawElement("panels", "side-panel").getFloat("width-ratio", 0.4f); }
|
||||
|
||||
// Overall content-column cap: the max width a tab's content should occupy before it is centered in wider
|
||||
// windows. Prevents cards/forms/tables (which all derive their size from the content child's width) from
|
||||
// stretching edge-to-edge at wide/ultrawide widths. <= 0 disables (fill full width). Tunable via ui.toml
|
||||
// [layout] content-max-width; default is generous so data-dense screens stay comfortable.
|
||||
inline float kContentMaxWidth() { return schema::UI().drawElement("layout", "content-max-width").sizeOr(1600.0f) * dpiScale(); }
|
||||
// Overall content-column cap: the max width a tab's content occupies before it is centered in wider
|
||||
// windows. <= 0 disables the cap so tab content fills ALL available horizontal width (the default —
|
||||
// requested so large windows don't leave a big empty gutter on the right). Set a positive
|
||||
// ui.toml [layout] content-max-width to re-enable a centered readable column.
|
||||
inline float kContentMaxWidth() { return schema::UI().drawElement("layout", "content-max-width").sizeOr(0.0f) * dpiScale(); }
|
||||
|
||||
// Shared compose-card envelope for the Send + Receive tabs (and any tab wanting the same box): fill the
|
||||
// available column up to the content-max-width cap, then center the leftover as margin. Both tabs MUST
|
||||
// derive their card width/offset from this so the two envelopes stay byte-for-byte identical — they
|
||||
// previously drifted (Send capped at 760dp, Receive at 860dp), so the Send card rendered narrower than
|
||||
// Receive on any window wider than ~860dp. Returns {width, offsetX} in the same units as availW.
|
||||
struct CardBox { float width; float offsetX; };
|
||||
inline CardBox mainComposeCardBox(float availW) {
|
||||
float cap = kContentMaxWidth();
|
||||
float w = (cap > 0.0f) ? std::min(availW, cap) : availW; // cap <= 0 -> fill full width
|
||||
return CardBox{ w, std::max(0.0f, (availW - w) * 0.5f) };
|
||||
}
|
||||
|
||||
inline float kTableMinHeight() { return schema::UI().drawElement("panels", "table").getFloat("min-height", 150.0f) * dpiScale(); }
|
||||
inline float kTableHeightRatio() { return schema::UI().drawElement("panels", "table").getFloat("height-ratio", 0.45f); }
|
||||
|
||||
@@ -544,11 +544,16 @@ inline bool TactileButton(const char* label, const ImVec2& size = ImVec2(0, 0),
|
||||
ImVec2 bMin = ImGui::GetItemRectMin();
|
||||
ImVec2 bMax = ImGui::GetItemRectMax();
|
||||
|
||||
// For icon fonts, manually draw centered icon after getting button rect
|
||||
// For icon fonts, manually draw centered icon after getting button rect. Measure/draw only the
|
||||
// VISIBLE label (up to the "##id" separator): CalcTextSizeA/AddText don't strip "##" the way
|
||||
// ImGui's own text render does, so an id suffix like "##pickContact" would inflate textSz and
|
||||
// shove the glyph left off-center (and try to draw the notdef id chars).
|
||||
if (isIconFont && size.x > 0 && size.y > 0) {
|
||||
ImVec2 textSz = useFont->CalcTextSizeA(useFont->LegacySize, FLT_MAX, 0, label);
|
||||
const char* labelEnd = label;
|
||||
while (*labelEnd && !(labelEnd[0] == '#' && labelEnd[1] == '#')) ++labelEnd;
|
||||
ImVec2 textSz = useFont->CalcTextSizeA(useFont->LegacySize, FLT_MAX, 0, label, labelEnd);
|
||||
ImVec2 textPos(bMin.x + (size.x - textSz.x) * 0.5f, bMin.y + (size.y - textSz.y) * 0.5f);
|
||||
dl->AddText(useFont, useFont->LegacySize, textPos, ImGui::GetColorU32(ImGuiCol_Text), label);
|
||||
dl->AddText(useFont, useFont->LegacySize, textPos, ImGui::GetColorU32(ImGuiCol_Text), label, labelEnd);
|
||||
}
|
||||
|
||||
float rounding = ImGui::GetStyle().FrameRounding;
|
||||
|
||||
@@ -107,7 +107,7 @@ inline float ActionButtonWidth(const char* label, const char* icon, float minWid
|
||||
ImFont* lf = Type().button();
|
||||
ImFont* icf = Type().iconSmall();
|
||||
const float dp = Layout::dpiScale();
|
||||
const float padX = 12.0f * dp, gap = 6.0f * dp;
|
||||
const float padX = 9.0f * dp, gap = 6.0f * dp; // mockup .btn padding: 9px horizontal
|
||||
const float labelW = lf->CalcTextSizeA(lf->LegacySize, FLT_MAX, 0, label).x;
|
||||
const float iconW = (icon && icon[0] && icf) ? icf->CalcTextSizeA(icf->LegacySize, FLT_MAX, 0, icon).x : 0.0f;
|
||||
const float w = padX * 2.0f + iconW + (iconW > 0.0f ? gap : 0.0f) + labelW;
|
||||
@@ -133,19 +133,21 @@ inline bool ActionButton(const char* id, const char* label, const char* icon, Ac
|
||||
if (hov) ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
|
||||
ImDrawList* dl = ImGui::GetWindowDrawList();
|
||||
const ImVec2 pMax(pos.x + w, pos.y + h);
|
||||
const float round = ImGui::GetStyle().FrameRounding;
|
||||
const float round = 7.0f * dp; // mockup .btn radius: 7px (softer than the global 4px frame)
|
||||
const float a = ImGui::GetStyle().Alpha; // BeginDisabled() lowers this
|
||||
|
||||
ImU32 bg = 0, border = 0, fg = OnSurface();
|
||||
bool glass = false;
|
||||
switch (tier) {
|
||||
case ActionTier::Primary:
|
||||
bg = WithAlpha(Primary(), act ? 255 : (hov ? 245 : 220));
|
||||
fg = IM_COL32(255, 255, 255, 240);
|
||||
// Mockup .btn.acc: a dark accent-tinted chip with accent TEXT — not a bright filled button.
|
||||
bg = WithAlpha(Primary(), hov ? 52 : 38);
|
||||
border = WithAlpha(Primary(), hov ? 150 : 110);
|
||||
fg = Primary();
|
||||
break;
|
||||
case ActionTier::Secondary:
|
||||
bg = WithAlpha(OnSurface(), hov ? 26 : 16);
|
||||
border = WithAlpha(OnSurface(), 40);
|
||||
bg = WithAlpha(OnSurface(), hov ? 30 : 20);
|
||||
border = WithAlpha(OnSurface(), 48);
|
||||
glass = true;
|
||||
fg = OnSurface();
|
||||
break;
|
||||
|
||||
@@ -31,6 +31,8 @@ struct AlertRecord {
|
||||
std::string message;
|
||||
NotificationType type;
|
||||
std::int64_t epoch; // std::time(nullptr) at push — wall-clock, for relative-age display
|
||||
std::function<void()> onClick; // optional: makes this bell-panel entry actionable
|
||||
std::string actionHint; // optional: accent link label rendered for the action
|
||||
};
|
||||
|
||||
struct Notification {
|
||||
@@ -92,15 +94,25 @@ public:
|
||||
if (duration < 0.0f) duration = schemaDuration("duration-error", 4.0f);
|
||||
push(message, NotificationType::Error, duration);
|
||||
}
|
||||
|
||||
// An actionable alert: a normal toast PLUS a clickable entry in the bell/alert-history panel.
|
||||
// onClick fires when the user clicks the accent `actionHint` link in that panel.
|
||||
void action(const std::string& message, NotificationType type, std::function<void()> onClick,
|
||||
const std::string& actionHint, float duration = -1.0f) {
|
||||
if (duration < 0.0f) duration = schemaDuration("duration-warning", 3.5f);
|
||||
push(message, type, duration, std::move(onClick), actionHint);
|
||||
}
|
||||
|
||||
void push(const std::string& message, NotificationType type, float duration = 5.0f) {
|
||||
void push(const std::string& message, NotificationType type, float duration = 5.0f,
|
||||
std::function<void()> onClick = nullptr, const std::string& actionHint = "") {
|
||||
notifications_.emplace_back(message, type, duration);
|
||||
|
||||
// Retain a copy in the persistent history (the toast above will fade in seconds; this
|
||||
// survives so the user can review what happened). Thread note: every push is on the UI
|
||||
// thread (RPC results run as main-thread MainCb callbacks), so this container needs no lock,
|
||||
// consistent with the rest of this class. Do NOT push from a raw worker thread.
|
||||
history_.push_back(AlertRecord{message, type, static_cast<std::int64_t>(std::time(nullptr))});
|
||||
history_.push_back(AlertRecord{message, type, static_cast<std::int64_t>(std::time(nullptr)),
|
||||
std::move(onClick), actionHint});
|
||||
++total_pushed_;
|
||||
while (history_.size() > kMaxHistory) {
|
||||
history_.pop_front();
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -538,11 +538,6 @@ inline bool RenderSidebar(NavPage& current, float sidebarWidth, float contentHei
|
||||
float exitRelY = curY + bottomPadding;
|
||||
float panelH = exitRelY + stripH;
|
||||
|
||||
// Vertical centering — offset so panel is centered in the child window
|
||||
float centerOffset = std::max(glassMarginY, (contentHeight - panelH) * 0.5f);
|
||||
if (centerOffset + panelH > contentHeight)
|
||||
centerOffset = std::max(0.0f, contentHeight - panelH);
|
||||
|
||||
// ===================================================================
|
||||
// PASS 2: Render using computed positions
|
||||
// ===================================================================
|
||||
@@ -552,6 +547,13 @@ inline bool RenderSidebar(NavPage& current, float sidebarWidth, float contentHei
|
||||
ImDrawList* dl = ImGui::GetWindowDrawList();
|
||||
ImVec2 wp = ImGui::GetWindowPos();
|
||||
|
||||
// Vertical centering — center the panel within the child. app.cpp sizes the child (contentHeight)
|
||||
// to the visible area (child top -> status-bar top) using window-local geometry, so this yields
|
||||
// equal top/bottom gaps at any height on every platform, no viewport dependency.
|
||||
float centerOffset = std::max(glassMarginY, (contentHeight - panelH) * 0.5f);
|
||||
if (centerOffset + panelH > contentHeight)
|
||||
centerOffset = std::max(0.0f, contentHeight - panelH);
|
||||
|
||||
float panelLeft = wp.x + glassMarginL;
|
||||
float panelRight = wp.x + sidebarWidth - glassMarginR;
|
||||
float panelTopY = wp.y + centerOffset;
|
||||
|
||||
@@ -1885,20 +1885,37 @@ void ResetChatTab()
|
||||
s_show_chat_settings = false;
|
||||
}
|
||||
|
||||
void RenderChatSettingsControls(App* app, float contentWidth)
|
||||
void RenderChatSettingsControls(App* app, float contentWidth, bool drawCards)
|
||||
{
|
||||
auto* st = app ? app->settings() : nullptr;
|
||||
if (!st) return;
|
||||
const float dp = Layout::dpiScale();
|
||||
const float ctrlW = 250.0f * dp; // control column width (fits a 3-segment control comfortably)
|
||||
const float rowGap = 5.0f * dp;
|
||||
const float rowGap = 10.0f * dp;
|
||||
|
||||
// Optionally paint two glass cards (Appearance | Messaging) around our own two columns so the
|
||||
// Settings tab matches the mockup's card-per-group layout. The chat modal passes drawCards=false
|
||||
// and keeps its plain single-surface layout — the controls themselves are identical either way.
|
||||
ImDrawList* cardDL = ImGui::GetWindowDrawList();
|
||||
const float cardPad = drawCards ? Layout::cardInnerPadding() : 0.0f;
|
||||
material::GlassPanelSpec cardSpec; cardSpec.rounding = Layout::glassRounding();
|
||||
float cardTopScr = 0.0f, cardBaseXScr = 0.0f, cardLeftBotScr = 0.0f;
|
||||
if (drawCards) {
|
||||
cardTopScr = ImGui::GetCursorScreenPos().y;
|
||||
cardBaseXScr = ImGui::GetCursorScreenPos().x;
|
||||
cardDL->ChannelsSplit(2);
|
||||
cardDL->ChannelsSetCurrent(1);
|
||||
ImGui::SetCursorScreenPos(ImVec2(cardBaseXScr, cardTopScr + cardPad));
|
||||
ImGui::Indent(cardPad);
|
||||
}
|
||||
// Right-align controls to the row's true right edge. The Settings tab renders us inside a GlassCard
|
||||
// whose content region isn't narrowed to the card padding, so it passes an explicit contentWidth;
|
||||
// the chat modal's dialog content region is correct, so it passes 0 (auto).
|
||||
// leftX/rowW define the current column the rows lay out in; retargeted below
|
||||
// to split Appearance | Messaging into two columns when the card is wide.
|
||||
float leftX = ImGui::GetCursorPosX();
|
||||
float rowW = (contentWidth > 0.0f) ? contentWidth : ImGui::GetContentRegionAvail().x;
|
||||
float rowW = drawCards ? (contentWidth - 2.0f * cardPad)
|
||||
: ((contentWidth > 0.0f) ? contentWidth : ImGui::GetContentRegionAvail().x);
|
||||
|
||||
// Label left, control right-aligned within [leftX, leftX+rowW]. Leaves the cursor at the control origin.
|
||||
auto beginRow = [&](const char* label) {
|
||||
@@ -1966,7 +1983,7 @@ void RenderChatSettingsControls(App* app, float contentWidth)
|
||||
// Two internal columns when the card is wide enough: Appearance on the left,
|
||||
// Messaging on the right — fills the width and roughly halves the height.
|
||||
// (Mirrors the Node & Security card.) Narrow (the chat modal) stays single-column.
|
||||
const float chatColGap = 24.0f * dp;
|
||||
const float chatColGap = drawCards ? (Layout::cardGap() + 2.0f * cardPad) : (24.0f * dp);
|
||||
const bool chatTwoCol = rowW > 760.0f * dp;
|
||||
const float chatColW = chatTwoCol ? (rowW - chatColGap) * 0.5f : rowW;
|
||||
const float chatBaseLeftX = leftX;
|
||||
@@ -2023,6 +2040,7 @@ void RenderChatSettingsControls(App* app, float contentWidth)
|
||||
// line-start holds the column; retarget leftX so controls right-align in it).
|
||||
if (chatTwoCol) {
|
||||
chatLeftBottomY = ImGui::GetCursorPosY();
|
||||
cardLeftBotScr = ImGui::GetCursorScreenPos().y; // left column bottom (screen), for its card panel
|
||||
ImGui::SetCursorPosY(chatTopY);
|
||||
ImGui::Indent(chatColW + chatColGap);
|
||||
leftX = chatBaseLeftX + chatColW + chatColGap;
|
||||
@@ -2056,12 +2074,41 @@ void RenderChatSettingsControls(App* app, float contentWidth)
|
||||
}
|
||||
|
||||
// Close the two-column band: un-indent and drop below the taller column.
|
||||
const float cardRightBotScr = ImGui::GetCursorScreenPos().y; // right (or only) column bottom, screen
|
||||
if (chatTwoCol) {
|
||||
ImGui::Unindent(chatColW + chatColGap);
|
||||
const float chatRightBottomY = ImGui::GetCursorPosY();
|
||||
ImGui::SetCursorPosX(chatBaseLeftX);
|
||||
ImGui::SetCursorPosY(std::max(chatLeftBottomY, chatRightBottomY));
|
||||
}
|
||||
|
||||
// Paint the glass card(s) behind the content, then merge the channels.
|
||||
if (drawCards) {
|
||||
ImGui::Unindent(cardPad);
|
||||
cardDL->ChannelsSetCurrent(0);
|
||||
const float cardW = (contentWidth - Layout::cardGap()) * 0.5f;
|
||||
if (chatTwoCol) {
|
||||
const float eqBot = std::max(cardLeftBotScr, cardRightBotScr); // equal-height cards (mockup grid stretch)
|
||||
material::DrawGlassPanel(cardDL, ImVec2(cardBaseXScr, cardTopScr),
|
||||
ImVec2(cardBaseXScr + cardW, eqBot + cardPad), cardSpec);
|
||||
material::DrawGlassPanel(cardDL, ImVec2(cardBaseXScr + cardW + Layout::cardGap(), cardTopScr),
|
||||
ImVec2(cardBaseXScr + contentWidth, eqBot + cardPad), cardSpec);
|
||||
} else {
|
||||
material::DrawGlassPanel(cardDL, ImVec2(cardBaseXScr, cardTopScr),
|
||||
ImVec2(cardBaseXScr + contentWidth, cardRightBotScr + cardPad), cardSpec);
|
||||
}
|
||||
cardDL->ChannelsMerge();
|
||||
const float botScr = chatTwoCol ? std::max(cardLeftBotScr, cardRightBotScr) : cardRightBotScr;
|
||||
// Reserve the card footprint with a Dummy so the parent scroll region grows to include it
|
||||
// (a bare SetCursorScreenPos past content warns in ImGui).
|
||||
ImGui::SetCursorScreenPos(ImVec2(cardBaseXScr, cardTopScr));
|
||||
ImGui::Dummy(ImVec2(contentWidth, (botScr - cardTopScr) + cardPad));
|
||||
|
||||
// Live conversation preview below the two cards (Settings tab only — the chat modal renders
|
||||
// its own preview column beside these controls, so it passes drawCards=false and skips this).
|
||||
ImGui::Dummy(ImVec2(0.0f, Layout::spacingMd()));
|
||||
RenderChatSettingsPreview(app, contentWidth);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace ui
|
||||
|
||||
@@ -34,7 +34,7 @@ void RenderChatTab(App* app);
|
||||
* width from the Settings tab (whose GlassCard doesn't narrow the content region). 0 = auto
|
||||
* (use the current content region, correct inside the chat modal's dialog).
|
||||
*/
|
||||
void RenderChatSettingsControls(App* app, float contentWidth = 0.0f);
|
||||
void RenderChatSettingsControls(App* app, float contentWidth = 0.0f, bool drawCards = false);
|
||||
|
||||
/**
|
||||
* @brief Securely wipe the Chat tab's UI-local state (composer / new-conversation
|
||||
|
||||
@@ -175,6 +175,11 @@ static void RenderAddressDropdown(App* app, float width) {
|
||||
}
|
||||
}
|
||||
|
||||
// Combo/button widths first — the preview truncates to the combo's real pixel width below.
|
||||
float copyBtnW = std::max(schema::UI().drawElement("tabs.receive", "copy-btn-min-width").size, schema::UI().drawElement("tabs.receive", "copy-btn-width").size * Layout::hScale(width));
|
||||
float newBtnW = std::max(schema::UI().drawElement("tabs.receive", "new-btn-min-width").size, schema::UI().drawElement("tabs.receive", "new-btn-width").size * Layout::hScale(width));
|
||||
float dropdownW = width - copyBtnW - newBtnW - Layout::spacingSm() * 2;
|
||||
|
||||
// Build preview string
|
||||
if (!app->isConnected()) {
|
||||
s_source_preview = TR(app->isLiteBuild() ? "lite_no_wallet_short" : "not_connected");
|
||||
@@ -183,18 +188,27 @@ static void RenderAddressDropdown(App* app, float width) {
|
||||
const auto& addr = state.addresses[s_selected_address_idx];
|
||||
bool isZ = addr.type == "shielded";
|
||||
const char* tag = isZ ? "[Z]" : "[T]";
|
||||
std::string trunc = util::truncateMiddle(addr.address,
|
||||
static_cast<int>(std::max(schema::UI().drawElement("tabs.receive", "addr-preview-trunc-min").size, width / schema::UI().drawElement("tabs.receive", "addr-preview-trunc-divisor").size)));
|
||||
snprintf(buf, sizeof(buf), "%s %s \xe2\x80\x94 %.8f %s",
|
||||
tag, trunc.c_str(), addr.balance, DRAGONX_TICKER);
|
||||
// Reserve pixel room for the tag prefix and the trailing balance, then middle-truncate the
|
||||
// address to whatever remains — measured with the combo's own Body2 font. Char-count
|
||||
// truncation kept MORE chars as the column widened, so at 150% the scaled font overflowed
|
||||
// and the combo hard-clipped "— 12.00000000 DRGX" to "— 1"; measuring in pixels keeps the
|
||||
// balance visible at any scale.
|
||||
ImFont* comboFont = Type().getFont(TypeStyle::Body2);
|
||||
float comboFontSz = comboFont->LegacySize;
|
||||
char prefix[16]; snprintf(prefix, sizeof(prefix), "%s ", tag);
|
||||
char suffix[64]; snprintf(suffix, sizeof(suffix), " \xe2\x80\x94 %.8f %s", addr.balance, DRAGONX_TICKER);
|
||||
float fixedW = comboFont->CalcTextSizeA(comboFontSz, FLT_MAX, 0.0f, prefix).x
|
||||
+ comboFont->CalcTextSizeA(comboFontSz, FLT_MAX, 0.0f, suffix).x;
|
||||
// Combo interior = dropdownW minus its dropdown-arrow button (~frame height) and both frame paddings.
|
||||
float addrBudget = dropdownW - ImGui::GetFrameHeight() - ImGui::GetStyle().FramePadding.x * 2.0f - fixedW;
|
||||
if (addrBudget < 24.0f) addrBudget = 24.0f; // floor: truncate to a stub rather than overflow
|
||||
std::string trunc = material::TruncateToWidth(addr.address, comboFont, comboFontSz, addrBudget);
|
||||
snprintf(buf, sizeof(buf), "%s%s%s", prefix, trunc.c_str(), suffix);
|
||||
s_source_preview = buf;
|
||||
} else {
|
||||
s_source_preview = TR("select_receiving_address");
|
||||
}
|
||||
|
||||
float copyBtnW = std::max(schema::UI().drawElement("tabs.receive", "copy-btn-min-width").size, schema::UI().drawElement("tabs.receive", "copy-btn-width").size * Layout::hScale(width));
|
||||
float newBtnW = std::max(schema::UI().drawElement("tabs.receive", "new-btn-min-width").size, schema::UI().drawElement("tabs.receive", "new-btn-width").size * Layout::hScale(width));
|
||||
float dropdownW = width - copyBtnW - newBtnW - Layout::spacingSm() * 2;
|
||||
ImGui::SetNextItemWidth(dropdownW);
|
||||
ImGui::PushFont(Type().getFont(TypeStyle::Body2));
|
||||
if (ImGui::BeginCombo("##RecvAddr", s_source_preview.c_str())) {
|
||||
@@ -584,12 +598,14 @@ void RenderReceiveTab(App* app)
|
||||
// ================================================================
|
||||
{
|
||||
// Cap + center the card so the address/amount column stops stretching while the
|
||||
// QR plateaus. cardW never exceeds formW (only shrinks); leftover becomes margin.
|
||||
// QR plateaus. Shared with the Send tab via mainComposeCardBox() so the two card
|
||||
// envelopes are identical (they must never drift in width/position again).
|
||||
// The RECENT RECEIVED list below stays on the uncapped formW (handled separately).
|
||||
float cardDp = Layout::dpiScale();
|
||||
float cardW = std::min(formW, 860.0f * cardDp);
|
||||
Layout::CardBox cardBox = Layout::mainComposeCardBox(formW);
|
||||
float cardW = cardBox.width;
|
||||
float cardLeftX = ImGui::GetCursorScreenPos().x;
|
||||
float cardOffsetX = std::max(0.0f, (formW - cardW) * 0.5f);
|
||||
float cardOffsetX = cardBox.offsetX;
|
||||
if (cardOffsetX > 0.0f)
|
||||
ImGui::SetCursorPosX(ImGui::GetCursorPosX() + cardOffsetX);
|
||||
|
||||
@@ -911,7 +927,13 @@ void RenderReceiveTab(App* app)
|
||||
{
|
||||
float btnGap = Layout::spacingMd();
|
||||
float btnH = std::max(schema::UI().drawElement("tabs.receive", "action-btn-min-height").size, schema::UI().drawElement("tabs.receive", "action-btn-height").size * vScale);
|
||||
float otherBtnW = std::max(S.drawElement("tabs.receive", "action-btn-min-width").size, innerW * S.drawElement("tabs.receive", "action-btn-width-ratio").size);
|
||||
// Justify the footer edge-to-edge like Send's [Review Send][Cancel] row instead of packing
|
||||
// fixed-width buttons from the left (which left a large dead gap on the right). Split innerW
|
||||
// into equal shares over the live button count: 2 by default (Clear Request + Explorer),
|
||||
// 4 when an amount is requested (+ Copy URI + Share).
|
||||
int nBtns = (s_request_amount > 0 ? 2 : 0) + 2;
|
||||
float otherBtnW = std::max(S.drawElement("tabs.receive", "action-btn-min-width").size,
|
||||
(innerW - (nBtns - 1) * btnGap) / (float)nBtns);
|
||||
|
||||
bool firstBtn = true;
|
||||
|
||||
|
||||
@@ -1272,12 +1272,13 @@ void RenderSendTab(App* app)
|
||||
float contentStartY = ImGui::GetCursorPosY();
|
||||
|
||||
float formAvailW = ImGui::GetContentRegionAvail().x;
|
||||
// The compose form reads best as a centered fixed-width column, not edge-to-edge.
|
||||
// Cap the card to a readable form width and center it; the recent-sends list below
|
||||
// deliberately keeps the full column width (formAvailW).
|
||||
const float sendDp = Layout::dpiScale();
|
||||
float formCardW = std::min(formAvailW, 760.0f * sendDp);
|
||||
float formOffsetX = std::max(0.0f, (formAvailW - formCardW) * 0.5f);
|
||||
// Fill the available column up to the content-max-width cap, then center. Shared with the
|
||||
// Receive tab via mainComposeCardBox() so the two card envelopes are identical in width and
|
||||
// position (Send previously capped at 760dp vs Receive's 860dp, so Send rendered narrower).
|
||||
// The recent-sends list below deliberately keeps the full column width (formAvailW).
|
||||
Layout::CardBox formBox = Layout::mainComposeCardBox(formAvailW);
|
||||
float formCardW = formBox.width;
|
||||
float formOffsetX = formBox.offsetX;
|
||||
float formW = formAvailW;
|
||||
ImGui::BeginGroup();
|
||||
|
||||
@@ -1367,7 +1368,10 @@ void RenderSendTab(App* app)
|
||||
|
||||
float pasteW = std::max(schema::UI().drawElement("tabs.send", "paste-btn-min-width").size, colW * schema::UI().drawElement("tabs.send", "paste-btn-width-ratio").size);
|
||||
float contactsW = ImGui::GetFrameHeight(); // compact square icon button for the contact picker
|
||||
ImGui::PushItemWidth(colW - pasteW - contactsW - Layout::spacingSm() * 2.0f);
|
||||
// Reserve the TWO real SameLine gaps (each = ItemSpacing.x) between input|Paste|icon.
|
||||
// Reserving spacingSm (a smaller token) under-counted the gap, so the row overshot colW by
|
||||
// ~2*(ItemSpacing.x - spacingSm) and the icon's right border clipped past the card edge.
|
||||
ImGui::PushItemWidth(colW - pasteW - contactsW - ImGui::GetStyle().ItemSpacing.x * 2.0f);
|
||||
|
||||
// Show clipboard preview as transparent overlay when paste button is hovered
|
||||
bool paste_hovered = false;
|
||||
@@ -1425,9 +1429,12 @@ void RenderSendTab(App* app)
|
||||
}
|
||||
}
|
||||
|
||||
// Contact picker — pick a saved contact's address as the recipient.
|
||||
// Contact picker — pick a saved contact's address as the recipient. Pin the height to the
|
||||
// frame height (== the input + Paste height) so the larger iconMed font doesn't auto-size
|
||||
// this square button taller than its row-mates. (Passing a non-zero size also routes
|
||||
// TactileButton through its precise InvisibleButton + centered-glyph path.)
|
||||
ImGui::SameLine();
|
||||
if (material::TactileButton(ICON_MD_CONTACTS "##pickContact", ImVec2(contactsW, 0),
|
||||
if (material::TactileButton(ICON_MD_CONTACTS "##pickContact", ImVec2(contactsW, ImGui::GetFrameHeight()),
|
||||
material::Type().iconMed()))
|
||||
ImGui::OpenPopup("##ContactPickerPopup");
|
||||
if (ImGui::IsItemHovered()) material::Tooltip("%s", TR("send_contacts_button"));
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "shield_dialog.h"
|
||||
#include "../../app.h"
|
||||
#include "../../config/version.h"
|
||||
#include "../../data/wallet_state.h"
|
||||
#include "../../rpc/rpc_client.h"
|
||||
#include "../../rpc/rpc_worker.h"
|
||||
#include "../../util/i18n.h"
|
||||
@@ -15,39 +16,98 @@
|
||||
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <cstdio>
|
||||
|
||||
namespace dragonx {
|
||||
namespace ui {
|
||||
|
||||
// Static state
|
||||
static bool s_open = false;
|
||||
// ── Static dialog state ─────────────────────────────────────────────────────────────────────────
|
||||
static bool s_open = false;
|
||||
static ShieldDialog::Mode s_mode = ShieldDialog::Mode::ShieldCoinbase;
|
||||
static char s_from_address[512] = "*";
|
||||
static char s_to_address[512] = "";
|
||||
static bool s_consolidate = false; // opened from the wallet-bloat nudge (shielded preset + framing)
|
||||
static int s_src = 2; // merge source: 0 = transparent, 1 = shielded, 2 = both
|
||||
static char s_from_address[512] = "*";
|
||||
static char s_to_address[512] = "";
|
||||
static int s_selected_zaddr_idx = -1;
|
||||
static double s_fee = DRAGONX_DEFAULT_FEE;
|
||||
static int s_utxo_limit = 50; // overridden by schema at runtime
|
||||
static bool s_operation_pending = false;
|
||||
static int s_utxo_limit = 50; // overridden by schema at runtime
|
||||
static bool s_advanced = false; // Advanced (fee + batch size) disclosure
|
||||
static bool s_confirm = false; // inline "confirm before moving funds" phase
|
||||
static bool s_operation_pending = false;
|
||||
static bool s_op_terminal = false; // async op reached success/failed — freeze inputs
|
||||
static std::string s_operation_id;
|
||||
static std::string s_status_message;
|
||||
static int s_selected_zaddr_idx = -1;
|
||||
static double s_last_poll = 0.0; // live-progress self-poll timer (ImGui::GetTime seconds)
|
||||
// Scope of what can be consolidated (fetched once on open, merge mode only).
|
||||
static bool s_scope_loading = false;
|
||||
static bool s_scope_loaded = false;
|
||||
static int s_t_count = 0, s_z_count = 0;
|
||||
static double s_t_amount = 0.0, s_z_amount = 0.0;
|
||||
static bool s_creating_addr = false; // z_getnewaddress in flight (empty state)
|
||||
|
||||
static void resetTransient()
|
||||
{
|
||||
s_operation_pending = false;
|
||||
s_op_terminal = false;
|
||||
s_confirm = false;
|
||||
s_status_message.clear();
|
||||
s_operation_id.clear();
|
||||
s_creating_addr = false;
|
||||
}
|
||||
|
||||
// Count + sum spendable transparent UTXOs and shielded notes so the user can see the scope of a
|
||||
// consolidation (and how many batches it may take). Read-only; runs off the UI thread.
|
||||
static void loadScope(App* app)
|
||||
{
|
||||
if (!app || !app->worker()) return;
|
||||
s_scope_loading = true; s_scope_loaded = false;
|
||||
app->worker()->post([app, rpc = app->rpc()]() -> rpc::RPCWorker::MainCb {
|
||||
int tC = 0, zC = 0; double tA = 0.0, zA = 0.0; std::string error;
|
||||
try {
|
||||
rpc::RPCClient::TraceScope trace("Shield dialog / Scope count");
|
||||
nlohmann::json us = rpc->call("listunspent", nlohmann::json::array({0}));
|
||||
if (us.is_array()) for (const auto& u : us) {
|
||||
if (u.value("confirmations", 0) >= 1 && u.value("spendable", true)) { ++tC; tA += u.value("amount", 0.0); }
|
||||
}
|
||||
nlohmann::json zs = rpc->call("z_listunspent", nlohmann::json::array({0}));
|
||||
if (zs.is_array()) for (const auto& z : zs) {
|
||||
if (z.value("confirmations", 0) >= 1) { ++zC; zA += z.value("amount", 0.0); }
|
||||
}
|
||||
} catch (const std::exception& e) { error = e.what(); }
|
||||
return [tC, zC, tA, zA, error]() {
|
||||
s_scope_loading = false; s_scope_loaded = error.empty();
|
||||
s_t_count = tC; s_z_count = zC; s_t_amount = tA; s_z_amount = zA;
|
||||
// Clamp the source to what actually has inputs (unless the user is mid-op).
|
||||
const bool tOk = tC > 0, zOk = zC > 0;
|
||||
if (!s_operation_pending) {
|
||||
if (s_consolidate && zOk) s_src = 1; // bloat nudge → shielded
|
||||
else if (s_src == 0 && !tOk) s_src = zOk ? 1 : 2;
|
||||
else if (s_src == 1 && !zOk) s_src = tOk ? 0 : 2;
|
||||
else if (!tOk && zOk) s_src = 1;
|
||||
else if (tOk && !zOk) s_src = 0;
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
void ShieldDialog::show(Mode mode)
|
||||
{
|
||||
s_mode = mode;
|
||||
s_open = true;
|
||||
s_operation_pending = false;
|
||||
s_status_message.clear();
|
||||
s_operation_id.clear();
|
||||
|
||||
if (mode == Mode::ShieldCoinbase) {
|
||||
strncpy(s_from_address, "*", sizeof(s_from_address));
|
||||
} else {
|
||||
s_from_address[0] = '\0';
|
||||
}
|
||||
s_consolidate = false; // reset preset flags so stale statics don't leak across opens
|
||||
s_src = 2;
|
||||
resetTransient();
|
||||
s_from_address[0] = '\0';
|
||||
if (mode == Mode::ShieldCoinbase) strncpy(s_from_address, "*", sizeof(s_from_address));
|
||||
s_to_address[0] = '\0';
|
||||
s_selected_zaddr_idx = -1;
|
||||
s_fee = DRAGONX_DEFAULT_FEE;
|
||||
s_utxo_limit = (int)schema::UI().drawElement("business", "utxo-limit").size;
|
||||
s_selected_zaddr_idx = -1;
|
||||
if (s_utxo_limit < 1) s_utxo_limit = 50;
|
||||
s_advanced = false;
|
||||
s_scope_loaded = false; s_scope_loading = false;
|
||||
s_t_count = s_z_count = 0; s_t_amount = s_z_amount = 0.0;
|
||||
s_last_poll = 0.0;
|
||||
}
|
||||
|
||||
void ShieldDialog::showShieldCoinbase(const std::string& fromAddress)
|
||||
@@ -59,14 +119,146 @@ void ShieldDialog::showShieldCoinbase(const std::string& fromAddress)
|
||||
void ShieldDialog::showMerge()
|
||||
{
|
||||
show(Mode::MergeToAddress);
|
||||
s_consolidate = false;
|
||||
s_src = 2; // generic merge: both sources
|
||||
}
|
||||
|
||||
void ShieldDialog::showConsolidate()
|
||||
{
|
||||
show(Mode::MergeToAddress);
|
||||
s_consolidate = true;
|
||||
s_src = 1; // wallet-bloat consolidation targets shielded notes (witness bloat)
|
||||
}
|
||||
|
||||
void ShieldDialog::hide()
|
||||
{
|
||||
s_open = false;
|
||||
s_operation_pending = false;
|
||||
s_status_message.clear();
|
||||
s_operation_id.clear();
|
||||
resetTransient();
|
||||
}
|
||||
|
||||
// Relevant count/amount for the currently-selected merge source.
|
||||
static int srcCount() { return s_src == 0 ? s_t_count : s_src == 1 ? s_z_count : (s_t_count + s_z_count); }
|
||||
static double srcAmount() { return s_src == 0 ? s_t_amount : s_src == 1 ? s_z_amount : (s_t_amount + s_z_amount); }
|
||||
|
||||
static std::string fmtAmt(double v) { char b[48]; std::snprintf(b, sizeof(b), "%.4f", v); return b; }
|
||||
|
||||
static std::string shortAddr(const std::string& a)
|
||||
{
|
||||
if (a.size() <= 20) return a;
|
||||
return a.substr(0, 10) + "…" + a.substr(a.size() - 8);
|
||||
}
|
||||
|
||||
// Auto-pick the best spendable z-address as the default destination (fewest hops for the user).
|
||||
static void autoSelectDestination(const WalletState& state)
|
||||
{
|
||||
if (s_to_address[0] != '\0' || state.z_addresses.empty()) return;
|
||||
int idx = bestSpendableAddressIndex(state.z_addresses);
|
||||
if (idx < 0) idx = 0;
|
||||
s_selected_zaddr_idx = idx;
|
||||
strncpy(s_to_address, state.z_addresses[idx].address.c_str(), sizeof(s_to_address) - 1);
|
||||
}
|
||||
|
||||
// Fire the actual shield/merge op. Registers the opid with the shared poller (for balance refresh)
|
||||
// AND kicks the modal's own live-progress poll.
|
||||
static void submitOperation(App* app)
|
||||
{
|
||||
s_operation_pending = true;
|
||||
s_op_terminal = false;
|
||||
s_status_message = TR("shield_submitting");
|
||||
s_last_poll = ImGui::GetTime();
|
||||
|
||||
if (s_mode == ShieldDialog::Mode::ShieldCoinbase) {
|
||||
std::string from(s_from_address), to(s_to_address);
|
||||
double fee = s_fee; int limit = s_utxo_limit;
|
||||
if (!app->worker()) return;
|
||||
app->worker()->post([app, rpc = app->rpc(), from, to, fee, limit]() -> rpc::RPCWorker::MainCb {
|
||||
nlohmann::json result; std::string error;
|
||||
try {
|
||||
rpc::RPCClient::TraceScope trace("Shield dialog / Shield coinbase");
|
||||
result = rpc->call("z_shieldcoinbase", {from, to, fee, limit});
|
||||
} catch (const std::exception& e) { error = e.what(); }
|
||||
return [app, result, error]() {
|
||||
if (error.empty()) {
|
||||
s_operation_id = result.value("opid", "");
|
||||
s_status_message = TR("merge_progress");
|
||||
Notifications::instance().success(TR("shield_started"));
|
||||
app->trackOperation(s_operation_id);
|
||||
} else {
|
||||
s_operation_pending = false; s_op_terminal = true;
|
||||
s_status_message = std::string(TR("shield_error_prefix")) + error;
|
||||
Notifications::instance().error(std::string(TR("shield_send_failed")) + error);
|
||||
}
|
||||
};
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// Merge / consolidate. Source → z_mergetoaddress fromaddress selector (this is the fix: shielded
|
||||
// notes, not just transparent UTXOs — the wallet-bloat the nudge warns about is shielded witnesses).
|
||||
std::vector<std::string> fromAddrs;
|
||||
if (s_src == 0) fromAddrs = { "ANY_TADDR" };
|
||||
else if (s_src == 1) fromAddrs = { "ANY_SAPLING" };
|
||||
else fromAddrs = { "*" };
|
||||
std::string to(s_to_address);
|
||||
double fee = s_fee; int limit = s_utxo_limit;
|
||||
if (!app->worker()) return;
|
||||
app->worker()->post([app, rpc = app->rpc(), fromAddrs, to, fee, limit]() -> rpc::RPCWorker::MainCb {
|
||||
nlohmann::json addrs = nlohmann::json::array();
|
||||
for (const auto& a : fromAddrs) addrs.push_back(a);
|
||||
nlohmann::json result; std::string error;
|
||||
try {
|
||||
rpc::RPCClient::TraceScope trace("Shield dialog / Consolidate");
|
||||
// fromaddrs, toaddr, fee, transparent_limit, shielded_limit — cap both to the batch size.
|
||||
result = rpc->call("z_mergetoaddress", {addrs, to, fee, limit, limit});
|
||||
} catch (const std::exception& e) { error = e.what(); }
|
||||
return [app, result, error]() {
|
||||
if (error.empty()) {
|
||||
s_operation_id = result.value("opid", "");
|
||||
s_status_message = TR("merge_progress");
|
||||
Notifications::instance().success(TR("merge_started"));
|
||||
app->trackOperation(s_operation_id);
|
||||
} else {
|
||||
s_operation_pending = false; s_op_terminal = true;
|
||||
s_status_message = std::string(TR("shield_error_prefix")) + error;
|
||||
Notifications::instance().error(std::string(TR("merge_send_failed")) + error);
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
// Live-progress self-poll: while an op is in flight, poll z_getoperationstatus every ~2s so the modal
|
||||
// shows "Consolidating… → Done/Failed" without a manual button. (The shared poller also tracks it for
|
||||
// balance refresh; this drives only the inline display.)
|
||||
static void pollOperation(App* app)
|
||||
{
|
||||
if (s_operation_id.empty() || s_op_terminal || !app->worker()) return;
|
||||
const double now = ImGui::GetTime();
|
||||
if (now - s_last_poll < 2.0) return;
|
||||
s_last_poll = now;
|
||||
std::string opid = s_operation_id;
|
||||
app->worker()->post([rpc = app->rpc(), opid]() -> rpc::RPCWorker::MainCb {
|
||||
nlohmann::json result; std::string error;
|
||||
try {
|
||||
rpc::RPCClient::TraceScope trace("Shield dialog / Op status");
|
||||
result = rpc->call("z_getoperationstatus", {nlohmann::json::array({opid})});
|
||||
} catch (const std::exception& e) { error = e.what(); }
|
||||
return [result, error]() {
|
||||
if (!error.empty() || !result.is_array() || result.empty()) return; // transient — retry next tick
|
||||
const auto& op = result[0];
|
||||
const std::string status = op.value("status", "");
|
||||
if (status == "success") {
|
||||
s_operation_pending = false; s_op_terminal = true;
|
||||
s_status_message = TR("shield_completed");
|
||||
Notifications::instance().success(TR("shield_merge_done"));
|
||||
} else if (status == "failed") {
|
||||
std::string msg = op.value("error", nlohmann::json{}).value("message", std::string(TR("shield_unknown_error")));
|
||||
s_operation_pending = false; s_op_terminal = true;
|
||||
s_status_message = std::string(TR("shield_op_failed")) + msg;
|
||||
Notifications::instance().error(std::string(TR("shield_op_failed")) + msg);
|
||||
}
|
||||
// queued / executing → leave the "Consolidating…" message and keep polling.
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
void ShieldDialog::render(App* app)
|
||||
@@ -74,263 +266,221 @@ void ShieldDialog::render(App* app)
|
||||
if (!s_open) return;
|
||||
|
||||
auto& S = schema::UI();
|
||||
auto win = S.window("dialogs.shield");
|
||||
auto addrLbl = S.label("dialogs.shield", "address-label");
|
||||
auto addrFrontLbl = S.label("dialogs.shield", "address-front-label");
|
||||
auto addrBackLbl = S.label("dialogs.shield", "address-back-label");
|
||||
auto feeInput = S.input("dialogs.shield", "fee-input");
|
||||
auto utxoInput = S.input("dialogs.shield", "utxo-limit-input");
|
||||
auto shieldBtn = S.button("dialogs.shield", "shield-button");
|
||||
auto cancelBtn = S.button("dialogs.shield", "cancel-button");
|
||||
auto win = S.window("dialogs.shield");
|
||||
auto addrLbl = S.label("dialogs.shield", "address-label");
|
||||
auto addrFront = S.label("dialogs.shield", "address-front-label");
|
||||
auto addrBack = S.label("dialogs.shield", "address-back-label");
|
||||
auto feeInput = S.input("dialogs.shield", "fee-input");
|
||||
auto utxoInput = S.input("dialogs.shield", "utxo-limit-input");
|
||||
auto shieldBtn = S.button("dialogs.shield", "shield-button");
|
||||
auto cancelBtn = S.button("dialogs.shield", "cancel-button");
|
||||
const float dp = Layout::dpiScale();
|
||||
const bool isMerge = (s_mode == Mode::MergeToAddress);
|
||||
|
||||
const char* title = (s_mode == Mode::ShieldCoinbase)
|
||||
? TR("shield_title")
|
||||
: TR("merge_title");
|
||||
const char* title = s_consolidate ? TR("consolidate_title")
|
||||
: isMerge ? TR("merge_title")
|
||||
: TR("shield_title");
|
||||
|
||||
material::OverlayDialogSpec ov;
|
||||
ov.title = title; ov.p_open = &s_open;
|
||||
ov.style = material::OverlayStyle::BlurFloat;
|
||||
ov.cardWidth = win.width; ov.idSuffix = "shielddialog";
|
||||
if (material::BeginOverlayDialog(ov)) {
|
||||
const auto& state = app->getWalletState();
|
||||
if (!material::BeginOverlayDialog(ov)) return;
|
||||
|
||||
// Description
|
||||
if (s_mode == Mode::ShieldCoinbase) {
|
||||
ImGui::TextWrapped("%s", TR("shield_description"));
|
||||
} else {
|
||||
ImGui::TextWrapped("%s", TR("merge_description"));
|
||||
const auto& state = app->getWalletState();
|
||||
autoSelectDestination(state);
|
||||
pollOperation(app);
|
||||
if (isMerge && !s_scope_loaded && !s_scope_loading && s_operation_id.empty()) loadScope(app);
|
||||
|
||||
// ── Description ──────────────────────────────────────────────────────────────────────────────
|
||||
ImGui::TextWrapped("%s", s_consolidate ? TR("consolidate_desc")
|
||||
: isMerge ? TR("merge_description")
|
||||
: TR("shield_description"));
|
||||
ImGui::Spacing();
|
||||
|
||||
const bool opInFlight = !s_operation_id.empty(); // submitted — inputs frozen, showing progress
|
||||
|
||||
// ── Merge: scope + source selector ──────────────────────────────────────────────────────────
|
||||
if (isMerge && !opInFlight) {
|
||||
if (s_scope_loading) {
|
||||
material::Type().textColored(material::TypeStyle::Caption, material::OnSurfaceMedium(),
|
||||
TR("merge_scope_loading"));
|
||||
} else if (s_scope_loaded) {
|
||||
char buf[160];
|
||||
std::snprintf(buf, sizeof(buf), TR("merge_scope_fmt"),
|
||||
s_t_count, s_z_count, fmtAmt(s_t_amount + s_z_amount).c_str());
|
||||
material::Type().textColored(material::TypeStyle::Caption, material::OnSurfaceMedium(), buf);
|
||||
}
|
||||
|
||||
ImGui::Spacing();
|
||||
|
||||
// From address (for shield coinbase)
|
||||
if (s_mode == Mode::ShieldCoinbase) {
|
||||
material::LabeledInput(TR("shield_from_address"), "##FromAddr", s_from_address, sizeof(s_from_address));
|
||||
ImGui::TextDisabled("%s", TR("shield_wildcard_hint"));
|
||||
// Source selector — only offer the types that actually have inputs.
|
||||
const bool tOk = s_t_count > 0, zOk = s_z_count > 0;
|
||||
if (tOk && zOk) {
|
||||
ImGui::AlignTextToFramePadding();
|
||||
ImGui::TextUnformatted(TR("merge_source"));
|
||||
ImGui::SameLine(0, Layout::spacingLg());
|
||||
ImGui::RadioButton(TR("merge_src_shielded"), &s_src, 1); ImGui::SameLine();
|
||||
ImGui::RadioButton(TR("merge_src_transparent"), &s_src, 0); ImGui::SameLine();
|
||||
ImGui::RadioButton(TR("merge_src_both"), &s_src, 2);
|
||||
ImGui::Spacing();
|
||||
}
|
||||
|
||||
// To address (z-address dropdown)
|
||||
ImGui::Text("%s", TR("shield_to_address"));
|
||||
|
||||
// Get z-addresses for dropdown
|
||||
std::string to_display = s_to_address[0] ? s_to_address : TR("shield_select_z");
|
||||
if (to_display.length() > static_cast<size_t>(addrLbl.truncate)) {
|
||||
to_display = to_display.substr(0, addrFrontLbl.truncate) + "..." + to_display.substr(to_display.length() - addrBackLbl.truncate);
|
||||
}
|
||||
|
||||
ImGui::SetNextItemWidth(-1);
|
||||
if (ImGui::BeginCombo("##ToAddr", to_display.c_str())) {
|
||||
for (size_t i = 0; i < state.z_addresses.size(); i++) {
|
||||
const auto& addr = state.z_addresses[i];
|
||||
std::string label = addr.address;
|
||||
if (label.length() > static_cast<size_t>(addrLbl.truncate)) {
|
||||
label = label.substr(0, addrFrontLbl.truncate) + "..." + label.substr(label.length() - addrBackLbl.truncate);
|
||||
}
|
||||
|
||||
bool selected = (s_selected_zaddr_idx == static_cast<int>(i));
|
||||
if (ImGui::Selectable(label.c_str(), selected)) {
|
||||
s_selected_zaddr_idx = static_cast<int>(i);
|
||||
strncpy(s_to_address, addr.address.c_str(), sizeof(s_to_address) - 1);
|
||||
}
|
||||
if (selected) {
|
||||
ImGui::SetItemDefaultFocus();
|
||||
}
|
||||
}
|
||||
ImGui::EndCombo();
|
||||
}
|
||||
if (state.z_addresses.empty()) {
|
||||
material::Type().textColored(material::TypeStyle::Caption, material::Warning(),
|
||||
TR("shield_no_zaddr_hint"));
|
||||
}
|
||||
|
||||
ImGui::Spacing();
|
||||
|
||||
// Fee + UTXO limit share one row (two columns) to tighten vertical rhythm.
|
||||
float pairColX = ImGui::GetContentRegionAvail().x * 0.5f;
|
||||
|
||||
// Fee (left column)
|
||||
ImGui::Text("%s", TR("fee_label"));
|
||||
ImGui::SetNextItemWidth(feeInput.width * Layout::dpiScale());
|
||||
ImGui::InputDouble("##Fee", &s_fee, 0.0001, 0.001, "%.8f");
|
||||
if (s_fee < 0.0) s_fee = 0.0; // no negative fee
|
||||
if (s_fee > 1.0) s_fee = 1.0; // guard a fat-fingered huge fee (mirrors utxo clamp)
|
||||
ImGui::SameLine();
|
||||
ImGui::TextDisabled("DRGX");
|
||||
|
||||
// UTXO limit (right column) — hint drops under the input (rather than beside it) since
|
||||
// "Max UTXOs per operation" is too long to share the narrower half-width column with "DRGX".
|
||||
ImGui::SameLine(pairColX);
|
||||
ImGui::BeginGroup();
|
||||
ImGui::Text("%s", TR("shield_utxo_limit"));
|
||||
ImGui::SetNextItemWidth(utxoInput.width * Layout::dpiScale());
|
||||
ImGui::InputInt("##Limit", &s_utxo_limit);
|
||||
if (s_utxo_limit < 1) s_utxo_limit = 1;
|
||||
if (s_utxo_limit > 100) s_utxo_limit = 100;
|
||||
material::Type().textColored(material::TypeStyle::Caption, material::OnSurfaceMedium(),
|
||||
TR("shield_max_utxos"));
|
||||
ImGui::EndGroup();
|
||||
|
||||
ImGui::Spacing();
|
||||
|
||||
// Status message
|
||||
if (!s_status_message.empty()) {
|
||||
if (s_operation_pending) {
|
||||
ImGui::TextColored(ImVec4(1.0f, 0.8f, 0.0f, 1.0f), "%s", s_status_message.c_str());
|
||||
} else {
|
||||
ImGui::TextWrapped("%s", s_status_message.c_str());
|
||||
}
|
||||
ImGui::Spacing();
|
||||
}
|
||||
|
||||
// Buttons — guard on connection/sync like the Send tab (a disconnected or mid-sync submit just
|
||||
// fails at the daemon with a raw error).
|
||||
bool sh_connected = app->isConnected();
|
||||
bool sh_syncing = state.sync.syncing;
|
||||
bool can_submit = !s_operation_pending && s_to_address[0] != '\0' && sh_connected && !sh_syncing;
|
||||
|
||||
// Center the primary + Cancel action row via the shared footer helper. We can't use
|
||||
// DialogActionFooter here because the primary button carries a disabled-hover tooltip that must
|
||||
// fire on ITS item (the helper draws primary+Close internally, leaving no hook between them), so
|
||||
// we keep the two TactileButtons + the interleaved tooltip and only standardize the placement.
|
||||
const char* btn_label = (s_mode == Mode::ShieldCoinbase) ? TR("shield_funds") : TR("merge_funds");
|
||||
float footerBtnW = shieldBtn.width + cancelBtn.width + ImGui::GetStyle().ItemSpacing.x;
|
||||
material::BeginOverlayDialogFooter(footerBtnW, /*drawSeparator=*/false);
|
||||
|
||||
if (!can_submit) ImGui::BeginDisabled();
|
||||
|
||||
if (material::TactileButton(btn_label, ImVec2(shieldBtn.width, 0), S.resolveFont(shieldBtn.font))) {
|
||||
s_operation_pending = true;
|
||||
s_status_message = TR("shield_submitting");
|
||||
|
||||
if (s_mode == Mode::ShieldCoinbase) {
|
||||
std::string from(s_from_address), to(s_to_address);
|
||||
double fee = s_fee;
|
||||
int limit = s_utxo_limit;
|
||||
if (app->worker()) {
|
||||
app->worker()->post([app, rpc = app->rpc(), from, to, fee, limit]() -> rpc::RPCWorker::MainCb {
|
||||
nlohmann::json result;
|
||||
std::string error;
|
||||
try {
|
||||
rpc::RPCClient::TraceScope trace("Send tab / Shield coinbase");
|
||||
result = rpc->call("z_shieldcoinbase", {from, to, fee, limit});
|
||||
} catch (const std::exception& e) {
|
||||
error = e.what();
|
||||
}
|
||||
return [app, result, error]() {
|
||||
s_operation_pending = false;
|
||||
if (error.empty()) {
|
||||
s_operation_id = result.value("opid", "");
|
||||
s_status_message = std::string(TR("shield_op_submitted")) + s_operation_id;
|
||||
Notifications::instance().success(TR("shield_started"));
|
||||
// Register with the shared poller so an async failure is
|
||||
// surfaced (and balances refresh) even after this dialog closes.
|
||||
app->trackOperation(s_operation_id);
|
||||
} else {
|
||||
s_status_message = std::string(TR("shield_error_prefix")) + error;
|
||||
Notifications::instance().error(std::string(TR("shield_send_failed")) + error);
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
} else {
|
||||
std::vector<std::string> fromAddrs;
|
||||
fromAddrs.push_back("ANY_TADDR");
|
||||
std::string to(s_to_address);
|
||||
double fee = s_fee;
|
||||
int limit = s_utxo_limit;
|
||||
if (app->worker()) {
|
||||
app->worker()->post([app, rpc = app->rpc(), fromAddrs, to, fee, limit]() -> rpc::RPCWorker::MainCb {
|
||||
nlohmann::json addrs = nlohmann::json::array();
|
||||
for (const auto& addr : fromAddrs) addrs.push_back(addr);
|
||||
nlohmann::json result;
|
||||
std::string error;
|
||||
try {
|
||||
rpc::RPCClient::TraceScope trace("Send tab / Merge funds");
|
||||
result = rpc->call("z_mergetoaddress", {addrs, to, fee, 0, limit});
|
||||
} catch (const std::exception& e) {
|
||||
error = e.what();
|
||||
}
|
||||
return [app, result, error]() {
|
||||
s_operation_pending = false;
|
||||
if (error.empty()) {
|
||||
s_operation_id = result.value("opid", "");
|
||||
s_status_message = std::string(TR("shield_op_submitted")) + s_operation_id;
|
||||
Notifications::instance().success(TR("merge_started"));
|
||||
// Register with the shared poller so an async failure is
|
||||
// surfaced (and balances refresh) even after this dialog closes.
|
||||
app->trackOperation(s_operation_id);
|
||||
} else {
|
||||
s_status_message = std::string(TR("shield_error_prefix")) + error;
|
||||
Notifications::instance().error(std::string(TR("merge_send_failed")) + error);
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!can_submit) ImGui::EndDisabled();
|
||||
if (!can_submit && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
|
||||
if (!sh_connected) material::Tooltip("%s", TR("send_tooltip_not_connected"));
|
||||
else if (sh_syncing) material::Tooltip("%s", TR("send_tooltip_syncing"));
|
||||
else if (s_to_address[0]=='\0') material::Tooltip("%s", TR("shield_select_z"));
|
||||
}
|
||||
|
||||
ImGui::SameLine();
|
||||
|
||||
if (material::TactileButton(TR("cancel"), ImVec2(cancelBtn.width, 0), S.resolveFont(cancelBtn.font))) {
|
||||
s_open = false;
|
||||
}
|
||||
|
||||
// Show operation status if we have an opid
|
||||
if (!s_operation_id.empty()) {
|
||||
ImGui::Spacing();
|
||||
ImGui::Separator();
|
||||
ImGui::Spacing();
|
||||
|
||||
ImGui::Text(TR("shield_operation_id"), s_operation_id.c_str());
|
||||
|
||||
if (material::TactileButton(TR("shield_check_status"), ImVec2(0,0), S.resolveFont(shieldBtn.font))) {
|
||||
std::string opid = s_operation_id;
|
||||
if (app->worker()) {
|
||||
app->worker()->post([rpc = app->rpc(), opid]() -> rpc::RPCWorker::MainCb {
|
||||
nlohmann::json result;
|
||||
std::string error;
|
||||
try {
|
||||
rpc::RPCClient::TraceScope trace("Send tab / Shield operation status");
|
||||
nlohmann::json ids = nlohmann::json::array();
|
||||
ids.push_back(opid);
|
||||
result = rpc->call("z_getoperationstatus", {ids});
|
||||
} catch (const std::exception& e) {
|
||||
error = e.what();
|
||||
}
|
||||
return [result, error]() {
|
||||
if (error.empty() && result.is_array() && !result.empty()) {
|
||||
auto& op = result[0];
|
||||
std::string status = op.value("status", "unknown");
|
||||
if (status == "success") {
|
||||
s_status_message = TR("shield_completed");
|
||||
Notifications::instance().success(TR("shield_merge_done"));
|
||||
} else if (status == "failed") {
|
||||
std::string errMsg = op.value("error", nlohmann::json{}).value("message", TR("shield_unknown_error"));
|
||||
s_status_message = std::string(TR("shield_op_failed")) + errMsg;
|
||||
Notifications::instance().error(std::string(TR("shield_op_failed")) + errMsg);
|
||||
} else if (status == "executing") {
|
||||
s_status_message = TR("shield_in_progress");
|
||||
} else {
|
||||
s_status_message = std::string(TR("shield_status_label")) + status;
|
||||
}
|
||||
} else if (!error.empty()) {
|
||||
s_status_message = std::string(TR("shield_status_check_error")) + error;
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
material::EndOverlayDialog();
|
||||
}
|
||||
|
||||
// ── Shield coinbase: from address ───────────────────────────────────────────────────────────
|
||||
if (!isMerge && !opInFlight) {
|
||||
material::LabeledInput(TR("shield_from_address"), "##FromAddr", s_from_address, sizeof(s_from_address));
|
||||
ImGui::TextDisabled("%s", TR("shield_wildcard_hint"));
|
||||
ImGui::Spacing();
|
||||
}
|
||||
|
||||
// ── Destination (z-address) ─────────────────────────────────────────────────────────────────
|
||||
if (!opInFlight) {
|
||||
ImGui::TextUnformatted(TR("shield_to_address"));
|
||||
if (state.z_addresses.empty()) {
|
||||
material::Type().textColored(material::TypeStyle::Caption, material::Warning(), TR("shield_no_zaddr_hint"));
|
||||
ImGui::Spacing();
|
||||
if (s_creating_addr) {
|
||||
ImGui::TextDisabled("%s", TR("merge_creating"));
|
||||
} else if (material::TactileButton(TR("merge_create_zaddr"), ImVec2(0, 0), S.resolveFont(shieldBtn.font))) {
|
||||
s_creating_addr = true;
|
||||
if (app->worker()) app->worker()->post([app, rpc = app->rpc()]() -> rpc::RPCWorker::MainCb {
|
||||
std::string addr, error;
|
||||
try {
|
||||
rpc::RPCClient::TraceScope trace("Shield dialog / New z-address");
|
||||
addr = rpc->call("z_getnewaddress", nlohmann::json::array()).get<std::string>();
|
||||
} catch (const std::exception& e) { error = e.what(); }
|
||||
return [app, addr, error]() {
|
||||
s_creating_addr = false;
|
||||
if (error.empty() && !addr.empty()) {
|
||||
strncpy(s_to_address, addr.c_str(), sizeof(s_to_address) - 1);
|
||||
Notifications::instance().success(TR("merge_addr_created"));
|
||||
} else {
|
||||
Notifications::instance().error(std::string(TR("shield_error_prefix")) + error);
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
} else {
|
||||
std::string to_display = s_to_address[0] ? s_to_address : TR("shield_select_z");
|
||||
if (to_display.length() > static_cast<size_t>(addrLbl.truncate))
|
||||
to_display = to_display.substr(0, addrFront.truncate) + "..." + to_display.substr(to_display.length() - addrBack.truncate);
|
||||
ImGui::SetNextItemWidth(-1);
|
||||
if (ImGui::BeginCombo("##ToAddr", to_display.c_str())) {
|
||||
for (size_t i = 0; i < state.z_addresses.size(); i++) {
|
||||
std::string label = state.z_addresses[i].address;
|
||||
if (label.length() > static_cast<size_t>(addrLbl.truncate))
|
||||
label = label.substr(0, addrFront.truncate) + "..." + label.substr(label.length() - addrBack.truncate);
|
||||
bool selected = (s_selected_zaddr_idx == static_cast<int>(i));
|
||||
if (ImGui::Selectable(label.c_str(), selected)) {
|
||||
s_selected_zaddr_idx = static_cast<int>(i);
|
||||
strncpy(s_to_address, state.z_addresses[i].address.c_str(), sizeof(s_to_address) - 1);
|
||||
}
|
||||
if (selected) ImGui::SetItemDefaultFocus();
|
||||
}
|
||||
ImGui::EndCombo();
|
||||
}
|
||||
}
|
||||
ImGui::Spacing();
|
||||
|
||||
// ── Advanced (fee + batch size) ─────────────────────────────────────────────────────────
|
||||
ImDrawList* dl = ImGui::GetWindowDrawList();
|
||||
material::CollapsibleHeader(dl, "##AdvToggle", TR("merge_advanced"), s_advanced,
|
||||
ImGui::GetContentRegionAvail().x, material::Type().caption(),
|
||||
material::OnSurfaceMedium());
|
||||
if (s_advanced) {
|
||||
ImGui::Spacing();
|
||||
ImGui::TextUnformatted(TR("fee_label"));
|
||||
ImGui::SetNextItemWidth(feeInput.width * dp);
|
||||
ImGui::InputDouble("##Fee", &s_fee, 0.0001, 0.001, "%.8f");
|
||||
if (s_fee < 0.0) s_fee = 0.0;
|
||||
if (s_fee > 1.0) s_fee = 1.0;
|
||||
ImGui::SameLine(); ImGui::TextDisabled("DRGX");
|
||||
material::Type().textColored(material::TypeStyle::Caption, material::OnSurfaceMedium(), TR("merge_fee_hint"));
|
||||
|
||||
ImGui::Spacing();
|
||||
ImGui::TextUnformatted(TR("merge_max_inputs"));
|
||||
ImGui::SetNextItemWidth(utxoInput.width * dp);
|
||||
ImGui::InputInt("##Limit", &s_utxo_limit);
|
||||
if (s_utxo_limit < 1) s_utxo_limit = 1;
|
||||
if (s_utxo_limit > 100) s_utxo_limit = 100;
|
||||
}
|
||||
|
||||
// Batch hint: one run only merges up to the limit; large sets need repeats.
|
||||
if (isMerge && s_scope_loaded && srcCount() > s_utxo_limit) {
|
||||
char hb[160];
|
||||
std::snprintf(hb, sizeof(hb), TR("merge_batch_fmt"), s_utxo_limit);
|
||||
ImGui::Spacing();
|
||||
material::Type().textColored(material::TypeStyle::Caption, material::Warning(), hb);
|
||||
}
|
||||
ImGui::Spacing();
|
||||
}
|
||||
|
||||
// ── Live progress / status ──────────────────────────────────────────────────────────────────
|
||||
if (!s_status_message.empty()) {
|
||||
if (s_operation_pending && !s_op_terminal)
|
||||
ImGui::TextColored(ImVec4(1.0f, 0.8f, 0.0f, 1.0f), "%s", s_status_message.c_str());
|
||||
else
|
||||
ImGui::TextWrapped("%s", s_status_message.c_str());
|
||||
ImGui::Spacing();
|
||||
}
|
||||
|
||||
// ── Footer ──────────────────────────────────────────────────────────────────────────────────
|
||||
const bool connected = app->isConnected();
|
||||
const bool syncing = state.sync.syncing;
|
||||
const bool haveDest = s_to_address[0] != '\0';
|
||||
|
||||
if (opInFlight) {
|
||||
// After submit: just a Close button (progress shows above; op continues in the background).
|
||||
material::BeginOverlayDialogFooter(cancelBtn.width, /*drawSeparator=*/false);
|
||||
if (material::TactileButton(s_op_terminal ? TR("done") : TR("close"),
|
||||
ImVec2(cancelBtn.width, 0), S.resolveFont(cancelBtn.font)))
|
||||
s_open = false;
|
||||
material::EndOverlayDialog();
|
||||
return;
|
||||
}
|
||||
|
||||
const char* primaryLabel = s_confirm ? TR("merge_confirm_btn")
|
||||
: s_consolidate ? TR("consolidate_funds_btn")
|
||||
: isMerge ? TR("merge_funds")
|
||||
: TR("shield_funds");
|
||||
const char* secondaryLabel = s_confirm ? TR("merge_back") : TR("cancel");
|
||||
|
||||
// Confirm summary (inline, before the fund-moving call). Merge/consolidate shows amount + input
|
||||
// count; shield-coinbase just gets the button relabel (its inputs aren't enumerated here).
|
||||
if (s_confirm && isMerge) {
|
||||
char cb[200];
|
||||
std::snprintf(cb, sizeof(cb), TR("merge_confirm_fmt"),
|
||||
fmtAmt(srcAmount()).c_str(), srcCount(), shortAddr(s_to_address).c_str());
|
||||
ImGui::TextWrapped("%s", cb);
|
||||
ImGui::Spacing();
|
||||
}
|
||||
|
||||
bool can_submit = haveDest && connected && !syncing;
|
||||
if (isMerge && s_scope_loaded && srcCount() == 0) can_submit = false;
|
||||
|
||||
float footerBtnW = shieldBtn.width + cancelBtn.width + ImGui::GetStyle().ItemSpacing.x;
|
||||
material::BeginOverlayDialogFooter(footerBtnW, /*drawSeparator=*/false);
|
||||
|
||||
if (!can_submit) ImGui::BeginDisabled();
|
||||
if (material::TactileButton(primaryLabel, ImVec2(shieldBtn.width, 0), S.resolveFont(shieldBtn.font))) {
|
||||
if (s_confirm) { submitOperation(app); }
|
||||
else { s_confirm = true; } // first click → show the confirm summary
|
||||
}
|
||||
if (!can_submit) ImGui::EndDisabled();
|
||||
if (!can_submit && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
|
||||
if (!connected) material::Tooltip("%s", TR("send_tooltip_not_connected"));
|
||||
else if (syncing) material::Tooltip("%s", TR("send_tooltip_syncing"));
|
||||
else if (!haveDest) material::Tooltip("%s", TR("shield_select_z"));
|
||||
else if (isMerge && srcCount() == 0) material::Tooltip("%s", TR("merge_no_spendable"));
|
||||
}
|
||||
|
||||
ImGui::SameLine();
|
||||
if (material::TactileButton(secondaryLabel, ImVec2(cancelBtn.width, 0), S.resolveFont(cancelBtn.font))) {
|
||||
if (s_confirm) s_confirm = false; // Back → return to the form
|
||||
else s_open = false; // Cancel → close
|
||||
}
|
||||
|
||||
material::EndOverlayDialog();
|
||||
}
|
||||
|
||||
} // namespace ui
|
||||
|
||||
@@ -33,10 +33,16 @@ public:
|
||||
static void showShieldCoinbase(const std::string& fromAddress = "*");
|
||||
|
||||
/**
|
||||
* @brief Show merge to address dialog
|
||||
* @brief Show merge to address dialog (generic — both transparent + shielded sources)
|
||||
*/
|
||||
static void showMerge();
|
||||
|
||||
/**
|
||||
* @brief Show the consolidate-funds flow preset for wallet-bloat reduction (shielded notes).
|
||||
* Used by the large-wallet nudges (Settings banner + alert action).
|
||||
*/
|
||||
static void showConsolidate();
|
||||
|
||||
/**
|
||||
* @brief Render the dialog (call each frame)
|
||||
*/
|
||||
|
||||
@@ -460,15 +460,23 @@ void I18n::loadBuiltinEnglish()
|
||||
// Settings sections
|
||||
strings_["appearance"] = "APPEARANCE";
|
||||
strings_["theme_language"] = "THEME & LANGUAGE";
|
||||
strings_["scale_effects"] = "SCALE & EFFECTS";
|
||||
strings_["advanced_effects"] = "Advanced Effects...";
|
||||
strings_["tools_actions"] = "Tools & Actions...";
|
||||
strings_["tools_actions_hdr"] = "TOOLS & ACTIONS";
|
||||
strings_["wallet_options_hdr"] = "OPTIONS";
|
||||
strings_["wallet_diagnostics_hdr"] = "DIAGNOSTICS";
|
||||
strings_["wallet"] = "WALLET";
|
||||
strings_["node_security"] = "NODE & SECURITY";
|
||||
strings_["node"] = "NODE";
|
||||
strings_["security"] = "SECURITY";
|
||||
strings_["explorer_section"] = "EXPLORER";
|
||||
strings_["explorer_urls_hdr"] = "URLS";
|
||||
strings_["about"] = "About";
|
||||
strings_["backup_data"] = "BACKUP & DATA";
|
||||
strings_["backup_col_import"] = "IMPORT & RESTORE";
|
||||
strings_["backup_col_backup"] = "BACKUP";
|
||||
strings_["backup_col_export"] = "EXPORT";
|
||||
strings_["balance_layout"] = "Balance Layout";
|
||||
strings_["low_spec_mode"] = "Low-spec mode";
|
||||
strings_["simple_background"] = "Simple background";
|
||||
@@ -496,9 +504,11 @@ void I18n::loadBuiltinEnglish()
|
||||
strings_["screenshot_sweep"] = "Run screenshot sweep";
|
||||
strings_["screenshot_sweep_full"] = "Full UI sweep";
|
||||
strings_["screenshot_open_dir"] = "Open location";
|
||||
strings_["sweep_current_theme_only"] = "Current theme only";
|
||||
strings_["tt_sweep_current_theme_only"] = "Sweep only the active theme instead of cycling every theme";
|
||||
strings_["screenshot_sweep_desc"] = "Cycles every theme across every tab and saves a screenshot of each into per-tab subfolders under the config directory's screenshots folder (overwriting the previous sweep). Runs for a few seconds.";
|
||||
strings_["mine_when_idle"] = "Mine when idle";
|
||||
strings_["setup_wizard"] = "Run Setup Wizard...";
|
||||
strings_["setup_wizard"] = "Run Setup Wizard…";
|
||||
|
||||
// RPC / Explorer settings
|
||||
strings_["rpc_connection"] = "RPC Connection...";
|
||||
@@ -512,21 +522,21 @@ void I18n::loadBuiltinEnglish()
|
||||
strings_["fetch_prices"] = "Fetch price data from CoinGecko";
|
||||
strings_["block_explorer"] = "Block Explorer";
|
||||
strings_["test_connection"] = "Test Connection";
|
||||
strings_["rescan"] = "Rescan Blockchain";
|
||||
strings_["rescan"] = "Rescan";
|
||||
|
||||
// Settings: buttons
|
||||
strings_["settings_address_book"] = "Address Book...";
|
||||
strings_["settings_validate_address"] = "Validate Address...";
|
||||
strings_["settings_request_payment"] = "Request Payment...";
|
||||
strings_["settings_shield_mining"] = "Shield Mining...";
|
||||
strings_["settings_merge_to_address"] = "Merge to Address...";
|
||||
strings_["settings_address_book"] = "Address Book…";
|
||||
strings_["settings_validate_address"] = "Validate Address…";
|
||||
strings_["settings_request_payment"] = "Request Payment…";
|
||||
strings_["settings_shield_mining"] = "Shield Mining…";
|
||||
strings_["settings_merge_to_address"] = "Merge to Address…";
|
||||
strings_["settings_clear_ztx"] = "Clear Z-Tx History";
|
||||
strings_["settings_import_key"] = "Import Private Key...";
|
||||
strings_["settings_import_viewkey"] = "Import Viewing Key...";
|
||||
strings_["settings_export_key"] = "Export Key...";
|
||||
strings_["settings_export_all"] = "Export All...";
|
||||
strings_["settings_backup"] = "Backup...";
|
||||
strings_["settings_export_csv"] = "Export CSV...";
|
||||
strings_["settings_import_key"] = "Import Private Key…";
|
||||
strings_["settings_import_viewkey"] = "Import Viewing Key…";
|
||||
strings_["settings_export_key"] = "Export Key…";
|
||||
strings_["settings_export_all"] = "Export All…";
|
||||
strings_["settings_backup"] = "Backup…";
|
||||
strings_["settings_export_csv"] = "Export CSV…";
|
||||
strings_["settings_encrypt_wallet"] = "Encrypt Wallet";
|
||||
strings_["settings_change_passphrase"] = "Change Passphrase";
|
||||
strings_["settings_lock_now"] = "Lock Now";
|
||||
@@ -655,8 +665,11 @@ void I18n::loadBuiltinEnglish()
|
||||
strings_["wiz_pin_confirm"] = "Confirm PIN:";
|
||||
strings_["wiz_pin_invalid"] = "PIN must be 4-8 digits";
|
||||
strings_["wiz_pin_mismatch"] = "PINs do not match";
|
||||
strings_["settings_data_dir"] = "Data Dir:";
|
||||
strings_["settings_wallet_size_label"] = "Wallet Size:";
|
||||
strings_["settings_data_dir"] = "Data Dir";
|
||||
strings_["settings_wallet_size_label"] = "Wallet Size";
|
||||
strings_["wallet_size_warn"] = "This wallet file is large. Consolidating your notes can curb further growth.";
|
||||
strings_["tt_wallet_size_warn"] = "Shielded wallets grow with each note's witness data — merging many notes into one address reduces it. Back up first.";
|
||||
strings_["wallet_size_consolidate"] = "Consolidate notes\xE2\x80\xA6";
|
||||
strings_["settings_debug_changed"] = "Debug categories changed \xe2\x80\x94 restart daemon to apply";
|
||||
strings_["settings_auto_detected"] = "Auto-detected from DRAGONX.conf";
|
||||
strings_["settings_visual_effects"] = "Visual Effects";
|
||||
@@ -670,7 +683,7 @@ void I18n::loadBuiltinEnglish()
|
||||
strings_["settings_wallet_info"] = "Wallet Info";
|
||||
strings_["settings_block_explorer_urls"] = "Block Explorer URLs";
|
||||
strings_["settings_configure_explorer"] = "Configure external block explorer links";
|
||||
strings_["settings_auto_lock"] = "AUTO-LOCK";
|
||||
strings_["settings_auto_lock"] = "Auto-lock";
|
||||
strings_["timeout_off"] = "Off";
|
||||
strings_["timeout_1min"] = "1 min";
|
||||
strings_["timeout_5min"] = "5 min";
|
||||
@@ -700,9 +713,9 @@ void I18n::loadBuiltinEnglish()
|
||||
strings_["tt_scanline"] = "CRT scanline effect in console";
|
||||
strings_["tt_theme_effects"] = "Shimmer, glow, hue-cycling per theme";
|
||||
strings_["tt_animate_avatars"] = "Play animated (GIF / WebP) contact avatars; off shows the first frame only";
|
||||
strings_["tt_blur"] = "Blur amount (0%% = off, 100%% = maximum)";
|
||||
strings_["tt_noise"] = "Grain texture intensity (0%% = off, 100%% = maximum)";
|
||||
strings_["tt_ui_opacity"] = "Card and sidebar opacity (100%% = fully opaque, lower = more see-through)";
|
||||
strings_["tt_blur"] = "Blur amount (0% = off, 100% = maximum)";
|
||||
strings_["tt_noise"] = "Grain texture intensity (0% = off, 100% = maximum)";
|
||||
strings_["tt_ui_opacity"] = "Card and sidebar opacity (100% = fully opaque, lower = more see-through)";
|
||||
strings_["tt_window_opacity"] = "Background opacity (lower = desktop visible through window)";
|
||||
strings_["tt_font_scale"] = "Scale all text and UI (1.0x = default, up to 1.5x). Hotkey: Alt + Scroll Wheel";
|
||||
strings_["tt_custom_theme"] = "Custom theme active";
|
||||
@@ -805,12 +818,14 @@ void I18n::loadBuiltinEnglish()
|
||||
strings_["rescan_detecting"] = "Checking which blocks your node has on disk…";
|
||||
strings_["rescan_bootstrapped_msg"] = "Your node was bootstrapped, so blocks below the snapshot aren't on disk and a rescan from genesis would fail. Rescan from a height your snapshot includes to reconcile your wallet's spent balance. Your wallet.dat and chain data are not deleted.";
|
||||
strings_["rescan_from_height"] = "Rescan from block height:";
|
||||
strings_["repair_wallet"] = "Repair Wallet";
|
||||
strings_["repair_wallet"] = "Repair";
|
||||
strings_["tt_repair_wallet"] = "Wipe and rebuild the wallet's transaction records from the blockchain (fixes notes that fail to send after a rescan)";
|
||||
strings_["confirm_repair_wallet_title"] = "Repair Wallet";
|
||||
strings_["confirm_repair_wallet_msg"] = "This restarts the daemon with -zapwallettxes=2: it deletes all of the wallet's transaction and note records, then rebuilds them from the blockchain. Use this when transactions fail to build (\"Invalid sapling spend proof\" / \"shielded requirements not met\") even after a full rescan. It takes a long time and the wallet stays offline until it finishes.";
|
||||
strings_["confirm_repair_wallet_safe"] = "Your keys, addresses and balance are preserved — only the cached transaction records are rebuilt.";
|
||||
strings_["daemon_binary"] = "Daemon binary";
|
||||
strings_["daemon_updates_label"] = "UPDATES";
|
||||
strings_["daemon_maintenance_label"] = "MAINTENANCE";
|
||||
strings_["daemon_installed"] = "Installed";
|
||||
strings_["daemon_bundled"] = "Bundled";
|
||||
strings_["daemon_not_installed"] = "not installed";
|
||||
@@ -818,6 +833,10 @@ void I18n::loadBuiltinEnglish()
|
||||
strings_["daemon_status_match"] = "Installed binary matches the bundled version.";
|
||||
strings_["daemon_status_differ"] = "Installed binary differs from the bundled version.";
|
||||
strings_["daemon_status_missing"] = "No daemon installed — install the bundled version.";
|
||||
// Compact status shown right-aligned on the DAEMON BINARY heading row.
|
||||
strings_["daemon_status_ok"] = "Up to date";
|
||||
strings_["daemon_status_diff"] = "Version differs";
|
||||
strings_["daemon_status_none"] = "Not installed";
|
||||
strings_["daemon_install_bundled"] = "Install bundled";
|
||||
strings_["tt_daemon_install_bundled"] = "Stop the node, overwrite the installed dragonxd with the version bundled in this wallet build, then restart";
|
||||
strings_["confirm_reinstall_daemon_title"] = "Install Bundled Daemon";
|
||||
@@ -1437,8 +1456,8 @@ void I18n::loadBuiltinEnglish()
|
||||
strings_["sb_daemon_extract_failed"] = "Failed to write daemon files — check free disk space and permissions.";
|
||||
strings_["sb_daemon_files_failed"] = "Failed to write daemon files to %s — check free disk space and permissions.";
|
||||
strings_["loading_stall_title"] = "Taking longer than expected";
|
||||
strings_["loading_stall_body"] = "The daemon has been initializing for %.0fs. This can be normal after an update or on first launch (loading the block index or rescanning) — it will connect automatically once ready.";
|
||||
strings_["loading_stall_hint"] = "Still stuck? Open Settings and use Restart Daemon, or check the Console for details.";
|
||||
strings_["loading_stall_body"] = "Initializing for %.0fs — normal after an update or first launch. Connects automatically when ready.";
|
||||
strings_["loading_stall_hint"] = "Stuck? Settings → Restart Daemon, or check the Console.";
|
||||
strings_["sb_plaintext_remote_blocked"] = "Refusing to send RPC credentials over plaintext to a remote host. Add rpcallowplaintext=1 to DRAGONX.conf to allow it, or enable TLS with rpctls=1.";
|
||||
strings_["rpc_plaintext_remote_warning"] = "Remote RPC is using plaintext HTTP. Add rpctls=1 to DRAGONX.conf if your daemon supports TLS.";
|
||||
strings_["settings_open_log_folder"] = "Open log folder";
|
||||
@@ -1500,6 +1519,7 @@ void I18n::loadBuiltinEnglish()
|
||||
strings_["about_chain"] = "Chain:";
|
||||
strings_["about_connections"] = "Connections:";
|
||||
strings_["about_credits"] = "Credits";
|
||||
strings_["about_source"] = "Source";
|
||||
strings_["about_daemon"] = "Daemon:";
|
||||
strings_["about_debug"] = "Debug";
|
||||
strings_["about_edition"] = "ImGui Edition";
|
||||
@@ -2221,6 +2241,29 @@ void I18n::loadBuiltinEnglish()
|
||||
strings_["merge_funds"] = "Merge Funds";
|
||||
strings_["merge_started"] = "Merge operation started";
|
||||
strings_["merge_title"] = "Merge to Address";
|
||||
// Consolidate-funds flow (rich merge modal + wallet-bloat preset).
|
||||
strings_["consolidate_title"] = "Consolidate funds";
|
||||
strings_["consolidate_desc"] = "Combine many small inputs into a single shielded note. Fewer notes means a smaller wallet file and better privacy.";
|
||||
strings_["consolidate_funds_btn"] = "Consolidate";
|
||||
strings_["merge_scope_loading"] = "Checking your inputs\xE2\x80\xA6";
|
||||
strings_["merge_scope_fmt"] = "%d transparent + %d shielded inputs \xC2\xB7 ~%s DRGX spendable";
|
||||
strings_["merge_source"] = "Consolidate";
|
||||
strings_["merge_src_transparent"] = "Transparent";
|
||||
strings_["merge_src_shielded"] = "Shielded";
|
||||
strings_["merge_src_both"] = "Both";
|
||||
strings_["merge_batch_fmt"] = "Merges up to %d inputs per run \xE2\x80\x94 repeat to finish the rest.";
|
||||
strings_["merge_advanced"] = "Advanced";
|
||||
strings_["merge_max_inputs"] = "Max inputs per batch";
|
||||
strings_["merge_fee_hint"] = "Network fee for this transaction.";
|
||||
strings_["merge_create_zaddr"] = "Create shielded address";
|
||||
strings_["merge_creating"] = "Creating address\xE2\x80\xA6";
|
||||
strings_["merge_addr_created"] = "Shielded address created.";
|
||||
strings_["merge_confirm_fmt"] = "Consolidate ~%s DRGX from %d input(s) into %s?";
|
||||
strings_["merge_confirm_btn"] = "Confirm";
|
||||
strings_["merge_back"] = "Back";
|
||||
strings_["merge_progress"] = "Consolidating\xE2\x80\xA6 this can take a few minutes. You can close this window.";
|
||||
strings_["merge_no_spendable"] = "No spendable inputs to consolidate yet.";
|
||||
strings_["done"] = "Done";
|
||||
|
||||
// --- Transaction Details Dialog ---
|
||||
strings_["tx_confirmations"] = "%d confirmations";
|
||||
|
||||
@@ -867,6 +867,70 @@ int Platform::getSystemIdleSeconds()
|
||||
// GPU utilization detection
|
||||
// ============================================================================
|
||||
|
||||
std::string Platform::runHiddenCapture(const std::string& cmdLine, bool mergeStderr, int* exitCode)
|
||||
{
|
||||
if (exitCode) *exitCode = -1;
|
||||
#ifdef _WIN32
|
||||
SECURITY_ATTRIBUTES sa;
|
||||
ZeroMemory(&sa, sizeof(sa));
|
||||
sa.nLength = sizeof(sa);
|
||||
sa.bInheritHandle = TRUE;
|
||||
HANDLE hRead = NULL, hWrite = NULL;
|
||||
if (!CreatePipe(&hRead, &hWrite, &sa, 0)) return {};
|
||||
SetHandleInformation(hRead, HANDLE_FLAG_INHERIT, 0); // parent's read end stays private
|
||||
|
||||
HANDLE hNul = INVALID_HANDLE_VALUE;
|
||||
if (!mergeStderr) {
|
||||
hNul = CreateFileA("NUL", GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, &sa,
|
||||
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
|
||||
}
|
||||
|
||||
STARTUPINFOA si;
|
||||
ZeroMemory(&si, sizeof(si));
|
||||
si.cb = sizeof(si);
|
||||
si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
|
||||
si.wShowWindow = SW_HIDE;
|
||||
si.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
|
||||
si.hStdOutput = hWrite;
|
||||
si.hStdError = mergeStderr ? hWrite : hNul;
|
||||
|
||||
PROCESS_INFORMATION pi;
|
||||
ZeroMemory(&pi, sizeof(pi));
|
||||
std::string cl = cmdLine; // CreateProcessA may modify lpCommandLine → needs a mutable buffer
|
||||
std::string out;
|
||||
if (CreateProcessA(NULL, cl.empty() ? NULL : &cl[0], NULL, NULL, TRUE,
|
||||
CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) {
|
||||
CloseHandle(hWrite); hWrite = NULL; // close our copy so ReadFile hits EOF when the child exits
|
||||
if (hNul != INVALID_HANDLE_VALUE) { CloseHandle(hNul); hNul = INVALID_HANDLE_VALUE; }
|
||||
char buf[4096];
|
||||
DWORD n = 0;
|
||||
while (ReadFile(hRead, buf, sizeof(buf), &n, NULL) && n > 0) out.append(buf, n);
|
||||
WaitForSingleObject(pi.hProcess, INFINITE);
|
||||
if (exitCode) {
|
||||
DWORD code = 0;
|
||||
if (GetExitCodeProcess(pi.hProcess, &code)) *exitCode = static_cast<int>(code);
|
||||
}
|
||||
CloseHandle(pi.hProcess);
|
||||
CloseHandle(pi.hThread);
|
||||
}
|
||||
if (hWrite != NULL) CloseHandle(hWrite);
|
||||
if (hNul != INVALID_HANDLE_VALUE) CloseHandle(hNul);
|
||||
CloseHandle(hRead);
|
||||
return out;
|
||||
#else
|
||||
const std::string full = cmdLine + (mergeStderr ? " 2>&1" : " 2>/dev/null");
|
||||
std::string out;
|
||||
FILE* f = popen(full.c_str(), "r");
|
||||
if (!f) return out;
|
||||
char buf[512];
|
||||
size_t n;
|
||||
while ((n = fread(buf, 1, sizeof(buf), f)) > 0) out.append(buf, n);
|
||||
const int st = pclose(f);
|
||||
if (exitCode) *exitCode = st; // raw status (matches prior pclose-based rc checks)
|
||||
return out;
|
||||
#endif
|
||||
}
|
||||
|
||||
int Platform::getGpuUtilization()
|
||||
{
|
||||
#ifdef _WIN32
|
||||
@@ -877,23 +941,16 @@ int Platform::getGpuUtilization()
|
||||
static bool s_has_nvidia = false;
|
||||
if (!s_tried_nvidia) {
|
||||
s_tried_nvidia = true;
|
||||
FILE* f = _popen("where nvidia-smi 2>nul", "r");
|
||||
if (f) {
|
||||
char buf[256];
|
||||
s_has_nvidia = (fgets(buf, sizeof(buf), f) != nullptr);
|
||||
_pclose(f);
|
||||
}
|
||||
// Windowless (runHiddenCapture) so GPU-aware idle detection never flashes a cmd.exe console.
|
||||
const std::string w = runHiddenCapture("where nvidia-smi");
|
||||
s_has_nvidia = (w.find_first_not_of(" \t\r\n") != std::string::npos);
|
||||
}
|
||||
if (s_has_nvidia) {
|
||||
FILE* f = _popen("nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits 2>nul", "r");
|
||||
if (f) {
|
||||
char buf[64];
|
||||
int util = -1;
|
||||
if (fgets(buf, sizeof(buf), f)) {
|
||||
util = atoi(buf);
|
||||
if (util < 0 || util > 100) util = -1;
|
||||
}
|
||||
_pclose(f);
|
||||
const std::string o = runHiddenCapture(
|
||||
"nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits");
|
||||
if (!o.empty()) {
|
||||
int util = atoi(o.c_str());
|
||||
if (util < 0 || util > 100) util = -1;
|
||||
return util;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -179,6 +179,15 @@ public:
|
||||
* @return GPU busy percent, or -1 if unavailable.
|
||||
*/
|
||||
static int getGpuUtilization();
|
||||
|
||||
// Run a command line and capture its stdout WITHOUT ever popping a console window: Windows uses
|
||||
// CreateProcess + CREATE_NO_WINDOW (a plain popen()/_popen() flashes a cmd.exe console), POSIX uses
|
||||
// popen(). Use this instead of _popen for anything run while the GUI is up. `mergeStderr` folds the
|
||||
// child's stderr into the result (like "2>&1"); otherwise stderr is discarded. `exitCode`, if given,
|
||||
// receives the child's exit status (raw pclose() status on POSIX, GetExitCodeProcess on Windows; -1
|
||||
// if the process could not be launched).
|
||||
static std::string runHiddenCapture(const std::string& cmdLine, bool mergeStderr = false,
|
||||
int* exitCode = nullptr);
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user