From 3151f80c41a84f19059085a3c64112c42f8f2cde Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 22 Dec 2023 03:36:09 +0800 Subject: [PATCH 1/3] rename binary to avoid unintended kills --- .github/workflows/atomicdex-desktop-ci.yml | 2 +- cmake/project.metadata.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index b9131d28b3..b8d0c2985f 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/atomicdex-desktop-ci.yml @@ -10,7 +10,7 @@ on: - cron: '0 0 * * 1' env: - DEX_API: "mm2" + DEX_API: "mm2_kmd" DEX_RPCPORT: 7762 DEX_RPC: "http://127.0.0.1:7762" DEX_PROJECT_NAME: "komodo-wallet" diff --git a/cmake/project.metadata.cmake b/cmake/project.metadata.cmake index ccd0464851..303c204bc2 100644 --- a/cmake/project.metadata.cmake +++ b/cmake/project.metadata.cmake @@ -1,5 +1,5 @@ # Default project values -set(DEX_API "mm2") +set(DEX_API "mm2_kmd") set(DEX_RPCPORT 7762) set(DEX_RPC "http://127.0.0.1:7762") set(DEX_PROJECT_NAME "komodo-wallet") From 14b83d5f50d95c63e9df7913bcd5dd9a64618435 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 22 Dec 2023 03:44:53 +0800 Subject: [PATCH 2/3] add rpcport to settings > about --- .../Dex/Settings/SettingModal.qml | 33 +++++++++++++++---- src/core/atomicdex/pages/qt.settings.page.cpp | 5 +++ src/core/atomicdex/pages/qt.settings.page.hpp | 1 + 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/atomic_defi_design/Dex/Settings/SettingModal.qml b/atomic_defi_design/Dex/Settings/SettingModal.qml index 7dcb86d2b3..332e245c6b 100644 --- a/atomic_defi_design/Dex/Settings/SettingModal.qml +++ b/atomic_defi_design/Dex/Settings/SettingModal.qml @@ -650,7 +650,7 @@ Qaterial.Dialog { anchors.fill: parent topPadding: 10 - spacing: 15 + spacing: 12 ModalLoader { @@ -721,15 +721,15 @@ Qaterial.Dialog { Layout.alignment: Qt.AlignVCenter Layout.fillWidth: true - text: qsTr("Qt version") + text: qsTr("RPC Port") } DexCopyableLabel { Layout.alignment: Qt.AlignVCenter - text: qtversion - onCopyNotificationTitle: qsTr("Qt Version") - onCopyNotificationMsg: qsTr("Qt Version copied to clipboard.") + text: API.app.settings_pg.get_rpcport() + onCopyNotificationTitle: qsTr("RPC Port") + onCopyNotificationMsg: qsTr("RPC Port copied to clipboard.") } } @@ -755,6 +755,27 @@ Qaterial.Dialog } } + RowLayout + { + width: parent.width - 30 + anchors.horizontalCenter: parent.horizontalCenter + height: 60 + + DexLabel + { + Layout.alignment: Qt.AlignVCenter + Layout.fillWidth: true + text: qsTr("Qt version") + } + + DexCopyableLabel + { + Layout.alignment: Qt.AlignVCenter + text: qtversion + onCopyNotificationTitle: qsTr("Qt Version") + onCopyNotificationMsg: qsTr("Qt Version copied to clipboard.") + } + } } } } @@ -777,7 +798,7 @@ Qaterial.Dialog DexAppButton { - text: qsTr("Search Update") + text: qsTr("Search for Update") height: 48 radius: 20 leftPadding: 20 diff --git a/src/core/atomicdex/pages/qt.settings.page.cpp b/src/core/atomicdex/pages/qt.settings.page.cpp index d1aea10aeb..05438a08c5 100644 --- a/src/core/atomicdex/pages/qt.settings.page.cpp +++ b/src/core/atomicdex/pages/qt.settings.page.cpp @@ -763,6 +763,11 @@ namespace atomic_dex return QString::fromStdString(mm2::rpc_version()); } + QString settings_page::get_rpcport() + { + return QString::fromStdString(atomic_dex::g_dex_rpcport); + } + QString settings_page::get_peerid() { return QString::fromStdString(mm2::peer_id()); diff --git a/src/core/atomicdex/pages/qt.settings.page.hpp b/src/core/atomicdex/pages/qt.settings.page.hpp index 6d98178989..5ce98412a7 100644 --- a/src/core/atomicdex/pages/qt.settings.page.hpp +++ b/src/core/atomicdex/pages/qt.settings.page.hpp @@ -126,6 +126,7 @@ namespace atomic_dex Q_INVOKABLE QStringList retrieve_seed(const QString& wallet_name, const QString& password); Q_INVOKABLE static QString get_mm2_version(); Q_INVOKABLE static QString get_peerid(); + Q_INVOKABLE static QString get_rpcport(); Q_INVOKABLE static QString get_log_folder(); Q_INVOKABLE static QString get_export_folder(); Q_INVOKABLE static QString get_version(); From e23a254fa7d21ec9461cc6f5cd09959936cb2b65 Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 22 Dec 2023 03:54:29 +0800 Subject: [PATCH 3/3] Add RPC port to about > settings --- .../assets/languages/atomic_defi_de.ts | 190 +++++++++--------- .../assets/languages/atomic_defi_en.ts | 188 ++++++++--------- .../assets/languages/atomic_defi_es.ts | 190 +++++++++--------- .../assets/languages/atomic_defi_fr.ts | 188 ++++++++--------- .../assets/languages/atomic_defi_ru.ts | 188 ++++++++--------- .../assets/languages/atomic_defi_tr.ts | 188 ++++++++--------- src/core/atomicdex/pages/qt.settings.page.cpp | 3 +- 7 files changed, 568 insertions(+), 567 deletions(-) diff --git a/atomic_defi_design/assets/languages/atomic_defi_de.ts b/atomic_defi_design/assets/languages/atomic_defi_de.ts index 090de3cdca..0348200972 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_de.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_de.ts @@ -311,12 +311,12 @@ Quelle - + Activating: - + Price provider is: %1 Preisanbieter ist: %1 @@ -661,29 +661,29 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 CoinMenu - + Disable %1 TICKER %1 deaktivieren - + Disable and Delete %1 TICKER %1 deaktivieren und löschen - + Disable all %1 assets Alle %1 Assets deaktivieren - + Disable all assets Alle Assets deaktivieren - + Disable 0 balance assets Alle Assets mit der Balance 0 deaktivieren @@ -1515,67 +1515,67 @@ Beispiel: Kennwort = 1234 Suffix=56 Eingabe beim Login=123456 - + Trading Fee - + Minimum Trading Amount Mindesthandelsbetrag - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1874,117 +1874,117 @@ They will be removed from the orderbook until you log in again. Main - + Price Preis - + Change 24hr 24h Veränderung - + Contract Address Vertragsadresse - + Send Senden - + Enable %1 ? %1 aktivieren? - + Yes Ja - + No Nein - + Receive Empfangen - + Swap Tausch - + Portfolio Portfolio - + is wallet only nur Brieftasche (kein DEX möglich) - + Rewards Belohnungen - + Faucet Faucet - - - + + + Public Key Öffentlicher Schlüssel - + Copied to Clipboard In die Zwischenablage kopiert - + + Explore + + + + Loading market data Laden von Marktdaten - + There is no chart data for this ticker yet Für diesen Ticker liegen noch keine Chartdaten vor - + Fetching transactions... Transaktionen werden abgerufen... - - Please wait, %1 is %2 + + No transactions available. - - % activated... + + Please wait, %1 is %2 - - No transactions available - Keine Transaktionen verfügbar - - - - Click to view your address on %1 (%2) block explorer - Klicken Sie hier, um Ihre Adresse im %1 (%2) Block-Explorer anzuzeigen + + % activated... + @@ -2150,63 +2150,63 @@ They will be removed from the orderbook until you log in again. NewUpdateModal - - - + + + Searching new updates Suche nach neuen Updates - + Fetching... Abrufen… - - - - + + + + Close Schließen - + Could not check new updates for the following reason: %1 Neue Updates konnten aus folgendem Grund nicht überprüft werden: %1 - + New version found Neue Version gefunden - + + Your application is up to date! + + + + Mandatory version found Zwingend notwendige Version gefunden - + %1 %2 is available ! %1 %2 ist verfügbar ! - + This update is mandatory to continue using the application Dieses Update ist zwingend erforderlich, um die Anwendung weiterhin verwenden zu können - + Close Dex Dex schließen - - Your application is updated. - Ihre Anwendung ist auf dem neuesten Stand. - - - + Download Herunterladen @@ -2513,92 +2513,92 @@ They will be removed from the orderbook until you log in again. OrderForm - + Price Preis - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Send Senden - + Receive Empfangen - + Max Max - + Swap 25% of your tradable balance. - + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: Mindestvolumen: - + Use custom minimum trade amount Benutzerdefinierten Mindesthandelsbetrag verwenden @@ -2959,7 +2959,7 @@ Bitte wählen Sie eine neue Order aus. QObject - + Cannot reach the endpoint: Der Endpunkt kann nicht erreicht werden: @@ -4563,7 +4563,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. diff --git a/atomic_defi_design/assets/languages/atomic_defi_en.ts b/atomic_defi_design/assets/languages/atomic_defi_en.ts index cf7cf4185c..7b6367813e 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_en.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_en.ts @@ -311,12 +311,12 @@ - + Activating: - + Price provider is: %1 @@ -660,29 +660,29 @@ CoinMenu - + Disable %1 TICKER - + Disable and Delete %1 TICKER - + Disable all %1 assets - + Disable all assets - + Disable 0 balance assets @@ -1514,67 +1514,67 @@ - + Trading Fee - + Minimum Trading Amount - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1873,116 +1873,116 @@ They will be removed from the orderbook until you log in again. Main - + Price - + Change 24hr - + Contract Address - + Send - + Enable %1 ? - + Yes Yes - + No - + Receive - + Swap - + Portfolio - + is wallet only - + Rewards - + Faucet - - - + + + Public Key - + Copied to Clipboard - - Loading market data + + Explore - - There is no chart data for this ticker yet + + Loading market data - - Fetching transactions... + + There is no chart data for this ticker yet - - Please wait, %1 is %2 + + Fetching transactions... - - % activated... + + No transactions available. - - No transactions available + + Please wait, %1 is %2 - - Click to view your address on %1 (%2) block explorer + + % activated... @@ -2149,63 +2149,63 @@ They will be removed from the orderbook until you log in again. NewUpdateModal - - - + + + Searching new updates - + Fetching... - - - - + + + + Close - + Could not check new updates for the following reason: %1 - + New version found - + + Your application is up to date! + + + + Mandatory version found - + %1 %2 is available ! - + This update is mandatory to continue using the application - + Close Dex - - Your application is updated. - - - - + Download @@ -2512,92 +2512,92 @@ They will be removed from the orderbook until you log in again. OrderForm - + Price - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Send - + Receive - + Max - + Swap 25% of your tradable balance. - + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: - + Use custom minimum trade amount @@ -2957,7 +2957,7 @@ Please select a new order. QObject - + Cannot reach the endpoint: @@ -4553,7 +4553,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. diff --git a/atomic_defi_design/assets/languages/atomic_defi_es.ts b/atomic_defi_design/assets/languages/atomic_defi_es.ts index dd40bbec99..ece7e6033c 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_es.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_es.ts @@ -311,12 +311,12 @@ Fuente - + Activating: Activando: - + Price provider is: %1 El proveedor de precios es: %1 @@ -660,29 +660,29 @@ CoinMenu - + Disable %1 TICKER Deshabilitar %1 - + Disable and Delete %1 TICKER Deshabilitar y eliminar %1 - + Disable all %1 assets Deshabilitar todos los activos de %1 - + Disable all assets Deshabilitar todos los activos - + Disable 0 balance assets Deshabilitar 0 balancear activos @@ -1514,67 +1514,67 @@ - + Trading Fee - + Minimum Trading Amount Cantidad Mínima de Intercambio - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1876,118 +1876,118 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión. Main - + Price Precio - + Change 24hr Cambio - + Contract Address Dirección del Contrato - + Send Enviar - + Enable %1 ? ¿Habilitar %1? - + Yes Sí - + No No - + Receive Recibir - + Swap Intercambiar - + Portfolio Cartera - + is wallet only es solo billetera - + Rewards Recompensas - + Faucet Grifo - - - + + + Public Key Clave Pública - + Copied to Clipboard Copiada en el Portapapeles - + + Explore + + + + Loading market data Cargando datos de mercado - + There is no chart data for this ticker yet No hay datos de gráficos para este ticker aún - + Fetching transactions... Obteniendo transacciones... - + + No transactions available. + + + + Please wait, %1 is %2 Por favor espera %1 es %2 - + % activated... % activado... - - - No transactions available - No hay transacciones disponibles - - - - Click to view your address on %1 (%2) block explorer - Haga clic para ver su dirección en %1 (%2) explorador de bloques - Trading Information @@ -2152,63 +2152,63 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión. NewUpdateModal - - - + + + Searching new updates Buscando nuevas actualizaciones - + Fetching... Buscando... - - - - + + + + Close Cerrar - + Could not check new updates for the following reason: %1 No se pudieron comprobar las nuevas actualizaciones por el siguiente motivo: %1 - + New version found Nueva versión encontrada - + + Your application is up to date! + + + + Mandatory version found Versión obligatoria encontrada - + %1 %2 is available ! %1 ¡%2 está disponible! - + This update is mandatory to continue using the application Esta actualización es obligatoria para seguir usando la aplicación - + Close Dex Cerrar Dex - - Your application is updated. - Tu aplicación está actualizada. - - - + Download Descargar @@ -2515,92 +2515,92 @@ Se eliminarán del libro de pedidos hasta que vuelva a iniciar sesión. OrderForm - + Price Precio - + Reduce 1% relative to CEX market price. Reducción del 1% en relación con el precio de mercado CEX. - + Use CEX market price. Utilice el precio de mercado CEX. - + Increase 1% relative to CEX market price. Aumento del 1% en relación con el precio de mercado de CEX. - + Send Enviar - + Receive Recibir - + Max Max - + Swap 25% of your tradable balance. Usar el 25% de su saldo comercial. - + Swap 50% of your tradable balance. Usar el 50% de su saldo comercial. - + Swap 100% of your tradable balance. Usar el 100% de su saldo comercial. - + Min Volume Volumen Mínimo - + Min amount to sell Cantidad mínima para vender - + Min amount to receive Cantidad mínimo para recibir - + Minimum accepted trade equals 10% of order volume. El comercio mínimo aceptado es igual al 10% del volumen del pedido. - + Minimum accepted trade equals 25% of order volume. El comercio mínimo aceptado es igual al 25% del volumen del pedido. - + Minimum accepted trade equals 50% of order volume. El comercio mínimo aceptado es igual al 50% del volumen del pedido. - + Min volume: Volumen mínimo: - + Use custom minimum trade amount Utilizar una cantidad personalizada de intercambio mínima @@ -2961,7 +2961,7 @@ Seleccione un nuevo pedido. QObject - + Cannot reach the endpoint: No se puede llegar al punto final: @@ -4566,7 +4566,7 @@ Esto puede tardar unos minutos... atomic_dex::settings_page - + An error has occurred. Se ha producido un error. diff --git a/atomic_defi_design/assets/languages/atomic_defi_fr.ts b/atomic_defi_design/assets/languages/atomic_defi_fr.ts index a53a7d640b..2fd93a2b52 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_fr.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_fr.ts @@ -311,12 +311,12 @@ Source - + Activating: - + Price provider is: %1 Fournisseur de prix : %1 @@ -660,29 +660,29 @@ CoinMenu - + Disable %1 TICKER Désactiver %1 - + Disable and Delete %1 TICKER Désactiver et Supprimer %1 - + Disable all %1 assets Désactiver tous les actifs %1 - + Disable all assets Désactiver tous les actifs - + Disable 0 balance assets @@ -1514,67 +1514,67 @@ - + Trading Fee - + Minimum Trading Amount Montant de trading minimum - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1873,116 +1873,116 @@ They will be removed from the orderbook until you log in again. Main - + Price Prix - + Change 24hr - + Contract Address - + Send Envoyez - + Enable %1 ? Activer %1 ? - + Yes Oui - + No Non - + Receive Recevoir - + Swap Échange - + Portfolio Portfolio - + is wallet only - + Rewards Récompenses - + Faucet Robinet - - - + + + Public Key - + Copied to Clipboard Copier dans le presse-papier - + + Explore + + + + Loading market data Chargement des données de marché - + There is no chart data for this ticker yet Il n'y a pas encore de données graphiques pour ce ticker - + Fetching transactions... - - Please wait, %1 is %2 - - - - - % activated... + + No transactions available. - - No transactions available + + Please wait, %1 is %2 - - Click to view your address on %1 (%2) block explorer + + % activated... @@ -2149,63 +2149,63 @@ They will be removed from the orderbook until you log in again. NewUpdateModal - - - + + + Searching new updates - + Fetching... - - - - + + + + Close Fermer - + Could not check new updates for the following reason: %1 - + New version found - + + Your application is up to date! + + + + Mandatory version found - + %1 %2 is available ! - + This update is mandatory to continue using the application - + Close Dex - - Your application is updated. - - - - + Download Téléchargement @@ -2512,92 +2512,92 @@ They will be removed from the orderbook until you log in again. OrderForm - + Send Envoyez - + Receive Recevoir - + Max Max - + Swap 25% of your tradable balance. - + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: Min volume : - + Use custom minimum trade amount Utiliser le montant d'échange minimum personnalisé - + Price Prix - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. @@ -2957,7 +2957,7 @@ Please select a new order. QObject - + Cannot reach the endpoint: @@ -4553,7 +4553,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. diff --git a/atomic_defi_design/assets/languages/atomic_defi_ru.ts b/atomic_defi_design/assets/languages/atomic_defi_ru.ts index a74d0fd4bb..a8d02cf8e8 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_ru.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_ru.ts @@ -311,12 +311,12 @@ Источник - + Activating: - + Price provider is: %1 Провайдер цены: %1 @@ -660,29 +660,29 @@ CoinMenu - + Disable %1 TICKER Удалить %1 - + Disable and Delete %1 TICKER Удалить токен %1 из AtomicDex - + Disable all %1 assets Отключить все %1 ассеты - + Disable all assets Отключить все ассеты - + Disable 0 balance assets @@ -1520,67 +1520,67 @@ - + Trading Fee - + Minimum Trading Amount Минимальный торговый объем - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1879,116 +1879,116 @@ They will be removed from the orderbook until you log in again. Main - + Price Цена - + Change 24hr - + Contract Address - + Send Отправить - + Enable %1 ? Активировать %1 ? - + Yes Да - + No Нет - + Receive Получить - + Swap Обменять - + Portfolio Портфолио - + is wallet only - + Rewards Награды - + Faucet Фаусет - - - + + + Public Key - + Copied to Clipboard Скопировано в буфер обмена - + + Explore + + + + Loading market data Загрузка рыночных данных - + There is no chart data for this ticker yet Для данного актива пока еще нет графиков данных - + Fetching transactions... - - Please wait, %1 is %2 - - - - - % activated... + + No transactions available. - - No transactions available + + Please wait, %1 is %2 - - Click to view your address on %1 (%2) block explorer + + % activated... @@ -2155,63 +2155,63 @@ They will be removed from the orderbook until you log in again. NewUpdateModal - - - + + + Searching new updates - + Fetching... - - - - + + + + Close Закрыть - + Could not check new updates for the following reason: %1 - + New version found - + + Your application is up to date! + + + + Mandatory version found - + %1 %2 is available ! - + This update is mandatory to continue using the application - + Close Dex - - Your application is updated. - - - - + Download Скачать @@ -2518,92 +2518,92 @@ They will be removed from the orderbook until you log in again. OrderForm - + Price Цена - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. - + Send Отправить - + Receive Получить - + Max Макс - + Swap 25% of your tradable balance. - + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: Мин. объем: - + Use custom minimum trade amount Задать минимальный объем сделки @@ -2963,7 +2963,7 @@ Please select a new order. QObject - + Cannot reach the endpoint: @@ -4559,7 +4559,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. diff --git a/atomic_defi_design/assets/languages/atomic_defi_tr.ts b/atomic_defi_design/assets/languages/atomic_defi_tr.ts index 5708dea400..49f3e80d63 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_tr.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_tr.ts @@ -311,12 +311,12 @@ - + Activating: - + Price provider is: %1 @@ -660,29 +660,29 @@ CoinMenu - + Disable %1 TICKER %1'i Etkisizleştir - + Disable and Delete %1 TICKER %1'i Etkisizleştir ve Sil - + Disable all %1 assets Tüm %1 türü varlıkları etkisizleştir - + Disable all assets Tüm varlıkları etkisizleştir - + Disable 0 balance assets @@ -1508,67 +1508,67 @@ - + Trading Fee - + Minimum Trading Amount Minimum Takas Tutarı - + Wallet %1 already exists WALLETNAME - - + + Please wait for %1 to fully activate - + %1 balance is lower than the fees amount: %2 %3 - + Tradable (after fees) %1 balance is lower than minimum trade amount - + Please fill the price field - + Please fill the volume field - - + + %1 volume is lower than minimum trade amount - - + + %1 needs to be enabled in order to use %2 - - + + %1 balance needs to be funded, a non-zero balance is required to pay the gas of %2 transactions - + Unknown Error @@ -1867,116 +1867,116 @@ They will be removed from the orderbook until you log in again. Main - + Price Fiyat - + Change 24hr - + Contract Address - + Send Gönder - + Enable %1 ? %1 Etkinleştirilsin mi ? - + Yes Evet - + No Hayır - + Receive Al - + Swap Takasla - + Portfolio - + is wallet only - + Rewards - + Faucet Musluk - - - + + + Public Key - + Copied to Clipboard Panoya Kopyalandı - + + Explore + + + + Loading market data Piyasa bilgisi yükleniyor - + There is no chart data for this ticker yet Henüz bu hisse senedi için grafik verisi yok - + Fetching transactions... - - Please wait, %1 is %2 - - - - - % activated... + + No transactions available. - - No transactions available + + Please wait, %1 is %2 - - Click to view your address on %1 (%2) block explorer + + % activated... @@ -2143,63 +2143,63 @@ They will be removed from the orderbook until you log in again. NewUpdateModal - - - + + + Searching new updates - + Fetching... - - - - + + + + Close Kapat - + Could not check new updates for the following reason: %1 - + New version found - + + Your application is up to date! + + + + Mandatory version found - + %1 %2 is available ! - + This update is mandatory to continue using the application - + Close Dex - - Your application is updated. - - - - + Download İndir @@ -2506,92 +2506,92 @@ They will be removed from the orderbook until you log in again. OrderForm - + Send Gönder - + Receive Al - + Max Maks - + Swap 25% of your tradable balance. - + Swap 50% of your tradable balance. - + Swap 100% of your tradable balance. - + Min Volume - + Min amount to sell - + Min amount to receive - + Minimum accepted trade equals 10% of order volume. - + Minimum accepted trade equals 25% of order volume. - + Minimum accepted trade equals 50% of order volume. - + Min volume: - + Use custom minimum trade amount - + Price Fiyat - + Reduce 1% relative to CEX market price. - + Use CEX market price. - + Increase 1% relative to CEX market price. @@ -2951,7 +2951,7 @@ Please select a new order. QObject - + Cannot reach the endpoint: @@ -4547,7 +4547,7 @@ This might take a few minutes... atomic_dex::settings_page - + An error has occurred. diff --git a/src/core/atomicdex/pages/qt.settings.page.cpp b/src/core/atomicdex/pages/qt.settings.page.cpp index 05438a08c5..4145591125 100644 --- a/src/core/atomicdex/pages/qt.settings.page.cpp +++ b/src/core/atomicdex/pages/qt.settings.page.cpp @@ -25,6 +25,7 @@ #include // Project Headers +#include "atomicdex/constants/dex.constants.hpp" #include "atomicdex/api/mm2/rpc_v2/rpc2.get_public_key.hpp" #include "atomicdex/config/enable.cfg.hpp" #include "atomicdex/events/events.hpp" @@ -765,7 +766,7 @@ namespace atomic_dex QString settings_page::get_rpcport() { - return QString::fromStdString(atomic_dex::g_dex_rpcport); + return QString::fromStdString(std::to_string(atomic_dex::g_dex_rpcport)); } QString settings_page::get_peerid()